summaryrefslogtreecommitdiffhomepage
path: root/applications/luci-app-firewall
diff options
context:
space:
mode:
Diffstat (limited to 'applications/luci-app-firewall')
-rw-r--r--applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js21
-rw-r--r--applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm90
-rw-r--r--applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm89
-rw-r--r--applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm59
-rw-r--r--applications/luci-app-firewall/po/ca/firewall.po204
-rw-r--r--applications/luci-app-firewall/po/cs/firewall.po204
-rw-r--r--applications/luci-app-firewall/po/de/firewall.po204
-rw-r--r--applications/luci-app-firewall/po/el/firewall.po174
-rw-r--r--applications/luci-app-firewall/po/en/firewall.po165
-rw-r--r--applications/luci-app-firewall/po/es/firewall.po204
-rw-r--r--applications/luci-app-firewall/po/fr/firewall.po186
-rw-r--r--applications/luci-app-firewall/po/he/firewall.po165
-rw-r--r--applications/luci-app-firewall/po/hu/firewall.po204
-rw-r--r--applications/luci-app-firewall/po/it/firewall.po204
-rw-r--r--applications/luci-app-firewall/po/ja/firewall.po204
-rw-r--r--applications/luci-app-firewall/po/ko/firewall.po186
-rw-r--r--applications/luci-app-firewall/po/ms/firewall.po165
-rw-r--r--applications/luci-app-firewall/po/no/firewall.po204
-rw-r--r--applications/luci-app-firewall/po/pl/firewall.po204
-rw-r--r--applications/luci-app-firewall/po/pt-br/firewall.po204
-rw-r--r--applications/luci-app-firewall/po/pt/firewall.po204
-rw-r--r--applications/luci-app-firewall/po/ro/firewall.po183
-rw-r--r--applications/luci-app-firewall/po/ru/firewall.po204
-rw-r--r--applications/luci-app-firewall/po/sk/firewall.po165
-rw-r--r--applications/luci-app-firewall/po/sv/firewall.po198
-rw-r--r--applications/luci-app-firewall/po/templates/firewall.pot165
-rw-r--r--applications/luci-app-firewall/po/tr/firewall.po165
-rw-r--r--applications/luci-app-firewall/po/uk/firewall.po482
-rw-r--r--applications/luci-app-firewall/po/vi/firewall.po165
-rw-r--r--applications/luci-app-firewall/po/zh-cn/firewall.po204
-rw-r--r--applications/luci-app-firewall/po/zh-tw/firewall.po204
31 files changed, 2138 insertions, 3541 deletions
diff --git a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js
index 62b792da1f..78a6626266 100644
--- a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js
+++ b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js
@@ -84,7 +84,8 @@ return L.view.extend({
o.modalonly = true;
o.cfgvalue = function(section_id) {
var name = uci.get('firewall', section_id, 'name');
-
+ if (name == null)
+ name = _("this new zone");
return _('This section defines common properties of %q. The <em>input</em> and <em>output</em> options set the default policies for traffic entering and leaving this zone while the <em>forward</em> option describes the policy for forwarded traffic between different networks within the zone. <em>Covered networks</em> specifies which available networks are members of this zone.')
.replace(/%s/g, name).replace(/%q/g, '"' + name + '"');
};
@@ -92,11 +93,14 @@ return L.view.extend({
o = s.taboption('general', form.Value, 'name', _('Name'));
o.placeholder = _('Unnamed zone');
o.modalonly = true;
+ o.rmempty = false;
o.datatype = 'and(uciname,maxlength(11))';
o.write = function(section_id, formvalue) {
var cfgvalue = this.cfgvalue(section_id);
- if (cfgvalue != formvalue)
+ if (cfgvalue == null || cfgvalue == '')
+ return uci.set('firewall', section_id, 'name', formvalue);
+ else if (cfgvalue != formvalue)
return firewall.renameZone(cfgvalue, formvalue);
};
@@ -165,13 +169,15 @@ return L.view.extend({
o.modalonly = true;
o.cfgvalue = function(section_id) {
var name = uci.get('firewall', section_id, 'name');
-
+ if (name == null)
+ name = _("this new zone");
return _('The options below control the forwarding policies between this zone (%s) and other zones. <em>Destination zones</em> cover forwarded traffic <strong>originating from %q</strong>. <em>Source zones</em> match forwarded traffic from other zones <strong>targeted at %q</strong>. The forwarding rule is <em>unidirectional</em>, e.g. a forward from lan to wan does <em>not</em> imply a permission to forward from wan to lan as well.')
.format(name);
};
o = s.taboption('advanced', widgets.DeviceSelect, 'device', _('Covered devices'), _('Use this option to classify zone traffic by raw, non-<em>uci</em> managed network devices.'));
o.modalonly = true;
+ o.noaliases = true;
o.multiple = true;
o = s.taboption('advanced', form.DynamicList, 'subnet', _('Covered subnets'), _('Use this option to classify zone traffic by source or destination subnet instead of networks or devices.'));
@@ -254,8 +260,11 @@ return L.view.extend({
o.rawhtml = true;
o.modalonly = true;
o.cfgvalue = function(section_id) {
+ var name = uci.get('firewall', section_id, 'name');
+ if (name == null)
+ name = _("this new zone");
return _('The options below control the forwarding policies between this zone (%s) and other zones. <em>Destination zones</em> cover forwarded traffic <strong>originating from %q</strong>. <em>Source zones</em> match forwarded traffic from other zones <strong>targeted at %q</strong>. The forwarding rule is <em>unidirectional</em>, e.g. a forward from lan to wan does <em>not</em> imply a permission to forward from wan to lan as well.')
- .format(uci.get('firewall', section_id, 'name'));
+ .format(name);
};
out = o = s.taboption('general', widgets.ZoneSelect, 'out', _('Allow forward to <em>destination zones</em>:'));
@@ -268,7 +277,7 @@ return L.view.extend({
o.cfgvalue = function(section_id) {
var out = (this.option == 'out'),
zone = this.lookupZone(uci.get('firewall', section_id, 'name')),
- fwds = zone.getForwardingsBy(out ? 'src' : 'dest'),
+ fwds = zone ? zone.getForwardingsBy(out ? 'src' : 'dest') : [],
value = [];
for (var i = 0; i < fwds.length; i++)
@@ -279,7 +288,7 @@ return L.view.extend({
o.write = o.remove = function(section_id, formvalue) {
var out = (this.option == 'out'),
zone = this.lookupZone(uci.get('firewall', section_id, 'name')),
- fwds = zone.getForwardingsBy(out ? 'src' : 'dest');
+ fwds = zone ? zone.getForwardingsBy(out ? 'src' : 'dest') : [];
if (formvalue == null)
formvalue = [];
diff --git a/applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm b/applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm
deleted file mode 100644
index 38f36b49c8..0000000000
--- a/applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm
+++ /dev/null
@@ -1,90 +0,0 @@
-<%-
- local fw = require "luci.model.firewall".init()
- local izl = { }
- local ezl = { }
- local _, z
- for _, z in ipairs(fw:get_zones()) do
- if z:name() ~= "wan" then
- izl[#izl+1] = z
- end
- if z:name() ~= "lan" then
- ezl[#ezl+1] = z
- end
- end
-
- local keys, vals = { }, { }
- luci.sys.net.ipv4_hints(function(ip, name)
- keys[#keys+1] = ip
- vals[#vals+1] = '%s (%s)' %{ ip, name }
- end)
--%>
-
-<h4><%:New port forward%></h4>
-<div class="table">
- <div class="tr table-titles">
- <div class="th"><%:Name%></div>
- <div class="th"><%:Protocol%></div>
- <div class="th"><%:External zone%></div>
- <div class="th"><%:External port%></div>
- <div class="th"><%:Internal zone%></div>
- <div class="th"><%:Internal IP address%></div>
- <div class="th"><%:Internal port%></div>
- <div class="th"></div>
- </div>
- <div class="tr">
- <div class="td">
- <input type="text" class="cbi-input-text" id="_newfwd.name" name="_newfwd.name" placeholder="<%:New port forward%>" />
- </div>
- <div class="td">
- <select class="cbi-input-select" id="_newfwd.proto" name="_newfwd.proto">
- <option value="tcp udp">TCP+UDP</option>
- <option value="tcp">TCP</option>
- <option value="udp">UDP</option>
- <option value="other"><%:Other...%></option>
- </select>
- </div>
- <div class="td">
- <select class="cbi-input-select" id="_newfwd.extzone" name="_newfwd.extzone">
- <% for _, z in ipairs(ezl) do -%><option value="<%=z:name()%>"><%=z:name()%></option><%- end %>
- </select>
- </div>
- <div class="td">
- <input type="text" class="cbi-input-text" id="_newfwd.extport" name="_newfwd.extport" data-type="portrange" data-optional="true" />
- </div>
- <div class="td">
- <select class="cbi-input-select" id="_newfwd.intzone" name="_newfwd.intzone">
- <% for _, z in ipairs(izl) do -%><option value="<%=z:name()%>"><%=z:name()%></option><%- end %>
- </select>
- </div>
- <div class="td">
- <input type="text" class="cbi-input-text" id="_newfwd.intaddr" name="_newfwd.intaddr" data-type="host" data-optional="true"<%=
- ifattr(#keys > 0, "data-choices", {keys, vals})
- %>/>
- </div>
- <div class="td">
- <input type="text" class="cbi-input-text" id="_newfwd.intport" name="_newfwd.intport" data-type="portrange" data-optional="true" />
- </div>
- <div class="td bottom">
- <input type="submit" class="cbi-button cbi-button-add" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>" value="<%:Add%>" />
- </div>
- </div>
-</div>
-
-<script type="text/javascript">//<![CDATA[
- document.getElementById('_newfwd.extport').addEventListener('blur',
- function() {
- var n = document.getElementById('_newfwd.name');
- var p = document.getElementById('_newfwd.proto');
- var i = document.getElementById('_newfwd.intport');
-
- if (!this.className.match(/invalid/))
- {
- if (!i.value) i.value = this.value;
-
- if (!n.value)
- {
- n.value = 'Forward' + this.value;
- }
- }
- });
-//]]></script>
diff --git a/applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm b/applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm
deleted file mode 100644
index e0092a7a56..0000000000
--- a/applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm
+++ /dev/null
@@ -1,89 +0,0 @@
-<%
- local fw = require "luci.model.firewall".init()
- local zones = fw:get_zones()
-%>
-
-<% if #zones > 0 then %>
- <h4><%:Open ports on router%></h4>
- <div class="table">
- <div class="tr cbi-section-table-titles">
- <div class="th"><%:Name%></div>
- <div class="th"><%:Protocol%></div>
- <div class="th"><%:External port%></div>
- <div class="th"></div>
- </div>
- <div class="tr">
- <div class="td">
- <input type="text" class="cbi-input-text" id="_newopen.name" name="_newopen.name" placeholder="<%:New input rule%>" />
- </div>
- <div class="td">
- <select class="cbi-input-select" id="_newopen.proto" name="_newopen.proto">
- <option value="tcp udp">TCP+UDP</option>
- <option value="tcp">TCP</option>
- <option value="udp">UDP</option>
- <option value="other"><%:Other...%></option>
- </select>
- </div>
- <div class="td">
- <input type="text" class="cbi-input-text" id="_newopen.extport" name="_newopen.extport" />
- </div>
- <div class="td bottom">
- <input type="submit" class="cbi-button cbi-button-add" name="_newopen.submit" value="<%:Add%>" />
- </div>
- </div>
- </div>
-<% end %>
-<% if #zones > 1 then %>
- <h4><%:New forward rule%></h4>
- <div class="table">
- <div class="tr cbi-section-table-titles">
- <div class="th"><%:Name%></div>
- <div class="th"><%:Source zone%></div>
- <div class="th"><%:Destination zone%></div>
- <div class="th"></div>
- </div>
- <div class="tr">
- <div class="td">
- <input type="text" class="cbi-input-text" id="_newfwd.name" name="_newfwd.name" placeholder="<%:New forward rule%>" />
- </div>
- <div class="td">
- <select class="cbi-input-text" id="_newfwd.src" name="_newfwd.src">
- <% local k, v; for k, v in ipairs(fw:get_zones()) do -%>
- <option<%=ifattr(v:name() == "wan", "selected", "selected")%> value="<%=v:name()%>"><%=v:name()%></option>
- <%- end %>
- </select>
- </div>
- <div class="td">
- <select class="cbi-input-text" id="_newfwd.dest" name="_newfwd.dest">
- <% local k, v; for k, v in ipairs(fw:get_zones()) do -%>
- <option<%=ifattr(v:name() == "lan", "selected", "selected")%> value="<%=v:name()%>"><%=v:name()%></option>
- <%- end %>
- </select>
- </div>
- <div class="td bottom">
- <input type="submit" class="cbi-button cbi-button-link" name="_newfwd.submit" value="<%:Add and edit...%>" />
- </div>
- </div>
- </div>
-<% else %>
- <input type="submit" class="cbi-button cbi-button-add" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>" value="<%:Add%>" />
-<% end %>
-
-<% if #zones > 0 then %>
- <script type="text/javascript">//<![CDATA[
- cbi_validate_field('_newopen.extport', true, 'list(neg(portrange))');
- document.getElementById('_newopen.extport').addEventListener('blur',
- function() {
- var n = document.getElementById('_newopen.name');
- var p = document.getElementById('_newopen.proto');
-
- if (!this.className.match(/invalid/))
- {
- if (!n.value && this.value)
- {
- n.value = 'Open' + this.value;
- }
- }
- });
- //]]></script>
-<% end %>
diff --git a/applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm b/applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm
deleted file mode 100644
index 0b4774ccc0..0000000000
--- a/applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm
+++ /dev/null
@@ -1,59 +0,0 @@
-<%
- local fw = require "luci.model.firewall".init()
- local nw = require "luci.model.network".init()
- local zones = fw:get_zones()
-
- local keys, vals, a, k, v = {}, {}
- for k, v in ipairs(nw:get_interfaces()) do
- for k, a in ipairs(v:ipaddrs()) do
- keys[#keys+1] = a:host():string()
- vals[#vals+1] = '%s (%s)' %{ a:host(), v:shortname() }
- end
- end
-%>
-
-<% if #zones > 1 then %>
- <h4><%:New source NAT%></h4>
- <div class="table">
- <div class="tr cbi-section-table-titles">
- <div class="th"><%:Name%></div>
- <div class="th"><%:Source zone%></div>
- <div class="th"><%:Destination zone%></div>
- <div class="th"><%:To source IP%></div>
- <div class="th"><%:To source port%></div>
- <div class="th"></div>
- </div>
- <div class="tr">
- <div class="td">
- <input type="text" class="cbi-input-text" id="_newsnat.name" name="_newsnat.name" placeholder="<%:New SNAT rule%>" />
- </div>
- <div class="td">
- <select class="cbi-input-text" id="_newsnat.src" name="_newsnat.src">
- <% local k, v; for k, v in ipairs(fw:get_zones()) do -%>
- <option<%=ifattr(v:name() == "lan", "selected", "selected")%> value="<%=v:name()%>"><%=v:name()%></option>
- <%- end %>
- </select>
- </div>
- <div class="td">
- <select class="cbi-input-text" id="_newsnat.dest" name="_newsnat.dest">
- <% local k, v; for k, v in ipairs(fw:get_zones()) do -%>
- <option<%=ifattr(v:name() == "wan", "selected", "selected")%> value="<%=v:name()%>"><%=v:name()%></option>
- <%- end %>
- </select>
- </div>
- <div class="td">
- <input type="text" class="cbi-input-text" id="_newsnat.dip" name="_newsnat.dip" placeholder="<%:Do not rewrite%>" data-type="ip4addr" data-optional="true"<%=
- ifattr(#keys > 0, "data-choices", { keys, vals })
- %> />
- </div>
- <div class="td">
- <input type="text" class="cbi-input-text" id="_newsnat.dport" name="_newsnat.dport" placeholder="<%:Do not rewrite%>" data-type="portrange" data-optional="true" />
- </div>
- <div class="td bottom">
- <input type="submit" class="cbi-button cbi-button-link" name="_newsnat.submit" value="<%:Add and edit...%>" />
- </div>
- </div>
- </div>
-<% else %>
- <input type="submit" class="cbi-button cbi-button-add" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>" value="<%:Add%>" />
-<% end %>
diff --git a/applications/luci-app-firewall/po/ca/firewall.po b/applications/luci-app-firewall/po/ca/firewall.po
index b0c26cf6b0..b5b395fb9e 100644
--- a/applications/luci-app-firewall/po/ca/firewall.po
+++ b/applications/luci-app-firewall/po/ca/firewall.po
@@ -62,26 +62,14 @@ msgstr ""
msgid "Action"
msgstr "Acció"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Afegeix"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Afegeix i edita..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -93,15 +81,15 @@ msgstr ""
msgid "Advanced Settings"
msgstr "Ajusts avançats"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "Permet el reenviament des dels <em>zones d'origen</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "Permet el reenviament als <em>zones de destí</em>:"
@@ -114,11 +102,11 @@ msgstr "Qualsevol"
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
@@ -127,19 +115,19 @@ msgstr ""
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:133
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "Xarxes cobertes"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -167,8 +155,6 @@ msgid "Destination port"
msgstr "Port de destí"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: 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"
msgstr "Zona de destí"
@@ -191,17 +177,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "No reescriguis"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -235,7 +216,7 @@ msgstr ""
msgid "Enable SYN-flood protection"
msgstr "Habilita protecció contra la inundació SYN"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "Habilita el registre d'aquesta zona"
@@ -243,7 +224,7 @@ msgstr "Habilita el registre d'aquesta zona"
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
@@ -252,21 +233,15 @@ msgid "External IP address"
msgstr "Adreça IP extern"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: 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"
msgstr "Port extern"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Zona extern"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "Paràmetres extres"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
@@ -274,7 +249,7 @@ msgstr ""
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -298,12 +273,12 @@ msgstr "Tallafocs - Regles de tràfic"
msgid "Firewall - Zone Settings"
msgstr "Tallafocs - Ajusts de zona"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr "Força el rastreig de connexió"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "Reenvia"
@@ -375,12 +350,12 @@ msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 i IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "Només IPv4"
@@ -389,31 +364,28 @@ msgid "IPv6"
msgstr "IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "Només IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "Entrada"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
-#: 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:251
-#: 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:233
-#: 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:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Limita els missatges de registre"
@@ -427,11 +399,11 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr "Fixació MSS"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr "Mascarada"
@@ -463,11 +435,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:92
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Nom"
@@ -475,28 +443,6 @@ msgstr "Nom"
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Nova regla SNAT"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "Nova regla de reenviament"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Nova regla d'entrada"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Nou reenviament de port"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Nou origen NAT"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr "Només coincideix amb trànsit entrant dirigit a la adreça IP donada."
@@ -517,17 +463,8 @@ msgstr ""
"Només coincideix amb trànsit originant en el host client des del port o del "
"rang de ports d'origen donat"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Obre els ports en el encaminador"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Altre..."
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "Sortida"
@@ -536,7 +473,7 @@ msgstr "Sortida"
msgid "Passes additional arguments to iptables. Use with care!"
msgstr "Passa paràmetres addicionals al iptables. Utilitzeu-ho amb cura!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -558,7 +495,7 @@ msgstr ""
"El reenviament de ports permet que els ordinadors remots en el Internet "
"connectin a un ordinador o servei específic dins del LAN privat."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -566,8 +503,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
-#: 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"
@@ -603,16 +538,16 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr "Restringeix la mascarada a les subxarxes de destí donades"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr "Restringeix la mascarada a les subxarxes d'origen donades"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: 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:188
msgid "Restrict to address family"
msgstr "Restringeix a la família d'adreces"
@@ -660,8 +595,6 @@ msgstr "Port d'origen"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
-#: 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"
@@ -693,8 +626,8 @@ msgstr ""
"El tallafocs crea zones a les teves interfícies de xarxa per controlar el "
"flux de tràfic de xarxa."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -710,7 +643,7 @@ msgstr ""
"regla de reenviament es <em>unidirectional</em>, per exemple un reenviament "
"de lan a wan <em>no</em> implica permís per reenviar de wan a lan també."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
#, fuzzy
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
@@ -754,14 +687,6 @@ msgstr "A %s en <var>aquest dispositiu</var>"
msgid "To %s, %s in %s"
msgstr "A %s, %s en %s"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "A l'IP d'origen"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "Al port d'origen"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
@@ -791,17 +716,17 @@ msgstr ""
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -823,7 +748,7 @@ msgstr ""
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "Zona ⇒ Reenviaments"
@@ -833,7 +758,7 @@ msgstr "Zones"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "accepta"
@@ -882,7 +807,7 @@ msgstr "no rastregis"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "descarta"
@@ -915,7 +840,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "rebutja"
@@ -924,6 +849,12 @@ msgstr "rebutja"
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -934,6 +865,45 @@ msgstr ""
msgid "types"
msgstr ""
+#~ msgid "Add"
+#~ msgstr "Afegeix"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Afegeix i edita..."
+
+#~ msgid "Do not rewrite"
+#~ msgstr "No reescriguis"
+
+#~ msgid "External zone"
+#~ msgstr "Zona extern"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Nova regla SNAT"
+
+#~ msgid "New forward rule"
+#~ msgstr "Nova regla de reenviament"
+
+#~ msgid "New input rule"
+#~ msgstr "Nova regla d'entrada"
+
+#~ msgid "New port forward"
+#~ msgstr "Nou reenviament de port"
+
+#~ msgid "New source NAT"
+#~ msgstr "Nou origen NAT"
+
+#~ msgid "Open ports on router"
+#~ msgstr "Obre els ports en el encaminador"
+
+#~ msgid "Other..."
+#~ msgstr "Altre..."
+
+#~ msgid "To source IP"
+#~ msgstr "A l'IP d'origen"
+
+#~ msgid "To source port"
+#~ msgstr "Al port d'origen"
+
#~ msgid "(Unnamed Entry)"
#~ msgstr "(Entrada sense nom)"
diff --git a/applications/luci-app-firewall/po/cs/firewall.po b/applications/luci-app-firewall/po/cs/firewall.po
index ea0f2a8259..b465d137f7 100644
--- a/applications/luci-app-firewall/po/cs/firewall.po
+++ b/applications/luci-app-firewall/po/cs/firewall.po
@@ -58,26 +58,14 @@ msgstr ""
msgid "Action"
msgstr "Akce"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Přidat"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Přidat a upravit"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -89,15 +77,15 @@ msgstr ""
msgid "Advanced Settings"
msgstr "Pokročilé nastavení"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "Povolit přesměrování ze <em>zdrojových oblastí</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "Povolit přesměrování do <em>zdrojových oblastí</em>:"
@@ -110,11 +98,11 @@ msgstr "Libovolné"
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
@@ -123,19 +111,19 @@ msgstr ""
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:133
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "Pokryté sítě"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -162,8 +150,6 @@ msgid "Destination port"
msgstr "Cílový port"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: 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"
msgstr "Cílová oblast"
@@ -186,17 +172,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "Nepřepisovat"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -230,7 +211,7 @@ msgstr "Povolit NAT Loopback"
msgid "Enable SYN-flood protection"
msgstr "Povolit ochranu proti SYN-flood"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "Povolit logování v této oblasti"
@@ -238,7 +219,7 @@ msgstr "Povolit logování v této oblasti"
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
@@ -247,21 +228,15 @@ msgid "External IP address"
msgstr "Vnější IP adresa"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: 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"
msgstr "Vnější port"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Vnější zóna"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "Dodatečné argumenty"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
@@ -269,7 +244,7 @@ msgstr ""
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -293,12 +268,12 @@ msgstr "Firewall - Pravidla síťového provozu"
msgid "Firewall - Zone Settings"
msgstr "Firewall - Nastavení zón"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr "Vynutit sledování připojení"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "Přesměrování"
@@ -370,12 +345,12 @@ msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 a IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "pouze IPv4"
@@ -384,31 +359,28 @@ msgid "IPv6"
msgstr "IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "pouze IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "Vstup"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
-#: 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:251
-#: 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:233
-#: 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:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Omezit logovací zprávy"
@@ -422,11 +394,11 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr "MSS clamping"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr "Maškárádování"
@@ -458,11 +430,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:92
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Název"
@@ -470,28 +438,6 @@ msgstr "Název"
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Nové pravidlo SNAT"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "Nové přesměrovací pravidlo"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Nové vstupní pravidlo"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Nové přesměrování portu"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Nový zdrojový NAT (SNAT)"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr "Vybrat pouze příchozí provoz, směrovaný na danou IP adresu."
@@ -512,17 +458,8 @@ msgstr ""
"Vybrat pouze příchozí provoz, pocházející ze zadaného portu nebo rozsahu "
"portů klienta."
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Otevřené porty na routeru"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Ostatní ..."
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "Výstup"
@@ -531,7 +468,7 @@ msgstr "Výstup"
msgid "Passes additional arguments to iptables. Use with care!"
msgstr "Předává další argumenty iptables. Používat opatrně!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -554,7 +491,7 @@ msgstr ""
"Internetu připojení k vybraným počítačům nebo službám uvnitř privátní sítě "
"LAN."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -562,8 +499,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
-#: 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"
@@ -600,16 +535,16 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr "Omezit maškarádování na uvedené cílové podsítě"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr "Omezit maškarádování na uvedené zdrojové podsítě"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: 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:188
msgid "Restrict to address family"
msgstr "Omezit na rodinu adres"
@@ -657,8 +592,6 @@ msgstr "Zdrojový port"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
-#: 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"
@@ -690,8 +623,8 @@ msgstr ""
"Firewall vytváří zóny přes vaše síťová rozhraní za účelem řízení síťového "
"provozu."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -707,7 +640,7 @@ msgstr ""
"Přesměrovávací pravidlo je <em>jednosměrné</em>, například přesměrování z "
"lan do wan <em>nepovoluje</em> přesměrování z wan do lan (a naopak)."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
#, fuzzy
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
@@ -750,14 +683,6 @@ msgstr "Na %s na <var>tomto zařízení</var>"
msgid "To %s, %s in %s"
msgstr "Na %s, %s v %s"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "Na zdrojovou IP"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "Na zdrojový port"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
@@ -787,17 +712,17 @@ msgstr ""
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -819,7 +744,7 @@ msgstr ""
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "Zóna ⇒ Přesměrování"
@@ -829,7 +754,7 @@ msgstr "Zóny"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "přijmout"
@@ -878,7 +803,7 @@ msgstr "nesledovat"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "zahodit"
@@ -911,7 +836,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "odmítnout"
@@ -920,6 +845,12 @@ msgstr "odmítnout"
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -930,6 +861,45 @@ msgstr ""
msgid "types"
msgstr ""
+#~ msgid "Add"
+#~ msgstr "Přidat"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Přidat a upravit"
+
+#~ msgid "Do not rewrite"
+#~ msgstr "Nepřepisovat"
+
+#~ msgid "External zone"
+#~ msgstr "Vnější zóna"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Nové pravidlo SNAT"
+
+#~ msgid "New forward rule"
+#~ msgstr "Nové přesměrovací pravidlo"
+
+#~ msgid "New input rule"
+#~ msgstr "Nové vstupní pravidlo"
+
+#~ msgid "New port forward"
+#~ msgstr "Nové přesměrování portu"
+
+#~ msgid "New source NAT"
+#~ msgstr "Nový zdrojový NAT (SNAT)"
+
+#~ msgid "Open ports on router"
+#~ msgstr "Otevřené porty na routeru"
+
+#~ msgid "Other..."
+#~ msgstr "Ostatní ..."
+
+#~ msgid "To source IP"
+#~ msgstr "Na zdrojovou IP"
+
+#~ msgid "To source port"
+#~ msgstr "Na zdrojový port"
+
#~ msgid "(Unnamed Entry)"
#~ msgstr "(Nepojmenovaný vstup)"
diff --git a/applications/luci-app-firewall/po/de/firewall.po b/applications/luci-app-firewall/po/de/firewall.po
index 3b287bc227..23ab725a58 100644
--- a/applications/luci-app-firewall/po/de/firewall.po
+++ b/applications/luci-app-firewall/po/de/firewall.po
@@ -60,26 +60,14 @@ msgstr ""
msgid "Action"
msgstr "Aktion"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Hinzufügen"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Hinzufügen und bearbeiten..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -91,15 +79,15 @@ msgstr ""
msgid "Advanced Settings"
msgstr "Erweiterte Einstellungen"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "Erlaube Weiterleitung von <em>Quellzone</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "Erlaube Weiterleitung zu <em>Zielzone</em>:"
@@ -112,11 +100,11 @@ msgstr "beliebig"
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
@@ -125,19 +113,19 @@ msgstr ""
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:133
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "Abgedeckte Netzwerke"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -165,8 +153,6 @@ msgid "Destination port"
msgstr "Zielport"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: 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"
msgstr "Ziel-Zone"
@@ -189,17 +175,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "Nicht umschreiben"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -233,7 +214,7 @@ msgstr "NAT-Loopback aktivieren"
msgid "Enable SYN-flood protection"
msgstr "Schutz vor SYN-flood-Attacken"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "Protokollierung innerhalb der Zone aktivieren"
@@ -241,7 +222,7 @@ msgstr "Protokollierung innerhalb der Zone aktivieren"
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr "Experimentelle Funktion. Nicht vollständig kompatibel mit QoS/SQM."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
@@ -250,21 +231,15 @@ msgid "External IP address"
msgstr "Externe IP-Adresse"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: 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"
msgstr "Externer Port"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Externe Zone"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "Zusätzliche Argumente"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
@@ -272,7 +247,7 @@ msgstr ""
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -296,12 +271,12 @@ msgstr "Firewall - Traffic-Regeln"
msgid "Firewall - Zone Settings"
msgstr "Firewall - Zoneneinstellungen"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr "Connectiontracking erzwingen"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "Weitergeleitet"
@@ -373,12 +348,12 @@ msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 und IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "nur IPv4"
@@ -387,31 +362,28 @@ msgid "IPv6"
msgstr "IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "nur IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "Eingehend"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
-#: 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:251
-#: 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:233
-#: 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:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Protokollnachrichten limitieren"
@@ -425,11 +397,11 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr "MSS Korrektur"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr "NAT aktivieren"
@@ -461,11 +433,7 @@ msgstr "Monatstage"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:92
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Name"
@@ -473,28 +441,6 @@ msgstr "Name"
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Neue SNAT-Regel"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "Neue Weiterleitungsregel"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Neue eingehende Regel"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Neue Portweiterleitung"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Neues SNAT"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr "Selektiere nur Traffic der an die angegebene IP-Adresse gerichtet ist."
@@ -513,17 +459,8 @@ msgid ""
"range on the client host"
msgstr "Selektiere nur Traffic von den angegebenen Quell-Ports auf dem Client."
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Ports auf dem Router öffnen"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Anderes..."
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "Ausgehend"
@@ -534,7 +471,7 @@ msgstr ""
"Gibt zusätzliche Kommandozeilenargumente an iptables weiter. Mit Vorsicht "
"benutzen!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -556,7 +493,7 @@ msgstr ""
"Portweiterleitungen ermöglichen es entfernten Rechnern im Internet auf "
"bestimmte Computer oder Dienste im lokalen LAN zuzugreifen."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -564,8 +501,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
-#: 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"
@@ -604,16 +539,16 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr "NAT auf die angegebenen Ziel-Subnetze beschränken"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr "NAT auf die angegebenen Quell-Subnetze beschränken"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: 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:188
msgid "Restrict to address family"
msgstr "Beschränke auf Adressfamilie"
@@ -661,8 +596,6 @@ msgstr "Quellport"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
-#: 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"
@@ -694,8 +627,8 @@ msgstr ""
"Die Firewall erstellt Netzwerkzonen über bestimmte Netzwerkschnittstellen um "
"den Netzwerk-Traffic zu trennen."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -713,7 +646,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:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
#, fuzzy
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
@@ -757,14 +690,6 @@ msgstr "Zu %s auf <var>diesem Gerät</var>"
msgid "To %s, %s in %s"
msgstr "Zu %s, %s in %s"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "Zu Quell-IP"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "Zu Quell-Port"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
@@ -794,17 +719,17 @@ msgstr "Unbenannte Portweiterleitung"
msgid "Unnamed rule"
msgstr "Unbennante Regel"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -826,7 +751,7 @@ msgstr "Mittwoch"
msgid "Week Days"
msgstr "Wochentage"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "Zone ⇒ Weiterleitungen"
@@ -838,7 +763,7 @@ msgstr "Zonen"
# ausgehenden Traffic annehmen.
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "zulassen"
@@ -887,7 +812,7 @@ msgstr "nicht verfolgen"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "verwerfen"
@@ -920,7 +845,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "zurückweisen"
@@ -929,6 +854,12 @@ msgstr "zurückweisen"
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -939,6 +870,45 @@ msgstr ""
msgid "types"
msgstr ""
+#~ msgid "Add"
+#~ msgstr "Hinzufügen"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Hinzufügen und bearbeiten..."
+
+#~ msgid "Do not rewrite"
+#~ msgstr "Nicht umschreiben"
+
+#~ msgid "External zone"
+#~ msgstr "Externe Zone"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Neue SNAT-Regel"
+
+#~ msgid "New forward rule"
+#~ msgstr "Neue Weiterleitungsregel"
+
+#~ msgid "New input rule"
+#~ msgstr "Neue eingehende Regel"
+
+#~ msgid "New port forward"
+#~ msgstr "Neue Portweiterleitung"
+
+#~ msgid "New source NAT"
+#~ msgstr "Neues SNAT"
+
+#~ msgid "Open ports on router"
+#~ msgstr "Ports auf dem Router öffnen"
+
+#~ msgid "Other..."
+#~ msgstr "Anderes..."
+
+#~ msgid "To source IP"
+#~ msgstr "Zu Quell-IP"
+
+#~ msgid "To source port"
+#~ msgstr "Zu Quell-Port"
+
#~ msgid "(Unnamed Entry)"
#~ msgstr "(Unbenannter Eintrag)"
diff --git a/applications/luci-app-firewall/po/el/firewall.po b/applications/luci-app-firewall/po/el/firewall.po
index 7e22a93958..04cb7c343e 100644
--- a/applications/luci-app-firewall/po/el/firewall.po
+++ b/applications/luci-app-firewall/po/el/firewall.po
@@ -60,26 +60,14 @@ msgstr ""
msgid "Action"
msgstr "Ενέργεια"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Προσθήκη"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Προσθήκη και επεξεργασία..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -91,15 +79,15 @@ msgstr ""
msgid "Advanced Settings"
msgstr "Ρυθμίσεις για προχωρημένους"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr ""
@@ -112,11 +100,11 @@ msgstr "Οποιοδήποτε"
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
@@ -125,19 +113,19 @@ msgstr ""
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:133
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -161,8 +149,6 @@ msgid "Destination port"
msgstr "Θύρα προορισμού"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
#, fuzzy
msgid "Destination zone"
msgstr "Ζώνη προορισμού"
@@ -186,17 +172,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -231,7 +212,7 @@ msgstr ""
msgid "Enable SYN-flood protection"
msgstr "Προστασία SYN-flood"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr ""
@@ -239,7 +220,7 @@ msgstr ""
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
@@ -248,21 +229,15 @@ msgid "External IP address"
msgstr "Εξωτερική διεύθυνση IP"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: 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"
msgstr "Εξωτερική θύρα"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "Επιπλέον παράμετροι"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
@@ -270,7 +245,7 @@ msgstr ""
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -294,12 +269,12 @@ msgstr "Τείχος προστασίας - Κανόνες Κίνησεις"
msgid "Firewall - Zone Settings"
msgstr "Τείχος προστασίας - Ρυθμίσεις Ζώνης"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr "Επιβολή παρακολούθησης σύνδεσης"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "Προώθηση"
@@ -371,12 +346,12 @@ msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 και IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "Μόνο IPv4"
@@ -385,33 +360,30 @@ msgid "IPv6"
msgstr "IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "Μόνο IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "Είσοδος"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
-#: 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:251
-#: 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:233
-#: 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:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Περιορισμός καταγραφών συστήματος"
@@ -425,12 +397,12 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
#, fuzzy
msgid "MSS clamping"
msgstr "Περιορισμός MSS"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr ""
@@ -460,11 +432,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:92
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Όνομα"
@@ -472,28 +440,6 @@ msgstr "Όνομα"
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
@@ -512,17 +458,8 @@ msgid ""
"range on the client host"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Άλλο..."
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "Έξοδος"
@@ -531,7 +468,7 @@ msgstr "Έξοδος"
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -551,7 +488,7 @@ msgid ""
"specific computer or service within the private LAN."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -559,8 +496,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
-#: 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 "Πρωτόκολλο"
@@ -596,16 +531,16 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: 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:188
msgid "Restrict to address family"
msgstr ""
@@ -655,8 +590,6 @@ msgstr "Θύρα πηγής"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
-#: 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 "Θύρα πηγής"
@@ -689,8 +622,8 @@ msgstr ""
"Το τείχος προστασίας δημιουργεί ζώνες πάνω στις διεπαφές δικτύου για να "
"ελέγχει την δικτυακή κίνηση."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -700,7 +633,7 @@ msgid ""
"<em>not</em> imply a permission to forward from wan to lan as well."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -737,14 +670,6 @@ msgstr ""
msgid "To %s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
@@ -771,17 +696,17 @@ msgstr ""
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -803,7 +728,7 @@ msgstr ""
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr ""
@@ -813,7 +738,7 @@ msgstr "Ζώνες"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "αποδοχή"
@@ -862,7 +787,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "αγνόηση"
@@ -895,7 +820,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "απόρριψη"
@@ -904,6 +829,12 @@ msgstr "απόρριψη"
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -914,5 +845,14 @@ msgstr ""
msgid "types"
msgstr ""
+#~ msgid "Add"
+#~ msgstr "Προσθήκη"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Προσθήκη και επεξεργασία..."
+
+#~ msgid "Other..."
+#~ msgstr "Άλλο..."
+
#~ msgid "Destination IP address"
#~ msgstr "Διεύθυνση IP προορισμού"
diff --git a/applications/luci-app-firewall/po/en/firewall.po b/applications/luci-app-firewall/po/en/firewall.po
index c089c8a27d..e38a33d2a6 100644
--- a/applications/luci-app-firewall/po/en/firewall.po
+++ b/applications/luci-app-firewall/po/en/firewall.po
@@ -58,26 +58,14 @@ msgstr ""
msgid "Action"
msgstr "Action"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -89,15 +77,15 @@ msgstr ""
msgid "Advanced Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr ""
@@ -110,11 +98,11 @@ msgstr ""
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
@@ -123,19 +111,19 @@ msgstr ""
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:133
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -159,8 +147,6 @@ msgid "Destination port"
msgstr "Destination port"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: 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"
msgstr "Destination zone"
@@ -183,17 +169,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -227,7 +208,7 @@ msgstr ""
msgid "Enable SYN-flood protection"
msgstr "Enable SYN-flood protection"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr ""
@@ -235,7 +216,7 @@ msgstr ""
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
@@ -244,21 +225,15 @@ msgid "External IP address"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: 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"
msgstr "External port"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
@@ -266,7 +241,7 @@ msgstr ""
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -294,12 +269,12 @@ msgstr ""
msgid "Firewall - Zone Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "Forward"
@@ -371,12 +346,12 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr ""
@@ -385,31 +360,28 @@ msgid "IPv6"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "Input"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
-#: 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:251
-#: 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:233
-#: 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:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr ""
@@ -423,11 +395,11 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr "MSS clamping"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr "Masquerading"
@@ -459,11 +431,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:92
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Name"
@@ -471,28 +439,6 @@ msgstr "Name"
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
@@ -511,17 +457,8 @@ msgid ""
"range on the client host"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "Output"
@@ -530,7 +467,7 @@ msgstr "Output"
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -550,7 +487,7 @@ msgid ""
"specific computer or service within the private LAN."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -558,8 +495,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
-#: 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"
@@ -596,16 +531,16 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: 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:188
msgid "Restrict to address family"
msgstr ""
@@ -683,8 +618,6 @@ msgstr "Source port"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
-#: 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"
@@ -716,8 +649,8 @@ msgstr ""
"The firewall creates zones over your network interfaces to control network "
"traffic flow."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -727,7 +660,7 @@ msgid ""
"<em>not</em> imply a permission to forward from wan to lan as well."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -764,14 +697,6 @@ msgstr ""
msgid "To %s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
@@ -798,17 +723,17 @@ msgstr ""
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -830,7 +755,7 @@ msgstr ""
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr ""
@@ -840,7 +765,7 @@ msgstr "Zones"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "accept"
@@ -889,7 +814,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "drop"
@@ -922,7 +847,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "reject"
@@ -931,6 +856,12 @@ msgstr "reject"
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
diff --git a/applications/luci-app-firewall/po/es/firewall.po b/applications/luci-app-firewall/po/es/firewall.po
index 54bd644674..a2a6b2a379 100644
--- a/applications/luci-app-firewall/po/es/firewall.po
+++ b/applications/luci-app-firewall/po/es/firewall.po
@@ -61,19 +61,7 @@ msgstr "Aceptar salida"
msgid "Action"
msgstr "Acción"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Añadir"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Añadir y editar..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
@@ -83,7 +71,7 @@ msgstr ""
"tráfico de destino de la zona, p.e. <code>-p tcp --dport 443</code> para que "
"solo coincida con el tráfico HTTPS saliente."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -98,15 +86,15 @@ msgstr ""
msgid "Advanced Settings"
msgstr "Configuración avanzada"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr "Permitir tráfico \"inválido\""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "Permitir reenvío desde <em>zonas de origen</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "Permitir reenvío a <em>zonas de destino</em>:"
@@ -119,11 +107,11 @@ msgstr "Cualquiera"
msgid "Any day"
msgstr "Cualquier día"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr "Asignación automática de ayuda"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
@@ -134,19 +122,19 @@ msgstr ""
msgid "Conntrack Settings"
msgstr "Configuraciones de Conntrack"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr "Ayudantes de Conntrack"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr "Dispositivos cubiertos"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:133
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "Redes cubiertas"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr "Subredes cubiertas"
@@ -174,8 +162,6 @@ msgid "Destination port"
msgstr "Puerto de destino"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: 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"
msgstr "Zona de destino"
@@ -198,7 +184,7 @@ msgstr "Descartar entrada"
msgid "Discard output"
msgstr "Descartar salida"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -207,11 +193,6 @@ msgstr ""
"estado conntrack <em>inválido</em>. Esto puede ser necesario para "
"configuraciones complejas de rutas asimétricas."
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "No reescribir"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -245,7 +226,7 @@ msgstr "Habilitar bucle NAT"
msgid "Enable SYN-flood protection"
msgstr "Habilitar protección contra inundaciones SYN"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "Habilitar registro en esta zona"
@@ -253,7 +234,7 @@ msgstr "Habilitar registro en esta zona"
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr "Característica experimental. No es totalmente compatible con QoS/SQM."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
"Elige explícitamente los ayudantes de seguimiento de conexión permitidos "
@@ -264,21 +245,15 @@ msgid "External IP address"
msgstr "Dirección IP externa"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: 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"
msgstr "Puerto externo"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Zona externa"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "Parámetros extra"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr "Argumentos de destino adicionales"
@@ -286,7 +261,7 @@ msgstr "Argumentos de destino adicionales"
msgid "Extra iptables arguments"
msgstr "Argumentos adicionales de iptables"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr "Argumentos fuente adicionales"
@@ -310,12 +285,12 @@ msgstr "Firewall - Reglas de tráfico"
msgid "Firewall - Zone Settings"
msgstr "Firewall - Configuración de la zona"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr "Forzar seguimiento de conexión"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "Reenviar"
@@ -387,12 +362,12 @@ msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 e IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "Sólo IPv4"
@@ -401,31 +376,28 @@ msgid "IPv6"
msgstr "IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "Sólo IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "Entrada"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
-#: 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:251
-#: 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:233
-#: 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:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Limitar registro de mensajes"
@@ -439,11 +411,11 @@ msgstr "MAC"
msgid "MACs"
msgstr "MACs"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr "Fijado de MSS"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr "Enmascaramiento"
@@ -475,11 +447,7 @@ msgstr "Días del mes"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:92
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Nombre"
@@ -487,28 +455,6 @@ msgstr "Nombre"
msgid "Network"
msgstr "Red"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Nueva regla SNAT"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "Nueva regla de reenvío"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Nueva regla de entrada"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Nuevo reenvío de puerto"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Nuevo origen NAT"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr "Coincidir sólo con tráfico de entrada a esta dirección IP."
@@ -529,17 +475,8 @@ msgstr ""
"Solo coincida con el tráfico entrante que se origina desde el puerto de "
"origen o el rango de puertos en el host del cliente"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Abrir puertos en el router"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Otros..."
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "Salida"
@@ -548,7 +485,7 @@ msgstr "Salida"
msgid "Passes additional arguments to iptables. Use with care!"
msgstr "Agrega más parámetros a iptables. ¡Utilice con cuidado!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -576,7 +513,7 @@ msgstr ""
"El reenvío de puertos permite a ordenadores remotos en internet conectar a "
"un ordenador o servicio específico en la LAN privada."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -586,8 +523,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
-#: 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"
@@ -627,16 +562,16 @@ msgstr ""
msgid "Restart Firewall"
msgstr "Reiniciar Firewall"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr "Restringir enmascaramiento a las subredes destino"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr "Restringir enmascaramiento a las subredes origen"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: 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:188
msgid "Restrict to address family"
msgstr "Restringir a la familia de direcciones"
@@ -684,8 +619,6 @@ msgstr "Puerto de origen"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
-#: 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"
@@ -717,8 +650,8 @@ msgstr ""
"El Firewall crea zonas sobre sus interfaces de red para controlar el flujo "
"del tráfico."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -735,7 +668,7 @@ msgstr ""
"la LAN a la WAN <em>no</em> implica permiso para reenviar desde la WAN a la "
"LAN también."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -778,14 +711,6 @@ msgstr "A %s por <var>este dispositivo</var>"
msgid "To %s, %s in %s"
msgstr "A %s, %s en %s"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "A IP origen"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "A puerto origen"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
@@ -815,11 +740,11 @@ msgstr "Reenvío sin nombre"
msgid "Unnamed rule"
msgstr "Regla sin nombre"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr "Zona sin nombre"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
@@ -827,7 +752,7 @@ msgstr ""
"Use esta opción para clasificar el tráfico de zona por raw, dispositivos de "
"red no administrados <em>uci</em>."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -851,7 +776,7 @@ msgstr "Miércoles"
msgid "Week Days"
msgstr "Días de la semana"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "Zona ⇒ Reenvíos"
@@ -861,7 +786,7 @@ msgstr "Zonas"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "Aceptar"
@@ -910,7 +835,7 @@ msgstr "No seguir"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "Descartar"
@@ -943,7 +868,7 @@ msgstr "Puertos"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "Rechazar"
@@ -952,6 +877,12 @@ msgstr "Rechazar"
msgid "second"
msgstr "segundo"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -962,6 +893,45 @@ msgstr "Tipo"
msgid "types"
msgstr "Tipos"
+#~ msgid "Add"
+#~ msgstr "Añadir"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Añadir y editar..."
+
+#~ msgid "Do not rewrite"
+#~ msgstr "No reescribir"
+
+#~ msgid "External zone"
+#~ msgstr "Zona externa"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Nueva regla SNAT"
+
+#~ msgid "New forward rule"
+#~ msgstr "Nueva regla de reenvío"
+
+#~ msgid "New input rule"
+#~ msgstr "Nueva regla de entrada"
+
+#~ msgid "New port forward"
+#~ msgstr "Nuevo reenvío de puerto"
+
+#~ msgid "New source NAT"
+#~ msgstr "Nuevo origen NAT"
+
+#~ msgid "Open ports on router"
+#~ msgstr "Abrir puertos en el router"
+
+#~ msgid "Other..."
+#~ msgstr "Otros..."
+
+#~ msgid "To source IP"
+#~ msgstr "A IP origen"
+
+#~ msgid "To source port"
+#~ msgstr "A puerto origen"
+
#~ msgid "Output zone"
#~ msgstr "Zona de salida"
diff --git a/applications/luci-app-firewall/po/fr/firewall.po b/applications/luci-app-firewall/po/fr/firewall.po
index 64f7f3a383..7da22682bd 100644
--- a/applications/luci-app-firewall/po/fr/firewall.po
+++ b/applications/luci-app-firewall/po/fr/firewall.po
@@ -60,26 +60,14 @@ msgstr ""
msgid "Action"
msgstr "Action"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -91,15 +79,15 @@ msgstr ""
msgid "Advanced Settings"
msgstr "Paramètres avancés"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "Permettre la transmission des <em>zones source</em> :"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "Permettre la transmission vers les <em>zones destination</em> :"
@@ -112,11 +100,11 @@ msgstr "N'importe lequel"
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
@@ -125,19 +113,19 @@ msgstr ""
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:133
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "Réseaux couverts"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -161,8 +149,6 @@ msgid "Destination port"
msgstr "Port de destination"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: 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"
msgstr "Zone de destination"
@@ -185,17 +171,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -229,7 +210,7 @@ msgstr "Activer le NAT sur la boucle-locale"
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:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "Activer les traces (logs) sur cette zone"
@@ -237,7 +218,7 @@ msgstr "Activer les traces (logs) sur cette zone"
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
@@ -246,21 +227,15 @@ msgid "External IP address"
msgstr "Adresse IP externe"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: 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"
msgstr "Port externe"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Zone externe"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
@@ -268,7 +243,7 @@ msgstr ""
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -296,12 +271,12 @@ msgstr "Pare-feu -- Règles de trafic"
msgid "Firewall - Zone Settings"
msgstr "Pare-feu - Configuration des zones"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr "Forcer le suivi des connexions"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "Transfert"
@@ -373,12 +348,12 @@ msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 et IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "IPv4 seulement"
@@ -387,31 +362,28 @@ msgid "IPv6"
msgstr "IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "IPv6 seulement"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "Entrée"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
-#: 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:251
-#: 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:233
-#: 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:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Limiter les messages de journalisation"
@@ -425,11 +397,11 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr "Contrainte du MSS"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr "Masquage"
@@ -461,11 +433,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:92
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Nom"
@@ -473,28 +441,6 @@ msgstr "Nom"
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Nouvelle règle SNAT"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Nouvelle règle d'entrée"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Nouvelle redirection de port"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Nouvelle source NAT"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
@@ -513,17 +459,8 @@ msgid ""
"range on the client host"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Ports ouverts sur le routeur"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Autre..."
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "Sortie"
@@ -532,7 +469,7 @@ msgstr "Sortie"
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -554,7 +491,7 @@ msgstr ""
"La redirection de port permet aux ordinateurs distants sur Internet, de se "
"connecter à un ordinateur ou service spécifié dans le réseau local privé."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -562,8 +499,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
-#: 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"
@@ -601,20 +536,20 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr ""
"Restreindre la substitution d'adresses (Masquerade) à ces sous-réseaux "
"destinataires"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr ""
"Restreindre la substitution d'adresses (Masquerade) à ces sous-réseaux "
"sources"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: 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:188
msgid "Restrict to address family"
msgstr "Restreindre à cette famille d'adresses"
@@ -692,8 +627,6 @@ msgstr "Port source"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
-#: 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"
@@ -725,8 +658,8 @@ msgstr ""
"Le pare-feu crée des zones sur les interfaces réseau pour contrôler le flux "
"du trafic réseau."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -743,7 +676,7 @@ msgstr ""
"transmission du LAN au WAN n'implique <em>pas</em> également l'autorisation "
"de transmission du WAN au LAN."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
#, fuzzy
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
@@ -787,14 +720,6 @@ msgstr ""
msgid "To %s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
@@ -821,17 +746,17 @@ msgstr ""
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -853,7 +778,7 @@ msgstr ""
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "Zone ⇒ Transmissions"
@@ -863,7 +788,7 @@ msgstr "Zones"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "accepter"
@@ -913,7 +838,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "ignorer"
@@ -946,7 +871,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "rejeter"
@@ -955,6 +880,12 @@ msgstr "rejeter"
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -965,6 +896,27 @@ msgstr ""
msgid "types"
msgstr ""
+#~ msgid "External zone"
+#~ msgstr "Zone externe"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Nouvelle règle SNAT"
+
+#~ msgid "New input rule"
+#~ msgstr "Nouvelle règle d'entrée"
+
+#~ msgid "New port forward"
+#~ msgstr "Nouvelle redirection de port"
+
+#~ msgid "New source NAT"
+#~ msgstr "Nouvelle source NAT"
+
+#~ msgid "Open ports on router"
+#~ msgstr "Ports ouverts sur le routeur"
+
+#~ msgid "Other..."
+#~ msgstr "Autre..."
+
#~ msgid "Destination IP address"
#~ msgstr "Adresse IP de destination"
diff --git a/applications/luci-app-firewall/po/he/firewall.po b/applications/luci-app-firewall/po/he/firewall.po
index 169711141b..b5e2e9a8d4 100644
--- a/applications/luci-app-firewall/po/he/firewall.po
+++ b/applications/luci-app-firewall/po/he/firewall.po
@@ -55,26 +55,14 @@ msgstr ""
msgid "Action"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -86,15 +74,15 @@ msgstr ""
msgid "Advanced Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr ""
@@ -107,11 +95,11 @@ msgstr ""
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
@@ -120,19 +108,19 @@ msgstr ""
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:133
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -156,8 +144,6 @@ msgid "Destination port"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: 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"
msgstr ""
@@ -180,17 +166,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -224,7 +205,7 @@ msgstr ""
msgid "Enable SYN-flood protection"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr ""
@@ -232,7 +213,7 @@ msgstr ""
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
@@ -241,21 +222,15 @@ msgid "External IP address"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: 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"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
@@ -263,7 +238,7 @@ msgstr ""
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -287,12 +262,12 @@ msgstr ""
msgid "Firewall - Zone Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr ""
@@ -364,12 +339,12 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr ""
@@ -378,31 +353,28 @@ msgid "IPv6"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
-#: 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:251
-#: 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:233
-#: 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:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr ""
@@ -416,11 +388,11 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr ""
@@ -450,11 +422,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:92
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr ""
@@ -462,28 +430,6 @@ msgstr ""
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
@@ -502,17 +448,8 @@ msgid ""
"range on the client host"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr ""
@@ -521,7 +458,7 @@ msgstr ""
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -541,7 +478,7 @@ msgid ""
"specific computer or service within the private LAN."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -549,8 +486,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
-#: 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 ""
@@ -586,16 +521,16 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: 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:188
msgid "Restrict to address family"
msgstr ""
@@ -643,8 +578,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
-#: 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 ""
@@ -674,8 +607,8 @@ msgid ""
"traffic flow."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -685,7 +618,7 @@ msgid ""
"<em>not</em> imply a permission to forward from wan to lan as well."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -722,14 +655,6 @@ msgstr ""
msgid "To %s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
@@ -756,17 +681,17 @@ msgstr ""
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -788,7 +713,7 @@ msgstr ""
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr ""
@@ -798,7 +723,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr ""
@@ -847,7 +772,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr ""
@@ -880,7 +805,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr ""
@@ -889,6 +814,12 @@ msgstr ""
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
diff --git a/applications/luci-app-firewall/po/hu/firewall.po b/applications/luci-app-firewall/po/hu/firewall.po
index 202217a854..000c19f3d0 100644
--- a/applications/luci-app-firewall/po/hu/firewall.po
+++ b/applications/luci-app-firewall/po/hu/firewall.po
@@ -58,26 +58,14 @@ msgstr ""
msgid "Action"
msgstr "Művelet"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Hozzáadás"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Hozzáadás és szerkesztés..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -89,15 +77,15 @@ msgstr ""
msgid "Advanced Settings"
msgstr "Haladó beállítások"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "Továbbítás engedélyezése ezekből a <em>forrás zónákból</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "Továbbítás engedélyezése ezekbe a <em>cél zónákba</em>:"
@@ -110,11 +98,11 @@ msgstr "Bármelyik"
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
@@ -123,19 +111,19 @@ msgstr ""
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:133
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "Lefedett hálózatok"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -163,8 +151,6 @@ msgid "Destination port"
msgstr "Cél port"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: 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"
msgstr "Cél zóna"
@@ -187,17 +173,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "Ne írja felül"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -231,7 +212,7 @@ msgstr "NAT visszacsatolás engedélyezése"
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:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "Naplózás engeélyezése ezen a zónán"
@@ -239,7 +220,7 @@ msgstr "Naplózás engeélyezése ezen a zónán"
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
@@ -248,21 +229,15 @@ msgid "External IP address"
msgstr "Külső IP cím"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: 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"
msgstr "Külső port"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Külső zóna"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "További argumentumok"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
@@ -270,7 +245,7 @@ msgstr ""
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -294,12 +269,12 @@ msgstr "Tűzfal - Forgalmi szabályok"
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:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr "Kapcsolat követés kényszerítése"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "Továbbítás"
@@ -371,12 +346,12 @@ msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 és IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "csak IPv4"
@@ -385,31 +360,28 @@ msgid "IPv6"
msgstr "IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "csak IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "Bemenet"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
-#: 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:251
-#: 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:233
-#: 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:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Napló üzenetek korlátozása"
@@ -423,11 +395,11 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr "MSS clamping engegélyezése"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr "Álcázás"
@@ -459,11 +431,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:92
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Név"
@@ -471,28 +439,6 @@ msgstr "Név"
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Új SNAT szabály"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "Új továbbítási szabály"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Új bemeneti szabály"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Új port továbbítás"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Új forrás NAT"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr "Csak a megadott IP címre irányított bejövő forgalmat egyeztesse."
@@ -515,17 +461,8 @@ msgstr ""
"Csak az ügyfél gép megadott forrás portjáról illetve forrás port "
"tartományába tartozó portról indított bejövő forgalmat egyeztesse."
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Port megnyitása a routeren"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Egyéb..."
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "Kimenet"
@@ -535,7 +472,7 @@ msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
"További argumentumok küldése az iptables részére. Használja körültekintően!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -558,7 +495,7 @@ msgstr ""
"privát helyi hálózat bizonyos számítógépéhez vagy szolgáltatásához történő "
"csatlakozását."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -566,8 +503,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
-#: 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"
@@ -603,16 +538,16 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr "Álcázás korlátozása a megadott cél alhálózatokra"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr "Álcázás korlátozása a megadott forrás alhálózatokra"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: 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:188
msgid "Restrict to address family"
msgstr "Korlátozás cím családra"
@@ -660,8 +595,6 @@ msgstr "Forrás port"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
-#: 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"
@@ -693,8 +626,8 @@ msgstr ""
"A tűzfal zónákat határoz meg a hálózati interfészek fölött a hálózati "
"forgalom áramlásának szabályozására."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -711,7 +644,7 @@ msgstr ""
"LAN-ból WAN-ba <em>nem</em> jelenti azt, hogy a továbbítás WAN-ból LAN-ba is "
"engedélyezett."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
#, fuzzy
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
@@ -755,14 +688,6 @@ msgstr "%s-re a <var>eszközön</var>"
msgid "To %s, %s in %s"
msgstr "%s-re, %s %s-ben"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "Forrás IP-re"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "Forrás portra"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
@@ -792,17 +717,17 @@ msgstr ""
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -824,7 +749,7 @@ msgstr ""
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "Zóna ⇒ Továbbítások"
@@ -834,7 +759,7 @@ msgstr "Zónák"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "elfogadás"
@@ -883,7 +808,7 @@ msgstr "ne kövesse"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "eldobás"
@@ -916,7 +841,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "visszautasítás"
@@ -925,6 +850,12 @@ msgstr "visszautasítás"
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -935,6 +866,45 @@ msgstr ""
msgid "types"
msgstr ""
+#~ msgid "Add"
+#~ msgstr "Hozzáadás"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Hozzáadás és szerkesztés..."
+
+#~ msgid "Do not rewrite"
+#~ msgstr "Ne írja felül"
+
+#~ msgid "External zone"
+#~ msgstr "Külső zóna"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Új SNAT szabály"
+
+#~ msgid "New forward rule"
+#~ msgstr "Új továbbítási szabály"
+
+#~ msgid "New input rule"
+#~ msgstr "Új bemeneti szabály"
+
+#~ msgid "New port forward"
+#~ msgstr "Új port továbbítás"
+
+#~ msgid "New source NAT"
+#~ msgstr "Új forrás NAT"
+
+#~ msgid "Open ports on router"
+#~ msgstr "Port megnyitása a routeren"
+
+#~ msgid "Other..."
+#~ msgstr "Egyéb..."
+
+#~ msgid "To source IP"
+#~ msgstr "Forrás IP-re"
+
+#~ msgid "To source port"
+#~ msgstr "Forrás portra"
+
#~ msgid "(Unnamed Entry)"
#~ msgstr "(Névtelen bejegyzés)"
diff --git a/applications/luci-app-firewall/po/it/firewall.po b/applications/luci-app-firewall/po/it/firewall.po
index 107a4d3a1c..aa522e2f24 100644
--- a/applications/luci-app-firewall/po/it/firewall.po
+++ b/applications/luci-app-firewall/po/it/firewall.po
@@ -60,26 +60,14 @@ msgstr ""
msgid "Action"
msgstr "Azione"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Aggiungi"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Aggiungi e modifica..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -91,15 +79,15 @@ msgstr ""
msgid "Advanced Settings"
msgstr "Opzioni Avanzate"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "Permetti routing da <em>zone di origine</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "Permetti rounting a <em>zone di destinazione</em>:"
@@ -112,11 +100,11 @@ msgstr "Qualsiasi"
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
@@ -125,19 +113,19 @@ msgstr ""
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:133
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "Reti coperte"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -165,8 +153,6 @@ msgid "Destination port"
msgstr "Porta di destinazione"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: 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"
msgstr "Zona di destinazione"
@@ -189,17 +175,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "Non riscrivere"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -233,7 +214,7 @@ msgstr "Attiva NAT Loopback"
msgid "Enable SYN-flood protection"
msgstr "Attiva protezione SYN-flood"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "Attiva registro su questa zona"
@@ -241,7 +222,7 @@ msgstr "Attiva registro su questa zona"
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
@@ -250,21 +231,15 @@ msgid "External IP address"
msgstr "Indirizzo IP Esterno"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: 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"
msgstr "Porta Esterna"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Zona Esterna"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "Comandi extra"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
@@ -272,7 +247,7 @@ msgstr ""
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -296,12 +271,12 @@ msgstr "Firewall - Regole Traffico"
msgid "Firewall - Zone Settings"
msgstr "Firewall - Opzioni delle Zone"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr "Forza tracciamento connessione"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "Inoltra"
@@ -373,12 +348,12 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 e IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "Solo IPv4"
@@ -387,31 +362,28 @@ msgid "IPv6"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "Solo IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "Ingresso"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
-#: 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:251
-#: 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:233
-#: 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:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Limita messaggi del registro"
@@ -425,11 +397,11 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr ""
@@ -461,11 +433,7 @@ msgstr "Giorni del Mese"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:92
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Nome"
@@ -473,28 +441,6 @@ msgstr "Nome"
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Nuova regola SNAT"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "Nuova regola di inoltro"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Nuova regola di ingresso"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Nuova porta di inoltro"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Nuova sorgente NAT"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr "Corrispondi solo traffico in entrata diretto al dato indirizzo IP."
@@ -515,17 +461,8 @@ msgstr ""
"Corrispondi solo traffico in entrata originato dalla porta o intervallo di "
"porte sorgenti su host cliente"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Porte aperte sul router"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Altri..."
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr ""
@@ -534,7 +471,7 @@ msgstr ""
msgid "Passes additional arguments to iptables. Use with care!"
msgstr "Passa comandi addizionali a iptables. Usare con cura!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -556,7 +493,7 @@ msgstr ""
"L'inoltro delle porte permette ai computer in remoto su Internet di "
"connettersi a uno specifico computer o servizio presente nella LAN privata"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -564,8 +501,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
-#: 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"
@@ -601,16 +536,16 @@ msgstr ""
msgid "Restart Firewall"
msgstr "Riavvia Firewall"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr "Limita il Masquerading alle subnet di destinazione date"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr "Limita il Masquerading alle subnet sorgente date"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: 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:188
msgid "Restrict to address family"
msgstr "Limita agli indirizzi famiglia"
@@ -679,8 +614,6 @@ msgstr "Porta di origine"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
-#: 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"
@@ -712,8 +645,8 @@ msgstr ""
"Il firewall crea delle zone nelle tue interfacce di rete per controllare il "
"flusso del traffico."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -730,7 +663,7 @@ msgstr ""
"alla wan <em>non</em> implica anche un permesso da inoltrare dalla wan alla "
"lan."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -773,14 +706,6 @@ msgstr "Verso %s su <var>questo dispositivo</var>"
msgid "To %s, %s in %s"
msgstr "Verso %s, %s in %s"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "Verso IP sorgente"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "Verso la porta sorgente"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
@@ -810,17 +735,17 @@ msgstr ""
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -842,7 +767,7 @@ msgstr "Mercoledì"
msgid "Week Days"
msgstr "Giorni della Settimana"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "Zona ⇒ Inoltri"
@@ -852,7 +777,7 @@ msgstr "Zone"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "accetta"
@@ -901,7 +826,7 @@ msgstr "non tracciare"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "scarta"
@@ -934,7 +859,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "rifiuta"
@@ -943,6 +868,12 @@ msgstr "rifiuta"
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -953,6 +884,45 @@ msgstr ""
msgid "types"
msgstr ""
+#~ msgid "Add"
+#~ msgstr "Aggiungi"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Aggiungi e modifica..."
+
+#~ msgid "Do not rewrite"
+#~ msgstr "Non riscrivere"
+
+#~ msgid "External zone"
+#~ msgstr "Zona Esterna"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Nuova regola SNAT"
+
+#~ msgid "New forward rule"
+#~ msgstr "Nuova regola di inoltro"
+
+#~ msgid "New input rule"
+#~ msgstr "Nuova regola di ingresso"
+
+#~ msgid "New port forward"
+#~ msgstr "Nuova porta di inoltro"
+
+#~ msgid "New source NAT"
+#~ msgstr "Nuova sorgente NAT"
+
+#~ msgid "Open ports on router"
+#~ msgstr "Porte aperte sul router"
+
+#~ msgid "Other..."
+#~ msgstr "Altri..."
+
+#~ msgid "To source IP"
+#~ msgstr "Verso IP sorgente"
+
+#~ msgid "To source port"
+#~ msgstr "Verso la porta sorgente"
+
#~ msgid "Destination IP address"
#~ msgstr "Indirizzo IP destinazione"
diff --git a/applications/luci-app-firewall/po/ja/firewall.po b/applications/luci-app-firewall/po/ja/firewall.po
index 8a1b4f2506..85702e60de 100644
--- a/applications/luci-app-firewall/po/ja/firewall.po
+++ b/applications/luci-app-firewall/po/ja/firewall.po
@@ -61,19 +61,7 @@ msgstr "出力を許可"
msgid "Action"
msgstr "動作"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "追加"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "追加及び編集..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
@@ -83,7 +71,7 @@ msgstr ""
"em> 引数です。(例: HTTPS 送信トラフィックのみにマッチさせる <code>-p tcp --"
"dport 443</code>)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -98,15 +86,15 @@ msgstr ""
msgid "Advanced Settings"
msgstr "詳細設定"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr "\"invalid\" トラフィックの許可"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "<em>送信元ゾーン</em>からの転送を許可する:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "<em>宛先ゾーン</em>への転送を許可する:"
@@ -119,11 +107,11 @@ msgstr "全て"
msgid "Any day"
msgstr "全日"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr "自動ヘルパー割り当て"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
@@ -134,19 +122,19 @@ msgstr ""
msgid "Conntrack Settings"
msgstr "Conntrack 設定"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr "Conntrack ヘルパー"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr "カバーされるデバイス"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:133
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "対象ネットワーク"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr "カバーされるサブネット"
@@ -174,8 +162,6 @@ msgid "Destination port"
msgstr "宛先ポート"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: 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"
msgstr "宛先ゾーン"
@@ -198,7 +184,7 @@ msgstr "入力を破棄"
msgid "Discard output"
msgstr "出力を破棄"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -207,11 +193,6 @@ msgstr ""
"追加ルールをインストールしません。これは、複雑で非対称なルートのセットアップ"
"に必要となることがあります。"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "リライトしない"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -245,7 +226,7 @@ msgstr "NATループバックを有効にする"
msgid "Enable SYN-flood protection"
msgstr "SYN-Floodプロテクションを有効にする"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "このゾーンのログ記録を有効にする"
@@ -253,7 +234,7 @@ msgstr "このゾーンのログ記録を有効にする"
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr "実験的な機能です。 QoS/SQM との完全な互換性はありません。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr "ゾーン トラフィックのコネクション追跡ヘルパーを明示的に選択します。"
@@ -262,21 +243,15 @@ msgid "External IP address"
msgstr "外部IPアドレス"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: 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"
msgstr "外部ポート"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "外部ゾーン"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "追加の引数"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr "追加の送信先引数"
@@ -284,7 +259,7 @@ msgstr "追加の送信先引数"
msgid "Extra iptables arguments"
msgstr "追加の iptables 引数"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr "追加の送信元引数"
@@ -308,12 +283,12 @@ msgstr "ファイアウォール - トラフィック・ルール"
msgid "Firewall - Zone Settings"
msgstr "ファイアウォール - ゾーン設定"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr "強制的にコネクション追跡を行う"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "転送"
@@ -385,12 +360,12 @@ msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4及びIPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "IPv4のみ"
@@ -399,31 +374,28 @@ msgid "IPv6"
msgstr "IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "IPv6のみ"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "受信"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
-#: 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:251
-#: 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:233
-#: 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:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "ログメッセージを制限"
@@ -437,11 +409,11 @@ msgstr "MAC"
msgid "MACs"
msgstr "MAC"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr "MSSクランプ"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr "マスカレード"
@@ -473,11 +445,7 @@ msgstr "月間"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:92
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "名前"
@@ -485,28 +453,6 @@ msgstr "名前"
msgid "Network"
msgstr "ネットワーク"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "SNATルールの新規作成"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "転送ルールの新規作成"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "受信ルールの新規作成"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "転送設定の新規作成"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "SNATルールの新規作成"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr "設定された宛先IPアドレスと一致した受信トラフィックが対象になります。"
@@ -529,17 +475,8 @@ msgstr ""
"設定されたクライアントホストの送信元ポート(またはポート範囲)からの受信トラ"
"フィックと一致したトラフィックのみを対象にします。"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "ポートの開放"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "その他のプロトコル"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "送信"
@@ -550,7 +487,7 @@ msgstr ""
"iptablesにパススルーする追加の引数を設定してください。ただし、注意して設定し"
"てください!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -578,7 +515,7 @@ msgstr ""
"ベートなネットワーク上の、特定のコンピュータやサービスへのアクセスを可能にし"
"ます。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -588,8 +525,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
-#: 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 "プロトコル"
@@ -627,16 +562,16 @@ msgstr ""
msgid "Restart Firewall"
msgstr "ファイアウォールの再起動"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr "設定された宛先サブネットへのマスカレードを制限する"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr "設定された送信元サブネットへのマスカレードを制限する"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: 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:188
msgid "Restrict to address family"
msgstr "アドレスファミリの制限"
@@ -684,8 +619,6 @@ msgstr "送信元ポート"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
-#: 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 "送信元ゾーン"
@@ -717,8 +650,8 @@ msgstr ""
"ファイアウォール機能は、各ネットワークインターフェース上にゾーンを作成してト"
"ラフィックの制御を行います。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -734,7 +667,7 @@ msgstr ""
"向</em>であり、例えばlanからwanへの転送設定は、wanからlanへの転送を<em>許可し"
"ません。</em>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -776,14 +709,6 @@ msgstr "宛先 %s (<var>デバイス</var>)"
msgid "To %s, %s in %s"
msgstr "宛先 %s, %s (%s)"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "変換後送信元IP"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "変換後送信元ポート"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
@@ -813,11 +738,11 @@ msgstr "名称未設定の転送"
msgid "Unnamed rule"
msgstr "名称未設定のルール"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr "名称未設定のゾーン"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
@@ -825,7 +750,7 @@ msgstr ""
"生の、または非 <em>uci</em> 管理下にあるデバイスによるゾーン トラフィックの区"
"分にこのオプションを使用します。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -849,7 +774,7 @@ msgstr "水曜日"
msgid "Week Days"
msgstr "曜日"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "ゾーン ⇒ 転送"
@@ -859,7 +784,7 @@ msgstr "ゾーン"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "許可"
@@ -908,7 +833,7 @@ msgstr "コネクション追跡を行わない"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "破棄"
@@ -941,7 +866,7 @@ msgstr "ポート"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "拒否"
@@ -950,6 +875,12 @@ msgstr "拒否"
msgid "second"
msgstr "秒"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -959,3 +890,42 @@ msgstr "タイプ"
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
msgid "types"
msgstr "タイプ"
+
+#~ msgid "Add"
+#~ msgstr "追加"
+
+#~ msgid "Add and edit..."
+#~ msgstr "追加及び編集..."
+
+#~ msgid "Do not rewrite"
+#~ msgstr "リライトしない"
+
+#~ msgid "External zone"
+#~ msgstr "外部ゾーン"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "SNATルールの新規作成"
+
+#~ msgid "New forward rule"
+#~ msgstr "転送ルールの新規作成"
+
+#~ msgid "New input rule"
+#~ msgstr "受信ルールの新規作成"
+
+#~ msgid "New port forward"
+#~ msgstr "転送設定の新規作成"
+
+#~ msgid "New source NAT"
+#~ msgstr "SNATルールの新規作成"
+
+#~ msgid "Open ports on router"
+#~ msgstr "ポートの開放"
+
+#~ msgid "Other..."
+#~ msgstr "その他のプロトコル"
+
+#~ msgid "To source IP"
+#~ msgstr "変換後送信元IP"
+
+#~ msgid "To source port"
+#~ msgstr "変換後送信元ポート"
diff --git a/applications/luci-app-firewall/po/ko/firewall.po b/applications/luci-app-firewall/po/ko/firewall.po
index a7dd7801a4..c916d1122f 100644
--- a/applications/luci-app-firewall/po/ko/firewall.po
+++ b/applications/luci-app-firewall/po/ko/firewall.po
@@ -60,26 +60,14 @@ msgstr ""
msgid "Action"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "추가 후 수정..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -91,15 +79,15 @@ msgstr ""
msgid "Advanced Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "<em>Source zone</em> 로부터의 forward 허용:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "<em>Destination zone</em> 으로 forward 허용:"
@@ -112,11 +100,11 @@ msgstr ""
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
@@ -125,19 +113,19 @@ msgstr ""
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:133
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -164,8 +152,6 @@ msgid "Destination port"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: 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"
msgstr ""
@@ -188,17 +174,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -232,7 +213,7 @@ msgstr "NAT Loopback 활성화"
msgid "Enable SYN-flood protection"
msgstr "SYN-flood protection 활성화"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "zone 의 logging 활성화"
@@ -240,7 +221,7 @@ msgstr "zone 의 logging 활성화"
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
@@ -249,21 +230,15 @@ msgid "External IP address"
msgstr "외부 IP 주소"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: 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"
msgstr "외부 port"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "외부 zone"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "추가 argument"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
@@ -271,7 +246,7 @@ msgstr ""
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -295,12 +270,12 @@ msgstr "방화벽 - Traffic Rules"
msgid "Firewall - Zone Settings"
msgstr "방화벽 - Zone 설정"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr ""
@@ -372,12 +347,12 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr ""
@@ -386,31 +361,28 @@ msgid "IPv6"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
-#: 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:251
-#: 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:233
-#: 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:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr ""
@@ -424,11 +396,11 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr ""
@@ -458,11 +430,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:92
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "이름"
@@ -470,28 +438,6 @@ msgstr "이름"
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "새로운 SNAT rule"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "새로운 forward rule"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "새로운 input rule"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "새로운 port forward"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "새로운 source NAT"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
@@ -510,17 +456,8 @@ msgid ""
"range on the client host"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr ""
@@ -529,7 +466,7 @@ msgstr ""
msgid "Passes additional arguments to iptables. Use with care!"
msgstr "iptables 명령에 추가 인자들을 더합니다. 조심해 사용하세요!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -551,7 +488,7 @@ msgstr ""
"Port forwarding 기능은 인터넷 상의 원격 컴퓨터가 내부 LAN 에 속한 특정 컴퓨터"
"나 서비스에 접속할 수 있도록 합니다."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -559,8 +496,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
-#: 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 ""
@@ -596,16 +531,16 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr "주어진 destination subnet 으로 Masquerading 제한"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr "주어진 source subnet 으로 Masquerading 제한"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: 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:188
msgid "Restrict to address family"
msgstr "Address family 제한"
@@ -653,8 +588,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
-#: 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 ""
@@ -686,8 +619,8 @@ msgstr ""
"방화벽 기능을 이용하여 네트워크 인터페이스와 연결된 zone 을 생성할 수 있고 이"
"를 이용하여 네트워크 traffic flow 를 제어할 수 있습니다."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -703,7 +636,7 @@ msgstr ""
"<em>unidirectional</em> 인데, 예를 들어 LAN 에서 WAN 으로의 forward 규칙이 "
"WAN 에서 LAN 으로의 forward 를 허락하는 것이 아닙니다."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
#, fuzzy
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
@@ -746,14 +679,6 @@ msgstr ""
msgid "To %s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
@@ -783,17 +708,17 @@ msgstr ""
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -815,7 +740,7 @@ msgstr "수요일"
msgid "Week Days"
msgstr "주일"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr ""
@@ -825,7 +750,7 @@ msgstr "Zone 내역"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr ""
@@ -874,7 +799,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr ""
@@ -907,7 +832,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr ""
@@ -916,6 +841,12 @@ msgstr ""
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -926,6 +857,27 @@ msgstr ""
msgid "types"
msgstr ""
+#~ msgid "Add and edit..."
+#~ msgstr "추가 후 수정..."
+
+#~ msgid "External zone"
+#~ msgstr "외부 zone"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "새로운 SNAT rule"
+
+#~ msgid "New forward rule"
+#~ msgstr "새로운 forward rule"
+
+#~ msgid "New input rule"
+#~ msgstr "새로운 input rule"
+
+#~ msgid "New port forward"
+#~ msgstr "새로운 port forward"
+
+#~ msgid "New source NAT"
+#~ msgstr "새로운 source NAT"
+
#~ msgid "Destination IP address"
#~ msgstr "Destination IP 주소"
diff --git a/applications/luci-app-firewall/po/ms/firewall.po b/applications/luci-app-firewall/po/ms/firewall.po
index 7a93f6b661..56a0f053ef 100644
--- a/applications/luci-app-firewall/po/ms/firewall.po
+++ b/applications/luci-app-firewall/po/ms/firewall.po
@@ -54,26 +54,14 @@ msgstr ""
msgid "Action"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -85,15 +73,15 @@ msgstr ""
msgid "Advanced Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr ""
@@ -106,11 +94,11 @@ msgstr ""
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
@@ -119,19 +107,19 @@ msgstr ""
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:133
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -155,8 +143,6 @@ msgid "Destination port"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: 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"
msgstr ""
@@ -179,17 +165,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -223,7 +204,7 @@ msgstr ""
msgid "Enable SYN-flood protection"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr ""
@@ -231,7 +212,7 @@ msgstr ""
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
@@ -240,21 +221,15 @@ msgid "External IP address"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: 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"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
@@ -262,7 +237,7 @@ msgstr ""
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -286,12 +261,12 @@ msgstr ""
msgid "Firewall - Zone Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr ""
@@ -363,12 +338,12 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr ""
@@ -377,31 +352,28 @@ msgid "IPv6"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
-#: 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:251
-#: 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:233
-#: 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:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr ""
@@ -415,11 +387,11 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr ""
@@ -449,11 +421,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:92
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr ""
@@ -461,28 +429,6 @@ msgstr ""
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
@@ -501,17 +447,8 @@ msgid ""
"range on the client host"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr ""
@@ -520,7 +457,7 @@ msgstr ""
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -540,7 +477,7 @@ msgid ""
"specific computer or service within the private LAN."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -548,8 +485,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
-#: 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 ""
@@ -585,16 +520,16 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: 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:188
msgid "Restrict to address family"
msgstr ""
@@ -642,8 +577,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
-#: 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 ""
@@ -673,8 +606,8 @@ msgid ""
"traffic flow."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -684,7 +617,7 @@ msgid ""
"<em>not</em> imply a permission to forward from wan to lan as well."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -721,14 +654,6 @@ msgstr ""
msgid "To %s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
@@ -755,17 +680,17 @@ msgstr ""
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -787,7 +712,7 @@ msgstr ""
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr ""
@@ -797,7 +722,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr ""
@@ -846,7 +771,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr ""
@@ -879,7 +804,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr ""
@@ -888,6 +813,12 @@ msgstr ""
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
diff --git a/applications/luci-app-firewall/po/no/firewall.po b/applications/luci-app-firewall/po/no/firewall.po
index b9c3b1a809..625a6a363b 100644
--- a/applications/luci-app-firewall/po/no/firewall.po
+++ b/applications/luci-app-firewall/po/no/firewall.po
@@ -55,26 +55,14 @@ msgstr ""
msgid "Action"
msgstr "Handling"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Legg til"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Legg til og redigere..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -86,15 +74,15 @@ msgstr ""
msgid "Advanced Settings"
msgstr "Avanserte Innstillinger"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "Tillat videresending fra <em>kilde soner</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "Tillat videresending til <em>destinasjon soner</em>:"
@@ -107,11 +95,11 @@ msgstr "Enhver"
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
@@ -120,19 +108,19 @@ msgstr ""
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:133
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "Gjeldene nettverk"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -159,8 +147,6 @@ msgid "Destination port"
msgstr "Destinasjon port"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: 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"
msgstr "Destinasjon sone"
@@ -183,17 +169,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "Ikke omskriv"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -227,7 +208,7 @@ msgstr "Aktiver NAT <abbr title=\"Loopback\">Tilbakekobling</abbr>"
msgid "Enable SYN-flood protection"
msgstr "Aktiver SYN-flood beskyttelse"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "Aktiver logging av denne sonen"
@@ -235,7 +216,7 @@ msgstr "Aktiver logging av denne sonen"
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
@@ -244,21 +225,15 @@ msgid "External IP address"
msgstr "Ekstern IP adressse"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: 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"
msgstr "Ekstern port"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Ekstern sone"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "Ekstra argumenter"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
@@ -266,7 +241,7 @@ msgstr ""
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -290,13 +265,13 @@ msgstr "Brannmur - Trafikk Regler"
msgid "Firewall - Zone Settings"
msgstr "Brannmur - Sone Innstillinger"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr ""
"Bruk <abbr title=\\\"connection tracking\\\">forbindelse sporing</abbr>"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "Videresend"
@@ -368,12 +343,12 @@ msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 og IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "Kun IPv4"
@@ -382,31 +357,28 @@ msgid "IPv6"
msgstr "IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "Kun IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "Inndata"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
-#: 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:251
-#: 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:233
-#: 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:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Begrens logging"
@@ -420,11 +392,11 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr "MSS Kontroll (Clamping)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr "Masquerading"
@@ -456,11 +428,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:92
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Navn"
@@ -468,28 +436,6 @@ msgstr "Navn"
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Ny SNAT regel"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "Ny videresending regel"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Ny inndata regel"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Ny port videresending"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Ny kilde NAT"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr "Match kun innkommende trafikk rettet mot den oppgitt IP adresse."
@@ -510,17 +456,8 @@ msgstr ""
"Match kun innkommende trafikk som kommer fra den oppgitte kildeport eller "
"fra portområdet til klienten"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Åpne porter på ruteren"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Andre..."
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "Utdata"
@@ -529,7 +466,7 @@ msgstr "Utdata"
msgid "Passes additional arguments to iptables. Use with care!"
msgstr "Sender flere argumenter til iptables. Bruk med forsiktighet!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -551,7 +488,7 @@ msgstr ""
"Port videresending tillater at eksterne datamaskiner på Internett kan koble "
"seg til en bestemt maskin eller tjeneste innenfor det private LAN."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -559,8 +496,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
-#: 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"
@@ -598,16 +533,16 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr "Begrens Masquerading til oppgitt destinasjons subnett"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr "Begrens Masqeuerading til oppgitt kilde subnett"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: 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:188
msgid "Restrict to address family"
msgstr "Begrens til adresse familie"
@@ -655,8 +590,6 @@ msgstr "Kilde port"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
-#: 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"
@@ -688,8 +621,8 @@ msgstr ""
"Brannmuren skaper soner over nettverkets grensesnitt for å styre "
"nettverkstrafikken."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -705,7 +638,7 @@ msgstr ""
"ved videresending er <em>enveis</em>, d.v.s at videresending fra LAN til WAN "
"<em>ikke</em> automatisk også tillater videresending fra WAN til LAN."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
#, fuzzy
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
@@ -749,14 +682,6 @@ msgstr "Til %s på <var>denne enheten</var>"
msgid "To %s, %s in %s"
msgstr "Til %s, %s i %s"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "Til kilde IP"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "Til kilde port"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
@@ -786,17 +711,17 @@ msgstr ""
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -818,7 +743,7 @@ msgstr ""
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "Sone = Videresendinger"
@@ -828,7 +753,7 @@ msgstr "Soner"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "godta"
@@ -877,7 +802,7 @@ msgstr "ikke track"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "forkast"
@@ -910,7 +835,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "avslå"
@@ -919,6 +844,12 @@ msgstr "avslå"
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -929,6 +860,45 @@ msgstr ""
msgid "types"
msgstr ""
+#~ msgid "Add"
+#~ msgstr "Legg til"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Legg til og redigere..."
+
+#~ msgid "Do not rewrite"
+#~ msgstr "Ikke omskriv"
+
+#~ msgid "External zone"
+#~ msgstr "Ekstern sone"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Ny SNAT regel"
+
+#~ msgid "New forward rule"
+#~ msgstr "Ny videresending regel"
+
+#~ msgid "New input rule"
+#~ msgstr "Ny inndata regel"
+
+#~ msgid "New port forward"
+#~ msgstr "Ny port videresending"
+
+#~ msgid "New source NAT"
+#~ msgstr "Ny kilde NAT"
+
+#~ msgid "Open ports on router"
+#~ msgstr "Åpne porter på ruteren"
+
+#~ msgid "Other..."
+#~ msgstr "Andre..."
+
+#~ msgid "To source IP"
+#~ msgstr "Til kilde IP"
+
+#~ msgid "To source port"
+#~ msgstr "Til kilde port"
+
#~ msgid "(Unnamed Entry)"
#~ msgstr "(oppføring uten navn)"
diff --git a/applications/luci-app-firewall/po/pl/firewall.po b/applications/luci-app-firewall/po/pl/firewall.po
index 242adf48e0..5c96d57b79 100644
--- a/applications/luci-app-firewall/po/pl/firewall.po
+++ b/applications/luci-app-firewall/po/pl/firewall.po
@@ -62,26 +62,14 @@ msgstr ""
msgid "Action"
msgstr "Działanie"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Dodaj"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Dodaj i edytuj..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -93,15 +81,15 @@ msgstr ""
msgid "Advanced Settings"
msgstr "Ustawienia zaawansowane"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "Zezwól na przekazywanie z <em>source zones</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "Zezwól na przekazywanie do <em>destination zones</em>:"
@@ -114,11 +102,11 @@ msgstr "Każdy"
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
@@ -127,19 +115,19 @@ msgstr ""
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:133
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "Objęte sieci"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -166,8 +154,6 @@ msgid "Destination port"
msgstr "Port docelowy"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: 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"
msgstr "Strefa docelowa"
@@ -190,17 +176,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "Nie przepisuj"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -234,7 +215,7 @@ msgstr "Włącz NAT Loopback"
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:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "Włącz logowanie na tej strefy"
@@ -242,7 +223,7 @@ msgstr "Włącz logowanie na tej strefy"
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
@@ -251,21 +232,15 @@ msgid "External IP address"
msgstr "Zewnętrzne adresy IP"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: 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"
msgstr "Port zewnętrzny"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Strefa zewnętrzna"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "Dodatkowe argumenty"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
@@ -273,7 +248,7 @@ msgstr ""
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -300,12 +275,12 @@ msgstr "Zapora - Reguły ruchu"
msgid "Firewall - Zone Settings"
msgstr "Zapora - Ustawienia strefy"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr "Wymuś śledzenie połączeń"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "Przekazuj"
@@ -377,12 +352,12 @@ msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 i IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "Tylko IPv4"
@@ -391,31 +366,28 @@ msgid "IPv6"
msgstr "IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "Tylko IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "Ruch przychodzący"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
-#: 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:251
-#: 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:233
-#: 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:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Ograniczenie logowania"
@@ -429,11 +401,11 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr "Dostosuj MSS"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr "Maskarada"
@@ -465,11 +437,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:92
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Nazwa"
@@ -477,28 +445,6 @@ msgstr "Nazwa"
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Nowa reguła SNAT"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "Nowa reguła przekazywania (forward)"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Nowa reguła wejściowa (input)"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Nowe przekierowanie portu"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Nowy NAT źródłowy"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr "Dopasuj tylko przychodzący ruch skierowany do danego adresu IP."
@@ -519,17 +465,8 @@ msgstr ""
"Dopasuj tylko ruch przychodzący z podanego portu źródłowego lub zakresu "
"portów na hoście klienta"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Otwarte porty na routerze"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Inne..."
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "Wyjście (Output)"
@@ -539,7 +476,7 @@ msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
"Przekazuje dodatkowe argumenty do iptables. Zachowaj szczególną ostrożność!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -561,7 +498,7 @@ msgstr ""
"Przekierowanie portów pozwala komputerom z internetu na połączenia z "
"komputerami z sieci LAN."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -569,8 +506,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
-#: 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ół"
@@ -608,18 +543,18 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr "Ogranicz maskaradę do wskazanych sieci docelowych"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr "Ogranicz maskaradę do wskazanych sieci źródłowych"
# Wstawiłem rodzinę gdyż gdzieś wcześniej było tak opisane ale klasa pasuje mi tu bardziej.
# Obsy - niestety ale "rodzina". W gui dotyczy to wyboru IPv4/IPv6, więc "rodzina" a nie klasa.
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: 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:188
msgid "Restrict to address family"
msgstr "Ogranicz do rodziny adresów"
@@ -667,8 +602,6 @@ msgstr "Port źródłowy"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
-#: 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"
@@ -700,8 +633,8 @@ msgstr ""
"Firewall tworzy strefy z Twoich interfejsów sieciowych, aby kontrolować ruch "
"sieciowy."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -717,7 +650,7 @@ msgstr ""
"przekazywania jest <em>jednokierunkowa</em>, np. przekazywanie z sieci LAN "
"do WAN <em>nie</em> implikuje pozwolenia na przekazywanie z sieci WAN do LAN."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
#, fuzzy
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
@@ -760,14 +693,6 @@ msgstr "Do %s na <var>tym urządzeniu</var>"
msgid "To %s, %s in %s"
msgstr "Do %s, %s w %s"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "Do źródłowego IP"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "Do źródłowego portu"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
@@ -797,17 +722,17 @@ msgstr ""
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -829,7 +754,7 @@ msgstr ""
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "Strefa ⇒ Przekazywanie"
@@ -839,7 +764,7 @@ msgstr "Strefy"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "akceptuj"
@@ -888,7 +813,7 @@ msgstr "nie śledź"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "porzucaj"
@@ -921,7 +846,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "odrzucaj"
@@ -930,6 +855,12 @@ msgstr "odrzucaj"
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -940,6 +871,45 @@ msgstr ""
msgid "types"
msgstr ""
+#~ msgid "Add"
+#~ msgstr "Dodaj"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Dodaj i edytuj..."
+
+#~ msgid "Do not rewrite"
+#~ msgstr "Nie przepisuj"
+
+#~ msgid "External zone"
+#~ msgstr "Strefa zewnętrzna"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Nowa reguła SNAT"
+
+#~ msgid "New forward rule"
+#~ msgstr "Nowa reguła przekazywania (forward)"
+
+#~ msgid "New input rule"
+#~ msgstr "Nowa reguła wejściowa (input)"
+
+#~ msgid "New port forward"
+#~ msgstr "Nowe przekierowanie portu"
+
+#~ msgid "New source NAT"
+#~ msgstr "Nowy NAT źródłowy"
+
+#~ msgid "Open ports on router"
+#~ msgstr "Otwarte porty na routerze"
+
+#~ msgid "Other..."
+#~ msgstr "Inne..."
+
+#~ msgid "To source IP"
+#~ msgstr "Do źródłowego IP"
+
+#~ msgid "To source port"
+#~ msgstr "Do źródłowego portu"
+
#~ msgid "(Unnamed Entry)"
#~ msgstr "(Nienazwany wpis)"
diff --git a/applications/luci-app-firewall/po/pt-br/firewall.po b/applications/luci-app-firewall/po/pt-br/firewall.po
index 608dfbc520..6926402548 100644
--- a/applications/luci-app-firewall/po/pt-br/firewall.po
+++ b/applications/luci-app-firewall/po/pt-br/firewall.po
@@ -60,26 +60,14 @@ msgstr "Aceitar a saída"
msgid "Action"
msgstr "Ação"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Adicionar"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Adicionar e editar..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -91,15 +79,15 @@ msgstr ""
msgid "Advanced Settings"
msgstr "Configurações Avançadas"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "Permite o encaminhamento da <em>zona de origem</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "Permite o encaminhamento para a <em>zona de destino</em>:"
@@ -112,11 +100,11 @@ msgstr "Qualquer"
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
@@ -125,19 +113,19 @@ msgstr ""
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:133
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "Redes cobertas"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -164,8 +152,6 @@ msgid "Destination port"
msgstr "Porta de destino"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: 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"
msgstr "Zona de destino"
@@ -188,17 +174,12 @@ msgstr "Descartar a entrada"
msgid "Discard output"
msgstr "Descartar a saída"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "Não sobrescreva"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -232,7 +213,7 @@ msgstr "Habilite o Loopback do NAT"
msgid "Enable SYN-flood protection"
msgstr "Habilite proteção contra SYN-flood"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "Habilite o registro nesta zona"
@@ -241,7 +222,7 @@ msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
"Funcionalidade experimental. Ela não é totalmente compatível com QoS/SQM."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
@@ -250,21 +231,15 @@ msgid "External IP address"
msgstr "Endereço IP externo"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: 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"
msgstr "Porta Externa"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Zona externa"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "Argumentos extras"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
@@ -272,7 +247,7 @@ msgstr ""
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -296,12 +271,12 @@ msgstr "Firewall - Regras de Tráfego"
msgid "Firewall - Zone Settings"
msgstr "Firewall - Configurações de Zona"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr "Force o rastreamento da conexão"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "Encaminhar"
@@ -373,12 +348,12 @@ msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 e IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "Somente IPv4"
@@ -387,31 +362,28 @@ msgid "IPv6"
msgstr "IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "Somente IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "Entrada"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
-#: 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:251
-#: 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:233
-#: 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:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Limita as mensagens de registro"
@@ -425,11 +397,11 @@ msgstr "MAC"
msgid "MACs"
msgstr "MACs"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr "Ajuste do MSS"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr "Mascaramento"
@@ -461,11 +433,7 @@ msgstr "Dias do mês"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:92
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Nome"
@@ -473,28 +441,6 @@ msgstr "Nome"
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Nova regra de SNAT"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "Nova regra de encaminhamento"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Nova regra de entrada"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Novo encaminhamento de porta"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Nova origem NAT"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
@@ -516,17 +462,8 @@ msgstr ""
"Somente case o tráfego entrante vindo da porta de origem fornecida ou "
"intervalo de portas no equipamento cliente"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Abrir portas no roteador"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Outro..."
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "Saída"
@@ -535,7 +472,7 @@ msgstr "Saída"
msgid "Passes additional arguments to iptables. Use with care!"
msgstr "Passa argumentos adicionais para o iptables. Use com cuidado!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -557,7 +494,7 @@ msgstr ""
"O encaminhamento de portas permite que computadores remotos na Internet "
"conectem a um computador ou serviço específico dentro da rede local privada."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -565,8 +502,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
-#: 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"
@@ -603,16 +538,16 @@ 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:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr "Restringe o mascaramento para uma subrede de destino específica"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr "Restringe o mascaramento para uma subrede de origem específica"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: 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:188
msgid "Restrict to address family"
msgstr "Restringe para uma família de endereços"
@@ -660,8 +595,6 @@ msgstr "Porta de origem"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
-#: 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"
@@ -693,8 +626,8 @@ msgstr ""
"O firewall cria zonas sobre as interfaces de rede para controlar o fluxo do "
"tráfego de rede."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -710,7 +643,7 @@ msgstr ""
"encaminhamento é <em>unidirecional</em>, ex: um encaminhamento da LAN para "
"WAN <em>não</em> implica na permissão de encaminhar da WAN para LAN."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -753,14 +686,6 @@ msgstr "Para %s <var>neste dispositivo</var>"
msgid "To %s, %s in %s"
msgstr "Para %s, %s em %s"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "Para o endereço IP de origem"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "Para a porta de origem"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
@@ -790,17 +715,17 @@ msgstr "Encaminhamento sem nome"
msgid "Unnamed rule"
msgstr "Regra sem nome"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -822,7 +747,7 @@ msgstr "Quarta-feira"
msgid "Week Days"
msgstr "Dias da semana"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "Zona ⇒ Encaminhamentos"
@@ -832,7 +757,7 @@ msgstr "Zonas"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "aceitar"
@@ -881,7 +806,7 @@ msgstr "não rastrear"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "descartar"
@@ -914,7 +839,7 @@ msgstr "portas"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "rejeitar"
@@ -923,6 +848,12 @@ msgstr "rejeitar"
msgid "second"
msgstr "segundo"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -933,6 +864,45 @@ msgstr "tipo"
msgid "types"
msgstr "tipos"
+#~ msgid "Add"
+#~ msgstr "Adicionar"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Adicionar e editar..."
+
+#~ msgid "Do not rewrite"
+#~ msgstr "Não sobrescreva"
+
+#~ msgid "External zone"
+#~ msgstr "Zona externa"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Nova regra de SNAT"
+
+#~ msgid "New forward rule"
+#~ msgstr "Nova regra de encaminhamento"
+
+#~ msgid "New input rule"
+#~ msgstr "Nova regra de entrada"
+
+#~ msgid "New port forward"
+#~ msgstr "Novo encaminhamento de porta"
+
+#~ msgid "New source NAT"
+#~ msgstr "Nova origem NAT"
+
+#~ msgid "Open ports on router"
+#~ msgstr "Abrir portas no roteador"
+
+#~ msgid "Other..."
+#~ msgstr "Outro..."
+
+#~ msgid "To source IP"
+#~ msgstr "Para o endereço IP de origem"
+
+#~ msgid "To source port"
+#~ msgstr "Para a porta de origem"
+
#~ msgid "Output zone"
#~ msgstr "Zona de saída"
diff --git a/applications/luci-app-firewall/po/pt/firewall.po b/applications/luci-app-firewall/po/pt/firewall.po
index 349f4c369f..281c6b17b3 100644
--- a/applications/luci-app-firewall/po/pt/firewall.po
+++ b/applications/luci-app-firewall/po/pt/firewall.po
@@ -60,26 +60,14 @@ msgstr ""
msgid "Action"
msgstr "Acção"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Adicionar"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Adicionar e editar..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -91,15 +79,15 @@ msgstr ""
msgid "Advanced Settings"
msgstr "Definições Avançadas"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "Permitir encaminhamento de <em>zonas de origem</em>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "Permitir encaminhamento para <em>zonas de destino</em>"
@@ -112,11 +100,11 @@ msgstr "Qualquer"
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
@@ -125,19 +113,19 @@ msgstr ""
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:133
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "Redes abrangidas"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -165,8 +153,6 @@ msgid "Destination port"
msgstr "Porta de destino"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: 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"
msgstr "Zona de destino"
@@ -189,17 +175,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "Não re-escrever"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -233,7 +214,7 @@ msgstr "Ativar NAT Loopback"
msgid "Enable SYN-flood protection"
msgstr "Ativar a Proteção SYN-flood"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "Ativar registo nesta zona"
@@ -241,7 +222,7 @@ msgstr "Ativar registo nesta zona"
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
@@ -250,21 +231,15 @@ msgid "External IP address"
msgstr "Endereço IP externo"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: 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"
msgstr "Porta externa"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Zona externa"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "Argumentos extra"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
@@ -272,7 +247,7 @@ msgstr ""
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -296,12 +271,12 @@ msgstr "Firewall - Regras de Tráfego"
msgid "Firewall - Zone Settings"
msgstr "Firewall - Definições de Zona"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr "Forçar rasto de ligação"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "Encaminhar"
@@ -373,12 +348,12 @@ msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 e IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "Só IPv4"
@@ -387,31 +362,28 @@ msgid "IPv6"
msgstr "IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "Só IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "Entrada"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
-#: 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:251
-#: 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:233
-#: 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:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Limitar registo de mensagens"
@@ -425,12 +397,12 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
#, fuzzy
msgid "MSS clamping"
msgstr "MSS-Correction"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr ""
@@ -462,11 +434,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:92
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Nome"
@@ -474,28 +442,6 @@ msgstr "Nome"
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Nova regra SNAT"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "Nova regra de encaminhamento"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Nova regra de entrada"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Novo encaminhamento de porta"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Nova origem de NAT"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr "Só se tráfego de entrada corresponder ao endereço IP fornecido."
@@ -516,17 +462,8 @@ msgstr ""
"Só se o tráfego de entrada corresponder à porta de origem fornecida ou de um "
"intervalo de portas no host cliente"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Abrir portas no router"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Outro..."
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "Saída"
@@ -535,7 +472,7 @@ msgstr "Saída"
msgid "Passes additional arguments to iptables. Use with care!"
msgstr "Passa argumentos adicionais para o iptables. Usar com cuidado!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -557,7 +494,7 @@ msgstr ""
"O Encaminhamento de Portas permite que computadores remotos na internet se "
"liguem a um computador ou serviço especifico na rede privada (LAN)."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -565,8 +502,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
-#: 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"
@@ -604,16 +539,16 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: 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:188
msgid "Restrict to address family"
msgstr "Restringir a família de endereços"
@@ -661,8 +596,6 @@ msgstr "Porta de origem"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
-#: 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"
@@ -694,8 +627,8 @@ msgstr ""
"A firewall cria zonas sobre as interfaces de rede para controlar o fluxo do "
"tráfego."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -705,7 +638,7 @@ msgid ""
"<em>not</em> imply a permission to forward from wan to lan as well."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -742,14 +675,6 @@ msgstr "Para %s em <var>este dispositivo</var>"
msgid "To %s, %s in %s"
msgstr "Para %s, %s em %s"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "Para o IP de origem"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "Para a porta de origem"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
@@ -779,17 +704,17 @@ msgstr ""
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -811,7 +736,7 @@ msgstr ""
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "Zona ⇒ Encaminhamentos"
@@ -821,7 +746,7 @@ msgstr "Zonas"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "aceitar"
@@ -870,7 +795,7 @@ msgstr "não seguir"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "drop"
@@ -903,7 +828,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "rejeitar"
@@ -912,6 +837,12 @@ msgstr "rejeitar"
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -922,6 +853,45 @@ msgstr ""
msgid "types"
msgstr ""
+#~ msgid "Add"
+#~ msgstr "Adicionar"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Adicionar e editar..."
+
+#~ msgid "Do not rewrite"
+#~ msgstr "Não re-escrever"
+
+#~ msgid "External zone"
+#~ msgstr "Zona externa"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Nova regra SNAT"
+
+#~ msgid "New forward rule"
+#~ msgstr "Nova regra de encaminhamento"
+
+#~ msgid "New input rule"
+#~ msgstr "Nova regra de entrada"
+
+#~ msgid "New port forward"
+#~ msgstr "Novo encaminhamento de porta"
+
+#~ msgid "New source NAT"
+#~ msgstr "Nova origem de NAT"
+
+#~ msgid "Open ports on router"
+#~ msgstr "Abrir portas no router"
+
+#~ msgid "Other..."
+#~ msgstr "Outro..."
+
+#~ msgid "To source IP"
+#~ msgstr "Para o IP de origem"
+
+#~ msgid "To source port"
+#~ msgstr "Para a porta de origem"
+
#~ msgid "(Unnamed Entry)"
#~ msgstr "(Entrada Sem Nome)"
diff --git a/applications/luci-app-firewall/po/ro/firewall.po b/applications/luci-app-firewall/po/ro/firewall.po
index 472948d4b7..30d3d89e5d 100644
--- a/applications/luci-app-firewall/po/ro/firewall.po
+++ b/applications/luci-app-firewall/po/ro/firewall.po
@@ -59,26 +59,14 @@ msgstr ""
msgid "Action"
msgstr "Acţiune"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Adaugă"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Adaugă şi editează..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -90,15 +78,15 @@ msgstr ""
msgid "Advanced Settings"
msgstr "Setări avansate"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "Permite trecerea din <em>zonele sursa</em>."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "Permite trecerea catre <em>zonele sursa</em>."
@@ -111,11 +99,11 @@ msgstr "Oricare"
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
@@ -124,19 +112,19 @@ msgstr ""
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:133
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "Retele acoperite"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -160,8 +148,6 @@ msgid "Destination port"
msgstr "Portul destinatie"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: 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"
msgstr "Zona destinatie"
@@ -184,17 +170,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "Nu rescrie"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -228,7 +209,7 @@ msgstr "Activează loopback NAT"
msgid "Enable SYN-flood protection"
msgstr "Activează protecţia SYN-flood"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "Activeaza log in aceasta zona"
@@ -236,7 +217,7 @@ msgstr "Activeaza log in aceasta zona"
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
@@ -245,21 +226,15 @@ msgid "External IP address"
msgstr "Adresă IP externă"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: 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"
msgstr "Port extern"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Zonă externă"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
@@ -267,7 +242,7 @@ msgstr ""
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -291,12 +266,12 @@ msgstr ""
msgid "Firewall - Zone Settings"
msgstr "Setari zona la firewall"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr "Forteaza urmarirea conexiunilor"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "Forward"
@@ -368,12 +343,12 @@ msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 şi IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "doar IPv4"
@@ -382,31 +357,28 @@ msgid "IPv6"
msgstr "IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "doar IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "Intrare"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
-#: 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:251
-#: 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:233
-#: 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:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Limitează mesaje în log"
@@ -420,11 +392,11 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr "Ajustare MSS"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr "Translatare"
@@ -454,11 +426,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:92
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Nume"
@@ -466,28 +434,6 @@ msgstr "Nume"
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Regulă nouă SNAT"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
@@ -506,17 +452,8 @@ msgid ""
"range on the client host"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Altele..."
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "Ieşire"
@@ -525,7 +462,7 @@ msgstr "Ieşire"
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -545,7 +482,7 @@ msgid ""
"specific computer or service within the private LAN."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -553,8 +490,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
-#: 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"
@@ -590,16 +525,16 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: 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:188
msgid "Restrict to address family"
msgstr ""
@@ -647,8 +582,6 @@ msgstr "Port sursa"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
-#: 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"
@@ -678,8 +611,8 @@ msgid ""
"traffic flow."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -689,7 +622,7 @@ msgid ""
"<em>not</em> imply a permission to forward from wan to lan as well."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -726,14 +659,6 @@ msgstr ""
msgid "To %s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
@@ -760,17 +685,17 @@ msgstr ""
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -792,7 +717,7 @@ msgstr ""
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr ""
@@ -802,7 +727,7 @@ msgstr "Zone"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "accept"
@@ -851,7 +776,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr ""
@@ -884,7 +809,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr ""
@@ -893,6 +818,12 @@ msgstr ""
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -903,6 +834,24 @@ msgstr ""
msgid "types"
msgstr ""
+#~ msgid "Add"
+#~ msgstr "Adaugă"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Adaugă şi editează..."
+
+#~ msgid "Do not rewrite"
+#~ msgstr "Nu rescrie"
+
+#~ msgid "External zone"
+#~ msgstr "Zonă externă"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Regulă nouă SNAT"
+
+#~ msgid "Other..."
+#~ msgstr "Altele..."
+
#~ msgid "(Unnamed Entry)"
#~ msgstr "(Intrare fără nume)"
diff --git a/applications/luci-app-firewall/po/ru/firewall.po b/applications/luci-app-firewall/po/ru/firewall.po
index 1ddb6a580e..ca8dc439c0 100644
--- a/applications/luci-app-firewall/po/ru/firewall.po
+++ b/applications/luci-app-firewall/po/ru/firewall.po
@@ -62,19 +62,7 @@ msgstr "Принимать исходящий трафик"
msgid "Action"
msgstr "Действие"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Добавить"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Добавить и редактировать..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
@@ -84,7 +72,7 @@ msgstr ""
"назначения, например <code>-p tcp --dport 443</code> для соответствия только "
"исходящему HTTPS трафику."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -99,15 +87,15 @@ msgstr ""
msgid "Advanced Settings"
msgstr "Дополнительные настройки"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr "Разрешить «недействительный» трафик"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "Разрешить перенаправление из <em>'зон источников'</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "Разрешить перенаправление в <em>'зоны назначения'</em>:"
@@ -120,11 +108,11 @@ msgstr "Любой"
msgid "Any day"
msgstr "Любой день"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr "Автоматическое назначение помощников"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
@@ -135,19 +123,19 @@ msgstr ""
msgid "Conntrack Settings"
msgstr "Отслеживание соединений (conntrack)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr "Помощники отслеживания соединений"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr "Охватываемые устройства"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:133
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "Охватываемые сети"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr "Охватываемые подсети"
@@ -175,8 +163,6 @@ msgid "Destination port"
msgstr "Порт назначения"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: 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"
msgstr "Зона назначения"
@@ -199,7 +185,7 @@ msgstr "Отклонять входящий трафик"
msgid "Discard output"
msgstr "Отклонять исходящий трафик"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -208,11 +194,6 @@ msgstr ""
"трафика с состоянием <em>недействительный</em> (<em>invalid</em>). Это может "
"потребоваться для сложных настроек асимметричной маршрутизации."
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "Не перезаписывать"
-
#: 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"
@@ -246,7 +227,7 @@ msgstr "Включить NAT Loopback"
msgid "Enable SYN-flood protection"
msgstr "Включить защиту от SYN-flood атак"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "Включить журналирование в этой зоне"
@@ -254,7 +235,7 @@ msgstr "Включить журналирование в этой зоне"
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr "Экспериментальный функционал. Не полностью совместим с QoS/SQM."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
"Явно определяет допустимые варианты помощников (helpers) отслеживания "
@@ -265,21 +246,15 @@ msgid "External IP address"
msgstr "Внешний IP-адрес"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: 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"
msgstr "Внешний порт"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Внешняя зона"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "Дополнительные аргументы"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr "Дополнительные аргументы для назначения"
@@ -287,7 +262,7 @@ msgstr "Дополнительные аргументы для назначен
msgid "Extra iptables arguments"
msgstr "Дополнительные аргументы iptables"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr "Дополнительные аргументы для источника"
@@ -311,12 +286,12 @@ msgstr "Межсетевой экран - Правила для трафика"
msgid "Firewall - Zone Settings"
msgstr "Межсетевой экран - Настройка зон"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr "Принудительно включать отслеживание соединений"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "Перенаправление"
@@ -388,12 +363,12 @@ msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 и IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "Только IPv4"
@@ -402,31 +377,28 @@ msgid "IPv6"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "Только IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "Входящий трафик"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
-#: 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:251
-#: 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:233
-#: 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:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Ограничить журнал сообщений"
@@ -440,11 +412,11 @@ msgstr "MAC-адрес"
msgid "MACs"
msgstr "MAC-адреса"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr "Ограничение MSS"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr "Маскарадинг"
@@ -476,11 +448,7 @@ msgstr "Дни месяца"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:92
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Имя"
@@ -488,28 +456,6 @@ msgstr "Имя"
msgid "Network"
msgstr "Сеть"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Новое правило SNAT"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "Новое правило перенаправления"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Новое правило для входящего трафика"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Новое перенаправление порта"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Новый SNAT"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
@@ -533,17 +479,8 @@ msgstr ""
"Применять правило только для входящего трафика от указанного порта или "
"диапазона портов клиентского хоста"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Открыть порты на маршрутизаторе"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Другое..."
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "Исходящий трафик"
@@ -554,7 +491,7 @@ msgstr ""
"Передаёт дополнительные аргументы таблице iptables. Используйте с "
"осторожностью!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -581,7 +518,7 @@ msgstr ""
"Перенаправленные портов позволяет удалённым компьютерам из Интернета "
"соединяться с компьютером или службой внутри частной локальной сети."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -591,8 +528,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
-#: 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 "Протокол"
@@ -631,16 +566,16 @@ msgstr ""
msgid "Restart Firewall"
msgstr "Перезапустить межсетевой экран"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr "Использовать маскарадинг только для указанных подсетей-получателей"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr "Использовать маскарадинг только для указанных подсетей-отправителей"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: 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:188
msgid "Restrict to address family"
msgstr "Использовать протокол"
@@ -688,8 +623,6 @@ msgstr "Порт источника"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
-#: 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 "Зона источника"
@@ -719,8 +652,8 @@ msgid ""
"traffic flow."
msgstr "Межсетевой экран создает зоны в вашей сети для контроля трафика."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -737,7 +670,7 @@ msgstr ""
"перенаправление из lan в wan <em>'не'</em> допускает перенаправление трафика "
"из wan в lan."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -780,14 +713,6 @@ msgstr "К %s на <var>этом устройстве</var>"
msgid "To %s, %s in %s"
msgstr "К %s, %s в %s"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "К IP-адресу источника"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "К порту источника"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
@@ -817,11 +742,11 @@ msgstr "Перенаправление без имени"
msgid "Unnamed rule"
msgstr "Правило без имени"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr "Зона без имени"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
@@ -829,7 +754,7 @@ msgstr ""
"Используйте эту опцию для классификации трафика зоны по сетевым устройствам, "
"управляемым не через <em>uci</em>."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -853,7 +778,7 @@ msgstr "Среда"
msgid "Week Days"
msgstr "Дни недели"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "Зона ⇒ Перенаправления"
@@ -863,7 +788,7 @@ msgstr "Зоны"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "принимать"
@@ -912,7 +837,7 @@ msgstr "не отслеживать"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "не обрабатывать"
@@ -945,7 +870,7 @@ msgstr "порты"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "отвергать"
@@ -954,6 +879,12 @@ msgstr "отвергать"
msgid "second"
msgstr "секунда"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -964,5 +895,44 @@ msgstr "тип"
msgid "types"
msgstr "типы"
+#~ msgid "Add"
+#~ msgstr "Добавить"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Добавить и редактировать..."
+
+#~ msgid "Do not rewrite"
+#~ msgstr "Не перезаписывать"
+
+#~ msgid "External zone"
+#~ msgstr "Внешняя зона"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Новое правило SNAT"
+
+#~ msgid "New forward rule"
+#~ msgstr "Новое правило перенаправления"
+
+#~ msgid "New input rule"
+#~ msgstr "Новое правило для входящего трафика"
+
+#~ msgid "New port forward"
+#~ msgstr "Новое перенаправление порта"
+
+#~ msgid "New source NAT"
+#~ msgstr "Новый SNAT"
+
+#~ msgid "Open ports on router"
+#~ msgstr "Открыть порты на маршрутизаторе"
+
+#~ msgid "Other..."
+#~ msgstr "Другое..."
+
+#~ msgid "To source IP"
+#~ msgstr "К IP-адресу источника"
+
+#~ msgid "To source port"
+#~ msgstr "К порту источника"
+
#~ msgid "Output zone"
#~ msgstr "Исходящая зона"
diff --git a/applications/luci-app-firewall/po/sk/firewall.po b/applications/luci-app-firewall/po/sk/firewall.po
index fa91b5605a..40ea67f271 100644
--- a/applications/luci-app-firewall/po/sk/firewall.po
+++ b/applications/luci-app-firewall/po/sk/firewall.po
@@ -55,26 +55,14 @@ msgstr ""
msgid "Action"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -86,15 +74,15 @@ msgstr ""
msgid "Advanced Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr ""
@@ -107,11 +95,11 @@ msgstr ""
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
@@ -120,19 +108,19 @@ msgstr ""
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:133
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -156,8 +144,6 @@ msgid "Destination port"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: 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"
msgstr ""
@@ -180,17 +166,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -224,7 +205,7 @@ msgstr ""
msgid "Enable SYN-flood protection"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr ""
@@ -232,7 +213,7 @@ msgstr ""
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
@@ -241,21 +222,15 @@ msgid "External IP address"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: 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"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
@@ -263,7 +238,7 @@ msgstr ""
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -287,12 +262,12 @@ msgstr ""
msgid "Firewall - Zone Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr ""
@@ -364,12 +339,12 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr ""
@@ -378,31 +353,28 @@ msgid "IPv6"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
-#: 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:251
-#: 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:233
-#: 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:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr ""
@@ -416,11 +388,11 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr ""
@@ -450,11 +422,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:92
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr ""
@@ -462,28 +430,6 @@ msgstr ""
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
@@ -502,17 +448,8 @@ msgid ""
"range on the client host"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr ""
@@ -521,7 +458,7 @@ msgstr ""
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -541,7 +478,7 @@ msgid ""
"specific computer or service within the private LAN."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -549,8 +486,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
-#: 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 ""
@@ -586,16 +521,16 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: 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:188
msgid "Restrict to address family"
msgstr ""
@@ -643,8 +578,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
-#: 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 ""
@@ -674,8 +607,8 @@ msgid ""
"traffic flow."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -685,7 +618,7 @@ msgid ""
"<em>not</em> imply a permission to forward from wan to lan as well."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -722,14 +655,6 @@ msgstr ""
msgid "To %s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
@@ -756,17 +681,17 @@ msgstr ""
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -788,7 +713,7 @@ msgstr ""
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr ""
@@ -798,7 +723,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr ""
@@ -847,7 +772,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr ""
@@ -880,7 +805,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr ""
@@ -889,6 +814,12 @@ msgstr ""
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
diff --git a/applications/luci-app-firewall/po/sv/firewall.po b/applications/luci-app-firewall/po/sv/firewall.po
index 4d81c1ae9c..d885c03986 100644
--- a/applications/luci-app-firewall/po/sv/firewall.po
+++ b/applications/luci-app-firewall/po/sv/firewall.po
@@ -56,26 +56,14 @@ msgstr ""
msgid "Action"
msgstr "Åtgärd"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Lägg till"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Lägg till och redigera..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -87,15 +75,15 @@ msgstr ""
msgid "Advanced Settings"
msgstr "Avancerade inställningar"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "Tillåt vidarebefordring från <em>källzonerna</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "Till vidarebefordring till <em>destinationszonerna:</em>:"
@@ -108,11 +96,11 @@ msgstr "Alla"
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
@@ -121,19 +109,19 @@ msgstr ""
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:133
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "Nätverk som omfattas"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -157,8 +145,6 @@ msgid "Destination port"
msgstr "Destinationsport"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: 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"
msgstr "Destinationens zon"
@@ -181,17 +167,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "Skriv inte om igen"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -225,7 +206,7 @@ msgstr ""
msgid "Enable SYN-flood protection"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "Aktivera loggning i den här zonen"
@@ -233,7 +214,7 @@ msgstr "Aktivera loggning i den här zonen"
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
@@ -242,21 +223,15 @@ msgid "External IP address"
msgstr "Extern IP-adress"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: 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"
msgstr "Extern port"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Extern zon"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "Extra argument"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
@@ -264,7 +239,7 @@ msgstr ""
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -288,12 +263,12 @@ msgstr "Brandvägg - Trafikregler"
msgid "Firewall - Zone Settings"
msgstr "Brandvägg - Zoninställningar"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "Vidarebefordra"
@@ -365,12 +340,12 @@ msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 och IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "Endast IPv4"
@@ -379,31 +354,28 @@ msgid "IPv6"
msgstr "IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "Endast IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "Inmatning"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
-#: 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:251
-#: 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:233
-#: 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:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Begränsa loggmeddelanden"
@@ -417,11 +389,11 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr "Maskering"
@@ -453,11 +425,7 @@ msgstr "Dagar i månaden"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:92
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Namn"
@@ -465,28 +433,6 @@ msgstr "Namn"
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Ny SNAT-regel"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "Ny regel för vidarebefordring"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Ny inmatningsregel"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Ny vidarebefordring av port"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Ny käll-NAT"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
@@ -506,17 +452,8 @@ msgid ""
"range on the client host"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Öppna portar i router"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Andra..."
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "Utmatning"
@@ -525,7 +462,7 @@ msgstr "Utmatning"
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -545,7 +482,7 @@ msgid ""
"specific computer or service within the private LAN."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -553,8 +490,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
-#: 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"
@@ -590,16 +525,16 @@ msgstr ""
msgid "Restart Firewall"
msgstr "Starta om brandvägg"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: 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:188
msgid "Restrict to address family"
msgstr "Begränsa till adressfamilj"
@@ -647,8 +582,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
-#: 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 ""
@@ -678,8 +611,8 @@ msgid ""
"traffic flow."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -689,7 +622,7 @@ msgid ""
"<em>not</em> imply a permission to forward from wan to lan as well."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -726,14 +659,6 @@ msgstr "Till %s på <var>den här enheten</var>"
msgid "To %s, %s in %s"
msgstr "Till %s, %s i %s"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
@@ -760,17 +685,17 @@ msgstr ""
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -792,7 +717,7 @@ msgstr "Onsdag"
msgid "Week Days"
msgstr "Veckodagar"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr ""
@@ -802,7 +727,7 @@ msgstr "Zoner"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "acceptera"
@@ -851,7 +776,7 @@ msgstr "spåra inte"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "släpp"
@@ -884,7 +809,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "neka"
@@ -893,6 +818,12 @@ msgstr "neka"
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -903,6 +834,39 @@ msgstr ""
msgid "types"
msgstr ""
+#~ msgid "Add"
+#~ msgstr "Lägg till"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Lägg till och redigera..."
+
+#~ msgid "Do not rewrite"
+#~ msgstr "Skriv inte om igen"
+
+#~ msgid "External zone"
+#~ msgstr "Extern zon"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Ny SNAT-regel"
+
+#~ msgid "New forward rule"
+#~ msgstr "Ny regel för vidarebefordring"
+
+#~ msgid "New input rule"
+#~ msgstr "Ny inmatningsregel"
+
+#~ msgid "New port forward"
+#~ msgstr "Ny vidarebefordring av port"
+
+#~ msgid "New source NAT"
+#~ msgstr "Ny käll-NAT"
+
+#~ msgid "Open ports on router"
+#~ msgstr "Öppna portar i router"
+
+#~ msgid "Other..."
+#~ msgstr "Andra..."
+
#~ msgid "(Unnamed Entry)"
#~ msgstr "(Namnlös post)"
diff --git a/applications/luci-app-firewall/po/templates/firewall.pot b/applications/luci-app-firewall/po/templates/firewall.pot
index 753309b69d..492d8aa8e4 100644
--- a/applications/luci-app-firewall/po/templates/firewall.pot
+++ b/applications/luci-app-firewall/po/templates/firewall.pot
@@ -48,26 +48,14 @@ msgstr ""
msgid "Action"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -79,15 +67,15 @@ msgstr ""
msgid "Advanced Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr ""
@@ -100,11 +88,11 @@ msgstr ""
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
@@ -113,19 +101,19 @@ msgstr ""
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:133
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -149,8 +137,6 @@ msgid "Destination port"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: 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"
msgstr ""
@@ -173,17 +159,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -217,7 +198,7 @@ msgstr ""
msgid "Enable SYN-flood protection"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr ""
@@ -225,7 +206,7 @@ msgstr ""
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
@@ -234,21 +215,15 @@ msgid "External IP address"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: 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"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
@@ -256,7 +231,7 @@ msgstr ""
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -280,12 +255,12 @@ msgstr ""
msgid "Firewall - Zone Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr ""
@@ -357,12 +332,12 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr ""
@@ -371,31 +346,28 @@ msgid "IPv6"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
-#: 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:251
-#: 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:233
-#: 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:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr ""
@@ -409,11 +381,11 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr ""
@@ -443,11 +415,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:92
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr ""
@@ -455,28 +423,6 @@ msgstr ""
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
@@ -495,17 +441,8 @@ msgid ""
"range on the client host"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr ""
@@ -514,7 +451,7 @@ msgstr ""
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -534,7 +471,7 @@ msgid ""
"specific computer or service within the private LAN."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -542,8 +479,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
-#: 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 ""
@@ -579,16 +514,16 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: 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:188
msgid "Restrict to address family"
msgstr ""
@@ -636,8 +571,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
-#: 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 ""
@@ -667,8 +600,8 @@ msgid ""
"traffic flow."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -678,7 +611,7 @@ msgid ""
"<em>not</em> imply a permission to forward from wan to lan as well."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -715,14 +648,6 @@ msgstr ""
msgid "To %s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
@@ -749,17 +674,17 @@ msgstr ""
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -781,7 +706,7 @@ msgstr ""
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr ""
@@ -791,7 +716,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr ""
@@ -840,7 +765,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr ""
@@ -873,7 +798,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr ""
@@ -882,6 +807,12 @@ msgstr ""
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
diff --git a/applications/luci-app-firewall/po/tr/firewall.po b/applications/luci-app-firewall/po/tr/firewall.po
index 5dc58f7810..1113306375 100644
--- a/applications/luci-app-firewall/po/tr/firewall.po
+++ b/applications/luci-app-firewall/po/tr/firewall.po
@@ -55,26 +55,14 @@ msgstr ""
msgid "Action"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -86,15 +74,15 @@ msgstr ""
msgid "Advanced Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr ""
@@ -107,11 +95,11 @@ msgstr ""
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
@@ -120,19 +108,19 @@ msgstr ""
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:133
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -156,8 +144,6 @@ msgid "Destination port"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: 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"
msgstr ""
@@ -180,17 +166,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -224,7 +205,7 @@ msgstr ""
msgid "Enable SYN-flood protection"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr ""
@@ -232,7 +213,7 @@ msgstr ""
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
@@ -241,21 +222,15 @@ msgid "External IP address"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: 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"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
@@ -263,7 +238,7 @@ msgstr ""
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -287,12 +262,12 @@ msgstr ""
msgid "Firewall - Zone Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr ""
@@ -364,12 +339,12 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr ""
@@ -378,31 +353,28 @@ msgid "IPv6"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
-#: 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:251
-#: 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:233
-#: 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:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr ""
@@ -416,11 +388,11 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr ""
@@ -450,11 +422,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:92
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr ""
@@ -462,28 +430,6 @@ msgstr ""
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
@@ -502,17 +448,8 @@ msgid ""
"range on the client host"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr ""
@@ -521,7 +458,7 @@ msgstr ""
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -541,7 +478,7 @@ msgid ""
"specific computer or service within the private LAN."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -549,8 +486,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
-#: 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 ""
@@ -586,16 +521,16 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: 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:188
msgid "Restrict to address family"
msgstr ""
@@ -643,8 +578,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
-#: 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 ""
@@ -674,8 +607,8 @@ msgid ""
"traffic flow."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -685,7 +618,7 @@ msgid ""
"<em>not</em> imply a permission to forward from wan to lan as well."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -722,14 +655,6 @@ msgstr ""
msgid "To %s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
@@ -756,17 +681,17 @@ msgstr ""
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -788,7 +713,7 @@ msgstr ""
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr ""
@@ -798,7 +723,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr ""
@@ -847,7 +772,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr ""
@@ -880,7 +805,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr ""
@@ -889,6 +814,12 @@ msgstr ""
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
diff --git a/applications/luci-app-firewall/po/uk/firewall.po b/applications/luci-app-firewall/po/uk/firewall.po
index f1a9a084b7..10386f52a1 100644
--- a/applications/luci-app-firewall/po/uk/firewall.po
+++ b/applications/luci-app-firewall/po/uk/firewall.po
@@ -9,7 +9,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
msgid "%s in %s"
msgstr "%s у %s"
@@ -18,7 +18,7 @@ msgstr "%s у %s"
msgid "%s%s with %s"
msgstr "%s%s із %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
msgid "%s, %s in %s"
msgstr "%s, %s у %s"
@@ -51,102 +51,90 @@ msgstr "Приймати вхідний"
msgid "Accept output"
msgstr "Приймати вихідний"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
msgid "Action"
msgstr "Дія"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Додати"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Додати та редагувати..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
"Додаткові аргументи raw <em>iptables</em> для класифікації трафіку "
-"призначення зони, наприклад, <code>-p tcp --dport 443</code>, щоб "
-"зіставляти лише вихідний трафік HTTPS."
+"призначення зони, наприклад, <code>-p tcp --dport 443</code>, щоб зіставляти "
+"лише вихідний трафік HTTPS."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
msgstr ""
-"Додаткові аргументи raw <em>iptables</em> для класифікації трафіку "
-"джерела зони, наприклад, <code>-p tcp --sport 443</code>, щоб "
-"зіставляти лише вхідний трафік HTTPS."
+"Додаткові аргументи raw <em>iptables</em> для класифікації трафіку джерела "
+"зони, наприклад, <code>-p tcp --sport 443</code>, щоб зіставляти лише "
+"вхідний трафік HTTPS."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr "Розширені настройки"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr "Дозволити \"неправильний\" трафік"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "Дозволити переспрямовування від <em>зон джерела</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "Дозволити переспрямовування до <em>зон призначення</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
msgid "Any"
msgstr "Будь-який"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
msgid "Any day"
msgstr "Будь-який день"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr "Автоматичне призначення помічника"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
-"Автоматично призначати помічників відслідковування з'єднань (<abbr "
-"title=\"Connection tracking\">Conntrack</abbr>) на підставі протоколу та "
-"порту трафіку"
+"Автоматично призначати помічників відслідковування з'єднань (<abbr title="
+"\"Connection tracking\">Conntrack</abbr>) на підставі протоколу та порту "
+"трафіку"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
msgid "Conntrack Settings"
msgstr ""
-"Параметри відслідковування з'єднань (<abbr title=\"Connection tracking\">"
-"Conntrack</abbr>)"
+"Параметри відслідковування з'єднань (<abbr title=\"Connection tracking"
+"\">Conntrack</abbr>)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-"Помічники відслідковування з'єднань (<abbr title=\"Connection tracking\">"
-"Conntrack</abbr>)"
+"Помічники відслідковування з'єднань (<abbr title=\"Connection tracking"
+"\">Conntrack</abbr>)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr "Охоплені пристрої"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "Охоплені мережі"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr "Охоплені підмережі"
@@ -165,17 +153,15 @@ msgstr ""
"виконуються після кожного перезавантаження брандмауера, відразу після "
"завантаження типового набору правил."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
msgid "Destination address"
msgstr "Адреса призначення"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
msgid "Destination port"
msgstr "Порт призначення"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
msgid "Destination zone"
msgstr "Зона призначення"
@@ -198,19 +184,14 @@ msgstr "Відкидати вхідний"
msgid "Discard output"
msgstr "Відкидати вихідний"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-"Не встановлювати додаткові правила для відхилення переспрямованого трафіку зі "
-"станом відслідковування з'єднань <em>invalid</em>. Це може знадобитися для "
-"складних налаштувань асиметричного маршруту."
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "Не перезаписувати"
+"Не встановлювати додаткові правила для відхилення переспрямованого трафіку "
+"зі станом відслідковування з'єднань <em>invalid</em>. Це може знадобитися "
+"для складних налаштувань асиметричного маршруту."
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
@@ -227,64 +208,60 @@ msgstr "Не відслідковувати вхідний"
msgid "Do not track output"
msgstr "Не відслідковувати вихідний"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
msgid "Drop invalid packets"
msgstr "Відкидати помилкові пакети"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr "Увімкнути"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
msgid "Enable NAT Loopback"
msgstr "Увімкнути NAT Loopback"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
msgid "Enable SYN-flood protection"
msgstr "Увімкнути захист від SYN-flood"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "Увімкнути реєстрування у цій зоні"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr "Експериментальна функція. Не повністю сумісно з QoS / SQM."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
-msgstr "В явному вигляді дозволені помічники відслідковування з'єднань для трафіку зони"
+msgstr ""
+"В явному вигляді дозволені помічники відслідковування з'єднань для трафіку "
+"зони"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
msgid "External IP address"
msgstr "Зовнішня IP-адреса"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
msgid "External port"
msgstr "Зовнішній порт"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Зовнішня зона"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "Додаткові аргументи"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr "Додаткові аргументи для призначення"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
msgid "Extra iptables arguments"
msgstr "Додаткові аргументи iptables"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr "Додаткові аргументи для джерела"
@@ -296,32 +273,32 @@ msgstr "Брандмауер"
msgid "Firewall - Custom Rules"
msgstr "Брандмауер — Настроювані правила"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
msgid "Firewall - Port Forwards"
msgstr "Брандмауер — Переспрямовування портів"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
msgid "Firewall - Traffic Rules"
msgstr "Брандмауер — Правила трафіка"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
msgid "Firewall - Zone Settings"
msgstr "Брандмауер — Параметри зон"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr "Примусове відслідковування з'єднань"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "Переспрямовування"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
msgid "Forward to"
msgstr "переспрямовування до"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Friday"
msgstr "П'ятниця"
@@ -352,15 +329,15 @@ msgstr "Від %s на <var>цьому пристрої</var> з джерело
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr "Від %s на <var>цьому пристрої</var> з джерелом %s та %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
msgid "General Settings"
msgstr "Загальні параметри"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
msgid "Hardware flow offloading"
msgstr "Апаратні засоби розвантаження потоку"
@@ -384,13 +361,13 @@ msgid "IPv4"
msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 та IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "Лише IPv4"
@@ -398,32 +375,29 @@ msgstr "Лише IPv4"
msgid "IPv6"
msgstr "IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "Лише IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "Вхідний"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
msgid "Internal IP address"
msgstr "Внутрішня IP-адреса"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
msgid "Internal port"
msgstr "Внутрішній порт"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
msgid "Internal zone"
msgstr "Внутрішня зона"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Обмеження повідомлень журналу"
@@ -437,24 +411,24 @@ msgstr "MAC-адреса"
msgid "MACs"
msgstr "MAC-адреси"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr "Затискання MSS"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr "Підміна"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
msgid "Match"
msgstr "Зіставляти"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
msgid "Match ICMP type"
msgstr "Зіставляти ICMP типу"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
msgid ""
"Match incoming traffic directed at the given destination port or port range "
"on this host"
@@ -462,22 +436,18 @@ msgstr ""
"Зіставляти вхідний трафік, спрямований на заданий порт призначення або "
"діапазон портів цього вузла."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Monday"
msgstr "Понеділок"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
msgid "Month Days"
msgstr "Дні місяця"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Ім'я"
@@ -485,41 +455,19 @@ msgstr "Ім'я"
msgid "Network"
msgstr "Мережа"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Нове правило SNAT"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "Нове правило переспрямовування"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Нове вхідне правило"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Нове переспрямовування порту"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Новий NAT джерела"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr "Зіставляти тільки вхідний трафік, спрямований на задану IP-адресу."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
msgid "Only match incoming traffic from these MACs."
msgstr "Зіставляти тільки вхідний трафік від цих MAC-адрес."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
msgid "Only match incoming traffic from this IP or range."
msgstr "Зіставляти тільки вхідний трафік від цього IP чи діапазону."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
@@ -527,27 +475,18 @@ msgstr ""
"Зіставляти тільки вхідний трафік, що виникає на заданому порту джерела або "
"діапазоні портів вузла клієнта."
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Відкрити порти на роутері"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Інше..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "Вихідний"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
"Передача додаткових аргументів для IPTables. Використовуйте з обережністю!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -556,17 +495,17 @@ msgid ""
"all services."
msgstr ""
"Передавання аргументів raw iptables до правил класифікації вихідного трафіку "
-"та трафіку призначення дозволяє зіставляти пакети на підставі інших критеріїв, "
-"ніж інтерфейси чи підмережі. Ці параметри слід використовувати з особливою "
-"обережністю, оскільки невірні значення можуть призвести до порушення набору "
-"правил брандмауера, повністю відкриваючи всі служби."
+"та трафіку призначення дозволяє зіставляти пакети на підставі інших "
+"критеріїв, ніж інтерфейси чи підмережі. Ці параметри слід використовувати з "
+"особливою обережністю, оскільки невірні значення можуть призвести до "
+"порушення набору правил брандмауера, повністю відкриваючи всі служби."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
msgid "Port Forwards"
msgstr "Переспрямовування портів"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
msgid ""
"Port forwarding allows remote computers on the Internet to connect to a "
"specific computer or service within the private LAN."
@@ -574,7 +513,7 @@ msgstr ""
"Переспрямовування портів дозволяє віддаленим комп'ютерам з Інтернету "
"підключатися до певного комп'ютера або служби у приватній мережі."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -582,20 +521,18 @@ msgstr ""
"Запобігати встановленню правил NOTRACK, які могли б обійти відслідковування "
"з'єднань."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
msgid "Protocol"
msgstr "Протокол"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
msgid ""
"Redirect matched incoming traffic to the given port on the internal host"
msgstr ""
"Переспрямувати відповідний вхідний трафік на заданий порт внутрішнього вузла"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr "Переспрямувати відповідний вхідний трафік на заданий внутрішній вузол"
@@ -614,7 +551,7 @@ msgstr "Відхиляти вхідний"
msgid "Refuse output"
msgstr "Відхиляти вихідний"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr "Необхідна апаратна підтримка NAT. Упроваджено принаймні для mt7621"
@@ -622,20 +559,20 @@ msgstr "Необхідна апаратна підтримка NAT. Упрова
msgid "Restart Firewall"
msgstr "Перезавантажити брандмауер"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr "Обмежити підміну заданими підмережами призначення"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr "Обмежити підміну заданими підмережами джерела"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr "Обмежити сімейство протоколів"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
msgid "Routing/NAT Offloading"
msgstr "Розвантаження маршрутизації/NAT"
@@ -647,64 +584,62 @@ msgstr "Правило вимкнено"
msgid "Rule is enabled"
msgstr "Правило ввімкнено"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
msgid "Saturday"
msgstr "Субота"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr "Програмне розвантаження для маршрутизації/NAT"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
msgid "Software flow offloading"
msgstr "Програмне розвантаження потоку"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
msgid "Source IP address"
msgstr "IP-адреса джерела"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
msgid "Source MAC address"
msgstr "MAC-адреса джерела"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
msgid "Source address"
msgstr "Адреса джерела"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
msgid "Source port"
msgstr "Порт джерела"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
msgid "Source zone"
msgstr "Зона джерела"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
msgid "Start Date (yyyy-mm-dd)"
msgstr "Дата початку (рррр-мм-дд)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
msgid "Start Time (hh.mm.ss)"
msgstr "Час початку (гг:хх:сс)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
msgid "Stop Date (yyyy-mm-dd)"
msgstr "Дата зупинки (рррр-мм-дд)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
msgid "Stop Time (hh.mm.ss)"
msgstr "Час зупинки (гг:хх:сс)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Sunday"
msgstr "Неділя"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
msgid ""
"The firewall creates zones over your network interfaces to control network "
"traffic flow."
@@ -712,8 +647,8 @@ msgstr ""
"Брандмауер створює зони поверх ваших мережевих інтерфейсів для управління "
"потоком мережевого трафіку."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -730,7 +665,7 @@ msgstr ""
"від LAN до WAN <em>не</em> означає, що є також дозвіл спрямовувати від WAN "
"до LAN."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -744,15 +679,15 @@ msgstr ""
"трафіку між різними мережами в межах зони. Пункт <em>Покриті мережі</em> "
"визначає, які доступні мережі є членами цієї зони."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
msgid "Thursday"
msgstr "Четвер"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
msgid "Time Restrictions"
msgstr "Часові обмеження"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
msgid "Time in UTC"
msgstr "Час в UTC"
@@ -772,20 +707,12 @@ msgstr "%s на <var>цього пристрою</var>"
msgid "To %s, %s in %s"
msgstr "%s, %s у %s"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "До IP джерела"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "До порту джерела"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
msgstr "Правила трафіка"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
msgid ""
"Traffic rules define policies for packets traveling between different zones, "
"for example to reject traffic between certain hosts or to open WAN ports on "
@@ -795,25 +722,25 @@ msgstr ""
"різними зонами, наприклад, відхиляти трафік між певними вузлами або відкрити "
"порти WAN на маршрутизаторі."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
msgid "Tuesday"
msgstr "Вівторок"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
msgid "Unnamed forward"
msgstr "Переспрямовування без назви"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
msgid "Unnamed rule"
msgstr "Правило без назви"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr "Зона без назви"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
@@ -821,7 +748,7 @@ msgstr ""
"Використовуйте цей параметр для класифікації трафіку зон за мережевими "
"пристроями <em>raw</em>, які не управляються через <em>uci</em>."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -837,44 +764,44 @@ msgstr "Через %s"
msgid "Via %s at %s"
msgstr "Через %s на %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Wednesday"
msgstr "Середа"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
msgid "Week Days"
msgstr "Дні тижня"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "Зона ⇒ Переспрямовування"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Zones"
msgstr "Зони"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "приймати"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
msgid "any"
msgstr "будь-який"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
@@ -888,7 +815,7 @@ msgstr "будь-який IP роутера"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr "будь-якій зоні"
@@ -898,13 +825,13 @@ msgstr "будь-якій зоні"
msgid "day"
msgstr "день"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
msgid "don't track"
msgstr "не відстеж."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "опускати"
@@ -935,9 +862,9 @@ msgstr "порт"
msgid "ports"
msgstr "порти"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "відкидати"
@@ -946,6 +873,12 @@ msgstr "відкидати"
msgid "second"
msgstr "секунду"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -955,3 +888,42 @@ msgstr "типом"
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
msgid "types"
msgstr "типами"
+
+#~ msgid "Add"
+#~ msgstr "Додати"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Додати та редагувати..."
+
+#~ msgid "Do not rewrite"
+#~ msgstr "Не перезаписувати"
+
+#~ msgid "External zone"
+#~ msgstr "Зовнішня зона"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Нове правило SNAT"
+
+#~ msgid "New forward rule"
+#~ msgstr "Нове правило переспрямовування"
+
+#~ msgid "New input rule"
+#~ msgstr "Нове вхідне правило"
+
+#~ msgid "New port forward"
+#~ msgstr "Нове переспрямовування порту"
+
+#~ msgid "New source NAT"
+#~ msgstr "Новий NAT джерела"
+
+#~ msgid "Open ports on router"
+#~ msgstr "Відкрити порти на роутері"
+
+#~ msgid "Other..."
+#~ msgstr "Інше..."
+
+#~ msgid "To source IP"
+#~ msgstr "До IP джерела"
+
+#~ msgid "To source port"
+#~ msgstr "До порту джерела"
diff --git a/applications/luci-app-firewall/po/vi/firewall.po b/applications/luci-app-firewall/po/vi/firewall.po
index 6cda161c22..31868bac62 100644
--- a/applications/luci-app-firewall/po/vi/firewall.po
+++ b/applications/luci-app-firewall/po/vi/firewall.po
@@ -60,26 +60,14 @@ msgstr ""
msgid "Action"
msgstr "Action"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -91,15 +79,15 @@ msgstr ""
msgid "Advanced Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr ""
@@ -112,11 +100,11 @@ msgstr ""
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
@@ -125,19 +113,19 @@ msgstr ""
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:133
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -161,8 +149,6 @@ msgid "Destination port"
msgstr "Cổng điểm đến"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
#, fuzzy
msgid "Destination zone"
msgstr "Điểm đến"
@@ -186,17 +172,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -231,7 +212,7 @@ msgstr ""
msgid "Enable SYN-flood protection"
msgstr "SYN-flood bảo vệ "
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr ""
@@ -239,7 +220,7 @@ msgstr ""
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
@@ -248,21 +229,15 @@ msgid "External IP address"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: 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"
msgstr "External port"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
@@ -270,7 +245,7 @@ msgstr ""
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -294,12 +269,12 @@ msgstr ""
msgid "Firewall - Zone Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr ""
@@ -371,12 +346,12 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr ""
@@ -385,33 +360,30 @@ msgid "IPv6"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "Input"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
-#: 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:251
-#: 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:233
-#: 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:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr ""
@@ -425,12 +397,12 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
#, fuzzy
msgid "MSS clamping"
msgstr "MSS Clamping"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr ""
@@ -460,11 +432,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:92
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr ""
@@ -472,28 +440,6 @@ msgstr ""
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
@@ -512,17 +458,8 @@ msgid ""
"range on the client host"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "Output"
@@ -531,7 +468,7 @@ msgstr "Output"
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -551,7 +488,7 @@ msgid ""
"specific computer or service within the private LAN."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -559,8 +496,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
-#: 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 ""
@@ -596,16 +531,16 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: 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:188
msgid "Restrict to address family"
msgstr ""
@@ -655,8 +590,6 @@ msgstr "Cổng nguồn"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
-#: 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"
@@ -689,8 +622,8 @@ msgstr ""
"The firewall tạo zones trên giao diện mạng lưới để điều triển sự dòng lưu "
"thông của mạng."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -700,7 +633,7 @@ msgid ""
"<em>not</em> imply a permission to forward from wan to lan as well."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -737,14 +670,6 @@ msgstr ""
msgid "To %s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
@@ -771,17 +696,17 @@ msgstr ""
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -803,7 +728,7 @@ msgstr ""
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr ""
@@ -813,7 +738,7 @@ msgstr "Zones"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "chấp nhận"
@@ -862,7 +787,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "drop"
@@ -895,7 +820,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "Không chấp nhận"
@@ -904,6 +829,12 @@ msgstr "Không chấp nhận"
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
diff --git a/applications/luci-app-firewall/po/zh-cn/firewall.po b/applications/luci-app-firewall/po/zh-cn/firewall.po
index 5264f5105e..28cd88b5c9 100644
--- a/applications/luci-app-firewall/po/zh-cn/firewall.po
+++ b/applications/luci-app-firewall/po/zh-cn/firewall.po
@@ -58,26 +58,14 @@ msgstr "接受出站"
msgid "Action"
msgstr "动作"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "添加"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "添加并编辑…"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -89,15 +77,15 @@ msgstr ""
msgid "Advanced Settings"
msgstr "高级设置"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "允许从<em>源区域</em>转发:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "允许转发到<em>目标区域</em>:"
@@ -110,11 +98,11 @@ msgstr "任何"
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
@@ -123,19 +111,19 @@ msgstr ""
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:133
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "覆盖网络"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -161,8 +149,6 @@ msgid "Destination port"
msgstr "目标端口"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: 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"
msgstr "目标区域"
@@ -185,17 +171,12 @@ msgstr "丢弃入站"
msgid "Discard output"
msgstr "丢弃出站"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "不重写"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -229,7 +210,7 @@ msgstr "启用 NAT 环回"
msgid "Enable SYN-flood protection"
msgstr "启用 SYN-flood 防御"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "启用此区域的日志记录"
@@ -237,7 +218,7 @@ msgstr "启用此区域的日志记录"
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr "实验特性。与 QoS/SQM 不完全兼容。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
@@ -246,21 +227,15 @@ msgid "External IP address"
msgstr "外部 IP 地址"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: 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"
msgstr "外部端口"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "外部区域"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "附加参数"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
@@ -268,7 +243,7 @@ msgstr ""
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -292,12 +267,12 @@ msgstr "防火墙 - 通信规则"
msgid "Firewall - Zone Settings"
msgstr "防火墙 - 区域设置"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr "强制连接追踪"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "转发"
@@ -369,12 +344,12 @@ msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 和 IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "仅 IPv4"
@@ -383,31 +358,28 @@ msgid "IPv6"
msgstr "IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "仅 IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "入站数据"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
-#: 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:251
-#: 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:233
-#: 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:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "限制日志信息"
@@ -421,11 +393,11 @@ msgstr "MAC"
msgid "MACs"
msgstr "MAC"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr "MSS 钳制"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr "IP 动态伪装"
@@ -455,11 +427,7 @@ msgstr "日期"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:92
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "名字"
@@ -467,28 +435,6 @@ msgstr "名字"
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "新建 SNAT 规则"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "新建转发规则"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "新建进入规则"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "新建端口转发"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "新建 Source NAT"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr "仅匹配指定目的 IP 地址的入站流量。"
@@ -507,17 +453,8 @@ msgid ""
"range on the client host"
msgstr "仅匹配源自客户端主机上给定源端口或源端口范围的入站流量。"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "打开路由器端口"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "其它..."
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "出站数据"
@@ -526,7 +463,7 @@ msgstr "出站数据"
msgid "Passes additional arguments to iptables. Use with care!"
msgstr "传递到 iptables 的额外参数。小心使用!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -547,7 +484,7 @@ msgid ""
msgstr ""
"端口转发允许 Internet 上的远程计算机连接到内部网络中的特定计算机或服务。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -555,8 +492,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
-#: 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 "协议"
@@ -592,16 +527,16 @@ msgstr "需要硬件 NAT 支持。目前 mt7621 已实现"
msgid "Restart Firewall"
msgstr "重启防火墙"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr "要限制 IP 动态伪装的目标子网"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr "要限制 IP 动态伪装的源子网"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: 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:188
msgid "Restrict to address family"
msgstr "限制地址"
@@ -649,8 +584,6 @@ msgstr "源端口"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
-#: 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 "源区域"
@@ -680,8 +613,8 @@ msgid ""
"traffic flow."
msgstr "防火墙通过在网络接口上创建区域来控制网络流量。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -695,7 +628,7 @@ msgstr ""
"strong> 的区域的需转发流量。转发规则的作用是<em>单向</em>的,例如:一条允许"
"从 lan 到 wan 的转发规则并不隐含有允许相反方向从 wan 到 lan 的流量转发。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -735,14 +668,6 @@ msgstr "到 %s 位于<var>本设备</var>"
msgid "To %s, %s in %s"
msgstr "到 %s, %s 位于 %s"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "到源 IP"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "到源端口"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
@@ -771,17 +696,17 @@ msgstr "未命名转发"
msgid "Unnamed rule"
msgstr "未命名规则"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -803,7 +728,7 @@ msgstr "星期三"
msgid "Week Days"
msgstr "星期"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "区域 ⇒ 转发"
@@ -813,7 +738,7 @@ msgstr "区域"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "接受"
@@ -862,7 +787,7 @@ msgstr "不跟踪"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "丢弃"
@@ -895,7 +820,7 @@ msgstr "端口"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "拒绝"
@@ -904,6 +829,12 @@ msgstr "拒绝"
msgid "second"
msgstr "秒"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -914,6 +845,45 @@ msgstr "类型"
msgid "types"
msgstr "类型"
+#~ msgid "Add"
+#~ msgstr "添加"
+
+#~ msgid "Add and edit..."
+#~ msgstr "添加并编辑…"
+
+#~ msgid "Do not rewrite"
+#~ msgstr "不重写"
+
+#~ msgid "External zone"
+#~ msgstr "外部区域"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "新建 SNAT 规则"
+
+#~ msgid "New forward rule"
+#~ msgstr "新建转发规则"
+
+#~ msgid "New input rule"
+#~ msgstr "新建进入规则"
+
+#~ msgid "New port forward"
+#~ msgstr "新建端口转发"
+
+#~ msgid "New source NAT"
+#~ msgstr "新建 Source NAT"
+
+#~ msgid "Open ports on router"
+#~ msgstr "打开路由器端口"
+
+#~ msgid "Other..."
+#~ msgstr "其它..."
+
+#~ msgid "To source IP"
+#~ msgstr "到源 IP"
+
+#~ msgid "To source port"
+#~ msgstr "到源端口"
+
#~ msgid "Output zone"
#~ msgstr "出站区域"
diff --git a/applications/luci-app-firewall/po/zh-tw/firewall.po b/applications/luci-app-firewall/po/zh-tw/firewall.po
index de8aa416e6..9754bc7a57 100644
--- a/applications/luci-app-firewall/po/zh-tw/firewall.po
+++ b/applications/luci-app-firewall/po/zh-tw/firewall.po
@@ -58,26 +58,14 @@ msgstr "接受出站"
msgid "Action"
msgstr "動作"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "新增"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "新增並編輯…"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -89,15 +77,15 @@ msgstr ""
msgid "Advanced Settings"
msgstr "高階設定"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "允許從<em>源區域</em>轉發:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "允許轉發到<em>目標區域</em>:"
@@ -110,11 +98,11 @@ msgstr "任何"
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
@@ -123,19 +111,19 @@ msgstr ""
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:133
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "覆蓋網路"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -161,8 +149,6 @@ msgid "Destination port"
msgstr "目標埠"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: 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"
msgstr "目標區域"
@@ -185,17 +171,12 @@ msgstr "丟棄入站"
msgid "Discard output"
msgstr "丟棄出站"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "不重寫"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -229,7 +210,7 @@ msgstr "啟用 NAT 環回"
msgid "Enable SYN-flood protection"
msgstr "啟用 SYN-flood 防禦"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "啟用此區域的日誌記錄"
@@ -237,7 +218,7 @@ msgstr "啟用此區域的日誌記錄"
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr "實驗特性。與 QoS/SQM 不完全相容。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
@@ -246,21 +227,15 @@ msgid "External IP address"
msgstr "外部 IP 位址"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: 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"
msgstr "外部埠"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "外部區域"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "附加引數"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
@@ -268,7 +243,7 @@ msgstr ""
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -292,12 +267,12 @@ msgstr "防火牆 - 通訊規則"
msgid "Firewall - Zone Settings"
msgstr "防火牆 - 區域設定"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr "強制連線追蹤"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "轉發"
@@ -369,12 +344,12 @@ msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 和 IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "僅 IPv4"
@@ -383,31 +358,28 @@ msgid "IPv6"
msgstr "IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "僅 IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "入站資料"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
-#: 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:251
-#: 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:233
-#: 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:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "限制日誌資訊"
@@ -421,11 +393,11 @@ msgstr "MAC"
msgid "MACs"
msgstr "MAC"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr "MSS 鉗制"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr "IP 動態偽裝"
@@ -455,11 +427,7 @@ msgstr "日期"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:92
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "名字"
@@ -467,28 +435,6 @@ msgstr "名字"
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "新建 SNAT 規則"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "新建轉發規則"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "新建進入規則"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "新建埠轉發"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "新建 Source NAT"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr "僅匹配指定目的 IP 位址的入站流量。"
@@ -507,17 +453,8 @@ msgid ""
"range on the client host"
msgstr "僅匹配源自客戶端主機上給定源埠或源埠範圍的入站流量。"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "開啟路由器埠"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "其它..."
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "出站資料"
@@ -526,7 +463,7 @@ msgstr "出站資料"
msgid "Passes additional arguments to iptables. Use with care!"
msgstr "傳遞到 iptables 的額外引數。小心使用!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -546,7 +483,7 @@ msgid ""
"specific computer or service within the private LAN."
msgstr "埠轉發允許 Internet 上的遠端計算機連線到內部網路中的特定計算機或服務。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -554,8 +491,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
-#: 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 "協議"
@@ -591,16 +526,16 @@ msgstr "需要硬體 NAT 支援。目前 mt7621 已實現"
msgid "Restart Firewall"
msgstr "重啟防火牆"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr "要限制 IP 動態偽裝的目標子網"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr "要限制 IP 動態偽裝的源子網"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: 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:188
msgid "Restrict to address family"
msgstr "限制位址"
@@ -648,8 +583,6 @@ msgstr "源埠"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
-#: 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 "源區域"
@@ -679,8 +612,8 @@ msgid ""
"traffic flow."
msgstr "防火牆通過在網路介面上建立區域來控制網路流量。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -694,7 +627,7 @@ msgstr ""
"strong> 的區域的需轉發流量。轉發規則的作用是<em>單向</em>的,例如:一條允許"
"從 lan 到 wan 的轉發規則並不隱含有允許相反方向從 wan 到 lan 的流量轉發。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -734,14 +667,6 @@ msgstr "到 %s 位於<var>本裝置</var>"
msgid "To %s, %s in %s"
msgstr "到 %s, %s 位於 %s"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "到源 IP"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "到源埠"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
@@ -770,17 +695,17 @@ msgstr "未命名轉發"
msgid "Unnamed rule"
msgstr "未命名規則"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -802,7 +727,7 @@ msgstr "星期三"
msgid "Week Days"
msgstr "星期"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "區域 ⇒ 轉發"
@@ -812,7 +737,7 @@ msgstr "區域"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "接受"
@@ -861,7 +786,7 @@ msgstr "不跟蹤"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "丟棄"
@@ -894,7 +819,7 @@ msgstr "埠"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "拒絕"
@@ -903,6 +828,12 @@ msgstr "拒絕"
msgid "second"
msgstr "秒"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -913,6 +844,45 @@ msgstr "型別"
msgid "types"
msgstr "型別"
+#~ msgid "Add"
+#~ msgstr "新增"
+
+#~ msgid "Add and edit..."
+#~ msgstr "新增並編輯…"
+
+#~ msgid "Do not rewrite"
+#~ msgstr "不重寫"
+
+#~ msgid "External zone"
+#~ msgstr "外部區域"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "新建 SNAT 規則"
+
+#~ msgid "New forward rule"
+#~ msgstr "新建轉發規則"
+
+#~ msgid "New input rule"
+#~ msgstr "新建進入規則"
+
+#~ msgid "New port forward"
+#~ msgstr "新建埠轉發"
+
+#~ msgid "New source NAT"
+#~ msgstr "新建 Source NAT"
+
+#~ msgid "Open ports on router"
+#~ msgstr "開啟路由器埠"
+
+#~ msgid "Other..."
+#~ msgstr "其它..."
+
+#~ msgid "To source IP"
+#~ msgstr "到源 IP"
+
+#~ msgid "To source port"
+#~ msgstr "到源埠"
+
#~ msgid "Output zone"
#~ msgstr "出站區域"