Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/openwrt/luci.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2020-01-16 23:36:39 +0300
committerJo-Philipp Wich <jo@mein.io>2020-01-16 23:36:39 +0300
commit28f4a9fcedda504adac3426195749c45b8893836 (patch)
treeda3259892c5495faabd641a1222c25e2c11ede14 /applications
parentaa62419e5ba92a0cdd8ceb487e9b9b819cf357d0 (diff)
luci-app-firewall: support 'limit' and 'limit_burst' options
Also resync firewall translations. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'applications')
-rw-r--r--applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js36
-rw-r--r--applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js36
-rw-r--r--applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js41
-rw-r--r--applications/luci-app-firewall/po/bg/firewall.po295
-rw-r--r--applications/luci-app-firewall/po/ca/firewall.po295
-rw-r--r--applications/luci-app-firewall/po/cs/firewall.po295
-rw-r--r--applications/luci-app-firewall/po/de/firewall.po295
-rw-r--r--applications/luci-app-firewall/po/el/firewall.po295
-rw-r--r--applications/luci-app-firewall/po/en/firewall.po295
-rw-r--r--applications/luci-app-firewall/po/es/firewall.po295
-rw-r--r--applications/luci-app-firewall/po/fr/firewall.po295
-rw-r--r--applications/luci-app-firewall/po/he/firewall.po295
-rw-r--r--applications/luci-app-firewall/po/hi/firewall.po295
-rw-r--r--applications/luci-app-firewall/po/hu/firewall.po295
-rw-r--r--applications/luci-app-firewall/po/it/firewall.po295
-rw-r--r--applications/luci-app-firewall/po/ja/firewall.po295
-rw-r--r--applications/luci-app-firewall/po/ko/firewall.po295
-rw-r--r--applications/luci-app-firewall/po/mr/firewall.po295
-rw-r--r--applications/luci-app-firewall/po/ms/firewall.po295
-rw-r--r--applications/luci-app-firewall/po/no/firewall.po295
-rw-r--r--applications/luci-app-firewall/po/pl/firewall.po297
-rw-r--r--applications/luci-app-firewall/po/pt-br/firewall.po295
-rw-r--r--applications/luci-app-firewall/po/pt/firewall.po295
-rw-r--r--applications/luci-app-firewall/po/ro/firewall.po295
-rw-r--r--applications/luci-app-firewall/po/ru/firewall.po295
-rw-r--r--applications/luci-app-firewall/po/sk/firewall.po295
-rw-r--r--applications/luci-app-firewall/po/sv/firewall.po295
-rw-r--r--applications/luci-app-firewall/po/templates/firewall.pot295
-rw-r--r--applications/luci-app-firewall/po/tr/firewall.po295
-rw-r--r--applications/luci-app-firewall/po/uk/firewall.po295
-rw-r--r--applications/luci-app-firewall/po/vi/firewall.po295
-rw-r--r--applications/luci-app-firewall/po/zh-cn/firewall.po295
-rw-r--r--applications/luci-app-firewall/po/zh-tw/firewall.po295
33 files changed, 6112 insertions, 2853 deletions
diff --git a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js
index 030b78b2d9..f8b9e19e12 100644
--- a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js
+++ b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js
@@ -315,6 +315,42 @@ return L.view.extend({
return true;
};
+ o = s.taboption('advanced', form.Value, 'limit', _('Limit matching'),
+ _('Limits traffic matching to the specified rate.'));
+ o.modalonly = true;
+ o.rmempty = true;
+ o.placeholder = _('unlimited');
+ o.value('10/second');
+ o.value('60/minute');
+ o.value('3/hour');
+ o.value('500/day');
+ o.validate = function(section_id, value) {
+ if (value == '')
+ return true;
+
+ var m = String(value).toLowerCase().match(/^(?:0x[0-9a-f]{1,8}|[0-9]{1,10})\/([a-z]+)$/),
+ u = ['second', 'minute', 'hour', 'day'],
+ i = 0;
+
+ if (m)
+ for (i = 0; i < u.length; i++)
+ if (u[i].indexOf(m[1]) == 0)
+ break;
+
+ if (!m || i >= u.length)
+ return _('Invalid limit value');
+
+ return true;
+ };
+
+ o = s.taboption('advanced', form.Value, 'limit_burst', _('Limit burst'),
+ _('Maximum initial number of packets to match: this number gets recharged by one every time the limit specified above is not reached, up to this number.'));
+ o.modalonly = true;
+ o.rmempty = true;
+ o.placeholder = '5';
+ o.datatype = 'uinteger';
+ o.depends({ limit: null, '!reverse': true });
+
o = s.taboption('advanced', form.Value, 'extra', _('Extra arguments'),
_('Passes additional arguments to iptables. Use with care!'));
o.modalonly = true;
diff --git a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js
index 9d8d8d1559..a5b27ccf30 100644
--- a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js
+++ b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js
@@ -555,6 +555,42 @@ return L.view.extend({
return true;
};
+ o = s.taboption('advanced', form.Value, 'limit', _('Limit matching'),
+ _('Limits traffic matching to the specified rate.'));
+ o.modalonly = true;
+ o.rmempty = true;
+ o.placeholder = _('unlimited');
+ o.value('10/second');
+ o.value('60/minute');
+ o.value('3/hour');
+ o.value('500/day');
+ o.validate = function(section_id, value) {
+ if (value == '')
+ return true;
+
+ var m = String(value).toLowerCase().match(/^(?:0x[0-9a-f]{1,8}|[0-9]{1,10})\/([a-z]+)$/),
+ u = ['second', 'minute', 'hour', 'day'],
+ i = 0;
+
+ if (m)
+ for (i = 0; i < u.length; i++)
+ if (u[i].indexOf(m[1]) == 0)
+ break;
+
+ if (!m || i >= u.length)
+ return _('Invalid limit value');
+
+ return true;
+ };
+
+ o = s.taboption('advanced', form.Value, 'limit_burst', _('Limit burst'),
+ _('Maximum initial number of packets to match: this number gets recharged by one every time the limit specified above is not reached, up to this number.'));
+ o.modalonly = true;
+ o.rmempty = true;
+ o.placeholder = '5';
+ o.datatype = 'uinteger';
+ o.depends({ limit: null, '!reverse': true });
+
o = s.taboption('advanced', form.Value, 'extra', _('Extra arguments'),
_('Passes additional arguments to iptables. Use with care!'));
o.modalonly = true;
diff --git a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js
index 48fd98ff28..b46791587a 100644
--- a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js
+++ b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js
@@ -81,10 +81,11 @@ function snat_proto_txt(s) {
var m = uci.get('firewall', s, 'mark'),
p = uci.get('firewall', s, 'proto');
- return fmt(_('Match %{protocol?%{family} %{protocol} traffic:any %{family} traffic} %{mark?with firewall mark %{mark}}'), {
+ return fmt(_('Match %{protocol?%{family} %{protocol} traffic:any %{family} traffic} %{mark?with firewall mark %{mark}} %{limit?limited to %{limit}}'), {
protocol: (p && p != 'all' && p != 'any' && p != '*') ? fwtool.fmt_proto(uci.get('firewall', s, 'proto')) : null,
family: fwtool.fmt_family('ipv4'),
- mark: m ? E('var', {}, fwtool.fmt_neg(m)) : null
+ mark: m ? E('var', {}, fwtool.fmt_neg(m)) : null,
+ limit: fwtool.fmt_limit(uci.get('firewall', s, 'limit'), uci.get('firewall', s, 'limit_burst'))
});
}
@@ -328,6 +329,42 @@ return L.view.extend({
return true;
};
+ o = s.taboption('advanced', form.Value, 'limit', _('Limit matching'),
+ _('Limits traffic matching to the specified rate.'));
+ o.modalonly = true;
+ o.rmempty = true;
+ o.placeholder = _('unlimited');
+ o.value('10/second');
+ o.value('60/minute');
+ o.value('3/hour');
+ o.value('500/day');
+ o.validate = function(section_id, value) {
+ if (value == '')
+ return true;
+
+ var m = String(value).toLowerCase().match(/^(?:0x[0-9a-f]{1,8}|[0-9]{1,10})\/([a-z]+)$/),
+ u = ['second', 'minute', 'hour', 'day'],
+ i = 0;
+
+ if (m)
+ for (i = 0; i < u.length; i++)
+ if (u[i].indexOf(m[1]) == 0)
+ break;
+
+ if (!m || i >= u.length)
+ return _('Invalid limit value');
+
+ return true;
+ };
+
+ o = s.taboption('advanced', form.Value, 'limit_burst', _('Limit burst'),
+ _('Maximum initial number of packets to match: this number gets recharged by one every time the limit specified above is not reached, up to this number.'));
+ o.modalonly = true;
+ o.rmempty = true;
+ o.placeholder = '5';
+ o.datatype = 'uinteger';
+ o.depends({ limit: null, '!reverse': true });
+
o = s.taboption('advanced', form.Value, 'extra', _('Extra arguments'),
_('Passes additional arguments to iptables. Use with care!'));
o.modalonly = true;
diff --git a/applications/luci-app-firewall/po/bg/firewall.po b/applications/luci-app-firewall/po/bg/firewall.po
index abae4ce3c4..cc6a5e3148 100644
--- a/applications/luci-app-firewall/po/bg/firewall.po
+++ b/applications/luci-app-firewall/po/bg/firewall.po
@@ -38,11 +38,11 @@ msgstr ""
msgid "<var>%s</var> and limit to %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:280
msgid "A rewrite IP must be specified!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:267
msgid "ACCEPT - Disable address rewriting"
msgstr ""
@@ -60,7 +60,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:224
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:388
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:262
msgid "Action"
msgstr ""
@@ -79,7 +79,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr ""
@@ -97,18 +97,29 @@ msgid "Allow forward to <em>destination zones</em>:"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:198
msgid "Any"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:430
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:446
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:340
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:602
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:618
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:377
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:393
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid ""
+"Apply a bitwise XOR of the given value and the existing mark value on "
+"established connections. Format is value[/mask]. If a mask is specified then "
+"those bits set in the mask are zeroed out."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "Apply the given DSCP class or value to established connections."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Assign the specified connection tracking helper to matched traffic."
msgstr ""
@@ -156,7 +167,19 @@ msgid ""
"each firewall restart, right after the default ruleset has been loaded."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:398
+msgid "DSCP classification"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:466
+msgid "DSCP mark required"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
msgid "Destination IP address"
msgstr ""
@@ -165,7 +188,7 @@ msgid "Destination address"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:379
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
msgid "Destination port"
msgstr ""
@@ -195,7 +218,7 @@ msgid ""
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:125
msgid "Do not rewrite"
msgstr ""
@@ -217,7 +240,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:157
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:230
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:189
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:190
msgid "Enable"
msgstr ""
@@ -234,7 +257,10 @@ msgid "Enable logging on this zone"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "Expecting: %s"
msgstr ""
@@ -254,9 +280,9 @@ msgstr ""
msgid "External port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:422
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:594
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:368
msgid "Extra arguments"
msgstr ""
@@ -284,7 +310,7 @@ msgstr ""
msgid "Firewall - Custom Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
msgid "Firewall - NAT Rules"
msgstr ""
@@ -309,8 +335,8 @@ msgstr ""
msgid "Forward to"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:436
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:608
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:383
msgid "Friday"
msgstr ""
@@ -341,13 +367,13 @@ msgstr ""
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:93
msgid "From %{ipaddr?:any host} %{port?with source %{port}}"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
#: 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/root/usr/share/luci/menu.d/luci-app-firewall.json:16
@@ -415,10 +441,39 @@ msgstr ""
msgid "Internal zone"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:471
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:553
+msgid "Invalid DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:581
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:355
+msgid "Invalid limit value"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:586
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:360
+msgid "Limit burst"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:558
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+msgid "Limit matching"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:559
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:333
+msgid "Limits traffic matching to the specified rate."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:275
msgid "Loopback source IP"
msgstr ""
@@ -431,7 +486,7 @@ msgstr "MAC"
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
msgstr ""
@@ -445,14 +500,18 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:133
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:174
msgid "Match"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:84
msgid ""
"Match %{protocol?%{family} %{protocol} traffic:any %{family} traffic} %{mark?"
-"with firewall mark %{mark}}"
+"with firewall mark %{mark}} %{limit?limited to %{limit}}"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:517
+msgid "Match DSCP"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:288
@@ -463,26 +522,26 @@ msgstr ""
msgid "Match device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:239
msgid "Match forwarded traffic directed at the given IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:252
msgid ""
"Match forwarded traffic directed at the given destination port or port range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
msgid "Match forwarded traffic from this IP or range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:228
msgid ""
"Match forwarded traffic originating from the given source port or port range."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match helper"
msgstr ""
@@ -493,40 +552,54 @@ msgid ""
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:302
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:315
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:501
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
msgid "Match mark"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match traffic using the specified connection tracking helper."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:303
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:502
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:317
msgid "Matches a specific firewall mark or a range of different marks."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:311
msgid "Matches forwarded traffic using the specified outbound network device."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:432
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:518
+msgid "Matches traffic carrying the specified DSCP marking."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:587
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:361
+msgid ""
+"Maximum initial number of packets to match: this number gets recharged by "
+"one every time the limit specified above is not reached, up to this number."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:604
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
msgid "Monday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:442
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:614
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:389
msgid "Month Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:156
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:157
#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
msgid "NAT Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:155
msgid ""
"NAT rules allow fine grained control over the source IP to use for outbound "
"or forwarded traffic."
@@ -534,7 +607,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:129
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:210
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr ""
@@ -562,11 +635,11 @@ msgid ""
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:309
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
msgid "Outbound device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:206
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:207
msgid "Outbound zone"
msgstr ""
@@ -575,9 +648,9 @@ msgstr ""
msgid "Output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:423
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:355
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:595
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:369
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
@@ -603,7 +676,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:162
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:275
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:194
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:195
msgid "Protocol"
msgstr ""
@@ -645,31 +718,31 @@ msgstr ""
msgid "Restrict to address family"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
msgid "Rewrite IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:270
msgid "Rewrite matched traffic to the specified source IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:300
msgid "Rewrite matched traffic to the specified source port or port range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
msgid "Rewrite port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:184
msgid "Rewrite to"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:115
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:116
msgid "Rewrite to %{ipaddr?%{port?%{ipaddr}, %{port}:%{ipaddr}}:%{port}}"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:122
msgid "Rewrite to outbound device IP"
msgstr ""
@@ -677,15 +750,25 @@ msgstr ""
msgid "Routing/NAT Offloading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:264
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
msgid "SNAT - Rewrite to specific source IP or port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:437
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:609
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:384
msgid "Saturday"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid "Set mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid ""
+"Set the given mark value on established connections. Format is value[/mask]. "
+"If a mask is specified then only those bits set in the mask are modified."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr ""
@@ -725,7 +808,7 @@ msgstr ""
# msgstr ""
#
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:213
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
msgid "Source IP address"
msgstr ""
@@ -740,7 +823,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:207
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
msgid "Source port"
msgstr ""
@@ -761,28 +844,28 @@ msgid ""
"reflected traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:461
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:371
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:633
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:408
msgid "Start Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:453
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:363
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:625
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:400
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:465
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:375
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:637
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:412
msgid "Stop Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:457
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:367
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:629
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:404
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:431
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:603
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:378
msgid "Sunday"
msgstr ""
@@ -812,18 +895,18 @@ msgid ""
"networks</em> specifies which available networks are members of this zone."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:435
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:607
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:382
msgid "Thursday"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:164
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:469
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:641
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:416
msgid "Time in UTC"
msgstr ""
@@ -843,13 +926,13 @@ msgstr ""
msgid "To %s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:102
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:103
msgid ""
"To %{ipaddr?:any destination} %{port?at %{port}} %{zone?via zone %{zone}} "
"%{device?egress device %{device}}"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Tracking helper"
msgstr ""
@@ -865,8 +948,8 @@ msgid ""
"the router."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:605
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:380
msgid "Tuesday"
msgstr ""
@@ -875,12 +958,12 @@ msgid "Unable to save contents: %s"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:299
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:419
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:498
msgid "Unknown or not installed conntrack helper \"%s\""
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:171
msgid "Unnamed NAT"
msgstr ""
@@ -926,16 +1009,24 @@ msgstr ""
msgid "Via %s at %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:434
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:606
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:381
msgid "Wednesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:426
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:598
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:373
msgid "Week Days"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+msgid "XOR firewall mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid "XOR mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr ""
@@ -962,12 +1053,13 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:376
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:382
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:399
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:406
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:231
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:242
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:478
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:485
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:521
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:255
msgid "any"
msgstr ""
@@ -990,6 +1082,10 @@ msgstr ""
msgid "any zone"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:396
+msgid "apply firewall mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:395
msgid "assign conntrack helper"
msgstr ""
@@ -998,8 +1094,8 @@ msgstr ""
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:273
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:303
msgid "do not rewrite"
msgstr ""
@@ -1058,11 +1154,20 @@ msgstr ""
msgid "types"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:322
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:562
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+msgid "unlimited"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:238
msgid "unspecified"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "valid firewall mark"
msgstr ""
diff --git a/applications/luci-app-firewall/po/ca/firewall.po b/applications/luci-app-firewall/po/ca/firewall.po
index 9240545740..e34ef2ef9b 100644
--- a/applications/luci-app-firewall/po/ca/firewall.po
+++ b/applications/luci-app-firewall/po/ca/firewall.po
@@ -40,11 +40,11 @@ msgstr ""
msgid "<var>%s</var> and limit to %s"
msgstr "<var>%s</var> i limita a %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:280
msgid "A rewrite IP must be specified!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:267
msgid "ACCEPT - Disable address rewriting"
msgstr ""
@@ -62,7 +62,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:224
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:388
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:262
msgid "Action"
msgstr "Acció"
@@ -81,7 +81,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr "Ajusts avançats"
@@ -99,18 +99,29 @@ msgid "Allow forward to <em>destination zones</em>:"
msgstr "Permet el reenviament als <em>zones de destí</em>:"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:198
msgid "Any"
msgstr "Qualsevol"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:430
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:446
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:340
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:602
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:618
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:377
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:393
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid ""
+"Apply a bitwise XOR of the given value and the existing mark value on "
+"established connections. Format is value[/mask]. If a mask is specified then "
+"those bits set in the mask are zeroed out."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "Apply the given DSCP class or value to established connections."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Assign the specified connection tracking helper to matched traffic."
msgstr ""
@@ -162,7 +173,19 @@ msgstr ""
"ordres s'executen després de cada reinici de tallafocs, just després el "
"conjunt de regles per defecte s'ha carregat."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:398
+msgid "DSCP classification"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:466
+msgid "DSCP mark required"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
msgid "Destination IP address"
msgstr "Adreça IP de destí"
@@ -171,7 +194,7 @@ msgid "Destination address"
msgstr "Adreça de destí"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:379
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
msgid "Destination port"
msgstr "Port de destí"
@@ -201,7 +224,7 @@ msgid ""
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:125
msgid "Do not rewrite"
msgstr "No reescriguis"
@@ -223,7 +246,7 @@ msgstr "Descarta els paquets invàlids"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:157
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:230
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:189
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:190
msgid "Enable"
msgstr "Activa"
@@ -240,7 +263,10 @@ msgid "Enable logging on this zone"
msgstr "Habilita el registre d'aquesta zona"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "Expecting: %s"
msgstr ""
@@ -260,9 +286,9 @@ msgstr "Adreça IP extern"
msgid "External port"
msgstr "Port extern"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:422
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:594
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:368
msgid "Extra arguments"
msgstr "Paràmetres extres"
@@ -286,7 +312,7 @@ msgstr "Tallafocs"
msgid "Firewall - Custom Rules"
msgstr "Tallafocs - Regles personalitzades"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
msgid "Firewall - NAT Rules"
msgstr ""
@@ -311,8 +337,8 @@ msgstr "Reenvia"
msgid "Forward to"
msgstr "Reenvia a"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:436
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:608
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:383
msgid "Friday"
msgstr "Divendres"
@@ -343,13 +369,13 @@ msgstr ""
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:93
msgid "From %{ipaddr?:any host} %{port?with source %{port}}"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
#: 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/root/usr/share/luci/menu.d/luci-app-firewall.json:16
@@ -417,10 +443,39 @@ msgstr "Port intern"
msgid "Internal zone"
msgstr "Zona interna"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:471
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:553
+msgid "Invalid DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:581
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:355
+msgid "Invalid limit value"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:586
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:360
+msgid "Limit burst"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Limita els missatges de registre"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:558
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+msgid "Limit matching"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:559
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:333
+msgid "Limits traffic matching to the specified rate."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:275
msgid "Loopback source IP"
msgstr ""
@@ -433,7 +488,7 @@ msgstr "MAC"
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
msgstr ""
@@ -447,14 +502,18 @@ msgstr "Mascarada"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:133
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:174
msgid "Match"
msgstr "Coincideix"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:84
msgid ""
"Match %{protocol?%{family} %{protocol} traffic:any %{family} traffic} %{mark?"
-"with firewall mark %{mark}}"
+"with firewall mark %{mark}} %{limit?limited to %{limit}}"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:517
+msgid "Match DSCP"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:288
@@ -465,26 +524,26 @@ msgstr "Coincideix amb el tipus ICMP"
msgid "Match device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:239
msgid "Match forwarded traffic directed at the given IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:252
msgid ""
"Match forwarded traffic directed at the given destination port or port range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
msgid "Match forwarded traffic from this IP or range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:228
msgid ""
"Match forwarded traffic originating from the given source port or port range."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match helper"
msgstr ""
@@ -497,40 +556,54 @@ msgstr ""
"aquest host donat"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:302
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:315
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:501
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
msgid "Match mark"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match traffic using the specified connection tracking helper."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:303
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:502
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:317
msgid "Matches a specific firewall mark or a range of different marks."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:311
msgid "Matches forwarded traffic using the specified outbound network device."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:432
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:518
+msgid "Matches traffic carrying the specified DSCP marking."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:587
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:361
+msgid ""
+"Maximum initial number of packets to match: this number gets recharged by "
+"one every time the limit specified above is not reached, up to this number."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:604
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
msgid "Monday"
msgstr "Dilluns"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:442
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:614
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:389
msgid "Month Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:156
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:157
#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
msgid "NAT Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:155
msgid ""
"NAT rules allow fine grained control over the source IP to use for outbound "
"or forwarded traffic."
@@ -538,7 +611,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:129
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:210
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Nom"
@@ -568,11 +641,11 @@ msgstr ""
"rang de ports d'origen donat"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:309
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
msgid "Outbound device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:206
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:207
msgid "Outbound zone"
msgstr ""
@@ -581,9 +654,9 @@ msgstr ""
msgid "Output"
msgstr "Sortida"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:423
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:355
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:595
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:369
msgid "Passes additional arguments to iptables. Use with care!"
msgstr "Passa paràmetres addicionals al iptables. Utilitzeu-ho amb cura!"
@@ -611,7 +684,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:162
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:275
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:194
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:195
msgid "Protocol"
msgstr "Protocol"
@@ -653,31 +726,31 @@ msgstr "Restringeix la mascarada a les subxarxes d'origen donades"
msgid "Restrict to address family"
msgstr "Restringeix a la família d'adreces"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
msgid "Rewrite IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:270
msgid "Rewrite matched traffic to the specified source IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:300
msgid "Rewrite matched traffic to the specified source port or port range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
msgid "Rewrite port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:184
msgid "Rewrite to"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:115
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:116
msgid "Rewrite to %{ipaddr?%{port?%{ipaddr}, %{port}:%{ipaddr}}:%{port}}"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:122
msgid "Rewrite to outbound device IP"
msgstr ""
@@ -685,15 +758,25 @@ msgstr ""
msgid "Routing/NAT Offloading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:264
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
msgid "SNAT - Rewrite to specific source IP or port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:437
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:609
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:384
msgid "Saturday"
msgstr "Dissabte"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid "Set mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid ""
+"Set the given mark value on established connections. Format is value[/mask]. "
+"If a mask is specified then only those bits set in the mask are modified."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr ""
@@ -703,7 +786,7 @@ msgid "Software flow offloading"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:213
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
msgid "Source IP address"
msgstr "Adreça IP d'origen"
@@ -718,7 +801,7 @@ msgstr "Adreça d'origen"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:207
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
msgid "Source port"
msgstr "Port d'origen"
@@ -739,28 +822,28 @@ msgid ""
"reflected traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:461
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:371
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:633
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:408
msgid "Start Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:453
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:363
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:625
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:400
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:465
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:375
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:637
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:412
msgid "Stop Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:457
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:367
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:629
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:404
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:431
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:603
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:378
msgid "Sunday"
msgstr "Diumenge"
@@ -805,18 +888,18 @@ msgstr ""
"<em>Xarxes cobertes</em> especifica quines xarxes disponibles són membres "
"d'aquesta zona."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:435
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:607
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:382
msgid "Thursday"
msgstr "Dijous"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:164
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:469
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:641
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:416
msgid "Time in UTC"
msgstr ""
@@ -836,13 +919,13 @@ msgstr "A %s en <var>aquest dispositiu</var>"
msgid "To %s, %s in %s"
msgstr "A %s, %s en %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:102
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:103
msgid ""
"To %{ipaddr?:any destination} %{port?at %{port}} %{zone?via zone %{zone}} "
"%{device?egress device %{device}}"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Tracking helper"
msgstr ""
@@ -861,8 +944,8 @@ msgstr ""
"zones distintes, per exemple per a rebutjar trànsit entre certs hosts o "
"obrir ports WAN en el encaminador."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:605
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:380
msgid "Tuesday"
msgstr "Dimarts"
@@ -871,12 +954,12 @@ msgid "Unable to save contents: %s"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:299
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:419
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:498
msgid "Unknown or not installed conntrack helper \"%s\""
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:171
msgid "Unnamed NAT"
msgstr ""
@@ -922,16 +1005,24 @@ msgstr "Via %s"
msgid "Via %s at %s"
msgstr "Via %s a %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:434
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:606
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:381
msgid "Wednesday"
msgstr "Dimecres"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:426
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:598
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:373
msgid "Week Days"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+msgid "XOR firewall mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid "XOR mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "Zona ⇒ Reenviaments"
@@ -958,12 +1049,13 @@ msgstr "accepta"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:376
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:382
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:399
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:406
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:231
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:242
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:478
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:485
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:521
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:255
msgid "any"
msgstr "qualsevol"
@@ -986,6 +1078,10 @@ msgstr "qualsevol IP d'encaminador"
msgid "any zone"
msgstr "qualsevol zona"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:396
+msgid "apply firewall mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:395
msgid "assign conntrack helper"
msgstr ""
@@ -994,8 +1090,8 @@ msgstr ""
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:273
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:303
msgid "do not rewrite"
msgstr ""
@@ -1054,12 +1150,21 @@ msgstr ""
msgid "types"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:322
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:562
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+msgid "unlimited"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:238
msgid "unspecified"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "valid firewall mark"
msgstr ""
diff --git a/applications/luci-app-firewall/po/cs/firewall.po b/applications/luci-app-firewall/po/cs/firewall.po
index f0520915f6..7a147023f7 100644
--- a/applications/luci-app-firewall/po/cs/firewall.po
+++ b/applications/luci-app-firewall/po/cs/firewall.po
@@ -36,11 +36,11 @@ msgstr "<var>%d</var> paketů za <var>%s</var>, burst <var>%d</var> paketů."
msgid "<var>%s</var> and limit to %s"
msgstr "<var>%s</var> a omezit na %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:280
msgid "A rewrite IP must be specified!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:267
msgid "ACCEPT - Disable address rewriting"
msgstr ""
@@ -58,7 +58,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:224
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:388
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:262
msgid "Action"
msgstr "Akce"
@@ -77,7 +77,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr "Pokročilé nastavení"
@@ -95,18 +95,29 @@ msgid "Allow forward to <em>destination zones</em>:"
msgstr "Povolit přesměrování do <em>zdrojových oblastí</em>:"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:198
msgid "Any"
msgstr "Libovolné"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:430
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:446
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:340
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:602
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:618
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:377
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:393
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid ""
+"Apply a bitwise XOR of the given value and the existing mark value on "
+"established connections. Format is value[/mask]. If a mask is specified then "
+"those bits set in the mask are zeroed out."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "Apply the given DSCP class or value to established connections."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Assign the specified connection tracking helper to matched traffic."
msgstr ""
@@ -157,7 +168,19 @@ msgstr ""
"nejsou jinak pokryté frameworkem firewallu. Příkazy jsou spuštěny po každém "
"restartu firewallu, právě po načtení výchozí sady pravidel."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:398
+msgid "DSCP classification"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:466
+msgid "DSCP mark required"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
msgid "Destination IP address"
msgstr "Cílová IP adresa"
@@ -166,7 +189,7 @@ msgid "Destination address"
msgstr "Cílová adresa"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:379
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
msgid "Destination port"
msgstr "Cílový port"
@@ -196,7 +219,7 @@ msgid ""
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:125
msgid "Do not rewrite"
msgstr "Nepřepisovat"
@@ -218,7 +241,7 @@ msgstr "Zahazovat neplatné pakety"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:157
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:230
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:189
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:190
msgid "Enable"
msgstr "Povolit"
@@ -235,7 +258,10 @@ msgid "Enable logging on this zone"
msgstr "Povolit logování v této oblasti"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "Expecting: %s"
msgstr ""
@@ -255,9 +281,9 @@ msgstr "Vnější IP adresa"
msgid "External port"
msgstr "Vnější port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:422
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:594
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:368
msgid "Extra arguments"
msgstr "Další argumenty volání"
@@ -281,7 +307,7 @@ msgstr "Firewall"
msgid "Firewall - Custom Rules"
msgstr "Firewall - Vlastní pravidla"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
msgid "Firewall - NAT Rules"
msgstr ""
@@ -306,8 +332,8 @@ msgstr "Přesměrování"
msgid "Forward to"
msgstr "Přesměrovat na"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:436
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:608
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:383
msgid "Friday"
msgstr "Pátek"
@@ -338,13 +364,13 @@ msgstr ""
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:93
msgid "From %{ipaddr?:any host} %{port?with source %{port}}"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
#: 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/root/usr/share/luci/menu.d/luci-app-firewall.json:16
@@ -412,10 +438,39 @@ msgstr "Vnitřní port"
msgid "Internal zone"
msgstr "Vnitřní zóna"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:471
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:553
+msgid "Invalid DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:581
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:355
+msgid "Invalid limit value"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:586
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:360
+msgid "Limit burst"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Omezit logovací zprávy"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:558
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+msgid "Limit matching"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:559
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:333
+msgid "Limits traffic matching to the specified rate."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:275
msgid "Loopback source IP"
msgstr ""
@@ -428,7 +483,7 @@ msgstr "MAC"
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
msgstr ""
@@ -442,14 +497,18 @@ msgstr "Maškárádování"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:133
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:174
msgid "Match"
msgstr "Shoda"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:84
msgid ""
"Match %{protocol?%{family} %{protocol} traffic:any %{family} traffic} %{mark?"
-"with firewall mark %{mark}}"
+"with firewall mark %{mark}} %{limit?limited to %{limit}}"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:517
+msgid "Match DSCP"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:288
@@ -460,26 +519,26 @@ msgstr "Odpovídá ICMP typu"
msgid "Match device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:239
msgid "Match forwarded traffic directed at the given IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:252
msgid ""
"Match forwarded traffic directed at the given destination port or port range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
msgid "Match forwarded traffic from this IP or range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:228
msgid ""
"Match forwarded traffic originating from the given source port or port range."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match helper"
msgstr ""
@@ -492,40 +551,54 @@ msgstr ""
"tohoto hostitele"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:302
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:315
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:501
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
msgid "Match mark"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match traffic using the specified connection tracking helper."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:303
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:502
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:317
msgid "Matches a specific firewall mark or a range of different marks."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:311
msgid "Matches forwarded traffic using the specified outbound network device."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:432
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:518
+msgid "Matches traffic carrying the specified DSCP marking."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:587
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:361
+msgid ""
+"Maximum initial number of packets to match: this number gets recharged by "
+"one every time the limit specified above is not reached, up to this number."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:604
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
msgid "Monday"
msgstr "Pondělí"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:442
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:614
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:389
msgid "Month Days"
msgstr "Dny v měsíci"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:156
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:157
#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
msgid "NAT Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:155
msgid ""
"NAT rules allow fine grained control over the source IP to use for outbound "
"or forwarded traffic."
@@ -533,7 +606,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:129
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:210
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Název"
@@ -563,11 +636,11 @@ msgstr ""
"portů klienta"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:309
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
msgid "Outbound device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:206
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:207
msgid "Outbound zone"
msgstr ""
@@ -576,9 +649,9 @@ msgstr ""
msgid "Output"
msgstr "Výstup"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:423
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:355
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:595
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:369
msgid "Passes additional arguments to iptables. Use with care!"
msgstr "Předává další argumenty iptables. Používat opatrně!"
@@ -607,7 +680,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:162
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:275
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:194
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:195
msgid "Protocol"
msgstr "Protokol"
@@ -650,31 +723,31 @@ msgstr "Omezit maškarádování na uvedené zdrojové podsítě"
msgid "Restrict to address family"
msgstr "Omezit na rodinu adres"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
msgid "Rewrite IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:270
msgid "Rewrite matched traffic to the specified source IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:300
msgid "Rewrite matched traffic to the specified source port or port range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
msgid "Rewrite port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:184
msgid "Rewrite to"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:115
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:116
msgid "Rewrite to %{ipaddr?%{port?%{ipaddr}, %{port}:%{ipaddr}}:%{port}}"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:122
msgid "Rewrite to outbound device IP"
msgstr ""
@@ -682,15 +755,25 @@ msgstr ""
msgid "Routing/NAT Offloading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:264
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
msgid "SNAT - Rewrite to specific source IP or port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:437
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:609
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:384
msgid "Saturday"
msgstr "Sobota"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid "Set mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid ""
+"Set the given mark value on established connections. Format is value[/mask]. "
+"If a mask is specified then only those bits set in the mask are modified."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr ""
@@ -700,7 +783,7 @@ msgid "Software flow offloading"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:213
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
msgid "Source IP address"
msgstr "Zdrojová IP adresa"
@@ -715,7 +798,7 @@ msgstr "Zdrojová adresa"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:207
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
msgid "Source port"
msgstr "Zdrojový port"
@@ -736,28 +819,28 @@ msgid ""
"reflected traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:461
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:371
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:633
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:408
msgid "Start Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:453
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:363
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:625
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:400
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:465
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:375
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:637
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:412
msgid "Stop Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:457
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:367
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:629
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:404
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:431
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:603
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:378
msgid "Sunday"
msgstr "Neděle"
@@ -800,18 +883,18 @@ msgstr ""
"pro přesměrování provozu mezi rozdílnými sítěmi uvnitř jedné zóny. "
"<em>Pokryté sítě</em> určuje, které z dostupných sítí jsou členy této zóny."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:435
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:607
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:382
msgid "Thursday"
msgstr "Čtvrtek"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:164
msgid "Time Restrictions"
msgstr "Časová omezení"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:469
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:641
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:416
msgid "Time in UTC"
msgstr "Čas v UTC"
@@ -831,13 +914,13 @@ 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/htdocs/luci-static/resources/view/firewall/snats.js:102
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:103
msgid ""
"To %{ipaddr?:any destination} %{port?at %{port}} %{zone?via zone %{zone}} "
"%{device?egress device %{device}}"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Tracking helper"
msgstr ""
@@ -856,8 +939,8 @@ msgstr ""
"různými zónami, například pro odmítnutí provozu mezi jistými hostiteli nebo "
"pro otevření WAN portů na routeru."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:605
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:380
msgid "Tuesday"
msgstr "Úterý"
@@ -866,12 +949,12 @@ msgid "Unable to save contents: %s"
msgstr "Nelze uložit obsah: %s"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:299
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:419
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:498
msgid "Unknown or not installed conntrack helper \"%s\""
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:171
msgid "Unnamed NAT"
msgstr ""
@@ -917,16 +1000,24 @@ msgstr "Prostřednictvím %s"
msgid "Via %s at %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:434
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:606
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:381
msgid "Wednesday"
msgstr "Středa"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:426
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:598
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:373
msgid "Week Days"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+msgid "XOR firewall mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid "XOR mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "Zóna ⇒ Přesměrování"
@@ -953,12 +1044,13 @@ msgstr "přijmout"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:376
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:382
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:399
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:406
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:231
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:242
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:478
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:485
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:521
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:255
msgid "any"
msgstr "libovolný"
@@ -981,6 +1073,10 @@ msgstr "libovolná IP routeru"
msgid "any zone"
msgstr "libovolná zóna"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:396
+msgid "apply firewall mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:395
msgid "assign conntrack helper"
msgstr ""
@@ -989,8 +1085,8 @@ msgstr ""
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:273
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:303
msgid "do not rewrite"
msgstr ""
@@ -1049,12 +1145,21 @@ msgstr ""
msgid "types"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:322
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:562
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+msgid "unlimited"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:238
msgid "unspecified"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "valid firewall mark"
msgstr ""
diff --git a/applications/luci-app-firewall/po/de/firewall.po b/applications/luci-app-firewall/po/de/firewall.po
index a403c54de4..75eb51a03c 100644
--- a/applications/luci-app-firewall/po/de/firewall.po
+++ b/applications/luci-app-firewall/po/de/firewall.po
@@ -38,11 +38,11 @@ msgstr "<var>%d</var> Pkte. pro <var>%s</var>, Häufung <var>%d</var> Pkte."
msgid "<var>%s</var> and limit to %s"
msgstr "<var>%s</var> und limitieren auf %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:280
msgid "A rewrite IP must be specified!"
msgstr "Es muss eine IP-Adresse zum Umschreiben angegeben werden!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:267
msgid "ACCEPT - Disable address rewriting"
msgstr "ACCEPT - Umschreiben von IP-Adressen deaktivieren"
@@ -60,7 +60,7 @@ msgstr "Ausgang akzeptieren"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:224
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:388
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:262
msgid "Action"
msgstr "Aktion"
@@ -85,7 +85,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr "Erweiterte Einstellungen"
@@ -103,18 +103,29 @@ msgid "Allow forward to <em>destination zones</em>:"
msgstr "Erlaube Weiterleitung zu <em>Zielzone</em>:"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:198
msgid "Any"
msgstr "Beliebig"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:430
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:446
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:340
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:602
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:618
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:377
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:393
msgid "Any day"
msgstr "Beliebig"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid ""
+"Apply a bitwise XOR of the given value and the existing mark value on "
+"established connections. Format is value[/mask]. If a mask is specified then "
+"those bits set in the mask are zeroed out."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "Apply the given DSCP class or value to established connections."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Assign the specified connection tracking helper to matched traffic."
msgstr ""
@@ -168,7 +179,19 @@ msgstr ""
"Befehle werden mit jedem Firewall-Neustart abgearbeitet, direkt nach dem "
"Laden der Basisregeln."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:398
+msgid "DSCP classification"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:466
+msgid "DSCP mark required"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
msgid "Destination IP address"
msgstr "Ziel IP-Adresse"
@@ -177,7 +200,7 @@ msgid "Destination address"
msgstr "Zieladresse"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:379
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
msgid "Destination port"
msgstr "Zielport"
@@ -210,7 +233,7 @@ msgstr ""
"Conntrack-Status <em>invalid</em> abzulehnen. Dies kann bei komplexen "
"asymmetrischen Routen erforderlich sein."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:125
msgid "Do not rewrite"
msgstr "Nicht umschreiben"
@@ -232,7 +255,7 @@ msgstr "Ungültige Pakete verwerfen"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:157
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:230
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:189
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:190
msgid "Enable"
msgstr "Aktivieren"
@@ -249,7 +272,10 @@ msgid "Enable logging on this zone"
msgstr "Protokollierung innerhalb der Zone aktivieren"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "Expecting: %s"
msgstr "Erwarte: %s"
@@ -270,9 +296,9 @@ msgstr "Externe IP-Adresse"
msgid "External port"
msgstr "Externer Port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:422
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:594
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:368
msgid "Extra arguments"
msgstr "Zusätzliche Argumente"
@@ -296,7 +322,7 @@ msgstr "Firewall"
msgid "Firewall - Custom Rules"
msgstr "Firewall - Benutzerdefinierte Regeln"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
msgid "Firewall - NAT Rules"
msgstr "Firewall - NAT Regeln"
@@ -321,8 +347,8 @@ msgstr "Weitergeleitet"
msgid "Forward to"
msgstr "Weiterleiten an"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:436
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:608
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:383
msgid "Friday"
msgstr "Freitag"
@@ -353,13 +379,13 @@ msgstr "Von %s auf <var>diesem Gerät</var> mit Quelle %s"
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr "Von %s auf <var>dieses Gerät</var> mit Quelle %s und %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:93
msgid "From %{ipaddr?:any host} %{port?with source %{port}}"
msgstr "Von %{ipaddr?:beliebigen Hosts} %{port?mit Quell-%{port}}"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
#: 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/root/usr/share/luci/menu.d/luci-app-firewall.json:16
@@ -427,10 +453,39 @@ msgstr "Interner Port"
msgid "Internal zone"
msgstr "Interne Zone"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:471
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:553
+msgid "Invalid DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:581
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:355
+msgid "Invalid limit value"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:586
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:360
+msgid "Limit burst"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Protokollnachrichten limitieren"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:558
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+msgid "Limit matching"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:559
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:333
+msgid "Limits traffic matching to the specified rate."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:275
msgid "Loopback source IP"
msgstr ""
@@ -443,7 +498,7 @@ msgstr "MAC"
msgid "MACs"
msgstr "MACs"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
msgstr ""
"MASQUERADE - Automatisch auf IP-Adresse der ausgehenden Schnittstelle "
@@ -459,18 +514,22 @@ msgstr "NAT aktivieren"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:133
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:174
msgid "Match"
msgstr "Filter"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:84
msgid ""
"Match %{protocol?%{family} %{protocol} traffic:any %{family} traffic} %{mark?"
-"with firewall mark %{mark}}"
+"with firewall mark %{mark}} %{limit?limited to %{limit}}"
msgstr ""
"Selektiere %{protocol?%{family}-%{protocol} Verkehr:jeglichen %{family}-"
"Verkehr} %{mark?mit Firewall-Markierung %{mark}}"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:517
+msgid "Match DSCP"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:288
msgid "Match ICMP type"
msgstr "Nach ICMP-Typ filtern"
@@ -479,22 +538,22 @@ msgstr "Nach ICMP-Typ filtern"
msgid "Match device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:239
msgid "Match forwarded traffic directed at the given IP address."
msgstr "Selektiert an die angegebene IP-Adresse gerichteten Verkehr."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:252
msgid ""
"Match forwarded traffic directed at the given destination port or port range."
msgstr ""
"Selektiert an den angegeben Port oder Port-Bereich gerichteten Verkehr."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
msgid "Match forwarded traffic from this IP or range."
msgstr ""
"Selektiert weitergeleiteten Verkehr von dieser IP oder diesem IP-Bereich."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:228
msgid ""
"Match forwarded traffic originating from the given source port or port range."
msgstr ""
@@ -502,7 +561,7 @@ msgstr ""
"Portbereich."
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match helper"
msgstr ""
@@ -515,44 +574,58 @@ msgstr ""
"Portbereich auf dem lokalen Gerät gerichtet sind"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:302
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:315
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:501
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
msgid "Match mark"
msgstr "Erfasse Markierung"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match traffic using the specified connection tracking helper."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:303
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:502
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:317
msgid "Matches a specific firewall mark or a range of different marks."
msgstr ""
"Selektiert Verkehr mit einer spezifischen Firewall-Markierung oder einem "
"Bereich von Markierungen."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:311
msgid "Matches forwarded traffic using the specified outbound network device."
msgstr ""
"Selektiert weitergeleiteten Verkehr welcher die angegebene "
"Netzwerkschnittstelle benutzt."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:432
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:518
+msgid "Matches traffic carrying the specified DSCP marking."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:587
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:361
+msgid ""
+"Maximum initial number of packets to match: this number gets recharged by "
+"one every time the limit specified above is not reached, up to this number."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:604
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
msgid "Monday"
msgstr "Montag"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:442
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:614
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:389
msgid "Month Days"
msgstr "Monatstage"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:156
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:157
#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
msgid "NAT Rules"
msgstr "NAT-Regeln"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:155
msgid ""
"NAT rules allow fine grained control over the source IP to use for outbound "
"or forwarded traffic."
@@ -562,7 +635,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:129
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:210
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Name"
@@ -592,11 +665,11 @@ msgstr ""
"des Client-Host stammt, selektieren"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:309
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
msgid "Outbound device"
msgstr "Ausgehende Schnittstelle"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:206
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:207
msgid "Outbound zone"
msgstr "Ausgehende Zone"
@@ -605,9 +678,9 @@ msgstr "Ausgehende Zone"
msgid "Output"
msgstr "Ausgehend"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:423
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:355
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:595
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:369
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
"Gibt zusätzliche Kommandozeilenargumente an iptables weiter. Mit Vorsicht "
@@ -643,7 +716,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:162
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:275
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:194
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:195
msgid "Protocol"
msgstr "Protokoll"
@@ -688,33 +761,33 @@ msgstr "NAT auf die angegebenen Quell-Subnetze beschränken"
msgid "Restrict to address family"
msgstr "Beschränke auf Adressfamilie"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
msgid "Rewrite IP address"
msgstr "IP-Adresse umschreiben"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:270
msgid "Rewrite matched traffic to the specified source IP address."
msgstr "Selektierten Verkehr auf die angegebene Quell-IP-Adresse umschreiben."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:300
msgid "Rewrite matched traffic to the specified source port or port range."
msgstr ""
"Selektierten Verkehr auf den angegebenen Quell-Port bzw. Port-Bereich "
"umschreiben."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
msgid "Rewrite port"
msgstr "Port umschreiben"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:184
msgid "Rewrite to"
msgstr "Umschreiben auf…"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:115
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:116
msgid "Rewrite to %{ipaddr?%{port?%{ipaddr}, %{port}:%{ipaddr}}:%{port}}"
msgstr "Umschreiben auf %{ipaddr?%{port?%{ipaddr}, %{port}:%{ipaddr}}:%{port}}"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:122
msgid "Rewrite to outbound device IP"
msgstr "Umschreiben auf ausgehende Schnittstellen-IP"
@@ -722,15 +795,25 @@ msgstr "Umschreiben auf ausgehende Schnittstellen-IP"
msgid "Routing/NAT Offloading"
msgstr "Routing/NAT-Beschleunigung"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:264
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
msgid "SNAT - Rewrite to specific source IP or port"
msgstr "SNAT - Umschreiben auf spezifische Quell-IP oder Port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:437
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:609
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:384
msgid "Saturday"
msgstr "Samstag"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid "Set mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid ""
+"Set the given mark value on established connections. Format is value[/mask]. "
+"If a mask is specified then only those bits set in the mask are modified."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr "Softwarebasierte Auslagerung von Routing/NAT"
@@ -740,7 +823,7 @@ msgid "Software flow offloading"
msgstr "Beschleunigte Flusskontrolle"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:213
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
msgid "Source IP address"
msgstr "Quell-IP-Adresse"
@@ -755,7 +838,7 @@ msgstr "Quelladresse"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:207
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
msgid "Source port"
msgstr "Quellport"
@@ -776,28 +859,28 @@ msgid ""
"reflected traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:461
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:371
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:633
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:408
msgid "Start Date (yyyy-mm-dd)"
msgstr "Startdatum (JJJJ-MM-TT)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:453
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:363
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:625
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:400
msgid "Start Time (hh.mm.ss)"
msgstr "Startzeit (hh.mm.ss)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:465
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:375
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:637
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:412
msgid "Stop Date (yyyy-mm-dd)"
msgstr "Enddatum (JJJJ-MM-TT)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:457
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:367
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:629
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:404
msgid "Stop Time (hh.mm.ss)"
msgstr "Stoppzeit (hh.mm.ss)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:431
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:603
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:378
msgid "Sunday"
msgstr "Sonntag"
@@ -843,18 +926,18 @@ msgstr ""
"dieser Zone zu. <em>Covered networks</em> definiert welche der verfügbaren "
"Netzwerke zu dieser Zone gehören."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:435
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:607
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:382
msgid "Thursday"
msgstr "Donnerstag"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:164
msgid "Time Restrictions"
msgstr "Zeitbeschränkungen"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:469
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:641
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:416
msgid "Time in UTC"
msgstr "Zeit ist UTC"
@@ -874,7 +957,7 @@ 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/htdocs/luci-static/resources/view/firewall/snats.js:102
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:103
msgid ""
"To %{ipaddr?:any destination} %{port?at %{port}} %{zone?via zone %{zone}} "
"%{device?egress device %{device}}"
@@ -882,7 +965,7 @@ msgstr ""
"Zu %{ipaddr?:beliebigem Host} %{port?an %{port}} %{zone?über Zone %{zone}} "
"%{device?ausgehende Schnittstelle %{device}}"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Tracking helper"
msgstr ""
@@ -901,8 +984,8 @@ msgstr ""
"zum Beispiel um Traffic zwischen bestimmten Rechnern zu unterbinden oder um "
"WAN-Ports auf dem Router zu öffnen."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:605
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:380
msgid "Tuesday"
msgstr "Dienstag"
@@ -911,12 +994,12 @@ msgid "Unable to save contents: %s"
msgstr "Inhalt kann nicht gespeichert werden: %s"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:299
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:419
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:498
msgid "Unknown or not installed conntrack helper \"%s\""
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:171
msgid "Unnamed NAT"
msgstr "Unbenannte NAT-Regel"
@@ -966,16 +1049,24 @@ msgstr "Über %s"
msgid "Via %s at %s"
msgstr "Über %s an %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:434
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:606
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:381
msgid "Wednesday"
msgstr "Mittwoch"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:426
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:598
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:373
msgid "Week Days"
msgstr "Wochentage"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+msgid "XOR firewall mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid "XOR mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "Zone ⇒ Weiterleitungen"
@@ -1004,12 +1095,13 @@ msgstr "zulassen"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:376
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:382
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:399
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:406
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:231
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:242
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:478
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:485
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:521
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:255
msgid "any"
msgstr "beliebig"
@@ -1032,6 +1124,10 @@ msgstr "beliebige Router-IP"
msgid "any zone"
msgstr "beliebige Zone"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:396
+msgid "apply firewall mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:395
msgid "assign conntrack helper"
msgstr ""
@@ -1040,8 +1136,8 @@ msgstr ""
msgid "day"
msgstr "Tag"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:273
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:303
msgid "do not rewrite"
msgstr "nicht umschreiben"
@@ -1100,12 +1196,21 @@ msgstr "Typ"
msgid "types"
msgstr "Typen"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:322
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:562
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+msgid "unlimited"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:238
msgid "unspecified"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "valid firewall mark"
msgstr "gültige Firewall-Markierung"
diff --git a/applications/luci-app-firewall/po/el/firewall.po b/applications/luci-app-firewall/po/el/firewall.po
index d7467bdaf4..e18179c6b2 100644
--- a/applications/luci-app-firewall/po/el/firewall.po
+++ b/applications/luci-app-firewall/po/el/firewall.po
@@ -38,11 +38,11 @@ msgstr ""
msgid "<var>%s</var> and limit to %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:280
msgid "A rewrite IP must be specified!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:267
msgid "ACCEPT - Disable address rewriting"
msgstr ""
@@ -60,7 +60,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:224
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:388
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:262
msgid "Action"
msgstr "Ενέργεια"
@@ -79,7 +79,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr "Ρυθμίσεις για προχωρημένους"
@@ -97,18 +97,29 @@ msgid "Allow forward to <em>destination zones</em>:"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:198
msgid "Any"
msgstr "Οποιοδήποτε"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:430
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:446
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:340
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:602
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:618
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:377
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:393
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid ""
+"Apply a bitwise XOR of the given value and the existing mark value on "
+"established connections. Format is value[/mask]. If a mask is specified then "
+"those bits set in the mask are zeroed out."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "Apply the given DSCP class or value to established connections."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Assign the specified connection tracking helper to matched traffic."
msgstr ""
@@ -156,7 +167,19 @@ msgid ""
"each firewall restart, right after the default ruleset has been loaded."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:398
+msgid "DSCP classification"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:466
+msgid "DSCP mark required"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
msgid "Destination IP address"
msgstr "Διεύθυνση IP προορισμού"
@@ -165,7 +188,7 @@ msgid "Destination address"
msgstr "Διεύθυνση προορισμού"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:379
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
msgid "Destination port"
msgstr "Θύρα προορισμού"
@@ -195,7 +218,7 @@ msgid ""
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:125
msgid "Do not rewrite"
msgstr ""
@@ -217,7 +240,7 @@ msgstr "Αγνόηση μη-έγκυρων πακετών"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:157
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:230
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:189
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:190
msgid "Enable"
msgstr "Ενεργοποίηση"
@@ -235,7 +258,10 @@ msgid "Enable logging on this zone"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "Expecting: %s"
msgstr ""
@@ -255,9 +281,9 @@ msgstr "Εξωτερική διεύθυνση IP"
msgid "External port"
msgstr "Εξωτερική θύρα"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:422
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:594
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:368
msgid "Extra arguments"
msgstr "Επιπλέον παράμετροι"
@@ -281,7 +307,7 @@ msgstr "Τείχος προστασίας"
msgid "Firewall - Custom Rules"
msgstr "Τείχος προστασίας - Προσαρμοσμένοι Κανόνες"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
msgid "Firewall - NAT Rules"
msgstr ""
@@ -306,8 +332,8 @@ msgstr "Προώθηση"
msgid "Forward to"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:436
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:608
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:383
msgid "Friday"
msgstr ""
@@ -338,13 +364,13 @@ msgstr ""
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:93
msgid "From %{ipaddr?:any host} %{port?with source %{port}}"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
#: 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/root/usr/share/luci/menu.d/luci-app-firewall.json:16
@@ -414,10 +440,39 @@ msgstr "Εξωτερική θύρα"
msgid "Internal zone"
msgstr "Εσωτερική ζώνη"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:471
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:553
+msgid "Invalid DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:581
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:355
+msgid "Invalid limit value"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:586
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:360
+msgid "Limit burst"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Περιορισμός καταγραφών συστήματος"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:558
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+msgid "Limit matching"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:559
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:333
+msgid "Limits traffic matching to the specified rate."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:275
msgid "Loopback source IP"
msgstr ""
@@ -430,7 +485,7 @@ msgstr "MAC"
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
msgstr ""
@@ -445,14 +500,18 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:133
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:174
msgid "Match"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:84
msgid ""
"Match %{protocol?%{family} %{protocol} traffic:any %{family} traffic} %{mark?"
-"with firewall mark %{mark}}"
+"with firewall mark %{mark}} %{limit?limited to %{limit}}"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:517
+msgid "Match DSCP"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:288
@@ -463,26 +522,26 @@ msgstr ""
msgid "Match device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:239
msgid "Match forwarded traffic directed at the given IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:252
msgid ""
"Match forwarded traffic directed at the given destination port or port range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
msgid "Match forwarded traffic from this IP or range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:228
msgid ""
"Match forwarded traffic originating from the given source port or port range."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match helper"
msgstr ""
@@ -493,40 +552,54 @@ msgid ""
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:302
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:315
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:501
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
msgid "Match mark"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match traffic using the specified connection tracking helper."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:303
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:502
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:317
msgid "Matches a specific firewall mark or a range of different marks."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:311
msgid "Matches forwarded traffic using the specified outbound network device."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:432
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:518
+msgid "Matches traffic carrying the specified DSCP marking."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:587
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:361
+msgid ""
+"Maximum initial number of packets to match: this number gets recharged by "
+"one every time the limit specified above is not reached, up to this number."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:604
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
msgid "Monday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:442
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:614
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:389
msgid "Month Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:156
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:157
#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
msgid "NAT Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:155
msgid ""
"NAT rules allow fine grained control over the source IP to use for outbound "
"or forwarded traffic."
@@ -534,7 +607,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:129
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:210
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Όνομα"
@@ -562,11 +635,11 @@ msgid ""
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:309
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
msgid "Outbound device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:206
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:207
msgid "Outbound zone"
msgstr ""
@@ -575,9 +648,9 @@ msgstr ""
msgid "Output"
msgstr "Έξοδος"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:423
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:355
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:595
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:369
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
@@ -603,7 +676,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:162
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:275
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:194
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:195
msgid "Protocol"
msgstr "Πρωτόκολλο"
@@ -645,31 +718,31 @@ msgstr ""
msgid "Restrict to address family"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
msgid "Rewrite IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:270
msgid "Rewrite matched traffic to the specified source IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:300
msgid "Rewrite matched traffic to the specified source port or port range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
msgid "Rewrite port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:184
msgid "Rewrite to"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:115
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:116
msgid "Rewrite to %{ipaddr?%{port?%{ipaddr}, %{port}:%{ipaddr}}:%{port}}"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:122
msgid "Rewrite to outbound device IP"
msgstr ""
@@ -677,15 +750,25 @@ msgstr ""
msgid "Routing/NAT Offloading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:264
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
msgid "SNAT - Rewrite to specific source IP or port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:437
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:609
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:384
msgid "Saturday"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid "Set mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid ""
+"Set the given mark value on established connections. Format is value[/mask]. "
+"If a mask is specified then only those bits set in the mask are modified."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr ""
@@ -695,7 +778,7 @@ msgid "Software flow offloading"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:213
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
#, fuzzy
msgid "Source IP address"
msgstr "Διεύθυνση MAC πηγής"
@@ -712,7 +795,7 @@ msgstr "Διεύθυνση MAC πηγής"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:207
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
msgid "Source port"
msgstr "Θύρα πηγής"
@@ -734,28 +817,28 @@ msgid ""
"reflected traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:461
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:371
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:633
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:408
msgid "Start Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:453
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:363
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:625
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:400
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:465
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:375
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:637
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:412
msgid "Stop Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:457
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:367
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:629
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:404
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:431
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:603
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:378
msgid "Sunday"
msgstr ""
@@ -787,18 +870,18 @@ msgid ""
"networks</em> specifies which available networks are members of this zone."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:435
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:607
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:382
msgid "Thursday"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:164
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:469
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:641
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:416
msgid "Time in UTC"
msgstr ""
@@ -818,13 +901,13 @@ msgstr ""
msgid "To %s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:102
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:103
msgid ""
"To %{ipaddr?:any destination} %{port?at %{port}} %{zone?via zone %{zone}} "
"%{device?egress device %{device}}"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Tracking helper"
msgstr ""
@@ -840,8 +923,8 @@ msgid ""
"the router."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:605
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:380
msgid "Tuesday"
msgstr ""
@@ -850,12 +933,12 @@ msgid "Unable to save contents: %s"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:299
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:419
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:498
msgid "Unknown or not installed conntrack helper \"%s\""
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:171
msgid "Unnamed NAT"
msgstr ""
@@ -901,16 +984,24 @@ msgstr ""
msgid "Via %s at %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:434
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:606
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:381
msgid "Wednesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:426
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:598
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:373
msgid "Week Days"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+msgid "XOR firewall mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid "XOR mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr ""
@@ -937,12 +1028,13 @@ msgstr "αποδοχή"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:376
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:382
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:399
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:406
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:231
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:242
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:478
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:485
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:521
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:255
msgid "any"
msgstr ""
@@ -965,6 +1057,10 @@ msgstr ""
msgid "any zone"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:396
+msgid "apply firewall mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:395
msgid "assign conntrack helper"
msgstr ""
@@ -973,8 +1069,8 @@ msgstr ""
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:273
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:303
msgid "do not rewrite"
msgstr ""
@@ -1033,12 +1129,21 @@ msgstr ""
msgid "types"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:322
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:562
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+msgid "unlimited"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:238
msgid "unspecified"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "valid firewall mark"
msgstr ""
diff --git a/applications/luci-app-firewall/po/en/firewall.po b/applications/luci-app-firewall/po/en/firewall.po
index b1aa849677..4679011027 100644
--- a/applications/luci-app-firewall/po/en/firewall.po
+++ b/applications/luci-app-firewall/po/en/firewall.po
@@ -35,11 +35,11 @@ msgstr ""
msgid "<var>%s</var> and limit to %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:280
msgid "A rewrite IP must be specified!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:267
msgid "ACCEPT - Disable address rewriting"
msgstr ""
@@ -57,7 +57,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:224
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:388
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:262
msgid "Action"
msgstr "Action"
@@ -76,7 +76,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr ""
@@ -94,18 +94,29 @@ msgid "Allow forward to <em>destination zones</em>:"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:198
msgid "Any"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:430
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:446
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:340
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:602
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:618
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:377
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:393
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid ""
+"Apply a bitwise XOR of the given value and the existing mark value on "
+"established connections. Format is value[/mask]. If a mask is specified then "
+"those bits set in the mask are zeroed out."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "Apply the given DSCP class or value to established connections."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Assign the specified connection tracking helper to matched traffic."
msgstr ""
@@ -153,7 +164,19 @@ msgid ""
"each firewall restart, right after the default ruleset has been loaded."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:398
+msgid "DSCP classification"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:466
+msgid "DSCP mark required"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
msgid "Destination IP address"
msgstr ""
@@ -162,7 +185,7 @@ msgid "Destination address"
msgstr "Destination address"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:379
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
msgid "Destination port"
msgstr "Destination port"
@@ -192,7 +215,7 @@ msgid ""
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:125
msgid "Do not rewrite"
msgstr ""
@@ -214,7 +237,7 @@ msgstr "Drop invalid packets"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:157
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:230
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:189
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:190
msgid "Enable"
msgstr ""
@@ -231,7 +254,10 @@ msgid "Enable logging on this zone"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "Expecting: %s"
msgstr ""
@@ -251,9 +277,9 @@ msgstr ""
msgid "External port"
msgstr "External port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:422
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:594
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:368
msgid "Extra arguments"
msgstr ""
@@ -281,7 +307,7 @@ msgstr "Firewall"
msgid "Firewall - Custom Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
msgid "Firewall - NAT Rules"
msgstr ""
@@ -306,8 +332,8 @@ msgstr "Forward"
msgid "Forward to"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:436
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:608
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:383
msgid "Friday"
msgstr ""
@@ -338,13 +364,13 @@ msgstr ""
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:93
msgid "From %{ipaddr?:any host} %{port?with source %{port}}"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
#: 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/root/usr/share/luci/menu.d/luci-app-firewall.json:16
@@ -412,10 +438,39 @@ msgstr "Internal port"
msgid "Internal zone"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:471
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:553
+msgid "Invalid DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:581
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:355
+msgid "Invalid limit value"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:586
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:360
+msgid "Limit burst"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:558
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+msgid "Limit matching"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:559
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:333
+msgid "Limits traffic matching to the specified rate."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:275
msgid "Loopback source IP"
msgstr ""
@@ -428,7 +483,7 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
msgstr ""
@@ -442,14 +497,18 @@ msgstr "Masquerading"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:133
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:174
msgid "Match"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:84
msgid ""
"Match %{protocol?%{family} %{protocol} traffic:any %{family} traffic} %{mark?"
-"with firewall mark %{mark}}"
+"with firewall mark %{mark}} %{limit?limited to %{limit}}"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:517
+msgid "Match DSCP"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:288
@@ -460,26 +519,26 @@ msgstr ""
msgid "Match device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:239
msgid "Match forwarded traffic directed at the given IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:252
msgid ""
"Match forwarded traffic directed at the given destination port or port range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
msgid "Match forwarded traffic from this IP or range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:228
msgid ""
"Match forwarded traffic originating from the given source port or port range."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match helper"
msgstr ""
@@ -492,40 +551,54 @@ msgstr ""
"on this host"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:302
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:315
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:501
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
msgid "Match mark"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match traffic using the specified connection tracking helper."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:303
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:502
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:317
msgid "Matches a specific firewall mark or a range of different marks."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:311
msgid "Matches forwarded traffic using the specified outbound network device."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:432
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:518
+msgid "Matches traffic carrying the specified DSCP marking."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:587
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:361
+msgid ""
+"Maximum initial number of packets to match: this number gets recharged by "
+"one every time the limit specified above is not reached, up to this number."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:604
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
msgid "Monday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:442
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:614
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:389
msgid "Month Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:156
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:157
#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
msgid "NAT Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:155
msgid ""
"NAT rules allow fine grained control over the source IP to use for outbound "
"or forwarded traffic."
@@ -533,7 +606,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:129
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:210
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Name"
@@ -561,11 +634,11 @@ msgid ""
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:309
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
msgid "Outbound device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:206
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:207
msgid "Outbound zone"
msgstr ""
@@ -574,9 +647,9 @@ msgstr ""
msgid "Output"
msgstr "Output"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:423
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:355
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:595
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:369
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
@@ -602,7 +675,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:162
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:275
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:194
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:195
msgid "Protocol"
msgstr "Protocol"
@@ -645,31 +718,31 @@ msgstr ""
msgid "Restrict to address family"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
msgid "Rewrite IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:270
msgid "Rewrite matched traffic to the specified source IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:300
msgid "Rewrite matched traffic to the specified source port or port range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
msgid "Rewrite port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:184
msgid "Rewrite to"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:115
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:116
msgid "Rewrite to %{ipaddr?%{port?%{ipaddr}, %{port}:%{ipaddr}}:%{port}}"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:122
msgid "Rewrite to outbound device IP"
msgstr ""
@@ -677,15 +750,25 @@ msgstr ""
msgid "Routing/NAT Offloading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:264
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
msgid "SNAT - Rewrite to specific source IP or port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:437
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:609
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:384
msgid "Saturday"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid "Set mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid ""
+"Set the given mark value on established connections. Format is value[/mask]. "
+"If a mask is specified then only those bits set in the mask are modified."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr ""
@@ -725,7 +808,7 @@ msgstr ""
# msgstr ""
#
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:213
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
msgid "Source IP address"
msgstr "Source IP address"
@@ -740,7 +823,7 @@ msgstr "Source address"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:207
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
msgid "Source port"
msgstr "Source port"
@@ -761,28 +844,28 @@ msgid ""
"reflected traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:461
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:371
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:633
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:408
msgid "Start Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:453
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:363
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:625
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:400
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:465
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:375
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:637
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:412
msgid "Stop Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:457
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:367
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:629
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:404
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:431
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:603
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:378
msgid "Sunday"
msgstr ""
@@ -814,18 +897,18 @@ msgid ""
"networks</em> specifies which available networks are members of this zone."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:435
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:607
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:382
msgid "Thursday"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:164
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:469
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:641
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:416
msgid "Time in UTC"
msgstr ""
@@ -845,13 +928,13 @@ msgstr ""
msgid "To %s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:102
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:103
msgid ""
"To %{ipaddr?:any destination} %{port?at %{port}} %{zone?via zone %{zone}} "
"%{device?egress device %{device}}"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Tracking helper"
msgstr ""
@@ -867,8 +950,8 @@ msgid ""
"the router."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:605
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:380
msgid "Tuesday"
msgstr ""
@@ -877,12 +960,12 @@ msgid "Unable to save contents: %s"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:299
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:419
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:498
msgid "Unknown or not installed conntrack helper \"%s\""
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:171
msgid "Unnamed NAT"
msgstr ""
@@ -928,16 +1011,24 @@ msgstr ""
msgid "Via %s at %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:434
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:606
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:381
msgid "Wednesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:426
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:598
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:373
msgid "Week Days"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+msgid "XOR firewall mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid "XOR mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr ""
@@ -964,12 +1055,13 @@ msgstr "accept"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:376
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:382
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:399
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:406
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:231
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:242
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:478
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:485
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:521
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:255
msgid "any"
msgstr "any"
@@ -992,6 +1084,10 @@ msgstr ""
msgid "any zone"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:396
+msgid "apply firewall mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:395
msgid "assign conntrack helper"
msgstr ""
@@ -1000,8 +1096,8 @@ msgstr ""
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:273
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:303
msgid "do not rewrite"
msgstr ""
@@ -1060,11 +1156,20 @@ msgstr ""
msgid "types"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:322
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:562
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+msgid "unlimited"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:238
msgid "unspecified"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "valid firewall mark"
msgstr ""
diff --git a/applications/luci-app-firewall/po/es/firewall.po b/applications/luci-app-firewall/po/es/firewall.po
index ae8ab7ab69..1f7b9daba6 100644
--- a/applications/luci-app-firewall/po/es/firewall.po
+++ b/applications/luci-app-firewall/po/es/firewall.po
@@ -39,11 +39,11 @@ msgstr ""
msgid "<var>%s</var> and limit to %s"
msgstr "<var>%s</var> y limitar a %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:280
msgid "A rewrite IP must be specified!"
msgstr "¡Se debe especificar una IP de reescritura!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:267
msgid "ACCEPT - Disable address rewriting"
msgstr "ACEPTAR - Desactivar reescritura de direcciones"
@@ -61,7 +61,7 @@ msgstr "Aceptar salida"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:224
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:388
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:262
msgid "Action"
msgstr "Acción"
@@ -86,7 +86,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr "Configuración avanzada"
@@ -104,18 +104,29 @@ msgid "Allow forward to <em>destination zones</em>:"
msgstr "Permitir reenvío a <em>zonas de destino</em>:"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:198
msgid "Any"
msgstr "Cualquiera"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:430
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:446
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:340
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:602
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:618
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:377
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:393
msgid "Any day"
msgstr "Cualquier día"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid ""
+"Apply a bitwise XOR of the given value and the existing mark value on "
+"established connections. Format is value[/mask]. If a mask is specified then "
+"those bits set in the mask are zeroed out."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "Apply the given DSCP class or value to established connections."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Assign the specified connection tracking helper to matched traffic."
msgstr ""
"Asigne el asistente de seguimiento de conexión especificado al tráfico "
@@ -171,7 +182,19 @@ msgstr ""
"cualquier reinicio del FIrewall, justo tras haber cargado el conjunto de "
"reglas predeterminadas."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:398
+msgid "DSCP classification"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:466
+msgid "DSCP mark required"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
msgid "Destination IP address"
msgstr "Dirección IP destino"
@@ -180,7 +203,7 @@ msgid "Destination address"
msgstr "Dirección de destino"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:379
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
msgid "Destination port"
msgstr "Puerto de destino"
@@ -213,7 +236,7 @@ msgstr ""
"estado conntrack <em>inválido</em>. Esto puede ser necesario para "
"configuraciones complejas de rutas asimétricas."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:125
msgid "Do not rewrite"
msgstr "No reescribir"
@@ -235,7 +258,7 @@ msgstr "Descartar paquetes inválidos"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:157
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:230
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:189
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:190
msgid "Enable"
msgstr "Activar"
@@ -252,7 +275,10 @@ msgid "Enable logging on this zone"
msgstr "Activar registro en esta zona"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "Expecting: %s"
msgstr "Esperando: %s"
@@ -274,9 +300,9 @@ msgstr "Dirección IP externa"
msgid "External port"
msgstr "Puerto externo"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:422
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:594
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:368
msgid "Extra arguments"
msgstr "Argumentos extra"
@@ -300,7 +326,7 @@ msgstr "Firewall"
msgid "Firewall - Custom Rules"
msgstr "Firewall - Reglas personalizadas"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
msgid "Firewall - NAT Rules"
msgstr "Firewall - Reglas de NAT"
@@ -325,8 +351,8 @@ msgstr "Reenviar"
msgid "Forward to"
msgstr "Reenviar a"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:436
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:608
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:383
msgid "Friday"
msgstr "Viernes"
@@ -357,13 +383,13 @@ msgstr "Desde %s en <var>este dispositivo</var> con la fuente %s"
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr "De %s en <var>este dispositivo</var> con la fuente %s y %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:93
msgid "From %{ipaddr?:any host} %{port?with source %{port}}"
msgstr "Desde %{ipaddr?:cualquier host} %{puerto?con origen %{puerto}}"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
#: 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/root/usr/share/luci/menu.d/luci-app-firewall.json:16
@@ -431,10 +457,39 @@ msgstr "Puerto interno"
msgid "Internal zone"
msgstr "Zona interna"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:471
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:553
+msgid "Invalid DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:581
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:355
+msgid "Invalid limit value"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:586
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:360
+msgid "Limit burst"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Limitar registro de mensajes"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:558
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+msgid "Limit matching"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:559
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:333
+msgid "Limits traffic matching to the specified rate."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:275
msgid "Loopback source IP"
msgstr "IP de origen de bucle invertido"
@@ -447,7 +502,7 @@ msgstr "MAC"
msgid "MACs"
msgstr "MAC"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
msgstr "MASQUERADE - Reescribe automáticamente a la interfaz IP saliente"
@@ -461,18 +516,22 @@ msgstr "Enmascaramiento"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:133
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:174
msgid "Match"
msgstr "Coincidir"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:84
msgid ""
"Match %{protocol?%{family} %{protocol} traffic:any %{family} traffic} %{mark?"
-"with firewall mark %{mark}}"
+"with firewall mark %{mark}} %{limit?limited to %{limit}}"
msgstr ""
"Coincidir %{protocolo?%{familia} %{protocolo} tráfico:cualquiera %{familia} "
"tráfico} %{marco?con marco de firewall %{marco}}"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:517
+msgid "Match DSCP"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:288
msgid "Match ICMP type"
msgstr "Coincidir con tipo ICMP"
@@ -481,22 +540,22 @@ msgstr "Coincidir con tipo ICMP"
msgid "Match device"
msgstr "Dispositivo de coincidencia"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:239
msgid "Match forwarded traffic directed at the given IP address."
msgstr "Haga coincidir el tráfico reenviado dirigido a la dirección IP dada."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:252
msgid ""
"Match forwarded traffic directed at the given destination port or port range."
msgstr ""
"Haga coincidir el tráfico reenviado dirigido al puerto de destino o rango de "
"puertos dados."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
msgid "Match forwarded traffic from this IP or range."
msgstr "Haga coincidir el tráfico reenviado desde esta IP o rango."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:228
msgid ""
"Match forwarded traffic originating from the given source port or port range."
msgstr ""
@@ -504,7 +563,7 @@ msgstr ""
"rango de puertos dados."
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match helper"
msgstr "Ayudante de partido"
@@ -517,46 +576,60 @@ msgstr ""
"destino en este host"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:302
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:315
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:501
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
msgid "Match mark"
msgstr "Marca de partido"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match traffic using the specified connection tracking helper."
msgstr ""
"Haga coincidir el tráfico con el ayudante de seguimiento de conexión "
"especificado."
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:303
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:502
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:317
msgid "Matches a specific firewall mark or a range of different marks."
msgstr ""
"Coincide con una marca de firewall específica o un rango de marcas "
"diferentes."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:311
msgid "Matches forwarded traffic using the specified outbound network device."
msgstr ""
"Coincide con el tráfico reenviado utilizando el dispositivo de red saliente "
"especificado."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:432
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:518
+msgid "Matches traffic carrying the specified DSCP marking."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:587
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:361
+msgid ""
+"Maximum initial number of packets to match: this number gets recharged by "
+"one every time the limit specified above is not reached, up to this number."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:604
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
msgid "Monday"
msgstr "Lunes"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:442
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:614
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:389
msgid "Month Days"
msgstr "Días del mes"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:156
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:157
#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
msgid "NAT Rules"
msgstr "Reglas NAT"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:155
msgid ""
"NAT rules allow fine grained control over the source IP to use for outbound "
"or forwarded traffic."
@@ -566,7 +639,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:129
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:210
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Nombre"
@@ -596,11 +669,11 @@ msgstr ""
"origen o el rango de puertos en el host del cliente"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:309
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
msgid "Outbound device"
msgstr "Dispositivo saliente"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:206
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:207
msgid "Outbound zone"
msgstr "Zona de salida"
@@ -609,9 +682,9 @@ msgstr "Zona de salida"
msgid "Output"
msgstr "Salida"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:423
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:355
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:595
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:369
msgid "Passes additional arguments to iptables. Use with care!"
msgstr "Ingrese argumentos adicionales a iptables. ¡Utilícelo con cuidado!"
@@ -645,7 +718,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:162
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:275
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:194
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:195
msgid "Protocol"
msgstr "Protocolo"
@@ -691,35 +764,35 @@ msgstr "Restringir enmascaramiento a las subredes origen"
msgid "Restrict to address family"
msgstr "Restringir a la familia de direcciones"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
msgid "Rewrite IP address"
msgstr "Reescribir dirección IP"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:270
msgid "Rewrite matched traffic to the specified source IP address."
msgstr ""
"Reescribe el tráfico coincidente a la dirección IP de origen especificada."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:300
msgid "Rewrite matched traffic to the specified source port or port range."
msgstr ""
"Reescribe el tráfico coincidente al puerto de origen o rango de puertos "
"especificados."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
msgid "Rewrite port"
msgstr "Reescribir puerto"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:184
msgid "Rewrite to"
msgstr "Reescribe a"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:115
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:116
msgid "Rewrite to %{ipaddr?%{port?%{ipaddr}, %{port}:%{ipaddr}}:%{port}}"
msgstr ""
"Reescribe a %{ipaddr?%{puerto?%{ipaddr}, %{puerto}:%{ipaddr}}:%{puerto}}"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:122
msgid "Rewrite to outbound device IP"
msgstr "Reescribir a la IP del dispositivo saliente"
@@ -727,15 +800,25 @@ msgstr "Reescribir a la IP del dispositivo saliente"
msgid "Routing/NAT Offloading"
msgstr "Enrutamiento/NAT Offloading"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:264
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
msgid "SNAT - Rewrite to specific source IP or port"
msgstr "SNAT - Reescribe a una fuente específica IP o puerto"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:437
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:609
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:384
msgid "Saturday"
msgstr "Sábado"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid "Set mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid ""
+"Set the given mark value on established connections. Format is value[/mask]. "
+"If a mask is specified then only those bits set in the mask are modified."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr "Descarga basada en software para enrutamiento/NAT"
@@ -745,7 +828,7 @@ msgid "Software flow offloading"
msgstr "Descarga de flujo por software"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:213
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
msgid "Source IP address"
msgstr "Dirección IP de origen"
@@ -760,7 +843,7 @@ msgstr "Dirección de origen"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:207
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
msgid "Source port"
msgstr "Puerto de origen"
@@ -785,28 +868,28 @@ msgstr ""
"Especifica si se debe usar la dirección IP externa o interna para el tráfico "
"reflejado."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:461
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:371
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:633
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:408
msgid "Start Date (yyyy-mm-dd)"
msgstr "Fecha de inicio (aaaa-mm-dd)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:453
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:363
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:625
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:400
msgid "Start Time (hh.mm.ss)"
msgstr "Hora de inicio (hh.mm.ss)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:465
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:375
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:637
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:412
msgid "Stop Date (yyyy-mm-dd)"
msgstr "Fecha de finalización (aaaa-mm-dd)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:457
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:367
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:629
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:404
msgid "Stop Time (hh.mm.ss)"
msgstr "Hora de finalización (hh.mm.ss)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:431
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:603
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:378
msgid "Sunday"
msgstr "Domingo"
@@ -851,18 +934,18 @@ msgstr ""
"<em>Redes cubiertas</em> especifican qué redes disponibles son miembros de "
"esta zona."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:435
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:607
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:382
msgid "Thursday"
msgstr "Jueves"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:164
msgid "Time Restrictions"
msgstr "Restricciones de tiempo"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:469
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:641
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:416
msgid "Time in UTC"
msgstr "Tiempo en UTC"
@@ -882,7 +965,7 @@ msgstr "A %s por <var>este dispositivo</var>"
msgid "To %s, %s in %s"
msgstr "A %s, %s en %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:102
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:103
msgid ""
"To %{ipaddr?:any destination} %{port?at %{port}} %{zone?via zone %{zone}} "
"%{device?egress device %{device}}"
@@ -890,7 +973,7 @@ msgstr ""
"A %{ipaddr?:cualquier destino} %{puerto?a %{puerto}} %{zona?via zona "
"%{zona}} %{dispositivo?dispositivo de salida %{dispositivo}}"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Tracking helper"
msgstr "Ayudante de seguimiento"
@@ -909,8 +992,8 @@ msgstr ""
"diferentes zonas, por ejemplo, para rechazar el tráfico entre ciertos hosts "
"o para abrir puertos WAN en el enrutador."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:605
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:380
msgid "Tuesday"
msgstr "Martes"
@@ -919,12 +1002,12 @@ msgid "Unable to save contents: %s"
msgstr "No se puede guardar el contenido: %s"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:299
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:419
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:498
msgid "Unknown or not installed conntrack helper \"%s\""
msgstr "Ayudante de Conntrack desconocido o no instalado \"%s\""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:171
msgid "Unnamed NAT"
msgstr "NAT sin nombre"
@@ -974,16 +1057,24 @@ msgstr "Vía %s"
msgid "Via %s at %s"
msgstr "Vía %s a %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:434
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:606
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:381
msgid "Wednesday"
msgstr "Miércoles"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:426
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:598
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:373
msgid "Week Days"
msgstr "Días de la semana"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+msgid "XOR firewall mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid "XOR mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "Zona ⇒ Reenvíos"
@@ -1010,12 +1101,13 @@ msgstr "Aceptar"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:376
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:382
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:399
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:406
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:231
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:242
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:478
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:485
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:521
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:255
msgid "any"
msgstr "cualquiera"
@@ -1038,6 +1130,10 @@ msgstr "cualquier router IP"
msgid "any zone"
msgstr "cualquier zona"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:396
+msgid "apply firewall mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:395
msgid "assign conntrack helper"
msgstr "asignar ayudante de Conntrack"
@@ -1046,8 +1142,8 @@ msgstr "asignar ayudante de Conntrack"
msgid "day"
msgstr "Día"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:273
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:303
msgid "do not rewrite"
msgstr "no reescribir"
@@ -1106,12 +1202,21 @@ msgstr "Tipo"
msgid "types"
msgstr "Tipos"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:322
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:562
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+msgid "unlimited"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:238
msgid "unspecified"
msgstr "sin especificar"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "valid firewall mark"
msgstr "marca de firewall válida"
diff --git a/applications/luci-app-firewall/po/fr/firewall.po b/applications/luci-app-firewall/po/fr/firewall.po
index dfc11bd84a..17637200f5 100644
--- a/applications/luci-app-firewall/po/fr/firewall.po
+++ b/applications/luci-app-firewall/po/fr/firewall.po
@@ -38,11 +38,11 @@ msgstr ""
msgid "<var>%s</var> and limit to %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:280
msgid "A rewrite IP must be specified!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:267
msgid "ACCEPT - Disable address rewriting"
msgstr ""
@@ -60,7 +60,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:224
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:388
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:262
msgid "Action"
msgstr "Action"
@@ -79,7 +79,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr "Paramètres avancés"
@@ -97,18 +97,29 @@ msgid "Allow forward to <em>destination zones</em>:"
msgstr "Permettre la transmission vers les <em>zones destination</em> :"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:198
msgid "Any"
msgstr "N'importe lequel"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:430
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:446
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:340
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:602
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:618
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:377
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:393
msgid "Any day"
msgstr "N'importe quel jour"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid ""
+"Apply a bitwise XOR of the given value and the existing mark value on "
+"established connections. Format is value[/mask]. If a mask is specified then "
+"those bits set in the mask are zeroed out."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "Apply the given DSCP class or value to established connections."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Assign the specified connection tracking helper to matched traffic."
msgstr ""
@@ -162,7 +173,19 @@ msgstr ""
"feu. Les commandes sont exécutées après chaque redémarrage du pare-feu, "
"juste après le chargement de l'ensemble de règles par défaut."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:398
+msgid "DSCP classification"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:466
+msgid "DSCP mark required"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
msgid "Destination IP address"
msgstr "Adresse IP de destination"
@@ -171,7 +194,7 @@ msgid "Destination address"
msgstr "Adresse de destination"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:379
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
msgid "Destination port"
msgstr "Port de destination"
@@ -201,7 +224,7 @@ msgid ""
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:125
msgid "Do not rewrite"
msgstr ""
@@ -223,7 +246,7 @@ msgstr "Supprimer les paquets invalides"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:157
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:230
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:189
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:190
msgid "Enable"
msgstr "Activer"
@@ -240,7 +263,10 @@ msgid "Enable logging on this zone"
msgstr "Activer les traces (logs) sur cette zone"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "Expecting: %s"
msgstr ""
@@ -260,9 +286,9 @@ msgstr "Adresse IP externe"
msgid "External port"
msgstr "Port externe"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:422
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:594
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:368
msgid "Extra arguments"
msgstr "Arguments supplémentaires"
@@ -290,7 +316,7 @@ msgstr "Pare-feu"
msgid "Firewall - Custom Rules"
msgstr "Pare-feu - Règles personnalisées"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
msgid "Firewall - NAT Rules"
msgstr ""
@@ -315,8 +341,8 @@ msgstr "Transférer"
msgid "Forward to"
msgstr "Transférer à"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:436
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:608
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:383
msgid "Friday"
msgstr "Vendredi"
@@ -347,13 +373,13 @@ msgstr ""
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:93
msgid "From %{ipaddr?:any host} %{port?with source %{port}}"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
#: 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/root/usr/share/luci/menu.d/luci-app-firewall.json:16
@@ -421,10 +447,39 @@ msgstr "Port interne"
msgid "Internal zone"
msgstr "Zone interne"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:471
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:553
+msgid "Invalid DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:581
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:355
+msgid "Invalid limit value"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:586
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:360
+msgid "Limit burst"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Limiter les messages de journalisation"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:558
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+msgid "Limit matching"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:559
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:333
+msgid "Limits traffic matching to the specified rate."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:275
msgid "Loopback source IP"
msgstr ""
@@ -437,7 +492,7 @@ msgstr "MAC"
msgid "MACs"
msgstr "MACs"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
msgstr ""
@@ -451,14 +506,18 @@ msgstr "Masquage"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:133
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:174
msgid "Match"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:84
msgid ""
"Match %{protocol?%{family} %{protocol} traffic:any %{family} traffic} %{mark?"
-"with firewall mark %{mark}}"
+"with firewall mark %{mark}} %{limit?limited to %{limit}}"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:517
+msgid "Match DSCP"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:288
@@ -469,26 +528,26 @@ msgstr "Type ICMP correspondant"
msgid "Match device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:239
msgid "Match forwarded traffic directed at the given IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:252
msgid ""
"Match forwarded traffic directed at the given destination port or port range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
msgid "Match forwarded traffic from this IP or range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:228
msgid ""
"Match forwarded traffic originating from the given source port or port range."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match helper"
msgstr ""
@@ -501,40 +560,54 @@ msgstr ""
"gamme de ports) sur cet hôte"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:302
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:315
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:501
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
msgid "Match mark"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match traffic using the specified connection tracking helper."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:303
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:502
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:317
msgid "Matches a specific firewall mark or a range of different marks."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:311
msgid "Matches forwarded traffic using the specified outbound network device."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:432
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:518
+msgid "Matches traffic carrying the specified DSCP marking."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:587
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:361
+msgid ""
+"Maximum initial number of packets to match: this number gets recharged by "
+"one every time the limit specified above is not reached, up to this number."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:604
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
msgid "Monday"
msgstr "Lundi"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:442
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:614
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:389
msgid "Month Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:156
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:157
#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
msgid "NAT Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:155
msgid ""
"NAT rules allow fine grained control over the source IP to use for outbound "
"or forwarded traffic."
@@ -542,7 +615,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:129
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:210
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Nom"
@@ -570,11 +643,11 @@ msgid ""
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:309
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
msgid "Outbound device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:206
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:207
msgid "Outbound zone"
msgstr ""
@@ -583,9 +656,9 @@ msgstr ""
msgid "Output"
msgstr "Sortie"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:423
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:355
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:595
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:369
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
"Passe des arguments supplémentaires aux tables d'adresses IP. A utiliser "
@@ -615,7 +688,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:162
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:275
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:194
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:195
msgid "Protocol"
msgstr "Protocole"
@@ -663,31 +736,31 @@ msgstr ""
msgid "Restrict to address family"
msgstr "Restreindre à cette famille d'adresses"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
msgid "Rewrite IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:270
msgid "Rewrite matched traffic to the specified source IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:300
msgid "Rewrite matched traffic to the specified source port or port range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
msgid "Rewrite port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:184
msgid "Rewrite to"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:115
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:116
msgid "Rewrite to %{ipaddr?%{port?%{ipaddr}, %{port}:%{ipaddr}}:%{port}}"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:122
msgid "Rewrite to outbound device IP"
msgstr ""
@@ -695,15 +768,25 @@ msgstr ""
msgid "Routing/NAT Offloading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:264
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
msgid "SNAT - Rewrite to specific source IP or port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:437
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:609
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:384
msgid "Saturday"
msgstr "Samedi"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid "Set mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid ""
+"Set the given mark value on established connections. Format is value[/mask]. "
+"If a mask is specified then only those bits set in the mask are modified."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr ""
@@ -743,7 +826,7 @@ msgstr ""
# msgstr ""
#
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:213
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
msgid "Source IP address"
msgstr "Adresse IP source"
@@ -758,7 +841,7 @@ msgstr "Adresse source"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:207
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
msgid "Source port"
msgstr "Port source"
@@ -779,28 +862,28 @@ msgid ""
"reflected traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:461
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:371
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:633
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:408
msgid "Start Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:453
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:363
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:625
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:400
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:465
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:375
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:637
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:412
msgid "Stop Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:457
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:367
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:629
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:404
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:431
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:603
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:378
msgid "Sunday"
msgstr "Dimanche"
@@ -846,18 +929,18 @@ msgstr ""
"cette zone. Les <em>réseaux couverts</em> indiquent quels réseaux "
"disponibles sont membre de cette zone."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:435
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:607
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:382
msgid "Thursday"
msgstr "Jeudi"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:164
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:469
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:641
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:416
msgid "Time in UTC"
msgstr "Heure en UTC"
@@ -877,13 +960,13 @@ msgstr ""
msgid "To %s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:102
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:103
msgid ""
"To %{ipaddr?:any destination} %{port?at %{port}} %{zone?via zone %{zone}} "
"%{device?egress device %{device}}"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Tracking helper"
msgstr ""
@@ -902,8 +985,8 @@ msgstr ""
"entre différentes zones, par exemple pour rejeter le trafic entre certains "
"hôtes ou pour ouvrir des ports WAN sur le routeur."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:605
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:380
msgid "Tuesday"
msgstr "Mardi"
@@ -912,12 +995,12 @@ msgid "Unable to save contents: %s"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:299
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:419
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:498
msgid "Unknown or not installed conntrack helper \"%s\""
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:171
msgid "Unnamed NAT"
msgstr ""
@@ -965,16 +1048,24 @@ msgstr ""
msgid "Via %s at %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:434
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:606
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:381
msgid "Wednesday"
msgstr "Mercredi"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:426
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:598
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:373
msgid "Week Days"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+msgid "XOR firewall mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid "XOR mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "Zone ⇒ Transmissions"
@@ -1001,12 +1092,13 @@ msgstr "accepter"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:376
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:382
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:399
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:406
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:231
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:242
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:478
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:485
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:521
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:255
msgid "any"
msgstr "tous"
@@ -1029,6 +1121,10 @@ msgstr ""
msgid "any zone"
msgstr "n'importe quelle zone"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:396
+msgid "apply firewall mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:395
msgid "assign conntrack helper"
msgstr ""
@@ -1037,8 +1133,8 @@ msgstr ""
msgid "day"
msgstr "journée"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:273
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:303
msgid "do not rewrite"
msgstr ""
@@ -1097,12 +1193,21 @@ msgstr "type"
msgid "types"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:322
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:562
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+msgid "unlimited"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:238
msgid "unspecified"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "valid firewall mark"
msgstr ""
diff --git a/applications/luci-app-firewall/po/he/firewall.po b/applications/luci-app-firewall/po/he/firewall.po
index 03bc60d7c4..f6962a09c1 100644
--- a/applications/luci-app-firewall/po/he/firewall.po
+++ b/applications/luci-app-firewall/po/he/firewall.po
@@ -32,11 +32,11 @@ msgstr ""
msgid "<var>%s</var> and limit to %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:280
msgid "A rewrite IP must be specified!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:267
msgid "ACCEPT - Disable address rewriting"
msgstr ""
@@ -54,7 +54,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:224
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:388
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:262
msgid "Action"
msgstr ""
@@ -73,7 +73,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr ""
@@ -91,18 +91,29 @@ msgid "Allow forward to <em>destination zones</em>:"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:198
msgid "Any"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:430
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:446
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:340
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:602
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:618
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:377
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:393
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid ""
+"Apply a bitwise XOR of the given value and the existing mark value on "
+"established connections. Format is value[/mask]. If a mask is specified then "
+"those bits set in the mask are zeroed out."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "Apply the given DSCP class or value to established connections."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Assign the specified connection tracking helper to matched traffic."
msgstr ""
@@ -150,7 +161,19 @@ msgid ""
"each firewall restart, right after the default ruleset has been loaded."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:398
+msgid "DSCP classification"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:466
+msgid "DSCP mark required"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
msgid "Destination IP address"
msgstr ""
@@ -159,7 +182,7 @@ msgid "Destination address"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:379
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
msgid "Destination port"
msgstr ""
@@ -189,7 +212,7 @@ msgid ""
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:125
msgid "Do not rewrite"
msgstr ""
@@ -211,7 +234,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:157
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:230
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:189
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:190
msgid "Enable"
msgstr ""
@@ -228,7 +251,10 @@ msgid "Enable logging on this zone"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "Expecting: %s"
msgstr ""
@@ -248,9 +274,9 @@ msgstr ""
msgid "External port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:422
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:594
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:368
msgid "Extra arguments"
msgstr ""
@@ -274,7 +300,7 @@ msgstr ""
msgid "Firewall - Custom Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
msgid "Firewall - NAT Rules"
msgstr ""
@@ -299,8 +325,8 @@ msgstr ""
msgid "Forward to"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:436
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:608
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:383
msgid "Friday"
msgstr ""
@@ -331,13 +357,13 @@ msgstr ""
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:93
msgid "From %{ipaddr?:any host} %{port?with source %{port}}"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
#: 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/root/usr/share/luci/menu.d/luci-app-firewall.json:16
@@ -405,10 +431,39 @@ msgstr ""
msgid "Internal zone"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:471
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:553
+msgid "Invalid DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:581
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:355
+msgid "Invalid limit value"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:586
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:360
+msgid "Limit burst"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:558
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+msgid "Limit matching"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:559
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:333
+msgid "Limits traffic matching to the specified rate."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:275
msgid "Loopback source IP"
msgstr ""
@@ -421,7 +476,7 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
msgstr ""
@@ -435,14 +490,18 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:133
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:174
msgid "Match"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:84
msgid ""
"Match %{protocol?%{family} %{protocol} traffic:any %{family} traffic} %{mark?"
-"with firewall mark %{mark}}"
+"with firewall mark %{mark}} %{limit?limited to %{limit}}"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:517
+msgid "Match DSCP"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:288
@@ -453,26 +512,26 @@ msgstr ""
msgid "Match device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:239
msgid "Match forwarded traffic directed at the given IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:252
msgid ""
"Match forwarded traffic directed at the given destination port or port range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
msgid "Match forwarded traffic from this IP or range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:228
msgid ""
"Match forwarded traffic originating from the given source port or port range."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match helper"
msgstr ""
@@ -483,40 +542,54 @@ msgid ""
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:302
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:315
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:501
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
msgid "Match mark"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match traffic using the specified connection tracking helper."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:303
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:502
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:317
msgid "Matches a specific firewall mark or a range of different marks."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:311
msgid "Matches forwarded traffic using the specified outbound network device."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:432
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:518
+msgid "Matches traffic carrying the specified DSCP marking."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:587
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:361
+msgid ""
+"Maximum initial number of packets to match: this number gets recharged by "
+"one every time the limit specified above is not reached, up to this number."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:604
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
msgid "Monday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:442
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:614
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:389
msgid "Month Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:156
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:157
#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
msgid "NAT Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:155
msgid ""
"NAT rules allow fine grained control over the source IP to use for outbound "
"or forwarded traffic."
@@ -524,7 +597,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:129
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:210
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr ""
@@ -552,11 +625,11 @@ msgid ""
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:309
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
msgid "Outbound device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:206
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:207
msgid "Outbound zone"
msgstr ""
@@ -565,9 +638,9 @@ msgstr ""
msgid "Output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:423
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:355
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:595
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:369
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
@@ -593,7 +666,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:162
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:275
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:194
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:195
msgid "Protocol"
msgstr ""
@@ -635,31 +708,31 @@ msgstr ""
msgid "Restrict to address family"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
msgid "Rewrite IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:270
msgid "Rewrite matched traffic to the specified source IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:300
msgid "Rewrite matched traffic to the specified source port or port range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
msgid "Rewrite port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:184
msgid "Rewrite to"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:115
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:116
msgid "Rewrite to %{ipaddr?%{port?%{ipaddr}, %{port}:%{ipaddr}}:%{port}}"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:122
msgid "Rewrite to outbound device IP"
msgstr ""
@@ -667,15 +740,25 @@ msgstr ""
msgid "Routing/NAT Offloading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:264
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
msgid "SNAT - Rewrite to specific source IP or port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:437
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:609
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:384
msgid "Saturday"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid "Set mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid ""
+"Set the given mark value on established connections. Format is value[/mask]. "
+"If a mask is specified then only those bits set in the mask are modified."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr ""
@@ -685,7 +768,7 @@ msgid "Software flow offloading"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:213
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
msgid "Source IP address"
msgstr ""
@@ -700,7 +783,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:207
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
msgid "Source port"
msgstr ""
@@ -721,28 +804,28 @@ msgid ""
"reflected traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:461
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:371
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:633
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:408
msgid "Start Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:453
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:363
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:625
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:400
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:465
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:375
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:637
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:412
msgid "Stop Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:457
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:367
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:629
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:404
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:431
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:603
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:378
msgid "Sunday"
msgstr ""
@@ -772,18 +855,18 @@ msgid ""
"networks</em> specifies which available networks are members of this zone."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:435
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:607
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:382
msgid "Thursday"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:164
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:469
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:641
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:416
msgid "Time in UTC"
msgstr ""
@@ -803,13 +886,13 @@ msgstr ""
msgid "To %s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:102
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:103
msgid ""
"To %{ipaddr?:any destination} %{port?at %{port}} %{zone?via zone %{zone}} "
"%{device?egress device %{device}}"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Tracking helper"
msgstr ""
@@ -825,8 +908,8 @@ msgid ""
"the router."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:605
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:380
msgid "Tuesday"
msgstr ""
@@ -835,12 +918,12 @@ msgid "Unable to save contents: %s"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:299
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:419
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:498
msgid "Unknown or not installed conntrack helper \"%s\""
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:171
msgid "Unnamed NAT"
msgstr ""
@@ -886,16 +969,24 @@ msgstr ""
msgid "Via %s at %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:434
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:606
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:381
msgid "Wednesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:426
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:598
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:373
msgid "Week Days"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+msgid "XOR firewall mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid "XOR mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr ""
@@ -922,12 +1013,13 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:376
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:382
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:399
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:406
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:231
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:242
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:478
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:485
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:521
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:255
msgid "any"
msgstr ""
@@ -950,6 +1042,10 @@ msgstr ""
msgid "any zone"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:396
+msgid "apply firewall mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:395
msgid "assign conntrack helper"
msgstr ""
@@ -958,8 +1054,8 @@ msgstr ""
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:273
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:303
msgid "do not rewrite"
msgstr ""
@@ -1018,11 +1114,20 @@ msgstr ""
msgid "types"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:322
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:562
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+msgid "unlimited"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:238
msgid "unspecified"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "valid firewall mark"
msgstr ""
diff --git a/applications/luci-app-firewall/po/hi/firewall.po b/applications/luci-app-firewall/po/hi/firewall.po
index cd1cadf240..0ab99d8988 100644
--- a/applications/luci-app-firewall/po/hi/firewall.po
+++ b/applications/luci-app-firewall/po/hi/firewall.po
@@ -38,11 +38,11 @@ msgstr ""
msgid "<var>%s</var> and limit to %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:280
msgid "A rewrite IP must be specified!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:267
msgid "ACCEPT - Disable address rewriting"
msgstr ""
@@ -60,7 +60,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:224
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:388
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:262
msgid "Action"
msgstr ""
@@ -79,7 +79,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr ""
@@ -97,18 +97,29 @@ msgid "Allow forward to <em>destination zones</em>:"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:198
msgid "Any"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:430
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:446
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:340
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:602
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:618
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:377
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:393
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid ""
+"Apply a bitwise XOR of the given value and the existing mark value on "
+"established connections. Format is value[/mask]. If a mask is specified then "
+"those bits set in the mask are zeroed out."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "Apply the given DSCP class or value to established connections."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Assign the specified connection tracking helper to matched traffic."
msgstr ""
@@ -156,7 +167,19 @@ msgid ""
"each firewall restart, right after the default ruleset has been loaded."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:398
+msgid "DSCP classification"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:466
+msgid "DSCP mark required"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
msgid "Destination IP address"
msgstr ""
@@ -165,7 +188,7 @@ msgid "Destination address"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:379
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
msgid "Destination port"
msgstr ""
@@ -195,7 +218,7 @@ msgid ""
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:125
msgid "Do not rewrite"
msgstr ""
@@ -217,7 +240,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:157
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:230
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:189
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:190
msgid "Enable"
msgstr ""
@@ -234,7 +257,10 @@ msgid "Enable logging on this zone"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "Expecting: %s"
msgstr ""
@@ -254,9 +280,9 @@ msgstr ""
msgid "External port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:422
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:594
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:368
msgid "Extra arguments"
msgstr ""
@@ -284,7 +310,7 @@ msgstr ""
msgid "Firewall - Custom Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
msgid "Firewall - NAT Rules"
msgstr ""
@@ -309,8 +335,8 @@ msgstr ""
msgid "Forward to"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:436
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:608
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:383
msgid "Friday"
msgstr ""
@@ -341,13 +367,13 @@ msgstr ""
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:93
msgid "From %{ipaddr?:any host} %{port?with source %{port}}"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
#: 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/root/usr/share/luci/menu.d/luci-app-firewall.json:16
@@ -415,10 +441,39 @@ msgstr ""
msgid "Internal zone"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:471
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:553
+msgid "Invalid DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:581
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:355
+msgid "Invalid limit value"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:586
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:360
+msgid "Limit burst"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:558
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+msgid "Limit matching"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:559
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:333
+msgid "Limits traffic matching to the specified rate."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:275
msgid "Loopback source IP"
msgstr ""
@@ -431,7 +486,7 @@ msgstr "MAC"
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
msgstr ""
@@ -445,14 +500,18 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:133
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:174
msgid "Match"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:84
msgid ""
"Match %{protocol?%{family} %{protocol} traffic:any %{family} traffic} %{mark?"
-"with firewall mark %{mark}}"
+"with firewall mark %{mark}} %{limit?limited to %{limit}}"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:517
+msgid "Match DSCP"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:288
@@ -463,26 +522,26 @@ msgstr ""
msgid "Match device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:239
msgid "Match forwarded traffic directed at the given IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:252
msgid ""
"Match forwarded traffic directed at the given destination port or port range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
msgid "Match forwarded traffic from this IP or range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:228
msgid ""
"Match forwarded traffic originating from the given source port or port range."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match helper"
msgstr ""
@@ -493,40 +552,54 @@ msgid ""
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:302
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:315
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:501
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
msgid "Match mark"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match traffic using the specified connection tracking helper."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:303
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:502
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:317
msgid "Matches a specific firewall mark or a range of different marks."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:311
msgid "Matches forwarded traffic using the specified outbound network device."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:432
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:518
+msgid "Matches traffic carrying the specified DSCP marking."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:587
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:361
+msgid ""
+"Maximum initial number of packets to match: this number gets recharged by "
+"one every time the limit specified above is not reached, up to this number."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:604
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
msgid "Monday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:442
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:614
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:389
msgid "Month Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:156
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:157
#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
msgid "NAT Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:155
msgid ""
"NAT rules allow fine grained control over the source IP to use for outbound "
"or forwarded traffic."
@@ -534,7 +607,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:129
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:210
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr ""
@@ -562,11 +635,11 @@ msgid ""
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:309
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
msgid "Outbound device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:206
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:207
msgid "Outbound zone"
msgstr ""
@@ -575,9 +648,9 @@ msgstr ""
msgid "Output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:423
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:355
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:595
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:369
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
@@ -603,7 +676,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:162
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:275
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:194
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:195
msgid "Protocol"
msgstr ""
@@ -645,31 +718,31 @@ msgstr ""
msgid "Restrict to address family"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
msgid "Rewrite IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:270
msgid "Rewrite matched traffic to the specified source IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:300
msgid "Rewrite matched traffic to the specified source port or port range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
msgid "Rewrite port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:184
msgid "Rewrite to"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:115
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:116
msgid "Rewrite to %{ipaddr?%{port?%{ipaddr}, %{port}:%{ipaddr}}:%{port}}"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:122
msgid "Rewrite to outbound device IP"
msgstr ""
@@ -677,15 +750,25 @@ msgstr ""
msgid "Routing/NAT Offloading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:264
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
msgid "SNAT - Rewrite to specific source IP or port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:437
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:609
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:384
msgid "Saturday"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid "Set mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid ""
+"Set the given mark value on established connections. Format is value[/mask]. "
+"If a mask is specified then only those bits set in the mask are modified."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr ""
@@ -725,7 +808,7 @@ msgstr ""
# msgstr ""
#
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:213
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
msgid "Source IP address"
msgstr ""
@@ -740,7 +823,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:207
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
msgid "Source port"
msgstr ""
@@ -761,28 +844,28 @@ msgid ""
"reflected traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:461
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:371
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:633
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:408
msgid "Start Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:453
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:363
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:625
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:400
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:465
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:375
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:637
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:412
msgid "Stop Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:457
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:367
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:629
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:404
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:431
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:603
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:378
msgid "Sunday"
msgstr ""
@@ -812,18 +895,18 @@ msgid ""
"networks</em> specifies which available networks are members of this zone."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:435
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:607
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:382
msgid "Thursday"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:164
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:469
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:641
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:416
msgid "Time in UTC"
msgstr ""
@@ -843,13 +926,13 @@ msgstr ""
msgid "To %s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:102
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:103
msgid ""
"To %{ipaddr?:any destination} %{port?at %{port}} %{zone?via zone %{zone}} "
"%{device?egress device %{device}}"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Tracking helper"
msgstr ""
@@ -865,8 +948,8 @@ msgid ""
"the router."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:605
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:380
msgid "Tuesday"
msgstr ""
@@ -875,12 +958,12 @@ msgid "Unable to save contents: %s"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:299
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:419
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:498
msgid "Unknown or not installed conntrack helper \"%s\""
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:171
msgid "Unnamed NAT"
msgstr ""
@@ -926,16 +1009,24 @@ msgstr ""
msgid "Via %s at %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:434
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:606
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:381
msgid "Wednesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:426
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:598
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:373
msgid "Week Days"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+msgid "XOR firewall mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid "XOR mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr ""
@@ -962,12 +1053,13 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:376
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:382
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:399
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:406
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:231
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:242
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:478
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:485
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:521
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:255
msgid "any"
msgstr ""
@@ -990,6 +1082,10 @@ msgstr ""
msgid "any zone"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:396
+msgid "apply firewall mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:395
msgid "assign conntrack helper"
msgstr ""
@@ -998,8 +1094,8 @@ msgstr ""
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:273
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:303
msgid "do not rewrite"
msgstr ""
@@ -1058,11 +1154,20 @@ msgstr ""
msgid "types"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:322
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:562
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+msgid "unlimited"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:238
msgid "unspecified"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "valid firewall mark"
msgstr ""
diff --git a/applications/luci-app-firewall/po/hu/firewall.po b/applications/luci-app-firewall/po/hu/firewall.po
index 8163dfc5e0..c30197a753 100644
--- a/applications/luci-app-firewall/po/hu/firewall.po
+++ b/applications/luci-app-firewall/po/hu/firewall.po
@@ -36,11 +36,11 @@ msgstr "<var>%d</var> csomag / <var>%s</var>, löket <var>%d</var> csomag"
msgid "<var>%s</var> and limit to %s"
msgstr "<var>%s</var> és korlátozás erre: %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:280
msgid "A rewrite IP must be specified!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:267
msgid "ACCEPT - Disable address rewriting"
msgstr ""
@@ -58,7 +58,7 @@ msgstr "Kimenet elfogadása"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:224
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:388
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:262
msgid "Action"
msgstr "Művelet"
@@ -83,7 +83,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr "Speciális beállítások"
@@ -101,18 +101,29 @@ msgid "Allow forward to <em>destination zones</em>:"
msgstr "Továbbítás engedélyezése ezekbe a <em>célzónákba</em>:"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:198
msgid "Any"
msgstr "Bármelyik"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:430
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:446
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:340
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:602
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:618
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:377
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:393
msgid "Any day"
msgstr "Bármely nap"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid ""
+"Apply a bitwise XOR of the given value and the existing mark value on "
+"established connections. Format is value[/mask]. If a mask is specified then "
+"those bits set in the mask are zeroed out."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "Apply the given DSCP class or value to established connections."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Assign the specified connection tracking helper to matched traffic."
msgstr ""
@@ -166,7 +177,19 @@ msgstr ""
"parancsok minden tűzfal-újraindítás után végrehajtásra kerülnek, közvetlenül "
"az alapértelmezett szabálykészletek betöltődése után."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:398
+msgid "DSCP classification"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:466
+msgid "DSCP mark required"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
msgid "Destination IP address"
msgstr "Cél IP-cím"
@@ -175,7 +198,7 @@ msgid "Destination address"
msgstr "Célcím"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:379
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
msgid "Destination port"
msgstr "Célport"
@@ -207,7 +230,7 @@ msgstr ""
"Ne telepítsen további szabályokat az <em>érvénytelen</em> kapcsolatkövető "
"állapottal rendelkező továbbított forgalom visszautasításához."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:125
msgid "Do not rewrite"
msgstr "Ne írja felül"
@@ -229,7 +252,7 @@ msgstr "Érvénytelen csomagok eldobása"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:157
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:230
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:189
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:190
msgid "Enable"
msgstr "Engedélyezés"
@@ -246,7 +269,10 @@ msgid "Enable logging on this zone"
msgstr "Naplózás engedélyezése ezen a zónán"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "Expecting: %s"
msgstr ""
@@ -268,9 +294,9 @@ msgstr "Külső IP-cím"
msgid "External port"
msgstr "Külső port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:422
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:594
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:368
msgid "Extra arguments"
msgstr "További argumentumok"
@@ -294,7 +320,7 @@ msgstr "Tűzfal"
msgid "Firewall - Custom Rules"
msgstr "Tűzfal – egyéni szabályok"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
msgid "Firewall - NAT Rules"
msgstr ""
@@ -319,8 +345,8 @@ msgstr "Továbbítás"
msgid "Forward to"
msgstr "Továbbítás ide"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:436
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:608
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:383
msgid "Friday"
msgstr "Péntek"
@@ -352,13 +378,13 @@ msgid "From %s on <var>this device</var> with source %s and %s"
msgstr ""
"Ettől: %s, <var>ezen az eszközön</var>, ezekkel a forrásokkal: %s és %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:93
msgid "From %{ipaddr?:any host} %{port?with source %{port}}"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
#: 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/root/usr/share/luci/menu.d/luci-app-firewall.json:16
@@ -426,10 +452,39 @@ msgstr "Belső port"
msgid "Internal zone"
msgstr "Belső zóna"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:471
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:553
+msgid "Invalid DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:581
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:355
+msgid "Invalid limit value"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:586
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:360
+msgid "Limit burst"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Naplóüzenetek korlátozása"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:558
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+msgid "Limit matching"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:559
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:333
+msgid "Limits traffic matching to the specified rate."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:275
msgid "Loopback source IP"
msgstr ""
@@ -442,7 +497,7 @@ msgstr "MAC"
msgid "MACs"
msgstr "MAC-ek"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
msgstr ""
@@ -456,14 +511,18 @@ msgstr "Álcázás"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:133
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:174
msgid "Match"
msgstr "Illesztés"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:84
msgid ""
"Match %{protocol?%{family} %{protocol} traffic:any %{family} traffic} %{mark?"
-"with firewall mark %{mark}}"
+"with firewall mark %{mark}} %{limit?limited to %{limit}}"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:517
+msgid "Match DSCP"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:288
@@ -474,26 +533,26 @@ msgstr "ICMP-típus illesztése"
msgid "Match device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:239
msgid "Match forwarded traffic directed at the given IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:252
msgid ""
"Match forwarded traffic directed at the given destination port or port range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
msgid "Match forwarded traffic from this IP or range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:228
msgid ""
"Match forwarded traffic originating from the given source port or port range."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match helper"
msgstr ""
@@ -506,40 +565,54 @@ msgstr ""
"bejövő forgalom illesztése"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:302
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:315
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:501
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
msgid "Match mark"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match traffic using the specified connection tracking helper."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:303
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:502
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:317
msgid "Matches a specific firewall mark or a range of different marks."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:311
msgid "Matches forwarded traffic using the specified outbound network device."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:432
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:518
+msgid "Matches traffic carrying the specified DSCP marking."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:587
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:361
+msgid ""
+"Maximum initial number of packets to match: this number gets recharged by "
+"one every time the limit specified above is not reached, up to this number."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:604
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
msgid "Monday"
msgstr "Hétfő"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:442
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:614
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:389
msgid "Month Days"
msgstr "Hónap napjai"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:156
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:157
#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
msgid "NAT Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:155
msgid ""
"NAT rules allow fine grained control over the source IP to use for outbound "
"or forwarded traffic."
@@ -547,7 +620,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:129
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:210
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Név"
@@ -578,11 +651,11 @@ msgstr ""
"bejövő forgalom illesztése"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:309
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
msgid "Outbound device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:206
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:207
msgid "Outbound zone"
msgstr ""
@@ -591,9 +664,9 @@ msgstr ""
msgid "Output"
msgstr "Kimenet"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:423
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:355
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:595
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:369
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
"Átadja a további argumentumokat az iptables részére. Használja "
@@ -630,7 +703,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:162
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:275
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:194
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:195
msgid "Protocol"
msgstr "Protokoll"
@@ -672,31 +745,31 @@ msgstr "Álcázás korlátozása a megadott forrás alhálózatokra"
msgid "Restrict to address family"
msgstr "Korlátozás címcsaládra"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
msgid "Rewrite IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:270
msgid "Rewrite matched traffic to the specified source IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:300
msgid "Rewrite matched traffic to the specified source port or port range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
msgid "Rewrite port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:184
msgid "Rewrite to"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:115
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:116
msgid "Rewrite to %{ipaddr?%{port?%{ipaddr}, %{port}:%{ipaddr}}:%{port}}"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:122
msgid "Rewrite to outbound device IP"
msgstr ""
@@ -704,15 +777,25 @@ msgstr ""
msgid "Routing/NAT Offloading"
msgstr "Útválasztás vagy NAT kiürítés"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:264
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
msgid "SNAT - Rewrite to specific source IP or port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:437
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:609
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:384
msgid "Saturday"
msgstr "Szombat"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid "Set mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid ""
+"Set the given mark value on established connections. Format is value[/mask]. "
+"If a mask is specified then only those bits set in the mask are modified."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr "Szoftver alapú kiürítés az útválasztásnál vagy NAT-nál"
@@ -722,7 +805,7 @@ msgid "Software flow offloading"
msgstr "Szoftveres áramláskiürítés"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:213
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
msgid "Source IP address"
msgstr "Forrás IP-cím"
@@ -737,7 +820,7 @@ msgstr "Forráscím"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:207
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
msgid "Source port"
msgstr "Forrásport"
@@ -758,28 +841,28 @@ msgid ""
"reflected traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:461
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:371
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:633
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:408
msgid "Start Date (yyyy-mm-dd)"
msgstr "Kezdés dátuma (ÉÉÉÉ-HH-NN)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:453
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:363
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:625
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:400
msgid "Start Time (hh.mm.ss)"
msgstr "Kezdés ideje (ÓÓ.PP.MM)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:465
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:375
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:637
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:412
msgid "Stop Date (yyyy-mm-dd)"
msgstr "Leállítás dátuma (ÉÉÉÉ-HH-NN)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:457
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:367
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:629
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:404
msgid "Stop Time (hh.mm.ss)"
msgstr "Leállítás ideje (ÓÓ.PP.MM)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:431
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:603
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:378
msgid "Sunday"
msgstr "Vasárnap"
@@ -824,18 +907,18 @@ msgstr ""
"belül. A <em>lefedett hálózatok</em> adják meg, hogy mely elérhető hálózatok "
"tagjai ennek a zónának."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:435
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:607
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:382
msgid "Thursday"
msgstr "Csütörtök"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:164
msgid "Time Restrictions"
msgstr "Időkorlátozások"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:469
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:641
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:416
msgid "Time in UTC"
msgstr "Idő UTC szerint"
@@ -855,13 +938,13 @@ msgstr "Ide: %s, <var>ezen az eszközön</var>"
msgid "To %s, %s in %s"
msgstr "Erre: %s, %s ebben: %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:102
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:103
msgid ""
"To %{ipaddr?:any destination} %{port?at %{port}} %{zone?via zone %{zone}} "
"%{device?egress device %{device}}"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Tracking helper"
msgstr ""
@@ -880,8 +963,8 @@ msgstr ""
"szabályokat határozzák meg, például bizonyos gépek közötti forgalom "
"visszautasításához vagy WAN portok megnyitásához az útválasztón."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:605
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:380
msgid "Tuesday"
msgstr "Kedd"
@@ -890,12 +973,12 @@ msgid "Unable to save contents: %s"
msgstr "Nem lehet elmenteni a tartalmat: %s"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:299
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:419
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:498
msgid "Unknown or not installed conntrack helper \"%s\""
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:171
msgid "Unnamed NAT"
msgstr ""
@@ -945,16 +1028,24 @@ msgstr "Ezen keresztül: %s"
msgid "Via %s at %s"
msgstr "Ezen keresztül: %s, itt: %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:434
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:606
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:381
msgid "Wednesday"
msgstr "Szerda"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:426
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:598
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:373
msgid "Week Days"
msgstr "Hétköznapok"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+msgid "XOR firewall mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid "XOR mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "Zóna ⇒ Továbbítások"
@@ -981,12 +1072,13 @@ msgstr "elfogadás"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:376
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:382
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:399
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:406
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:231
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:242
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:478
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:485
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:521
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:255
msgid "any"
msgstr "bármely"
@@ -1009,6 +1101,10 @@ msgstr "bármely útválasztó IP"
msgid "any zone"
msgstr "bármely zóna"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:396
+msgid "apply firewall mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:395
msgid "assign conntrack helper"
msgstr ""
@@ -1017,8 +1113,8 @@ msgstr ""
msgid "day"
msgstr "nap"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:273
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:303
msgid "do not rewrite"
msgstr ""
@@ -1077,12 +1173,21 @@ msgstr "típus"
msgid "types"
msgstr "típusok"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:322
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:562
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+msgid "unlimited"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:238
msgid "unspecified"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "valid firewall mark"
msgstr ""
diff --git a/applications/luci-app-firewall/po/it/firewall.po b/applications/luci-app-firewall/po/it/firewall.po
index bf1ac6b06d..5901306b78 100644
--- a/applications/luci-app-firewall/po/it/firewall.po
+++ b/applications/luci-app-firewall/po/it/firewall.po
@@ -38,11 +38,11 @@ msgstr ""
msgid "<var>%s</var> and limit to %s"
msgstr "<var>%s</var> e limita a %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:280
msgid "A rewrite IP must be specified!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:267
msgid "ACCEPT - Disable address rewriting"
msgstr ""
@@ -60,7 +60,7 @@ msgstr "Accetta output"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:224
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:388
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:262
msgid "Action"
msgstr "Azione"
@@ -79,7 +79,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr "Opzioni Avanzate"
@@ -97,18 +97,29 @@ msgid "Allow forward to <em>destination zones</em>:"
msgstr "Permetti rounting a <em>zone di destinazione</em>:"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:198
msgid "Any"
msgstr "Qualsiasi"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:430
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:446
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:340
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:602
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:618
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:377
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:393
msgid "Any day"
msgstr "Qualsiasi giorno"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid ""
+"Apply a bitwise XOR of the given value and the existing mark value on "
+"established connections. Format is value[/mask]. If a mask is specified then "
+"those bits set in the mask are zeroed out."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "Apply the given DSCP class or value to established connections."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Assign the specified connection tracking helper to matched traffic."
msgstr ""
@@ -160,7 +171,19 @@ msgstr ""
"comandi sono eseguiti dopo ogni riavvio del firewall, giusto dopo le altre "
"regole che sono state caricate."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:398
+msgid "DSCP classification"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:466
+msgid "DSCP mark required"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
msgid "Destination IP address"
msgstr "Indirizzo IP destinazione"
@@ -169,7 +192,7 @@ msgid "Destination address"
msgstr "Indirizzo di destinazione"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:379
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
msgid "Destination port"
msgstr "Porta di destinazione"
@@ -199,7 +222,7 @@ msgid ""
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:125
msgid "Do not rewrite"
msgstr "Non riscrivere"
@@ -221,7 +244,7 @@ msgstr "Scarta pacchetti invalidi"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:157
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:230
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:189
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:190
msgid "Enable"
msgstr "Attiva"
@@ -238,7 +261,10 @@ msgid "Enable logging on this zone"
msgstr "Attiva registro su questa zona"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "Expecting: %s"
msgstr ""
@@ -258,9 +284,9 @@ msgstr "Indirizzo IP Esterno"
msgid "External port"
msgstr "Porta Esterna"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:422
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:594
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:368
msgid "Extra arguments"
msgstr "Comandi extra"
@@ -284,7 +310,7 @@ msgstr "Firewall"
msgid "Firewall - Custom Rules"
msgstr "Firewall - Regole Personalizzate"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
msgid "Firewall - NAT Rules"
msgstr ""
@@ -309,8 +335,8 @@ msgstr "Inoltra"
msgid "Forward to"
msgstr "Inoltra a"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:436
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:608
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:383
msgid "Friday"
msgstr "Venerdì"
@@ -341,13 +367,13 @@ msgstr ""
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:93
msgid "From %{ipaddr?:any host} %{port?with source %{port}}"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
#: 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/root/usr/share/luci/menu.d/luci-app-firewall.json:16
@@ -415,10 +441,39 @@ msgstr "Porta interna"
msgid "Internal zone"
msgstr "Zona Interna"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:471
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:553
+msgid "Invalid DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:581
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:355
+msgid "Invalid limit value"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:586
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:360
+msgid "Limit burst"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Limita messaggi del registro"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:558
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+msgid "Limit matching"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:559
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:333
+msgid "Limits traffic matching to the specified rate."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:275
msgid "Loopback source IP"
msgstr ""
@@ -431,7 +486,7 @@ msgstr "MAC"
msgid "MACs"
msgstr "MACs"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
msgstr ""
@@ -445,14 +500,18 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:133
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:174
msgid "Match"
msgstr "Corrispondenza"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:84
msgid ""
"Match %{protocol?%{family} %{protocol} traffic:any %{family} traffic} %{mark?"
-"with firewall mark %{mark}}"
+"with firewall mark %{mark}} %{limit?limited to %{limit}}"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:517
+msgid "Match DSCP"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:288
@@ -463,26 +522,26 @@ msgstr "Corrispondenza tipo ICMP"
msgid "Match device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:239
msgid "Match forwarded traffic directed at the given IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:252
msgid ""
"Match forwarded traffic directed at the given destination port or port range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
msgid "Match forwarded traffic from this IP or range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:228
msgid ""
"Match forwarded traffic originating from the given source port or port range."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match helper"
msgstr ""
@@ -495,40 +554,54 @@ msgstr ""
"dato su questo host"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:302
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:315
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:501
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
msgid "Match mark"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match traffic using the specified connection tracking helper."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:303
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:502
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:317
msgid "Matches a specific firewall mark or a range of different marks."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:311
msgid "Matches forwarded traffic using the specified outbound network device."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:432
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:518
+msgid "Matches traffic carrying the specified DSCP marking."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:587
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:361
+msgid ""
+"Maximum initial number of packets to match: this number gets recharged by "
+"one every time the limit specified above is not reached, up to this number."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:604
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
msgid "Monday"
msgstr "Lunedì"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:442
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:614
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:389
msgid "Month Days"
msgstr "Giorni del Mese"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:156
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:157
#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
msgid "NAT Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:155
msgid ""
"NAT rules allow fine grained control over the source IP to use for outbound "
"or forwarded traffic."
@@ -536,7 +609,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:129
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:210
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Nome"
@@ -566,11 +639,11 @@ msgstr ""
"porte sorgenti su host cliente"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:309
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
msgid "Outbound device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:206
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:207
msgid "Outbound zone"
msgstr ""
@@ -579,9 +652,9 @@ msgstr ""
msgid "Output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:423
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:355
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:595
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:369
msgid "Passes additional arguments to iptables. Use with care!"
msgstr "Passa comandi addizionali a iptables. Usare con cura!"
@@ -609,7 +682,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:162
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:275
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:194
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:195
msgid "Protocol"
msgstr "Protocollo"
@@ -651,31 +724,31 @@ msgstr "Limita il Masquerading alle subnet sorgente date"
msgid "Restrict to address family"
msgstr "Limita agli indirizzi famiglia"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
msgid "Rewrite IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:270
msgid "Rewrite matched traffic to the specified source IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:300
msgid "Rewrite matched traffic to the specified source port or port range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
msgid "Rewrite port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:184
msgid "Rewrite to"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:115
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:116
msgid "Rewrite to %{ipaddr?%{port?%{ipaddr}, %{port}:%{ipaddr}}:%{port}}"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:122
msgid "Rewrite to outbound device IP"
msgstr ""
@@ -683,15 +756,25 @@ msgstr ""
msgid "Routing/NAT Offloading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:264
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
msgid "SNAT - Rewrite to specific source IP or port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:437
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:609
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:384
msgid "Saturday"
msgstr "Sabato"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid "Set mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid ""
+"Set the given mark value on established connections. Format is value[/mask]. "
+"If a mask is specified then only those bits set in the mask are modified."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr ""
@@ -722,7 +805,7 @@ msgstr ""
# msgid "Protocol"
# msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:213
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
msgid "Source IP address"
msgstr "Indirizzo IP di origine"
@@ -737,7 +820,7 @@ msgstr "Indirizzo di origine"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:207
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
msgid "Source port"
msgstr "Porta di origine"
@@ -758,28 +841,28 @@ msgid ""
"reflected traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:461
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:371
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:633
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:408
msgid "Start Date (yyyy-mm-dd)"
msgstr "Data di Inizio (yyyy-mm-dd)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:453
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:363
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:625
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:400
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:465
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:375
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:637
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:412
msgid "Stop Date (yyyy-mm-dd)"
msgstr "Data di Stop (yyyy-mm-dd)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:457
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:367
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:629
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:404
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:431
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:603
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:378
msgid "Sunday"
msgstr "Domenica"
@@ -824,18 +907,18 @@ msgstr ""
"differenti nella zona. Le <em>reti coperte</em> specificano quali reti "
"disponibili sono membri di questa zona."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:435
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:607
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:382
msgid "Thursday"
msgstr "Giovedì"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:164
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:469
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:641
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:416
msgid "Time in UTC"
msgstr "Orario in UTC"
@@ -855,13 +938,13 @@ msgstr "Verso %s su <var>questo dispositivo</var>"
msgid "To %s, %s in %s"
msgstr "Verso %s, %s in %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:102
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:103
msgid ""
"To %{ipaddr?:any destination} %{port?at %{port}} %{zone?via zone %{zone}} "
"%{device?egress device %{device}}"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Tracking helper"
msgstr ""
@@ -880,8 +963,8 @@ msgstr ""
"tra zone differenti, per esempio per rifiutare il traffico tra certi host o "
"per aprire porte WAN sul router."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:605
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:380
msgid "Tuesday"
msgstr "Martedì"
@@ -890,12 +973,12 @@ msgid "Unable to save contents: %s"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:299
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:419
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:498
msgid "Unknown or not installed conntrack helper \"%s\""
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:171
msgid "Unnamed NAT"
msgstr ""
@@ -941,16 +1024,24 @@ msgstr ""
msgid "Via %s at %s"
msgstr "Via %s a %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:434
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:606
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:381
msgid "Wednesday"
msgstr "Mercoledì"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:426
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:598
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:373
msgid "Week Days"
msgstr "Giorni della Settimana"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+msgid "XOR firewall mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid "XOR mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "Zona ⇒ Inoltri"
@@ -977,12 +1068,13 @@ msgstr "accetta"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:376
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:382
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:399
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:406
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:231
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:242
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:478
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:485
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:521
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:255
msgid "any"
msgstr "qualsiasi"
@@ -1005,6 +1097,10 @@ msgstr "qualsiasi router IP"
msgid "any zone"
msgstr "qualsiasi zona"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:396
+msgid "apply firewall mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:395
msgid "assign conntrack helper"
msgstr ""
@@ -1013,8 +1109,8 @@ msgstr ""
msgid "day"
msgstr "giorno"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:273
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:303
msgid "do not rewrite"
msgstr ""
@@ -1073,12 +1169,21 @@ msgstr ""
msgid "types"
msgstr "tipi"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:322
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:562
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+msgid "unlimited"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:238
msgid "unspecified"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "valid firewall mark"
msgstr ""
diff --git a/applications/luci-app-firewall/po/ja/firewall.po b/applications/luci-app-firewall/po/ja/firewall.po
index b40927cd93..b924214b6f 100644
--- a/applications/luci-app-firewall/po/ja/firewall.po
+++ b/applications/luci-app-firewall/po/ja/firewall.po
@@ -39,11 +39,11 @@ msgstr ""
msgid "<var>%s</var> and limit to %s"
msgstr "<var>%s</var>, %s を上限に設定"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:280
msgid "A rewrite IP must be specified!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:267
msgid "ACCEPT - Disable address rewriting"
msgstr ""
@@ -61,7 +61,7 @@ msgstr "出力を許可"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:224
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:388
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:262
msgid "Action"
msgstr "動作"
@@ -86,7 +86,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr "詳細設定"
@@ -104,18 +104,29 @@ msgid "Allow forward to <em>destination zones</em>:"
msgstr "<em>宛先ゾーン</em>への転送を許可する:"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:198
msgid "Any"
msgstr "全て"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:430
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:446
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:340
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:602
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:618
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:377
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:393
msgid "Any day"
msgstr "全日"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid ""
+"Apply a bitwise XOR of the given value and the existing mark value on "
+"established connections. Format is value[/mask]. If a mask is specified then "
+"those bits set in the mask are zeroed out."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "Apply the given DSCP class or value to established connections."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Assign the specified connection tracking helper to matched traffic."
msgstr ""
@@ -169,7 +180,19 @@ msgstr ""
"ドは、ファイアウォール機能の起動ごとに、標準のルールが読み込まれた後に実行さ"
"れます。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:398
+msgid "DSCP classification"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:466
+msgid "DSCP mark required"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
msgid "Destination IP address"
msgstr ""
@@ -178,7 +201,7 @@ msgid "Destination address"
msgstr "宛先アドレス"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:379
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
msgid "Destination port"
msgstr "宛先ポート"
@@ -211,7 +234,7 @@ msgstr ""
"追加ルールをインストールしません。これは、複雑で非対称なルートのセットアップ"
"に必要となることがあります。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:125
msgid "Do not rewrite"
msgstr "リライトしない"
@@ -233,7 +256,7 @@ msgstr "無効なパケットを遮断する"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:157
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:230
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:189
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:190
msgid "Enable"
msgstr "有効"
@@ -250,7 +273,10 @@ msgid "Enable logging on this zone"
msgstr "このゾーンのログ記録を有効にする"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "Expecting: %s"
msgstr ""
@@ -270,9 +296,9 @@ msgstr "外部IPアドレス"
msgid "External port"
msgstr "外部ポート"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:422
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:594
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:368
msgid "Extra arguments"
msgstr "追加の引数"
@@ -296,7 +322,7 @@ msgstr "ファイアウォール"
msgid "Firewall - Custom Rules"
msgstr "ファイアウォール - 手動設定ルール"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
msgid "Firewall - NAT Rules"
msgstr ""
@@ -321,8 +347,8 @@ msgstr "転送"
msgid "Forward to"
msgstr "転送先"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:436
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:608
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:383
msgid "Friday"
msgstr "金曜日"
@@ -353,13 +379,13 @@ msgstr "送信元 %s, %s (<var>デバイス</var>)"
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr "送信元 %s, %s, %s (<var>デバイス</var>)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:93
msgid "From %{ipaddr?:any host} %{port?with source %{port}}"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
#: 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/root/usr/share/luci/menu.d/luci-app-firewall.json:16
@@ -427,10 +453,39 @@ msgstr "内部ポート"
msgid "Internal zone"
msgstr "内部ゾーン"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:471
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:553
+msgid "Invalid DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:581
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:355
+msgid "Invalid limit value"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:586
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:360
+msgid "Limit burst"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "ログメッセージを制限"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:558
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+msgid "Limit matching"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:559
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:333
+msgid "Limits traffic matching to the specified rate."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:275
msgid "Loopback source IP"
msgstr ""
@@ -443,7 +498,7 @@ msgstr "MAC"
msgid "MACs"
msgstr "MAC"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
msgstr ""
@@ -457,14 +512,18 @@ msgstr "マスカレード"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:133
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:174
msgid "Match"
msgstr "対象"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:84
msgid ""
"Match %{protocol?%{family} %{protocol} traffic:any %{family} traffic} %{mark?"
-"with firewall mark %{mark}}"
+"with firewall mark %{mark}} %{limit?limited to %{limit}}"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:517
+msgid "Match DSCP"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:288
@@ -475,26 +534,26 @@ msgstr "ICMPタイプの一致"
msgid "Match device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:239
msgid "Match forwarded traffic directed at the given IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:252
msgid ""
"Match forwarded traffic directed at the given destination port or port range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
msgid "Match forwarded traffic from this IP or range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:228
msgid ""
"Match forwarded traffic originating from the given source port or port range."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match helper"
msgstr ""
@@ -507,40 +566,54 @@ msgstr ""
"ます"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:302
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:315
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:501
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
msgid "Match mark"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match traffic using the specified connection tracking helper."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:303
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:502
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:317
msgid "Matches a specific firewall mark or a range of different marks."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:311
msgid "Matches forwarded traffic using the specified outbound network device."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:432
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:518
+msgid "Matches traffic carrying the specified DSCP marking."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:587
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:361
+msgid ""
+"Maximum initial number of packets to match: this number gets recharged by "
+"one every time the limit specified above is not reached, up to this number."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:604
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
msgid "Monday"
msgstr "月曜日"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:442
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:614
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:389
msgid "Month Days"
msgstr "月間"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:156
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:157
#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
msgid "NAT Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:155
msgid ""
"NAT rules allow fine grained control over the source IP to use for outbound "
"or forwarded traffic."
@@ -548,7 +621,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:129
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:210
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "名前"
@@ -580,11 +653,11 @@ msgstr ""
"フィックと一致したトラフィックのみを対象にします。"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:309
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
msgid "Outbound device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:206
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:207
msgid "Outbound zone"
msgstr ""
@@ -593,9 +666,9 @@ msgstr ""
msgid "Output"
msgstr "送信"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:423
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:355
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:595
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:369
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
"iptablesにパススルーする追加の引数を設定してください。ただし、注意して設定し"
@@ -631,7 +704,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:162
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:275
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:194
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:195
msgid "Protocol"
msgstr "プロトコル"
@@ -675,31 +748,31 @@ msgstr "設定された送信元サブネットへのマスカレードを制限
msgid "Restrict to address family"
msgstr "アドレスファミリの制限"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
msgid "Rewrite IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:270
msgid "Rewrite matched traffic to the specified source IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:300
msgid "Rewrite matched traffic to the specified source port or port range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
msgid "Rewrite port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:184
msgid "Rewrite to"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:115
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:116
msgid "Rewrite to %{ipaddr?%{port?%{ipaddr}, %{port}:%{ipaddr}}:%{port}}"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:122
msgid "Rewrite to outbound device IP"
msgstr ""
@@ -707,15 +780,25 @@ msgstr ""
msgid "Routing/NAT Offloading"
msgstr "ルーティング/NAT オフロード"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:264
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
msgid "SNAT - Rewrite to specific source IP or port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:437
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:609
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:384
msgid "Saturday"
msgstr "土曜日"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid "Set mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid ""
+"Set the given mark value on established connections. Format is value[/mask]. "
+"If a mask is specified then only those bits set in the mask are modified."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr "ルーティング/NAT のための、ソフトウェアベースのオフロードです。"
@@ -725,7 +808,7 @@ msgid "Software flow offloading"
msgstr "ソフトウェア フローオフロード"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:213
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
msgid "Source IP address"
msgstr "送信元IPアドレス"
@@ -740,7 +823,7 @@ msgstr "送信元アドレス"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:207
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
msgid "Source port"
msgstr "送信元ポート"
@@ -761,28 +844,28 @@ msgid ""
"reflected traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:461
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:371
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:633
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:408
msgid "Start Date (yyyy-mm-dd)"
msgstr "開始日 (yyyy-mm-dd)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:453
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:363
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:625
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:400
msgid "Start Time (hh.mm.ss)"
msgstr "開始時刻 (hh.mm.ss)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:465
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:375
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:637
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:412
msgid "Stop Date (yyyy-mm-dd)"
msgstr "停止日 (yyyy-mm-dd)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:457
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:367
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:629
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:404
msgid "Stop Time (hh.mm.ss)"
msgstr "停止時刻 (hh.mm.ss)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:431
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:603
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:378
msgid "Sunday"
msgstr "日曜日"
@@ -825,18 +908,18 @@ msgstr ""
"準のポリシーになります。<em>対象ネットワーク</em>は、どのネットワーク設定がこ"
"のゾーンに属するかを設定します。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:435
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:607
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:382
msgid "Thursday"
msgstr "木曜日"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:164
msgid "Time Restrictions"
msgstr "時間制限"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:469
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:641
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:416
msgid "Time in UTC"
msgstr "UTC時刻を使用"
@@ -856,13 +939,13 @@ msgstr "宛先 %s (<var>デバイス</var>)"
msgid "To %s, %s in %s"
msgstr "宛先 %s, %s (%s)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:102
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:103
msgid ""
"To %{ipaddr?:any destination} %{port?at %{port}} %{zone?via zone %{zone}} "
"%{device?egress device %{device}}"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Tracking helper"
msgstr ""
@@ -881,8 +964,8 @@ msgstr ""
"します。例えば、特定のホスト間や、ルーターのWANポートへのトラフィックの拒否を"
"設定することができます。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:605
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:380
msgid "Tuesday"
msgstr "火曜日"
@@ -891,12 +974,12 @@ msgid "Unable to save contents: %s"
msgstr "内容を保存できません: %s"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:299
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:419
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:498
msgid "Unknown or not installed conntrack helper \"%s\""
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:171
msgid "Unnamed NAT"
msgstr ""
@@ -946,16 +1029,24 @@ msgstr "経由 %s"
msgid "Via %s at %s"
msgstr "経由 %s , %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:434
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:606
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:381
msgid "Wednesday"
msgstr "水曜日"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:426
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:598
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:373
msgid "Week Days"
msgstr "曜日"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+msgid "XOR firewall mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid "XOR mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "ゾーン ⇒ 転送"
@@ -982,12 +1073,13 @@ msgstr "許可"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:376
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:382
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:399
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:406
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:231
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:242
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:478
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:485
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:521
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:255
msgid "any"
msgstr "全て"
@@ -1010,6 +1102,10 @@ msgstr "全てのルーターIP"
msgid "any zone"
msgstr "全てのゾーン"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:396
+msgid "apply firewall mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:395
msgid "assign conntrack helper"
msgstr ""
@@ -1018,8 +1114,8 @@ msgstr ""
msgid "day"
msgstr "日"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:273
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:303
msgid "do not rewrite"
msgstr ""
@@ -1078,12 +1174,21 @@ msgstr "タイプ"
msgid "types"
msgstr "タイプ"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:322
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:562
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+msgid "unlimited"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:238
msgid "unspecified"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "valid firewall mark"
msgstr ""
diff --git a/applications/luci-app-firewall/po/ko/firewall.po b/applications/luci-app-firewall/po/ko/firewall.po
index 841b13ca75..50241e497a 100644
--- a/applications/luci-app-firewall/po/ko/firewall.po
+++ b/applications/luci-app-firewall/po/ko/firewall.po
@@ -38,11 +38,11 @@ msgstr ""
msgid "<var>%s</var> and limit to %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:280
msgid "A rewrite IP must be specified!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:267
msgid "ACCEPT - Disable address rewriting"
msgstr ""
@@ -60,7 +60,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:224
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:388
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:262
msgid "Action"
msgstr ""
@@ -79,7 +79,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr ""
@@ -97,18 +97,29 @@ msgid "Allow forward to <em>destination zones</em>:"
msgstr "<em>Destination zone</em> 으로 forward 허용:"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:198
msgid "Any"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:430
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:446
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:340
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:602
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:618
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:377
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:393
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid ""
+"Apply a bitwise XOR of the given value and the existing mark value on "
+"established connections. Format is value[/mask]. If a mask is specified then "
+"those bits set in the mask are zeroed out."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "Apply the given DSCP class or value to established connections."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Assign the specified connection tracking helper to matched traffic."
msgstr ""
@@ -159,7 +170,19 @@ msgstr ""
"수 있도록 합니다. 입력된 명령어들은 매 방화벽 재시작시 실행되는데 default "
"ruleset 이 load 된 후 시점입니다."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:398
+msgid "DSCP classification"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:466
+msgid "DSCP mark required"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
msgid "Destination IP address"
msgstr "Destination IP 주소"
@@ -168,7 +191,7 @@ msgid "Destination address"
msgstr "Destination 주소"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:379
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
msgid "Destination port"
msgstr ""
@@ -198,7 +221,7 @@ msgid ""
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:125
msgid "Do not rewrite"
msgstr ""
@@ -220,7 +243,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:157
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:230
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:189
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:190
msgid "Enable"
msgstr "활성화"
@@ -237,7 +260,10 @@ msgid "Enable logging on this zone"
msgstr "zone 의 logging 활성화"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "Expecting: %s"
msgstr ""
@@ -257,9 +283,9 @@ msgstr "외부 IP 주소"
msgid "External port"
msgstr "외부 port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:422
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:594
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:368
msgid "Extra arguments"
msgstr "추가 argument"
@@ -283,7 +309,7 @@ msgstr "방화벽"
msgid "Firewall - Custom Rules"
msgstr "방화벽 - Custom Rules"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
msgid "Firewall - NAT Rules"
msgstr ""
@@ -308,8 +334,8 @@ msgstr ""
msgid "Forward to"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:436
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:608
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:383
msgid "Friday"
msgstr "금요일"
@@ -340,13 +366,13 @@ msgstr ""
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:93
msgid "From %{ipaddr?:any host} %{port?with source %{port}}"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
#: 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/root/usr/share/luci/menu.d/luci-app-firewall.json:16
@@ -414,10 +440,39 @@ msgstr "내부 port"
msgid "Internal zone"
msgstr "내부 zone"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:471
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:553
+msgid "Invalid DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:581
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:355
+msgid "Invalid limit value"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:586
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:360
+msgid "Limit burst"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:558
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+msgid "Limit matching"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:559
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:333
+msgid "Limits traffic matching to the specified rate."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:275
msgid "Loopback source IP"
msgstr ""
@@ -430,7 +485,7 @@ msgstr "MAC"
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
msgstr ""
@@ -444,14 +499,18 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:133
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:174
msgid "Match"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:84
msgid ""
"Match %{protocol?%{family} %{protocol} traffic:any %{family} traffic} %{mark?"
-"with firewall mark %{mark}}"
+"with firewall mark %{mark}} %{limit?limited to %{limit}}"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:517
+msgid "Match DSCP"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:288
@@ -462,26 +521,26 @@ msgstr ""
msgid "Match device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:239
msgid "Match forwarded traffic directed at the given IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:252
msgid ""
"Match forwarded traffic directed at the given destination port or port range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
msgid "Match forwarded traffic from this IP or range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:228
msgid ""
"Match forwarded traffic originating from the given source port or port range."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match helper"
msgstr ""
@@ -492,40 +551,54 @@ msgid ""
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:302
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:315
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:501
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
msgid "Match mark"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match traffic using the specified connection tracking helper."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:303
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:502
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:317
msgid "Matches a specific firewall mark or a range of different marks."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:311
msgid "Matches forwarded traffic using the specified outbound network device."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:432
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:518
+msgid "Matches traffic carrying the specified DSCP marking."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:587
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:361
+msgid ""
+"Maximum initial number of packets to match: this number gets recharged by "
+"one every time the limit specified above is not reached, up to this number."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:604
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
msgid "Monday"
msgstr "월요일"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:442
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:614
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:389
msgid "Month Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:156
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:157
#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
msgid "NAT Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:155
msgid ""
"NAT rules allow fine grained control over the source IP to use for outbound "
"or forwarded traffic."
@@ -533,7 +606,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:129
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:210
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "이름"
@@ -561,11 +634,11 @@ msgid ""
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:309
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
msgid "Outbound device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:206
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:207
msgid "Outbound zone"
msgstr ""
@@ -574,9 +647,9 @@ msgstr ""
msgid "Output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:423
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:355
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:595
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:369
msgid "Passes additional arguments to iptables. Use with care!"
msgstr "iptables 명령에 추가 인자들을 더합니다. 조심해 사용하세요!"
@@ -604,7 +677,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:162
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:275
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:194
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:195
msgid "Protocol"
msgstr ""
@@ -646,31 +719,31 @@ msgstr "주어진 source subnet 으로 Masquerading 제한"
msgid "Restrict to address family"
msgstr "Address family 제한"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
msgid "Rewrite IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:270
msgid "Rewrite matched traffic to the specified source IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:300
msgid "Rewrite matched traffic to the specified source port or port range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
msgid "Rewrite port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:184
msgid "Rewrite to"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:115
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:116
msgid "Rewrite to %{ipaddr?%{port?%{ipaddr}, %{port}:%{ipaddr}}:%{port}}"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:122
msgid "Rewrite to outbound device IP"
msgstr ""
@@ -678,15 +751,25 @@ msgstr ""
msgid "Routing/NAT Offloading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:264
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
msgid "SNAT - Rewrite to specific source IP or port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:437
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:609
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:384
msgid "Saturday"
msgstr "토요일"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid "Set mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid ""
+"Set the given mark value on established connections. Format is value[/mask]. "
+"If a mask is specified then only those bits set in the mask are modified."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr ""
@@ -696,7 +779,7 @@ msgid "Software flow offloading"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:213
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
msgid "Source IP address"
msgstr "Source IP 주소"
@@ -711,7 +794,7 @@ msgstr "Source 주소"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:207
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
msgid "Source port"
msgstr ""
@@ -732,28 +815,28 @@ msgid ""
"reflected traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:461
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:371
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:633
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:408
msgid "Start Date (yyyy-mm-dd)"
msgstr "시작 날짜 (yyyy-mm-dd)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:453
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:363
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:625
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:400
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:465
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:375
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:637
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:412
msgid "Stop Date (yyyy-mm-dd)"
msgstr "종료 날짜 (yyyy-mm-dd)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:457
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:367
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:629
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:404
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:431
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:603
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:378
msgid "Sunday"
msgstr "일요일"
@@ -797,18 +880,18 @@ msgstr ""
"를 오가는 forward traffic 에 대한 정책을 뜻합니다. <em>Covered networks</em> "
"에서는 zone 의 영향을 받을 네트워크들을 지정할 수 있습니다."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:435
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:607
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:382
msgid "Thursday"
msgstr "목요일"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:164
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:469
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:641
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:416
msgid "Time in UTC"
msgstr "UTC 기준시"
@@ -828,13 +911,13 @@ msgstr ""
msgid "To %s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:102
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:103
msgid ""
"To %{ipaddr?:any destination} %{port?at %{port}} %{zone?via zone %{zone}} "
"%{device?egress device %{device}}"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Tracking helper"
msgstr ""
@@ -853,8 +936,8 @@ msgstr ""
"다. 예를 들어 특정 host 들 사이의 트래픽을 차단하거나 공유기의 WAN port 를 "
"open 할때 사용됩니다."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:605
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:380
msgid "Tuesday"
msgstr "화요일"
@@ -863,12 +946,12 @@ msgid "Unable to save contents: %s"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:299
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:419
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:498
msgid "Unknown or not installed conntrack helper \"%s\""
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:171
msgid "Unnamed NAT"
msgstr ""
@@ -914,16 +997,24 @@ msgstr ""
msgid "Via %s at %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:434
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:606
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:381
msgid "Wednesday"
msgstr "수요일"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:426
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:598
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:373
msgid "Week Days"
msgstr "주일"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+msgid "XOR firewall mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid "XOR mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr ""
@@ -950,12 +1041,13 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:376
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:382
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:399
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:406
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:231
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:242
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:478
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:485
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:521
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:255
msgid "any"
msgstr ""
@@ -978,6 +1070,10 @@ msgstr ""
msgid "any zone"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:396
+msgid "apply firewall mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:395
msgid "assign conntrack helper"
msgstr ""
@@ -986,8 +1082,8 @@ msgstr ""
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:273
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:303
msgid "do not rewrite"
msgstr ""
@@ -1046,12 +1142,21 @@ msgstr ""
msgid "types"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:322
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:562
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+msgid "unlimited"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:238
msgid "unspecified"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "valid firewall mark"
msgstr ""
diff --git a/applications/luci-app-firewall/po/mr/firewall.po b/applications/luci-app-firewall/po/mr/firewall.po
index 921180dcad..0c830383f3 100644
--- a/applications/luci-app-firewall/po/mr/firewall.po
+++ b/applications/luci-app-firewall/po/mr/firewall.po
@@ -38,11 +38,11 @@ msgstr ""
msgid "<var>%s</var> and limit to %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:280
msgid "A rewrite IP must be specified!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:267
msgid "ACCEPT - Disable address rewriting"
msgstr ""
@@ -60,7 +60,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:224
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:388
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:262
msgid "Action"
msgstr ""
@@ -79,7 +79,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr "प्रगत सेटिंग्ज"
@@ -97,18 +97,29 @@ msgid "Allow forward to <em>destination zones</em>:"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:198
msgid "Any"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:430
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:446
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:340
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:602
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:618
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:377
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:393
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid ""
+"Apply a bitwise XOR of the given value and the existing mark value on "
+"established connections. Format is value[/mask]. If a mask is specified then "
+"those bits set in the mask are zeroed out."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "Apply the given DSCP class or value to established connections."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Assign the specified connection tracking helper to matched traffic."
msgstr ""
@@ -156,7 +167,19 @@ msgid ""
"each firewall restart, right after the default ruleset has been loaded."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:398
+msgid "DSCP classification"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:466
+msgid "DSCP mark required"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
msgid "Destination IP address"
msgstr ""
@@ -165,7 +188,7 @@ msgid "Destination address"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:379
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
msgid "Destination port"
msgstr ""
@@ -195,7 +218,7 @@ msgid ""
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:125
msgid "Do not rewrite"
msgstr ""
@@ -217,7 +240,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:157
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:230
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:189
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:190
msgid "Enable"
msgstr "सक्षम करा"
@@ -234,7 +257,10 @@ msgid "Enable logging on this zone"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "Expecting: %s"
msgstr ""
@@ -254,9 +280,9 @@ msgstr ""
msgid "External port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:422
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:594
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:368
msgid "Extra arguments"
msgstr ""
@@ -284,7 +310,7 @@ msgstr ""
msgid "Firewall - Custom Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
msgid "Firewall - NAT Rules"
msgstr ""
@@ -309,8 +335,8 @@ msgstr ""
msgid "Forward to"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:436
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:608
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:383
msgid "Friday"
msgstr ""
@@ -341,13 +367,13 @@ msgstr ""
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:93
msgid "From %{ipaddr?:any host} %{port?with source %{port}}"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
#: 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/root/usr/share/luci/menu.d/luci-app-firewall.json:16
@@ -415,10 +441,39 @@ msgstr ""
msgid "Internal zone"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:471
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:553
+msgid "Invalid DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:581
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:355
+msgid "Invalid limit value"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:586
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:360
+msgid "Limit burst"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:558
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+msgid "Limit matching"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:559
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:333
+msgid "Limits traffic matching to the specified rate."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:275
msgid "Loopback source IP"
msgstr ""
@@ -431,7 +486,7 @@ msgstr "MAC"
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
msgstr ""
@@ -445,14 +500,18 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:133
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:174
msgid "Match"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:84
msgid ""
"Match %{protocol?%{family} %{protocol} traffic:any %{family} traffic} %{mark?"
-"with firewall mark %{mark}}"
+"with firewall mark %{mark}} %{limit?limited to %{limit}}"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:517
+msgid "Match DSCP"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:288
@@ -463,26 +522,26 @@ msgstr ""
msgid "Match device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:239
msgid "Match forwarded traffic directed at the given IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:252
msgid ""
"Match forwarded traffic directed at the given destination port or port range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
msgid "Match forwarded traffic from this IP or range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:228
msgid ""
"Match forwarded traffic originating from the given source port or port range."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match helper"
msgstr ""
@@ -493,40 +552,54 @@ msgid ""
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:302
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:315
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:501
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
msgid "Match mark"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match traffic using the specified connection tracking helper."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:303
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:502
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:317
msgid "Matches a specific firewall mark or a range of different marks."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:311
msgid "Matches forwarded traffic using the specified outbound network device."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:432
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:518
+msgid "Matches traffic carrying the specified DSCP marking."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:587
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:361
+msgid ""
+"Maximum initial number of packets to match: this number gets recharged by "
+"one every time the limit specified above is not reached, up to this number."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:604
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
msgid "Monday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:442
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:614
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:389
msgid "Month Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:156
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:157
#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
msgid "NAT Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:155
msgid ""
"NAT rules allow fine grained control over the source IP to use for outbound "
"or forwarded traffic."
@@ -534,7 +607,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:129
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:210
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "नाव"
@@ -562,11 +635,11 @@ msgid ""
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:309
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
msgid "Outbound device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:206
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:207
msgid "Outbound zone"
msgstr ""
@@ -575,9 +648,9 @@ msgstr ""
msgid "Output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:423
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:355
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:595
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:369
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
@@ -603,7 +676,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:162
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:275
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:194
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:195
msgid "Protocol"
msgstr "प्रोटोकॉल"
@@ -645,31 +718,31 @@ msgstr ""
msgid "Restrict to address family"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
msgid "Rewrite IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:270
msgid "Rewrite matched traffic to the specified source IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:300
msgid "Rewrite matched traffic to the specified source port or port range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
msgid "Rewrite port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:184
msgid "Rewrite to"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:115
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:116
msgid "Rewrite to %{ipaddr?%{port?%{ipaddr}, %{port}:%{ipaddr}}:%{port}}"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:122
msgid "Rewrite to outbound device IP"
msgstr ""
@@ -677,15 +750,25 @@ msgstr ""
msgid "Routing/NAT Offloading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:264
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
msgid "SNAT - Rewrite to specific source IP or port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:437
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:609
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:384
msgid "Saturday"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid "Set mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid ""
+"Set the given mark value on established connections. Format is value[/mask]. "
+"If a mask is specified then only those bits set in the mask are modified."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr ""
@@ -725,7 +808,7 @@ msgstr ""
# msgstr ""
#
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:213
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
msgid "Source IP address"
msgstr ""
@@ -740,7 +823,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:207
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
msgid "Source port"
msgstr ""
@@ -761,28 +844,28 @@ msgid ""
"reflected traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:461
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:371
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:633
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:408
msgid "Start Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:453
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:363
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:625
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:400
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:465
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:375
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:637
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:412
msgid "Stop Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:457
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:367
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:629
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:404
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:431
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:603
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:378
msgid "Sunday"
msgstr ""
@@ -812,18 +895,18 @@ msgid ""
"networks</em> specifies which available networks are members of this zone."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:435
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:607
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:382
msgid "Thursday"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:164
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:469
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:641
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:416
msgid "Time in UTC"
msgstr ""
@@ -843,13 +926,13 @@ msgstr ""
msgid "To %s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:102
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:103
msgid ""
"To %{ipaddr?:any destination} %{port?at %{port}} %{zone?via zone %{zone}} "
"%{device?egress device %{device}}"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Tracking helper"
msgstr ""
@@ -865,8 +948,8 @@ msgid ""
"the router."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:605
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:380
msgid "Tuesday"
msgstr ""
@@ -875,12 +958,12 @@ msgid "Unable to save contents: %s"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:299
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:419
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:498
msgid "Unknown or not installed conntrack helper \"%s\""
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:171
msgid "Unnamed NAT"
msgstr ""
@@ -926,16 +1009,24 @@ msgstr ""
msgid "Via %s at %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:434
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:606
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:381
msgid "Wednesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:426
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:598
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:373
msgid "Week Days"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+msgid "XOR firewall mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid "XOR mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr ""
@@ -962,12 +1053,13 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:376
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:382
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:399
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:406
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:231
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:242
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:478
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:485
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:521
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:255
msgid "any"
msgstr ""
@@ -990,6 +1082,10 @@ msgstr ""
msgid "any zone"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:396
+msgid "apply firewall mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:395
msgid "assign conntrack helper"
msgstr ""
@@ -998,8 +1094,8 @@ msgstr ""
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:273
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:303
msgid "do not rewrite"
msgstr ""
@@ -1058,11 +1154,20 @@ msgstr ""
msgid "types"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:322
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:562
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+msgid "unlimited"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:238
msgid "unspecified"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "valid firewall mark"
msgstr ""
diff --git a/applications/luci-app-firewall/po/ms/firewall.po b/applications/luci-app-firewall/po/ms/firewall.po
index 8c74a0f530..ed6d631f52 100644
--- a/applications/luci-app-firewall/po/ms/firewall.po
+++ b/applications/luci-app-firewall/po/ms/firewall.po
@@ -36,11 +36,11 @@ msgstr ""
msgid "<var>%s</var> and limit to %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:280
msgid "A rewrite IP must be specified!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:267
msgid "ACCEPT - Disable address rewriting"
msgstr ""
@@ -58,7 +58,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:224
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:388
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:262
msgid "Action"
msgstr "Tindakan"
@@ -77,7 +77,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr ""
@@ -95,18 +95,29 @@ msgid "Allow forward to <em>destination zones</em>:"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:198
msgid "Any"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:430
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:446
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:340
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:602
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:618
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:377
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:393
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid ""
+"Apply a bitwise XOR of the given value and the existing mark value on "
+"established connections. Format is value[/mask]. If a mask is specified then "
+"those bits set in the mask are zeroed out."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "Apply the given DSCP class or value to established connections."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Assign the specified connection tracking helper to matched traffic."
msgstr ""
@@ -154,7 +165,19 @@ msgid ""
"each firewall restart, right after the default ruleset has been loaded."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:398
+msgid "DSCP classification"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:466
+msgid "DSCP mark required"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
msgid "Destination IP address"
msgstr ""
@@ -163,7 +186,7 @@ msgid "Destination address"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:379
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
msgid "Destination port"
msgstr ""
@@ -193,7 +216,7 @@ msgid ""
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:125
msgid "Do not rewrite"
msgstr ""
@@ -215,7 +238,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:157
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:230
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:189
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:190
msgid "Enable"
msgstr ""
@@ -232,7 +255,10 @@ msgid "Enable logging on this zone"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "Expecting: %s"
msgstr ""
@@ -252,9 +278,9 @@ msgstr ""
msgid "External port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:422
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:594
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:368
msgid "Extra arguments"
msgstr ""
@@ -278,7 +304,7 @@ msgstr ""
msgid "Firewall - Custom Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
msgid "Firewall - NAT Rules"
msgstr ""
@@ -303,8 +329,8 @@ msgstr ""
msgid "Forward to"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:436
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:608
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:383
msgid "Friday"
msgstr ""
@@ -335,13 +361,13 @@ msgstr ""
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:93
msgid "From %{ipaddr?:any host} %{port?with source %{port}}"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
#: 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/root/usr/share/luci/menu.d/luci-app-firewall.json:16
@@ -409,10 +435,39 @@ msgstr ""
msgid "Internal zone"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:471
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:553
+msgid "Invalid DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:581
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:355
+msgid "Invalid limit value"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:586
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:360
+msgid "Limit burst"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:558
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+msgid "Limit matching"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:559
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:333
+msgid "Limits traffic matching to the specified rate."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:275
msgid "Loopback source IP"
msgstr ""
@@ -425,7 +480,7 @@ msgstr "MAC"
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
msgstr ""
@@ -439,14 +494,18 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:133
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:174
msgid "Match"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:84
msgid ""
"Match %{protocol?%{family} %{protocol} traffic:any %{family} traffic} %{mark?"
-"with firewall mark %{mark}}"
+"with firewall mark %{mark}} %{limit?limited to %{limit}}"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:517
+msgid "Match DSCP"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:288
@@ -457,26 +516,26 @@ msgstr ""
msgid "Match device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:239
msgid "Match forwarded traffic directed at the given IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:252
msgid ""
"Match forwarded traffic directed at the given destination port or port range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
msgid "Match forwarded traffic from this IP or range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:228
msgid ""
"Match forwarded traffic originating from the given source port or port range."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match helper"
msgstr ""
@@ -487,40 +546,54 @@ msgid ""
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:302
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:315
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:501
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
msgid "Match mark"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match traffic using the specified connection tracking helper."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:303
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:502
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:317
msgid "Matches a specific firewall mark or a range of different marks."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:311
msgid "Matches forwarded traffic using the specified outbound network device."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:432
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:518
+msgid "Matches traffic carrying the specified DSCP marking."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:587
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:361
+msgid ""
+"Maximum initial number of packets to match: this number gets recharged by "
+"one every time the limit specified above is not reached, up to this number."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:604
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
msgid "Monday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:442
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:614
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:389
msgid "Month Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:156
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:157
#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
msgid "NAT Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:155
msgid ""
"NAT rules allow fine grained control over the source IP to use for outbound "
"or forwarded traffic."
@@ -528,7 +601,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:129
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:210
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr ""
@@ -556,11 +629,11 @@ msgid ""
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:309
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
msgid "Outbound device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:206
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:207
msgid "Outbound zone"
msgstr ""
@@ -569,9 +642,9 @@ msgstr ""
msgid "Output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:423
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:355
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:595
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:369
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
@@ -597,7 +670,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:162
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:275
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:194
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:195
msgid "Protocol"
msgstr ""
@@ -639,31 +712,31 @@ msgstr ""
msgid "Restrict to address family"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
msgid "Rewrite IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:270
msgid "Rewrite matched traffic to the specified source IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:300
msgid "Rewrite matched traffic to the specified source port or port range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
msgid "Rewrite port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:184
msgid "Rewrite to"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:115
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:116
msgid "Rewrite to %{ipaddr?%{port?%{ipaddr}, %{port}:%{ipaddr}}:%{port}}"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:122
msgid "Rewrite to outbound device IP"
msgstr ""
@@ -671,15 +744,25 @@ msgstr ""
msgid "Routing/NAT Offloading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:264
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
msgid "SNAT - Rewrite to specific source IP or port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:437
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:609
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:384
msgid "Saturday"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid "Set mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid ""
+"Set the given mark value on established connections. Format is value[/mask]. "
+"If a mask is specified then only those bits set in the mask are modified."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr ""
@@ -689,7 +772,7 @@ msgid "Software flow offloading"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:213
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
msgid "Source IP address"
msgstr ""
@@ -704,7 +787,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:207
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
msgid "Source port"
msgstr ""
@@ -725,28 +808,28 @@ msgid ""
"reflected traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:461
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:371
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:633
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:408
msgid "Start Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:453
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:363
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:625
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:400
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:465
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:375
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:637
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:412
msgid "Stop Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:457
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:367
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:629
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:404
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:431
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:603
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:378
msgid "Sunday"
msgstr ""
@@ -776,18 +859,18 @@ msgid ""
"networks</em> specifies which available networks are members of this zone."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:435
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:607
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:382
msgid "Thursday"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:164
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:469
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:641
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:416
msgid "Time in UTC"
msgstr ""
@@ -807,13 +890,13 @@ msgstr ""
msgid "To %s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:102
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:103
msgid ""
"To %{ipaddr?:any destination} %{port?at %{port}} %{zone?via zone %{zone}} "
"%{device?egress device %{device}}"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Tracking helper"
msgstr ""
@@ -829,8 +912,8 @@ msgid ""
"the router."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:605
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:380
msgid "Tuesday"
msgstr ""
@@ -839,12 +922,12 @@ msgid "Unable to save contents: %s"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:299
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:419
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:498
msgid "Unknown or not installed conntrack helper \"%s\""
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:171
msgid "Unnamed NAT"
msgstr ""
@@ -890,16 +973,24 @@ msgstr ""
msgid "Via %s at %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:434
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:606
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:381
msgid "Wednesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:426
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:598
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:373
msgid "Week Days"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+msgid "XOR firewall mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid "XOR mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr ""
@@ -926,12 +1017,13 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:376
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:382
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:399
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:406
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:231
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:242
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:478
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:485
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:521
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:255
msgid "any"
msgstr ""
@@ -954,6 +1046,10 @@ msgstr ""
msgid "any zone"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:396
+msgid "apply firewall mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:395
msgid "assign conntrack helper"
msgstr ""
@@ -962,8 +1058,8 @@ msgstr ""
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:273
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:303
msgid "do not rewrite"
msgstr ""
@@ -1022,11 +1118,20 @@ msgstr ""
msgid "types"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:322
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:562
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+msgid "unlimited"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:238
msgid "unspecified"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "valid firewall mark"
msgstr ""
diff --git a/applications/luci-app-firewall/po/no/firewall.po b/applications/luci-app-firewall/po/no/firewall.po
index 8605ac112b..c14e234576 100644
--- a/applications/luci-app-firewall/po/no/firewall.po
+++ b/applications/luci-app-firewall/po/no/firewall.po
@@ -34,11 +34,11 @@ msgstr "<var>%d</var> pakker per <var>%s</var>, burst <var>%d</var>pakker."
msgid "<var>%s</var> and limit to %s"
msgstr "<var>%s</var> og begrens til %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:280
msgid "A rewrite IP must be specified!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:267
msgid "ACCEPT - Disable address rewriting"
msgstr ""
@@ -56,7 +56,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:224
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:388
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:262
msgid "Action"
msgstr "Handling"
@@ -75,7 +75,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr "Avanserte Innstillinger"
@@ -93,18 +93,29 @@ msgid "Allow forward to <em>destination zones</em>:"
msgstr "Tillat videresending til <em>destinasjon soner</em>:"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:198
msgid "Any"
msgstr "Enhver"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:430
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:446
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:340
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:602
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:618
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:377
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:393
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid ""
+"Apply a bitwise XOR of the given value and the existing mark value on "
+"established connections. Format is value[/mask]. If a mask is specified then "
+"those bits set in the mask are zeroed out."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "Apply the given DSCP class or value to established connections."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Assign the specified connection tracking helper to matched traffic."
msgstr ""
@@ -155,7 +166,19 @@ msgstr ""
"som ikke dekkes av brannmurens standardoppsett. Kommandoene utføres etter "
"hver omstart av brannmuren, rett etter at standard regelsett er lastet."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:398
+msgid "DSCP classification"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:466
+msgid "DSCP mark required"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
msgid "Destination IP address"
msgstr "Destinasjon IP adresse"
@@ -164,7 +187,7 @@ msgid "Destination address"
msgstr "Destinasjon adresse"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:379
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
msgid "Destination port"
msgstr "Destinasjon port"
@@ -194,7 +217,7 @@ msgid ""
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:125
msgid "Do not rewrite"
msgstr "Ikke omskriv"
@@ -216,7 +239,7 @@ msgstr "Forkast ugyldige pakker"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:157
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:230
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:189
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:190
msgid "Enable"
msgstr "Aktiver"
@@ -233,7 +256,10 @@ msgid "Enable logging on this zone"
msgstr "Aktiver logging av denne sonen"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "Expecting: %s"
msgstr ""
@@ -253,9 +279,9 @@ msgstr "Ekstern IP adressse"
msgid "External port"
msgstr "Ekstern port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:422
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:594
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:368
msgid "Extra arguments"
msgstr "Ekstra argumenter"
@@ -279,7 +305,7 @@ msgstr "Brannmur"
msgid "Firewall - Custom Rules"
msgstr "Brannmur - Egendefinerte Regler"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
msgid "Firewall - NAT Rules"
msgstr ""
@@ -304,8 +330,8 @@ msgstr "Videresend"
msgid "Forward to"
msgstr "Videresend til"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:436
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:608
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:383
msgid "Friday"
msgstr ""
@@ -336,13 +362,13 @@ msgstr ""
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:93
msgid "From %{ipaddr?:any host} %{port?with source %{port}}"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
#: 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/root/usr/share/luci/menu.d/luci-app-firewall.json:16
@@ -410,10 +436,39 @@ msgstr "Intern port"
msgid "Internal zone"
msgstr "Intern sone"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:471
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:553
+msgid "Invalid DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:581
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:355
+msgid "Invalid limit value"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:586
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:360
+msgid "Limit burst"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Begrens logging"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:558
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+msgid "Limit matching"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:559
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:333
+msgid "Limits traffic matching to the specified rate."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:275
msgid "Loopback source IP"
msgstr ""
@@ -426,7 +481,7 @@ msgstr "MAC"
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
msgstr ""
@@ -440,14 +495,18 @@ msgstr "Masquerading"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:133
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:174
msgid "Match"
msgstr "Match"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:84
msgid ""
"Match %{protocol?%{family} %{protocol} traffic:any %{family} traffic} %{mark?"
-"with firewall mark %{mark}}"
+"with firewall mark %{mark}} %{limit?limited to %{limit}}"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:517
+msgid "Match DSCP"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:288
@@ -458,26 +517,26 @@ msgstr "Match ICMP type"
msgid "Match device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:239
msgid "Match forwarded traffic directed at the given IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:252
msgid ""
"Match forwarded traffic directed at the given destination port or port range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
msgid "Match forwarded traffic from this IP or range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:228
msgid ""
"Match forwarded traffic originating from the given source port or port range."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match helper"
msgstr ""
@@ -490,40 +549,54 @@ msgstr ""
"portområdet på denne verten"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:302
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:315
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:501
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
msgid "Match mark"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match traffic using the specified connection tracking helper."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:303
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:502
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:317
msgid "Matches a specific firewall mark or a range of different marks."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:311
msgid "Matches forwarded traffic using the specified outbound network device."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:432
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:518
+msgid "Matches traffic carrying the specified DSCP marking."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:587
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:361
+msgid ""
+"Maximum initial number of packets to match: this number gets recharged by "
+"one every time the limit specified above is not reached, up to this number."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:604
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
msgid "Monday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:442
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:614
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:389
msgid "Month Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:156
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:157
#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
msgid "NAT Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:155
msgid ""
"NAT rules allow fine grained control over the source IP to use for outbound "
"or forwarded traffic."
@@ -531,7 +604,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:129
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:210
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Navn"
@@ -561,11 +634,11 @@ msgstr ""
"fra portområdet til klienten"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:309
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
msgid "Outbound device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:206
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:207
msgid "Outbound zone"
msgstr ""
@@ -574,9 +647,9 @@ msgstr ""
msgid "Output"
msgstr "Utdata"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:423
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:355
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:595
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:369
msgid "Passes additional arguments to iptables. Use with care!"
msgstr "Sender flere argumenter til iptables. Bruk med forsiktighet!"
@@ -604,7 +677,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:162
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:275
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:194
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:195
msgid "Protocol"
msgstr "Protokoll"
@@ -648,31 +721,31 @@ msgstr "Begrens Masqeuerading til oppgitt kilde subnett"
msgid "Restrict to address family"
msgstr "Begrens til adresse familie"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
msgid "Rewrite IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:270
msgid "Rewrite matched traffic to the specified source IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:300
msgid "Rewrite matched traffic to the specified source port or port range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
msgid "Rewrite port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:184
msgid "Rewrite to"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:115
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:116
msgid "Rewrite to %{ipaddr?%{port?%{ipaddr}, %{port}:%{ipaddr}}:%{port}}"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:122
msgid "Rewrite to outbound device IP"
msgstr ""
@@ -680,15 +753,25 @@ msgstr ""
msgid "Routing/NAT Offloading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:264
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
msgid "SNAT - Rewrite to specific source IP or port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:437
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:609
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:384
msgid "Saturday"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid "Set mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid ""
+"Set the given mark value on established connections. Format is value[/mask]. "
+"If a mask is specified then only those bits set in the mask are modified."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr ""
@@ -698,7 +781,7 @@ msgid "Software flow offloading"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:213
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
msgid "Source IP address"
msgstr "Kilde IP adresse"
@@ -713,7 +796,7 @@ msgstr "Kilde adresse"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:207
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
msgid "Source port"
msgstr "Kilde port"
@@ -734,28 +817,28 @@ msgid ""
"reflected traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:461
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:371
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:633
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:408
msgid "Start Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:453
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:363
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:625
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:400
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:465
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:375
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:637
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:412
msgid "Stop Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:457
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:367
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:629
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:404
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:431
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:603
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:378
msgid "Sunday"
msgstr ""
@@ -800,18 +883,18 @@ msgstr ""
"spesifiserer hvilken av de tilgjengelige nettverk som er medlem av denne "
"sone."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:435
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:607
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:382
msgid "Thursday"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:164
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:469
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:641
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:416
msgid "Time in UTC"
msgstr ""
@@ -831,13 +914,13 @@ msgstr "Til %s på <var>denne enheten</var>"
msgid "To %s, %s in %s"
msgstr "Til %s, %s i %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:102
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:103
msgid ""
"To %{ipaddr?:any destination} %{port?at %{port}} %{zone?via zone %{zone}} "
"%{device?egress device %{device}}"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Tracking helper"
msgstr ""
@@ -856,8 +939,8 @@ msgstr ""
"for eksempel for å avvise trafikk mellom visse verter eller for å åpne WAN "
"porter på ruteren."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:605
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:380
msgid "Tuesday"
msgstr ""
@@ -866,12 +949,12 @@ msgid "Unable to save contents: %s"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:299
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:419
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:498
msgid "Unknown or not installed conntrack helper \"%s\""
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:171
msgid "Unnamed NAT"
msgstr ""
@@ -917,16 +1000,24 @@ msgstr "Via %s"
msgid "Via %s at %s"
msgstr "Via %s på %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:434
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:606
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:381
msgid "Wednesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:426
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:598
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:373
msgid "Week Days"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+msgid "XOR firewall mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid "XOR mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "Sone = Videresendinger"
@@ -953,12 +1044,13 @@ msgstr "godta"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:376
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:382
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:399
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:406
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:231
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:242
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:478
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:485
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:521
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:255
msgid "any"
msgstr "enhver"
@@ -981,6 +1073,10 @@ msgstr "enhver ruter IP"
msgid "any zone"
msgstr "enhver sone"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:396
+msgid "apply firewall mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:395
msgid "assign conntrack helper"
msgstr ""
@@ -989,8 +1085,8 @@ msgstr ""
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:273
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:303
msgid "do not rewrite"
msgstr ""
@@ -1049,12 +1145,21 @@ msgstr ""
msgid "types"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:322
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:562
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+msgid "unlimited"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:238
msgid "unspecified"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "valid firewall mark"
msgstr ""
diff --git a/applications/luci-app-firewall/po/pl/firewall.po b/applications/luci-app-firewall/po/pl/firewall.po
index b9f249f12b..dba586c0d3 100644
--- a/applications/luci-app-firewall/po/pl/firewall.po
+++ b/applications/luci-app-firewall/po/pl/firewall.po
@@ -40,11 +40,11 @@ msgstr ""
msgid "<var>%s</var> and limit to %s"
msgstr "<var>%s</var> i limit do %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:280
msgid "A rewrite IP must be specified!"
msgstr "Należy podać adres IP do ponownego zapisu!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:267
msgid "ACCEPT - Disable address rewriting"
msgstr "AKCEPTUJ - Wyłącz przepisywanie adresów"
@@ -62,7 +62,7 @@ msgstr "Zaakceptuj wyjście"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:224
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:388
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:262
msgid "Action"
msgstr "Akcja"
@@ -87,7 +87,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr "Ustawienia zaawansowane"
@@ -105,18 +105,29 @@ msgid "Allow forward to <em>destination zones</em>:"
msgstr "Zezwól na przekazywanie do <em>strefy docelowej</em>:"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:198
msgid "Any"
msgstr "Każdy"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:430
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:446
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:340
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:602
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:618
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:377
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:393
msgid "Any day"
msgstr "Każdy dzień"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid ""
+"Apply a bitwise XOR of the given value and the existing mark value on "
+"established connections. Format is value[/mask]. If a mask is specified then "
+"those bits set in the mask are zeroed out."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "Apply the given DSCP class or value to established connections."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Assign the specified connection tracking helper to matched traffic."
msgstr ""
"Przypisz określonego pomocnika śledzenia połączeń do dopasowanego ruchu."
@@ -170,7 +181,19 @@ msgstr ""
"są objęte składnią zapory. Polecenia wykonywane są po każdym restarcie "
"zapory, zaraz po załadowaniu zestawu reguł domyślnych."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:398
+msgid "DSCP classification"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:466
+msgid "DSCP mark required"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
msgid "Destination IP address"
msgstr "Docelowy adres IP"
@@ -179,7 +202,7 @@ msgid "Destination address"
msgstr "Adres docelowy"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:379
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
msgid "Destination port"
msgstr "Port docelowy"
@@ -212,7 +235,7 @@ msgstr ""
"state <em>invalid</em>. Może to być wymagane w przypadku skomplikowanych "
"asymetrycznych ustawień trasy."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:125
msgid "Do not rewrite"
msgstr "Nie przepisuj"
@@ -234,7 +257,7 @@ msgstr "Porzuć wadliwe pakiety"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:157
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:230
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:189
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:190
msgid "Enable"
msgstr "Włącz"
@@ -251,7 +274,10 @@ msgid "Enable logging on this zone"
msgstr "Włącz logowanie tej strefy"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "Expecting: %s"
msgstr "Zaleca się użyć: %s"
@@ -272,9 +298,9 @@ msgstr "Zewnętrzne adresy IP"
msgid "External port"
msgstr "Port zewnętrzny"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:422
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:594
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:368
msgid "Extra arguments"
msgstr "Dodatkowe argumenty"
@@ -301,7 +327,7 @@ msgstr "Zapora sieciowa"
msgid "Firewall - Custom Rules"
msgstr "Zapora sieciowa - Własne reguły"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
msgid "Firewall - NAT Rules"
msgstr "Zapora sieciowa - Zasady NAT"
@@ -326,8 +352,8 @@ msgstr "Przekazuj"
msgid "Forward to"
msgstr "Przekazuj do"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:436
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:608
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:383
msgid "Friday"
msgstr "Piątek"
@@ -358,13 +384,13 @@ msgstr "Z %s na <var>to urządzenie</var> ze źródłem %s"
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr "Z %s na <var>to urządzenie</var> ze źródłem %s oraz %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:93
msgid "From %{ipaddr?:any host} %{port?with source %{port}}"
msgstr "Z %{ipaddr?:any host} %{port?with source %{port}}"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
#: 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/root/usr/share/luci/menu.d/luci-app-firewall.json:16
@@ -432,10 +458,39 @@ msgstr "Port wewnętrzny"
msgid "Internal zone"
msgstr "Strefa wewnętrzna"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:471
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:553
+msgid "Invalid DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:581
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:355
+msgid "Invalid limit value"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:586
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:360
+msgid "Limit burst"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Ograniczenie logowania"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:558
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+msgid "Limit matching"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:559
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:333
+msgid "Limits traffic matching to the specified rate."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:275
msgid "Loopback source IP"
msgstr "Źródło pętli zwrotnej IP"
@@ -448,7 +503,7 @@ msgstr "MAC"
msgid "MACs"
msgstr "MACs"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
msgstr "MASQUERADE - Automatyczne przepisywanie na interfejs wyjściowy IP"
@@ -462,17 +517,21 @@ msgstr "Maskarada"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:133
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:174
msgid "Match"
msgstr "Dopasuj"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:84
msgid ""
"Match %{protocol?%{family} %{protocol} traffic:any %{family} traffic} %{mark?"
-"with firewall mark %{mark}}"
+"with firewall mark %{mark}} %{limit?limited to %{limit}}"
msgstr ""
"Dopasuj %{protocol?%{family} %{protocol} traffic:any %{family} traffic} "
-"%{mark?with firewall mark %{mark}}"
+"%{mark?with firewall mark %{mark}} %{limit?limited to %{limit}}"
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:517
+msgid "Match DSCP"
+msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:288
msgid "Match ICMP type"
@@ -482,21 +541,21 @@ msgstr "Dopasuj typ ICMP"
msgid "Match device"
msgstr "Dopasuj urządzenie"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:239
msgid "Match forwarded traffic directed at the given IP address."
msgstr "Dopasuj przesyłany ruch skierowany na podany adres IP."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:252
msgid ""
"Match forwarded traffic directed at the given destination port or port range."
msgstr ""
"Dopasuj przesyłany ruch skierowany na dany port docelowy lub zakres portów."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
msgid "Match forwarded traffic from this IP or range."
msgstr "Dopasuj przesyłany ruch z tego adresu IP lub zakresu."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:228
msgid ""
"Match forwarded traffic originating from the given source port or port range."
msgstr ""
@@ -504,7 +563,7 @@ msgstr ""
"portów."
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match helper"
msgstr "Dopasuj pomocnika"
@@ -517,42 +576,56 @@ msgstr ""
"tym hoście"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:302
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:315
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:501
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
msgid "Match mark"
msgstr "Znak dopasowania"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match traffic using the specified connection tracking helper."
msgstr "Dopasuj ruch, używając określonego pomocnika śledzenia połączeń."
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:303
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:502
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:317
msgid "Matches a specific firewall mark or a range of different marks."
msgstr "Odpowiada konkretnemu znakowi zapory lub zakresowi różnych znaków."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:311
msgid "Matches forwarded traffic using the specified outbound network device."
msgstr ""
"Dopasowuje przesyłany ruch przy użyciu określonego wychodzącego urządzenia "
"sieciowego."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:432
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:518
+msgid "Matches traffic carrying the specified DSCP marking."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:587
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:361
+msgid ""
+"Maximum initial number of packets to match: this number gets recharged by "
+"one every time the limit specified above is not reached, up to this number."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:604
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
msgid "Monday"
msgstr "Poniedziałek"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:442
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:614
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:389
msgid "Month Days"
msgstr "Dni miesiąca"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:156
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:157
#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
msgid "NAT Rules"
msgstr "Zasady NAT"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:155
msgid ""
"NAT rules allow fine grained control over the source IP to use for outbound "
"or forwarded traffic."
@@ -562,7 +635,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:129
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:210
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Nazwa"
@@ -592,11 +665,11 @@ msgstr ""
"portów na hoście klienta"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:309
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
msgid "Outbound device"
msgstr "Urządzenie wychodzące"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:206
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:207
msgid "Outbound zone"
msgstr "Strefa wychodząca"
@@ -605,9 +678,9 @@ msgstr "Strefa wychodząca"
msgid "Output"
msgstr "Ruch wychodzący"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:423
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:355
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:595
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:369
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
"Przekazuje dodatkowe argumenty do iptables. Zachowaj szczególną ostrożność!"
@@ -642,7 +715,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:162
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:275
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:194
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:195
msgid "Protocol"
msgstr "Protokół"
@@ -688,32 +761,32 @@ msgstr "Ogranicz maskaradę do wskazanych podsieci źródłowych"
msgid "Restrict to address family"
msgstr "Ogranicz do rodziny adresów"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
msgid "Rewrite IP address"
msgstr "Przepisz adres IP"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:270
msgid "Rewrite matched traffic to the specified source IP address."
msgstr "Przepisz dopasowany ruch do określonego źródłowego adresu IP."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:300
msgid "Rewrite matched traffic to the specified source port or port range."
msgstr ""
"Przepisz dopasowany ruch do określonego portu źródłowego lub zakresu portów."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
msgid "Rewrite port"
msgstr "Przepisz port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:184
msgid "Rewrite to"
msgstr "Przepisz do"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:115
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:116
msgid "Rewrite to %{ipaddr?%{port?%{ipaddr}, %{port}:%{ipaddr}}:%{port}}"
msgstr "Przepisz do %{ipaddr?%{port?%{ipaddr}, %{port}:%{ipaddr}}:%{port}}"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:122
msgid "Rewrite to outbound device IP"
msgstr "Przepisz do adresu IP urządzenia wychodzącego"
@@ -721,15 +794,25 @@ msgstr "Przepisz do adresu IP urządzenia wychodzącego"
msgid "Routing/NAT Offloading"
msgstr "Routing/NAT Offloading"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:264
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
msgid "SNAT - Rewrite to specific source IP or port"
msgstr "SNAT - Przepisz do określonego źródłowego adresu IP lub portu"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:437
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:609
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:384
msgid "Saturday"
msgstr "Sobota"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid "Set mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid ""
+"Set the given mark value on established connections. Format is value[/mask]. "
+"If a mask is specified then only those bits set in the mask are modified."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr "Oprogramowanie oparte na offloading dla routingu/NAT"
@@ -739,7 +822,7 @@ msgid "Software flow offloading"
msgstr "Programowy flow offloading"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:213
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
msgid "Source IP address"
msgstr "Źródłowy adres IP"
@@ -754,7 +837,7 @@ msgstr "Adres źródłowy"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:207
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
msgid "Source port"
msgstr "Port źródłowy"
@@ -779,28 +862,28 @@ msgstr ""
"Określa, czy użyć zewnętrznego czy wewnętrznego adresu IP do odbijanego "
"ruchu."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:461
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:371
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:633
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:408
msgid "Start Date (yyyy-mm-dd)"
msgstr "Data rozpoczęcia (rrrr-mm-dd)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:453
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:363
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:625
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:400
msgid "Start Time (hh.mm.ss)"
msgstr "Czas rozpoczęcia (hh.mm.ss)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:465
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:375
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:637
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:412
msgid "Stop Date (yyyy-mm-dd)"
msgstr "Data zakończenia (yyyyy-mm-dd)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:457
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:367
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:629
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:404
msgid "Stop Time (hh.mm.ss)"
msgstr "Czas zatrzymania (yyyyy-mm-dd)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:431
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:603
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:378
msgid "Sunday"
msgstr "Niedziela"
@@ -843,18 +926,18 @@ msgstr ""
"politykę ruchu przekazywanego pomiędzy różnymi sieciami wewnątrz strefy. "
"<em>Objęte sieci</em> określają dostępne sieci będące członkami tej strefy."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:435
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:607
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:382
msgid "Thursday"
msgstr "Czwartek"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:164
msgid "Time Restrictions"
msgstr "Ograniczenia czasowe"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:469
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:641
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:416
msgid "Time in UTC"
msgstr "Czas w UTC"
@@ -874,7 +957,7 @@ 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/htdocs/luci-static/resources/view/firewall/snats.js:102
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:103
msgid ""
"To %{ipaddr?:any destination} %{port?at %{port}} %{zone?via zone %{zone}} "
"%{device?egress device %{device}}"
@@ -882,7 +965,7 @@ msgstr ""
"Do %{ipaddr?:any destination} %{port?at %{port}} %{zone?via zone %{zone}} "
"%{device?egress device %{device}}"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Tracking helper"
msgstr "Pomocnik śledzenia"
@@ -901,8 +984,8 @@ msgstr ""
"między strefami, na przykład aby odrzucać ruch między konkretnymi hostami "
"albo otworzyć porty WAN routera."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:605
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:380
msgid "Tuesday"
msgstr "Wtorek"
@@ -911,12 +994,12 @@ msgid "Unable to save contents: %s"
msgstr "Nie można zapisać zawartości: %s"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:299
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:419
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:498
msgid "Unknown or not installed conntrack helper \"%s\""
msgstr "Nieznany lub nie zainstalowany pomocnik conntrack \"%s\""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:171
msgid "Unnamed NAT"
msgstr "Nienazwany NAT"
@@ -966,16 +1049,24 @@ msgstr "Przez %s"
msgid "Via %s at %s"
msgstr "Przez %s w %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:434
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:606
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:381
msgid "Wednesday"
msgstr "Środa"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:426
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:598
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:373
msgid "Week Days"
msgstr "Dni tygodnia"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+msgid "XOR firewall mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid "XOR mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "Strefa ⇒ Przekazywanie"
@@ -1002,12 +1093,13 @@ msgstr "akceptuj"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:376
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:382
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:399
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:406
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:231
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:242
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:478
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:485
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:521
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:255
msgid "any"
msgstr "dowolny"
@@ -1030,6 +1122,10 @@ msgstr "dowolne IP routera"
msgid "any zone"
msgstr "dowolna strefa"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:396
+msgid "apply firewall mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:395
msgid "assign conntrack helper"
msgstr "przypisz pomocnika conntrack"
@@ -1038,8 +1134,8 @@ msgstr "przypisz pomocnika conntrack"
msgid "day"
msgstr "Dzień"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:273
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:303
msgid "do not rewrite"
msgstr "Nie przepisuj"
@@ -1098,12 +1194,21 @@ msgstr "typ"
msgid "types"
msgstr "typy"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:322
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:562
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+msgid "unlimited"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:238
msgid "unspecified"
msgstr "nieokreślone"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "valid firewall mark"
msgstr "prawidłowy znak zapory sieciowej"
diff --git a/applications/luci-app-firewall/po/pt-br/firewall.po b/applications/luci-app-firewall/po/pt-br/firewall.po
index 42c9053a48..a3a1284bb1 100644
--- a/applications/luci-app-firewall/po/pt-br/firewall.po
+++ b/applications/luci-app-firewall/po/pt-br/firewall.po
@@ -38,11 +38,11 @@ msgstr "<var>%d</var> pcts. por <var>%s</var>, pico <var>%d</var> pcts."
msgid "<var>%s</var> and limit to %s"
msgstr "<var>%s</var> e limite a %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:280
msgid "A rewrite IP must be specified!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:267
msgid "ACCEPT - Disable address rewriting"
msgstr ""
@@ -60,7 +60,7 @@ msgstr "Aceitar saída"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:224
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:388
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:262
msgid "Action"
msgstr "Ação"
@@ -85,7 +85,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr "Configurações Avançadas"
@@ -103,18 +103,29 @@ msgid "Allow forward to <em>destination zones</em>:"
msgstr "Permite o encaminhamento para a <em>zona de destino</em>:"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:198
msgid "Any"
msgstr "Qualquer"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:430
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:446
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:340
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:602
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:618
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:377
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:393
msgid "Any day"
msgstr "Qualquer dia"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid ""
+"Apply a bitwise XOR of the given value and the existing mark value on "
+"established connections. Format is value[/mask]. If a mask is specified then "
+"those bits set in the mask are zeroed out."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "Apply the given DSCP class or value to established connections."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Assign the specified connection tracking helper to matched traffic."
msgstr ""
@@ -167,7 +178,19 @@ msgstr ""
"cobertos por esta ferramenta. Os comandos serão executados após cada "
"reinício do firewall, logo após a carga do conjunto de regras padrão."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:398
+msgid "DSCP classification"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:466
+msgid "DSCP mark required"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
msgid "Destination IP address"
msgstr "Endereço IP de destino"
@@ -176,7 +199,7 @@ msgid "Destination address"
msgstr "Endereço de destino"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:379
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
msgid "Destination port"
msgstr "Porta de destino"
@@ -209,7 +232,7 @@ msgstr ""
"estado do conntrack for <em>invalid</em>. Isto pode ser necessário para "
"configurações complexas e de rotas assimétricas."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:125
msgid "Do not rewrite"
msgstr "Não sobrescreva"
@@ -231,7 +254,7 @@ msgstr "Descartar pacotes inválidos"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:157
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:230
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:189
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:190
msgid "Enable"
msgstr "Ativar"
@@ -248,7 +271,10 @@ msgid "Enable logging on this zone"
msgstr "Habilite o registro nesta zona"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "Expecting: %s"
msgstr ""
@@ -271,9 +297,9 @@ msgstr "Endereço IP externo"
msgid "External port"
msgstr "Porta Externa"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:422
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:594
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:368
msgid "Extra arguments"
msgstr "Argumentos extras"
@@ -297,7 +323,7 @@ msgstr "Firewall"
msgid "Firewall - Custom Rules"
msgstr "Firewall - Regras personalizadas"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
msgid "Firewall - NAT Rules"
msgstr ""
@@ -322,8 +348,8 @@ msgstr "Encaminhar"
msgid "Forward to"
msgstr "Encaminhar para"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:436
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:608
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:383
msgid "Friday"
msgstr "Sexta-feira"
@@ -354,13 +380,13 @@ msgstr "De %s <var>neste dispositivo</var> com origem %s"
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr "De %s <var>neste dispositivo</var> com origem %s e %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:93
msgid "From %{ipaddr?:any host} %{port?with source %{port}}"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
#: 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/root/usr/share/luci/menu.d/luci-app-firewall.json:16
@@ -428,10 +454,39 @@ msgstr "Porta Interna"
msgid "Internal zone"
msgstr "Zona interna"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:471
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:553
+msgid "Invalid DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:581
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:355
+msgid "Invalid limit value"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:586
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:360
+msgid "Limit burst"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Limita as mensagens de registro"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:558
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+msgid "Limit matching"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:559
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:333
+msgid "Limits traffic matching to the specified rate."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:275
msgid "Loopback source IP"
msgstr ""
@@ -444,7 +499,7 @@ msgstr "MAC"
msgid "MACs"
msgstr "MACs"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
msgstr ""
@@ -458,14 +513,18 @@ msgstr "Mascaramento"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:133
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:174
msgid "Match"
msgstr "Casa"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:84
msgid ""
"Match %{protocol?%{family} %{protocol} traffic:any %{family} traffic} %{mark?"
-"with firewall mark %{mark}}"
+"with firewall mark %{mark}} %{limit?limited to %{limit}}"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:517
+msgid "Match DSCP"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:288
@@ -476,26 +535,26 @@ msgstr "Casa com ICMP tipo"
msgid "Match device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:239
msgid "Match forwarded traffic directed at the given IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:252
msgid ""
"Match forwarded traffic directed at the given destination port or port range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
msgid "Match forwarded traffic from this IP or range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:228
msgid ""
"Match forwarded traffic originating from the given source port or port range."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match helper"
msgstr ""
@@ -508,40 +567,54 @@ msgstr ""
"destino específica neste computador"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:302
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:315
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:501
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
msgid "Match mark"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match traffic using the specified connection tracking helper."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:303
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:502
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:317
msgid "Matches a specific firewall mark or a range of different marks."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:311
msgid "Matches forwarded traffic using the specified outbound network device."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:432
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:518
+msgid "Matches traffic carrying the specified DSCP marking."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:587
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:361
+msgid ""
+"Maximum initial number of packets to match: this number gets recharged by "
+"one every time the limit specified above is not reached, up to this number."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:604
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
msgid "Monday"
msgstr "Segunda-Feira"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:442
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:614
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:389
msgid "Month Days"
msgstr "Dias do mês"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:156
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:157
#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
msgid "NAT Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:155
msgid ""
"NAT rules allow fine grained control over the source IP to use for outbound "
"or forwarded traffic."
@@ -549,7 +622,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:129
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:210
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Nome"
@@ -580,11 +653,11 @@ msgstr ""
"intervalo de portas no equipamento cliente"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:309
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
msgid "Outbound device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:206
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:207
msgid "Outbound zone"
msgstr ""
@@ -593,9 +666,9 @@ msgstr ""
msgid "Output"
msgstr "Saída"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:423
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:355
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:595
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:369
msgid "Passes additional arguments to iptables. Use with care!"
msgstr "Passa argumentos adicionais para o iptables. Use com cuidado!"
@@ -628,7 +701,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:162
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:275
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:194
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:195
msgid "Protocol"
msgstr "Protocolo"
@@ -671,31 +744,31 @@ msgstr "Restringe o mascaramento para uma subrede de origem específica"
msgid "Restrict to address family"
msgstr "Restringe para uma família de endereços"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
msgid "Rewrite IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:270
msgid "Rewrite matched traffic to the specified source IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:300
msgid "Rewrite matched traffic to the specified source port or port range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
msgid "Rewrite port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:184
msgid "Rewrite to"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:115
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:116
msgid "Rewrite to %{ipaddr?%{port?%{ipaddr}, %{port}:%{ipaddr}}:%{port}}"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:122
msgid "Rewrite to outbound device IP"
msgstr ""
@@ -703,15 +776,25 @@ msgstr ""
msgid "Routing/NAT Offloading"
msgstr "Aceleração de Roteamento/NAT"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:264
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
msgid "SNAT - Rewrite to specific source IP or port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:437
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:609
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:384
msgid "Saturday"
msgstr "Sábado"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid "Set mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid ""
+"Set the given mark value on established connections. Format is value[/mask]. "
+"If a mask is specified then only those bits set in the mask are modified."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr "Aceleração de roteamento/NAT baseada em Software"
@@ -721,7 +804,7 @@ msgid "Software flow offloading"
msgstr "Aceleração de fluxo de dados via Software"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:213
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
msgid "Source IP address"
msgstr "Endereço IP de origem"
@@ -736,7 +819,7 @@ msgstr "Endereço de origem"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:207
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
msgid "Source port"
msgstr "Porta de origem"
@@ -757,28 +840,28 @@ msgid ""
"reflected traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:461
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:371
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:633
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:408
msgid "Start Date (yyyy-mm-dd)"
msgstr "Dia inicial (aaaa-mm-dd)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:453
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:363
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:625
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:400
msgid "Start Time (hh.mm.ss)"
msgstr "Hora de Início (hh.mm.ss)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:465
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:375
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:637
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:412
msgid "Stop Date (yyyy-mm-dd)"
msgstr "Dia final (aaaa-mm-dd)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:457
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:367
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:629
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:404
msgid "Stop Time (hh.mm.ss)"
msgstr "Hora de Parada (hh.mm.ss)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:431
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:603
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:378
msgid "Sunday"
msgstr "Domingo"
@@ -822,18 +905,18 @@ msgstr ""
"<em>Redes Cobertas</em> especificam que redes disponíveis são membros desta "
"zona."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:435
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:607
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:382
msgid "Thursday"
msgstr "Quita-feira"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:164
msgid "Time Restrictions"
msgstr "Restrições de tempo"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:469
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:641
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:416
msgid "Time in UTC"
msgstr "Hora em UTC"
@@ -853,13 +936,13 @@ msgstr "Para %s <var>neste dispositivo</var>"
msgid "To %s, %s in %s"
msgstr "Para %s, %s em %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:102
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:103
msgid ""
"To %{ipaddr?:any destination} %{port?at %{port}} %{zone?via zone %{zone}} "
"%{device?egress device %{device}}"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Tracking helper"
msgstr ""
@@ -878,8 +961,8 @@ msgstr ""
"diferentes zonas. Por exemplo, rejeitar o tráfego entre certos equipamentos "
"ou abrir portas WAN no roteador."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:605
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:380
msgid "Tuesday"
msgstr "Terça-feira"
@@ -888,12 +971,12 @@ msgid "Unable to save contents: %s"
msgstr "Não foi possível salvar os conteúdos: %s"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:299
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:419
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:498
msgid "Unknown or not installed conntrack helper \"%s\""
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:171
msgid "Unnamed NAT"
msgstr ""
@@ -943,16 +1026,24 @@ msgstr "Via %s"
msgid "Via %s at %s"
msgstr "Através do %s na %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:434
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:606
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:381
msgid "Wednesday"
msgstr "Quarta-feira"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:426
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:598
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:373
msgid "Week Days"
msgstr "Dias da semana"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+msgid "XOR firewall mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid "XOR mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "Zona ⇒ Encaminhamentos"
@@ -979,12 +1070,13 @@ msgstr "aceitar"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:376
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:382
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:399
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:406
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:231
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:242
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:478
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:485
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:521
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:255
msgid "any"
msgstr "qualquer"
@@ -1007,6 +1099,10 @@ msgstr "qualquer endereço IP do roteador"
msgid "any zone"
msgstr "qualquer zona"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:396
+msgid "apply firewall mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:395
msgid "assign conntrack helper"
msgstr ""
@@ -1015,8 +1111,8 @@ msgstr ""
msgid "day"
msgstr "dia"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:273
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:303
msgid "do not rewrite"
msgstr ""
@@ -1075,12 +1171,21 @@ msgstr "tipo"
msgid "types"
msgstr "tipos"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:322
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:562
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+msgid "unlimited"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:238
msgid "unspecified"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "valid firewall mark"
msgstr ""
diff --git a/applications/luci-app-firewall/po/pt/firewall.po b/applications/luci-app-firewall/po/pt/firewall.po
index ab18894032..77a621d3ac 100644
--- a/applications/luci-app-firewall/po/pt/firewall.po
+++ b/applications/luci-app-firewall/po/pt/firewall.po
@@ -38,11 +38,11 @@ msgstr "<var>%d</var> pcts. por <var>%s</var>, burst <var>%d</var> pcts."
msgid "<var>%s</var> and limit to %s"
msgstr "<var>%s</var> e limite a %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:280
msgid "A rewrite IP must be specified!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:267
msgid "ACCEPT - Disable address rewriting"
msgstr ""
@@ -60,7 +60,7 @@ msgstr "Aceitar a saída"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:224
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:388
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:262
msgid "Action"
msgstr "Ação"
@@ -85,7 +85,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr "Definições Avançadas"
@@ -103,18 +103,29 @@ msgid "Allow forward to <em>destination zones</em>:"
msgstr "Permitir encaminhamento para <em>zonas de destino</em>:"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:198
msgid "Any"
msgstr "Qualquer"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:430
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:446
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:340
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:602
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:618
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:377
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:393
msgid "Any day"
msgstr "Qualquer dia"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid ""
+"Apply a bitwise XOR of the given value and the existing mark value on "
+"established connections. Format is value[/mask]. If a mask is specified then "
+"those bits set in the mask are zeroed out."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "Apply the given DSCP class or value to established connections."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Assign the specified connection tracking helper to matched traffic."
msgstr ""
@@ -168,7 +179,19 @@ msgstr ""
"comandos são executados a seguir ao reinicio da firewall, logo a seguir ao "
"conjunto de regras predefinidas serem carregadas."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:398
+msgid "DSCP classification"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:466
+msgid "DSCP mark required"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
msgid "Destination IP address"
msgstr "Endereço IP de destino"
@@ -177,7 +200,7 @@ msgid "Destination address"
msgstr "Endereço de destino"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:379
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
msgid "Destination port"
msgstr "Porta de destino"
@@ -210,7 +233,7 @@ msgstr ""
"conntrack <em>invalid</em>. Isto pode ser necessário para configurações "
"complexas de rotas assimétricas."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:125
msgid "Do not rewrite"
msgstr "Não re-escrever"
@@ -232,7 +255,7 @@ msgstr "Cancelar pacotes inválidos"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:157
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:230
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:189
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:190
msgid "Enable"
msgstr "Ativar"
@@ -249,7 +272,10 @@ msgid "Enable logging on this zone"
msgstr "Ativar registo nesta zona"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "Expecting: %s"
msgstr ""
@@ -271,9 +297,9 @@ msgstr "Endereço IP externo"
msgid "External port"
msgstr "Porta externa"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:422
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:594
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:368
msgid "Extra arguments"
msgstr "Argumentos adicionais"
@@ -297,7 +323,7 @@ msgstr "Firewall"
msgid "Firewall - Custom Rules"
msgstr "Firewall - Regras Personalizadas"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
msgid "Firewall - NAT Rules"
msgstr ""
@@ -322,8 +348,8 @@ msgstr "Encaminhar"
msgid "Forward to"
msgstr "Encaminhar para"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:436
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:608
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:383
msgid "Friday"
msgstr "Sexta-feira"
@@ -354,13 +380,13 @@ msgstr "De %s <var>neste aparelho</var> com a fonte %s"
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr "De %s <var>neste aparelho</var> com as fontes %s e %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:93
msgid "From %{ipaddr?:any host} %{port?with source %{port}}"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
#: 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/root/usr/share/luci/menu.d/luci-app-firewall.json:16
@@ -428,10 +454,39 @@ msgstr "Porta interna"
msgid "Internal zone"
msgstr "Zona Interna"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:471
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:553
+msgid "Invalid DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:581
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:355
+msgid "Invalid limit value"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:586
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:360
+msgid "Limit burst"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Limitar registo de mensagens"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:558
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+msgid "Limit matching"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:559
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:333
+msgid "Limits traffic matching to the specified rate."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:275
msgid "Loopback source IP"
msgstr ""
@@ -444,7 +499,7 @@ msgstr "MAC"
msgid "MACs"
msgstr "MACs"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
msgstr ""
@@ -458,14 +513,18 @@ msgstr "Mascaramento"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:133
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:174
msgid "Match"
msgstr "Corresponder"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:84
msgid ""
"Match %{protocol?%{family} %{protocol} traffic:any %{family} traffic} %{mark?"
-"with firewall mark %{mark}}"
+"with firewall mark %{mark}} %{limit?limited to %{limit}}"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:517
+msgid "Match DSCP"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:288
@@ -476,26 +535,26 @@ msgstr "Correspondência do tipo de ICMP"
msgid "Match device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:239
msgid "Match forwarded traffic directed at the given IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:252
msgid ""
"Match forwarded traffic directed at the given destination port or port range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
msgid "Match forwarded traffic from this IP or range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:228
msgid ""
"Match forwarded traffic originating from the given source port or port range."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match helper"
msgstr ""
@@ -508,40 +567,54 @@ msgstr ""
"portas neste host"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:302
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:315
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:501
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
msgid "Match mark"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match traffic using the specified connection tracking helper."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:303
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:502
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:317
msgid "Matches a specific firewall mark or a range of different marks."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:311
msgid "Matches forwarded traffic using the specified outbound network device."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:432
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:518
+msgid "Matches traffic carrying the specified DSCP marking."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:587
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:361
+msgid ""
+"Maximum initial number of packets to match: this number gets recharged by "
+"one every time the limit specified above is not reached, up to this number."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:604
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
msgid "Monday"
msgstr "Segunda-feira"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:442
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:614
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:389
msgid "Month Days"
msgstr "Dias do mês"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:156
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:157
#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
msgid "NAT Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:155
msgid ""
"NAT rules allow fine grained control over the source IP to use for outbound "
"or forwarded traffic."
@@ -549,7 +622,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:129
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:210
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Nome"
@@ -579,11 +652,11 @@ msgstr ""
"intervalo de portas no host cliente"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:309
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
msgid "Outbound device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:206
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:207
msgid "Outbound zone"
msgstr ""
@@ -592,9 +665,9 @@ msgstr ""
msgid "Output"
msgstr "Saída"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:423
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:355
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:595
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:369
msgid "Passes additional arguments to iptables. Use with care!"
msgstr "Passa argumentos adicionais para o iptables. Usar com cuidado!"
@@ -627,7 +700,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:162
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:275
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:194
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:195
msgid "Protocol"
msgstr "Protocolo"
@@ -672,31 +745,31 @@ msgstr "Restringir Mascaramento a sub-redes de origem fornecidas"
msgid "Restrict to address family"
msgstr "Restringir a família de endereços"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
msgid "Rewrite IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:270
msgid "Rewrite matched traffic to the specified source IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:300
msgid "Rewrite matched traffic to the specified source port or port range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
msgid "Rewrite port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:184
msgid "Rewrite to"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:115
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:116
msgid "Rewrite to %{ipaddr?%{port?%{ipaddr}, %{port}:%{ipaddr}}:%{port}}"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:122
msgid "Rewrite to outbound device IP"
msgstr ""
@@ -704,15 +777,25 @@ msgstr ""
msgid "Routing/NAT Offloading"
msgstr "Descargar Roteamento/NAT"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:264
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
msgid "SNAT - Rewrite to specific source IP or port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:437
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:609
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:384
msgid "Saturday"
msgstr "Sábado"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid "Set mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid ""
+"Set the given mark value on established connections. Format is value[/mask]. "
+"If a mask is specified then only those bits set in the mask are modified."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr "Descarga baseada em software para roteamento/NAT"
@@ -722,7 +805,7 @@ msgid "Software flow offloading"
msgstr "Descarga de fluxo de software"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:213
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
msgid "Source IP address"
msgstr "Endereço IP de origem"
@@ -737,7 +820,7 @@ msgstr "Endereço de origem"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:207
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
msgid "Source port"
msgstr "Porta de origem"
@@ -758,28 +841,28 @@ msgid ""
"reflected traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:461
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:371
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:633
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:408
msgid "Start Date (yyyy-mm-dd)"
msgstr "Data de Início (aaaaa-mm-dd)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:453
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:363
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:625
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:400
msgid "Start Time (hh.mm.ss)"
msgstr "Hora de início (hh.mm.ss)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:465
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:375
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:637
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:412
msgid "Stop Date (yyyy-mm-dd)"
msgstr "Data de Paragem (aaaaa-mm-dd)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:457
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:367
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:629
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:404
msgid "Stop Time (hh.mm.ss)"
msgstr "Tempo de Parada (hh.mm.ss)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:431
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:603
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:378
msgid "Sunday"
msgstr "Domingo"
@@ -824,18 +907,18 @@ msgstr ""
"abrangidas</em> especifica quais das redes disponíveis são membros desta "
"zona."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:435
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:607
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:382
msgid "Thursday"
msgstr "Quinta-feira"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:164
msgid "Time Restrictions"
msgstr "Restrições de Tempo"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:469
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:641
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:416
msgid "Time in UTC"
msgstr "Tempo em UTC"
@@ -855,13 +938,13 @@ msgstr "Para %s em <var>este dispositivo</var>"
msgid "To %s, %s in %s"
msgstr "Para %s, %s em %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:102
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:103
msgid ""
"To %{ipaddr?:any destination} %{port?at %{port}} %{zone?via zone %{zone}} "
"%{device?egress device %{device}}"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Tracking helper"
msgstr ""
@@ -880,8 +963,8 @@ msgstr ""
"diferentes zonas, por exemplo, para rejeitar trafego entre certos hosts ou "
"para abrir portas WAN no router."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:605
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:380
msgid "Tuesday"
msgstr "Terça-feira"
@@ -890,12 +973,12 @@ msgid "Unable to save contents: %s"
msgstr "Incapaz de gravar conteúdos: %s"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:299
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:419
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:498
msgid "Unknown or not installed conntrack helper \"%s\""
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:171
msgid "Unnamed NAT"
msgstr ""
@@ -945,16 +1028,24 @@ msgstr "Via %s"
msgid "Via %s at %s"
msgstr "Via %s no %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:434
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:606
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:381
msgid "Wednesday"
msgstr "Quarta-feira"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:426
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:598
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:373
msgid "Week Days"
msgstr "Dias úteis"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+msgid "XOR firewall mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid "XOR mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "Zona ⇒ Encaminhamentos"
@@ -981,12 +1072,13 @@ msgstr "aceitar"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:376
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:382
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:399
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:406
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:231
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:242
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:478
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:485
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:521
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:255
msgid "any"
msgstr "qualquer"
@@ -1009,6 +1101,10 @@ msgstr "qualquer IP do router"
msgid "any zone"
msgstr "qualquer zona"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:396
+msgid "apply firewall mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:395
msgid "assign conntrack helper"
msgstr ""
@@ -1017,8 +1113,8 @@ msgstr ""
msgid "day"
msgstr "dia"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:273
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:303
msgid "do not rewrite"
msgstr ""
@@ -1077,12 +1173,21 @@ msgstr "tipo"
msgid "types"
msgstr "tipos"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:322
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:562
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+msgid "unlimited"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:238
msgid "unspecified"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "valid firewall mark"
msgstr ""
diff --git a/applications/luci-app-firewall/po/ro/firewall.po b/applications/luci-app-firewall/po/ro/firewall.po
index 1ce2c9f411..f7c604b7c1 100644
--- a/applications/luci-app-firewall/po/ro/firewall.po
+++ b/applications/luci-app-firewall/po/ro/firewall.po
@@ -37,11 +37,11 @@ msgstr ""
msgid "<var>%s</var> and limit to %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:280
msgid "A rewrite IP must be specified!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:267
msgid "ACCEPT - Disable address rewriting"
msgstr ""
@@ -59,7 +59,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:224
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:388
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:262
msgid "Action"
msgstr "Actiune"
@@ -78,7 +78,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr "Setări avansate"
@@ -96,18 +96,29 @@ msgid "Allow forward to <em>destination zones</em>:"
msgstr "Permite trecerea catre <em>zonele sursa</em>."
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:198
msgid "Any"
msgstr "Oricare"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:430
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:446
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:340
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:602
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:618
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:377
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:393
msgid "Any day"
msgstr "Orice zi"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid ""
+"Apply a bitwise XOR of the given value and the existing mark value on "
+"established connections. Format is value[/mask]. If a mask is specified then "
+"those bits set in the mask are zeroed out."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "Apply the given DSCP class or value to established connections."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Assign the specified connection tracking helper to matched traffic."
msgstr ""
@@ -155,7 +166,19 @@ msgid ""
"each firewall restart, right after the default ruleset has been loaded."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:398
+msgid "DSCP classification"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:466
+msgid "DSCP mark required"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
msgid "Destination IP address"
msgstr "Destinaţie adresă IP"
@@ -164,7 +187,7 @@ msgid "Destination address"
msgstr "Destinaţie adresă"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:379
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
msgid "Destination port"
msgstr "Portul destinatie"
@@ -194,7 +217,7 @@ msgid ""
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:125
msgid "Do not rewrite"
msgstr "Nu rescrie"
@@ -216,7 +239,7 @@ msgstr "Descarcă pachetele invalide"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:157
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:230
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:189
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:190
msgid "Enable"
msgstr "Activează"
@@ -233,7 +256,10 @@ msgid "Enable logging on this zone"
msgstr "Activeaza log in aceasta zona"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "Expecting: %s"
msgstr ""
@@ -253,9 +279,9 @@ msgstr "Adresă IP externă"
msgid "External port"
msgstr "Port extern"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:422
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:594
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:368
msgid "Extra arguments"
msgstr ""
@@ -279,7 +305,7 @@ msgstr "Firewall"
msgid "Firewall - Custom Rules"
msgstr "Firewall - Reguli particularizate"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
msgid "Firewall - NAT Rules"
msgstr ""
@@ -304,8 +330,8 @@ msgstr "Forward"
msgid "Forward to"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:436
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:608
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:383
msgid "Friday"
msgstr "Vineri"
@@ -336,13 +362,13 @@ msgstr ""
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:93
msgid "From %{ipaddr?:any host} %{port?with source %{port}}"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
#: 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/root/usr/share/luci/menu.d/luci-app-firewall.json:16
@@ -410,10 +436,39 @@ msgstr "Port intern"
msgid "Internal zone"
msgstr "Zonă internă"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:471
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:553
+msgid "Invalid DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:581
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:355
+msgid "Invalid limit value"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:586
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:360
+msgid "Limit burst"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Limitează mesaje în log"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:558
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+msgid "Limit matching"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:559
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:333
+msgid "Limits traffic matching to the specified rate."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:275
msgid "Loopback source IP"
msgstr ""
@@ -426,7 +481,7 @@ msgstr "MAC"
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
msgstr ""
@@ -440,14 +495,18 @@ msgstr "Translatare"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:133
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:174
msgid "Match"
msgstr "Potrivire"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:84
msgid ""
"Match %{protocol?%{family} %{protocol} traffic:any %{family} traffic} %{mark?"
-"with firewall mark %{mark}}"
+"with firewall mark %{mark}} %{limit?limited to %{limit}}"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:517
+msgid "Match DSCP"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:288
@@ -458,26 +517,26 @@ msgstr "Potriveste pe tipul de ICMP"
msgid "Match device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:239
msgid "Match forwarded traffic directed at the given IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:252
msgid ""
"Match forwarded traffic directed at the given destination port or port range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
msgid "Match forwarded traffic from this IP or range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:228
msgid ""
"Match forwarded traffic originating from the given source port or port range."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match helper"
msgstr ""
@@ -488,40 +547,54 @@ msgid ""
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:302
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:315
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:501
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
msgid "Match mark"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match traffic using the specified connection tracking helper."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:303
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:502
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:317
msgid "Matches a specific firewall mark or a range of different marks."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:311
msgid "Matches forwarded traffic using the specified outbound network device."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:432
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:518
+msgid "Matches traffic carrying the specified DSCP marking."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:587
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:361
+msgid ""
+"Maximum initial number of packets to match: this number gets recharged by "
+"one every time the limit specified above is not reached, up to this number."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:604
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
msgid "Monday"
msgstr "Luni"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:442
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:614
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:389
msgid "Month Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:156
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:157
#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
msgid "NAT Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:155
msgid ""
"NAT rules allow fine grained control over the source IP to use for outbound "
"or forwarded traffic."
@@ -529,7 +602,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:129
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:210
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Nume"
@@ -557,11 +630,11 @@ msgid ""
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:309
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
msgid "Outbound device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:206
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:207
msgid "Outbound zone"
msgstr ""
@@ -570,9 +643,9 @@ msgstr ""
msgid "Output"
msgstr "Ieşire"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:423
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:355
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:595
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:369
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
@@ -598,7 +671,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:162
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:275
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:194
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:195
msgid "Protocol"
msgstr "Protocol"
@@ -640,31 +713,31 @@ msgstr ""
msgid "Restrict to address family"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
msgid "Rewrite IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:270
msgid "Rewrite matched traffic to the specified source IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:300
msgid "Rewrite matched traffic to the specified source port or port range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
msgid "Rewrite port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:184
msgid "Rewrite to"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:115
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:116
msgid "Rewrite to %{ipaddr?%{port?%{ipaddr}, %{port}:%{ipaddr}}:%{port}}"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:122
msgid "Rewrite to outbound device IP"
msgstr ""
@@ -672,15 +745,25 @@ msgstr ""
msgid "Routing/NAT Offloading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:264
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
msgid "SNAT - Rewrite to specific source IP or port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:437
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:609
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:384
msgid "Saturday"
msgstr "Sâmbătă"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid "Set mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid ""
+"Set the given mark value on established connections. Format is value[/mask]. "
+"If a mask is specified then only those bits set in the mask are modified."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr ""
@@ -690,7 +773,7 @@ msgid "Software flow offloading"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:213
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
msgid "Source IP address"
msgstr "Sursă adresă IP"
@@ -705,7 +788,7 @@ msgstr "Adresa sursa"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:207
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
msgid "Source port"
msgstr "Port sursa"
@@ -726,28 +809,28 @@ msgid ""
"reflected traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:461
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:371
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:633
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:408
msgid "Start Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:453
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:363
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:625
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:400
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:465
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:375
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:637
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:412
msgid "Stop Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:457
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:367
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:629
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:404
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:431
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:603
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:378
msgid "Sunday"
msgstr "Duminică"
@@ -777,18 +860,18 @@ msgid ""
"networks</em> specifies which available networks are members of this zone."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:435
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:607
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:382
msgid "Thursday"
msgstr "Joi"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:164
msgid "Time Restrictions"
msgstr "Restricţii de timp"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:469
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:641
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:416
msgid "Time in UTC"
msgstr ""
@@ -808,13 +891,13 @@ msgstr ""
msgid "To %s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:102
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:103
msgid ""
"To %{ipaddr?:any destination} %{port?at %{port}} %{zone?via zone %{zone}} "
"%{device?egress device %{device}}"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Tracking helper"
msgstr ""
@@ -830,8 +913,8 @@ msgid ""
"the router."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:605
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:380
msgid "Tuesday"
msgstr "Marţi"
@@ -840,12 +923,12 @@ msgid "Unable to save contents: %s"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:299
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:419
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:498
msgid "Unknown or not installed conntrack helper \"%s\""
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:171
msgid "Unnamed NAT"
msgstr ""
@@ -891,16 +974,24 @@ msgstr ""
msgid "Via %s at %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:434
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:606
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:381
msgid "Wednesday"
msgstr "Miercuri"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:426
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:598
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:373
msgid "Week Days"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+msgid "XOR firewall mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid "XOR mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr ""
@@ -927,12 +1018,13 @@ msgstr "accept"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:376
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:382
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:399
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:406
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:231
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:242
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:478
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:485
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:521
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:255
msgid "any"
msgstr "oricare"
@@ -955,6 +1047,10 @@ msgstr ""
msgid "any zone"
msgstr "orice zona"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:396
+msgid "apply firewall mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:395
msgid "assign conntrack helper"
msgstr ""
@@ -963,8 +1059,8 @@ msgstr ""
msgid "day"
msgstr "zi"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:273
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:303
msgid "do not rewrite"
msgstr ""
@@ -1023,12 +1119,21 @@ msgstr "tip"
msgid "types"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:322
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:562
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+msgid "unlimited"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:238
msgid "unspecified"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "valid firewall mark"
msgstr ""
diff --git a/applications/luci-app-firewall/po/ru/firewall.po b/applications/luci-app-firewall/po/ru/firewall.po
index bc50ce1395..43e470f682 100644
--- a/applications/luci-app-firewall/po/ru/firewall.po
+++ b/applications/luci-app-firewall/po/ru/firewall.po
@@ -40,11 +40,11 @@ msgstr "<var>%d</var> пакетов за <var>%s</var>, подряд <var>%d</v
msgid "<var>%s</var> and limit to %s"
msgstr "<var>%s</var> с пределом в %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:280
msgid "A rewrite IP must be specified!"
msgstr "IP-адрес для перезаписи должен быть указан!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:267
msgid "ACCEPT - Disable address rewriting"
msgstr "ACCEPT — отключить перезапись адреса"
@@ -62,7 +62,7 @@ msgstr "Принимать исходящий трафик"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:224
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:388
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:262
msgid "Action"
msgstr "Действие"
@@ -87,7 +87,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr "Дополнительные настройки"
@@ -105,18 +105,29 @@ msgid "Allow forward to <em>destination zones</em>:"
msgstr "Разрешить перенаправление в <em>'зоны назначения'</em>:"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:198
msgid "Any"
msgstr "Любой"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:430
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:446
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:340
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:602
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:618
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:377
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:393
msgid "Any day"
msgstr "Любой день"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid ""
+"Apply a bitwise XOR of the given value and the existing mark value on "
+"established connections. Format is value[/mask]. If a mask is specified then "
+"those bits set in the mask are zeroed out."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "Apply the given DSCP class or value to established connections."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Assign the specified connection tracking helper to matched traffic."
msgstr ""
@@ -170,7 +181,19 @@ msgstr ""
"каждой перезагрузки межсетевого экрана, сразу после загрузки набора правил "
"по умолчанию."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:398
+msgid "DSCP classification"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:466
+msgid "DSCP mark required"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
msgid "Destination IP address"
msgstr "IP-адрес назначения"
@@ -179,7 +202,7 @@ msgid "Destination address"
msgstr "Адрес назначения"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:379
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
msgid "Destination port"
msgstr "Порт назначения"
@@ -212,7 +235,7 @@ msgstr ""
"трафика с состоянием <em>недействительный</em> (<em>invalid</em>). Это может "
"потребоваться для сложных настроек асимметричной маршрутизации."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:125
msgid "Do not rewrite"
msgstr "Не перезаписывать"
@@ -234,7 +257,7 @@ msgstr "Отбрасывать некорректные пакеты"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:157
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:230
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:189
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:190
msgid "Enable"
msgstr "Включить"
@@ -251,7 +274,10 @@ msgid "Enable logging on this zone"
msgstr "Включить журналирование в этой зоне"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "Expecting: %s"
msgstr "Ожидается: %s"
@@ -273,9 +299,9 @@ msgstr "Внешний IP-адрес"
msgid "External port"
msgstr "Внешний порт"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:422
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:594
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:368
msgid "Extra arguments"
msgstr "Дополнительные аргументы"
@@ -299,7 +325,7 @@ msgstr "Межсетевой экран"
msgid "Firewall - Custom Rules"
msgstr "Межсетевой экран - Пользовательские правила"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
msgid "Firewall - NAT Rules"
msgstr "Межсетевой экран - Правила NAT"
@@ -324,8 +350,8 @@ msgstr "Перенаправление"
msgid "Forward to"
msgstr "Перенаправлять на"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:436
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:608
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:383
msgid "Friday"
msgstr "Пятница"
@@ -356,13 +382,13 @@ msgstr "Из %s в <var>это устройство</var> с источнико
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr "Из %s в <var>это устройство</var> с источниками %s and %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:93
msgid "From %{ipaddr?:any host} %{port?with source %{port}}"
msgstr "Из %{ipaddr?:любой хост} %{port?с источником %{port}}"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
#: 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/root/usr/share/luci/menu.d/luci-app-firewall.json:16
@@ -430,10 +456,39 @@ msgstr "Внутренний порт"
msgid "Internal zone"
msgstr "Внутренняя зона"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:471
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:553
+msgid "Invalid DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:581
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:355
+msgid "Invalid limit value"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:586
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:360
+msgid "Limit burst"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Ограничить журнал сообщений"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:558
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+msgid "Limit matching"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:559
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:333
+msgid "Limits traffic matching to the specified rate."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:275
msgid "Loopback source IP"
msgstr ""
@@ -446,7 +501,7 @@ msgstr "MAC"
msgid "MACs"
msgstr "MAC-адреса"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
msgstr ""
"MASQUERADE — автоматически переписывать на IP-адрес исходящего интерфейса"
@@ -461,18 +516,22 @@ msgstr "Маскарадинг"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:133
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:174
msgid "Match"
msgstr "Входящий трафик"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:84
msgid ""
"Match %{protocol?%{family} %{protocol} traffic:any %{family} traffic} %{mark?"
-"with firewall mark %{mark}}"
+"with firewall mark %{mark}} %{limit?limited to %{limit}}"
msgstr ""
"Соответствует %{protocol?%{family} %{protocol} трафику:любому %{family} "
"трафику} %{mark?с меткой брандмауэра %{mark}}"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:517
+msgid "Match DSCP"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:288
msgid "Match ICMP type"
msgstr "Соответствовать ICMP типу"
@@ -481,24 +540,24 @@ msgstr "Соответствовать ICMP типу"
msgid "Match device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:239
msgid "Match forwarded traffic directed at the given IP address."
msgstr ""
"Соответствие перенаправляемого трафика, направленного на заданный IP-адрес."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:252
msgid ""
"Match forwarded traffic directed at the given destination port or port range."
msgstr ""
"Соответствие перенаправляемого трафика, направленного на заданный порт "
"назначения или диапазон портов."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
msgid "Match forwarded traffic from this IP or range."
msgstr ""
"Соответствие перенаправляемого трафика от данного IP-адреса или диапазона."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:228
msgid ""
"Match forwarded traffic originating from the given source port or port range."
msgstr ""
@@ -506,7 +565,7 @@ msgstr ""
"источника или диапазона портов."
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match helper"
msgstr ""
@@ -519,43 +578,57 @@ msgstr ""
"перенаправляться на внутренний порт внутреннего IP-адреса (см. ниже)"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:302
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:315
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:501
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
msgid "Match mark"
msgstr "Соответствие метки"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match traffic using the specified connection tracking helper."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:303
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:502
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:317
msgid "Matches a specific firewall mark or a range of different marks."
msgstr ""
"Соответствие определённой метке брандмауэра или диапазона различных меток."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:311
msgid "Matches forwarded traffic using the specified outbound network device."
msgstr ""
"Соответствие перенаправляемого трафика, использующего указанное исходящее "
"сетевое устройство."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:432
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:518
+msgid "Matches traffic carrying the specified DSCP marking."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:587
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:361
+msgid ""
+"Maximum initial number of packets to match: this number gets recharged by "
+"one every time the limit specified above is not reached, up to this number."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:604
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
msgid "Monday"
msgstr "Понедельник"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:442
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:614
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:389
msgid "Month Days"
msgstr "Дни месяца"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:156
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:157
#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
msgid "NAT Rules"
msgstr "Правила NAT"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:155
msgid ""
"NAT rules allow fine grained control over the source IP to use for outbound "
"or forwarded traffic."
@@ -565,7 +638,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:129
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:210
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Имя"
@@ -598,11 +671,11 @@ msgstr ""
"диапазона портов клиентского хоста"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:309
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
msgid "Outbound device"
msgstr "Исходящее устройство"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:206
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:207
msgid "Outbound zone"
msgstr "Исходящая зона"
@@ -611,9 +684,9 @@ msgstr "Исходящая зона"
msgid "Output"
msgstr "Исходящий трафик"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:423
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:355
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:595
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:369
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
"Передаёт дополнительные аргументы таблице iptables. Используйте с "
@@ -648,7 +721,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:162
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:275
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:194
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:195
msgid "Protocol"
msgstr "Протокол"
@@ -693,33 +766,33 @@ msgstr "Использовать маскарадинг только для ук
msgid "Restrict to address family"
msgstr "Использовать протокол"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
msgid "Rewrite IP address"
msgstr "IP-адрес для перезаписи"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:270
msgid "Rewrite matched traffic to the specified source IP address."
msgstr "Перезаписать соответствующий трафик на указанный IP-адрес источника."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:300
msgid "Rewrite matched traffic to the specified source port or port range."
msgstr ""
"Перезаписать соответствующий трафик на указанный порт источника или диапазон "
"портов."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
msgid "Rewrite port"
msgstr "Порт для перезаписи"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:184
msgid "Rewrite to"
msgstr "Перезаписать"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:115
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:116
msgid "Rewrite to %{ipaddr?%{port?%{ipaddr}, %{port}:%{ipaddr}}:%{port}}"
msgstr "Перезаписать на %{ipaddr?%{port?%{ipaddr}, %{port}:%{ipaddr}}:%{port}}"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:122
msgid "Rewrite to outbound device IP"
msgstr "Перезаписать на IP-адрес исходящего устройства"
@@ -727,15 +800,25 @@ msgstr "Перезаписать на IP-адрес исходящего уст
msgid "Routing/NAT Offloading"
msgstr "Маршрутизация/NAT offloading"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:264
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
msgid "SNAT - Rewrite to specific source IP or port"
msgstr "SNAT — перезаписать на указанный IP-адрес источника или порт"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:437
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:609
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:384
msgid "Saturday"
msgstr "Суббота"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid "Set mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid ""
+"Set the given mark value on established connections. Format is value[/mask]. "
+"If a mask is specified then only those bits set in the mask are modified."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr "Программная реализация offloading для маршрутизации/NAT"
@@ -745,7 +828,7 @@ msgid "Software flow offloading"
msgstr "Программный flow offloading"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:213
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
msgid "Source IP address"
msgstr "IP-адрес источника"
@@ -760,7 +843,7 @@ msgstr "Адрес источника"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:207
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
msgid "Source port"
msgstr "Порт источника"
@@ -781,28 +864,28 @@ msgid ""
"reflected traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:461
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:371
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:633
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:408
msgid "Start Date (yyyy-mm-dd)"
msgstr "Дата начала (год-мес-день)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:453
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:363
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:625
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:400
msgid "Start Time (hh.mm.ss)"
msgstr "Время начала (чч.мм.сс)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:465
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:375
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:637
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:412
msgid "Stop Date (yyyy-mm-dd)"
msgstr "Дата окончания (год-мес-день)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:457
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:367
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:629
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:404
msgid "Stop Time (hh.mm.ss)"
msgstr "Время окончания (чч.мм.сс)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:431
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:603
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:378
msgid "Sunday"
msgstr "Воскресенье"
@@ -845,18 +928,18 @@ msgstr ""
"различными сетями внутри зоны. <em>'Использовать сети'</em> указывает, какие "
"доступные сети являются членами этой зоны."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:435
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:607
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:382
msgid "Thursday"
msgstr "Четверг"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:164
msgid "Time Restrictions"
msgstr "Временные ограничения"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:469
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:641
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:416
msgid "Time in UTC"
msgstr "Время UTC"
@@ -876,7 +959,7 @@ msgstr "К %s на <var>этом устройстве</var>"
msgid "To %s, %s in %s"
msgstr "К %s, %s в %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:102
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:103
msgid ""
"To %{ipaddr?:any destination} %{port?at %{port}} %{zone?via zone %{zone}} "
"%{device?egress device %{device}}"
@@ -884,7 +967,7 @@ msgstr ""
"На %{ipaddr?:любой адрес назначения} %{port?порт %{port}} %{zone?через зону "
"%{zone}} %{device?исходящее устройство %{device}}"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Tracking helper"
msgstr ""
@@ -903,8 +986,8 @@ msgstr ""
"зонами, например, запрет трафика между некоторыми хостами или открытие WAN-"
"портов маршрутизатора."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:605
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:380
msgid "Tuesday"
msgstr "Вторник"
@@ -913,12 +996,12 @@ msgid "Unable to save contents: %s"
msgstr "Невозможно сохранить содержимое: %s"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:299
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:419
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:498
msgid "Unknown or not installed conntrack helper \"%s\""
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:171
msgid "Unnamed NAT"
msgstr "NAT без имени"
@@ -968,16 +1051,24 @@ msgstr "Через %s"
msgid "Via %s at %s"
msgstr "Через %s, %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:434
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:606
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:381
msgid "Wednesday"
msgstr "Среда"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:426
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:598
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:373
msgid "Week Days"
msgstr "Дни недели"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+msgid "XOR firewall mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid "XOR mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "Зона ⇒ Перенаправления"
@@ -1004,12 +1095,13 @@ msgstr "принимать"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:376
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:382
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:399
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:406
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:231
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:242
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:478
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:485
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:521
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:255
msgid "any"
msgstr "любой"
@@ -1032,6 +1124,10 @@ msgstr "любой IP-адрес маршрутизатора"
msgid "any zone"
msgstr "любой зоны"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:396
+msgid "apply firewall mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:395
msgid "assign conntrack helper"
msgstr ""
@@ -1040,8 +1136,8 @@ msgstr ""
msgid "day"
msgstr "день"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:273
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:303
msgid "do not rewrite"
msgstr "не перезаписывать"
@@ -1100,12 +1196,21 @@ msgstr "тип"
msgid "types"
msgstr "типы"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:322
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:562
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+msgid "unlimited"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:238
msgid "unspecified"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "valid firewall mark"
msgstr "верная метка брандмауэра"
diff --git a/applications/luci-app-firewall/po/sk/firewall.po b/applications/luci-app-firewall/po/sk/firewall.po
index 43414cb6b0..ad80268fec 100644
--- a/applications/luci-app-firewall/po/sk/firewall.po
+++ b/applications/luci-app-firewall/po/sk/firewall.po
@@ -36,11 +36,11 @@ msgstr ""
msgid "<var>%s</var> and limit to %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:280
msgid "A rewrite IP must be specified!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:267
msgid "ACCEPT - Disable address rewriting"
msgstr ""
@@ -58,7 +58,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:224
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:388
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:262
msgid "Action"
msgstr "Akcia"
@@ -77,7 +77,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr ""
@@ -95,18 +95,29 @@ msgid "Allow forward to <em>destination zones</em>:"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:198
msgid "Any"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:430
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:446
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:340
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:602
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:618
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:377
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:393
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid ""
+"Apply a bitwise XOR of the given value and the existing mark value on "
+"established connections. Format is value[/mask]. If a mask is specified then "
+"those bits set in the mask are zeroed out."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "Apply the given DSCP class or value to established connections."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Assign the specified connection tracking helper to matched traffic."
msgstr ""
@@ -154,7 +165,19 @@ msgid ""
"each firewall restart, right after the default ruleset has been loaded."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:398
+msgid "DSCP classification"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:466
+msgid "DSCP mark required"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
msgid "Destination IP address"
msgstr ""
@@ -163,7 +186,7 @@ msgid "Destination address"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:379
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
msgid "Destination port"
msgstr ""
@@ -193,7 +216,7 @@ msgid ""
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:125
msgid "Do not rewrite"
msgstr ""
@@ -215,7 +238,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:157
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:230
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:189
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:190
msgid "Enable"
msgstr ""
@@ -232,7 +255,10 @@ msgid "Enable logging on this zone"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "Expecting: %s"
msgstr ""
@@ -252,9 +278,9 @@ msgstr ""
msgid "External port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:422
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:594
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:368
msgid "Extra arguments"
msgstr ""
@@ -278,7 +304,7 @@ msgstr ""
msgid "Firewall - Custom Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
msgid "Firewall - NAT Rules"
msgstr ""
@@ -303,8 +329,8 @@ msgstr ""
msgid "Forward to"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:436
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:608
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:383
msgid "Friday"
msgstr ""
@@ -335,13 +361,13 @@ msgstr ""
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:93
msgid "From %{ipaddr?:any host} %{port?with source %{port}}"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
#: 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/root/usr/share/luci/menu.d/luci-app-firewall.json:16
@@ -409,10 +435,39 @@ msgstr ""
msgid "Internal zone"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:471
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:553
+msgid "Invalid DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:581
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:355
+msgid "Invalid limit value"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:586
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:360
+msgid "Limit burst"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:558
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+msgid "Limit matching"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:559
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:333
+msgid "Limits traffic matching to the specified rate."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:275
msgid "Loopback source IP"
msgstr ""
@@ -425,7 +480,7 @@ msgstr "MAC"
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
msgstr ""
@@ -439,14 +494,18 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:133
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:174
msgid "Match"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:84
msgid ""
"Match %{protocol?%{family} %{protocol} traffic:any %{family} traffic} %{mark?"
-"with firewall mark %{mark}}"
+"with firewall mark %{mark}} %{limit?limited to %{limit}}"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:517
+msgid "Match DSCP"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:288
@@ -457,26 +516,26 @@ msgstr ""
msgid "Match device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:239
msgid "Match forwarded traffic directed at the given IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:252
msgid ""
"Match forwarded traffic directed at the given destination port or port range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
msgid "Match forwarded traffic from this IP or range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:228
msgid ""
"Match forwarded traffic originating from the given source port or port range."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match helper"
msgstr ""
@@ -487,40 +546,54 @@ msgid ""
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:302
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:315
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:501
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
msgid "Match mark"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match traffic using the specified connection tracking helper."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:303
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:502
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:317
msgid "Matches a specific firewall mark or a range of different marks."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:311
msgid "Matches forwarded traffic using the specified outbound network device."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:432
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:518
+msgid "Matches traffic carrying the specified DSCP marking."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:587
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:361
+msgid ""
+"Maximum initial number of packets to match: this number gets recharged by "
+"one every time the limit specified above is not reached, up to this number."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:604
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
msgid "Monday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:442
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:614
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:389
msgid "Month Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:156
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:157
#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
msgid "NAT Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:155
msgid ""
"NAT rules allow fine grained control over the source IP to use for outbound "
"or forwarded traffic."
@@ -528,7 +601,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:129
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:210
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr ""
@@ -556,11 +629,11 @@ msgid ""
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:309
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
msgid "Outbound device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:206
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:207
msgid "Outbound zone"
msgstr ""
@@ -569,9 +642,9 @@ msgstr ""
msgid "Output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:423
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:355
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:595
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:369
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
@@ -597,7 +670,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:162
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:275
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:194
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:195
msgid "Protocol"
msgstr ""
@@ -639,31 +712,31 @@ msgstr ""
msgid "Restrict to address family"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
msgid "Rewrite IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:270
msgid "Rewrite matched traffic to the specified source IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:300
msgid "Rewrite matched traffic to the specified source port or port range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
msgid "Rewrite port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:184
msgid "Rewrite to"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:115
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:116
msgid "Rewrite to %{ipaddr?%{port?%{ipaddr}, %{port}:%{ipaddr}}:%{port}}"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:122
msgid "Rewrite to outbound device IP"
msgstr ""
@@ -671,15 +744,25 @@ msgstr ""
msgid "Routing/NAT Offloading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:264
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
msgid "SNAT - Rewrite to specific source IP or port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:437
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:609
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:384
msgid "Saturday"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid "Set mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid ""
+"Set the given mark value on established connections. Format is value[/mask]. "
+"If a mask is specified then only those bits set in the mask are modified."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr ""
@@ -689,7 +772,7 @@ msgid "Software flow offloading"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:213
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
msgid "Source IP address"
msgstr ""
@@ -704,7 +787,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:207
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
msgid "Source port"
msgstr ""
@@ -725,28 +808,28 @@ msgid ""
"reflected traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:461
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:371
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:633
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:408
msgid "Start Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:453
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:363
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:625
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:400
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:465
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:375
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:637
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:412
msgid "Stop Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:457
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:367
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:629
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:404
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:431
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:603
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:378
msgid "Sunday"
msgstr ""
@@ -776,18 +859,18 @@ msgid ""
"networks</em> specifies which available networks are members of this zone."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:435
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:607
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:382
msgid "Thursday"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:164
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:469
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:641
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:416
msgid "Time in UTC"
msgstr ""
@@ -807,13 +890,13 @@ msgstr ""
msgid "To %s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:102
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:103
msgid ""
"To %{ipaddr?:any destination} %{port?at %{port}} %{zone?via zone %{zone}} "
"%{device?egress device %{device}}"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Tracking helper"
msgstr ""
@@ -829,8 +912,8 @@ msgid ""
"the router."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:605
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:380
msgid "Tuesday"
msgstr ""
@@ -839,12 +922,12 @@ msgid "Unable to save contents: %s"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:299
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:419
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:498
msgid "Unknown or not installed conntrack helper \"%s\""
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:171
msgid "Unnamed NAT"
msgstr ""
@@ -890,16 +973,24 @@ msgstr ""
msgid "Via %s at %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:434
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:606
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:381
msgid "Wednesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:426
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:598
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:373
msgid "Week Days"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+msgid "XOR firewall mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid "XOR mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr ""
@@ -926,12 +1017,13 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:376
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:382
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:399
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:406
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:231
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:242
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:478
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:485
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:521
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:255
msgid "any"
msgstr ""
@@ -954,6 +1046,10 @@ msgstr ""
msgid "any zone"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:396
+msgid "apply firewall mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:395
msgid "assign conntrack helper"
msgstr ""
@@ -962,8 +1058,8 @@ msgstr ""
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:273
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:303
msgid "do not rewrite"
msgstr ""
@@ -1022,11 +1118,20 @@ msgstr ""
msgid "types"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:322
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:562
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+msgid "unlimited"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:238
msgid "unspecified"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "valid firewall mark"
msgstr ""
diff --git a/applications/luci-app-firewall/po/sv/firewall.po b/applications/luci-app-firewall/po/sv/firewall.po
index 0de443ff43..9f94584f9d 100644
--- a/applications/luci-app-firewall/po/sv/firewall.po
+++ b/applications/luci-app-firewall/po/sv/firewall.po
@@ -36,11 +36,11 @@ msgstr "<var>%d</var> pkt. per <var>%s</var>, brustna <var>%d</var> pkt."
msgid "<var>%s</var> and limit to %s"
msgstr "<var>%s</var> och gränsen till %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:280
msgid "A rewrite IP must be specified!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:267
msgid "ACCEPT - Disable address rewriting"
msgstr ""
@@ -58,7 +58,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:224
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:388
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:262
msgid "Action"
msgstr "Åtgärd"
@@ -77,7 +77,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr "Avancerade inställningar"
@@ -95,18 +95,29 @@ msgid "Allow forward to <em>destination zones</em>:"
msgstr "Till vidarebefordring till <em>destinationszonerna:</em>:"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:198
msgid "Any"
msgstr "Något"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:430
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:446
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:340
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:602
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:618
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:377
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:393
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid ""
+"Apply a bitwise XOR of the given value and the existing mark value on "
+"established connections. Format is value[/mask]. If a mask is specified then "
+"those bits set in the mask are zeroed out."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "Apply the given DSCP class or value to established connections."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Assign the specified connection tracking helper to matched traffic."
msgstr ""
@@ -154,7 +165,19 @@ msgid ""
"each firewall restart, right after the default ruleset has been loaded."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:398
+msgid "DSCP classification"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:466
+msgid "DSCP mark required"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
msgid "Destination IP address"
msgstr "Destinationens IP-adress"
@@ -163,7 +186,7 @@ msgid "Destination address"
msgstr "Destinationens adress"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:379
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
msgid "Destination port"
msgstr "Destinationsport"
@@ -193,7 +216,7 @@ msgid ""
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:125
msgid "Do not rewrite"
msgstr "Skriv inte om igen"
@@ -215,7 +238,7 @@ msgstr "Släpp ogiltiga paket"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:157
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:230
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:189
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:190
msgid "Enable"
msgstr "Aktivera"
@@ -232,7 +255,10 @@ msgid "Enable logging on this zone"
msgstr "Aktivera loggning i den här zonen"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "Expecting: %s"
msgstr ""
@@ -252,9 +278,9 @@ msgstr "Extern IP-adress"
msgid "External port"
msgstr "Extern port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:422
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:594
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:368
msgid "Extra arguments"
msgstr "Extra argument"
@@ -278,7 +304,7 @@ msgstr "Brandvägg"
msgid "Firewall - Custom Rules"
msgstr "Brandvägg - Anpassade regler"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
msgid "Firewall - NAT Rules"
msgstr ""
@@ -303,8 +329,8 @@ msgstr "Vidarebefordra"
msgid "Forward to"
msgstr "Vidarebefordra till"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:436
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:608
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:383
msgid "Friday"
msgstr "Fredag"
@@ -335,13 +361,13 @@ msgstr ""
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:93
msgid "From %{ipaddr?:any host} %{port?with source %{port}}"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
#: 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/root/usr/share/luci/menu.d/luci-app-firewall.json:16
@@ -409,10 +435,39 @@ msgstr "Intern port"
msgid "Internal zone"
msgstr "Intern zon"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:471
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:553
+msgid "Invalid DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:581
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:355
+msgid "Invalid limit value"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:586
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:360
+msgid "Limit burst"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Begränsa loggmeddelanden"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:558
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+msgid "Limit matching"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:559
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:333
+msgid "Limits traffic matching to the specified rate."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:275
msgid "Loopback source IP"
msgstr ""
@@ -425,7 +480,7 @@ msgstr "MAC"
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
msgstr ""
@@ -439,14 +494,18 @@ msgstr "Maskering"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:133
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:174
msgid "Match"
msgstr "Matcha"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:84
msgid ""
"Match %{protocol?%{family} %{protocol} traffic:any %{family} traffic} %{mark?"
-"with firewall mark %{mark}}"
+"with firewall mark %{mark}} %{limit?limited to %{limit}}"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:517
+msgid "Match DSCP"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:288
@@ -457,26 +516,26 @@ msgstr "Matchar ICMP-typ"
msgid "Match device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:239
msgid "Match forwarded traffic directed at the given IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:252
msgid ""
"Match forwarded traffic directed at the given destination port or port range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
msgid "Match forwarded traffic from this IP or range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:228
msgid ""
"Match forwarded traffic originating from the given source port or port range."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match helper"
msgstr ""
@@ -489,40 +548,54 @@ msgstr ""
"portens räckvidd på den här värden"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:302
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:315
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:501
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
msgid "Match mark"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match traffic using the specified connection tracking helper."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:303
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:502
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:317
msgid "Matches a specific firewall mark or a range of different marks."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:311
msgid "Matches forwarded traffic using the specified outbound network device."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:432
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:518
+msgid "Matches traffic carrying the specified DSCP marking."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:587
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:361
+msgid ""
+"Maximum initial number of packets to match: this number gets recharged by "
+"one every time the limit specified above is not reached, up to this number."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:604
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
msgid "Monday"
msgstr "Måndag"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:442
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:614
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:389
msgid "Month Days"
msgstr "Dagar i månaden"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:156
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:157
#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
msgid "NAT Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:155
msgid ""
"NAT rules allow fine grained control over the source IP to use for outbound "
"or forwarded traffic."
@@ -530,7 +603,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:129
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:210
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Namn"
@@ -559,11 +632,11 @@ msgid ""
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:309
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
msgid "Outbound device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:206
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:207
msgid "Outbound zone"
msgstr ""
@@ -572,9 +645,9 @@ msgstr ""
msgid "Output"
msgstr "Utmatning"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:423
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:355
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:595
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:369
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
@@ -600,7 +673,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:162
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:275
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:194
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:195
msgid "Protocol"
msgstr "Protokoll"
@@ -642,31 +715,31 @@ msgstr ""
msgid "Restrict to address family"
msgstr "Begränsa till adressfamilj"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
msgid "Rewrite IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:270
msgid "Rewrite matched traffic to the specified source IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:300
msgid "Rewrite matched traffic to the specified source port or port range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
msgid "Rewrite port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:184
msgid "Rewrite to"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:115
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:116
msgid "Rewrite to %{ipaddr?%{port?%{ipaddr}, %{port}:%{ipaddr}}:%{port}}"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:122
msgid "Rewrite to outbound device IP"
msgstr ""
@@ -674,15 +747,25 @@ msgstr ""
msgid "Routing/NAT Offloading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:264
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
msgid "SNAT - Rewrite to specific source IP or port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:437
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:609
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:384
msgid "Saturday"
msgstr "Lördag"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid "Set mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid ""
+"Set the given mark value on established connections. Format is value[/mask]. "
+"If a mask is specified then only those bits set in the mask are modified."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr ""
@@ -692,7 +775,7 @@ msgid "Software flow offloading"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:213
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
msgid "Source IP address"
msgstr "IP-adress för källa"
@@ -707,7 +790,7 @@ msgstr "Adress för källkod"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:207
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
msgid "Source port"
msgstr ""
@@ -728,28 +811,28 @@ msgid ""
"reflected traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:461
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:371
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:633
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:408
msgid "Start Date (yyyy-mm-dd)"
msgstr "Startdatum (åååå-mm-dd)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:453
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:363
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:625
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:400
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:465
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:375
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:637
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:412
msgid "Stop Date (yyyy-mm-dd)"
msgstr "Stopptid (åååå-mm-dd)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:457
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:367
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:629
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:404
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:431
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:603
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:378
msgid "Sunday"
msgstr "Söndag"
@@ -779,18 +862,18 @@ msgid ""
"networks</em> specifies which available networks are members of this zone."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:435
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:607
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:382
msgid "Thursday"
msgstr "Torsdag"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:164
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:469
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:641
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:416
msgid "Time in UTC"
msgstr "Tid enligt UTC"
@@ -810,13 +893,13 @@ 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/htdocs/luci-static/resources/view/firewall/snats.js:102
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:103
msgid ""
"To %{ipaddr?:any destination} %{port?at %{port}} %{zone?via zone %{zone}} "
"%{device?egress device %{device}}"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Tracking helper"
msgstr ""
@@ -832,8 +915,8 @@ msgid ""
"the router."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:605
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:380
msgid "Tuesday"
msgstr "Tisdag"
@@ -842,12 +925,12 @@ msgid "Unable to save contents: %s"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:299
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:419
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:498
msgid "Unknown or not installed conntrack helper \"%s\""
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:171
msgid "Unnamed NAT"
msgstr ""
@@ -893,16 +976,24 @@ msgstr "Via %s"
msgid "Via %s at %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:434
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:606
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:381
msgid "Wednesday"
msgstr "Onsdag"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:426
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:598
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:373
msgid "Week Days"
msgstr "Veckodagar"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+msgid "XOR firewall mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid "XOR mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr ""
@@ -929,12 +1020,13 @@ msgstr "acceptera"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:376
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:382
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:399
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:406
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:231
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:242
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:478
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:485
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:521
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:255
msgid "any"
msgstr "något"
@@ -957,6 +1049,10 @@ msgstr ""
msgid "any zone"
msgstr "alla zoner"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:396
+msgid "apply firewall mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:395
msgid "assign conntrack helper"
msgstr ""
@@ -965,8 +1061,8 @@ msgstr ""
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:273
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:303
msgid "do not rewrite"
msgstr ""
@@ -1025,12 +1121,21 @@ msgstr "typ"
msgid "types"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:322
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:562
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+msgid "unlimited"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:238
msgid "unspecified"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "valid firewall mark"
msgstr ""
diff --git a/applications/luci-app-firewall/po/templates/firewall.pot b/applications/luci-app-firewall/po/templates/firewall.pot
index e7a252a524..445d0b1d70 100644
--- a/applications/luci-app-firewall/po/templates/firewall.pot
+++ b/applications/luci-app-firewall/po/templates/firewall.pot
@@ -25,11 +25,11 @@ msgstr ""
msgid "<var>%s</var> and limit to %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:280
msgid "A rewrite IP must be specified!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:267
msgid "ACCEPT - Disable address rewriting"
msgstr ""
@@ -47,7 +47,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:224
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:388
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:262
msgid "Action"
msgstr ""
@@ -66,7 +66,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr ""
@@ -84,18 +84,29 @@ msgid "Allow forward to <em>destination zones</em>:"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:198
msgid "Any"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:430
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:446
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:340
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:602
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:618
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:377
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:393
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid ""
+"Apply a bitwise XOR of the given value and the existing mark value on "
+"established connections. Format is value[/mask]. If a mask is specified then "
+"those bits set in the mask are zeroed out."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "Apply the given DSCP class or value to established connections."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Assign the specified connection tracking helper to matched traffic."
msgstr ""
@@ -143,7 +154,19 @@ msgid ""
"each firewall restart, right after the default ruleset has been loaded."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:398
+msgid "DSCP classification"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:466
+msgid "DSCP mark required"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
msgid "Destination IP address"
msgstr ""
@@ -152,7 +175,7 @@ msgid "Destination address"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:379
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
msgid "Destination port"
msgstr ""
@@ -182,7 +205,7 @@ msgid ""
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:125
msgid "Do not rewrite"
msgstr ""
@@ -204,7 +227,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:157
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:230
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:189
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:190
msgid "Enable"
msgstr ""
@@ -221,7 +244,10 @@ msgid "Enable logging on this zone"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "Expecting: %s"
msgstr ""
@@ -241,9 +267,9 @@ msgstr ""
msgid "External port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:422
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:594
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:368
msgid "Extra arguments"
msgstr ""
@@ -267,7 +293,7 @@ msgstr ""
msgid "Firewall - Custom Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
msgid "Firewall - NAT Rules"
msgstr ""
@@ -292,8 +318,8 @@ msgstr ""
msgid "Forward to"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:436
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:608
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:383
msgid "Friday"
msgstr ""
@@ -324,13 +350,13 @@ msgstr ""
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:93
msgid "From %{ipaddr?:any host} %{port?with source %{port}}"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
#: 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/root/usr/share/luci/menu.d/luci-app-firewall.json:16
@@ -398,10 +424,39 @@ msgstr ""
msgid "Internal zone"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:471
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:553
+msgid "Invalid DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:581
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:355
+msgid "Invalid limit value"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:586
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:360
+msgid "Limit burst"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:558
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+msgid "Limit matching"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:559
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:333
+msgid "Limits traffic matching to the specified rate."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:275
msgid "Loopback source IP"
msgstr ""
@@ -414,7 +469,7 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
msgstr ""
@@ -428,14 +483,18 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:133
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:174
msgid "Match"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:84
msgid ""
"Match %{protocol?%{family} %{protocol} traffic:any %{family} traffic} %{mark?"
-"with firewall mark %{mark}}"
+"with firewall mark %{mark}} %{limit?limited to %{limit}}"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:517
+msgid "Match DSCP"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:288
@@ -446,26 +505,26 @@ msgstr ""
msgid "Match device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:239
msgid "Match forwarded traffic directed at the given IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:252
msgid ""
"Match forwarded traffic directed at the given destination port or port range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
msgid "Match forwarded traffic from this IP or range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:228
msgid ""
"Match forwarded traffic originating from the given source port or port range."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match helper"
msgstr ""
@@ -476,40 +535,54 @@ msgid ""
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:302
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:315
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:501
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
msgid "Match mark"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match traffic using the specified connection tracking helper."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:303
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:502
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:317
msgid "Matches a specific firewall mark or a range of different marks."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:311
msgid "Matches forwarded traffic using the specified outbound network device."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:432
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:518
+msgid "Matches traffic carrying the specified DSCP marking."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:587
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:361
+msgid ""
+"Maximum initial number of packets to match: this number gets recharged by "
+"one every time the limit specified above is not reached, up to this number."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:604
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
msgid "Monday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:442
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:614
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:389
msgid "Month Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:156
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:157
#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
msgid "NAT Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:155
msgid ""
"NAT rules allow fine grained control over the source IP to use for outbound "
"or forwarded traffic."
@@ -517,7 +590,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:129
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:210
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr ""
@@ -545,11 +618,11 @@ msgid ""
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:309
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
msgid "Outbound device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:206
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:207
msgid "Outbound zone"
msgstr ""
@@ -558,9 +631,9 @@ msgstr ""
msgid "Output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:423
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:355
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:595
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:369
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
@@ -586,7 +659,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:162
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:275
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:194
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:195
msgid "Protocol"
msgstr ""
@@ -628,31 +701,31 @@ msgstr ""
msgid "Restrict to address family"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
msgid "Rewrite IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:270
msgid "Rewrite matched traffic to the specified source IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:300
msgid "Rewrite matched traffic to the specified source port or port range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
msgid "Rewrite port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:184
msgid "Rewrite to"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:115
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:116
msgid "Rewrite to %{ipaddr?%{port?%{ipaddr}, %{port}:%{ipaddr}}:%{port}}"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:122
msgid "Rewrite to outbound device IP"
msgstr ""
@@ -660,15 +733,25 @@ msgstr ""
msgid "Routing/NAT Offloading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:264
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
msgid "SNAT - Rewrite to specific source IP or port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:437
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:609
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:384
msgid "Saturday"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid "Set mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid ""
+"Set the given mark value on established connections. Format is value[/mask]. "
+"If a mask is specified then only those bits set in the mask are modified."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr ""
@@ -678,7 +761,7 @@ msgid "Software flow offloading"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:213
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
msgid "Source IP address"
msgstr ""
@@ -693,7 +776,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:207
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
msgid "Source port"
msgstr ""
@@ -714,28 +797,28 @@ msgid ""
"reflected traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:461
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:371
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:633
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:408
msgid "Start Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:453
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:363
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:625
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:400
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:465
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:375
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:637
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:412
msgid "Stop Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:457
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:367
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:629
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:404
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:431
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:603
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:378
msgid "Sunday"
msgstr ""
@@ -765,18 +848,18 @@ msgid ""
"networks</em> specifies which available networks are members of this zone."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:435
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:607
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:382
msgid "Thursday"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:164
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:469
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:641
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:416
msgid "Time in UTC"
msgstr ""
@@ -796,13 +879,13 @@ msgstr ""
msgid "To %s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:102
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:103
msgid ""
"To %{ipaddr?:any destination} %{port?at %{port}} %{zone?via zone %{zone}} "
"%{device?egress device %{device}}"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Tracking helper"
msgstr ""
@@ -818,8 +901,8 @@ msgid ""
"the router."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:605
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:380
msgid "Tuesday"
msgstr ""
@@ -828,12 +911,12 @@ msgid "Unable to save contents: %s"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:299
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:419
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:498
msgid "Unknown or not installed conntrack helper \"%s\""
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:171
msgid "Unnamed NAT"
msgstr ""
@@ -879,16 +962,24 @@ msgstr ""
msgid "Via %s at %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:434
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:606
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:381
msgid "Wednesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:426
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:598
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:373
msgid "Week Days"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+msgid "XOR firewall mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid "XOR mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr ""
@@ -915,12 +1006,13 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:376
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:382
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:399
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:406
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:231
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:242
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:478
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:485
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:521
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:255
msgid "any"
msgstr ""
@@ -943,6 +1035,10 @@ msgstr ""
msgid "any zone"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:396
+msgid "apply firewall mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:395
msgid "assign conntrack helper"
msgstr ""
@@ -951,8 +1047,8 @@ msgstr ""
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:273
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:303
msgid "do not rewrite"
msgstr ""
@@ -1011,11 +1107,20 @@ msgstr ""
msgid "types"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:322
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:562
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+msgid "unlimited"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:238
msgid "unspecified"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "valid firewall mark"
msgstr ""
diff --git a/applications/luci-app-firewall/po/tr/firewall.po b/applications/luci-app-firewall/po/tr/firewall.po
index 5c07149698..f5bda6470c 100644
--- a/applications/luci-app-firewall/po/tr/firewall.po
+++ b/applications/luci-app-firewall/po/tr/firewall.po
@@ -36,11 +36,11 @@ msgstr ""
msgid "<var>%s</var> and limit to %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:280
msgid "A rewrite IP must be specified!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:267
msgid "ACCEPT - Disable address rewriting"
msgstr ""
@@ -58,7 +58,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:224
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:388
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:262
msgid "Action"
msgstr "Eylem"
@@ -77,7 +77,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr ""
@@ -95,18 +95,29 @@ msgid "Allow forward to <em>destination zones</em>:"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:198
msgid "Any"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:430
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:446
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:340
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:602
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:618
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:377
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:393
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid ""
+"Apply a bitwise XOR of the given value and the existing mark value on "
+"established connections. Format is value[/mask]. If a mask is specified then "
+"those bits set in the mask are zeroed out."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "Apply the given DSCP class or value to established connections."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Assign the specified connection tracking helper to matched traffic."
msgstr ""
@@ -154,7 +165,19 @@ msgid ""
"each firewall restart, right after the default ruleset has been loaded."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:398
+msgid "DSCP classification"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:466
+msgid "DSCP mark required"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
msgid "Destination IP address"
msgstr ""
@@ -163,7 +186,7 @@ msgid "Destination address"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:379
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
msgid "Destination port"
msgstr ""
@@ -193,7 +216,7 @@ msgid ""
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:125
msgid "Do not rewrite"
msgstr ""
@@ -215,7 +238,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:157
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:230
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:189
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:190
msgid "Enable"
msgstr ""
@@ -232,7 +255,10 @@ msgid "Enable logging on this zone"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "Expecting: %s"
msgstr ""
@@ -252,9 +278,9 @@ msgstr ""
msgid "External port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:422
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:594
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:368
msgid "Extra arguments"
msgstr ""
@@ -278,7 +304,7 @@ msgstr ""
msgid "Firewall - Custom Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
msgid "Firewall - NAT Rules"
msgstr ""
@@ -303,8 +329,8 @@ msgstr ""
msgid "Forward to"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:436
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:608
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:383
msgid "Friday"
msgstr ""
@@ -335,13 +361,13 @@ msgstr ""
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:93
msgid "From %{ipaddr?:any host} %{port?with source %{port}}"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
#: 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/root/usr/share/luci/menu.d/luci-app-firewall.json:16
@@ -409,10 +435,39 @@ msgstr ""
msgid "Internal zone"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:471
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:553
+msgid "Invalid DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:581
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:355
+msgid "Invalid limit value"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:586
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:360
+msgid "Limit burst"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:558
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+msgid "Limit matching"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:559
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:333
+msgid "Limits traffic matching to the specified rate."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:275
msgid "Loopback source IP"
msgstr ""
@@ -425,7 +480,7 @@ msgstr "MAC"
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
msgstr ""
@@ -439,14 +494,18 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:133
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:174
msgid "Match"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:84
msgid ""
"Match %{protocol?%{family} %{protocol} traffic:any %{family} traffic} %{mark?"
-"with firewall mark %{mark}}"
+"with firewall mark %{mark}} %{limit?limited to %{limit}}"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:517
+msgid "Match DSCP"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:288
@@ -457,26 +516,26 @@ msgstr ""
msgid "Match device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:239
msgid "Match forwarded traffic directed at the given IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:252
msgid ""
"Match forwarded traffic directed at the given destination port or port range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
msgid "Match forwarded traffic from this IP or range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:228
msgid ""
"Match forwarded traffic originating from the given source port or port range."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match helper"
msgstr ""
@@ -487,40 +546,54 @@ msgid ""
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:302
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:315
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:501
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
msgid "Match mark"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match traffic using the specified connection tracking helper."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:303
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:502
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:317
msgid "Matches a specific firewall mark or a range of different marks."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:311
msgid "Matches forwarded traffic using the specified outbound network device."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:432
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:518
+msgid "Matches traffic carrying the specified DSCP marking."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:587
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:361
+msgid ""
+"Maximum initial number of packets to match: this number gets recharged by "
+"one every time the limit specified above is not reached, up to this number."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:604
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
msgid "Monday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:442
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:614
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:389
msgid "Month Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:156
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:157
#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
msgid "NAT Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:155
msgid ""
"NAT rules allow fine grained control over the source IP to use for outbound "
"or forwarded traffic."
@@ -528,7 +601,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:129
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:210
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr ""
@@ -556,11 +629,11 @@ msgid ""
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:309
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
msgid "Outbound device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:206
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:207
msgid "Outbound zone"
msgstr ""
@@ -569,9 +642,9 @@ msgstr ""
msgid "Output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:423
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:355
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:595
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:369
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
@@ -597,7 +670,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:162
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:275
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:194
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:195
msgid "Protocol"
msgstr ""
@@ -639,31 +712,31 @@ msgstr ""
msgid "Restrict to address family"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
msgid "Rewrite IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:270
msgid "Rewrite matched traffic to the specified source IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:300
msgid "Rewrite matched traffic to the specified source port or port range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
msgid "Rewrite port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:184
msgid "Rewrite to"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:115
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:116
msgid "Rewrite to %{ipaddr?%{port?%{ipaddr}, %{port}:%{ipaddr}}:%{port}}"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:122
msgid "Rewrite to outbound device IP"
msgstr ""
@@ -671,15 +744,25 @@ msgstr ""
msgid "Routing/NAT Offloading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:264
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
msgid "SNAT - Rewrite to specific source IP or port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:437
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:609
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:384
msgid "Saturday"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid "Set mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid ""
+"Set the given mark value on established connections. Format is value[/mask]. "
+"If a mask is specified then only those bits set in the mask are modified."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr ""
@@ -689,7 +772,7 @@ msgid "Software flow offloading"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:213
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
msgid "Source IP address"
msgstr ""
@@ -704,7 +787,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:207
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
msgid "Source port"
msgstr ""
@@ -725,28 +808,28 @@ msgid ""
"reflected traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:461
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:371
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:633
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:408
msgid "Start Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:453
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:363
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:625
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:400
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:465
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:375
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:637
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:412
msgid "Stop Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:457
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:367
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:629
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:404
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:431
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:603
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:378
msgid "Sunday"
msgstr ""
@@ -776,18 +859,18 @@ msgid ""
"networks</em> specifies which available networks are members of this zone."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:435
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:607
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:382
msgid "Thursday"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:164
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:469
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:641
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:416
msgid "Time in UTC"
msgstr ""
@@ -807,13 +890,13 @@ msgstr ""
msgid "To %s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:102
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:103
msgid ""
"To %{ipaddr?:any destination} %{port?at %{port}} %{zone?via zone %{zone}} "
"%{device?egress device %{device}}"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Tracking helper"
msgstr ""
@@ -829,8 +912,8 @@ msgid ""
"the router."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:605
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:380
msgid "Tuesday"
msgstr ""
@@ -839,12 +922,12 @@ msgid "Unable to save contents: %s"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:299
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:419
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:498
msgid "Unknown or not installed conntrack helper \"%s\""
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:171
msgid "Unnamed NAT"
msgstr ""
@@ -890,16 +973,24 @@ msgstr ""
msgid "Via %s at %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:434
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:606
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:381
msgid "Wednesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:426
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:598
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:373
msgid "Week Days"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+msgid "XOR firewall mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid "XOR mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr ""
@@ -926,12 +1017,13 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:376
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:382
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:399
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:406
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:231
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:242
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:478
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:485
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:521
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:255
msgid "any"
msgstr ""
@@ -954,6 +1046,10 @@ msgstr ""
msgid "any zone"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:396
+msgid "apply firewall mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:395
msgid "assign conntrack helper"
msgstr ""
@@ -962,8 +1058,8 @@ msgstr ""
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:273
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:303
msgid "do not rewrite"
msgstr ""
@@ -1022,11 +1118,20 @@ msgstr ""
msgid "types"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:322
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:562
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+msgid "unlimited"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:238
msgid "unspecified"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "valid firewall mark"
msgstr ""
diff --git a/applications/luci-app-firewall/po/uk/firewall.po b/applications/luci-app-firewall/po/uk/firewall.po
index b709efef28..c51d575ae8 100644
--- a/applications/luci-app-firewall/po/uk/firewall.po
+++ b/applications/luci-app-firewall/po/uk/firewall.po
@@ -37,11 +37,11 @@ msgstr "<var>%d</var> пакетів за <var>%s</var>, підряд <var>%d</v
msgid "<var>%s</var> and limit to %s"
msgstr "<var>%s</var> з лімітом %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:280
msgid "A rewrite IP must be specified!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:267
msgid "ACCEPT - Disable address rewriting"
msgstr ""
@@ -59,7 +59,7 @@ msgstr "Приймати вихідний"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:224
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:388
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:262
msgid "Action"
msgstr "Дія"
@@ -84,7 +84,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr "Додаткові параметри"
@@ -102,18 +102,29 @@ msgid "Allow forward to <em>destination zones</em>:"
msgstr "Дозволити переспрямовування до <em>зон призначення</em>:"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:198
msgid "Any"
msgstr "Будь-який"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:430
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:446
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:340
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:602
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:618
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:377
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:393
msgid "Any day"
msgstr "Будь-який день"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid ""
+"Apply a bitwise XOR of the given value and the existing mark value on "
+"established connections. Format is value[/mask]. If a mask is specified then "
+"those bits set in the mask are zeroed out."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "Apply the given DSCP class or value to established connections."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Assign the specified connection tracking helper to matched traffic."
msgstr ""
@@ -172,7 +183,19 @@ msgstr ""
"виконуються після кожного перезавантаження брандмауера, відразу після "
"завантаження типового набору правил."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:398
+msgid "DSCP classification"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:466
+msgid "DSCP mark required"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
msgid "Destination IP address"
msgstr ""
@@ -181,7 +204,7 @@ msgid "Destination address"
msgstr "Адреса призначення"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:379
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
msgid "Destination port"
msgstr "Порт призначення"
@@ -214,7 +237,7 @@ msgstr ""
"зі станом відслідковування з'єднань <em>invalid</em>. Це може знадобитися "
"для складних налаштувань асиметричного маршруту."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:125
msgid "Do not rewrite"
msgstr ""
@@ -236,7 +259,7 @@ msgstr "Відкидати помилкові пакети"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:157
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:230
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:189
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:190
msgid "Enable"
msgstr "Увімкнути"
@@ -253,7 +276,10 @@ msgid "Enable logging on this zone"
msgstr "Увімкнути реєстрування у цій зоні"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "Expecting: %s"
msgstr ""
@@ -275,9 +301,9 @@ msgstr "Зовнішня IP-адреса"
msgid "External port"
msgstr "Зовнішній порт"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:422
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:594
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:368
msgid "Extra arguments"
msgstr "Додаткові аргументи"
@@ -301,7 +327,7 @@ msgstr "Брандмауер"
msgid "Firewall - Custom Rules"
msgstr "Брандмауер — Настроювані правила"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
msgid "Firewall - NAT Rules"
msgstr ""
@@ -326,8 +352,8 @@ msgstr "Переспрямовування"
msgid "Forward to"
msgstr "переспрямовування до"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:436
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:608
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:383
msgid "Friday"
msgstr "П'ятниця"
@@ -358,13 +384,13 @@ 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/snats.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:93
msgid "From %{ipaddr?:any host} %{port?with source %{port}}"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
#: 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/root/usr/share/luci/menu.d/luci-app-firewall.json:16
@@ -432,10 +458,39 @@ msgstr "Внутрішній порт"
msgid "Internal zone"
msgstr "Внутрішня зона"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:471
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:553
+msgid "Invalid DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:581
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:355
+msgid "Invalid limit value"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:586
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:360
+msgid "Limit burst"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Обмеження повідомлень журналу"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:558
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+msgid "Limit matching"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:559
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:333
+msgid "Limits traffic matching to the specified rate."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:275
msgid "Loopback source IP"
msgstr ""
@@ -448,7 +503,7 @@ msgstr "MAC-адреса"
msgid "MACs"
msgstr "MAC-адреси"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
msgstr ""
@@ -462,14 +517,18 @@ msgstr "Підміна"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:133
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:174
msgid "Match"
msgstr "Зіставляти"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:84
msgid ""
"Match %{protocol?%{family} %{protocol} traffic:any %{family} traffic} %{mark?"
-"with firewall mark %{mark}}"
+"with firewall mark %{mark}} %{limit?limited to %{limit}}"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:517
+msgid "Match DSCP"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:288
@@ -480,26 +539,26 @@ msgstr "Зіставляти ICMP типу"
msgid "Match device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:239
msgid "Match forwarded traffic directed at the given IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:252
msgid ""
"Match forwarded traffic directed at the given destination port or port range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
msgid "Match forwarded traffic from this IP or range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:228
msgid ""
"Match forwarded traffic originating from the given source port or port range."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match helper"
msgstr ""
@@ -512,40 +571,54 @@ msgstr ""
"діапазон портів цього вузла"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:302
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:315
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:501
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
msgid "Match mark"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match traffic using the specified connection tracking helper."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:303
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:502
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:317
msgid "Matches a specific firewall mark or a range of different marks."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:311
msgid "Matches forwarded traffic using the specified outbound network device."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:432
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:518
+msgid "Matches traffic carrying the specified DSCP marking."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:587
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:361
+msgid ""
+"Maximum initial number of packets to match: this number gets recharged by "
+"one every time the limit specified above is not reached, up to this number."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:604
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
msgid "Monday"
msgstr "Понеділок"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:442
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:614
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:389
msgid "Month Days"
msgstr "Дні місяця"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:156
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:157
#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
msgid "NAT Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:155
msgid ""
"NAT rules allow fine grained control over the source IP to use for outbound "
"or forwarded traffic."
@@ -553,7 +626,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:129
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:210
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Ім'я"
@@ -583,11 +656,11 @@ msgstr ""
"діапазоні портів вузла клієнта"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:309
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
msgid "Outbound device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:206
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:207
msgid "Outbound zone"
msgstr ""
@@ -596,9 +669,9 @@ msgstr ""
msgid "Output"
msgstr "Вихідний"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:423
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:355
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:595
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:369
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
"Передача додаткових аргументів для IPTables. Використовуйте з обережністю!"
@@ -632,7 +705,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:162
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:275
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:194
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:195
msgid "Protocol"
msgstr "Протокол"
@@ -675,31 +748,31 @@ msgstr "Обмежити підміну заданими підмережами
msgid "Restrict to address family"
msgstr "Обмежити сімейство протоколів"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
msgid "Rewrite IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:270
msgid "Rewrite matched traffic to the specified source IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:300
msgid "Rewrite matched traffic to the specified source port or port range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
msgid "Rewrite port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:184
msgid "Rewrite to"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:115
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:116
msgid "Rewrite to %{ipaddr?%{port?%{ipaddr}, %{port}:%{ipaddr}}:%{port}}"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:122
msgid "Rewrite to outbound device IP"
msgstr ""
@@ -707,15 +780,25 @@ msgstr ""
msgid "Routing/NAT Offloading"
msgstr "Розвантаження маршрутизації/NAT"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:264
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
msgid "SNAT - Rewrite to specific source IP or port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:437
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:609
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:384
msgid "Saturday"
msgstr "Субота"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid "Set mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid ""
+"Set the given mark value on established connections. Format is value[/mask]. "
+"If a mask is specified then only those bits set in the mask are modified."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr "Програмне розвантаження для маршрутизації/NAT"
@@ -725,7 +808,7 @@ msgid "Software flow offloading"
msgstr "Програмне розвантаження потоку"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:213
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
msgid "Source IP address"
msgstr "IP-адреса джерела"
@@ -740,7 +823,7 @@ msgstr "Адреса джерела"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:207
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
msgid "Source port"
msgstr "Порт джерела"
@@ -761,28 +844,28 @@ msgid ""
"reflected traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:461
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:371
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:633
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:408
msgid "Start Date (yyyy-mm-dd)"
msgstr "Дата початку (рррр-мм-дд)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:453
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:363
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:625
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:400
msgid "Start Time (hh.mm.ss)"
msgstr "Час початку (гг:хх:сс)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:465
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:375
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:637
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:412
msgid "Stop Date (yyyy-mm-dd)"
msgstr "Дата зупинки (рррр-мм-дд)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:457
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:367
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:629
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:404
msgid "Stop Time (hh.mm.ss)"
msgstr "Час зупинки (гг:хх:сс)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:431
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:603
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:378
msgid "Sunday"
msgstr "Неділя"
@@ -826,18 +909,18 @@ msgstr ""
"спрямовування трафіку між різними мережами в межах зони. Пункт <em>Покриті "
"мережі</em> визначає, які доступні мережі є членами цієї зони."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:435
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:607
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:382
msgid "Thursday"
msgstr "Четвер"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:164
msgid "Time Restrictions"
msgstr "Часові обмеження"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:469
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:641
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:416
msgid "Time in UTC"
msgstr "Час в UTC"
@@ -857,13 +940,13 @@ msgstr "%s на <var>цього пристрою</var>"
msgid "To %s, %s in %s"
msgstr "%s, %s у %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:102
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:103
msgid ""
"To %{ipaddr?:any destination} %{port?at %{port}} %{zone?via zone %{zone}} "
"%{device?egress device %{device}}"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Tracking helper"
msgstr ""
@@ -882,8 +965,8 @@ msgstr ""
"різними зонами, наприклад, відхиляти трафік між певними вузлами або відкрити "
"порти WAN на маршрутизаторі."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:605
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:380
msgid "Tuesday"
msgstr "Вівторок"
@@ -892,12 +975,12 @@ msgid "Unable to save contents: %s"
msgstr "Не вдалося зберегти вміст: %s"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:299
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:419
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:498
msgid "Unknown or not installed conntrack helper \"%s\""
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:171
msgid "Unnamed NAT"
msgstr ""
@@ -947,16 +1030,24 @@ msgstr "Через %s"
msgid "Via %s at %s"
msgstr "Через %s на %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:434
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:606
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:381
msgid "Wednesday"
msgstr "Середа"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:426
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:598
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:373
msgid "Week Days"
msgstr "Дні тижня"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+msgid "XOR firewall mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid "XOR mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "Зона ⇒ Переспрямовування"
@@ -983,12 +1074,13 @@ msgstr "приймати"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:376
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:382
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:399
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:406
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:231
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:242
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:478
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:485
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:521
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:255
msgid "any"
msgstr "будь-який"
@@ -1011,6 +1103,10 @@ msgstr "будь-який IP роутера"
msgid "any zone"
msgstr "будь-якій зоні"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:396
+msgid "apply firewall mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:395
msgid "assign conntrack helper"
msgstr ""
@@ -1019,8 +1115,8 @@ msgstr ""
msgid "day"
msgstr "день"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:273
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:303
msgid "do not rewrite"
msgstr ""
@@ -1079,12 +1175,21 @@ msgstr "типом"
msgid "types"
msgstr "типами"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:322
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:562
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+msgid "unlimited"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:238
msgid "unspecified"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "valid firewall mark"
msgstr ""
diff --git a/applications/luci-app-firewall/po/vi/firewall.po b/applications/luci-app-firewall/po/vi/firewall.po
index db3ec66ccb..0cfba4b3d4 100644
--- a/applications/luci-app-firewall/po/vi/firewall.po
+++ b/applications/luci-app-firewall/po/vi/firewall.po
@@ -40,11 +40,11 @@ msgstr ""
msgid "<var>%s</var> and limit to %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:280
msgid "A rewrite IP must be specified!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:267
msgid "ACCEPT - Disable address rewriting"
msgstr ""
@@ -62,7 +62,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:224
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:388
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:262
msgid "Action"
msgstr "Hành động"
@@ -81,7 +81,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr ""
@@ -99,18 +99,29 @@ msgid "Allow forward to <em>destination zones</em>:"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:198
msgid "Any"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:430
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:446
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:340
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:602
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:618
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:377
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:393
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid ""
+"Apply a bitwise XOR of the given value and the existing mark value on "
+"established connections. Format is value[/mask]. If a mask is specified then "
+"those bits set in the mask are zeroed out."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "Apply the given DSCP class or value to established connections."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Assign the specified connection tracking helper to matched traffic."
msgstr ""
@@ -158,7 +169,19 @@ msgid ""
"each firewall restart, right after the default ruleset has been loaded."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:398
+msgid "DSCP classification"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:466
+msgid "DSCP mark required"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
msgid "Destination IP address"
msgstr ""
@@ -167,7 +190,7 @@ msgid "Destination address"
msgstr "Địa chỉ điểm đến"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:379
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
msgid "Destination port"
msgstr "Cổng điểm đến"
@@ -198,7 +221,7 @@ msgid ""
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:125
msgid "Do not rewrite"
msgstr ""
@@ -220,7 +243,7 @@ msgstr "Bỏ qua nhưng gói không hợp lý"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:157
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:230
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:189
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:190
msgid "Enable"
msgstr "Kích hoạt"
@@ -238,7 +261,10 @@ msgid "Enable logging on this zone"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "Expecting: %s"
msgstr ""
@@ -258,9 +284,9 @@ msgstr ""
msgid "External port"
msgstr "External port"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:422
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:594
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:368
msgid "Extra arguments"
msgstr ""
@@ -284,7 +310,7 @@ msgstr "Firewall"
msgid "Firewall - Custom Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
msgid "Firewall - NAT Rules"
msgstr ""
@@ -309,8 +335,8 @@ msgstr ""
msgid "Forward to"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:436
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:608
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:383
msgid "Friday"
msgstr ""
@@ -341,13 +367,13 @@ msgstr ""
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:93
msgid "From %{ipaddr?:any host} %{port?with source %{port}}"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
#: 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/root/usr/share/luci/menu.d/luci-app-firewall.json:16
@@ -417,10 +443,39 @@ msgstr "External port"
msgid "Internal zone"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:471
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:553
+msgid "Invalid DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:581
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:355
+msgid "Invalid limit value"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:586
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:360
+msgid "Limit burst"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:558
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+msgid "Limit matching"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:559
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:333
+msgid "Limits traffic matching to the specified rate."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:275
msgid "Loopback source IP"
msgstr ""
@@ -433,7 +488,7 @@ msgstr "MAC"
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
msgstr ""
@@ -448,14 +503,18 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:133
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:174
msgid "Match"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:84
msgid ""
"Match %{protocol?%{family} %{protocol} traffic:any %{family} traffic} %{mark?"
-"with firewall mark %{mark}}"
+"with firewall mark %{mark}} %{limit?limited to %{limit}}"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:517
+msgid "Match DSCP"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:288
@@ -466,26 +525,26 @@ msgstr ""
msgid "Match device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:239
msgid "Match forwarded traffic directed at the given IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:252
msgid ""
"Match forwarded traffic directed at the given destination port or port range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
msgid "Match forwarded traffic from this IP or range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:228
msgid ""
"Match forwarded traffic originating from the given source port or port range."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match helper"
msgstr ""
@@ -496,40 +555,54 @@ msgid ""
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:302
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:315
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:501
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
msgid "Match mark"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match traffic using the specified connection tracking helper."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:303
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:502
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:317
msgid "Matches a specific firewall mark or a range of different marks."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:311
msgid "Matches forwarded traffic using the specified outbound network device."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:432
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:518
+msgid "Matches traffic carrying the specified DSCP marking."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:587
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:361
+msgid ""
+"Maximum initial number of packets to match: this number gets recharged by "
+"one every time the limit specified above is not reached, up to this number."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:604
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
msgid "Monday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:442
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:614
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:389
msgid "Month Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:156
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:157
#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
msgid "NAT Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:155
msgid ""
"NAT rules allow fine grained control over the source IP to use for outbound "
"or forwarded traffic."
@@ -537,7 +610,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:129
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:210
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr ""
@@ -565,11 +638,11 @@ msgid ""
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:309
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
msgid "Outbound device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:206
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:207
msgid "Outbound zone"
msgstr ""
@@ -578,9 +651,9 @@ msgstr ""
msgid "Output"
msgstr "Output"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:423
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:355
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:595
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:369
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
@@ -606,7 +679,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:162
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:275
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:194
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:195
msgid "Protocol"
msgstr "Giao thức"
@@ -648,31 +721,31 @@ msgstr ""
msgid "Restrict to address family"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
msgid "Rewrite IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:270
msgid "Rewrite matched traffic to the specified source IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:300
msgid "Rewrite matched traffic to the specified source port or port range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
msgid "Rewrite port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:184
msgid "Rewrite to"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:115
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:116
msgid "Rewrite to %{ipaddr?%{port?%{ipaddr}, %{port}:%{ipaddr}}:%{port}}"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:122
msgid "Rewrite to outbound device IP"
msgstr ""
@@ -680,15 +753,25 @@ msgstr ""
msgid "Routing/NAT Offloading"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:264
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
msgid "SNAT - Rewrite to specific source IP or port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:437
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:609
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:384
msgid "Saturday"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid "Set mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid ""
+"Set the given mark value on established connections. Format is value[/mask]. "
+"If a mask is specified then only those bits set in the mask are modified."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr ""
@@ -698,7 +781,7 @@ msgid "Software flow offloading"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:213
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
#, fuzzy
msgid "Source IP address"
msgstr "Đỉa chỉ MAC nguồn"
@@ -715,7 +798,7 @@ msgstr "Đỉa chỉ MAC nguồn"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:207
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
msgid "Source port"
msgstr "Cổng nguồn"
@@ -737,28 +820,28 @@ msgid ""
"reflected traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:461
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:371
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:633
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:408
msgid "Start Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:453
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:363
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:625
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:400
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:465
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:375
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:637
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:412
msgid "Stop Date (yyyy-mm-dd)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:457
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:367
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:629
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:404
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:431
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:603
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:378
msgid "Sunday"
msgstr ""
@@ -790,18 +873,18 @@ msgid ""
"networks</em> specifies which available networks are members of this zone."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:435
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:607
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:382
msgid "Thursday"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:164
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:469
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:641
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:416
msgid "Time in UTC"
msgstr ""
@@ -821,13 +904,13 @@ msgstr ""
msgid "To %s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:102
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:103
msgid ""
"To %{ipaddr?:any destination} %{port?at %{port}} %{zone?via zone %{zone}} "
"%{device?egress device %{device}}"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Tracking helper"
msgstr ""
@@ -843,8 +926,8 @@ msgid ""
"the router."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:605
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:380
msgid "Tuesday"
msgstr ""
@@ -853,12 +936,12 @@ msgid "Unable to save contents: %s"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:299
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:419
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:498
msgid "Unknown or not installed conntrack helper \"%s\""
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:171
msgid "Unnamed NAT"
msgstr ""
@@ -904,16 +987,24 @@ msgstr ""
msgid "Via %s at %s"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:434
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:606
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:381
msgid "Wednesday"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:426
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:598
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:373
msgid "Week Days"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+msgid "XOR firewall mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid "XOR mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr ""
@@ -940,12 +1031,13 @@ msgstr "chấp nhận"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:376
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:382
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:399
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:406
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:231
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:242
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:478
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:485
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:521
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:255
msgid "any"
msgstr ""
@@ -968,6 +1060,10 @@ msgstr ""
msgid "any zone"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:396
+msgid "apply firewall mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:395
msgid "assign conntrack helper"
msgstr ""
@@ -976,8 +1072,8 @@ msgstr ""
msgid "day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:273
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:303
msgid "do not rewrite"
msgstr ""
@@ -1036,11 +1132,20 @@ msgstr ""
msgid "types"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:322
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:562
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+msgid "unlimited"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:238
msgid "unspecified"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "valid firewall mark"
msgstr ""
diff --git a/applications/luci-app-firewall/po/zh-cn/firewall.po b/applications/luci-app-firewall/po/zh-cn/firewall.po
index 001cc67a35..f84eb481c0 100644
--- a/applications/luci-app-firewall/po/zh-cn/firewall.po
+++ b/applications/luci-app-firewall/po/zh-cn/firewall.po
@@ -40,11 +40,11 @@ msgstr "<var>%d</var> 数据包/<var>%s</var>,突发 <var>%d</var> 数据包
msgid "<var>%s</var> and limit to %s"
msgstr "<var>%s</var> 并限制到 %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:280
msgid "A rewrite IP must be specified!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:267
msgid "ACCEPT - Disable address rewriting"
msgstr ""
@@ -62,7 +62,7 @@ msgstr "接受出站"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:224
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:388
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:262
msgid "Action"
msgstr "动作"
@@ -85,7 +85,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr "高级设置"
@@ -103,18 +103,29 @@ msgid "Allow forward to <em>destination zones</em>:"
msgstr "允许转发到<em>目标区域</em>:"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:198
msgid "Any"
msgstr "任何"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:430
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:446
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:340
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:602
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:618
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:377
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:393
msgid "Any day"
msgstr "每天"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid ""
+"Apply a bitwise XOR of the given value and the existing mark value on "
+"established connections. Format is value[/mask]. If a mask is specified then "
+"those bits set in the mask are zeroed out."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "Apply the given DSCP class or value to established connections."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Assign the specified connection tracking helper to matched traffic."
msgstr ""
@@ -164,7 +175,19 @@ msgstr ""
"自定义规则允许您执行不属于防火墙框架的任意 iptables 命令。每次重启防火墙时,"
"在默认的规则运行后这些命令将立即执行。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:398
+msgid "DSCP classification"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:466
+msgid "DSCP mark required"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
msgid "Destination IP address"
msgstr "目标 IP 地址"
@@ -173,7 +196,7 @@ msgid "Destination address"
msgstr "目标地址"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:379
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
msgid "Destination port"
msgstr "目标端口"
@@ -205,7 +228,7 @@ msgstr ""
"不安装额外的规则以拒绝 conntrack 状态为<em>无效</em>的转发流量。对复杂的非对"
"称路由这可能是必需的设置。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:125
msgid "Do not rewrite"
msgstr "不重写"
@@ -227,7 +250,7 @@ msgstr "丢弃无效数据包"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:157
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:230
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:189
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:190
msgid "Enable"
msgstr "启用"
@@ -244,7 +267,10 @@ msgid "Enable logging on this zone"
msgstr "启用此区域的日志记录"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "Expecting: %s"
msgstr ""
@@ -264,9 +290,9 @@ msgstr "外部 IP 地址"
msgid "External port"
msgstr "外部端口"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:422
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:594
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:368
msgid "Extra arguments"
msgstr "额外参数"
@@ -290,7 +316,7 @@ msgstr "防火墙"
msgid "Firewall - Custom Rules"
msgstr "防火墙 - 自定义规则"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
msgid "Firewall - NAT Rules"
msgstr ""
@@ -315,8 +341,8 @@ msgstr "转发"
msgid "Forward to"
msgstr "转发到"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:436
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:608
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:383
msgid "Friday"
msgstr "星期五"
@@ -347,13 +373,13 @@ msgstr "来自 %s 位于<var>本设备</var>源于 %s"
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr "来自 %s 位于<var>本设备</var>源端口 %s 源 MAC %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:93
msgid "From %{ipaddr?:any host} %{port?with source %{port}}"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
#: 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/root/usr/share/luci/menu.d/luci-app-firewall.json:16
@@ -421,10 +447,39 @@ msgstr "内部端口"
msgid "Internal zone"
msgstr "内部区域"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:471
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:553
+msgid "Invalid DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:581
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:355
+msgid "Invalid limit value"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:586
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:360
+msgid "Limit burst"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "限制日志信息"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:558
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+msgid "Limit matching"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:559
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:333
+msgid "Limits traffic matching to the specified rate."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:275
msgid "Loopback source IP"
msgstr ""
@@ -437,7 +492,7 @@ msgstr "MAC"
msgid "MACs"
msgstr "MAC"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
msgstr ""
@@ -451,14 +506,18 @@ msgstr "IP 动态伪装"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:133
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:174
msgid "Match"
msgstr "匹配规则"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:84
msgid ""
"Match %{protocol?%{family} %{protocol} traffic:any %{family} traffic} %{mark?"
-"with firewall mark %{mark}}"
+"with firewall mark %{mark}} %{limit?limited to %{limit}}"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:517
+msgid "Match DSCP"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:288
@@ -469,26 +528,26 @@ msgstr "匹配 ICMP 类型"
msgid "Match device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:239
msgid "Match forwarded traffic directed at the given IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:252
msgid ""
"Match forwarded traffic directed at the given destination port or port range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
msgid "Match forwarded traffic from this IP or range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:228
msgid ""
"Match forwarded traffic originating from the given source port or port range."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match helper"
msgstr ""
@@ -499,40 +558,54 @@ msgid ""
msgstr "匹配指向此主机上指定目标端口或目标端口范围的入站流量"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:302
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:315
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:501
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
msgid "Match mark"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match traffic using the specified connection tracking helper."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:303
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:502
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:317
msgid "Matches a specific firewall mark or a range of different marks."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:311
msgid "Matches forwarded traffic using the specified outbound network device."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:432
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:518
+msgid "Matches traffic carrying the specified DSCP marking."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:587
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:361
+msgid ""
+"Maximum initial number of packets to match: this number gets recharged by "
+"one every time the limit specified above is not reached, up to this number."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:604
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
msgid "Monday"
msgstr "星期一"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:442
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:614
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:389
msgid "Month Days"
msgstr "日期"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:156
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:157
#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
msgid "NAT Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:155
msgid ""
"NAT rules allow fine grained control over the source IP to use for outbound "
"or forwarded traffic."
@@ -540,7 +613,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:129
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:210
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "名称"
@@ -568,11 +641,11 @@ msgid ""
msgstr "仅匹配源自客户端主机上给定源端口或源端口范围的入站流量"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:309
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
msgid "Outbound device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:206
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:207
msgid "Outbound zone"
msgstr ""
@@ -581,9 +654,9 @@ msgstr ""
msgid "Output"
msgstr "出站数据"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:423
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:355
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:595
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:369
msgid "Passes additional arguments to iptables. Use with care!"
msgstr "传递到 iptables 的额外参数。小心使用!"
@@ -613,7 +686,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:162
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:275
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:194
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:195
msgid "Protocol"
msgstr "协议"
@@ -655,31 +728,31 @@ msgstr "要限制 IP 动态伪装的源子网"
msgid "Restrict to address family"
msgstr "限制地址"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
msgid "Rewrite IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:270
msgid "Rewrite matched traffic to the specified source IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:300
msgid "Rewrite matched traffic to the specified source port or port range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
msgid "Rewrite port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:184
msgid "Rewrite to"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:115
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:116
msgid "Rewrite to %{ipaddr?%{port?%{ipaddr}, %{port}:%{ipaddr}}:%{port}}"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:122
msgid "Rewrite to outbound device IP"
msgstr ""
@@ -687,15 +760,25 @@ msgstr ""
msgid "Routing/NAT Offloading"
msgstr "Routing/NAT 分载"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:264
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
msgid "SNAT - Rewrite to specific source IP or port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:437
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:609
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:384
msgid "Saturday"
msgstr "星期六"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid "Set mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid ""
+"Set the given mark value on established connections. Format is value[/mask]. "
+"If a mask is specified then only those bits set in the mask are modified."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr "基于软件的 Routing/NAT 分载"
@@ -705,7 +788,7 @@ msgid "Software flow offloading"
msgstr "软件流量分载"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:213
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
msgid "Source IP address"
msgstr "源 IP 地址"
@@ -720,7 +803,7 @@ msgstr "源地址"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:207
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
msgid "Source port"
msgstr "源端口"
@@ -741,28 +824,28 @@ msgid ""
"reflected traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:461
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:371
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:633
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:408
msgid "Start Date (yyyy-mm-dd)"
msgstr "开始日期(yyyy-mm-dd)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:453
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:363
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:625
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:400
msgid "Start Time (hh.mm.ss)"
msgstr "开始时间(hh.mm.ss)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:465
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:375
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:637
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:412
msgid "Stop Date (yyyy-mm-dd)"
msgstr "停止日期(yyyy-mm-dd)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:457
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:367
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:629
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:404
msgid "Stop Time (hh.mm.ss)"
msgstr "停止时间(hh.mm.ss)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:431
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:603
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:378
msgid "Sunday"
msgstr "星期日"
@@ -799,18 +882,18 @@ msgstr ""
"域入站和出站流量的默认策略,<em>转发</em>选项描述该区域内不同网络之间的流量转"
"发策略。<em>涵盖的网络</em>指定从属于这个区域的网络。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:435
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:607
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:382
msgid "Thursday"
msgstr "星期四"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:164
msgid "Time Restrictions"
msgstr "时间限制"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:469
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:641
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:416
msgid "Time in UTC"
msgstr "UTC 时间"
@@ -830,13 +913,13 @@ msgstr "到 %s 位于<var>本设备</var>"
msgid "To %s, %s in %s"
msgstr "到 %s, %s 位于 %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:102
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:103
msgid ""
"To %{ipaddr?:any destination} %{port?at %{port}} %{zone?via zone %{zone}} "
"%{device?egress device %{device}}"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Tracking helper"
msgstr ""
@@ -854,8 +937,8 @@ msgstr ""
"通信规则定义了不同区域间的数据包传输策略,例如:拒绝一些主机之间的通信,开放"
"路由器 WAN 上的端口。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:605
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:380
msgid "Tuesday"
msgstr "星期二"
@@ -864,12 +947,12 @@ msgid "Unable to save contents: %s"
msgstr "无法保存内容:%s"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:299
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:419
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:498
msgid "Unknown or not installed conntrack helper \"%s\""
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:171
msgid "Unnamed NAT"
msgstr ""
@@ -915,16 +998,24 @@ msgstr "通过 %s"
msgid "Via %s at %s"
msgstr "通过 %s 在 %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:434
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:606
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:381
msgid "Wednesday"
msgstr "星期三"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:426
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:598
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:373
msgid "Week Days"
msgstr "星期"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+msgid "XOR firewall mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid "XOR mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "区域 ⇒ 转发"
@@ -951,12 +1042,13 @@ msgstr "接受"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:376
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:382
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:399
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:406
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:231
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:242
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:478
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:485
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:521
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:255
msgid "any"
msgstr "任意"
@@ -979,6 +1071,10 @@ msgstr "所有路由 IP"
msgid "any zone"
msgstr "所有区域"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:396
+msgid "apply firewall mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:395
msgid "assign conntrack helper"
msgstr ""
@@ -987,8 +1083,8 @@ msgstr ""
msgid "day"
msgstr "日"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:273
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:303
msgid "do not rewrite"
msgstr ""
@@ -1047,12 +1143,21 @@ msgstr "类型"
msgid "types"
msgstr "类型"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:322
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:562
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+msgid "unlimited"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:238
msgid "unspecified"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "valid firewall mark"
msgstr ""
diff --git a/applications/luci-app-firewall/po/zh-tw/firewall.po b/applications/luci-app-firewall/po/zh-tw/firewall.po
index 29ebdc6adf..d21b563215 100644
--- a/applications/luci-app-firewall/po/zh-tw/firewall.po
+++ b/applications/luci-app-firewall/po/zh-tw/firewall.po
@@ -37,11 +37,11 @@ msgstr "<var>%d</var> 資料包/<var>%s</var>,突發 <var>%d</var> 資料包
msgid "<var>%s</var> and limit to %s"
msgstr "<var>%s</var> 並限制到 %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:280
msgid "A rewrite IP must be specified!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:267
msgid "ACCEPT - Disable address rewriting"
msgstr ""
@@ -59,7 +59,7 @@ msgstr "接受出站"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:224
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:388
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:262
msgid "Action"
msgstr "行動"
@@ -78,7 +78,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:109
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr "高階設定"
@@ -96,18 +96,29 @@ msgid "Allow forward to <em>destination zones</em>:"
msgstr "允許轉發到<em>目標區域</em>:"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:278
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:198
msgid "Any"
msgstr "任何"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:430
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:446
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:340
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:356
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:602
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:618
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:377
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:393
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid ""
+"Apply a bitwise XOR of the given value and the existing mark value on "
+"established connections. Format is value[/mask]. If a mask is specified then "
+"those bits set in the mask are zeroed out."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "Apply the given DSCP class or value to established connections."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Assign the specified connection tracking helper to matched traffic."
msgstr ""
@@ -157,7 +168,19 @@ msgstr ""
"自訂規則允許您執行不屬於防火牆框架的任意 iptables 指令。每次重啟防火牆時,在"
"預設的規則執行後這些指令將立即執行。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:237
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:398
+msgid "DSCP classification"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:438
+msgid "DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:466
+msgid "DSCP mark required"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
msgid "Destination IP address"
msgstr "目標 IP 位址"
@@ -166,7 +189,7 @@ msgid "Destination address"
msgstr "目標位址"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:379
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:250
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
msgid "Destination port"
msgstr "目標埠"
@@ -196,7 +219,7 @@ msgid ""
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:125
msgid "Do not rewrite"
msgstr "不重寫"
@@ -218,7 +241,7 @@ msgstr "丟棄無效資料包"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:157
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:230
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:189
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:190
msgid "Enable"
msgstr "啟用"
@@ -235,7 +258,10 @@ msgid "Enable logging on this zone"
msgstr "啟用此區域的日誌記錄"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "Expecting: %s"
msgstr ""
@@ -255,9 +281,9 @@ msgstr "外部 IP 位址"
msgid "External port"
msgstr "外部埠"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:422
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:594
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:368
msgid "Extra arguments"
msgstr "附加引數"
@@ -281,7 +307,7 @@ msgstr "防火牆"
msgid "Firewall - Custom Rules"
msgstr "防火牆 - 自訂規則"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:153
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
msgid "Firewall - NAT Rules"
msgstr ""
@@ -306,8 +332,8 @@ msgstr "轉發"
msgid "Forward to"
msgstr "轉發到"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:436
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:608
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:383
msgid "Friday"
msgstr "星期五"
@@ -338,13 +364,13 @@ msgstr "來自 %s 位於<var>本裝置</var>源於 %s"
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr "來自 %s 位於<var>本裝置</var>源埠 %s 源 MAC %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:93
msgid "From %{ipaddr?:any host} %{port?with source %{port}}"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:161
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:162
#: 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/root/usr/share/luci/menu.d/luci-app-firewall.json:16
@@ -412,10 +438,39 @@ msgstr "內部埠"
msgid "Internal zone"
msgstr "內部區域"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:471
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:553
+msgid "Invalid DSCP mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:581
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:355
+msgid "Invalid limit value"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:586
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:360
+msgid "Limit burst"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "限制日誌資訊"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:318
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:558
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+msgid "Limit matching"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:559
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:333
+msgid "Limits traffic matching to the specified rate."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:275
msgid "Loopback source IP"
msgstr ""
@@ -428,7 +483,7 @@ msgstr "MAC"
msgid "MACs"
msgstr "MAC"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:266
msgid "MASQUERADE - Automatically rewrite to outbound interface IP"
msgstr ""
@@ -442,14 +497,18 @@ msgstr "IP 動態偽裝"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:133
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:174
msgid "Match"
msgstr "匹配規則"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:84
msgid ""
"Match %{protocol?%{family} %{protocol} traffic:any %{family} traffic} %{mark?"
-"with firewall mark %{mark}}"
+"with firewall mark %{mark}} %{limit?limited to %{limit}}"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:517
+msgid "Match DSCP"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:288
@@ -460,26 +519,26 @@ msgstr "匹配 ICMP 型別"
msgid "Match device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:238
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:239
msgid "Match forwarded traffic directed at the given IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:252
msgid ""
"Match forwarded traffic directed at the given destination port or port range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:215
msgid "Match forwarded traffic from this IP or range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:228
msgid ""
"Match forwarded traffic originating from the given source port or port range."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match helper"
msgstr ""
@@ -490,40 +549,54 @@ msgid ""
msgstr "匹配指向此主機上指定目標埠或目標埠範圍的入站流量。"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:302
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:315
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:501
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
msgid "Match mark"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:284
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:404
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:483
msgid "Match traffic using the specified connection tracking helper."
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:303
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:502
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:317
msgid "Matches a specific firewall mark or a range of different marks."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:311
msgid "Matches forwarded traffic using the specified outbound network device."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:432
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:518
+msgid "Matches traffic carrying the specified DSCP marking."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:587
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:361
+msgid ""
+"Maximum initial number of packets to match: this number gets recharged by "
+"one every time the limit specified above is not reached, up to this number."
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:604
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
msgid "Monday"
msgstr "星期一"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:442
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:352
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:614
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:389
msgid "Month Days"
msgstr "日期"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:156
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:157
#: applications/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json:43
msgid "NAT Rules"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:155
msgid ""
"NAT rules allow fine grained control over the source IP to use for outbound "
"or forwarded traffic."
@@ -531,7 +604,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:129
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:210
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "名字"
@@ -559,11 +632,11 @@ msgid ""
msgstr "僅匹配源自客戶端主機上給定源埠或源埠範圍的入站流量。"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:240
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:309
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:310
msgid "Outbound device"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:206
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:207
msgid "Outbound zone"
msgstr ""
@@ -572,9 +645,9 @@ msgstr ""
msgid "Output"
msgstr "出站資料"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:319
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:423
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:355
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:595
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:369
msgid "Passes additional arguments to iptables. Use with care!"
msgstr "傳遞到 iptables 的額外引數。小心使用!"
@@ -600,7 +673,7 @@ msgstr "埠轉發允許 Internet 上的遠端計算機連線到內部網路中
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:162
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:275
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:194
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:195
msgid "Protocol"
msgstr "協議"
@@ -642,31 +715,31 @@ msgstr "要限制 IP 動態偽裝的源子網"
msgid "Restrict to address family"
msgstr "限制位址"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
msgid "Rewrite IP address"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:269
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:270
msgid "Rewrite matched traffic to the specified source IP address."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:300
msgid "Rewrite matched traffic to the specified source port or port range."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:298
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:299
msgid "Rewrite port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:184
msgid "Rewrite to"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:115
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:116
msgid "Rewrite to %{ipaddr?%{port?%{ipaddr}, %{port}:%{ipaddr}}:%{port}}"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:122
msgid "Rewrite to outbound device IP"
msgstr ""
@@ -674,15 +747,25 @@ msgstr ""
msgid "Routing/NAT Offloading"
msgstr "Routing/NAT 分載"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:264
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:265
msgid "SNAT - Rewrite to specific source IP or port"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:437
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:609
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:384
msgid "Saturday"
msgstr "星期六"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid "Set mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:412
+msgid ""
+"Set the given mark value on established connections. Format is value[/mask]. "
+"If a mask is specified then only those bits set in the mask are modified."
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr "基於軟體的 Routing/NAT 分載"
@@ -692,7 +775,7 @@ msgid "Software flow offloading"
msgstr "軟體流量分載"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:213
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:214
msgid "Source IP address"
msgstr "源 IP 位址"
@@ -707,7 +790,7 @@ msgstr "源位址"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:207
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:226
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:227
msgid "Source port"
msgstr "源埠"
@@ -728,28 +811,28 @@ msgid ""
"reflected traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:461
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:371
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:633
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:408
msgid "Start Date (yyyy-mm-dd)"
msgstr "開始日期(yyyy-mm-dd)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:453
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:363
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:625
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:400
msgid "Start Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:465
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:375
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:637
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:412
msgid "Stop Date (yyyy-mm-dd)"
msgstr "停止日期(yyyy-mm-dd)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:457
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:367
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:629
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:404
msgid "Stop Time (hh.mm.ss)"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:431
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:341
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:603
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:378
msgid "Sunday"
msgstr "星期日"
@@ -786,18 +869,18 @@ msgstr ""
"域入站和出站流量的預設策略,<em>轉發</em>選項描述該區域內不同網路之間的流量轉"
"發策略。<em>覆蓋網路</em>指定從屬於這個區域的網路。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:435
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:607
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:382
msgid "Thursday"
msgstr "星期四"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:179
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:163
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:164
msgid "Time Restrictions"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:469
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:379
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:641
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:416
msgid "Time in UTC"
msgstr "UTC 時間"
@@ -817,13 +900,13 @@ msgstr "到 %s 位於<var>本裝置</var>"
msgid "To %s, %s in %s"
msgstr "到 %s, %s 位於 %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:102
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:103
msgid ""
"To %{ipaddr?:any destination} %{port?at %{port}} %{zone?via zone %{zone}} "
"%{device?egress device %{device}}"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:476
msgid "Tracking helper"
msgstr ""
@@ -841,8 +924,8 @@ msgstr ""
"通訊規則定義了不同區域間的資料包傳輸策略,例如:拒絕一些主機之間的通訊,開放"
"路由器 WAN 上的埠。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:605
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:380
msgid "Tuesday"
msgstr "星期二"
@@ -851,12 +934,12 @@ msgid "Unable to save contents: %s"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:299
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:419
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:498
msgid "Unknown or not installed conntrack helper \"%s\""
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:170
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:171
msgid "Unnamed NAT"
msgstr ""
@@ -902,16 +985,24 @@ msgstr "通過 %s"
msgid "Via %s at %s"
msgstr "通過 %s 在 %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:434
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:606
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:381
msgid "Wednesday"
msgstr "星期三"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:426
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:598
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:373
msgid "Week Days"
msgstr "星期"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:397
+msgid "XOR firewall mark"
+msgstr ""
+
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:425
+msgid "XOR mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "區域 ⇒ 轉發"
@@ -938,12 +1029,13 @@ msgstr "接受"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:376
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:382
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:399
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:406
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:218
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:231
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:242
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:254
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:478
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:485
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:521
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:219
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:255
msgid "any"
msgstr "所有"
@@ -966,6 +1058,10 @@ msgstr "所有路由 IP"
msgid "any zone"
msgstr "所有區域"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:396
+msgid "apply firewall mark"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:395
msgid "assign conntrack helper"
msgstr ""
@@ -974,8 +1070,8 @@ msgstr ""
msgid "day"
msgstr "日"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:272
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:273
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:303
msgid "do not rewrite"
msgstr ""
@@ -1034,12 +1130,21 @@ msgstr "型別"
msgid "types"
msgstr "型別"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:322
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:562
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:336
+msgid "unlimited"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:238
msgid "unspecified"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:313
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:326
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:420
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:433
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:512
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/snats.js:327
msgid "valid firewall mark"
msgstr ""