diff --git a/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js b/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js
deleted file mode 100644
index 198528aaa..000000000
--- a/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js
+++ /dev/null
@@ -1,312 +0,0 @@
-'use strict';
-'require ui';
-'require uci';
-'require form';
-'require network';
-'require firewall';
-'require tools.prng as random';
-
-var protocols = [
-	'ip', 0, 'IP',
-	'hopopt', 0, 'HOPOPT',
-	'icmp', 1, 'ICMP',
-	'igmp', 2, 'IGMP',
-	'ggp', 3 , 'GGP',
-	'ipencap', 4, 'IP-ENCAP',
-	'st', 5, 'ST',
-	'tcp', 6, 'TCP',
-	'egp', 8, 'EGP',
-	'igp', 9, 'IGP',
-	'pup', 12, 'PUP',
-	'udp', 17, 'UDP',
-	'hmp', 20, 'HMP',
-	'xns-idp', 22, 'XNS-IDP',
-	'rdp', 27, 'RDP',
-	'iso-tp4', 29, 'ISO-TP4',
-	'dccp', 33, 'DCCP',
-	'xtp', 36, 'XTP',
-	'ddp', 37, 'DDP',
-	'idpr-cmtp', 38, 'IDPR-CMTP',
-	'ipv6', 41, 'IPv6',
-	'ipv6-route', 43, 'IPv6-Route',
-	'ipv6-frag', 44, 'IPv6-Frag',
-	'idrp', 45, 'IDRP',
-	'rsvp', 46, 'RSVP',
-	'gre', 47, 'GRE',
-	'esp', 50, 'IPSEC-ESP',
-	'ah', 51, 'IPSEC-AH',
-	'skip', 57, 'SKIP',
-	'ipv6-icmp', 58, 'IPv6-ICMP',
-	'ipv6-nonxt', 59, 'IPv6-NoNxt',
-	'ipv6-opts', 60, 'IPv6-Opts',
-	'rspf', 73, 'RSPF', 'CPHB',
-	'vmtp', 81, 'VMTP',
-	'eigrp', 88, 'EIGRP',
-	'ospf', 89, 'OSPFIGP',
-	'ax.25', 93, 'AX.25',
-	'ipip', 94, 'IPIP',
-	'etherip', 97, 'ETHERIP',
-	'encap', 98, 'ENCAP',
-	'pim', 103, 'PIM',
-	'ipcomp', 108, 'IPCOMP',
-	'vrrp', 112, 'VRRP',
-	'l2tp', 115, 'L2TP',
-	'isis', 124, 'ISIS',
-	'sctp', 132, 'SCTP',
-	'fc', 133, 'FC',
-	'mobility-header', 135, 'Mobility-Header',
-	'udplite', 136, 'UDPLite',
-	'mpls-in-ip', 137, 'MPLS-in-IP',
-	'manet', 138, 'MANET',
-	'hip', 139, 'HIP',
-	'shim6', 140, 'Shim6',
-	'wesp', 141, 'WESP',
-	'rohc', 142, 'ROHC',
-];
-
-function lookupProto(x) {
-	if (x == null || x == '')
-		return null;
-
-	var s = String(x).toLowerCase();
-
-	for (var i = 0; i < protocols.length; i += 3)
-		if (s == protocols[i] || s == protocols[i+1])
-			return [ protocols[i+1], protocols[i+2] ];
-
-	return [ -1, x ];
-}
-
-
-return L.Class.extend({
-	fmt_neg: function(x) {
-		var rv = E([]),
-		    v = (typeof(x) == 'string') ? x.replace(/^ *! */, '') : '';
-
-		L.dom.append(rv, (v != '' && v != x) ? [ _('not') + ' ', v ] : [ '', x ]);
-		return rv;
-	},
-
-	fmt_mac: function(x) {
-		var rv = E([]), l = L.toArray(x);
-
-		if (l.length == 0)
-			return null;
-
-		L.dom.append(rv, [ _('MAC') + ' ' ]);
-
-		for (var i = 0; i < l.length; i++) {
-			var n = this.fmt_neg(l[i]);
-			L.dom.append(rv, (i > 0) ? [ ', ', n ] : n);
-		}
-
-		if (rv.childNodes.length > 2)
-			rv.firstChild.data = _('MACs') + ' ';
-
-		return rv;
-	},
-
-	fmt_port: function(x, d) {
-		var rv = E([]), l = L.toArray(x);
-
-		if (l.length == 0) {
-			if (d) {
-				L.dom.append(rv, E('var', {}, d));
-				return rv;
-			}
-
-			return null;
-		}
-
-		L.dom.append(rv, [ _('port') + ' ' ]);
-
-		for (var i = 0; i < l.length; i++) {
-			var n = this.fmt_neg(l[i]),
-			    m = n.lastChild.data.match(/^(\d+)\D+(\d+)$/);
-
-			if (i > 0)
-				L.dom.append(rv, [ ', ' ]);
-
-			if (m) {
-				rv.firstChild.data = _('ports') + ' ';
-				L.dom.append(rv, E('var', [ n.firstChild, m[1], '-', m[2] ]));
-			}
-			else {
-				L.dom.append(rv, E('var', {}, n));
-			}
-		}
-
-		if (rv.childNodes.length > 2)
-			rv.firstChild.data = _('ports') + ' ';
-
-		return rv;
-	},
-
-	fmt_ip: function(x, d) {
-		var rv = E([]), l = L.toArray(x);
-
-		if (l.length == 0) {
-			if (d) {
-				L.dom.append(rv, E('var', {}, d));
-				return rv;
-			}
-
-			return null;
-		}
-
-		L.dom.append(rv, [ _('IP') + ' ' ]);
-
-		for (var i = 0; i < l.length; i++) {
-			var n = this.fmt_neg(l[i]),
-			    m = n.lastChild.data.match(/^(\S+)\/(\d+\.\S+)$/);
-
-			if (i > 0)
-				L.dom.append(rv, [ ', ' ]);
-
-			if (m)
-				rv.firstChild.data = _('IP range') + ' ';
-			else if (n.lastChild.data.match(/^[a-zA-Z0-9_]+$/))
-				rv.firstChild.data = _('Network') + ' ';
-
-			L.dom.append(rv, E('var', {}, n));
-		}
-
-		if (rv.childNodes.length > 2)
-			rv.firstChild.data = _('IPs') + ' ';
-
-		return rv;
-	},
-
-	fmt_zone: function(x, d) {
-		if (x == '*')
-			return E('var', _('any zone'));
-		else if (x != null && x != '')
-			return E('var', {}, [ x ]);
-		else if (d != null && d != '')
-			return E('var', {}, d);
-		else
-			return null;
-	},
-
-	fmt_icmp_type: function(x) {
-		var rv = E([]), l = L.toArray(x);
-
-		if (l.length == 0)
-			return null;
-
-		L.dom.append(rv, [ _('type') + ' ' ]);
-
-		for (var i = 0; i < l.length; i++) {
-			var n = this.fmt_neg(l[i]);
-
-			if (i > 0)
-				L.dom.append(rv, [ ', ' ]);
-
-			L.dom.append(rv, E('var', {}, n));
-		}
-
-		if (rv.childNodes.length > 2)
-			rv.firstChild.data = _('types') + ' ';
-
-		return rv;
-	},
-
-	fmt_family: function(family) {
-		if (family == 'ipv4')
-			return _('IPv4');
-		else if (family == 'ipv6')
-			return _('IPv6');
-		else
-			return _('IPv4 and IPv6');
-	},
-
-	fmt_proto: function(x, icmp_types) {
-		var rv = E([]), l = L.toArray(x);
-
-		if (l.length == 0)
-			return null;
-
-		var t = this.fmt_icmp_type(icmp_types);
-
-		for (var i = 0; i < l.length; i++) {
-			var n = this.fmt_neg(l[i]),
-			    p = lookupProto(n.lastChild.data);
-
-			if (n.lastChild.data == 'all')
-				continue;
-
-			if (i > 0)
-				L.dom.append(rv, [ ', ' ]);
-
-			if (t && (p[0] == 1 || p[0] == 58))
-				L.dom.append(rv, [ _('%s%s with %s').format(n.firstChild.data, p[1], ''), t ]);
-			else
-				L.dom.append(rv, [ n.firstChild.data, p[1] ]);
-		}
-
-		return rv;
-	},
-
-	fmt_limit: function(limit, burst) {
-		if (limit == null || limit == '')
-			return null;
-
-		var m = String(limit).match(/^(\d+)\/(\w+)$/),
-		    u = m[2] || 'second',
-		    l = +(m[1] || limit),
-		    b = +burst;
-
-		if (!isNaN(l)) {
-			if (u.match(/^s/))
-				u = _('second');
-			else if (u.match(/^m/))
-				u = _('minute');
-			else if (u.match(/^h/))
-				u = _('hour');
-			else if (u.match(/^d/))
-				u = _('day');
-
-			if (!isNaN(b) && b > 0)
-				return E('<span>' +
-					_('<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts.').format(l, u, b) +
-				'</span>');
-			else
-				return E('<span>' +
-					_('<var>%d</var> pkts. per <var>%s</var>').format(l, u) +
-				'</span>');
-		}
-	},
-
-	fmt_target: function(x, src, dest) {
-		if (src == null || src == '') {
-			if (x == 'ACCEPT')
-				return _('Accept output');
-			else if (x == 'REJECT')
-				return _('Refuse output');
-			else if (x == 'NOTRACK')
-				return _('Do not track output');
-			else /* if (x == 'DROP') */
-				return _('Discard output');
-		}
-		else if (dest != null && dest != '') {
-			if (x == 'ACCEPT')
-				return _('Accept forward');
-			else if (x == 'REJECT')
-				return _('Refuse forward');
-			else if (x == 'NOTRACK')
-				return _('Do not track forward');
-			else /* if (x == 'DROP') */
-				return _('Discard forward');
-		}
-		else {
-			if (x == 'ACCEPT')
-				return _('Accept input');
-			else if (x == 'REJECT' )
-				return _('Refuse input');
-			else if (x == 'NOTRACK')
-				return _('Do not track input');
-			else /* if (x == 'DROP') */
-				return _('Discard input');
-		}
-	}
-});
diff --git a/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js b/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js
deleted file mode 100644
index 80938711e..000000000
--- a/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js
+++ /dev/null
@@ -1,274 +0,0 @@
-'use strict';
-'require ui';
-'require rpc';
-'require uci';
-'require form';
-'require tools.firewall as fwtool';
-'require tools.widgets as widgets';
-
-function fmt(fmt /*, ...*/) {
-	var repl = [], wrap = false;
-
-	for (var i = 1; i < arguments.length; i++) {
-		if (L.dom.elem(arguments[i])) {
-			switch (arguments[i].nodeType) {
-			case 1:
-				repl.push(arguments[i].outerHTML);
-				wrap = true;
-				break;
-
-			case 3:
-				repl.push(arguments[i].data);
-				break;
-
-			case 11:
-				var span = E('span');
-				span.appendChild(arguments[i]);
-				repl.push(span.innerHTML);
-				wrap = true;
-				break;
-
-			default:
-				repl.push('');
-			}
-		}
-		else {
-			repl.push(arguments[i]);
-		}
-	}
-
-	var rv = fmt.format.apply(fmt, repl);
-	return wrap ? E('span', rv) : rv;
-}
-
-function forward_proto_txt(s) {
-	return fmt('%s-%s',
-		fwtool.fmt_family(uci.get('firewall', s, 'family')),
-		fwtool.fmt_proto(uci.get('firewall', s, 'proto'),
-		                 uci.get('firewall', s, 'icmp_type')) || 'TCP+UDP');
-}
-
-function forward_src_txt(s) {
-	var z = fwtool.fmt_zone(uci.get('firewall', s, 'src'), _('any zone')),
-	    a = fwtool.fmt_ip(uci.get('firewall', s, 'src_ip'), _('any host')),
-	    p = fwtool.fmt_port(uci.get('firewall', s, 'src_port')),
-	    m = fwtool.fmt_mac(uci.get('firewall', s, 'src_mac'));
-
-	if (p && m)
-		return fmt(_('From %s in %s with source %s and %s'), a, z, p, m);
-	else if (p || m)
-		return fmt(_('From %s in %s with source %s'), a, z, p || m);
-	else
-		return fmt(_('From %s in %s'), a, z);
-}
-
-function forward_via_txt(s) {
-	var a = fwtool.fmt_ip(uci.get('firewall', s, 'src_dip'), _('any router IP')),
-	    p = fwtool.fmt_port(uci.get('firewall', s, 'src_dport'));
-
-	if (p)
-		return fmt(_('Via %s at %s'), a, p);
-	else
-		return fmt(_('Via %s'), a);
-}
-
-return L.view.extend({
-	callHostHints: rpc.declare({
-		object: 'luci',
-		method: 'getHostHints',
-		expect: { '': {} }
-	}),
-
-	load: function() {
-		return Promise.all([
-			this.callHostHints()
-		]);
-	},
-
-	render: function(data) {
-		var hosts = data[0],
-		    m, s, o;
-
-		m = new form.Map('firewall', _('Firewall - Port Forwards'),
-			_('Port forwarding allows remote computers on the Internet to connect to a specific computer or service within the private LAN.'));
-
-		s = m.section(form.GridSection, 'redirect', _('Port Forwards'));
-		s.addremove = true;
-		s.anonymous = true;
-		s.sortable  = true;
-
-		s.tab('general', _('General Settings'));
-		s.tab('advanced', _('Advanced Settings'));
-
-		s.filter = function(section_id) {
-			return (uci.get('firewall', section_id, 'target') != 'SNAT');
-		};
-
-		s.sectiontitle = function(section_id) {
-			return uci.get('firewall', section_id, 'name') || _('Unnamed forward');
-		};
-
-		s.handleAdd = function(ev) {
-			var config_name = this.uciconfig || this.map.config,
-			    section_id = uci.add(config_name, this.sectiontype);
-
-			uci.set(config_name, section_id, 'target', 'DNAT');
-
-			this.addedSection = section_id;
-			this.renderMoreOptionsModal(section_id);
-		};
-
-		o = s.taboption('general', form.Value, 'name', _('Name'));
-		o.placeholder = _('Unnamed forward');
-		o.modalonly = true;
-
-		o = s.option(form.DummyValue, '_match', _('Match'));
-		o.modalonly = false;
-		o.textvalue = function(s) {
-			return E('small', [
-				forward_proto_txt(s), E('br'),
-				forward_src_txt(s), E('br'),
-				forward_via_txt(s)
-			]);
-		};
-
-		o = s.option(form.ListValue, '_dest', _('Forward to'));
-		o.modalonly = false;
-		o.textvalue = function(s) {
-			var z = fwtool.fmt_zone(uci.get('firewall', s, 'dest'), _('any zone')),
-			    a = fwtool.fmt_ip(uci.get('firewall', s, 'dest_ip'), _('any host')),
-			    p = fwtool.fmt_port(uci.get('firewall', s, 'dest_port')) ||
-			        fwtool.fmt_port(uci.get('firewall', s, 'src_dport'));
-
-			if (p)
-				return fmt(_('%s, %s in %s'), a, p, z);
-			else
-				return fmt(_('%s in %s'), a, z);
-		};
-
-		o = s.option(form.Flag, 'enabled', _('Enable'));
-		o.modalonly = false;
-		o.default = o.enabled;
-		o.editable = true;
-
-		o = s.taboption('general', form.Value, 'proto', _('Protocol'));
-		o.modalonly = true;
-		o.default = 'tcp udp';
-		o.value('tcp udp', 'TCP+UDP');
-		o.value('tcp', 'TCP');
-		o.value('udp', 'UDP');
-		o.value('icmp', 'ICMP');
-
-		o.cfgvalue = function(/* ... */) {
-			var v = this.super('cfgvalue', arguments);
-			return (v == 'tcpudp') ? 'tcp udp' : v;
-		};
-
-		o = s.taboption('general', widgets.ZoneSelect, 'src', _('Source zone'));
-		o.modalonly = true;
-		o.rmempty = false;
-		o.nocreate = true;
-		o.default = 'wan';
-
-		o = s.taboption('advanced', form.Value, 'src_mac', _('Source MAC address'),
-			_('Only match incoming traffic from these MACs.'));
-		o.modalonly = true;
-		o.rmempty = true;
-		o.datatype = 'neg(macaddr)';
-		o.placeholder = E('em', _('any'));
-		L.sortedKeys(hosts).forEach(function(mac) {
-			o.value(mac, '%s (%s)'.format(
-				mac,
-				hosts[mac].name || hosts[mac].ipv4 || hosts[mac].ipv6 || '?'
-			));
-		});
-
-		o = s.taboption('advanced', form.Value, 'src_ip', _('Source IP address'),
-			_('Only match incoming traffic from this IP or range.'));
-		o.modalonly = true;
-		o.rmempty = true;
-		o.datatype = 'neg(ipmask4)';
-		o.placeholder = E('em', _('any'));
-		L.sortedKeys(hosts, 'ipv4', 'addr').forEach(function(mac) {
-			o.value(hosts[mac].ipv4, '%s (%s)'.format(
-				hosts[mac].ipv4,
-				hosts[mac].name || mac
-			));
-		});
-
-		o = s.taboption('advanced', form.Value, 'src_port', _('Source port'),
-			_('Only match incoming traffic originating from the given source port or port range on the client host'));
-		o.modalonly = true;
-		o.rmempty = true;
-		o.datatype = 'neg(portrange)';
-		o.placeholder = _('any');
-		o.depends('proto', 'tcp');
-		o.depends('proto', 'udp');
-		o.depends('proto', 'tcp udp');
-		o.depends('proto', 'tcpudp');
-
-		o = s.taboption('advanced', form.Value, 'src_dip', _('External IP address'),
-			_('Only match incoming traffic directed at the given IP address.'));
-		o.modalonly = true;
-		o.rmempty = true;
-		o.datatype = 'neg(ipmask4)';
-		o.placeholder = E('em', _('any'));
-		L.sortedKeys(hosts, 'ipv4', 'addr').forEach(function(mac) {
-			o.value(hosts[mac].ipv4, '%s (%s)'.format(
-				hosts[mac].ipv4,
-				hosts[mac].name || mac
-			));
-		});
-
-		o = s.taboption('general', form.Value, 'src_dport', _('External port'),
-			_('Match incoming traffic directed at the given destination port or port range on this host'));
-		o.modalonly = true;
-		o.rmempty = false;
-		o.datatype = 'neg(portrange)';
-		o.depends('proto', 'tcp');
-		o.depends('proto', 'udp');
-		o.depends('proto', 'tcp udp');
-		o.depends('proto', 'tcpudp');
-
-		o = s.taboption('general', widgets.ZoneSelect, 'dest', _('Internal zone'));
-		o.modalonly = true;
-		o.rmempty = true;
-		o.nocreate = true;
-		o.default = 'lan';
-
-		o = s.taboption('general', form.Value, 'dest_ip', _('Internal IP address'),
-			_('Redirect matched incoming traffic to the specified internal host'));
-		o.modalonly = true;
-		o.rmempty = true;
-		o.datatype = 'ipmask4';
-		L.sortedKeys(hosts, 'ipv4', 'addr').forEach(function(mac) {
-			o.value(hosts[mac].ipv4, '%s (%s)'.format(
-				hosts[mac].ipv4,
-				hosts[mac].name || mac
-			));
-		});
-
-		o = s.taboption('general', form.Value, 'dest_port', _('Internal port'),
-			_('Redirect matched incoming traffic to the given port on the internal host'));
-		o.modalonly = true;
-		o.rmempty = true;
-		o.placeholder = _('any');
-		o.datatype = 'portrange';
-		o.depends('proto', 'tcp');
-		o.depends('proto', 'udp');
-		o.depends('proto', 'tcp udp');
-		o.depends('proto', 'tcpudp');
-
-		o = s.taboption('advanced', form.Flag, 'reflection', _('Enable NAT Loopback'));
-		o.modalonly = true;
-		o.rmempty = true;
-		o.default = o.enabled;
-
-		o = s.taboption('advanced', form.Value, 'extra', _('Extra arguments'),
-			_('Passes additional arguments to iptables. Use with care!'));
-		o.modalonly = true;
-		o.rmempty = true;
-
-		return m.render();
-	}
-});
diff --git a/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js b/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js
deleted file mode 100644
index 6df3bc7f8..000000000
--- a/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js
+++ /dev/null
@@ -1,383 +0,0 @@
-'use strict';
-'require ui';
-'require rpc';
-'require uci';
-'require form';
-'require tools.firewall as fwtool';
-'require tools.widgets as widgets';
-
-function fmt(fmt /*, ...*/) {
-	var repl = [], wrap = false;
-
-	for (var i = 1; i < arguments.length; i++) {
-		if (L.dom.elem(arguments[i])) {
-			switch (arguments[i].nodeType) {
-			case 1:
-				repl.push(arguments[i].outerHTML);
-				wrap = true;
-				break;
-
-			case 3:
-				repl.push(arguments[i].data);
-				break;
-
-			case 11:
-				var span = E('span');
-				span.appendChild(arguments[i]);
-				repl.push(span.innerHTML);
-				wrap = true;
-				break;
-
-			default:
-				repl.push('');
-			}
-		}
-		else {
-			repl.push(arguments[i]);
-		}
-	}
-
-	var rv = fmt.format.apply(fmt, repl);
-	return wrap ? E('span', rv) : rv;
-}
-
-function forward_proto_txt(s) {
-	return fmt('%s-%s',
-		fwtool.fmt_family(uci.get('firewall', s, 'family')),
-		fwtool.fmt_proto(uci.get('firewall', s, 'proto'),
-		                 uci.get('firewall', s, 'icmp_type')) || 'TCP+UDP');
-}
-
-function rule_src_txt(s) {
-	var z = fwtool.fmt_zone(uci.get('firewall', s, 'src')),
-	    p = fwtool.fmt_port(uci.get('firewall', s, 'src_port')),
-	    m = fwtool.fmt_mac(uci.get('firewall', s, 'src_mac'));
-
-	// Forward/Input
-	if (z) {
-		var a = fwtool.fmt_ip(uci.get('firewall', s, 'src_ip'), _('any host'));
-		if (p && m)
-			return fmt(_('From %s in %s with source %s and %s'), a, z, p, m);
-		else if (p || m)
-			return fmt(_('From %s in %s with source %s'), a, z, p || m);
-		else
-			return fmt(_('From %s in %s'), a, z);
-	}
-
-	// Output
-	else {
-		var a = fwtool.fmt_ip(uci.get('firewall', s, 'src_ip'), _('any router IP'));
-		if (p && m)
-			return fmt(_('From %s on <var>this device</var> with source %s and %s'), a, p, m);
-		else if (p || m)
-			return fmt(_('From %s on <var>this device</var> with source %s'), a, p || m);
-		else
-			return fmt(_('From %s on <var>this device</var>'), a);
-	}
-}
-
-function rule_dest_txt(s) {
-	var z = fwtool.fmt_zone(uci.get('firewall', s, 'dest')),
-	    p = fwtool.fmt_port(uci.get('firewall', s, 'dest_port'));
-
-    // Forward
-	if (z) {
-		var a = fwtool.fmt_ip(uci.get('firewall', s, 'dest_ip'), _('any host'));
-		if (p)
-			return fmt(_('To %s, %s in %s'), a, p, z);
-		else
-			return fmt(_('To %s in %s'), a, z);
-	}
-
-	// Input
-	else {
-		var a = fwtool.fmt_ip(uci.get('firewall', s, 'dest_ip'), _('any router IP'));
-		if (p)
-			return fmt(_('To %s at %s on <var>this device</var>'), a, p);
-		else
-			return fmt(_('To %s on <var>this device</var>'), a);
-	}
-}
-
-function rule_target_txt(s) {
-	var t = fwtool.fmt_target(uci.get('firewall', s, 'target'), uci.get('firewall', s, 'src'), uci.get('firewall', s, 'dest')),
-	    l = fwtool.fmt_limit(uci.get('firewall', s, 'limit'), uci.get('firewall', s, 'limit_burst'));
-
-	if (l)
-		return fmt(_('<var>%s</var> and limit to %s'), t, l);
-	else
-		return fmt('<var>%s</var>', t);
-}
-
-return L.view.extend({
-	callHostHints: rpc.declare({
-		object: 'luci',
-		method: 'getHostHints',
-		expect: { '': {} }
-	}),
-
-	load: function() {
-		return this.callHostHints().catch(function(e) {
-			console.debug('load fail', e);
-		});
-	},
-
-	render: function(hosts) {
-		var m, s, o;
-
-		m = new form.Map('firewall', _('Firewall - Traffic Rules'),
-			_('Traffic rules define policies for packets traveling between different zones, for example to reject traffic between certain hosts or to open WAN ports on the router.'));
-
-		s = m.section(form.GridSection, 'rule', _('Traffic Rules'));
-		s.addremove = true;
-		s.anonymous = true;
-		s.sortable  = true;
-
-		s.tab('general', _('General Settings'));
-		s.tab('advanced', _('Advanced Settings'));
-		s.tab('timed', _('Time Restrictions'));
-
-		s.filter = function(section_id) {
-			return (uci.get('firewall', section_id, 'target') != 'SNAT');
-		};
-
-		s.sectiontitle = function(section_id) {
-			return uci.get('firewall', section_id, 'name') || _('Unnamed rule');
-		};
-
-		s.handleAdd = function(ev) {
-			var config_name = this.uciconfig || this.map.config,
-			    section_id = uci.add(config_name, this.sectiontype),
-			    opt1, opt2;
-
-			for (var i = 0; i < this.children.length; i++)
-				if (this.children[i].option == 'src')
-					opt1 = this.children[i];
-				else if (this.children[i].option == 'dest')
-					opt2 = this.children[i];
-
-			opt1.default = 'wan';
-			opt2.default = 'lan';
-
-			this.addedSection = section_id;
-			this.renderMoreOptionsModal(section_id);
-
-			delete opt1.default;
-			delete opt2.default;
-		};
-
-		o = s.taboption('general', form.Value, 'name', _('Name'));
-		o.placeholder = _('Unnamed rule');
-		o.modalonly = true;
-
-		o = s.option(form.DummyValue, '_match', _('Match'));
-		o.modalonly = false;
-		o.textvalue = function(s) {
-			return E('small', [
-				forward_proto_txt(s), E('br'),
-				rule_src_txt(s), E('br'),
-				rule_dest_txt(s)
-			]);
-		};
-
-		o = s.option(form.ListValue, '_target', _('Action'));
-		o.modalonly = false;
-		o.textvalue = function(s) {
-			return rule_target_txt(s);
-		};
-
-		o = s.option(form.Flag, 'enabled', _('Enable'));
-		o.modalonly = false;
-		o.default = o.enabled;
-		o.editable = true;
-
-		//ft.opt_enabled(s, Button);
-		//ft.opt_name(s, Value, _('Name'));
-
-
-		o = s.taboption('advanced', form.ListValue, 'family', _('Restrict to address family'));
-		o.modalonly = true;
-		o.rmempty = true;
-		o.value('', _('IPv4 and IPv6'));
-		o.value('ipv4', _('IPv4 only'));
-		o.value('ipv6', _('IPv6 only'));
-
-		o = s.taboption('general', form.Value, 'proto', _('Protocol'));
-		o.modalonly = true;
-		o.default = 'tcp udp';
-		o.value('all', _('Any'));
-		o.value('tcp udp', 'TCP+UDP');
-		o.value('tcp', 'TCP');
-		o.value('udp', 'UDP');
-		o.value('icmp', 'ICMP');
-		o.cfgvalue = function(/* ... */) {
-			var v = this.super('cfgvalue', arguments);
-			return (v == 'tcpudp') ? 'tcp udp' : v;
-		};
-
-		o = s.taboption('advanced', form.MultiValue, 'icmp_type', _('Match ICMP type'));
-		o.modalonly = true;
-		o.multiple = true;
-		o.custom = true;
-		o.cast = 'table';
-		o.placeholder = _('any');
-		o.value('', 'any');
-		o.value('address-mask-reply');
-		o.value('address-mask-request');
-		o.value('communication-prohibited');
-		o.value('destination-unreachable');
-		o.value('echo-reply');
-		o.value('echo-request');
-		o.value('fragmentation-needed');
-		o.value('host-precedence-violation');
-		o.value('host-prohibited');
-		o.value('host-redirect');
-		o.value('host-unknown');
-		o.value('host-unreachable');
-		o.value('ip-header-bad');
-		o.value('neighbour-advertisement');
-		o.value('neighbour-solicitation');
-		o.value('network-prohibited');
-		o.value('network-redirect');
-		o.value('network-unknown');
-		o.value('network-unreachable');
-		o.value('parameter-problem');
-		o.value('port-unreachable');
-		o.value('precedence-cutoff');
-		o.value('protocol-unreachable');
-		o.value('redirect');
-		o.value('required-option-missing');
-		o.value('router-advertisement');
-		o.value('router-solicitation');
-		o.value('source-quench');
-		o.value('source-route-failed');
-		o.value('time-exceeded');
-		o.value('timestamp-reply');
-		o.value('timestamp-request');
-		o.value('TOS-host-redirect');
-		o.value('TOS-host-unreachable');
-		o.value('TOS-network-redirect');
-		o.value('TOS-network-unreachable');
-		o.value('ttl-zero-during-reassembly');
-		o.value('ttl-zero-during-transit');
-		o.depends('proto', 'icmp');
-
-		o = s.taboption('general', widgets.ZoneSelect, 'src', _('Source zone'));
-		o.modalonly = true;
-		o.nocreate = true;
-		o.allowany = true;
-		o.allowlocal = 'src';
-
-		o = s.taboption('advanced', form.Value, 'src_mac', _('Source MAC address'));
-		o.modalonly = true;
-		o.datatype = 'list(macaddr)';
-		o.placeholder = _('any');
-		L.sortedKeys(hosts).forEach(function(mac) {
-			o.value(mac, '%s (%s)'.format(
-				mac,
-				hosts[mac].name || hosts[mac].ipv4 || hosts[mac].ipv6 || '?'
-			));
-		});
-
-		o = s.taboption('general', form.Value, 'src_ip', _('Source address'));
-		o.modalonly = true;
-		o.datatype = 'list(neg(ipmask))';
-		o.placeholder = _('any');
-		L.sortedKeys(hosts, 'ipv4', 'addr').forEach(function(mac) {
-			o.value(hosts[mac].ipv4, '%s (%s)'.format(
-				hosts[mac].ipv4,
-				hosts[mac].name || mac
-			));
-		});
-
-		o = s.taboption('general', form.Value, 'src_port', _('Source port'));
-		o.modalonly = true;
-		o.datatype = 'list(neg(portrange))';
-		o.placeholder = _('any');
-		o.depends('proto', 'tcp');
-		o.depends('proto', 'udp');
-		o.depends('proto', 'tcp udp');
-		o.depends('proto', 'tcpudp');
-
-		o = s.taboption('general', widgets.ZoneSelect, 'dest', _('Destination zone'));
-		o.modalonly = true;
-		o.nocreate = true;
-		o.allowany = true;
-		o.allowlocal = true;
-
-		o = s.taboption('general', form.Value, 'dest_ip', _('Destination address'));
-		o.modalonly = true;
-		o.datatype = 'list(neg(ipmask))';
-		o.placeholder = _('any');
-		L.sortedKeys(hosts, 'ipv4', 'addr').forEach(function(mac) {
-			o.value(hosts[mac].ipv4, '%s (%s)'.format(
-				hosts[mac].ipv4,
-				hosts[mac].name || mac
-			));
-		});
-
-		o = s.taboption('general', form.Value, 'dest_port', _('Destination port'));
-		o.modalonly = true;
-		o.datatype = 'list(neg(portrange))';
-		o.placeholder = _('any');
-		o.depends('proto', 'tcp');
-		o.depends('proto', 'udp');
-		o.depends('proto', 'tcp udp');
-		o.depends('proto', 'tcpudp');
-
-		o = s.taboption('general', form.ListValue, 'target', _('Action'));
-		o.modalonly = true;
-		o.default = 'ACCEPT';
-		o.value('DROP', _('drop'));
-		o.value('ACCEPT', _('accept'));
-		o.value('REJECT', _('reject'));
-		o.value('NOTRACK', _("don't track"));
-
-		o = s.taboption('advanced', form.Value, 'extra', _('Extra arguments'),
-			_('Passes additional arguments to iptables. Use with care!'));
-		o.modalonly = true;
-
-		o = s.taboption('timed', form.MultiValue, 'weekdays', _('Week Days'));
-		o.modalonly = true;
-		o.multiple = true;
-		o.display = 5;
-		o.placeholder = _('Any day');
-		o.value('Sun', _('Sunday'));
-		o.value('Mon', _('Monday'));
-		o.value('Tue', _('Tuesday'));
-		o.value('Wed', _('Wednesday'));
-		o.value('Thu', _('Thursday'));
-		o.value('Fri', _('Friday'));
-		o.value('Sat', _('Saturday'));
-
-		o = s.taboption('timed', form.MultiValue, 'monthdays', _('Month Days'));
-		o.modalonly = true;
-		o.multiple = true;
-		o.display_size = 15;
-		o.placeholder = _('Any day');
-		for (var i = 1; i <= 31; i++)
-			o.value(i);
-
-		o = s.taboption('timed', form.Value, 'start_time', _('Start Time (hh.mm.ss)'));
-		o.modalonly = true;
-		o.datatype = 'timehhmmss';
-
-		o = s.taboption('timed', form.Value, 'stop_time', _('Stop Time (hh.mm.ss)'));
-		o.modalonly = true;
-		o.datatype = 'timehhmmss';
-
-		o = s.taboption('timed', form.Value, 'start_date', _('Start Date (yyyy-mm-dd)'));
-		o.modalonly = true;
-		o.datatype = 'dateyyyymmdd';
-
-		o = s.taboption('timed', form.Value, 'stop_date', _('Stop Date (yyyy-mm-dd)'));
-		o.modalonly = true;
-		o.datatype = 'dateyyyymmdd';
-
-		o = s.taboption('timed', form.Flag, 'utc_time', _('Time in UTC'));
-		o.modalonly = true;
-		o.default = o.disabled;
-
-		return m.render();
-	}
-});
diff --git a/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js b/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js
deleted file mode 100644
index 78a662626..000000000
--- a/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js
+++ /dev/null
@@ -1,321 +0,0 @@
-'use strict';
-'require rpc';
-'require uci';
-'require form';
-'require network';
-'require firewall';
-'require tools.widgets as widgets';
-
-return L.view.extend({
-	callConntrackHelpers: rpc.declare({
-		object: 'luci',
-		method: 'getConntrackHelpers',
-		expect: { result: [] }
-	}),
-
-	load: function() {
-		return Promise.all([
-			this.callConntrackHelpers(),
-			firewall.getDefaults()
-		]);
-	},
-
-	render: function(data) {
-		var ctHelpers = data[0],
-		    fwDefaults = data[1],
-		    m, s, o, inp, out;
-
-		m = new form.Map('firewall', _('Firewall - Zone Settings'),
-			_('The firewall creates zones over your network interfaces to control network traffic flow.'));
-
-		s = m.section(form.TypedSection, 'defaults', _('General Settings'));
-		s.anonymous = true;
-		s.addremove = false;
-
-		o = s.option(form.Flag, 'syn_flood', _('Enable SYN-flood protection'));
-		o = s.option(form.Flag, 'drop_invalid', _('Drop invalid packets'));
-
-		var p = [
-			s.option(form.ListValue, 'input', _('Input')),
-			s.option(form.ListValue, 'output', _('Output')),
-			s.option(form.ListValue, 'forward', _('Forward'))
-		];
-
-		for (var i = 0; i < p.length; i++) {
-			p[i].value('REJECT', _('reject'));
-			p[i].value('DROP', _('drop'));
-			p[i].value('ACCEPT', _('accept'));
-		}
-
-		/* Netfilter flow offload support */
-
-		if (L.hasSystemFeature('offloading')) {
-			s = m.section(form.TypedSection, 'defaults', _('Routing/NAT Offloading'),
-				_('Experimental feature. Not fully compatible with QoS/SQM.'));
-
-			s.anonymous = true;
-			s.addremove = false;
-
-			o = s.option(form.Flag, 'flow_offloading',
-				_('Software flow offloading'),
-				_('Software based offloading for routing/NAT'));
-			o.optional = true;
-
-			o = s.option(form.Flag, 'flow_offloading_hw',
-				_('Hardware flow offloading'),
-				_('Requires hardware NAT support. Implemented at least for mt7621'));
-			o.optional = true;
-			o.depends('flow_offloading', '1');
-		}
-
-
-		s = m.section(form.GridSection, 'zone', _('Zones'));
-		s.addremove = true;
-		s.anonymous = true;
-		s.sortable  = true;
-
-		s.tab('general', _('General Settings'));
-		s.tab('advanced', _('Advanced Settings'));
-		s.tab('conntrack', _('Conntrack Settings'));
-		s.tab('extra', _('Extra iptables arguments'));
-
-		o = s.taboption('general', form.DummyValue, '_generalinfo');
-		o.rawhtml = true;
-		o.modalonly = true;
-		o.cfgvalue = function(section_id) {
-			var name = uci.get('firewall', section_id, 'name');
-			if (name == null)
-				name = _("this new zone");
-			return _('This section defines common properties of %q. The <em>input</em> and <em>output</em> options set the default policies for traffic entering and leaving this zone while the <em>forward</em> option describes the policy for forwarded traffic between different networks within the zone. <em>Covered networks</em> specifies which available networks are members of this zone.')
-				.replace(/%s/g, name).replace(/%q/g, '"' + name + '"');
-		};
-
-		o = s.taboption('general', form.Value, 'name', _('Name'));
-		o.placeholder = _('Unnamed zone');
-		o.modalonly = true;
-		o.rmempty = false;
-		o.datatype = 'and(uciname,maxlength(11))';
-		o.write = function(section_id, formvalue) {
-			var cfgvalue = this.cfgvalue(section_id);
-
-			if (cfgvalue == null || cfgvalue == '')
-				return uci.set('firewall', section_id, 'name', formvalue);
-			else if (cfgvalue != formvalue)
-				return firewall.renameZone(cfgvalue, formvalue);
-		};
-
-		o = s.option(widgets.ZoneForwards, '_info', _('Zone ⇒ Forwardings'));
-		o.editable = true;
-		o.modalonly = false;
-		o.cfgvalue = function(section_id) {
-			return uci.get('firewall', section_id, 'name');
-		};
-
-		var p = [
-			s.taboption('general', form.ListValue, 'input', _('Input')),
-			s.taboption('general', form.ListValue, 'output', _('Output')),
-			s.taboption('general', form.ListValue, 'forward', _('Forward'))
-		];
-
-		for (var i = 0; i < p.length; i++) {
-			p[i].value('REJECT', _('reject'));
-			p[i].value('DROP', _('drop'));
-			p[i].value('ACCEPT', _('accept'));
-			p[i].editable = true;
-		}
-
-		p[0].default = fwDefaults.getInput();
-		p[1].default = fwDefaults.getOutput();
-		p[2].default = fwDefaults.getForward();
-
-		o = s.taboption('general', form.Flag, 'masq', _('Masquerading'));
-		o.editable = true;
-
-		o = s.taboption('general', form.Flag, 'mtu_fix', _('MSS clamping'));
-		o.modalonly = true;
-
-		o = s.taboption('general', widgets.NetworkSelect, 'network', _('Covered networks'));
-		o.modalonly = true;
-		o.multiple = true;
-		o.write = function(section_id, formvalue) {
-			var name = uci.get('firewall', section_id, 'name'),
-			    cfgvalue = this.cfgvalue(section_id);
-
-			if (typeof(cfgvalue) == 'string' && Array.isArray(formvalue) && (cfgvalue == formvalue.join(' ')))
-				return;
-
-			var tasks = [ firewall.getZone(name) ];
-
-			if (Array.isArray(formvalue))
-				for (var i = 0; i < formvalue.length; i++) {
-					var netname = formvalue[i];
-					tasks.push(network.getNetwork(netname).then(function(net) {
-						return net || network.addNetwork(netname, { 'proto': 'none' });
-					}));
-				}
-
-			return Promise.all(tasks).then(function(zone_networks) {
-				if (zone_networks[0])
-					for (var i = 1; i < zone_networks.length; i++)
-						zone_networks[0].addNetwork(zone_networks[i].getName());
-			});
-		};
-		o.remove = function(section_id) {
-			return uci.set('firewall', section_id, 'network', ' ');
-		};
-
-		o = s.taboption('advanced', form.DummyValue, '_advancedinfo');
-		o.rawhtml = true;
-		o.modalonly = true;
-		o.cfgvalue = function(section_id) {
-			var name = uci.get('firewall', section_id, 'name');
-			if (name == null)
-				name = _("this new zone");
-			return _('The options below control the forwarding policies between this zone (%s) and other zones. <em>Destination zones</em> cover forwarded traffic <strong>originating from %q</strong>. <em>Source zones</em> match forwarded traffic from other zones <strong>targeted at %q</strong>. The forwarding rule is <em>unidirectional</em>, e.g. a forward from lan to wan does <em>not</em> imply a permission to forward from wan to lan as well.')
-				.format(name);
-		};
-
-		o = s.taboption('advanced', widgets.DeviceSelect, 'device', _('Covered devices'), _('Use this option to classify zone traffic by raw, non-<em>uci</em> managed network devices.'));
-		o.modalonly = true;
-		o.noaliases = true;
-		o.multiple = true;
-
-		o = s.taboption('advanced', form.DynamicList, 'subnet', _('Covered subnets'), _('Use this option to classify zone traffic by source or destination subnet instead of networks or devices.'));
-		o.datatype = 'neg(cidr)';
-		o.modalonly = true;
-		o.multiple = true;
-
-		o = s.taboption('advanced', form.ListValue, 'family', _('Restrict to address family'));
-		o.value('', _('IPv4 and IPv6'));
-		o.value('ipv4', _('IPv4 only'));
-		o.value('ipv6', _('IPv6 only'));
-		o.modalonly = true;
-
-		o = s.taboption('advanced', form.DynamicList, 'masq_src', _('Restrict Masquerading to given source subnets'));
-		o.depends('family', '');
-		o.depends('family', 'ipv4');
-		o.datatype = 'list(neg(or(uciname,hostname,ipmask4)))';
-		o.placeholder = '0.0.0.0/0';
-		o.modalonly = true;
-
-		o = s.taboption('advanced', form.DynamicList, 'masq_dest', _('Restrict Masquerading to given destination subnets'));
-		o.depends('family', '');
-		o.depends('family', 'ipv4');
-		o.datatype = 'list(neg(or(uciname,hostname,ipmask4)))';
-		o.placeholder = '0.0.0.0/0';
-		o.modalonly = true;
-
-		o = s.taboption('conntrack', form.Flag, 'conntrack', _('Force connection tracking'), _('Prevent the installation of <em>NOTRACK</em> rules which would bypass connection tracking.'));
-		o.modalonly = true;
-
-		o = s.taboption('conntrack', form.Flag, 'masq_allow_invalid', _('Allow "invalid" traffic'), _('Do not install extra rules to reject forwarded traffic with conntrack state <em>invalid</em>. This may be required for complex asymmetric route setups.'));
-		o.modalonly = true;
-
-		o = s.taboption('conntrack', form.Flag, 'auto_helper', _('Automatic helper assignment'), _('Automatically assign conntrack helpers based on traffic protocol and port'));
-		o.default = o.enabled;
-		o.modalonly = true;
-
-		o = s.taboption('conntrack', form.MultiValue, 'helper', _('Conntrack helpers'), _('Explicitly choses allowed connection tracking helpers for zone traffic'));
-		o.depends('auto_helper', '0');
-		o.modalonly = true;
-		for (var i = 0; i < ctHelpers.length; i++)
-			o.value(ctHelpers[i].name, '<span class="hide-close">%s (%s)</span><span class="hide-open">%s</span>'.format(ctHelpers[i].description, ctHelpers[i].name.toUpperCase(), ctHelpers[i].name.toUpperCase()));
-
-		o = s.taboption('advanced', form.Flag, 'log', _('Enable logging on this zone'));
-		o.modalonly = true;
-
-		o = s.taboption('advanced', form.Value, 'log_limit', _('Limit log messages'));
-		o.depends('log', '1');
-		o.placeholder = '10/minute';
-		o.modalonly = true;
-
-		o = s.taboption('extra', form.DummyValue, '_extrainfo');
-		o.rawhtml = true;
-		o.modalonly = true;
-		o.cfgvalue = function(section_id) {
-			return _('Passing raw iptables arguments to source and destination traffic classification rules allows to match packets based on other criteria than interfaces or subnets. These options should be used with extreme care as invalid values could render the firewall ruleset broken, completely exposing all services.');
-		};
-
-		o = s.taboption('extra', form.Value, 'extra_src', _('Extra source arguments'), _('Additional raw <em>iptables</em> arguments to classify zone source traffic, e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic.'));
-		o.modalonly = true;
-		o.cfgvalue = function(section_id) {
-			return uci.get('firewall', section_id, 'extra_src') || uci.get('firewall', section_id, 'extra');
-		};
-		o.write = function(section_id, value) {
-			uci.unset('firewall', section_id, 'extra');
-			uci.set('firewall', section_id, 'extra_src', value);
-		};
-
-		o = s.taboption('extra', form.Value, 'extra_dest', _('Extra destination arguments'), _('Additional raw <em>iptables</em> arguments to classify zone destination traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS traffic.'));
-		o.modalonly = true;
-		o.cfgvalue = function(section_id) {
-			return uci.get('firewall', section_id, 'extra_dest') || uci.get('firewall', section_id, 'extra_src') || uci.get('firewall', section_id, 'extra');
-		};
-		o.write = function(section_id, value) {
-			uci.unset('firewall', section_id, 'extra');
-			uci.set('firewall', section_id, 'extra_dest', value);
-		};
-
-		o = s.taboption('general', form.DummyValue, '_forwardinfo');
-		o.rawhtml = true;
-		o.modalonly = true;
-		o.cfgvalue = function(section_id) {
-			var name = uci.get('firewall', section_id, 'name');
-			if (name == null)
-				name = _("this new zone");
-			return _('The options below control the forwarding policies between this zone (%s) and other zones. <em>Destination zones</em> cover forwarded traffic <strong>originating from %q</strong>. <em>Source zones</em> match forwarded traffic from other zones <strong>targeted at %q</strong>. The forwarding rule is <em>unidirectional</em>, e.g. a forward from lan to wan does <em>not</em> imply a permission to forward from wan to lan as well.')
-				.format(name);
-		};
-
-		out = o = s.taboption('general', widgets.ZoneSelect, 'out', _('Allow forward to <em>destination zones</em>:'));
-		o.nocreate = true;
-		o.multiple = true;
-		o.modalonly = true;
-		o.filter = function(section_id, value) {
-			return (uci.get('firewall', section_id, 'name') != value);
-		};
-		o.cfgvalue = function(section_id) {
-			var out = (this.option == 'out'),
-			    zone = this.lookupZone(uci.get('firewall', section_id, 'name')),
-			    fwds = zone ? zone.getForwardingsBy(out ? 'src' : 'dest') : [],
-			    value = [];
-
-			for (var i = 0; i < fwds.length; i++)
-				value.push(out ? fwds[i].getDestination() : fwds[i].getSource());
-
-			return value;
-		};
-		o.write = o.remove = function(section_id, formvalue) {
-			var out = (this.option == 'out'),
-			    zone = this.lookupZone(uci.get('firewall', section_id, 'name')),
-			    fwds = zone ? zone.getForwardingsBy(out ? 'src' : 'dest') : [];
-
-			if (formvalue == null)
-				formvalue = [];
-
-			if (Array.isArray(formvalue)) {
-				for (var i = 0; i < fwds.length; i++) {
-					var cmp = out ? fwds[i].getDestination() : fwds[i].getSource();
-					if (!formvalue.filter(function(d) { return d == cmp }).length)
-						zone.deleteForwarding(fwds[i]);
-				}
-
-				for (var i = 0; i < formvalue.length; i++)
-					if (out)
-						zone.addForwardingTo(formvalue[i]);
-					else
-						zone.addForwardingFrom(formvalue[i]);
-			}
-		};
-
-		inp = o = s.taboption('general', widgets.ZoneSelect, 'in', _('Allow forward from <em>source zones</em>:'));
-		o.nocreate = true;
-		o.multiple = true;
-		o.modalonly = true;
-		o.write = o.remove = out.write;
-		o.filter = out.filter;
-		o.cfgvalue = out.cfgvalue;
-
-		return m.render();
-	}
-});
diff --git a/luci-app-firewall/luasrc/controller/firewall.lua b/luci-app-firewall/luasrc/controller/firewall.lua
index 58a44c601..4fe7770ef 100644
--- a/luci-app-firewall/luasrc/controller/firewall.lua
+++ b/luci-app-firewall/luasrc/controller/firewall.lua
@@ -6,13 +6,16 @@ function index()
 		_("Firewall"), 60)
 
 	entry({"admin", "network", "firewall", "zones"},
-		view("firewall/zones"), _("General Settings"), 10)
+		arcombine(cbi("firewall/zones"), cbi("firewall/zone-details")),
+		_("General Settings"), 10).leaf = true
 
 	entry({"admin", "network", "firewall", "forwards"},
-		view("firewall/forwards"), _("Port Forwards"), 20)
+		arcombine(cbi("firewall/forwards"), cbi("firewall/forward-details")),
+		_("Port Forwards"), 20).leaf = true
 
 	entry({"admin", "network", "firewall", "rules"},
-		view("firewall/rules"), _("Traffic Rules"), 30)
+		arcombine(cbi("firewall/rules"), cbi("firewall/rule-details")),
+		_("Traffic Rules"), 30).leaf = true
 
 	entry({"admin", "network", "firewall", "custom"},
 		form("firewall/custom"),
diff --git a/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua b/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua
new file mode 100644
index 000000000..d51f8fb79
--- /dev/null
+++ b/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua
@@ -0,0 +1,162 @@
+-- Copyright 2011 Jo-Philipp Wich <jow@openwrt.org>
+-- Licensed to the public under the Apache License 2.0.
+
+local sys = require "luci.sys"
+local dsp = require "luci.dispatcher"
+local ft  = require "luci.tools.firewall"
+
+local m, s, o
+
+arg[1] = arg[1] or ""
+
+m = Map("firewall",
+	translate("Firewall - Port Forwards"),
+	translate("This page allows you to change advanced properties of the port \
+	           forwarding entry. In most cases there is no need to modify \
+			   those settings."))
+
+m.redirect = dsp.build_url("admin/network/firewall/forwards")
+
+if m.uci:get("firewall", arg[1]) ~= "redirect" then
+	luci.http.redirect(m.redirect)
+	return
+else
+	local name = m:get(arg[1], "name") or m:get(arg[1], "_name")
+	if not name or #name == 0 then
+		name = translate("(Unnamed Entry)")
+	end
+	m.title = "%s - %s" %{ translate("Firewall - Port Forwards"), name }
+end
+
+s = m:section(NamedSection, arg[1], "redirect", "")
+s.anonymous = true
+s.addremove = false
+
+ft.opt_enabled(s, Button)
+ft.opt_name(s, Value, translate("Name"))
+
+
+o = s:option(Value, "proto", translate("Protocol"))
+o:value("tcp udp", "TCP+UDP")
+o:value("tcp", "TCP")
+o:value("udp", "UDP")
+o:value("icmp", "ICMP")
+
+function o.cfgvalue(...)
+	local v = Value.cfgvalue(...)
+	if not v or v == "tcpudp" then
+		return "tcp udp"
+	end
+	return v
+end
+
+
+o = s:option(Value, "src", translate("Source zone"))
+o.nocreate = true
+o.default = "wan"
+o.template = "cbi/firewall_zonelist"
+o.rmempty = false
+
+
+o = s:option(DynamicList, "src_mac",
+	translate("Source MAC address"),
+	translate("Only match incoming traffic from these MACs."))
+o.rmempty = true
+o.datatype = "neg(macaddr)"
+o.placeholder = translate("any")
+
+luci.sys.net.mac_hints(function(mac, name)
+	o:value(mac, "%s (%s)" %{ mac, name })
+end)
+
+
+o = s:option(Value, "src_ip",
+	translate("Source IP address"),
+	translate("Only match incoming traffic from this IP or range."))
+o.rmempty = true
+o.datatype = "neg(ipmask4)"
+o.placeholder = translate("any")
+
+luci.sys.net.ipv4_hints(function(ip, name)
+	o:value(ip, "%s (%s)" %{ ip, name })
+end)
+
+
+o = s:option(Value, "src_port",
+	translate("Source port"),
+	translate("Only match incoming traffic originating from the given source port or port range on the client host"))
+o.rmempty = true
+o.datatype = "neg(portrange)"
+o.placeholder = translate("any")
+
+o:depends("proto", "tcp")
+o:depends("proto", "udp")
+o:depends("proto", "tcp udp")
+o:depends("proto", "tcpudp")
+
+o = s:option(Value, "src_dip",
+	translate("External IP address"),
+	translate("Only match incoming traffic directed at the given IP address."))
+
+luci.sys.net.ipv4_hints(function(ip, name)
+	o:value(ip, "%s (%s)" %{ ip, name })
+end)
+
+
+o.rmempty = true
+o.datatype = "neg(ipmask4)"
+o.placeholder = translate("any")
+
+
+o = s:option(Value, "src_dport", translate("External port"),
+	translate("Match incoming traffic directed at the given " ..
+		"destination port or port range on this host"))
+o.datatype = "neg(portrange)"
+
+o:depends("proto", "tcp")
+o:depends("proto", "udp")
+o:depends("proto", "tcp udp")
+o:depends("proto", "tcpudp")
+
+o = s:option(Value, "dest", translate("Internal zone"))
+o.nocreate = true
+o.default = "lan"
+o.template = "cbi/firewall_zonelist"
+
+
+o = s:option(Value, "dest_ip", translate("Internal IP address"),
+	translate("Redirect matched incoming traffic to the specified \
+		internal host"))
+o.datatype = "ipmask4"
+
+luci.sys.net.ipv4_hints(function(ip, name)
+	o:value(ip, "%s (%s)" %{ ip, name })
+end)
+
+
+o = s:option(Value, "dest_port",
+	translate("Internal port"),
+	translate("Redirect matched incoming traffic to the given port on \
+		the internal host"))
+o.placeholder = translate("any")
+o.datatype = "portrange"
+
+o:depends("proto", "tcp")
+o:depends("proto", "udp")
+o:depends("proto", "tcp udp")
+o:depends("proto", "tcpudp")
+
+o = s:option(Flag, "reflection", translate("Enable NAT Loopback"))
+o.rmempty = true
+o.default = o.enabled
+o.cfgvalue = function(...)
+	return Flag.cfgvalue(...) or "1"
+end
+
+
+s:option(Value, "extra",
+	translate("Extra arguments"),
+	translate("Passes additional arguments to iptables. Use with care!"))
+
+
+return m
diff --git a/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua b/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua
new file mode 100644
index 000000000..5d1ffe091
--- /dev/null
+++ b/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua
@@ -0,0 +1,133 @@
+-- Copyright 2008 Steven Barth <steven@midlink.org>
+-- Copyright 2010-2012 Jo-Philipp Wich <jow@openwrt.org>
+-- Licensed to the public under the Apache License 2.0.
+
+local ds = require "luci.dispatcher"
+local ft = require "luci.tools.firewall"
+
+m = Map("firewall", translate("Firewall - Port Forwards"),
+	translate("Port forwarding allows remote computers on the Internet to \
+	           connect to a specific computer or service within the \
+	           private LAN."))
+
+--
+-- Port Forwards
+--
+
+s = m:section(TypedSection, "redirect", translate("Port Forwards"))
+s.template  = "cbi/tblsection"
+s.addremove = true
+s.anonymous = true
+s.sortable  = true
+s.extedit   = ds.build_url("admin/network/firewall/forwards/%s")
+s.template_addremove = "firewall/cbi_addforward"
+
+function s.create(self, section)
+	local n = m:formvalue("_newfwd.name")
+	local p = m:formvalue("_newfwd.proto")
+	local E = m:formvalue("_newfwd.extzone")
+	local e = m:formvalue("_newfwd.extport")
+	local I = m:formvalue("_newfwd.intzone")
+	local a = m:formvalue("_newfwd.intaddr")
+	local i = m:formvalue("_newfwd.intport")
+
+	if p == "other" or (p and a) then
+		created = TypedSection.create(self, section)
+
+		self.map:set(created, "target",    "DNAT")
+		self.map:set(created, "src",       E or "wan")
+		self.map:set(created, "dest",      I or "lan")
+		self.map:set(created, "proto",     (p ~= "other") and p or "all")
+		self.map:set(created, "src_dport", e)
+		self.map:set(created, "dest_ip",   a)
+		self.map:set(created, "dest_port", i)
+		self.map:set(created, "name",      n)
+	end
+
+	if p ~= "other" then
+		created = nil
+	end
+end
+
+function s.parse(self, ...)
+	TypedSection.parse(self, ...)
+	if created then
+		m.uci:save("firewall")
+		luci.http.redirect(ds.build_url(
+			"admin/network/firewall/forwards", created
+		))
+	end
+end
+
+function s.filter(self, sid)
+	return (self.map:get(sid, "target") ~= "SNAT")
+end
+
+function s.sectiontitle(self, sid)
+	return (self.map:get(sid, "name") or translate("Unnamed forward"))
+end
+
+
+local function forward_proto_txt(self, s)
+	return "%s-%s" %{
+		translate("IPv4"),
+		ft.fmt_proto(self.map:get(s, "proto"),
+	                 self.map:get(s, "icmp_type")) or "TCP+UDP"
+	}
+end
+
+local function forward_src_txt(self, s)
+	local z = ft.fmt_zone(self.map:get(s, "src"), translate("any zone"))
+	local a = ft.fmt_ip(self.map:get(s, "src_ip"), translate("any host"))
+	local p = ft.fmt_port(self.map:get(s, "src_port"))
+	local m = ft.fmt_mac(self.map:get(s, "src_mac"))
+
+	if p and m then
+		return translatef("From %s in %s with source %s and %s", a, z, p, m)
+	elseif p or m then
+		return translatef("From %s in %s with source %s", a, z, p or m)
+	else
+		return translatef("From %s in %s", a, z)
+	end
+end
+
+local function forward_via_txt(self, s)
+	local a = ft.fmt_ip(self.map:get(s, "src_dip"), translate("any router IP"))
+	local p = ft.fmt_port(self.map:get(s, "src_dport"))
+
+	if p then
+		return translatef("Via %s at %s", a, p)
+	else
+		return translatef("Via %s", a)
+	end
+end
+
+match = s:option(DummyValue, "match", translate("Match"))
+match.rawhtml = true
+function match.cfgvalue(self, s)
+	return "<small>%s<br />%s<br />%s</small>" % {
+		forward_proto_txt(self, s),
+		forward_src_txt(self, s),
+		forward_via_txt(self, s)
+	}
+end
+
+
+dest = s:option(DummyValue, "dest", translate("Forward to"))
+dest.rawhtml = true
+function dest.cfgvalue(self, s)
+	local z = ft.fmt_zone(self.map:get(s, "dest"), translate("any zone"))
+	local a = ft.fmt_ip(self.map:get(s, "dest_ip"), translate("any host"))
+	local p = ft.fmt_port(self.map:get(s, "dest_port")) or
+		ft.fmt_port(self.map:get(s, "src_dport"))
+
+	if p then
+		return translatef("%s, %s in %s", a, p, z)
+	else
+		return translatef("%s in %s", a, z)
+	end
+end
+
+ft.opt_enabled(s, Flag, translate("Enable"))
+
+return m
diff --git a/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua b/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua
new file mode 100644
index 000000000..def01c669
--- /dev/null
+++ b/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua
@@ -0,0 +1,365 @@
+-- Copyright 2008 Steven Barth <steven@midlink.org>
+-- Copyright 2010-2012 Jo-Philipp Wich <jow@openwrt.org>
+-- Licensed to the public under the Apache License 2.0.
+local dsp = require "luci.dispatcher"
+local ft = require "luci.tools.firewall"
+local nw = require "luci.model.network"
+local m, s, o, v, _
+
+arg[1] = arg[1] or ""
+
+m = Map("firewall",
+	translate("Firewall - Traffic Rules"),
+	translate("This page allows you to change advanced properties of the \
+	           traffic rule entry, such as matched source and destination \
+			   hosts."))
+
+m.redirect = dsp.build_url("admin/network/firewall/rules")
+
+nw.init(m.uci)
+
+local rule_type = m.uci:get("firewall", arg[1])
+if rule_type == "redirect" and m:get(arg[1], "target") ~= "SNAT" then
+	rule_type = nil
+end
+
+if not rule_type then
+	luci.http.redirect(m.redirect)
+	return
+
+--
+-- SNAT
+--
+elseif rule_type == "redirect" then
+
+	local name = m:get(arg[1], "name") or m:get(arg[1], "_name")
+	if not name or #name == 0 then
+		name = translate("(Unnamed SNAT)")
+	else
+		name = "SNAT %s" % name
+	end
+
+	m.title = "%s - %s" %{ translate("Firewall - Traffic Rules"), name }
+
+	s = m:section(NamedSection, arg[1], "redirect", "")
+	s.anonymous = true
+	s.addremove = false
+
+
+	ft.opt_enabled(s, Button)
+	ft.opt_name(s, Value, translate("Name"))
+
+
+	o = s:option(Value, "proto",
+		translate("Protocol"),
+		translate("You may specify multiple by selecting \"-- custom --\" and \
+		           then entering protocols separated by space."))
+
+	o:value("all", "All protocols")
+	o:value("tcp udp", "TCP+UDP")
+	o:value("tcp", "TCP")
+	o:value("udp", "UDP")
+	o:value("icmp", "ICMP")
+
+	function o.cfgvalue(...)
+		local v = Value.cfgvalue(...)
+		if not v or v == "tcpudp" then
+			return "tcp udp"
+		end
+		return v
+	end
+
+
+	o = s:option(Value, "src", translate("Source zone"))
+	o.nocreate = true
+	o.default = "wan"
+	o.template = "cbi/firewall_zonelist"
+
+
+	o = s:option(Value, "src_ip", translate("Source IP address"))
+	o.rmempty = true
+	o.datatype = "neg(ipmask4)"
+	o.placeholder = translate("any")
+
+	luci.sys.net.ipv4_hints(function(ip, name)
+		o:value(ip, "%s (%s)" %{ ip, name })
+	end)
+
+
+	o = s:option(Value, "src_port",
+		translate("Source port"),
+		translate("Match incoming traffic originating from the given source \
+			port or port range on the client host."))
+	o.rmempty = true
+	o.datatype = "neg(portrange)"
+	o.placeholder = translate("any")
+
+	o:depends("proto", "tcp")
+	o:depends("proto", "udp")
+	o:depends("proto", "tcp udp")
+	o:depends("proto", "tcpudp")
+
+	o = s:option(Value, "dest", translate("Destination zone"))
+	o.nocreate = true
+	o.default = "lan"
+	o.template = "cbi/firewall_zonelist"
+
+
+	o = s:option(Value, "dest_ip", translate("Destination IP address"))
+	o.datatype = "neg(ipmask4)"
+
+	luci.sys.net.ipv4_hints(function(ip, name)
+		o:value(ip, "%s (%s)" %{ ip, name })
+	end)
+
+
+	o = s:option(Value, "dest_port",
+		translate("Destination port"),
+		translate("Match forwarded traffic to the given destination port or \
+			port range."))
+
+	o.rmempty = true
+	o.placeholder = translate("any")
+	o.datatype = "neg(portrange)"
+
+	o:depends("proto", "tcp")
+	o:depends("proto", "udp")
+	o:depends("proto", "tcp udp")
+	o:depends("proto", "tcpudp")
+
+	o = s:option(Value, "src_dip",
+		translate("SNAT IP address"),
+		translate("Rewrite matched traffic to the given address."))
+	o.rmempty = false
+	o.datatype = "ip4addr"
+
+	for _, v in ipairs(nw:get_interfaces()) do
+		local a
+		for _, a in ipairs(v:ipaddrs()) do
+			o:value(a:host():string(), '%s (%s)' %{
+				a:host():string(), v:shortname()
+			})
+		end
+	end
+
+
+	o = s:option(Value, "src_dport", translate("SNAT port"),
+		translate("Rewrite matched traffic to the given source port. May be \
+			left empty to only rewrite the IP address."))
+	o.datatype = "portrange"
+	o.rmempty = true
+	o.placeholder = translate('Do not rewrite')
+
+	o:depends("proto", "tcp")
+	o:depends("proto", "udp")
+	o:depends("proto", "tcp udp")
+	o:depends("proto", "tcpudp")
+
+	s:option(Value, "extra",
+		translate("Extra arguments"),
+		translate("Passes additional arguments to iptables. Use with care!"))
+
+
+--
+-- Rule
+--
+else
+	local name = m:get(arg[1], "name") or m:get(arg[1], "_name")
+	if not name or #name == 0 then
+		name = translate("(Unnamed Rule)")
+	end
+
+	m.title = "%s - %s" %{ translate("Firewall - Traffic Rules"), name }
+
+
+	s = m:section(NamedSection, arg[1], "rule", "")
+	s.anonymous = true
+	s.addremove = false
+
+	ft.opt_enabled(s, Button)
+	ft.opt_name(s, Value, translate("Name"))
+
+
+	o = s:option(ListValue, "family", translate("Restrict to address family"))
+	o.rmempty = true
+	o:value("", translate("IPv4 and IPv6"))
+	o:value("ipv4", translate("IPv4 only"))
+	o:value("ipv6", translate("IPv6 only"))
+
+
+	o = s:option(Value, "proto", translate("Protocol"))
+	o:value("all", translate("Any"))
+	o:value("tcp udp", "TCP+UDP")
+	o:value("tcp", "TCP")
+	o:value("udp", "UDP")
+	o:value("icmp", "ICMP")
+
+	function o.cfgvalue(...)
+		local v = Value.cfgvalue(...)
+		if not v or v == "tcpudp" then
+			return "tcp udp"
+		end
+		return v
+	end
+
+
+	o = s:option(DropDown, "icmp_type", translate("Match ICMP type"))
+	o.multiple = true
+	o.display = 10
+	o.dropdown = 10
+	o.custom = true
+	o.cast = "table"
+
+	o:value("", "any")
+	o:value("echo-reply")
+	o:value("destination-unreachable")
+	o:value("network-unreachable")
+	o:value("host-unreachable")
+	o:value("protocol-unreachable")
+	o:value("port-unreachable")
+	o:value("fragmentation-needed")
+	o:value("source-route-failed")
+	o:value("network-unknown")
+	o:value("host-unknown")
+	o:value("network-prohibited")
+	o:value("host-prohibited")
+	o:value("TOS-network-unreachable")
+	o:value("TOS-host-unreachable")
+	o:value("communication-prohibited")
+	o:value("host-precedence-violation")
+	o:value("precedence-cutoff")
+	o:value("source-quench")
+	o:value("redirect")
+	o:value("network-redirect")
+	o:value("host-redirect")
+	o:value("TOS-network-redirect")
+	o:value("TOS-host-redirect")
+	o:value("echo-request")
+	o:value("router-advertisement")
+	o:value("router-solicitation")
+	o:value("time-exceeded")
+	o:value("ttl-zero-during-transit")
+	o:value("ttl-zero-during-reassembly")
+	o:value("parameter-problem")
+	o:value("ip-header-bad")
+	o:value("required-option-missing")
+	o:value("timestamp-request")
+	o:value("timestamp-reply")
+	o:value("address-mask-request")
+	o:value("address-mask-reply")
+
+	o:depends("proto", "icmp")
+
+
+	o = s:option(Value, "src", translate("Source zone"))
+	o.nocreate = true
+	o.allowany = true
+	o.allowlocal = "src"
+	o.template = "cbi/firewall_zonelist"
+
+
+	o = s:option(Value, "src_mac", translate("Source MAC address"))
+	o.datatype = "list(macaddr)"
+	o.placeholder = translate("any")
+
+	luci.sys.net.mac_hints(function(mac, name)
+		o:value(mac, "%s (%s)" %{ mac, name })
+	end)
+
+
+	o = s:option(Value, "src_ip", translate("Source address"))
+	o.datatype = "list(neg(ipmask))"
+	o.placeholder = translate("any")
+
+	luci.sys.net.ipv4_hints(function(ip, name)
+		o:value(ip, "%s (%s)" %{ ip, name })
+	end)
+
+
+	o = s:option(Value, "src_port", translate("Source port"))
+	o.datatype = "list(neg(portrange))"
+	o.placeholder = translate("any")
+
+	o:depends("proto", "tcp")
+	o:depends("proto", "udp")
+	o:depends("proto", "tcp udp")
+	o:depends("proto", "tcpudp")
+
+	o = s:option(Value, "dest_local", translate("Output zone"))
+	o.nocreate = true
+	o.allowany = true
+	o.template = "cbi/firewall_zonelist"
+	o.alias = "dest"
+	o:depends("src", "")
+
+	o = s:option(Value, "dest_remote", translate("Destination zone"))
+	o.nocreate = true
+	o.allowany = true
+	o.allowlocal = true
+	o.template = "cbi/firewall_zonelist"
+	o.alias = "dest"
+	o:depends({["src"] = "", ["!reverse"] = true})
+
+
+	o = s:option(Value, "dest_ip", translate("Destination address"))
+	o.datatype = "list(neg(ipmask))"
+	o.placeholder = translate("any")
+
+	luci.sys.net.ipv4_hints(function(ip, name)
+		o:value(ip, "%s (%s)" %{ ip, name })
+	end)
+
+
+	o = s:option(Value, "dest_port", translate("Destination port"))
+	o.datatype = "list(neg(portrange))"
+	o.placeholder = translate("any")
+
+	o:depends("proto", "tcp")
+	o:depends("proto", "udp")
+	o:depends("proto", "tcp udp")
+	o:depends("proto", "tcpudp")
+
+	o = s:option(ListValue, "target", translate("Action"))
+	o.default = "ACCEPT"
+	o:value("DROP", translate("drop"))
+	o:value("ACCEPT", translate("accept"))
+	o:value("REJECT", translate("reject"))
+	o:value("NOTRACK", translate("don't track"))
+
+
+	s:option(Value, "extra",
+		translate("Extra arguments"),
+		translate("Passes additional arguments to iptables. Use with care!"))
+end
+
+o = s:option(DropDown, "weekdays", translate("Week Days"))
+o.multiple = true
+o.display = 5
+o:value("Sun", translate("Sunday"))
+o:value("Mon", translate("Monday"))
+o:value("Tue", translate("Tuesday"))
+o:value("Wed", translate("Wednesday"))
+o:value("Thu", translate("Thursday"))
+o:value("Fri", translate("Friday"))
+o:value("Sat", translate("Saturday"))
+
+o = s:option(DropDown, "monthdays", translate("Month Days"))
+o.multiple = true
+o.display = 15
+for i = 1,31 do
+	o:value(translate(i))
+end
+
+o = s:option(Value, "start_time", translate("Start Time (hh:mm:ss)"))
+o.datatype = "timehhmmss"
+o = s:option(Value, "stop_time", translate("Stop Time (hh:mm:ss)"))
+o.datatype = "timehhmmss"
+o = s:option(Value, "start_date", translate("Start Date (yyyy-mm-dd)"))
+o.datatype = "dateyyyymmdd"
+o = s:option(Value, "stop_date", translate("Stop Date (yyyy-mm-dd)"))
+o.datatype = "dateyyyymmdd"
+
+o = s:option(Flag, "utc_time", translate("Time in UTC"))
+o.default = o.disabled
+
+return m
diff --git a/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua b/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua
new file mode 100644
index 000000000..f4b6b2a92
--- /dev/null
+++ b/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua
@@ -0,0 +1,273 @@
+-- Copyright 2008 Steven Barth <steven@midlink.org>
+-- Copyright 2010-2012 Jo-Philipp Wich <jow@openwrt.org>
+-- Licensed to the public under the Apache License 2.0.
+
+local ds = require "luci.dispatcher"
+local ft = require "luci.tools.firewall"
+
+m = Map("firewall",
+	translate("Firewall - Traffic Rules"),
+	translate("Traffic rules define policies for packets traveling between \
+		different zones, for example to reject traffic between certain hosts \
+		or to open WAN ports on the router."))
+
+--
+-- Rules
+--
+
+s = m:section(TypedSection, "rule", translate("Traffic Rules"))
+s.addremove = true
+s.anonymous = true
+s.sortable  = true
+s.template = "cbi/tblsection"
+s.extedit   = ds.build_url("admin/network/firewall/rules/%s")
+s.defaults.target = "ACCEPT"
+s.template_addremove = "firewall/cbi_addrule"
+
+
+function s.create(self, section)
+	created = TypedSection.create(self, section)
+end
+
+function s.parse(self, ...)
+	TypedSection.parse(self, ...)
+
+	local i_n = m:formvalue("_newopen.name")
+	local i_p = m:formvalue("_newopen.proto")
+	local i_e = m:formvalue("_newopen.extport")
+	local i_x = m:formvalue("_newopen.submit")
+
+	local f_n = m:formvalue("_newfwd.name")
+	local f_s = m:formvalue("_newfwd.src")
+	local f_d = m:formvalue("_newfwd.dest")
+	local f_x = m:formvalue("_newfwd.submit")
+
+	if i_x then
+		created = TypedSection.create(self, section)
+
+		self.map:set(created, "target",    "ACCEPT")
+		self.map:set(created, "src",       "wan")
+		self.map:set(created, "proto",     (i_p ~= "other") and i_p or "all")
+		self.map:set(created, "dest_port", i_e)
+		self.map:set(created, "name",      i_n)
+
+		if i_p ~= "other" and i_e and #i_e > 0 then
+			created = nil
+		end
+
+	elseif f_x then
+		created = TypedSection.create(self, section)
+
+		self.map:set(created, "target", "ACCEPT")
+		self.map:set(created, "src",    f_s)
+		self.map:set(created, "dest",   f_d)
+		self.map:set(created, "name",   f_n)
+	end
+
+	if created then
+		m.uci:save("firewall")
+		luci.http.redirect(ds.build_url(
+			"admin/network/firewall/rules", created
+		))
+	end
+end
+
+function s.sectiontitle(self, sid)
+	return (self.map:get(sid, "name") or translate("Unnamed rule"))
+end
+
+local function rule_proto_txt(self, s)
+	local f = self.map:get(s, "family")
+	local p = ft.fmt_proto(self.map:get(s, "proto"),
+	                       self.map:get(s, "icmp_type")) or translate("traffic")
+
+	if f and f:match("4") then
+		return "%s-%s" %{ translate("IPv4"), p }
+	elseif f and f:match("6") then
+		return "%s-%s" %{ translate("IPv6"), p }
+	else
+		return "%s %s" %{ translate("Any"), p }
+	end
+end
+
+local function rule_src_txt(self, s)
+	local z = ft.fmt_zone(self.map:get(s, "src"))
+	local p = ft.fmt_port(self.map:get(s, "src_port"))
+	local m = ft.fmt_mac(self.map:get(s, "src_mac"))
+
+	-- Forward/Input
+	if z and #z > 0 then
+		local a = ft.fmt_ip(self.map:get(s, "src_ip"), translate("any host"))
+		if p and m then
+			return translatef("From %s in %s with source %s and %s", a, z, p, m)
+		elseif p or m then
+			return translatef("From %s in %s with source %s", a, z, p or m)
+		else
+			return translatef("From %s in %s", a, z)
+		end
+
+	-- Output
+	else
+		local a = ft.fmt_ip(self.map:get(s, "src_ip"), translate("any router IP"))
+		if p and m then
+			return translatef("From %s on <var>this device</var> with source %s and %s", a, p, m)
+		elseif p or m then
+			return translatef("From %s on <var>this device</var> with source %s", a, p or m)
+		else
+			return translatef("From %s on <var>this device</var>", a)
+		end
+	end
+end
+
+local function rule_dest_txt(self, s)
+	local z = ft.fmt_zone(self.map:get(s, "dest"))
+	local p = ft.fmt_port(self.map:get(s, "dest_port"))
+
+	-- Forward
+	if z then
+		local a = ft.fmt_ip(self.map:get(s, "dest_ip"), translate("any host"))
+		if p then
+			return translatef("To %s, %s in %s", a, p, z)
+		else
+			return translatef("To %s in %s", a, z)
+		end
+
+	-- Input
+	else
+		local a = ft.fmt_ip(self.map:get(s, "dest_ip"),
+			translate("any router IP"))
+
+		if p then
+			return translatef("To %s at %s on <var>this device</var>", a, p)
+		else
+			return translatef("To %s on <var>this device</var>", a)
+		end
+	end
+end
+
+local function snat_dest_txt(self, s)
+	local z = ft.fmt_zone(self.map:get(s, "dest"), translate("any zone"))
+	local a = ft.fmt_ip(self.map:get(s, "dest_ip"), translate("any host"))
+	local p = ft.fmt_port(self.map:get(s, "dest_port")) or
+		ft.fmt_port(self.map:get(s, "src_dport"))
+
+	if p then
+		return translatef("To %s, %s in %s", a, p, z)
+	else
+		return translatef("To %s in %s", a, z)
+	end
+end
+
+
+match = s:option(DummyValue, "match", translate("Match"))
+match.rawhtml = true
+function match.cfgvalue(self, s)
+	return "<small>%s<br />%s<br />%s</small>" % {
+		rule_proto_txt(self, s),
+		rule_src_txt(self, s),
+		rule_dest_txt(self, s)
+	}
+end
+
+target = s:option(DummyValue, "target", translate("Action"))
+target.rawhtml = true
+function target.cfgvalue(self, s)
+	local t = ft.fmt_target(self.map:get(s, "target"), self.map:get(s, "src"), self.map:get(s, "dest"))
+	local l = ft.fmt_limit(self.map:get(s, "limit"),
+		self.map:get(s, "limit_burst"))
+
+	if l then
+		return translatef("<var>%s</var> and limit to %s", t, l)
+	else
+		return "<var>%s</var>" % t
+	end
+end
+
+ft.opt_enabled(s, Flag, translate("Enable"))
+
+
+--
+-- SNAT
+--
+
+s = m:section(TypedSection, "redirect",
+	translate("Source NAT"),
+	translate("Source NAT is a specific form of masquerading which allows \
+		fine grained control over the source IP used for outgoing traffic, \
+		for example to map multiple WAN addresses to internal subnets."))
+s.template  = "cbi/tblsection"
+s.addremove = true
+s.anonymous = true
+s.sortable  = true
+s.extedit   = ds.build_url("admin/network/firewall/rules/%s")
+s.template_addremove = "firewall/cbi_addsnat"
+
+function s.create(self, section)
+	created = TypedSection.create(self, section)
+end
+
+function s.parse(self, ...)
+	TypedSection.parse(self, ...)
+
+	local n = m:formvalue("_newsnat.name")
+	local s = m:formvalue("_newsnat.src")
+	local d = m:formvalue("_newsnat.dest")
+	local a = m:formvalue("_newsnat.dip")
+	local p = m:formvalue("_newsnat.dport")
+	local x = m:formvalue("_newsnat.submit")
+
+	if x and a and #a > 0 then
+		created = TypedSection.create(self, section)
+
+		self.map:set(created, "target",    "SNAT")
+		self.map:set(created, "src",       s)
+		self.map:set(created, "dest",      d)
+		self.map:set(created, "proto",     "all")
+		self.map:set(created, "src_dip",   a)
+		self.map:set(created, "src_dport", p)
+		self.map:set(created, "name",      n)
+	end
+
+	if created then
+		m.uci:save("firewall")
+		luci.http.redirect(ds.build_url(
+			"admin/network/firewall/rules", created
+		))
+	end
+end
+
+function s.filter(self, sid)
+	return (self.map:get(sid, "target") == "SNAT")
+end
+
+function s.sectiontitle(self, sid)
+	return (self.map:get(sid, "name") or translate("Unnamed SNAT"))
+end
+
+match = s:option(DummyValue, "match", translate("Match"))
+match.rawhtml = true
+function match.cfgvalue(self, s)
+	return "<small>%s<br />%s<br />%s</small>" % {
+		rule_proto_txt(self, s),
+		rule_src_txt(self, s),
+		snat_dest_txt(self, s)
+	}
+end
+
+snat = s:option(DummyValue, "via", translate("Action"))
+snat.rawhtml = true
+function snat.cfgvalue(self, s)
+	local a = ft.fmt_ip(self.map:get(s, "src_dip"))
+	local p = ft.fmt_port(self.map:get(s, "src_dport"))
+
+	if a and p then
+		return translatef("Rewrite to source %s, %s", a, p)
+	else
+		return translatef("Rewrite to source %s", a or p)
+	end
+end
+
+ft.opt_enabled(s, Flag, translate("Enable"))
+
+
+return m
diff --git a/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua b/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua
new file mode 100644
index 000000000..e168c3c60
--- /dev/null
+++ b/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua
@@ -0,0 +1,229 @@
+-- Copyright 2008 Steven Barth <steven@midlink.org>
+-- Copyright 2010-2011 Jo-Philipp Wich <jow@openwrt.org>
+-- Licensed to the public under the Apache License 2.0.
+
+local nw = require "luci.model.network"
+local fw = require "luci.model.firewall"
+local ds = require "luci.dispatcher"
+local ut = require "luci.util"
+
+local m, p, i, v
+local s, name, net, family, msrc, mdest, log, lim
+local s2, out, inp
+
+
+m = Map("firewall", translate("Firewall - Zone Settings"))
+m.redirect = luci.dispatcher.build_url("admin/network/firewall/zones")
+
+fw.init(m.uci)
+nw.init(m.uci)
+
+
+local zone = fw:get_zone(arg[1])
+if not zone then
+	luci.http.redirect(ds.build_url("admin/network/firewall/zones"))
+	return
+else
+	m.title = "%s - %s" %{
+		translate("Firewall - Zone Settings"),
+		translatef("Zone %q", zone:name() or "?")
+	}
+end
+
+
+s = m:section(NamedSection, zone.sid, "zone",
+	translatef("Zone %q", zone:name()),
+	translatef("This section defines common properties of %q. \
+		The <em>input</em> and <em>output</em> options set the default \
+		policies for traffic entering and leaving this zone while the \
+		<em>forward</em> option describes the policy for forwarded traffic \
+		between different networks within the zone. \
+		<em>Covered networks</em> specifies which available networks are \
+		members of this zone.", zone:name()))
+
+s.anonymous = true
+s.addremove = false
+
+m.on_commit = function(map)
+	local zone = fw:get_zone(arg[1])
+	if zone then
+		s.section  = zone.sid
+		s2.section = zone.sid
+	end
+end
+
+
+s:tab("general", translate("General Settings"))
+s:tab("advanced", translate("Advanced Settings"))
+
+
+name = s:taboption("general", Value, "name", translate("Name"))
+name.optional = false
+name.forcewrite = true
+name.datatype = "and(uciname,maxlength(11))"
+
+function name.write(self, section, value)
+	if zone:name() ~= value then
+		fw:rename_zone(zone:name(), value)
+		out.exclude = value
+		inp.exclude = value
+	end
+end
+
+p = {
+	s:taboption("general", ListValue, "input", translate("Input")),
+	s:taboption("general", ListValue, "output", translate("Output")),
+	s:taboption("general", ListValue, "forward", translate("Forward"))
+}
+
+for i, v in ipairs(p) do
+	v:value("REJECT", translate("reject"))
+	v:value("DROP", translate("drop"))
+	v:value("ACCEPT", translate("accept"))
+end
+
+s:taboption("general", Flag, "masq", translate("Masquerading"))
+s:taboption("general", Flag, "mtu_fix", translate("MSS clamping"))
+
+net = s:taboption("general", Value, "network", translate("Covered networks"))
+net.template = "cbi/network_netlist"
+net.widget = "checkbox"
+net.cast = "string"
+
+function net.formvalue(self, section)
+	return Value.formvalue(self, section) or "-"
+end
+
+function net.cfgvalue(self, section)
+	return Value.cfgvalue(self, section) or name:cfgvalue(section)
+end
+
+function net.write(self, section, value)
+	zone:clear_networks()
+
+	local net
+	for net in ut.imatch(value) do
+		local n = nw:get_network(net) or nw:add_network(net, { proto = "none" })
+		if n then
+			zone:add_network(n:name())
+		end
+	end
+end
+
+
+family = s:taboption("advanced", ListValue, "family",
+	translate("Restrict to address family"))
+
+family.rmempty = true
+family:value("", translate("IPv4 and IPv6"))
+family:value("ipv4", translate("IPv4 only"))
+family:value("ipv6", translate("IPv6 only"))
+
+msrc = s:taboption("advanced", DynamicList, "masq_src",
+	translate("Restrict Masquerading to given source subnets"))
+
+msrc.optional = true
+msrc.datatype = "list(neg(or(uciname,hostname,ipmask4)))"
+msrc.placeholder = "0.0.0.0/0"
+msrc:depends("family", "")
+msrc:depends("family", "ipv4")
+
+mdest = s:taboption("advanced", DynamicList, "masq_dest",
+	translate("Restrict Masquerading to given destination subnets"))
+
+mdest.optional = true
+mdest.datatype = "list(neg(or(uciname,hostname,ipmask4)))"
+mdest.placeholder = "0.0.0.0/0"
+mdest:depends("family", "")
+mdest:depends("family", "ipv4")
+
+s:taboption("advanced", Flag, "conntrack",
+	translate("Force connection tracking"))
+
+log = s:taboption("advanced", Flag, "log",
+	translate("Enable logging on this zone"))
+
+log.rmempty = true
+log.enabled = "1"
+
+lim = s:taboption("advanced", Value, "log_limit",
+	translate("Limit log messages"))
+
+lim.placeholder = "10/minute"
+lim:depends("log", "1")
+
+
+s2 = m:section(NamedSection, zone.sid, "fwd_out",
+	translate("Inter-Zone Forwarding"),
+	translatef("The options below control the forwarding policies between \
+		this zone (%s) and other zones. <em>Destination zones</em> cover \
+		forwarded traffic <strong>originating from %q</strong>. \
+		<em>Source zones</em> match forwarded traffic from other zones \
+		<strong>targeted at %q</strong>. The forwarding rule is \
+		<em>unidirectional</em>, e.g. a forward from lan to wan does \
+		<em>not</em> imply a permission to forward from wan to lan as well.",
+		zone:name(), zone:name(), zone:name()
+
+	))
+
+out = s2:option(Value, "out",
+	translate("Allow forward to <em>destination zones</em>:"))
+
+out.nocreate = true
+out.widget = "checkbox"
+out.exclude = zone:name()
+out.template = "cbi/firewall_zonelist"
+
+inp = s2:option(Value, "in",
+	translate("Allow forward from <em>source zones</em>:"))
+
+inp.nocreate = true
+inp.widget = "checkbox"
+inp.exclude = zone:name()
+inp.template = "cbi/firewall_zonelist"
+
+function out.cfgvalue(self, section)
+	local v = { }
+	local f
+	for _, f in ipairs(zone:get_forwardings_by("src")) do
+		v[#v+1] = f:dest()
+	end
+	return table.concat(v, " ")
+end
+
+function inp.cfgvalue(self, section)
+	local v = { }
+	local f
+	for _, f in ipairs(zone:get_forwardings_by("dest")) do
+		v[#v+1] = f:src()
+	end
+	return v
+end
+
+function out.formvalue(self, section)
+	return Value.formvalue(self, section) or "-"
+end
+
+function inp.formvalue(self, section)
+	return Value.formvalue(self, section) or "-"
+end
+
+function out.write(self, section, value)
+	zone:del_forwardings_by("src")
+
+	local f
+	for f in ut.imatch(value) do
+		zone:add_forwarding_to(f)
+	end
+end
+
+function inp.write(self, section, value)
+	zone:del_forwardings_by("dest")
+
+	local f
+	for f in ut.imatch(value) do
+		zone:add_forwarding_from(f)
+	end
+end
+
+return m
diff --git a/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua b/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua
new file mode 100644
index 000000000..46402a8fc
--- /dev/null
+++ b/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua
@@ -0,0 +1,104 @@
+-- Copyright 2008 Steven Barth <steven@midlink.org>
+-- Licensed to the public under the Apache License 2.0.
+
+local ds = require "luci.dispatcher"
+local fw = require "luci.model.firewall"
+local fs = require "nixio.fs"
+
+local m, s, o, p, i, v
+
+m = Map("firewall",
+	translate("Firewall - Zone Settings"),
+	translate("The firewall creates zones over your network interfaces to control network traffic flow."))
+
+fw.init(m.uci)
+
+s = m:section(TypedSection, "defaults", translate("General Settings"))
+s.anonymous = true
+s.addremove = false
+
+s:option(Flag, "syn_flood", translate("Enable SYN-flood protection"))
+
+o = s:option(Flag, "drop_invalid", translate("Drop invalid packets"))
+
+p = {
+	s:option(ListValue, "input", translate("Input")),
+	s:option(ListValue, "output", translate("Output")),
+	s:option(ListValue, "forward", translate("Forward"))
+}
+
+for i, v in ipairs(p) do
+	v:value("REJECT", translate("reject"))
+	v:value("DROP", translate("drop"))
+	v:value("ACCEPT", translate("accept"))
+end
+
+-- Netfilter flow offload support
+
+local offload = fs.access("/sys/module/xt_FLOWOFFLOAD/refcnt")
+
+if offload then
+	s:option(DummyValue, "offload_advice",
+		translate("Routing/NAT Offloading"),
+		translate("Experimental feature. Not fully compatible with QoS/SQM."))
+
+	o = s:option(Flag, "flow_offloading",
+		translate("Software flow offloading"),
+		translate("Software based offloading for routing/NAT"))
+	o.optional = true
+
+	o = s:option(Flag, "flow_offloading_hw",
+		translate("Hardware flow offloading"),
+		translate("Requires hardware NAT support. Implemented at least for mt7621"))
+	o.optional = true
+	o:depends( "flow_offloading", 1)
+end
+
+-- Firewall zones
+
+s = m:section(TypedSection, "zone", translate("Zones"))
+s.template = "cbi/tblsection"
+s.anonymous = true
+s.addremove = true
+s.extedit   = ds.build_url("admin", "network", "firewall", "zones", "%s")
+
+function s.sectiontitle(self, sid)
+	local z = fw:get_zone(sid)
+	return z:name()
+end
+
+function s.create(self)
+	local z = fw:new_zone()
+	if z then
+		luci.http.redirect(
+			ds.build_url("admin", "network", "firewall", "zones", z.sid)
+		)
+	end
+end
+
+function s.remove(self, section)
+	return fw:del_zone(section)
+end
+
+o = s:option(DummyValue, "_info", translate("Zone ⇒ Forwardings"))
+o.template = "cbi/firewall_zoneforwards"
+o.cfgvalue = function(self, section)
+	return self.map:get(section, "name")
+end
+
+p = {
+	s:option(ListValue, "input", translate("Input")),
+	s:option(ListValue, "output", translate("Output")),
+	s:option(ListValue, "forward", translate("Forward"))
+}
+
+for i, v in ipairs(p) do
+	v:value("REJECT", translate("reject"))
+	v:value("DROP", translate("drop"))
+	v:value("ACCEPT", translate("accept"))
+end
+
+s:option(Flag, "masq", translate("Masquerading"))
+s:option(Flag, "mtu_fix", translate("MSS clamping"))
+
+return m
diff --git a/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm b/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm
new file mode 100644
index 000000000..38f36b49c
--- /dev/null
+++ b/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm
@@ -0,0 +1,90 @@
+<%-
+	local fw = require "luci.model.firewall".init()
+	local izl = { }
+	local ezl = { }
+	local _, z
+	for _, z in ipairs(fw:get_zones()) do
+		if z:name() ~= "wan" then
+			izl[#izl+1] = z
+		end
+		if z:name() ~= "lan" then
+			ezl[#ezl+1] = z
+		end
+	end
+
+	local keys, vals = { }, { }
+	luci.sys.net.ipv4_hints(function(ip, name)
+		keys[#keys+1] = ip
+		vals[#vals+1] = '%s (%s)' %{ ip, name }
+	end)
+-%>
+
+<h4><%:New port forward%></h4>
+<div class="table">
+	<div class="tr table-titles">
+		<div class="th"><%:Name%></div>
+		<div class="th"><%:Protocol%></div>
+		<div class="th"><%:External zone%></div>
+		<div class="th"><%:External port%></div>
+		<div class="th"><%:Internal zone%></div>
+		<div class="th"><%:Internal IP address%></div>
+		<div class="th"><%:Internal port%></div>
+		<div class="th"></div>
+	</div>
+	<div class="tr">
+		<div class="td">
+			<input type="text" class="cbi-input-text" id="_newfwd.name" name="_newfwd.name" placeholder="<%:New port forward%>" />
+		</div>
+		<div class="td">
+			<select class="cbi-input-select" id="_newfwd.proto" name="_newfwd.proto">
+				<option value="tcp udp">TCP+UDP</option>
+				<option value="tcp">TCP</option>
+				<option value="udp">UDP</option>
+				<option value="other"><%:Other...%></option>
+			</select>
+		</div>
+		<div class="td">
+			<select class="cbi-input-select" id="_newfwd.extzone" name="_newfwd.extzone">
+				<% for _, z in ipairs(ezl) do -%><option value="<%=z:name()%>"><%=z:name()%></option><%- end %>
+			</select>
+		</div>
+		<div class="td">
+			<input type="text" class="cbi-input-text" id="_newfwd.extport" name="_newfwd.extport" data-type="portrange" data-optional="true" />
+		</div>
+		<div class="td">
+			<select class="cbi-input-select" id="_newfwd.intzone" name="_newfwd.intzone">
+				<% for _, z in ipairs(izl) do -%><option value="<%=z:name()%>"><%=z:name()%></option><%- end %>
+			</select>
+		</div>
+		<div class="td">
+			<input type="text" class="cbi-input-text" id="_newfwd.intaddr" name="_newfwd.intaddr" data-type="host" data-optional="true"<%=
+				ifattr(#keys > 0, "data-choices", {keys, vals})
+			%>/>
+		</div>
+		<div class="td">
+			<input type="text" class="cbi-input-text" id="_newfwd.intport" name="_newfwd.intport" data-type="portrange" data-optional="true" />
+		</div>
+		<div class="td bottom">
+			<input type="submit" class="cbi-button cbi-button-add" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>" value="<%:Add%>" />
+		</div>
+	</div>
+</div>
+
+<script type="text/javascript">//<![CDATA[
+	document.getElementById('_newfwd.extport').addEventListener('blur',
+		function() {
+			var n = document.getElementById('_newfwd.name');
+			var p = document.getElementById('_newfwd.proto');
+			var i = document.getElementById('_newfwd.intport');
+
+			if (!this.className.match(/invalid/))
+			{
+				if (!i.value) i.value = this.value;
+
+				if (!n.value)
+				{
+					n.value = 'Forward' + this.value;
+				}
+			}
+		});
+//]]></script>
diff --git a/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm b/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm
new file mode 100644
index 000000000..e0092a7a5
--- /dev/null
+++ b/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm
@@ -0,0 +1,89 @@
+<%
+	local fw = require "luci.model.firewall".init()
+	local zones = fw:get_zones()
+%>
+
+<% if #zones > 0 then %>
+	<h4><%:Open ports on router%></h4>
+	<div class="table">
+		<div class="tr cbi-section-table-titles">
+			<div class="th"><%:Name%></div>
+			<div class="th"><%:Protocol%></div>
+			<div class="th"><%:External port%></div>
+			<div class="th"></div>
+		</div>
+		<div class="tr">
+			<div class="td">
+				<input type="text" class="cbi-input-text" id="_newopen.name" name="_newopen.name" placeholder="<%:New input rule%>" />
+			</div>
+			<div class="td">
+				<select class="cbi-input-select" id="_newopen.proto" name="_newopen.proto">
+					<option value="tcp udp">TCP+UDP</option>
+					<option value="tcp">TCP</option>
+					<option value="udp">UDP</option>
+					<option value="other"><%:Other...%></option>
+				</select>
+			</div>
+			<div class="td">
+				<input type="text" class="cbi-input-text" id="_newopen.extport" name="_newopen.extport" />
+			</div>
+			<div class="td bottom">
+				<input type="submit" class="cbi-button cbi-button-add" name="_newopen.submit" value="<%:Add%>" />
+			</div>
+		</div>
+	</div>
+<% end %>
+<% if #zones > 1 then %>
+	<h4><%:New forward rule%></h4>
+	<div class="table">
+		<div class="tr cbi-section-table-titles">
+			<div class="th"><%:Name%></div>
+			<div class="th"><%:Source zone%></div>
+			<div class="th"><%:Destination zone%></div>
+			<div class="th"></div>
+		</div>
+		<div class="tr">
+			<div class="td">
+				<input type="text" class="cbi-input-text" id="_newfwd.name" name="_newfwd.name" placeholder="<%:New forward rule%>" />
+			</div>
+			<div class="td">
+				<select class="cbi-input-text" id="_newfwd.src" name="_newfwd.src">
+					<% local k, v; for k, v in ipairs(fw:get_zones()) do -%>
+						<option<%=ifattr(v:name() == "wan", "selected", "selected")%> value="<%=v:name()%>"><%=v:name()%></option>
+					<%- end %>
+				</select>
+			</div>
+			<div class="td">
+				<select class="cbi-input-text" id="_newfwd.dest" name="_newfwd.dest">
+					<% local k, v; for k, v in ipairs(fw:get_zones()) do -%>
+						<option<%=ifattr(v:name() == "lan", "selected", "selected")%> value="<%=v:name()%>"><%=v:name()%></option>
+					<%- end %>
+				</select>
+			</div>
+			<div class="td bottom">
+				<input type="submit" class="cbi-button cbi-button-link" name="_newfwd.submit" value="<%:Add and edit...%>" />
+			</div>
+		</div>
+	</div>
+<% else %>
+	<input type="submit" class="cbi-button cbi-button-add" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>" value="<%:Add%>" />
+<% end %>
+
+<% if #zones > 0 then %>
+	<script type="text/javascript">//<![CDATA[
+		cbi_validate_field('_newopen.extport', true, 'list(neg(portrange))');
+		document.getElementById('_newopen.extport').addEventListener('blur',
+			function() {
+				var n = document.getElementById('_newopen.name');
+				var p = document.getElementById('_newopen.proto');
+
+				if (!this.className.match(/invalid/))
+				{
+					if (!n.value && this.value)
+					{
+						n.value = 'Open' + this.value;
+					}
+				}
+			});
+	//]]></script>
+<% end %>
diff --git a/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm b/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm
new file mode 100644
index 000000000..0b4774ccc
--- /dev/null
+++ b/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm
@@ -0,0 +1,59 @@
+<%
+	local fw = require "luci.model.firewall".init()
+	local nw = require "luci.model.network".init()
+	local zones = fw:get_zones()
+
+	local keys, vals, a, k, v = {}, {}
+	for k, v in ipairs(nw:get_interfaces()) do
+		for k, a in ipairs(v:ipaddrs()) do
+			keys[#keys+1] = a:host():string()
+			vals[#vals+1] = '%s (%s)' %{ a:host(), v:shortname() }
+		end
+	end
+%>
+
+<% if #zones > 1 then %>
+	<h4><%:New source NAT%></h4>
+	<div class="table">
+		<div class="tr cbi-section-table-titles">
+			<div class="th"><%:Name%></div>
+			<div class="th"><%:Source zone%></div>
+			<div class="th"><%:Destination zone%></div>
+			<div class="th"><%:To source IP%></div>
+			<div class="th"><%:To source port%></div>
+			<div class="th"></div>
+		</div>
+		<div class="tr">
+			<div class="td">
+				<input type="text" class="cbi-input-text" id="_newsnat.name" name="_newsnat.name" placeholder="<%:New SNAT rule%>" />
+			</div>
+			<div class="td">
+				<select class="cbi-input-text" id="_newsnat.src" name="_newsnat.src">
+					<% local k, v; for k, v in ipairs(fw:get_zones()) do -%>
+						<option<%=ifattr(v:name() == "lan", "selected", "selected")%> value="<%=v:name()%>"><%=v:name()%></option>
+					<%- end %>
+				</select>
+			</div>
+			<div class="td">
+				<select class="cbi-input-text" id="_newsnat.dest" name="_newsnat.dest">
+					<% local k, v; for k, v in ipairs(fw:get_zones()) do -%>
+						<option<%=ifattr(v:name() == "wan", "selected", "selected")%> value="<%=v:name()%>"><%=v:name()%></option>
+					<%- end %>
+				</select>
+			</div>
+			<div class="td">
+				<input type="text" class="cbi-input-text" id="_newsnat.dip" name="_newsnat.dip" placeholder="<%:Do not rewrite%>" data-type="ip4addr" data-optional="true"<%=
+					ifattr(#keys > 0, "data-choices", { keys, vals })
+				%> />
+			</div>
+			<div class="td">
+				<input type="text" class="cbi-input-text" id="_newsnat.dport" name="_newsnat.dport" placeholder="<%:Do not rewrite%>" data-type="portrange" data-optional="true" />
+			</div>
+			<div class="td bottom">
+				<input type="submit" class="cbi-button cbi-button-link" name="_newsnat.submit" value="<%:Add and edit...%>" />
+			</div>
+		</div>
+	</div>
+<% else %>
+	<input type="submit" class="cbi-button cbi-button-add" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>" value="<%:Add%>" />
+<% end %>
diff --git a/luci-app-firewall/po/ca/firewall.po b/luci-app-firewall/po/ca/firewall.po
index b5b395fb9..10ce1ce5d 100644
--- a/luci-app-firewall/po/ca/firewall.po
+++ b/luci-app-firewall/po/ca/firewall.po
@@ -15,123 +15,94 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.6\n"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:127
 msgid "%s in %s"
 msgstr "%s en %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr "%s%s amb %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:125
 msgid "%s, %s in %s"
 msgstr "%s, %s en %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:26
+msgid "(Unnamed Entry)"
+msgstr "(Entrada sense nom)"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:169
+msgid "(Unnamed Rule)"
+msgstr "(Regla sense nom)"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:37
+msgid "(Unnamed SNAT)"
+msgstr "(SNAT sense nom)"
+
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr "<var>%d</var> paquets al <var>%s</var>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:180
 msgid "<var>%s</var> and limit to %s"
 msgstr "<var>%s</var> i limita a %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:257
 msgid "Action"
 msgstr "Acció"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone destination "
-"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
-"traffic."
-msgstr ""
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
+msgid "Add"
+msgstr "Afegeix"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
-"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
-msgstr ""
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
+msgid "Add and edit..."
+msgstr "Afegeix i edita..."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:57
 msgid "Advanced Settings"
 msgstr "Ajusts avançats"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid "Allow \"invalid\" traffic"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:178
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Permet el reenviament des dels <em>zones d'origen</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:170
 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:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:89
 msgid "Any"
 msgstr "Qualsevol"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
-msgid "Any day"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid "Automatic helper assignment"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid ""
-"Automatically assign conntrack helpers based on traffic protocol and port"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
-msgid "Conntrack Settings"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Conntrack helpers"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid "Covered devices"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:88
 msgid "Covered networks"
 msgstr "Xarxes cobertes"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid "Covered subnets"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:22
 msgid "Custom Rules"
 msgstr "Regles personalitzades"
 
@@ -146,15 +117,23 @@ msgstr ""
 "ordres s'executen després de cada reinici de tallafocs, just després el "
 "conjunt de regles per defecte s'ha carregat."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:108
+msgid "Destination IP address"
+msgstr "Adreça IP de destí"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:304
 msgid "Destination address"
 msgstr "Adreça de destí"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:313
 msgid "Destination port"
 msgstr "Port de destí"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:102
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:295
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
 msgid "Destination zone"
 msgstr "Zona de destí"
 
@@ -162,97 +141,83 @@ msgstr "Zona de destí"
 msgid "Disable"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid ""
-"Do not install extra rules to reject forwarded traffic with conntrack state "
-"<em>invalid</em>. This may be required for complex asymmetric route setups."
-msgstr ""
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:151
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
+msgid "Do not rewrite"
+msgstr "No reescriguis"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:22
 msgid "Drop invalid packets"
 msgstr "Descarta els paquets invàlids"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:270
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "Habilita"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:149
 msgid "Enable NAT Loopback"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:20
 msgid "Enable SYN-flood protection"
 msgstr "Habilita protecció contra la inundació SYN"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:144
 msgid "Enable logging on this zone"
 msgstr "Habilita el registre d'aquesta zona"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:43
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:98
 msgid "External IP address"
 msgstr "Adreça IP extern"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:111
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
 msgid "External port"
 msgstr "Port extern"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
+msgid "External zone"
+msgstr "Zona extern"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:158
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:331
 msgid "Extra arguments"
 msgstr "Paràmetres extres"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid "Extra destination arguments"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
-msgid "Extra iptables arguments"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid "Extra source arguments"
-msgstr ""
-
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
 msgid "Firewall"
 msgstr "Tallafocs"
@@ -261,162 +226,179 @@ msgstr "Tallafocs"
 msgid "Firewall - Custom Rules"
 msgstr "Tallafocs - Regles personalitzades"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:13
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:8
 msgid "Firewall - Port Forwards"
 msgstr "Tallafocs - Reenviaments de port"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:12
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:42
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:9
 msgid "Firewall - Traffic Rules"
 msgstr "Tallafocs - Regles de tràfic"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:15
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:11
 msgid "Firewall - Zone Settings"
 msgstr "Tallafocs - Ajusts de zona"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:141
 msgid "Force connection tracking"
 msgstr "Força el rastreig de connexió"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:76
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:27
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:92
 msgid "Forward"
 msgstr "Reenvia"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:116
 msgid "Forward to"
 msgstr "Reenvia a"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:343
 msgid "Friday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:106
 msgid "From %s in %s"
 msgstr "Des de %s en %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:88
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:104
 msgid "From %s in %s with source %s"
 msgstr "Des de %s en %s amb origen %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:102
 msgid "From %s in %s with source %s and %s"
 msgstr "Des de %s en %s amb orígens %s i %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:117
 msgid "From %s on <var>this device</var>"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:115
 msgid "From %s on <var>this device</var> with source %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:113
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:10
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:56
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:16
 msgid "General Settings"
 msgstr "Ajusts generals"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:51
 msgid "Hardware flow offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:85
 msgid "IPv4"
 msgstr "IPv4"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:185
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:118
 msgid "IPv4 and IPv6"
 msgstr "IPv4 i IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:119
 msgid "IPv4 only"
 msgstr "Només IPv4"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:87
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:120
 msgid "IPv6 only"
 msgstr "Només IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:25
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:90
 msgid "Input"
 msgstr "Entrada"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:157
+msgid "Inter-Zone Forwarding"
+msgstr "Reenviament interzonal"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:127
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
 msgid "Internal IP address"
 msgstr "Adreça IP interna"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:138
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
 msgid "Internal port"
 msgstr "Port intern"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:121
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
 msgid "Internal zone"
 msgstr "Zona interna"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:150
 msgid "Limit log messages"
 msgstr "Limita els missatges de registre"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:102
 msgid "MSS clamping"
 msgstr "Fixació MSS"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:101
 msgid "Masquerading"
 msgstr "Mascarada"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:105
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:162
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:247
 msgid "Match"
 msgstr "Coincideix"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:206
 msgid "Match ICMP type"
 msgstr "Coincideix amb el tipus ICMP"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:118
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr ""
+"Coincideix amb trànsit reenviat al port o rang de ports de destí donat."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:112
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
@@ -424,38 +406,68 @@ msgstr ""
 "Coincideix amb trànsit entrant dirigit al port o rang de ports de destí en "
 "aquest host donat"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:91
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr ""
+"Coincideix amb trànsit entrant originant en el host client des del port o "
+"rang de ports d'origen donat."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:339
 msgid "Monday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:346
 msgid "Month Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:50
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:180
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:60
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
 msgid "Name"
 msgstr "Nom"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:169
-msgid "Network"
-msgstr ""
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
+msgid "New SNAT rule"
+msgstr "Nova regla SNAT"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
+msgid "New forward rule"
+msgstr "Nova regla de reenviament"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
+msgid "New input rule"
+msgstr "Nova regla d'entrada"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
+msgid "New port forward"
+msgstr "Nou reenviament de port"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
+msgid "New source NAT"
+msgstr "Nou origen NAT"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:99
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr "Només coincideix amb trànsit entrant dirigit a la adreça IP donada."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:63
 msgid "Only match incoming traffic from these MACs."
 msgstr "Només coincideix amb trànsit entrant des d'aquests MAC."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:75
 msgid "Only match incoming traffic from this IP or range."
 msgstr "Només coincideix amb trànsit entrant des d'aquest IP o rang."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:87
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
@@ -463,31 +475,37 @@ msgstr ""
 "Només coincideix amb trànsit originant en el host client des del port o del "
 "rang de ports d'origen donat"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
+msgid "Open ports on router"
+msgstr "Obre els ports en el encaminador"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
+msgid "Other..."
+msgstr "Altre..."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:26
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:91
 msgid "Output"
 msgstr "Sortida"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:288
+msgid "Output zone"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:160
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:332
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr "Passa paràmetres addicionals al iptables. Utilitzeu-ho amb cura!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
-msgid ""
-"Passing raw iptables arguments to source and destination traffic "
-"classification rules allows to match packets based on other criteria than "
-"interfaces or subnets. These options should be used with extreme care as "
-"invalid values could render the firewall ruleset broken, completely exposing "
-"all services."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:14
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:17
 msgid "Port Forwards"
 msgstr "Reenviaments de port"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:9
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
@@ -495,42 +513,36 @@ msgstr ""
 "El reenviament de ports permet que els ordinadors remots en el Internet "
 "connectin a un ordinador o servei específic dins del LAN privat."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
-msgid ""
-"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
-"connection tracking."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:39
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:190
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
 msgid "Protocol"
 msgstr "Protocol"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:139
 msgid ""
 "Redirect matched incoming traffic to the given port on the internal host"
 msgstr "Redirigeix trànsit entrant coincidit al port donat en el host intern"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:128
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "Redirigeix trànsit entrant coincidit al host intern especificat"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:52
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
@@ -538,20 +550,40 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:132
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "Restringeix la mascarada a les subxarxes de destí donades"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:123
 msgid "Restrict Masquerading to given source subnets"
 msgstr "Restringeix la mascarada a les subxarxes d'origen donades"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:183
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:115
 msgid "Restrict to address family"
 msgstr "Restringeix a la família d'adreces"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:132
+msgid "Rewrite matched traffic to the given address."
+msgstr "Reescriu el trànsit coincidint cap a la adreça donada."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:147
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr ""
+"Reescriu el trànsit coincidint cap al port d'origen donat. Pot ser deixat en "
+"blanc per només reescriure l'adreça IP."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:266
+msgid "Rewrite to source %s"
+msgstr "Reescriu a l'origen %s"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:264
+msgid "Rewrite to source %s, %s"
+msgstr "Reescriu als orígens %s, %s"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:42
 msgid "Routing/NAT Offloading"
 msgstr ""
 
@@ -563,62 +595,89 @@ msgstr ""
 msgid "Rule is enabled"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:131
+msgid "SNAT IP address"
+msgstr "Adreça IP de SNAT"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:146
+msgid "SNAT port"
+msgstr "Port SNAT"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:344
 msgid "Saturday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:47
 msgid "Software based offloading for routing/NAT"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:46
 msgid "Software flow offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:79
 msgid "Source IP address"
 msgstr "Adreça IP d'origen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:261
 msgid "Source MAC address"
 msgstr "Adreça MAC d'origen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:194
+msgid "Source NAT"
+msgstr "NAT d'origen"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:195
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+"El NAT d'origen és un forma específic de mascarada que permet control de gra "
+"fi sobre l'IP d'origen utilitzat pel trànsit sortint, per exemple per "
+"associar múltiples adreces WAN a subxarxes internes."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:270
 msgid "Source address"
 msgstr "Adreça d'origen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:279
 msgid "Source port"
 msgstr "Port d'origen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:254
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
 msgid "Source zone"
 msgstr "Zona d'origen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:357
 msgid "Start Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
-msgid "Start Time (hh.mm.ss)"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:353
+msgid "Start Time (hh:mm:ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:359
 msgid "Stop Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
-msgid "Stop Time (hh.mm.ss)"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:355
+msgid "Stop Time (hh:mm:ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:338
 msgid "Sunday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:12
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
@@ -626,8 +685,7 @@ msgstr ""
 "El tallafocs crea zones a les teves interfícies de xarxa per controlar el "
 "flux de tràfic de xarxa."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:158
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -643,7 +701,24 @@ msgstr ""
 "regla de reenviament es <em>unidirectional</em>, per exemple un reenviament "
 "de lan a wan <em>no</em> implica permís per reenviar de wan a lan també."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:14
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr ""
+"Aquesta pàgina us permet canviar propietats avançats de l'entrada de "
+"reenviament de port. En la majoria dels casos no hi ha necessitat de "
+"modificar aquests ajusts."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:13
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr ""
+"Aquesta pàgina us permet canviar propietats avançats de l'entrada de regla "
+"de trànsit, com als hosts d'origen i de destí coincidits."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:36
 #, fuzzy
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
@@ -659,40 +734,46 @@ 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:349
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:342
 msgid "Thursday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
-msgid "Time Restrictions"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:362
 msgid "Time in UTC"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:141
 msgid "To %s at %s on <var>this device</var>"
 msgstr "A %s a %s en <var>aquest dispositiu</var>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:132
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:157
 msgid "To %s in %s"
 msgstr "A %s en %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:143
 msgid "To %s on <var>this device</var>"
 msgstr "A %s en <var>aquest dispositiu</var>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:130
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:155
 msgid "To %s, %s in %s"
 msgstr "A %s, %s en %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
+msgid "To source IP"
+msgstr "A l'IP d'origen"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
+msgid "To source port"
+msgstr "Al port d'origen"
+
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:18
 msgid "Traffic Rules"
 msgstr "Regles de trànsit"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:10
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
@@ -702,292 +783,158 @@ 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:347
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:340
 msgid "Tuesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:244
+msgid "Unnamed SNAT"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:67
 msgid "Unnamed forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:76
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
-msgid "Unnamed zone"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid ""
-"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
-"network devices."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid ""
-"Use this option to classify zone traffic by source or destination subnet "
-"instead of networks or devices."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:101
 msgid "Via %s"
 msgstr "Via %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:99
 msgid "Via %s at %s"
 msgstr "Via %s a %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:341
 msgid "Wednesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:335
 msgid "Week Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:55
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr ""
+"Podeu especificar múltiples per seleccionar \"-- personalitzat --\" i "
+"llavors introduir protocols separats per espai."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:35
+msgid "Zone %q"
+msgstr "Zona %q"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:83
 msgid "Zone ⇒ Forwardings"
 msgstr "Zona ⇒ Reenviaments"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:59
 msgid "Zones"
 msgstr "Zones"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:325
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:33
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:98
 msgid "accept"
 msgstr "accepta"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:108
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:141
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:263
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:272
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:281
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:306
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:315
 msgid "any"
 msgstr "qualsevol"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:120
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:100
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:150
 msgid "any host"
 msgstr "qualsevol host"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:111
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:138
 msgid "any router IP"
 msgstr "qualsevol IP d'encaminador"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:119
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:149
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr "qualsevol zona"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:327
 msgid "don't track"
 msgstr "no rastregis"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:324
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:32
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:97
 msgid "drop"
 msgstr "descarta"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:326
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:31
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:96
 msgid "reject"
 msgstr "rebutja"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
-msgid "this new zone"
-msgstr ""
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:82
+msgid "traffic"
+msgstr "trànsit"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr ""
-
-#~ msgid "Add"
-#~ msgstr "Afegeix"
-
-#~ msgid "Add and edit..."
-#~ msgstr "Afegeix i edita..."
-
-#~ msgid "Do not rewrite"
-#~ msgstr "No reescriguis"
-
-#~ msgid "External zone"
-#~ msgstr "Zona extern"
-
-#~ msgid "New SNAT rule"
-#~ msgstr "Nova regla SNAT"
-
-#~ msgid "New forward rule"
-#~ msgstr "Nova regla de reenviament"
-
-#~ msgid "New input rule"
-#~ msgstr "Nova regla d'entrada"
-
-#~ msgid "New port forward"
-#~ msgstr "Nou reenviament de port"
-
-#~ msgid "New source NAT"
-#~ msgstr "Nou origen NAT"
-
-#~ msgid "Open ports on router"
-#~ msgstr "Obre els ports en el encaminador"
-
-#~ msgid "Other..."
-#~ msgstr "Altre..."
-
-#~ msgid "To source IP"
-#~ msgstr "A l'IP d'origen"
-
-#~ msgid "To source port"
-#~ msgstr "Al port d'origen"
-
-#~ msgid "(Unnamed Entry)"
-#~ msgstr "(Entrada sense nom)"
-
-#~ msgid "(Unnamed Rule)"
-#~ msgstr "(Regla sense nom)"
-
-#~ msgid "(Unnamed SNAT)"
-#~ msgstr "(SNAT sense nom)"
-
-#~ msgid "Destination IP address"
-#~ msgstr "Adreça IP de destí"
-
-#~ msgid "Inter-Zone Forwarding"
-#~ msgstr "Reenviament interzonal"
-
-#~ msgid "Match forwarded traffic to the given destination port or port range."
-#~ msgstr ""
-#~ "Coincideix amb trànsit reenviat al port o rang de ports de destí donat."
-
-#~ msgid ""
-#~ "Match incoming traffic originating from the given source port or port "
-#~ "range on the client host."
-#~ msgstr ""
-#~ "Coincideix amb trànsit entrant originant en el host client des del port o "
-#~ "rang de ports d'origen donat."
-
-#~ msgid "Rewrite matched traffic to the given address."
-#~ msgstr "Reescriu el trànsit coincidint cap a la adreça donada."
-
-#~ msgid ""
-#~ "Rewrite matched traffic to the given source port. May be left empty to "
-#~ "only rewrite the IP address."
-#~ msgstr ""
-#~ "Reescriu el trànsit coincidint cap al port d'origen donat. Pot ser deixat "
-#~ "en blanc per només reescriure l'adreça IP."
-
-#~ msgid "Rewrite to source %s"
-#~ msgstr "Reescriu a l'origen %s"
-
-#~ msgid "Rewrite to source %s, %s"
-#~ msgstr "Reescriu als orígens %s, %s"
-
-#~ msgid "SNAT IP address"
-#~ msgstr "Adreça IP de SNAT"
-
-#~ msgid "SNAT port"
-#~ msgstr "Port SNAT"
-
-#~ msgid "Source NAT"
-#~ msgstr "NAT d'origen"
-
-#~ msgid ""
-#~ "Source NAT is a specific form of masquerading which allows fine grained "
-#~ "control over the source IP used for outgoing traffic, for example to map "
-#~ "multiple WAN addresses to internal subnets."
-#~ msgstr ""
-#~ "El NAT d'origen és un forma específic de mascarada que permet control de "
-#~ "gra fi sobre l'IP d'origen utilitzat pel trànsit sortint, per exemple per "
-#~ "associar múltiples adreces WAN a subxarxes internes."
-
-#~ msgid ""
-#~ "This page allows you to change advanced properties of the port forwarding "
-#~ "entry. In most cases there is no need to modify those settings."
-#~ msgstr ""
-#~ "Aquesta pàgina us permet canviar propietats avançats de l'entrada de "
-#~ "reenviament de port. En la majoria dels casos no hi ha necessitat de "
-#~ "modificar aquests ajusts."
-
-#~ msgid ""
-#~ "This page allows you to change advanced properties of the traffic rule "
-#~ "entry, such as matched source and destination hosts."
-#~ msgstr ""
-#~ "Aquesta pàgina us permet canviar propietats avançats de l'entrada de "
-#~ "regla de trànsit, com als hosts d'origen i de destí coincidits."
-
-#~ msgid ""
-#~ "You may specify multiple by selecting \"-- custom --\" and then entering "
-#~ "protocols separated by space."
-#~ msgstr ""
-#~ "Podeu especificar múltiples per seleccionar \"-- personalitzat --\" i "
-#~ "llavors introduir protocols separats per espai."
-
-#~ msgid "Zone %q"
-#~ msgstr "Zona %q"
-
-#~ msgid "traffic"
-#~ msgstr "trànsit"
diff --git a/luci-app-firewall/po/cs/firewall.po b/luci-app-firewall/po/cs/firewall.po
index b465d137f..dce237825 100644
--- a/luci-app-firewall/po/cs/firewall.po
+++ b/luci-app-firewall/po/cs/firewall.po
@@ -11,123 +11,94 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: Pootle 2.0.6\n"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:127
 msgid "%s in %s"
 msgstr "%s v %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr "%s%s s %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:125
 msgid "%s, %s in %s"
 msgstr "%s, %s v %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:26
+msgid "(Unnamed Entry)"
+msgstr "(Nepojmenovaný vstup)"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:169
+msgid "(Unnamed Rule)"
+msgstr "(Nepojmenované pravidlo)"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:37
+msgid "(Unnamed SNAT)"
+msgstr "(Nepojmenovaný SNAT)"
+
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr "<var>%d</var> paketů za <var>%s</var>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr "<var>%d</var> paketů za <var>%s</var>, burst <var>%d</var> paketů."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:180
 msgid "<var>%s</var> and limit to %s"
 msgstr "<var>%s</var> a omezit na %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:257
 msgid "Action"
 msgstr "Akce"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone destination "
-"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
-"traffic."
-msgstr ""
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
+msgid "Add"
+msgstr "Přidat"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
-"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
-msgstr ""
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
+msgid "Add and edit..."
+msgstr "Přidat a upravit"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:57
 msgid "Advanced Settings"
 msgstr "Pokročilé nastavení"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid "Allow \"invalid\" traffic"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:178
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Povolit přesměrování ze <em>zdrojových oblastí</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:170
 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:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:89
 msgid "Any"
 msgstr "Libovolné"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
-msgid "Any day"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid "Automatic helper assignment"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid ""
-"Automatically assign conntrack helpers based on traffic protocol and port"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
-msgid "Conntrack Settings"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Conntrack helpers"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid "Covered devices"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:88
 msgid "Covered networks"
 msgstr "Pokryté sítě"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid "Covered subnets"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:22
 msgid "Custom Rules"
 msgstr "Vlastní pravidla"
 
@@ -141,15 +112,23 @@ msgstr ""
 "nejsou jinak pokryté frameworkem firewallu. Příkazy jsou spuštěny po každém "
 "restartu firewallu, právě po načtení výchozí sady pravidel."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:108
+msgid "Destination IP address"
+msgstr "Cílová IP adresa"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:304
 msgid "Destination address"
 msgstr "Cílová adresa"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:313
 msgid "Destination port"
 msgstr "Cílový port"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:102
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:295
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
 msgid "Destination zone"
 msgstr "Cílová oblast"
 
@@ -157,97 +136,83 @@ msgstr "Cílová oblast"
 msgid "Disable"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid ""
-"Do not install extra rules to reject forwarded traffic with conntrack state "
-"<em>invalid</em>. This may be required for complex asymmetric route setups."
-msgstr ""
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:151
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
+msgid "Do not rewrite"
+msgstr "Nepřepisovat"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:22
 msgid "Drop invalid packets"
 msgstr "Zahazovat neplatné pakety"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:270
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "Povolit"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:149
 msgid "Enable NAT Loopback"
 msgstr "Povolit NAT Loopback"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:20
 msgid "Enable SYN-flood protection"
 msgstr "Povolit ochranu proti SYN-flood"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:144
 msgid "Enable logging on this zone"
 msgstr "Povolit logování v této oblasti"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:43
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:98
 msgid "External IP address"
 msgstr "Vnější IP adresa"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:111
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
 msgid "External port"
 msgstr "Vnější port"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
+msgid "External zone"
+msgstr "Vnější zóna"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:158
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:331
 msgid "Extra arguments"
 msgstr "Dodatečné argumenty"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid "Extra destination arguments"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
-msgid "Extra iptables arguments"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid "Extra source arguments"
-msgstr ""
-
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
 msgid "Firewall"
 msgstr "Firewall"
@@ -256,162 +221,179 @@ msgstr "Firewall"
 msgid "Firewall - Custom Rules"
 msgstr "Firewall - Vlastní pravidla"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:13
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:8
 msgid "Firewall - Port Forwards"
 msgstr "Firewall - Přesměrování portů"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:12
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:42
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:9
 msgid "Firewall - Traffic Rules"
 msgstr "Firewall - Pravidla síťového provozu"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:15
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:11
 msgid "Firewall - Zone Settings"
 msgstr "Firewall - Nastavení zón"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:141
 msgid "Force connection tracking"
 msgstr "Vynutit sledování připojení"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:76
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:27
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:92
 msgid "Forward"
 msgstr "Přesměrování"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:116
 msgid "Forward to"
 msgstr "Přesměrovat na"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:343
 msgid "Friday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:106
 msgid "From %s in %s"
 msgstr "Z %s v %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:88
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:104
 msgid "From %s in %s with source %s"
 msgstr "Z %s v %s se zdrojovou %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:102
 msgid "From %s in %s with source %s and %s"
 msgstr "Z %s v %s se zdrojovou %s a %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:117
 msgid "From %s on <var>this device</var>"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:115
 msgid "From %s on <var>this device</var> with source %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:113
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:10
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:56
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:16
 msgid "General Settings"
 msgstr "Obecné nastavení"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:51
 msgid "Hardware flow offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:85
 msgid "IPv4"
 msgstr "IPv4"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:185
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:118
 msgid "IPv4 and IPv6"
 msgstr "IPv4 a IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:119
 msgid "IPv4 only"
 msgstr "pouze IPv4"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:87
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:120
 msgid "IPv6 only"
 msgstr "pouze IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:25
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:90
 msgid "Input"
 msgstr "Vstup"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+# nebo mimo zóny?
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:157
+msgid "Inter-Zone Forwarding"
+msgstr "Přesměrování mezi zónami"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:127
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
 msgid "Internal IP address"
 msgstr "Vnitřní IP adresa"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:138
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
 msgid "Internal port"
 msgstr "Vnitřní port"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:121
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
 msgid "Internal zone"
 msgstr "Vnitřní zóna"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:150
 msgid "Limit log messages"
 msgstr "Omezit logovací zprávy"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:102
 msgid "MSS clamping"
 msgstr "MSS clamping"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:101
 msgid "Masquerading"
 msgstr "Maškárádování"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:105
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:162
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:247
 msgid "Match"
 msgstr "Shoda"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:206
 msgid "Match ICMP type"
 msgstr "Odpovídá ICMP typu"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:118
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr "Vybrat provoz, přesměrovaný na zadaný port nebo rozsah portů"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:112
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
@@ -419,38 +401,68 @@ msgstr ""
 "Vybrat příchozí provoz, směrovaný na zadaný cílový port nebo rozsah portů "
 "tohoto hostitele"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:91
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr ""
+"Vybrat příchozí provoz, pocházející ze zadaného portu nebo rozsahu portů "
+"klienta."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:339
 msgid "Monday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:346
 msgid "Month Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:50
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:180
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:60
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
 msgid "Name"
 msgstr "Název"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:169
-msgid "Network"
-msgstr ""
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
+msgid "New SNAT rule"
+msgstr "Nové pravidlo SNAT"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
+msgid "New forward rule"
+msgstr "Nové přesměrovací pravidlo"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
+msgid "New input rule"
+msgstr "Nové vstupní pravidlo"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
+msgid "New port forward"
+msgstr "Nové přesměrování portu"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
+msgid "New source NAT"
+msgstr "Nový zdrojový NAT (SNAT)"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:99
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr "Vybrat pouze příchozí provoz, směrovaný na danou IP adresu."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:63
 msgid "Only match incoming traffic from these MACs."
 msgstr "Vybrat pouze příchozí provoz z těchto MAC adres."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:75
 msgid "Only match incoming traffic from this IP or range."
 msgstr "Vybrat pouze příchozí provoz z této IP nebo rozsahu IP adres."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:87
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
@@ -458,31 +470,37 @@ msgstr ""
 "Vybrat pouze příchozí provoz, pocházející ze zadaného portu nebo rozsahu "
 "portů klienta."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
+msgid "Open ports on router"
+msgstr "Otevřené porty na routeru"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
+msgid "Other..."
+msgstr "Ostatní ..."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:26
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:91
 msgid "Output"
 msgstr "Výstup"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:288
+msgid "Output zone"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:160
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:332
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr "Předává další argumenty iptables. Používat opatrně!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
-msgid ""
-"Passing raw iptables arguments to source and destination traffic "
-"classification rules allows to match packets based on other criteria than "
-"interfaces or subnets. These options should be used with extreme care as "
-"invalid values could render the firewall ruleset broken, completely exposing "
-"all services."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:14
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:17
 msgid "Port Forwards"
 msgstr "Přesměrování portů"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:9
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
@@ -491,43 +509,37 @@ msgstr ""
 "Internetu připojení k vybraným počítačům nebo službám uvnitř privátní sítě "
 "LAN."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
-msgid ""
-"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
-"connection tracking."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:39
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:190
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
 msgid "Protocol"
 msgstr "Protokol"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:139
 msgid ""
 "Redirect matched incoming traffic to the given port on the internal host"
 msgstr ""
 "Přesměrovat vybraný příchozí provoz na uvedený port vnitřního hostitele."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:128
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "Přesměrovat vybraný příchozí provoz na uvedeného vnitřního hostitele."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:52
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
@@ -535,20 +547,40 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:132
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "Omezit maškarádování na uvedené cílové podsítě"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:123
 msgid "Restrict Masquerading to given source subnets"
 msgstr "Omezit maškarádování na uvedené zdrojové podsítě"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:183
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:115
 msgid "Restrict to address family"
 msgstr "Omezit na rodinu adres"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:132
+msgid "Rewrite matched traffic to the given address."
+msgstr "Přepsat shodný provoz na uvedenou adresu."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:147
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr ""
+"Přepsat shodný provoz na uvedený zdrojový port. Může zůstat prázdné, pak "
+"bude přepsána pouze IP adresa."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:266
+msgid "Rewrite to source %s"
+msgstr "Přepsat na zdrojovou %s"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:264
+msgid "Rewrite to source %s, %s"
+msgstr "Přepsat na zdrojovou %s, %s"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:42
 msgid "Routing/NAT Offloading"
 msgstr ""
 
@@ -560,62 +592,89 @@ msgstr ""
 msgid "Rule is enabled"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:131
+msgid "SNAT IP address"
+msgstr "IP adresa SNATu"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:146
+msgid "SNAT port"
+msgstr "Port SNATu"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:344
 msgid "Saturday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:47
 msgid "Software based offloading for routing/NAT"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:46
 msgid "Software flow offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:79
 msgid "Source IP address"
 msgstr "Zdrojová IP adresa"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:261
 msgid "Source MAC address"
 msgstr "Zdrojová MAC adresa"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:194
+msgid "Source NAT"
+msgstr "Zdrojový NAT"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:195
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+"Zdrojový NAT je specifická forma maškarádování, která umožňuje jemnozrnnou "
+"kontrolu nad zdrojovými IP, použitými pro odchozí provoz. Využívá se "
+"například pro mapování množství WAN adres do vnitřních podsítí."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:270
 msgid "Source address"
 msgstr "Zdrojová adresa"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:279
 msgid "Source port"
 msgstr "Zdrojový port"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:254
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
 msgid "Source zone"
 msgstr "Zdrojová zóna"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:357
 msgid "Start Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
-msgid "Start Time (hh.mm.ss)"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:353
+msgid "Start Time (hh:mm:ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:359
 msgid "Stop Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
-msgid "Stop Time (hh.mm.ss)"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:355
+msgid "Stop Time (hh:mm:ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:338
 msgid "Sunday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:12
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
@@ -623,8 +682,7 @@ msgstr ""
 "Firewall vytváří zóny přes vaše síťová rozhraní za účelem řízení síťového "
 "provozu."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:158
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -640,7 +698,23 @@ msgstr ""
 "Přesměrovávací pravidlo je <em>jednosměrné</em>, například přesměrování z "
 "lan do wan <em>nepovoluje</em> přesměrování z wan do lan (a naopak)."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:14
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr ""
+"Tato stránka vám umožňuje změnit pokročilé vlastností přesměrování portů. Ve "
+"většině případů není potřeba upravovat tato nastavení."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:13
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr ""
+"Tato stránka vám umožňuje změnit pokročilé vlastnosti pravidla síťového "
+"provozu, například zdrojové a cílové hostitele."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:36
 #, fuzzy
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
@@ -655,40 +729,46 @@ 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:349
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:342
 msgid "Thursday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
-msgid "Time Restrictions"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:362
 msgid "Time in UTC"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:141
 msgid "To %s at %s on <var>this device</var>"
 msgstr "Na %s v %s na <var>tomto zařízení</var>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:132
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:157
 msgid "To %s in %s"
 msgstr "Na %s v %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:143
 msgid "To %s on <var>this device</var>"
 msgstr "Na %s na <var>tomto zařízení</var>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:130
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:155
 msgid "To %s, %s in %s"
 msgstr "Na %s, %s v %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
+msgid "To source IP"
+msgstr "Na zdrojovou IP"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
+msgid "To source port"
+msgstr "Na zdrojový port"
+
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:18
 msgid "Traffic Rules"
 msgstr "Pravidla síťového provozu"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:10
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
@@ -698,291 +778,158 @@ 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:347
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:340
 msgid "Tuesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:244
+msgid "Unnamed SNAT"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:67
 msgid "Unnamed forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:76
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
-msgid "Unnamed zone"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid ""
-"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
-"network devices."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid ""
-"Use this option to classify zone traffic by source or destination subnet "
-"instead of networks or devices."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:101
 msgid "Via %s"
 msgstr "Prostřednictvím %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:99
 msgid "Via %s at %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:341
 msgid "Wednesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:335
 msgid "Week Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:55
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr ""
+"Lze určit více protokolů. Vyberte \"-- vlastní --\" a vkládejte protokoly "
+"oddělené mezerou."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:35
+msgid "Zone %q"
+msgstr "Zóna %q"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:83
 msgid "Zone ⇒ Forwardings"
 msgstr "Zóna ⇒ Přesměrování"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:59
 msgid "Zones"
 msgstr "Zóny"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:325
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:33
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:98
 msgid "accept"
 msgstr "přijmout"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:108
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:141
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:263
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:272
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:281
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:306
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:315
 msgid "any"
 msgstr "libovolný"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:120
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:100
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:150
 msgid "any host"
 msgstr "libovolný hostitel"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:111
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:138
 msgid "any router IP"
 msgstr "libovolná IP routeru"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:119
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:149
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr "libovolná zóna"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:327
 msgid "don't track"
 msgstr "nesledovat"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:324
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:32
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:97
 msgid "drop"
 msgstr "zahodit"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:326
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:31
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:96
 msgid "reject"
 msgstr "odmítnout"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
-msgid "this new zone"
-msgstr ""
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:82
+msgid "traffic"
+msgstr "provoz"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr ""
-
-#~ msgid "Add"
-#~ msgstr "Přidat"
-
-#~ msgid "Add and edit..."
-#~ msgstr "Přidat a upravit"
-
-#~ msgid "Do not rewrite"
-#~ msgstr "Nepřepisovat"
-
-#~ msgid "External zone"
-#~ msgstr "Vnější zóna"
-
-#~ msgid "New SNAT rule"
-#~ msgstr "Nové pravidlo SNAT"
-
-#~ msgid "New forward rule"
-#~ msgstr "Nové přesměrovací pravidlo"
-
-#~ msgid "New input rule"
-#~ msgstr "Nové vstupní pravidlo"
-
-#~ msgid "New port forward"
-#~ msgstr "Nové přesměrování portu"
-
-#~ msgid "New source NAT"
-#~ msgstr "Nový zdrojový NAT (SNAT)"
-
-#~ msgid "Open ports on router"
-#~ msgstr "Otevřené porty na routeru"
-
-#~ msgid "Other..."
-#~ msgstr "Ostatní ..."
-
-#~ msgid "To source IP"
-#~ msgstr "Na zdrojovou IP"
-
-#~ msgid "To source port"
-#~ msgstr "Na zdrojový port"
-
-#~ msgid "(Unnamed Entry)"
-#~ msgstr "(Nepojmenovaný vstup)"
-
-#~ msgid "(Unnamed Rule)"
-#~ msgstr "(Nepojmenované pravidlo)"
-
-#~ msgid "(Unnamed SNAT)"
-#~ msgstr "(Nepojmenovaný SNAT)"
-
-#~ msgid "Destination IP address"
-#~ msgstr "Cílová IP adresa"
-
-# nebo mimo zóny?
-#~ msgid "Inter-Zone Forwarding"
-#~ msgstr "Přesměrování mezi zónami"
-
-#~ msgid "Match forwarded traffic to the given destination port or port range."
-#~ msgstr "Vybrat provoz, přesměrovaný na zadaný port nebo rozsah portů"
-
-#~ msgid ""
-#~ "Match incoming traffic originating from the given source port or port "
-#~ "range on the client host."
-#~ msgstr ""
-#~ "Vybrat příchozí provoz, pocházející ze zadaného portu nebo rozsahu portů "
-#~ "klienta."
-
-#~ msgid "Rewrite matched traffic to the given address."
-#~ msgstr "Přepsat shodný provoz na uvedenou adresu."
-
-#~ msgid ""
-#~ "Rewrite matched traffic to the given source port. May be left empty to "
-#~ "only rewrite the IP address."
-#~ msgstr ""
-#~ "Přepsat shodný provoz na uvedený zdrojový port. Může zůstat prázdné, pak "
-#~ "bude přepsána pouze IP adresa."
-
-#~ msgid "Rewrite to source %s"
-#~ msgstr "Přepsat na zdrojovou %s"
-
-#~ msgid "Rewrite to source %s, %s"
-#~ msgstr "Přepsat na zdrojovou %s, %s"
-
-#~ msgid "SNAT IP address"
-#~ msgstr "IP adresa SNATu"
-
-#~ msgid "SNAT port"
-#~ msgstr "Port SNATu"
-
-#~ msgid "Source NAT"
-#~ msgstr "Zdrojový NAT"
-
-#~ msgid ""
-#~ "Source NAT is a specific form of masquerading which allows fine grained "
-#~ "control over the source IP used for outgoing traffic, for example to map "
-#~ "multiple WAN addresses to internal subnets."
-#~ msgstr ""
-#~ "Zdrojový NAT je specifická forma maškarádování, která umožňuje "
-#~ "jemnozrnnou kontrolu nad zdrojovými IP, použitými pro odchozí provoz. "
-#~ "Využívá se například pro mapování množství WAN adres do vnitřních podsítí."
-
-#~ msgid ""
-#~ "This page allows you to change advanced properties of the port forwarding "
-#~ "entry. In most cases there is no need to modify those settings."
-#~ msgstr ""
-#~ "Tato stránka vám umožňuje změnit pokročilé vlastností přesměrování portů. "
-#~ "Ve většině případů není potřeba upravovat tato nastavení."
-
-#~ msgid ""
-#~ "This page allows you to change advanced properties of the traffic rule "
-#~ "entry, such as matched source and destination hosts."
-#~ msgstr ""
-#~ "Tato stránka vám umožňuje změnit pokročilé vlastnosti pravidla síťového "
-#~ "provozu, například zdrojové a cílové hostitele."
-
-#~ msgid ""
-#~ "You may specify multiple by selecting \"-- custom --\" and then entering "
-#~ "protocols separated by space."
-#~ msgstr ""
-#~ "Lze určit více protokolů. Vyberte \"-- vlastní --\" a vkládejte protokoly "
-#~ "oddělené mezerou."
-
-#~ msgid "Zone %q"
-#~ msgstr "Zóna %q"
-
-#~ msgid "traffic"
-#~ msgstr "provoz"
diff --git a/luci-app-firewall/po/de/firewall.po b/luci-app-firewall/po/de/firewall.po
index 23ab725a5..ad0cc1f29 100644
--- a/luci-app-firewall/po/de/firewall.po
+++ b/luci-app-firewall/po/de/firewall.po
@@ -13,123 +13,94 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.6\n"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:127
 msgid "%s in %s"
 msgstr "%s in %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr "%s%s mit %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:125
 msgid "%s, %s in %s"
 msgstr "%s, %s in %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:26
+msgid "(Unnamed Entry)"
+msgstr "(Unbenannter Eintrag)"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:169
+msgid "(Unnamed Rule)"
+msgstr "(Unbenannte Regel)"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:37
+msgid "(Unnamed SNAT)"
+msgstr "(Unbennanter SNAT-Eintrag)"
+
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr "<var>%d</var> Pkte. pro <var>%s</var>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr "<var>%d</var> Pkte. pro <var>%s</var>, Häufung <var>%d</var> Pkte."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:180
 msgid "<var>%s</var> and limit to %s"
 msgstr "<var>%s</var> und limitieren auf %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:257
 msgid "Action"
 msgstr "Aktion"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone destination "
-"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
-"traffic."
-msgstr ""
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
+msgid "Add"
+msgstr "Hinzufügen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
-"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
-msgstr ""
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
+msgid "Add and edit..."
+msgstr "Hinzufügen und bearbeiten..."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:57
 msgid "Advanced Settings"
 msgstr "Erweiterte Einstellungen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid "Allow \"invalid\" traffic"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:178
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Erlaube Weiterleitung von <em>Quellzone</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:170
 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:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:89
 msgid "Any"
 msgstr "beliebig"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
-msgid "Any day"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid "Automatic helper assignment"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid ""
-"Automatically assign conntrack helpers based on traffic protocol and port"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
-msgid "Conntrack Settings"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Conntrack helpers"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid "Covered devices"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:88
 msgid "Covered networks"
 msgstr "Abgedeckte Netzwerke"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid "Covered subnets"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:22
 msgid "Custom Rules"
 msgstr "Benutzerdefinierte Regeln"
 
@@ -144,15 +115,23 @@ msgstr ""
 "Befehle werden mit jedem Firewall-Neustart abgearbeitet, direkt nach dem "
 "Laden der Basisregeln."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:108
+msgid "Destination IP address"
+msgstr "Ziel IP-Adresse"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:304
 msgid "Destination address"
 msgstr "Zieladresse"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:313
 msgid "Destination port"
 msgstr "Zielport"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:102
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:295
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
 msgid "Destination zone"
 msgstr "Ziel-Zone"
 
@@ -160,97 +139,83 @@ msgstr "Ziel-Zone"
 msgid "Disable"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid ""
-"Do not install extra rules to reject forwarded traffic with conntrack state "
-"<em>invalid</em>. This may be required for complex asymmetric route setups."
-msgstr ""
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:151
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
+msgid "Do not rewrite"
+msgstr "Nicht umschreiben"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:22
 msgid "Drop invalid packets"
 msgstr "Ungültige Pakete verwerfen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:270
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "Aktivieren"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:149
 msgid "Enable NAT Loopback"
 msgstr "NAT-Loopback aktivieren"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:20
 msgid "Enable SYN-flood protection"
 msgstr "Schutz vor SYN-flood-Attacken"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:144
 msgid "Enable logging on this zone"
 msgstr "Protokollierung innerhalb der Zone aktivieren"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:43
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
-msgstr "Experimentelle Funktion. Nicht vollständig kompatibel mit QoS/SQM."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:98
 msgid "External IP address"
 msgstr "Externe IP-Adresse"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:111
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
 msgid "External port"
 msgstr "Externer Port"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
+msgid "External zone"
+msgstr "Externe Zone"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:158
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:331
 msgid "Extra arguments"
 msgstr "Zusätzliche Argumente"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid "Extra destination arguments"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
-msgid "Extra iptables arguments"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid "Extra source arguments"
-msgstr ""
-
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
 msgid "Firewall"
 msgstr "Firewall"
@@ -259,162 +224,178 @@ msgstr "Firewall"
 msgid "Firewall - Custom Rules"
 msgstr "Firewall - Benutzerdefinierte Regeln"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:13
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:8
 msgid "Firewall - Port Forwards"
 msgstr "Firewall - Portweiterleitungen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:12
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:42
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:9
 msgid "Firewall - Traffic Rules"
-msgstr "Firewall - Traffic-Regeln"
+msgstr "Firewall - Verkehrsregeln"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:15
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:11
 msgid "Firewall - Zone Settings"
 msgstr "Firewall - Zoneneinstellungen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:141
 msgid "Force connection tracking"
 msgstr "Connectiontracking erzwingen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:76
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:27
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:92
 msgid "Forward"
 msgstr "Weitergeleitet"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:116
 msgid "Forward to"
 msgstr "Weiterleiten an"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:343
 msgid "Friday"
-msgstr "Freitag"
+msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:106
 msgid "From %s in %s"
 msgstr "Von %s in %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:88
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:104
 msgid "From %s in %s with source %s"
 msgstr "Von %s in %s mit Quell-%s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:102
 msgid "From %s in %s with source %s and %s"
 msgstr "Von %s in %s mit Quell-%s und %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:117
 msgid "From %s on <var>this device</var>"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:115
 msgid "From %s on <var>this device</var> with source %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:113
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:10
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:56
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:16
 msgid "General Settings"
 msgstr "Allgemein"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:51
 msgid "Hardware flow offloading"
-msgstr "Hardwarebeschleunigte Flusskontrolle"
+msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:85
 msgid "IPv4"
 msgstr "IPv4"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:185
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:118
 msgid "IPv4 and IPv6"
 msgstr "IPv4 und IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:119
 msgid "IPv4 only"
 msgstr "nur IPv4"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:87
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:120
 msgid "IPv6 only"
 msgstr "nur IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:25
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:90
 msgid "Input"
-msgstr "Eingehend"
+msgstr "Eingang"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:157
+msgid "Inter-Zone Forwarding"
+msgstr "Weiterleitungen zwischen Zonen"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:127
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
 msgid "Internal IP address"
 msgstr "Interne IP-Adresse"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:138
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
 msgid "Internal port"
 msgstr "Interner Port"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:121
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
 msgid "Internal zone"
 msgstr "Interne Zone"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:150
 msgid "Limit log messages"
 msgstr "Protokollnachrichten limitieren"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:102
 msgid "MSS clamping"
 msgstr "MSS Korrektur"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:101
 msgid "Masquerading"
 msgstr "NAT aktivieren"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:105
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:162
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:247
 msgid "Match"
 msgstr "Filter"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:206
 msgid "Match ICMP type"
 msgstr "Nach ICMP-Typ filtern"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:118
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr "Selektiert weitergeleiteten Verkehr nach den angegebenen Ziel-Ports."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:112
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
@@ -422,70 +403,104 @@ msgstr ""
 "Eingehende Verbindungen filtern welche an den angegebenen Port oder "
 "Portbereich auf dem lokalen Gerät gerichtet sind"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:91
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr "Selektiert eingehenden Verkehr nach den angegebenen Quell-Ports."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:339
 msgid "Monday"
-msgstr "Montag"
+msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:346
 msgid "Month Days"
-msgstr "Monatstage"
+msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:50
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:180
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:60
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
 msgid "Name"
 msgstr "Name"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:169
-msgid "Network"
-msgstr ""
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
+msgid "New SNAT rule"
+msgstr "Neue SNAT-Regel"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
+msgid "New forward rule"
+msgstr "Neuer Weiterleitungsregel"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
+msgid "New input rule"
+msgstr "Neue Eingangsregel"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
+msgid "New port forward"
+msgstr "Neue Portweiterleitung"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
+msgid "New source NAT"
+msgstr "Neues SNAT"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:99
 msgid "Only match incoming traffic directed at the given IP address."
-msgstr "Selektiere nur Traffic der an die angegebene IP-Adresse gerichtet ist."
+msgstr "Selektiere nur Verkehr der an die angegebene IP-Adresse gerichtet ist."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:63
 msgid "Only match incoming traffic from these MACs."
-msgstr "Selektiere nur Traffic von den angegebenen MAC-Adressen."
+msgstr "Selektiere nur Verkehr von den angegebenen MAC-Adressen."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:75
 msgid "Only match incoming traffic from this IP or range."
-msgstr "Selektiere nur Traffic vom angebenem Quell-IP-Adressbereich."
+msgstr "Selektiere nur Verkehr vom angebenem Quell-IP-Adressbereich."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:87
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
-msgstr "Selektiere nur Traffic von den angegebenen Quell-Ports auf dem Client."
+msgstr "Selektiere nur Verkehr von den angegebenen Quell-Ports auf dem Client."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
+msgid "Open ports on router"
+msgstr "Ports auf dem Router öffnen"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
+msgid "Other..."
+msgstr "Anderes..."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:26
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:91
 msgid "Output"
-msgstr "Ausgehend"
+msgstr "Ausgang"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:288
+msgid "Output zone"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:160
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:332
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 "Gibt zusätzliche Kommandozeilenargumente an iptables weiter. Mit Vorsicht "
 "benutzen!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
-msgid ""
-"Passing raw iptables arguments to source and destination traffic "
-"classification rules allows to match packets based on other criteria than "
-"interfaces or subnets. These options should be used with extreme care as "
-"invalid values could render the firewall ruleset broken, completely exposing "
-"all services."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:14
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:17
 msgid "Port Forwards"
 msgstr "Portweiterleitungen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:9
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
@@ -493,142 +508,181 @@ msgstr ""
 "Portweiterleitungen ermöglichen es entfernten Rechnern im Internet auf "
 "bestimmte Computer oder Dienste im lokalen LAN zuzugreifen."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
-msgid ""
-"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
-"connection tracking."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:39
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:190
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:139
 msgid ""
 "Redirect matched incoming traffic to the given port on the internal host"
 msgstr ""
 "Gefilterte Verbindungen an den angegeben Port auf dem internen Host "
 "weiterleiten"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:128
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "Gefilterte Verbindungen an den angegeben internen Host weiterleiten"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:52
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
-"Erfordert Hardware-NAT-Unterstützung. (Zumindest für mt7621 implementiert)"
 
 #: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:29
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:132
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "NAT auf die angegebenen Ziel-Subnetze beschränken"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:123
 msgid "Restrict Masquerading to given source subnets"
 msgstr "NAT auf die angegebenen Quell-Subnetze beschränken"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:183
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:115
 msgid "Restrict to address family"
 msgstr "Beschränke auf Adressfamilie"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:132
+msgid "Rewrite matched traffic to the given address."
+msgstr "Schreibe selektierten Verkehr auf die angegebene Quell-IP-Adresse um."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:147
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr ""
+"Schreibe selektierten Verkehr auf den angegebenen Qull-Port um. Kann leer "
+"gelassen werden um nur die IP-Adresse umzuschreiben."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:266
+msgid "Rewrite to source %s"
+msgstr "Schreibe um auf Quell-%s"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:264
+msgid "Rewrite to source %s, %s"
+msgstr "Schreibe um auf Quell-%s, %s"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:42
 msgid "Routing/NAT Offloading"
-msgstr "Routing/NAT-Beschleunigung"
+msgstr ""
 
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:245
 msgid "Rule is disabled"
-msgstr "Regel ist deaktiviert"
+msgstr ""
 
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:241
 msgid "Rule is enabled"
-msgstr "Regel ist aktiviert"
+msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:131
+msgid "SNAT IP address"
+msgstr "SNAT-IP-Adresse"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:146
+msgid "SNAT port"
+msgstr "SNAT-Port"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:344
 msgid "Saturday"
-msgstr "Samstag"
+msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:47
 msgid "Software based offloading for routing/NAT"
-msgstr "Softwarebasierte Auslagerung für Routing/NAT"
+msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:46
 msgid "Software flow offloading"
-msgstr "Beschleunigte Flusskontrolle"
+msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:79
 msgid "Source IP address"
 msgstr "Quell-IP-Adresse"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:261
 msgid "Source MAC address"
 msgstr "Quell-MAC-Adresse"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:194
+msgid "Source NAT"
+msgstr "Source NAT"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:195
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+"Source NAT ist eine spezifische From von NAT, welche volle Kontrolle über "
+"die verwendete Quell-IP-Adresse für ausgehenden Verkehr zulässt, zum "
+"Beispiel um mehrere WAN-IP-Adressen auf interne Subnetze abzubilden."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:270
 msgid "Source address"
 msgstr "Quelladresse"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:279
 msgid "Source port"
 msgstr "Quellport"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:254
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
 msgid "Source zone"
 msgstr "Quell-Zone"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:357
 msgid "Start Date (yyyy-mm-dd)"
-msgstr "Startdatum (JJJJ-MM-TT)"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
-msgid "Start Time (hh.mm.ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:353
+msgid "Start Time (hh:mm:ss)"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:359
 msgid "Stop Date (yyyy-mm-dd)"
-msgstr "Enddatum (JJJJ-MM-TT)"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
-msgid "Stop Time (hh.mm.ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
-msgid "Sunday"
-msgstr "Sonntag"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:355
+msgid "Stop Time (hh:mm:ss)"
+msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:338
+msgid "Sunday"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:12
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
 msgstr ""
 "Die Firewall erstellt Netzwerkzonen über bestimmte Netzwerkschnittstellen um "
-"den Netzwerk-Traffic zu trennen."
+"den Netzverkehr zu trennen."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:158
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -637,16 +691,33 @@ msgid ""
 "rule is <em>unidirectional</em>, e.g. a forward from lan to wan does "
 "<em>not</em> imply a permission to forward from wan to lan as well."
 msgstr ""
-"Die untenstehenen Optionen regeln die Verfahreinsweisen für Traffic zwischen "
+"Die untenstehenen Optionen regeln die Verfahreinsweisen für Verkehr zwischen "
 "dieser Zone (%s) und anderen Zonen. <em>Ziel-Zonen</em> decken "
-"weitergeleiteten Traffic <strong>von %q</strong> ab. <em>Quell-Zonen</em> "
-"treffen auf weitergeleiteten Traffic aus anderen Zonen zu, welcher "
+"weitergeleiteten Verkehr <strong>von %q</strong> ab. <em>Quell-Zonen</em> "
+"treffen auf weitergeleiteten Verkehr aus anderen Zonen zu, welcher "
 "<strong>an %q gerichtet</strong> ist. Die Weiterleitung gilt nur in eine "
 "Richtung, d.h. eine erlaubte Weiterleitung von LAN nach WAN impliziert "
 "<em>nicht</em> zusätzlich die Erlaubnis, auch von WAN nach LAN "
 "weiterzuleiten."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:14
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr ""
+"Diese Seite bietet Zugriff auf die erweiterten Eigenschaften der "
+"Portweiterleitung. In den meisten Fällen ist es unnötig die Eigenschaften zu "
+"ändern."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:13
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr ""
+"Diese Seite bietet Zugriff auf die erweiterten Eigenschaften der "
+"Verkehrsregel, zum Beispiel die Selektion nach Quell- und Zieladressen."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:36
 #, fuzzy
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
@@ -657,347 +728,214 @@ msgid ""
 msgstr ""
 "Diese Sektion definiert allgemeine Eigenschaften der %q Zone. Die "
 "<em>Eingang</em> und <em>Ausgang</em> Optionen regeln die Verfahrensweise "
-"für Traffic der in diese Zone eintritt oder diese verlässt. "
-"<em>Weitergeleitet</em> trifft auf Traffic zwischen verschiedenen "
+"für Verkehr der in diese Zone eintritt oder diese verlässt. "
+"<em>Weitergeleitet</em> trifft auf Verkehr zwischen verschiedenen "
 "Schnittstellen innerhalb dieser Zone zu. <em>Abgedeckte Netzwerke</em> "
 "definieren die Zugehörigkeit von Schnittstellen zu dieser Zone."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:342
 msgid "Thursday"
-msgstr "Donnerstag"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
-msgid "Time Restrictions"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:362
 msgid "Time in UTC"
-msgstr "Zeit ist UTC"
+msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:141
 msgid "To %s at %s on <var>this device</var>"
 msgstr "Zu %s an %s auf <var>diesem Gerät</var>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:132
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:157
 msgid "To %s in %s"
 msgstr "Zu %s in %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:143
 msgid "To %s on <var>this device</var>"
 msgstr "Zu %s auf <var>diesem Gerät</var>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:130
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:155
 msgid "To %s, %s in %s"
 msgstr "Zu %s, %s in %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
-msgid "Traffic Rules"
-msgstr "Traffic-Regeln"
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
+msgid "To source IP"
+msgstr "Zu Quell-IP"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
+msgid "To source port"
+msgstr "Zu Quell-Port"
+
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:18
+msgid "Traffic Rules"
+msgstr "Verkehrsregeln"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:10
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
 "the router."
 msgstr ""
-"Traffic-Regeln bestimmen den Fluss der Pakete zwischen verschiedenen Zonen, "
-"zum Beispiel um Traffic zwischen bestimmten Rechnern zu unterbinden oder um "
+"Verkehrsregeln bestimmen den Fluss der Pakete zwischen verschiedenen Zonen, "
+"zum Beispiel um Verkehr zwischen bestimmten Rechnern zu unterbinden oder um "
 "WAN-Ports auf dem Router zu öffnen."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:340
 msgid "Tuesday"
-msgstr "Dienstag"
+msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:244
+msgid "Unnamed SNAT"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:67
 msgid "Unnamed forward"
-msgstr "Unbenannte Portweiterleitung"
+msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:76
 msgid "Unnamed rule"
-msgstr "Unbennante Regel"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
-msgid "Unnamed zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid ""
-"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
-"network devices."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid ""
-"Use this option to classify zone traffic by source or destination subnet "
-"instead of networks or devices."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:101
 msgid "Via %s"
 msgstr "Über %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:99
 msgid "Via %s at %s"
 msgstr "Über %s an %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:341
 msgid "Wednesday"
-msgstr "Mittwoch"
+msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:335
 msgid "Week Days"
-msgstr "Wochentage"
+msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:55
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr ""
+"Durch die Auswahl von \"-- benutzerdefiniert --\" könnene mehrere Werte "
+"durch Leerzeichen getrennt angegeben werden."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:35
+msgid "Zone %q"
+msgstr "Zone %q"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:83
 msgid "Zone ⇒ Forwardings"
 msgstr "Zone ⇒ Weiterleitungen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:59
 msgid "Zones"
 msgstr "Zonen"
 
 # Die richtige Übersetzung von ACCEPT im Firewallkontext ist nicht "Annehmen" sondern "Zulassen". Man kann ja keinen
-# ausgehenden Traffic annehmen. 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+# ausgehenden Verkehr annehmen. 
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:325
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:33
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:98
 msgid "accept"
 msgstr "zulassen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:108
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:141
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:263
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:272
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:281
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:306
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:315
 msgid "any"
 msgstr "beliebig"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:120
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:100
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:150
 msgid "any host"
 msgstr "beliebiger Rechner"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:111
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:138
 msgid "any router IP"
 msgstr "beliebige Router-IP"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:119
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:149
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr "beliebige Zone"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:327
 msgid "don't track"
 msgstr "nicht verfolgen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:324
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:32
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:97
 msgid "drop"
 msgstr "verwerfen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:326
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:31
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:96
 msgid "reject"
 msgstr "zurückweisen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
-msgid "this new zone"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:82
+msgid "traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr ""
-
-#~ msgid "Add"
-#~ msgstr "Hinzufügen"
-
-#~ msgid "Add and edit..."
-#~ msgstr "Hinzufügen und bearbeiten..."
-
-#~ msgid "Do not rewrite"
-#~ msgstr "Nicht umschreiben"
-
-#~ msgid "External zone"
-#~ msgstr "Externe Zone"
-
-#~ msgid "New SNAT rule"
-#~ msgstr "Neue SNAT-Regel"
-
-#~ msgid "New forward rule"
-#~ msgstr "Neue Weiterleitungsregel"
-
-#~ msgid "New input rule"
-#~ msgstr "Neue eingehende Regel"
-
-#~ msgid "New port forward"
-#~ msgstr "Neue Portweiterleitung"
-
-#~ msgid "New source NAT"
-#~ msgstr "Neues SNAT"
-
-#~ msgid "Open ports on router"
-#~ msgstr "Ports auf dem Router öffnen"
-
-#~ msgid "Other..."
-#~ msgstr "Anderes..."
-
-#~ msgid "To source IP"
-#~ msgstr "Zu Quell-IP"
-
-#~ msgid "To source port"
-#~ msgstr "Zu Quell-Port"
-
-#~ msgid "(Unnamed Entry)"
-#~ msgstr "(Unbenannter Eintrag)"
-
-#~ msgid "(Unnamed Rule)"
-#~ msgstr "(Unbenannte Regel)"
-
-#~ msgid "(Unnamed SNAT)"
-#~ msgstr "(Unbennanter SNAT-Eintrag)"
-
-#~ msgid "Destination IP address"
-#~ msgstr "Ziel IP-Adresse"
-
-#~ msgid "Inter-Zone Forwarding"
-#~ msgstr "Weiterleitungen zwischen Zonen"
-
-#~ msgid "Match forwarded traffic to the given destination port or port range."
-#~ msgstr ""
-#~ "Selektiert weitergeleiteten Verkehr nach den angegebenen Ziel-Ports."
-
-#~ msgid ""
-#~ "Match incoming traffic originating from the given source port or port "
-#~ "range on the client host."
-#~ msgstr "Selektiert eingehenden Verkehr nach den angegebenen Quell-Ports."
-
-#~ msgid "Rewrite matched traffic to the given address."
-#~ msgstr ""
-#~ "Schreibe selektierten Verkehr auf die angegebene Quell-IP-Adresse um."
-
-#~ msgid ""
-#~ "Rewrite matched traffic to the given source port. May be left empty to "
-#~ "only rewrite the IP address."
-#~ msgstr ""
-#~ "Schreibe selektierten Verkehr auf den angegebenen Qull-Port um. Kann leer "
-#~ "gelassen werden um nur die IP-Adresse umzuschreiben."
-
-#~ msgid "Rewrite to source %s"
-#~ msgstr "Schreibe um auf Quell-%s"
-
-#~ msgid "Rewrite to source %s, %s"
-#~ msgstr "Schreibe um auf Quell-%s, %s"
-
-#~ msgid "SNAT IP address"
-#~ msgstr "SNAT-IP-Adresse"
-
-#~ msgid "SNAT port"
-#~ msgstr "SNAT-Port"
-
-#~ msgid "Source NAT"
-#~ msgstr "Source NAT"
-
-#~ msgid ""
-#~ "Source NAT is a specific form of masquerading which allows fine grained "
-#~ "control over the source IP used for outgoing traffic, for example to map "
-#~ "multiple WAN addresses to internal subnets."
-#~ msgstr ""
-#~ "Source NAT ist eine spezifische From von NAT, welche volle Kontrolle über "
-#~ "die verwendete Quell-IP-Adresse für ausgehenden Verkehr zulässt, zum "
-#~ "Beispiel um mehrere WAN-IP-Adressen auf interne Subnetze abzubilden."
-
-#~ msgid "Start Time (hh:mm:ss)"
-#~ msgstr "Startzeit (hh:mm:ss)"
-
-#~ msgid "Stop Time (hh:mm:ss)"
-#~ msgstr "Endzeit (hh:mm:ss)"
-
-#~ msgid ""
-#~ "This page allows you to change advanced properties of the port forwarding "
-#~ "entry. In most cases there is no need to modify those settings."
-#~ msgstr ""
-#~ "Diese Seite bietet Zugriff auf die erweiterten Eigenschaften der "
-#~ "Portweiterleitung. In den meisten Fällen ist es unnötig die Eigenschaften "
-#~ "zu ändern."
-
-#~ msgid ""
-#~ "This page allows you to change advanced properties of the traffic rule "
-#~ "entry, such as matched source and destination hosts."
-#~ msgstr ""
-#~ "Diese Seite bietet Zugriff auf die erweiterten Eigenschaften der "
-#~ "Verkehrsregel, zum Beispiel die Selektion nach Quell- und Zieladressen."
-
-#~ msgid "Unnamed SNAT"
-#~ msgstr "Unbennante SNAT-Regel"
-
-#~ msgid ""
-#~ "You may specify multiple by selecting \"-- custom --\" and then entering "
-#~ "protocols separated by space."
-#~ msgstr ""
-#~ "Durch die Auswahl von \"-- benutzerdefiniert --\" könnene mehrere Werte "
-#~ "durch Leerzeichen getrennt angegeben werden."
-
-#~ msgid "Zone %q"
-#~ msgstr "Zone %q"
diff --git a/luci-app-firewall/po/el/firewall.po b/luci-app-firewall/po/el/firewall.po
index 04cb7c343..4fa25b9fe 100644
--- a/luci-app-firewall/po/el/firewall.po
+++ b/luci-app-firewall/po/el/firewall.po
@@ -13,123 +13,94 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.4\n"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:127
 msgid "%s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr "%s%s με %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:125
 msgid "%s, %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:26
+msgid "(Unnamed Entry)"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:169
+msgid "(Unnamed Rule)"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:37
+msgid "(Unnamed SNAT)"
+msgstr ""
+
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr "<var>%d</var> πκτ. ανά <var>%s</var>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:180
 msgid "<var>%s</var> and limit to %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:257
 msgid "Action"
 msgstr "Ενέργεια"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone destination "
-"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
-"traffic."
-msgstr ""
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
+msgid "Add"
+msgstr "Προσθήκη"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
-"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
-msgstr ""
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
+msgid "Add and edit..."
+msgstr "Προσθήκη και επεξεργασία..."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:57
 msgid "Advanced Settings"
 msgstr "Ρυθμίσεις για προχωρημένους"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid "Allow \"invalid\" traffic"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:178
 msgid "Allow forward from <em>source zones</em>:"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:170
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:89
 msgid "Any"
 msgstr "Οποιοδήποτε"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
-msgid "Any day"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid "Automatic helper assignment"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid ""
-"Automatically assign conntrack helpers based on traffic protocol and port"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
-msgid "Conntrack Settings"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Conntrack helpers"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid "Covered devices"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:88
 msgid "Covered networks"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid "Covered subnets"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:22
 msgid "Custom Rules"
 msgstr "Προσαρμοσμένοι Κανόνες"
 
@@ -140,15 +111,23 @@ msgid ""
 "each firewall restart, right after the default ruleset has been loaded."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:108
+msgid "Destination IP address"
+msgstr "Διεύθυνση IP προορισμού"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:304
 msgid "Destination address"
 msgstr "Διεύθυνση προορισμού"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:313
 msgid "Destination port"
 msgstr "Θύρα προορισμού"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:102
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:295
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
 #, fuzzy
 msgid "Destination zone"
 msgstr "Ζώνη προορισμού"
@@ -157,98 +136,84 @@ msgstr "Ζώνη προορισμού"
 msgid "Disable"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid ""
-"Do not install extra rules to reject forwarded traffic with conntrack state "
-"<em>invalid</em>. This may be required for complex asymmetric route setups."
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:151
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
+msgid "Do not rewrite"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:22
 msgid "Drop invalid packets"
 msgstr "Αγνόηση μη-έγκυρων πακετών"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:270
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "Ενεργοποίηση"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:149
 msgid "Enable NAT Loopback"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:20
 #, fuzzy
 msgid "Enable SYN-flood protection"
 msgstr "Προστασία SYN-flood"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:144
 msgid "Enable logging on this zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:43
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:98
 msgid "External IP address"
 msgstr "Εξωτερική διεύθυνση IP"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:111
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
 msgid "External port"
 msgstr "Εξωτερική θύρα"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
+msgid "External zone"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:158
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:331
 msgid "Extra arguments"
 msgstr "Επιπλέον παράμετροι"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid "Extra destination arguments"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
-msgid "Extra iptables arguments"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid "Extra source arguments"
-msgstr ""
-
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
 msgid "Firewall"
 msgstr "Τείχος προστασίας"
@@ -257,273 +222,317 @@ msgstr "Τείχος προστασίας"
 msgid "Firewall - Custom Rules"
 msgstr "Τείχος προστασίας - Προσαρμοσμένοι Κανόνες"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:13
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:8
 msgid "Firewall - Port Forwards"
 msgstr "Τείχος προστασίας - Προώθηση Θυρών"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:12
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:42
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:9
 msgid "Firewall - Traffic Rules"
 msgstr "Τείχος προστασίας - Κανόνες Κίνησεις"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:15
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:11
 msgid "Firewall - Zone Settings"
 msgstr "Τείχος προστασίας - Ρυθμίσεις Ζώνης"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:141
 msgid "Force connection tracking"
 msgstr "Επιβολή παρακολούθησης σύνδεσης"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:76
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:27
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:92
 msgid "Forward"
 msgstr "Προώθηση"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:116
 msgid "Forward to"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:343
 msgid "Friday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:106
 msgid "From %s in %s"
 msgstr "Απο %s στο %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:88
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:104
 msgid "From %s in %s with source %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:102
 msgid "From %s in %s with source %s and %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:117
 msgid "From %s on <var>this device</var>"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:115
 msgid "From %s on <var>this device</var> with source %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:113
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:10
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:56
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:16
 msgid "General Settings"
 msgstr "Γενικές Ρυθμίσεις"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:51
 msgid "Hardware flow offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:85
 msgid "IPv4"
 msgstr "IPv4"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:185
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:118
 msgid "IPv4 and IPv6"
 msgstr "IPv4 και IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:119
 msgid "IPv4 only"
 msgstr "Μόνο IPv4"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:87
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:120
 msgid "IPv6 only"
 msgstr "Μόνο IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:25
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:90
 msgid "Input"
 msgstr "Είσοδος"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:157
+msgid "Inter-Zone Forwarding"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:127
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
 #, fuzzy
 msgid "Internal IP address"
 msgstr "Εσωτερική διεύθυνση"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:138
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
 #, fuzzy
 msgid "Internal port"
 msgstr "Εξωτερική θύρα"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:121
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
 msgid "Internal zone"
 msgstr "Εσωτερική ζώνη"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:150
 msgid "Limit log messages"
 msgstr "Περιορισμός καταγραφών συστήματος"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:102
 #, fuzzy
 msgid "MSS clamping"
 msgstr "Περιορισμός MSS"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:101
 msgid "Masquerading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:105
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:162
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:247
 msgid "Match"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:206
 msgid "Match ICMP type"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:118
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:112
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:91
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:339
 msgid "Monday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:346
 msgid "Month Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:50
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:180
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:60
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
 msgid "Name"
 msgstr "Όνομα"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:169
-msgid "Network"
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
+msgid "New SNAT rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
+msgid "New forward rule"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
+msgid "New input rule"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
+msgid "New port forward"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
+msgid "New source NAT"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:99
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:63
 msgid "Only match incoming traffic from these MACs."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:75
 msgid "Only match incoming traffic from this IP or range."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:87
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
+msgid "Open ports on router"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
+msgid "Other..."
+msgstr "Άλλο..."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:26
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:91
 msgid "Output"
 msgstr "Έξοδος"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:288
+msgid "Output zone"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:160
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:332
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
-msgid ""
-"Passing raw iptables arguments to source and destination traffic "
-"classification rules allows to match packets based on other criteria than "
-"interfaces or subnets. These options should be used with extreme care as "
-"invalid values could render the firewall ruleset broken, completely exposing "
-"all services."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:14
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:17
 msgid "Port Forwards"
 msgstr "Προώθηση Θυρών"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:9
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
-msgid ""
-"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
-"connection tracking."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:39
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:190
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
 msgid "Protocol"
 msgstr "Πρωτόκολλο"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:139
 msgid ""
 "Redirect matched incoming traffic to the given port on the internal host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:128
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:52
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
@@ -531,20 +540,38 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:132
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:123
 msgid "Restrict Masquerading to given source subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:183
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:115
 msgid "Restrict to address family"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:132
+msgid "Rewrite matched traffic to the given address."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:147
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:266
+msgid "Rewrite to source %s"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:264
+msgid "Rewrite to source %s, %s"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:42
 msgid "Routing/NAT Offloading"
 msgstr ""
 
@@ -556,65 +583,89 @@ msgstr ""
 msgid "Rule is enabled"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:131
+msgid "SNAT IP address"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:146
+msgid "SNAT port"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:344
 msgid "Saturday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:47
 msgid "Software based offloading for routing/NAT"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:46
 msgid "Software flow offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:79
 #, fuzzy
 msgid "Source IP address"
 msgstr "Διεύθυνση MAC πηγής"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:261
 msgid "Source MAC address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:194
+msgid "Source NAT"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:195
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:270
 #, fuzzy
 msgid "Source address"
 msgstr "Διεύθυνση MAC πηγής"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:279
 msgid "Source port"
 msgstr "Θύρα πηγής"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:254
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
 #, fuzzy
 msgid "Source zone"
 msgstr "Θύρα πηγής"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:357
 msgid "Start Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
-msgid "Start Time (hh.mm.ss)"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:353
+msgid "Start Time (hh:mm:ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:359
 msgid "Stop Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
-msgid "Stop Time (hh.mm.ss)"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:355
+msgid "Stop Time (hh:mm:ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:338
 msgid "Sunday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:12
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
@@ -622,8 +673,7 @@ msgstr ""
 "Το τείχος προστασίας δημιουργεί ζώνες πάνω στις διεπαφές δικτύου για να "
 "ελέγχει την δικτυακή κίνηση."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:158
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -633,7 +683,19 @@ msgid ""
 "<em>not</em> imply a permission to forward from wan to lan as well."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:14
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:13
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:36
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -642,217 +704,202 @@ 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:349
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:342
 msgid "Thursday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
-msgid "Time Restrictions"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:362
 msgid "Time in UTC"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:141
 msgid "To %s at %s on <var>this device</var>"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:132
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:157
 msgid "To %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:143
 msgid "To %s on <var>this device</var>"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:130
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:155
 msgid "To %s, %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
+msgid "To source IP"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
+msgid "To source port"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:18
 msgid "Traffic Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:10
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
 "the router."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:340
 msgid "Tuesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:244
+msgid "Unnamed SNAT"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:67
 msgid "Unnamed forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:76
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
-msgid "Unnamed zone"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid ""
-"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
-"network devices."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid ""
-"Use this option to classify zone traffic by source or destination subnet "
-"instead of networks or devices."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:101
 msgid "Via %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:99
 msgid "Via %s at %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:341
 msgid "Wednesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:335
 msgid "Week Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:55
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:35
+msgid "Zone %q"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:83
 msgid "Zone ⇒ Forwardings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:59
 msgid "Zones"
 msgstr "Ζώνες"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:325
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:33
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:98
 msgid "accept"
 msgstr "αποδοχή"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:108
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:141
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:263
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:272
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:281
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:306
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:315
 msgid "any"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:120
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:100
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:150
 msgid "any host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:111
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:138
 msgid "any router IP"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:119
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:149
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:327
 msgid "don't track"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:324
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:32
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:97
 msgid "drop"
 msgstr "αγνόηση"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:326
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:31
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:96
 msgid "reject"
 msgstr "απόρριψη"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
-msgid "this new zone"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:82
+msgid "traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr ""
-
-#~ msgid "Add"
-#~ msgstr "Προσθήκη"
-
-#~ msgid "Add and edit..."
-#~ msgstr "Προσθήκη και επεξεργασία..."
-
-#~ msgid "Other..."
-#~ msgstr "Άλλο..."
-
-#~ msgid "Destination IP address"
-#~ msgstr "Διεύθυνση IP προορισμού"
diff --git a/luci-app-firewall/po/en/firewall.po b/luci-app-firewall/po/en/firewall.po
index e38a33d2a..5c1e66d9d 100644
--- a/luci-app-firewall/po/en/firewall.po
+++ b/luci-app-firewall/po/en/firewall.po
@@ -11,123 +11,94 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:127
 msgid "%s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:125
 msgid "%s, %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:26
+msgid "(Unnamed Entry)"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:169
+msgid "(Unnamed Rule)"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:37
+msgid "(Unnamed SNAT)"
+msgstr ""
+
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:180
 msgid "<var>%s</var> and limit to %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:257
 msgid "Action"
 msgstr "Action"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone destination "
-"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
-"traffic."
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
+msgid "Add"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
-"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
+msgid "Add and edit..."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:57
 msgid "Advanced Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid "Allow \"invalid\" traffic"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:178
 msgid "Allow forward from <em>source zones</em>:"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:170
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:89
 msgid "Any"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
-msgid "Any day"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid "Automatic helper assignment"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid ""
-"Automatically assign conntrack helpers based on traffic protocol and port"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
-msgid "Conntrack Settings"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Conntrack helpers"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid "Covered devices"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:88
 msgid "Covered networks"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid "Covered subnets"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:22
 msgid "Custom Rules"
 msgstr ""
 
@@ -138,15 +109,23 @@ msgid ""
 "each firewall restart, right after the default ruleset has been loaded."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:108
+msgid "Destination IP address"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:304
 msgid "Destination address"
 msgstr "Destination address"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:313
 msgid "Destination port"
 msgstr "Destination port"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:102
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:295
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
 msgid "Destination zone"
 msgstr "Destination zone"
 
@@ -154,97 +133,83 @@ msgstr "Destination zone"
 msgid "Disable"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid ""
-"Do not install extra rules to reject forwarded traffic with conntrack state "
-"<em>invalid</em>. This may be required for complex asymmetric route setups."
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:151
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
+msgid "Do not rewrite"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:22
 msgid "Drop invalid packets"
 msgstr "Drop invalid packets"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:270
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:149
 msgid "Enable NAT Loopback"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:20
 msgid "Enable SYN-flood protection"
 msgstr "Enable SYN-flood protection"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:144
 msgid "Enable logging on this zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:43
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:98
 msgid "External IP address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:111
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
 msgid "External port"
 msgstr "External port"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
+msgid "External zone"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:158
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:331
 msgid "Extra arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid "Extra destination arguments"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
-msgid "Extra iptables arguments"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid "Extra source arguments"
-msgstr ""
-
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 # Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/zones.lua      #
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
@@ -257,162 +222,178 @@ msgstr "Firewall"
 msgid "Firewall - Custom Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:13
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:8
 msgid "Firewall - Port Forwards"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:12
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:42
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:9
 msgid "Firewall - Traffic Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:15
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:11
 msgid "Firewall - Zone Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:141
 msgid "Force connection tracking"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:76
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:27
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:92
 msgid "Forward"
 msgstr "Forward"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:116
 msgid "Forward to"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:343
 msgid "Friday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:106
 msgid "From %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:88
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:104
 msgid "From %s in %s with source %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:102
 msgid "From %s in %s with source %s and %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:117
 msgid "From %s on <var>this device</var>"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:115
 msgid "From %s on <var>this device</var> with source %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:113
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:10
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:56
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:16
 msgid "General Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:51
 msgid "Hardware flow offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:85
 msgid "IPv4"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:185
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:118
 msgid "IPv4 and IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:119
 msgid "IPv4 only"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:87
 msgid "IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:120
 msgid "IPv6 only"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:25
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:90
 msgid "Input"
 msgstr "Input"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:157
+msgid "Inter-Zone Forwarding"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:127
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
 msgid "Internal IP address"
 msgstr "Internal IP address"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:138
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
 msgid "Internal port"
 msgstr "Internal port"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:121
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
 msgid "Internal zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:150
 msgid "Limit log messages"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:102
 msgid "MSS clamping"
 msgstr "MSS clamping"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:101
 msgid "Masquerading"
 msgstr "Masquerading"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:105
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:162
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:247
 msgid "Match"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:206
 msgid "Match ICMP type"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:118
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:112
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
@@ -420,110 +401,138 @@ msgstr ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:91
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:339
 msgid "Monday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:346
 msgid "Month Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:50
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:180
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:60
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
 msgid "Name"
 msgstr "Name"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:169
-msgid "Network"
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
+msgid "New SNAT rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
+msgid "New forward rule"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
+msgid "New input rule"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
+msgid "New port forward"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
+msgid "New source NAT"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:99
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:63
 msgid "Only match incoming traffic from these MACs."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:75
 msgid "Only match incoming traffic from this IP or range."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:87
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
+msgid "Open ports on router"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
+msgid "Other..."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:26
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:91
 msgid "Output"
 msgstr "Output"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:288
+msgid "Output zone"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:160
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:332
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
-msgid ""
-"Passing raw iptables arguments to source and destination traffic "
-"classification rules allows to match packets based on other criteria than "
-"interfaces or subnets. These options should be used with extreme care as "
-"invalid values could render the firewall ruleset broken, completely exposing "
-"all services."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:14
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:17
 msgid "Port Forwards"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:9
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
-msgid ""
-"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
-"connection tracking."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:39
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:190
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
 msgid "Protocol"
 msgstr "Protocol"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:139
 msgid ""
 "Redirect matched incoming traffic to the given port on the internal host"
 msgstr ""
 "Redirect matched incoming traffic to the given port on the internal host"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:128
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "Redirect matched incoming traffic to the specified internal host"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:52
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
@@ -531,20 +540,38 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:132
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:123
 msgid "Restrict Masquerading to given source subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:183
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:115
 msgid "Restrict to address family"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:132
+msgid "Rewrite matched traffic to the given address."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:147
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:266
+msgid "Rewrite to source %s"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:264
+msgid "Rewrite to source %s, %s"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:42
 msgid "Routing/NAT Offloading"
 msgstr ""
 
@@ -556,15 +583,23 @@ msgstr ""
 msgid "Rule is enabled"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:131
+msgid "SNAT IP address"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:146
+msgid "SNAT port"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:344
 msgid "Saturday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:47
 msgid "Software based offloading for routing/NAT"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:46
 msgid "Software flow offloading"
 msgstr ""
 
@@ -598,50 +633,66 @@ msgstr ""
 # msgid "Protocol"
 # msgstr ""
 #
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:79
 msgid "Source IP address"
 msgstr "Source IP address"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:261
 msgid "Source MAC address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:194
+msgid "Source NAT"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:195
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:270
 msgid "Source address"
 msgstr "Source address"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:279
 msgid "Source port"
 msgstr "Source port"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:254
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
 msgid "Source zone"
 msgstr "Source zone"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:357
 msgid "Start Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
-msgid "Start Time (hh.mm.ss)"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:353
+msgid "Start Time (hh:mm:ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:359
 msgid "Stop Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
-msgid "Stop Time (hh.mm.ss)"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:355
+msgid "Stop Time (hh:mm:ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:338
 msgid "Sunday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:12
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
@@ -649,8 +700,7 @@ msgstr ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:158
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -660,7 +710,19 @@ msgid ""
 "<em>not</em> imply a permission to forward from wan to lan as well."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:14
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:13
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:36
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -669,205 +731,202 @@ 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:349
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:342
 msgid "Thursday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
-msgid "Time Restrictions"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:362
 msgid "Time in UTC"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:141
 msgid "To %s at %s on <var>this device</var>"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:132
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:157
 msgid "To %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:143
 msgid "To %s on <var>this device</var>"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:130
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:155
 msgid "To %s, %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
+msgid "To source IP"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
+msgid "To source port"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:18
 msgid "Traffic Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:10
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
 "the router."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:340
 msgid "Tuesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:244
+msgid "Unnamed SNAT"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:67
 msgid "Unnamed forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:76
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
-msgid "Unnamed zone"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid ""
-"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
-"network devices."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid ""
-"Use this option to classify zone traffic by source or destination subnet "
-"instead of networks or devices."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:101
 msgid "Via %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:99
 msgid "Via %s at %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:341
 msgid "Wednesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:335
 msgid "Week Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:55
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:35
+msgid "Zone %q"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:83
 msgid "Zone ⇒ Forwardings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:59
 msgid "Zones"
 msgstr "Zones"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:325
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:33
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:98
 msgid "accept"
 msgstr "accept"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:108
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:141
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:263
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:272
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:281
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:306
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:315
 msgid "any"
 msgstr "any"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:120
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:100
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:150
 msgid "any host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:111
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:138
 msgid "any router IP"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:119
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:149
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:327
 msgid "don't track"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:324
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:32
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:97
 msgid "drop"
 msgstr "drop"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:326
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:31
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:96
 msgid "reject"
 msgstr "reject"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
-msgid "this new zone"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:82
+msgid "traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr ""
diff --git a/luci-app-firewall/po/es/firewall.po b/luci-app-firewall/po/es/firewall.po
index 6c40bc88c..c7e9aa2bc 100644
--- a/luci-app-firewall/po/es/firewall.po
+++ b/luci-app-firewall/po/es/firewall.po
@@ -3,142 +3,105 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-03-30 17:00+0200\n"
-"PO-Revision-Date: 2019-10-08 16:17-0300\n"
-"Last-Translator: Franco Castillo <castillofrancodamian@gmail.com>\n"
+"PO-Revision-Date: 2019-05-16 22:32-0300\n"
+"Last-Translator: José Vicente <josevteg@gmail.com>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.2.4\n"
+"X-Generator: Poedit 2.2.2\n"
 "Language-Team: \n"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:127
 msgid "%s in %s"
 msgstr "%s en %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr "%s%s con %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:125
 msgid "%s, %s in %s"
 msgstr "%s, %s en %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:26
+msgid "(Unnamed Entry)"
+msgstr "(Entrada sin nombre)"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:169
+msgid "(Unnamed Rule)"
+msgstr "(Regla sin nombre)"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:37
+msgid "(Unnamed SNAT)"
+msgstr "(SNAT sin nombre)"
+
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr "<var>%d</var> paquetes por <var>%s</var>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr ""
 "<var>%d</var> paquetes por <var>%s</var>, máximo <var>%d</var> paquetes."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:180
 msgid "<var>%s</var> and limit to %s"
 msgstr "<var>%s</var> y limitar a %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr "Aceptar reenvío"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr "Aceptar entrada"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr "Aceptar salida"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:257
 msgid "Action"
 msgstr "Acción"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone destination "
-"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
-"traffic."
-msgstr ""
-"Argumentos sin procesar adicionales de <em>iptables</em> para clasificar el "
-"tráfico de destino de la zona, p.e. <code>-p tcp --dport 443</code> para que "
-"solo coincida con el tráfico HTTPS saliente."
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
+msgid "Add"
+msgstr "Añadir"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
-"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
-msgstr ""
-"Argumentos sin procesar adicionales de <em>iptables</em> para clasificar el "
-"tráfico de origen de zona, p.e. <code>-p tcp --sport 443</code> para que "
-"solo coincida con el tráfico HTTPS entrante."
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
+msgid "Add and edit..."
+msgstr "Añadir y editar..."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:57
 msgid "Advanced Settings"
 msgstr "Configuración avanzada"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid "Allow \"invalid\" traffic"
-msgstr "Permitir tráfico \"inválido\""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:178
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Permitir reenvío desde <em>zonas de origen</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:170
 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:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:89
 msgid "Any"
 msgstr "Cualquiera"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
-msgid "Any day"
-msgstr "Cualquier día"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid "Automatic helper assignment"
-msgstr "Asignación automática de ayuda"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid ""
-"Automatically assign conntrack helpers based on traffic protocol and port"
-msgstr ""
-"Asigna automáticamente ayudantes de conntrack según el protocolo de tráfico "
-"y el puerto"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
-msgid "Conntrack Settings"
-msgstr "Configuraciones de Conntrack"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Conntrack helpers"
-msgstr "Ayudantes de Conntrack"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid "Covered devices"
-msgstr "Dispositivos cubiertos"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:88
 msgid "Covered networks"
 msgstr "Redes cubiertas"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid "Covered subnets"
-msgstr "Subredes cubiertas"
-
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:22
 msgid "Custom Rules"
 msgstr "Reglas personalizadas"
 
@@ -153,15 +116,23 @@ msgstr ""
 "cualquier reinicio del FIrewall, justo tras haber cargado el conjunto de "
 "reglas predeterminadas."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:108
+msgid "Destination IP address"
+msgstr "Dirección IP destino"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:304
 msgid "Destination address"
 msgstr "Dirección de destino"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:313
 msgid "Destination port"
 msgstr "Puerto de destino"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:102
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:295
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
 msgid "Destination zone"
 msgstr "Zona de destino"
 
@@ -169,102 +140,83 @@ msgstr "Zona de destino"
 msgid "Disable"
 msgstr "Deshabilitar"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr "Descartar reenvío"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr "Descartar entrada"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr "Descartar salida"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid ""
-"Do not install extra rules to reject forwarded traffic with conntrack state "
-"<em>invalid</em>. This may be required for complex asymmetric route setups."
-msgstr ""
-"No instale reglas adicionales para rechazar el tráfico reenviado con el "
-"estado conntrack <em>inválido</em>. Esto puede ser necesario para "
-"configuraciones complejas de rutas asimétricas."
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:151
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
+msgid "Do not rewrite"
+msgstr "No reescribir"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr "No seguir reenvío"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr "No seguir entrada"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr "No seguir salida"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:22
 msgid "Drop invalid packets"
 msgstr "Descartar paquetes inválidos"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:270
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "Habilitar"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:149
 msgid "Enable NAT Loopback"
 msgstr "Habilitar bucle NAT"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:20
 msgid "Enable SYN-flood protection"
 msgstr "Habilitar protección contra inundaciones SYN"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:144
 msgid "Enable logging on this zone"
 msgstr "Habilitar registro en esta zona"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:43
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr "Característica experimental. No es totalmente compatible con QoS/SQM."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
-msgstr ""
-"Elige explícitamente los ayudantes de seguimiento de conexión permitidos "
-"para el tráfico de zona"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:98
 msgid "External IP address"
 msgstr "Dirección IP externa"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:111
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
 msgid "External port"
 msgstr "Puerto externo"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
+msgid "External zone"
+msgstr "Zona externa"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:158
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:331
 msgid "Extra arguments"
 msgstr "Parámetros extra"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid "Extra destination arguments"
-msgstr "Argumentos de destino adicionales"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
-msgid "Extra iptables arguments"
-msgstr "Argumentos adicionales de iptables"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid "Extra source arguments"
-msgstr "Argumentos fuente adicionales"
-
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
 msgid "Firewall"
 msgstr "Firewall"
@@ -273,162 +225,178 @@ msgstr "Firewall"
 msgid "Firewall - Custom Rules"
 msgstr "Firewall - Reglas personalizadas"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:13
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:8
 msgid "Firewall - Port Forwards"
 msgstr "Firewall - Reenvíos de puertos"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:12
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:42
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:9
 msgid "Firewall - Traffic Rules"
 msgstr "Firewall - Reglas de tráfico"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:15
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:11
 msgid "Firewall - Zone Settings"
 msgstr "Firewall - Configuración de la zona"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:141
 msgid "Force connection tracking"
 msgstr "Forzar seguimiento de conexión"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:76
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:27
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:92
 msgid "Forward"
 msgstr "Reenviar"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:116
 msgid "Forward to"
 msgstr "Reenviar a"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:343
 msgid "Friday"
 msgstr "Viernes"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:106
 msgid "From %s in %s"
 msgstr "Desde %s en %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:88
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:104
 msgid "From %s in %s with source %s"
 msgstr "Desde %s en %s con origen %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:102
 msgid "From %s in %s with source %s and %s"
 msgstr "Desde %s en %s con origen %s y %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:117
 msgid "From %s on <var>this device</var>"
 msgstr "Desde %s en <var>este dispositivo</var>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:115
 msgid "From %s on <var>this device</var> with source %s"
 msgstr "Desde %s en <var>este dispositivo</var> con la fuente %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:113
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr "De %s en <var>este dispositivo</var> con la fuente %s y %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:10
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:56
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:16
 msgid "General Settings"
 msgstr "Configuración general"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:51
 msgid "Hardware flow offloading"
 msgstr "Flow Offloading por hardware"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr "IP"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr "Rango de IP"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr "IPs"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:85
 msgid "IPv4"
 msgstr "IPv4"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:185
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:118
 msgid "IPv4 and IPv6"
 msgstr "IPv4 e IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:119
 msgid "IPv4 only"
 msgstr "Sólo IPv4"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:87
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:120
 msgid "IPv6 only"
 msgstr "Sólo IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:25
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:90
 msgid "Input"
 msgstr "Entrada"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:157
+msgid "Inter-Zone Forwarding"
+msgstr "Reenvío entre zonas"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:127
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
 msgid "Internal IP address"
 msgstr "Dirección IP interna"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:138
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
 msgid "Internal port"
 msgstr "Puerto interno"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:121
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
 msgid "Internal zone"
 msgstr "Zona interna"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:150
 msgid "Limit log messages"
 msgstr "Limitar registro de mensajes"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr "MAC"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr "MACs"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:102
 msgid "MSS clamping"
 msgstr "Fijado de MSS"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:101
 msgid "Masquerading"
 msgstr "Enmascaramiento"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:105
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:162
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:247
 msgid "Match"
 msgstr "Coincidir"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:206
 msgid "Match ICMP type"
 msgstr "Coincidir con tipo ICMP"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:118
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr "Coincidir con tráfico reenviado al puerto o rango de puertos destino."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:112
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
@@ -436,38 +404,68 @@ msgstr ""
 "Coincidir con tráfico de entrada dirigido al puerto o rango de puertos "
 "destino en este host"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:91
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr ""
+"Haga coincidir el tráfico entrante que se origina en el puerto de origen o "
+"el rango de puertos en el host del cliente."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:339
 msgid "Monday"
 msgstr "Lunes"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:346
 msgid "Month Days"
 msgstr "Días del mes"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:50
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:180
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:60
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
 msgid "Name"
 msgstr "Nombre"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:169
-msgid "Network"
-msgstr "Red"
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
+msgid "New SNAT rule"
+msgstr "Nueva regla SNAT"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
+msgid "New forward rule"
+msgstr "Nueva regla de reenvío"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
+msgid "New input rule"
+msgstr "Nueva regla de entrada"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
+msgid "New port forward"
+msgstr "Nuevo reenvío de puerto"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
+msgid "New source NAT"
+msgstr "Nuevo origen NAT"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:99
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr "Coincidir sólo con tráfico de entrada a esta dirección IP."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:63
 msgid "Only match incoming traffic from these MACs."
 msgstr "Coincidir sólo con tráfico de entrada desde estas MACs."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:75
 msgid "Only match incoming traffic from this IP or range."
 msgstr "Coincidir sólo con tráfico de entrada desde esta IP o rango."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:87
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
@@ -475,37 +473,37 @@ msgstr ""
 "Solo coincida con el tráfico entrante que se origina desde el puerto de "
 "origen o el rango de puertos en el host del cliente"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
+msgid "Open ports on router"
+msgstr "Abrir puertos en el router"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
+msgid "Other..."
+msgstr "Otros..."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:26
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:91
 msgid "Output"
 msgstr "Salida"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:288
+msgid "Output zone"
+msgstr "Zona de salida"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:160
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:332
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr "Agrega más parámetros a iptables. ¡Utilice con cuidado!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
-msgid ""
-"Passing raw iptables arguments to source and destination traffic "
-"classification rules allows to match packets based on other criteria than "
-"interfaces or subnets. These options should be used with extreme care as "
-"invalid values could render the firewall ruleset broken, completely exposing "
-"all services."
-msgstr ""
-"Pasar argumentos de iptables sin procesar a las reglas de clasificación de "
-"tráfico de origen y destino permite hacer coincidir paquetes basados en "
-"otros criterios que no sean interfaces o subredes. Estas opciones se deben "
-"usar con extremo cuidado, ya que los valores inválidos pueden hacer que el "
-"conjunto de reglas del firewall se rompa, exponiendo completamente todos los "
-"servicios."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:14
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:17
 msgid "Port Forwards"
 msgstr "Reenvíos de puertos"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:9
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
@@ -513,47 +511,39 @@ msgstr ""
 "El reenvío de puertos permite a ordenadores remotos en internet conectar a "
 "un ordenador o servicio específico en la LAN privada."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
-msgid ""
-"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
-"connection tracking."
-msgstr ""
-"Evite la instalación de reglas <em>NOTRACK</em> que evitarían el seguimiento "
-"de la conexión."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:39
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:190
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:139
 msgid ""
 "Redirect matched incoming traffic to the given port on the internal host"
 msgstr ""
 "Redirigir el tráfico de entrada que coincida al puerto dado en el host "
 "interno"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:128
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr ""
 "Redirigir el tráfico de entrada que coincida al host interno especificado"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr "Rechazar reenvío"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr "Rechazar entrada"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr "Rechazar salida"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:52
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 "Requiere soporte de NAT por hardware. Implementado al menos para mt7621"
@@ -562,20 +552,40 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr "Reiniciar Firewall"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:132
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "Restringir enmascaramiento a las subredes destino"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:123
 msgid "Restrict Masquerading to given source subnets"
 msgstr "Restringir enmascaramiento a las subredes origen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:183
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:115
 msgid "Restrict to address family"
 msgstr "Restringir a la familia de direcciones"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:132
+msgid "Rewrite matched traffic to the given address."
+msgstr "Reescribir el tráfico que coincida a estas direcciones."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:147
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr ""
+"Reescribir el tráfico que coincida con este puerto origen. Deje en blanco "
+"para reescribir sólo la dirección IP."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:266
+msgid "Rewrite to source %s"
+msgstr "Reescribir a origen %s"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:264
+msgid "Rewrite to source %s, %s"
+msgstr "Reescribir a origen %s, %s"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:42
 msgid "Routing/NAT Offloading"
 msgstr "Enrutamiento/NAT Offloading"
 
@@ -587,62 +597,89 @@ msgstr "Regla deshabilitada"
 msgid "Rule is enabled"
 msgstr "Regla habilitada"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:131
+msgid "SNAT IP address"
+msgstr "Dirección IP SNAT"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:146
+msgid "SNAT port"
+msgstr "Puerto SNAT"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:344
 msgid "Saturday"
 msgstr "Sábado"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:47
 msgid "Software based offloading for routing/NAT"
 msgstr "Offloading basado en software para enrutamiento/NAT"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:46
 msgid "Software flow offloading"
 msgstr "Flow Offloading por software"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:79
 msgid "Source IP address"
 msgstr "Dirección IP origen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:261
 msgid "Source MAC address"
 msgstr "Dirección MAC origen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:194
+msgid "Source NAT"
+msgstr "Origen NAT"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:195
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+"Origen NAT es una forma específica de enmascaramiento que permite el control "
+"fino del origen IP que se usa en el tráfico de salida por ejemplo para "
+"dirigir múltiples direcciones WAN a las subredes internas."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:270
 msgid "Source address"
 msgstr "Dirección de origen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:279
 msgid "Source port"
 msgstr "Puerto de origen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:254
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
 msgid "Source zone"
 msgstr "Zona de origen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:357
 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:361
-msgid "Start Time (hh.mm.ss)"
-msgstr "Hora de inicio (hh.mm.ss)"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:353
+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:373
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:359
 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:365
-msgid "Stop Time (hh.mm.ss)"
-msgstr "Hora de finalización (hh.mm.ss)"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:355
+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:345
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:338
 msgid "Sunday"
 msgstr "Domingo"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:12
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
@@ -650,8 +687,7 @@ msgstr ""
 "El Firewall crea zonas sobre sus interfaces de red para controlar el flujo "
 "del tráfico."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:158
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -668,7 +704,23 @@ msgstr ""
 "la LAN a la WAN <em>no</em> implica permiso para reenviar desde la WAN a la "
 "LAN también."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:14
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr ""
+"Propiedades avanzadas de la entrada \"reenvío de puertos\". No suele ser "
+"necesario modificar esta configuración."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:13
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr ""
+"Esta página le permite cambiar las propiedades avanzadas de la entrada de la "
+"regla de tráfico, como los hosts de origen y destino coincidentes."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:36
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -683,40 +735,46 @@ 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:349
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:342
 msgid "Thursday"
 msgstr "Jueves"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
-msgid "Time Restrictions"
-msgstr "Restricciones de tiempo"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:362
 msgid "Time in UTC"
 msgstr "Tiempo en UTC"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:141
 msgid "To %s at %s on <var>this device</var>"
 msgstr "A %s en %s por <var>este dispositivo</var>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:132
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:157
 msgid "To %s in %s"
 msgstr "A %s en %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:143
 msgid "To %s on <var>this device</var>"
 msgstr "A %s por <var>este dispositivo</var>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:130
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:155
 msgid "To %s, %s in %s"
 msgstr "A %s, %s en %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
+msgid "To source IP"
+msgstr "A IP origen"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
+msgid "To source port"
+msgstr "A puerto origen"
+
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:18
 msgid "Traffic Rules"
 msgstr "Reglas de tráfico"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:10
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
@@ -726,307 +784,158 @@ 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:347
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:340
 msgid "Tuesday"
 msgstr "Martes"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:244
+msgid "Unnamed SNAT"
+msgstr "SNAT sin nombre"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:67
 msgid "Unnamed forward"
 msgstr "Reenvío sin nombre"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:76
 msgid "Unnamed rule"
 msgstr "Regla sin nombre"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
-msgid "Unnamed zone"
-msgstr "Zona sin nombre"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid ""
-"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
-"network devices."
-msgstr ""
-"Use esta opción para clasificar el tráfico de zona por raw, dispositivos de "
-"red no administrados <em>uci</em>."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid ""
-"Use this option to classify zone traffic by source or destination subnet "
-"instead of networks or devices."
-msgstr ""
-"Use esta opción para clasificar el tráfico de zona por subred de origen o "
-"destino en lugar de redes o dispositivos."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:101
 msgid "Via %s"
 msgstr "Vía %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:99
 msgid "Via %s at %s"
 msgstr "Vía %s a %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:341
 msgid "Wednesday"
 msgstr "Miércoles"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:335
 msgid "Week Days"
 msgstr "Días de la semana"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:55
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr ""
+"Puede poner varios seleccionando \"-- personalizado --\" e introduciendo los "
+"protocolos separados por espacio."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:35
+msgid "Zone %q"
+msgstr "Zona %q"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:83
 msgid "Zone ⇒ Forwardings"
 msgstr "Zona ⇒ Reenvíos"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:59
 msgid "Zones"
 msgstr "Zonas"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:325
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:33
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:98
 msgid "accept"
 msgstr "Aceptar"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:108
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:141
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:263
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:272
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:281
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:306
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:315
 msgid "any"
 msgstr "cualquiera"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:120
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:100
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:150
 msgid "any host"
 msgstr "cualquier host"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:111
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:138
 msgid "any router IP"
 msgstr "cualquier router IP"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:119
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:149
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr "cualquier zona"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr "Día"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:327
 msgid "don't track"
 msgstr "No seguir"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:324
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:32
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:97
 msgid "drop"
 msgstr "Descartar"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr "Hora"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr "Minuto"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr "No"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
-msgstr "puerto"
+msgstr "Puerto"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
-msgstr "puertos"
+msgstr "Puertos"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:326
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:31
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:96
 msgid "reject"
 msgstr "Rechazar"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr "segundo"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
-msgid "this new zone"
-msgstr "Esta nueva zona"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:82
+msgid "traffic"
+msgstr "Tráfico"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr "Tipo"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr "Tipos"
-
-#~ msgid "Add"
-#~ msgstr "Añadir"
-
-#~ msgid "Add and edit..."
-#~ msgstr "Añadir y editar..."
-
-#~ msgid "Do not rewrite"
-#~ msgstr "No reescribir"
-
-#~ msgid "External zone"
-#~ msgstr "Zona externa"
-
-#~ msgid "New SNAT rule"
-#~ msgstr "Nueva regla SNAT"
-
-#~ msgid "New forward rule"
-#~ msgstr "Nueva regla de reenvío"
-
-#~ msgid "New input rule"
-#~ msgstr "Nueva regla de entrada"
-
-#~ msgid "New port forward"
-#~ msgstr "Nuevo reenvío de puerto"
-
-#~ msgid "New source NAT"
-#~ msgstr "Nuevo origen NAT"
-
-#~ msgid "Open ports on router"
-#~ msgstr "Abrir puertos en el router"
-
-#~ msgid "Other..."
-#~ msgstr "Otros..."
-
-#~ msgid "To source IP"
-#~ msgstr "A IP origen"
-
-#~ msgid "To source port"
-#~ msgstr "A puerto origen"
-
-#~ msgid "Output zone"
-#~ msgstr "Zona de salida"
-
-#~ msgid "(Unnamed Entry)"
-#~ msgstr "(Entrada sin nombre)"
-
-#~ msgid "(Unnamed Rule)"
-#~ msgstr "(Regla sin nombre)"
-
-#~ msgid "(Unnamed SNAT)"
-#~ msgstr "(SNAT sin nombre)"
-
-#~ msgid "Destination IP address"
-#~ msgstr "Dirección IP destino"
-
-#~ msgid "Inter-Zone Forwarding"
-#~ msgstr "Reenvío entre zonas"
-
-#~ msgid "Match forwarded traffic to the given destination port or port range."
-#~ msgstr ""
-#~ "Coincidir con tráfico reenviado al puerto o rango de puertos destino."
-
-#~ msgid ""
-#~ "Match incoming traffic originating from the given source port or port "
-#~ "range on the client host."
-#~ msgstr ""
-#~ "Haga coincidir el tráfico entrante que se origina en el puerto de origen "
-#~ "o el rango de puertos en el host del cliente."
-
-#~ msgid "Rewrite matched traffic to the given address."
-#~ msgstr "Reescribir el tráfico que coincida a estas direcciones."
-
-#~ msgid ""
-#~ "Rewrite matched traffic to the given source port. May be left empty to "
-#~ "only rewrite the IP address."
-#~ msgstr ""
-#~ "Reescribir el tráfico que coincida con este puerto origen. Deje en blanco "
-#~ "para reescribir sólo la dirección IP."
-
-#~ msgid "Rewrite to source %s"
-#~ msgstr "Reescribir a origen %s"
-
-#~ msgid "Rewrite to source %s, %s"
-#~ msgstr "Reescribir a origen %s, %s"
-
-#~ msgid "SNAT IP address"
-#~ msgstr "Dirección IP SNAT"
-
-#~ msgid "SNAT port"
-#~ msgstr "Puerto SNAT"
-
-#~ msgid "Source NAT"
-#~ msgstr "Origen NAT"
-
-#~ msgid ""
-#~ "Source NAT is a specific form of masquerading which allows fine grained "
-#~ "control over the source IP used for outgoing traffic, for example to map "
-#~ "multiple WAN addresses to internal subnets."
-#~ msgstr ""
-#~ "Origen NAT es una forma específica de enmascaramiento que permite el "
-#~ "control fino del origen IP que se usa en el tráfico de salida por ejemplo "
-#~ "para dirigir múltiples direcciones WAN a las subredes internas."
-
-#~ msgid "Start Time (hh:mm:ss)"
-#~ msgstr "Hora de inicio (hh:mm:ss)"
-
-#~ msgid "Stop Time (hh:mm:ss)"
-#~ msgstr "Hora de finalización (hh:mm:ss)"
-
-#~ msgid ""
-#~ "This page allows you to change advanced properties of the port forwarding "
-#~ "entry. In most cases there is no need to modify those settings."
-#~ msgstr ""
-#~ "Propiedades avanzadas de la entrada \"reenvío de puertos\". No suele ser "
-#~ "necesario modificar esta configuración."
-
-#~ msgid ""
-#~ "This page allows you to change advanced properties of the traffic rule "
-#~ "entry, such as matched source and destination hosts."
-#~ msgstr ""
-#~ "Esta página le permite cambiar las propiedades avanzadas de la entrada de "
-#~ "la regla de tráfico, como los hosts de origen y destino coincidentes."
-
-#~ msgid "Unnamed SNAT"
-#~ msgstr "SNAT sin nombre"
-
-#~ msgid ""
-#~ "You may specify multiple by selecting \"-- custom --\" and then entering "
-#~ "protocols separated by space."
-#~ msgstr ""
-#~ "Puede poner varios seleccionando \"-- personalizado --\" e introduciendo "
-#~ "los protocolos separados por espacio."
-
-#~ msgid "Zone %q"
-#~ msgstr "Zona %q"
-
-#~ msgid "traffic"
-#~ msgstr "Tráfico"
diff --git a/luci-app-firewall/po/fr/firewall.po b/luci-app-firewall/po/fr/firewall.po
index 7da22682b..ac136a59b 100644
--- a/luci-app-firewall/po/fr/firewall.po
+++ b/luci-app-firewall/po/fr/firewall.po
@@ -13,123 +13,94 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Pootle 2.0.6\n"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:127
 msgid "%s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:125
 msgid "%s, %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:26
+msgid "(Unnamed Entry)"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:169
+msgid "(Unnamed Rule)"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:37
+msgid "(Unnamed SNAT)"
+msgstr ""
+
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:180
 msgid "<var>%s</var> and limit to %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:257
 msgid "Action"
 msgstr "Action"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone destination "
-"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
-"traffic."
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
+msgid "Add"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
-"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
+msgid "Add and edit..."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:57
 msgid "Advanced Settings"
 msgstr "Paramètres avancés"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid "Allow \"invalid\" traffic"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:178
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Permettre la transmission des <em>zones source</em> :"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:170
 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:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:89
 msgid "Any"
 msgstr "N'importe lequel"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
-msgid "Any day"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid "Automatic helper assignment"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid ""
-"Automatically assign conntrack helpers based on traffic protocol and port"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
-msgid "Conntrack Settings"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Conntrack helpers"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid "Covered devices"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:88
 msgid "Covered networks"
 msgstr "Réseaux couverts"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid "Covered subnets"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:22
 msgid "Custom Rules"
 msgstr "Régles spécifiques"
 
@@ -140,15 +111,23 @@ msgid ""
 "each firewall restart, right after the default ruleset has been loaded."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:108
+msgid "Destination IP address"
+msgstr "Adresse IP de destination"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:304
 msgid "Destination address"
 msgstr "Adresse de destination"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:313
 msgid "Destination port"
 msgstr "Port de destination"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:102
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:295
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
 msgid "Destination zone"
 msgstr "Zone de destination"
 
@@ -156,97 +135,83 @@ msgstr "Zone de destination"
 msgid "Disable"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid ""
-"Do not install extra rules to reject forwarded traffic with conntrack state "
-"<em>invalid</em>. This may be required for complex asymmetric route setups."
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:151
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
+msgid "Do not rewrite"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:22
 msgid "Drop invalid packets"
 msgstr "Supprimer les paquets invalides"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:270
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "Activer"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:149
 msgid "Enable NAT Loopback"
 msgstr "Activer le NAT sur la boucle-locale"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:20
 msgid "Enable SYN-flood protection"
 msgstr "Activer la protection contre le SYN-flood"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:144
 msgid "Enable logging on this zone"
 msgstr "Activer les traces (logs) sur cette zone"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:43
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:98
 msgid "External IP address"
 msgstr "Adresse IP externe"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:111
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
 msgid "External port"
 msgstr "Port externe"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
+msgid "External zone"
+msgstr "Zone externe"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:158
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:331
 msgid "Extra arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid "Extra destination arguments"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
-msgid "Extra iptables arguments"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid "Extra source arguments"
-msgstr ""
-
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 #  applications/luci-fw/luasrc/model/cbi/luci_fw/zones.lua                    #
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
@@ -259,162 +224,178 @@ msgstr "Pare-feu"
 msgid "Firewall - Custom Rules"
 msgstr "Pare-feu -- Règles personnalisées"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:13
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:8
 msgid "Firewall - Port Forwards"
 msgstr "Pare-feu -- Redirections de ports"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:12
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:42
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:9
 msgid "Firewall - Traffic Rules"
 msgstr "Pare-feu -- Règles de trafic"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:15
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:11
 msgid "Firewall - Zone Settings"
 msgstr "Pare-feu - Configuration des zones"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:141
 msgid "Force connection tracking"
 msgstr "Forcer le suivi des connexions"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:76
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:27
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:92
 msgid "Forward"
 msgstr "Transfert"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:116
 msgid "Forward to"
 msgstr "Transférer à"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:343
 msgid "Friday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:106
 msgid "From %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:88
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:104
 msgid "From %s in %s with source %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:102
 msgid "From %s in %s with source %s and %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:117
 msgid "From %s on <var>this device</var>"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:115
 msgid "From %s on <var>this device</var> with source %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:113
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:10
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:56
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:16
 msgid "General Settings"
 msgstr "Paramètres généraux"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:51
 msgid "Hardware flow offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:85
 msgid "IPv4"
 msgstr "IPv4"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:185
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:118
 msgid "IPv4 and IPv6"
 msgstr "IPv4 et IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:119
 msgid "IPv4 only"
 msgstr "IPv4 seulement"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:87
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:120
 msgid "IPv6 only"
 msgstr "IPv6 seulement"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:25
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:90
 msgid "Input"
 msgstr "Entrée"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:157
+msgid "Inter-Zone Forwarding"
+msgstr "Transmission entre zones"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:127
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
 msgid "Internal IP address"
 msgstr "Adresse IP interne"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:138
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
 msgid "Internal port"
 msgstr "Port interne"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:121
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
 msgid "Internal zone"
 msgstr "Zone interne"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:150
 msgid "Limit log messages"
 msgstr "Limiter les messages de journalisation"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:102
 msgid "MSS clamping"
 msgstr "Contrainte du MSS"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:101
 msgid "Masquerading"
 msgstr "Masquage"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:105
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:162
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:247
 msgid "Match"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:206
 msgid "Match ICMP type"
 msgstr "Type ICMP correspondant"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:118
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:112
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
@@ -422,68 +403,102 @@ msgstr ""
 "Prendre en compte le trafic dirigé vers le port de destination donné (ou la "
 "gamme de ports) sur cet hôte"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:91
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:339
 msgid "Monday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:346
 msgid "Month Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:50
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:180
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:60
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
 msgid "Name"
 msgstr "Nom"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:169
-msgid "Network"
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
+msgid "New SNAT rule"
+msgstr "Nouvelle règle SNAT"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
+msgid "New forward rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
+msgid "New input rule"
+msgstr "Nouvelle règle d'entrée"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
+msgid "New port forward"
+msgstr "Nouvelle redirection de port"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
+msgid "New source NAT"
+msgstr "Nouvelle source NAT"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:99
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:63
 msgid "Only match incoming traffic from these MACs."
 msgstr "Montrer seulement le trafic entrant provenant de ces adresses MAC."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:75
 msgid "Only match incoming traffic from this IP or range."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:87
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
+msgid "Open ports on router"
+msgstr "Ports ouverts sur le routeur"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
+msgid "Other..."
+msgstr "Autre..."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:26
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:91
 msgid "Output"
 msgstr "Sortie"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:288
+msgid "Output zone"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:160
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:332
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
-msgid ""
-"Passing raw iptables arguments to source and destination traffic "
-"classification rules allows to match packets based on other criteria than "
-"interfaces or subnets. These options should be used with extreme care as "
-"invalid values could render the firewall ruleset broken, completely exposing "
-"all services."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:14
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:17
 msgid "Port Forwards"
 msgstr "Redirections de port"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:9
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
@@ -491,44 +506,38 @@ msgstr ""
 "La redirection de port permet aux ordinateurs distants sur Internet, de se "
 "connecter à un ordinateur ou service spécifié dans le réseau local privé."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
-msgid ""
-"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
-"connection tracking."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:39
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:190
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
 msgid "Protocol"
 msgstr "Protocole"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:139
 msgid ""
 "Redirect matched incoming traffic to the given port on the internal host"
 msgstr ""
 "Rediriger le trafic entrant correspondant vers le port donné sur l'hôte "
 "interne"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:128
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "Rediriger le trafic entrant correspondant vers l'hôte interne spécifié"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:52
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
@@ -536,24 +545,42 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:132
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
 "Restreindre la substitution d'adresses (Masquerade) à ces sous-réseaux "
 "destinataires"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:123
 msgid "Restrict Masquerading to given source subnets"
 msgstr ""
 "Restreindre la substitution d'adresses (Masquerade) à ces sous-réseaux "
 "sources"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:183
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:115
 msgid "Restrict to address family"
 msgstr "Restreindre à cette famille d'adresses"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:132
+msgid "Rewrite matched traffic to the given address."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:147
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:266
+msgid "Rewrite to source %s"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:264
+msgid "Rewrite to source %s, %s"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:42
 msgid "Routing/NAT Offloading"
 msgstr ""
 
@@ -565,15 +592,23 @@ msgstr ""
 msgid "Rule is enabled"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:131
+msgid "SNAT IP address"
+msgstr "Adresse IP SNAT"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:146
+msgid "SNAT port"
+msgstr "Port SNAT"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:344
 msgid "Saturday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:47
 msgid "Software based offloading for routing/NAT"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:46
 msgid "Software flow offloading"
 msgstr ""
 
@@ -607,50 +642,66 @@ msgstr ""
 # msgid "Protocol"
 # msgstr ""
 #
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:79
 msgid "Source IP address"
 msgstr "Adresse IP source"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:261
 msgid "Source MAC address"
 msgstr "Adresse MAC source"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:194
+msgid "Source NAT"
+msgstr "Source NAT"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:195
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:270
 msgid "Source address"
 msgstr "Adresse source"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:279
 msgid "Source port"
 msgstr "Port source"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:254
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
 msgid "Source zone"
 msgstr "Zone source"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:357
 msgid "Start Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
-msgid "Start Time (hh.mm.ss)"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:353
+msgid "Start Time (hh:mm:ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:359
 msgid "Stop Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
-msgid "Stop Time (hh.mm.ss)"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:355
+msgid "Stop Time (hh:mm:ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:338
 msgid "Sunday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:12
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
@@ -658,8 +709,7 @@ msgstr ""
 "Le pare-feu crée des zones sur les interfaces réseau pour contrôler le flux "
 "du trafic réseau."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:158
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -676,7 +726,22 @@ msgstr ""
 "transmission du LAN au WAN n'implique <em>pas</em> également l'autorisation "
 "de transmission du WAN au LAN."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:14
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr ""
+"Cette page vous permet de modifier les propriétés avancées parmi les entrées "
+"de redirection de port. Dans la plupart des cas, cela n'est pas nécessaire "
+"de modifier ces paramètres."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:13
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:36
 #, fuzzy
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
@@ -692,253 +757,203 @@ 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:349
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:342
 msgid "Thursday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
-msgid "Time Restrictions"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:362
 msgid "Time in UTC"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:141
 msgid "To %s at %s on <var>this device</var>"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:132
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:157
 msgid "To %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:143
 msgid "To %s on <var>this device</var>"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:130
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:155
 msgid "To %s, %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
+msgid "To source IP"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
+msgid "To source port"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:18
 msgid "Traffic Rules"
 msgstr "Règles de trafic"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:10
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
 "the router."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:340
 msgid "Tuesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:244
+msgid "Unnamed SNAT"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:67
 msgid "Unnamed forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:76
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
-msgid "Unnamed zone"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid ""
-"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
-"network devices."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid ""
-"Use this option to classify zone traffic by source or destination subnet "
-"instead of networks or devices."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:101
 msgid "Via %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:99
 msgid "Via %s at %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:341
 msgid "Wednesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:335
 msgid "Week Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:55
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:35
+msgid "Zone %q"
+msgstr "Zone %q"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:83
 msgid "Zone ⇒ Forwardings"
 msgstr "Zone ⇒ Transmissions"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:59
 msgid "Zones"
 msgstr "Zones"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:325
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:33
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:98
 msgid "accept"
 msgstr "accepter"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:108
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:141
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:263
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:272
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:281
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:306
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:315
 #, fuzzy
 msgid "any"
 msgstr "tous"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:120
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:100
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:150
 msgid "any host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:111
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:138
 msgid "any router IP"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:119
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:149
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:327
 msgid "don't track"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:324
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:32
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:97
 msgid "drop"
 msgstr "ignorer"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:326
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:31
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:96
 msgid "reject"
 msgstr "rejeter"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
-msgid "this new zone"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:82
+msgid "traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr ""
-
-#~ msgid "External zone"
-#~ msgstr "Zone externe"
-
-#~ msgid "New SNAT rule"
-#~ msgstr "Nouvelle règle SNAT"
-
-#~ msgid "New input rule"
-#~ msgstr "Nouvelle règle d'entrée"
-
-#~ msgid "New port forward"
-#~ msgstr "Nouvelle redirection de port"
-
-#~ msgid "New source NAT"
-#~ msgstr "Nouvelle source NAT"
-
-#~ msgid "Open ports on router"
-#~ msgstr "Ports ouverts sur le routeur"
-
-#~ msgid "Other..."
-#~ msgstr "Autre..."
-
-#~ msgid "Destination IP address"
-#~ msgstr "Adresse IP de destination"
-
-#~ msgid "Inter-Zone Forwarding"
-#~ msgstr "Transmission entre zones"
-
-#~ msgid "SNAT IP address"
-#~ msgstr "Adresse IP SNAT"
-
-#~ msgid "SNAT port"
-#~ msgstr "Port SNAT"
-
-#~ msgid "Source NAT"
-#~ msgstr "Source NAT"
-
-#~ msgid ""
-#~ "This page allows you to change advanced properties of the port forwarding "
-#~ "entry. In most cases there is no need to modify those settings."
-#~ msgstr ""
-#~ "Cette page vous permet de modifier les propriétés avancées parmi les "
-#~ "entrées de redirection de port. Dans la plupart des cas, cela n'est pas "
-#~ "nécessaire de modifier ces paramètres."
-
-#~ msgid "Zone %q"
-#~ msgstr "Zone %q"
diff --git a/luci-app-firewall/po/he/firewall.po b/luci-app-firewall/po/he/firewall.po
index b5e2e9a8d..7878ee553 100644
--- a/luci-app-firewall/po/he/firewall.po
+++ b/luci-app-firewall/po/he/firewall.po
@@ -8,123 +8,94 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:127
 msgid "%s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:125
 msgid "%s, %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:26
+msgid "(Unnamed Entry)"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:169
+msgid "(Unnamed Rule)"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:37
+msgid "(Unnamed SNAT)"
+msgstr ""
+
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:180
 msgid "<var>%s</var> and limit to %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:257
 msgid "Action"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone destination "
-"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
-"traffic."
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
+msgid "Add"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
-"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
+msgid "Add and edit..."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:57
 msgid "Advanced Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid "Allow \"invalid\" traffic"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:178
 msgid "Allow forward from <em>source zones</em>:"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:170
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:89
 msgid "Any"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
-msgid "Any day"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid "Automatic helper assignment"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid ""
-"Automatically assign conntrack helpers based on traffic protocol and port"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
-msgid "Conntrack Settings"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Conntrack helpers"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid "Covered devices"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:88
 msgid "Covered networks"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid "Covered subnets"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:22
 msgid "Custom Rules"
 msgstr ""
 
@@ -135,15 +106,23 @@ msgid ""
 "each firewall restart, right after the default ruleset has been loaded."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:108
+msgid "Destination IP address"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:304
 msgid "Destination address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:313
 msgid "Destination port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:102
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:295
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
 msgid "Destination zone"
 msgstr ""
 
@@ -151,97 +130,83 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid ""
-"Do not install extra rules to reject forwarded traffic with conntrack state "
-"<em>invalid</em>. This may be required for complex asymmetric route setups."
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:151
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
+msgid "Do not rewrite"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:22
 msgid "Drop invalid packets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:270
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:149
 msgid "Enable NAT Loopback"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:20
 msgid "Enable SYN-flood protection"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:144
 msgid "Enable logging on this zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:43
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:98
 msgid "External IP address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:111
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
 msgid "External port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
+msgid "External zone"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:158
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:331
 msgid "Extra arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid "Extra destination arguments"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
-msgid "Extra iptables arguments"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid "Extra source arguments"
-msgstr ""
-
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
 msgid "Firewall"
 msgstr ""
@@ -250,270 +215,314 @@ msgstr ""
 msgid "Firewall - Custom Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:13
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:8
 msgid "Firewall - Port Forwards"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:12
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:42
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:9
 msgid "Firewall - Traffic Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:15
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:11
 msgid "Firewall - Zone Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:141
 msgid "Force connection tracking"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:76
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:27
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:92
 msgid "Forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:116
 msgid "Forward to"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:343
 msgid "Friday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:106
 msgid "From %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:88
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:104
 msgid "From %s in %s with source %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:102
 msgid "From %s in %s with source %s and %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:117
 msgid "From %s on <var>this device</var>"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:115
 msgid "From %s on <var>this device</var> with source %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:113
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:10
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:56
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:16
 msgid "General Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:51
 msgid "Hardware flow offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:85
 msgid "IPv4"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:185
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:118
 msgid "IPv4 and IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:119
 msgid "IPv4 only"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:87
 msgid "IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:120
 msgid "IPv6 only"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:25
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:90
 msgid "Input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:157
+msgid "Inter-Zone Forwarding"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:127
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
 msgid "Internal IP address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:138
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
 msgid "Internal port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:121
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
 msgid "Internal zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:150
 msgid "Limit log messages"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:102
 msgid "MSS clamping"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:101
 msgid "Masquerading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:105
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:162
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:247
 msgid "Match"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:206
 msgid "Match ICMP type"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:118
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:112
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:91
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:339
 msgid "Monday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:346
 msgid "Month Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:50
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:180
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:60
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
 msgid "Name"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:169
-msgid "Network"
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
+msgid "New SNAT rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
+msgid "New forward rule"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
+msgid "New input rule"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
+msgid "New port forward"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
+msgid "New source NAT"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:99
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:63
 msgid "Only match incoming traffic from these MACs."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:75
 msgid "Only match incoming traffic from this IP or range."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:87
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
+msgid "Open ports on router"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
+msgid "Other..."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:26
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:91
 msgid "Output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:288
+msgid "Output zone"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:160
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:332
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
-msgid ""
-"Passing raw iptables arguments to source and destination traffic "
-"classification rules allows to match packets based on other criteria than "
-"interfaces or subnets. These options should be used with extreme care as "
-"invalid values could render the firewall ruleset broken, completely exposing "
-"all services."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:14
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:17
 msgid "Port Forwards"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:9
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
-msgid ""
-"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
-"connection tracking."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:39
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:190
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
 msgid "Protocol"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:139
 msgid ""
 "Redirect matched incoming traffic to the given port on the internal host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:128
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:52
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
@@ -521,20 +530,38 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:132
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:123
 msgid "Restrict Masquerading to given source subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:183
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:115
 msgid "Restrict to address family"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:132
+msgid "Rewrite matched traffic to the given address."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:147
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:266
+msgid "Rewrite to source %s"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:264
+msgid "Rewrite to source %s, %s"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:42
 msgid "Routing/NAT Offloading"
 msgstr ""
 
@@ -546,69 +573,92 @@ msgstr ""
 msgid "Rule is enabled"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:131
+msgid "SNAT IP address"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:146
+msgid "SNAT port"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:344
 msgid "Saturday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:47
 msgid "Software based offloading for routing/NAT"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:46
 msgid "Software flow offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:79
 msgid "Source IP address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:261
 msgid "Source MAC address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:194
+msgid "Source NAT"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:195
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:270
 msgid "Source address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:279
 msgid "Source port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:254
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
 msgid "Source zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:357
 msgid "Start Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
-msgid "Start Time (hh.mm.ss)"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:353
+msgid "Start Time (hh:mm:ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:359
 msgid "Stop Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
-msgid "Stop Time (hh.mm.ss)"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:355
+msgid "Stop Time (hh:mm:ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:338
 msgid "Sunday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:12
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:158
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -618,7 +668,19 @@ msgid ""
 "<em>not</em> imply a permission to forward from wan to lan as well."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:14
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:13
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:36
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -627,205 +689,202 @@ 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:349
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:342
 msgid "Thursday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
-msgid "Time Restrictions"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:362
 msgid "Time in UTC"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:141
 msgid "To %s at %s on <var>this device</var>"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:132
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:157
 msgid "To %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:143
 msgid "To %s on <var>this device</var>"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:130
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:155
 msgid "To %s, %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
+msgid "To source IP"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
+msgid "To source port"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:18
 msgid "Traffic Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:10
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
 "the router."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:340
 msgid "Tuesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:244
+msgid "Unnamed SNAT"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:67
 msgid "Unnamed forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:76
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
-msgid "Unnamed zone"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid ""
-"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
-"network devices."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid ""
-"Use this option to classify zone traffic by source or destination subnet "
-"instead of networks or devices."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:101
 msgid "Via %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:99
 msgid "Via %s at %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:341
 msgid "Wednesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:335
 msgid "Week Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:55
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:35
+msgid "Zone %q"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:83
 msgid "Zone ⇒ Forwardings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:59
 msgid "Zones"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:325
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:33
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:98
 msgid "accept"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:108
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:141
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:263
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:272
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:281
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:306
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:315
 msgid "any"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:120
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:100
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:150
 msgid "any host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:111
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:138
 msgid "any router IP"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:119
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:149
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:327
 msgid "don't track"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:324
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:32
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:97
 msgid "drop"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:326
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:31
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:96
 msgid "reject"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
-msgid "this new zone"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:82
+msgid "traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr ""
diff --git a/luci-app-firewall/po/hu/firewall.po b/luci-app-firewall/po/hu/firewall.po
index 000c19f3d..4f8a78305 100644
--- a/luci-app-firewall/po/hu/firewall.po
+++ b/luci-app-firewall/po/hu/firewall.po
@@ -11,123 +11,94 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.6\n"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:127
 msgid "%s in %s"
 msgstr "%s %s-ban"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr "%s%s %s-el"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:125
 msgid "%s, %s in %s"
 msgstr "%s, %s %s-ben"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:26
+msgid "(Unnamed Entry)"
+msgstr "(Névtelen bejegyzés)"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:169
+msgid "(Unnamed Rule)"
+msgstr "(Névtelen szabály)"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:37
+msgid "(Unnamed SNAT)"
+msgstr "(Névtelen SNAT)"
+
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr "<var>%d</var> csomag/<var>%s</var>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr "<var>%d</var> csom. <var>%s</var>-enként, burst <var>%d</var> csom."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:180
 msgid "<var>%s</var> and limit to %s"
 msgstr "<var>%s</var> és korlátozás %s-re"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:257
 msgid "Action"
 msgstr "Művelet"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone destination "
-"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
-"traffic."
-msgstr ""
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
+msgid "Add"
+msgstr "Hozzáadás"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
-"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
-msgstr ""
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
+msgid "Add and edit..."
+msgstr "Hozzáadás és szerkesztés..."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:57
 msgid "Advanced Settings"
 msgstr "Haladó beállítások"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid "Allow \"invalid\" traffic"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:178
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Továbbítás engedélyezése ezekből a <em>forrás zónákból</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:170
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "Továbbítás engedélyezése ezekbe a <em>cél zónákba</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:89
 msgid "Any"
 msgstr "Bármelyik"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
-msgid "Any day"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid "Automatic helper assignment"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid ""
-"Automatically assign conntrack helpers based on traffic protocol and port"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
-msgid "Conntrack Settings"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Conntrack helpers"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid "Covered devices"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:88
 msgid "Covered networks"
 msgstr "Lefedett hálózatok"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid "Covered subnets"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:22
 msgid "Custom Rules"
 msgstr "Egyéni szabályok"
 
@@ -142,15 +113,23 @@ msgstr ""
 "lehetőséget. A parancsok a tűzfal minden újraindításakor futtatásra "
 "kerülnek, közvetlenül az alapértelmezett szabálykészletek betöltése után."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:108
+msgid "Destination IP address"
+msgstr "Cél IP-cím"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:304
 msgid "Destination address"
 msgstr "Cél cím"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:313
 msgid "Destination port"
 msgstr "Cél port"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:102
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:295
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
 msgid "Destination zone"
 msgstr "Cél zóna"
 
@@ -158,97 +137,83 @@ msgstr "Cél zóna"
 msgid "Disable"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid ""
-"Do not install extra rules to reject forwarded traffic with conntrack state "
-"<em>invalid</em>. This may be required for complex asymmetric route setups."
-msgstr ""
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:151
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
+msgid "Do not rewrite"
+msgstr "Ne írja felül"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:22
 msgid "Drop invalid packets"
 msgstr "Érvénytelen csomagok eldobása"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:270
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "Engedélyezés"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:149
 msgid "Enable NAT Loopback"
 msgstr "NAT visszacsatolás engedélyezése"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:20
 msgid "Enable SYN-flood protection"
 msgstr "SYN-flood védelem engedélyezése"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:144
 msgid "Enable logging on this zone"
 msgstr "Naplózás engeélyezése ezen a zónán"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:43
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:98
 msgid "External IP address"
 msgstr "Külső IP cím"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:111
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
 msgid "External port"
 msgstr "Külső port"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
+msgid "External zone"
+msgstr "Külső zóna"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:158
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:331
 msgid "Extra arguments"
 msgstr "További argumentumok"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid "Extra destination arguments"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
-msgid "Extra iptables arguments"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid "Extra source arguments"
-msgstr ""
-
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
 msgid "Firewall"
 msgstr "Tűzfal"
@@ -257,162 +222,180 @@ msgstr "Tűzfal"
 msgid "Firewall - Custom Rules"
 msgstr "Tűzfal - Egyéni szabályok"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:13
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:8
 msgid "Firewall - Port Forwards"
 msgstr "Tűzfal - Port továbbítások"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:12
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:42
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:9
 msgid "Firewall - Traffic Rules"
 msgstr "Tűzfal - Forgalmi szabályok"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:15
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:11
 msgid "Firewall - Zone Settings"
 msgstr "Tűzfal - Zóna beállítások"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:141
 msgid "Force connection tracking"
 msgstr "Kapcsolat követés kényszerítése"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:76
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:27
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:92
 msgid "Forward"
 msgstr "Továbbítás"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:116
 msgid "Forward to"
 msgstr "Továbbítás ennek"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:343
 msgid "Friday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:106
 msgid "From %s in %s"
 msgstr "%s felől %s-ben"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:88
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:104
 msgid "From %s in %s with source %s"
 msgstr "%s felől %s-ben %s forrással"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:102
 msgid "From %s in %s with source %s and %s"
 msgstr "%s felől %s-ben %s és %s forrással"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:117
 msgid "From %s on <var>this device</var>"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:115
 msgid "From %s on <var>this device</var> with source %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:113
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:10
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:56
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:16
 msgid "General Settings"
 msgstr "Általános beállítások"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:51
 msgid "Hardware flow offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:85
 msgid "IPv4"
 msgstr "IPv4"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:185
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:118
 msgid "IPv4 and IPv6"
 msgstr "IPv4 és IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:119
 msgid "IPv4 only"
 msgstr "csak IPv4"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:87
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:120
 msgid "IPv6 only"
 msgstr "csak IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:25
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:90
 msgid "Input"
 msgstr "Bemenet"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:157
+msgid "Inter-Zone Forwarding"
+msgstr "Zónák-közötti továbbítás"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:127
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
 msgid "Internal IP address"
 msgstr "Belső IP cím"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:138
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
 msgid "Internal port"
 msgstr "Belső port"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:121
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
 msgid "Internal zone"
 msgstr "Belső zóna"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:150
 msgid "Limit log messages"
 msgstr "Napló üzenetek korlátozása"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:102
 msgid "MSS clamping"
 msgstr "MSS clamping engegélyezése"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:101
 msgid "Masquerading"
 msgstr "Álcázás"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:105
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:162
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:247
 msgid "Match"
 msgstr "Szűrés"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:206
 msgid "Match ICMP type"
 msgstr "Szűrés ICMP típus alapján"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:118
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr ""
+"Továbbított forgalom szűrése a megadott cél port, vagy port tartomány "
+"szerint."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:112
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
@@ -420,40 +403,70 @@ msgstr ""
 "Adott portra vagy port tartományra irányított bejövő forgalom szűrése ezen a "
 "gépen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:91
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr ""
+"Az ügyfél gép megadott portjáról, vagy port tartományából indított forgalom "
+"szűrése. "
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:339
 msgid "Monday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:346
 msgid "Month Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:50
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:180
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:60
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
 msgid "Name"
 msgstr "Név"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:169
-msgid "Network"
-msgstr ""
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
+msgid "New SNAT rule"
+msgstr "Új SNAT szabály"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
+msgid "New forward rule"
+msgstr "Új továbbítási szabály"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
+msgid "New input rule"
+msgstr "Új bemeneti szabály"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
+msgid "New port forward"
+msgstr "Új port továbbítás"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
+msgid "New source NAT"
+msgstr "Új forrás NAT"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:99
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr "Csak a megadott IP címre irányított bejövő forgalmat egyeztesse."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:63
 msgid "Only match incoming traffic from these MACs."
 msgstr "Csak a megadott MAC címekről érkező bejövő forgalmat egyeztesse."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:75
 msgid "Only match incoming traffic from this IP or range."
 msgstr ""
 "Csak a megadott IP címről illetve IP címtartományból érkező bejövő forgalmat "
 "egyeztesse."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:87
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
@@ -461,32 +474,38 @@ msgstr ""
 "Csak az ügyfél gép megadott forrás portjáról illetve forrás port "
 "tartományába tartozó portról indított bejövő forgalmat egyeztesse."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
+msgid "Open ports on router"
+msgstr "Port megnyitása a routeren"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
+msgid "Other..."
+msgstr "Egyéb..."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:26
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:91
 msgid "Output"
 msgstr "Kimenet"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:288
+msgid "Output zone"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:160
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:332
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 "További argumentumok küldése az iptables részére. Használja körültekintően!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
-msgid ""
-"Passing raw iptables arguments to source and destination traffic "
-"classification rules allows to match packets based on other criteria than "
-"interfaces or subnets. These options should be used with extreme care as "
-"invalid values could render the firewall ruleset broken, completely exposing "
-"all services."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:14
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:17
 msgid "Port Forwards"
 msgstr "Port továbbítás"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:9
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
@@ -495,42 +514,36 @@ msgstr ""
 "privát helyi hálózat bizonyos számítógépéhez vagy szolgáltatásához történő "
 "csatlakozását."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
-msgid ""
-"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
-"connection tracking."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:39
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:190
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:139
 msgid ""
 "Redirect matched incoming traffic to the given port on the internal host"
 msgstr "Átirányítja az egyező bejövő forgalmat a belső gép megadott portjához"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:128
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "Átirányítja az egyező bejövő forgalmat a megadott belső géphez"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:52
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
@@ -538,20 +551,40 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:132
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "Álcázás korlátozása a megadott cél alhálózatokra"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:123
 msgid "Restrict Masquerading to given source subnets"
 msgstr "Álcázás korlátozása a megadott forrás alhálózatokra"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:183
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:115
 msgid "Restrict to address family"
 msgstr "Korlátozás cím családra"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:132
+msgid "Rewrite matched traffic to the given address."
+msgstr "Az összeíllő forgalom átírása a megadott címre."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:147
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr ""
+"Az összeillő forgalom átírása a megadott forrás portra. Amennyibe üresen van "
+"hagyva, csak az IP cím kerül átírásra."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:266
+msgid "Rewrite to source %s"
+msgstr "Átírás %s forrásra"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:264
+msgid "Rewrite to source %s, %s"
+msgstr "Átírás %s, %s forrásra"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:42
 msgid "Routing/NAT Offloading"
 msgstr ""
 
@@ -563,62 +596,89 @@ msgstr ""
 msgid "Rule is enabled"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:131
+msgid "SNAT IP address"
+msgstr "SNAT IP cím"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:146
+msgid "SNAT port"
+msgstr "SNAT port"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:344
 msgid "Saturday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:47
 msgid "Software based offloading for routing/NAT"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:46
 msgid "Software flow offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:79
 msgid "Source IP address"
 msgstr "Forrás IP cím"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:261
 msgid "Source MAC address"
 msgstr "Forrás MAC cím"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:194
+msgid "Source NAT"
+msgstr "Forrás NAT"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:195
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+"A forrás NAT az álcázás olyan speciális formája, mely lehetővé teszi a "
+"kimenő forgalomhoz használt forrás IP címek aprólékos szabályozását, például "
+"több WAN cím hozzárendelését a belső alhálózatokhoz."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:270
 msgid "Source address"
 msgstr "Forrás cím"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:279
 msgid "Source port"
 msgstr "Forrás port"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:254
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
 msgid "Source zone"
 msgstr "Forrás zóna"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:357
 msgid "Start Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
-msgid "Start Time (hh.mm.ss)"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:353
+msgid "Start Time (hh:mm:ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:359
 msgid "Stop Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
-msgid "Stop Time (hh.mm.ss)"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:355
+msgid "Stop Time (hh:mm:ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:338
 msgid "Sunday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:12
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
@@ -626,8 +686,7 @@ msgstr ""
 "A tűzfal zónákat határoz meg a hálózati interfészek fölött a hálózati "
 "forgalom áramlásának szabályozására."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:158
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -644,7 +703,24 @@ msgstr ""
 "LAN-ból WAN-ba <em>nem</em> jelenti azt, hogy a továbbítás WAN-ból LAN-ba is "
 "engedélyezett."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:14
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr ""
+"Ez a lap lehetővé teszi a port továbbítási bejegyzések speciális "
+"tulajdonságainak módosítását. A legtöbb esetben ezeknek a beállításoknak a "
+"módosítása nem szükséges."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:13
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr ""
+"Ez a lap lehetővé teszi a forgalmi szabály bejegyzés speciális "
+"tulajdonságainak módosítását, mint a forrás- és célgépek megfeleltetése."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:36
 #, fuzzy
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
@@ -660,40 +736,46 @@ msgstr ""
 "<em>lefedett hálózatok</em> adják meg, hogy mely elérhető hálózatok tagjai "
 "ennek a zónának."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:342
 msgid "Thursday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
-msgid "Time Restrictions"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:362
 msgid "Time in UTC"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:141
 msgid "To %s at %s on <var>this device</var>"
 msgstr "%s-re %s-nél a <var>eszközön</var>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:132
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:157
 msgid "To %s in %s"
 msgstr "%s-re %s-ben"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:143
 msgid "To %s on <var>this device</var>"
 msgstr "%s-re a <var>eszközön</var>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:130
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:155
 msgid "To %s, %s in %s"
 msgstr "%s-re, %s %s-ben"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
+msgid "To source IP"
+msgstr "Forrás IP-re"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
+msgid "To source port"
+msgstr "Forrás portra"
+
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:18
 msgid "Traffic Rules"
 msgstr "Forgalmi szabályok"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:10
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
@@ -703,290 +785,158 @@ msgstr ""
 "házirendet határozzák meg, például bizonyos gépek közötti forgalom "
 "megakadályozához vagy WAN portok megnyitásához a routeren."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:340
 msgid "Tuesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:244
+msgid "Unnamed SNAT"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:67
 msgid "Unnamed forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:76
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
-msgid "Unnamed zone"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid ""
-"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
-"network devices."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid ""
-"Use this option to classify zone traffic by source or destination subnet "
-"instead of networks or devices."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:101
 msgid "Via %s"
 msgstr "%s-en át"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:99
 msgid "Via %s at %s"
 msgstr "%s-en át %s-nél"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:341
 msgid "Wednesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:335
 msgid "Week Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:55
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr ""
+"Az \"-- egyéni --\" lehetőség választásával több protokoll megadása "
+"lehetséges egymástól szóközzell elválasztva."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:35
+msgid "Zone %q"
+msgstr "Zóna %q"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:83
 msgid "Zone ⇒ Forwardings"
 msgstr "Zóna ⇒ Továbbítások"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:59
 msgid "Zones"
 msgstr "Zónák"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:325
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:33
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:98
 msgid "accept"
 msgstr "elfogadás"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:108
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:141
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:263
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:272
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:281
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:306
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:315
 msgid "any"
 msgstr "bármelyik"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:120
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:100
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:150
 msgid "any host"
 msgstr "bármelyik gép"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:111
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:138
 msgid "any router IP"
 msgstr "bármelyik router IP"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:119
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:149
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr "bármelyik zóna"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:327
 msgid "don't track"
 msgstr "ne kövesse"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:324
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:32
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:97
 msgid "drop"
 msgstr "eldobás"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:326
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:31
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:96
 msgid "reject"
 msgstr "visszautasítás"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
-msgid "this new zone"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:82
+msgid "traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr ""
-
-#~ msgid "Add"
-#~ msgstr "Hozzáadás"
-
-#~ msgid "Add and edit..."
-#~ msgstr "Hozzáadás és szerkesztés..."
-
-#~ msgid "Do not rewrite"
-#~ msgstr "Ne írja felül"
-
-#~ msgid "External zone"
-#~ msgstr "Külső zóna"
-
-#~ msgid "New SNAT rule"
-#~ msgstr "Új SNAT szabály"
-
-#~ msgid "New forward rule"
-#~ msgstr "Új továbbítási szabály"
-
-#~ msgid "New input rule"
-#~ msgstr "Új bemeneti szabály"
-
-#~ msgid "New port forward"
-#~ msgstr "Új port továbbítás"
-
-#~ msgid "New source NAT"
-#~ msgstr "Új forrás NAT"
-
-#~ msgid "Open ports on router"
-#~ msgstr "Port megnyitása a routeren"
-
-#~ msgid "Other..."
-#~ msgstr "Egyéb..."
-
-#~ msgid "To source IP"
-#~ msgstr "Forrás IP-re"
-
-#~ msgid "To source port"
-#~ msgstr "Forrás portra"
-
-#~ msgid "(Unnamed Entry)"
-#~ msgstr "(Névtelen bejegyzés)"
-
-#~ msgid "(Unnamed Rule)"
-#~ msgstr "(Névtelen szabály)"
-
-#~ msgid "(Unnamed SNAT)"
-#~ msgstr "(Névtelen SNAT)"
-
-#~ msgid "Destination IP address"
-#~ msgstr "Cél IP-cím"
-
-#~ msgid "Inter-Zone Forwarding"
-#~ msgstr "Zónák-közötti továbbítás"
-
-#~ msgid "Match forwarded traffic to the given destination port or port range."
-#~ msgstr ""
-#~ "Továbbított forgalom szűrése a megadott cél port, vagy port tartomány "
-#~ "szerint."
-
-#~ msgid ""
-#~ "Match incoming traffic originating from the given source port or port "
-#~ "range on the client host."
-#~ msgstr ""
-#~ "Az ügyfél gép megadott portjáról, vagy port tartományából indított "
-#~ "forgalom szűrése. "
-
-#~ msgid "Rewrite matched traffic to the given address."
-#~ msgstr "Az összeíllő forgalom átírása a megadott címre."
-
-#~ msgid ""
-#~ "Rewrite matched traffic to the given source port. May be left empty to "
-#~ "only rewrite the IP address."
-#~ msgstr ""
-#~ "Az összeillő forgalom átírása a megadott forrás portra. Amennyibe üresen "
-#~ "van hagyva, csak az IP cím kerül átírásra."
-
-#~ msgid "Rewrite to source %s"
-#~ msgstr "Átírás %s forrásra"
-
-#~ msgid "Rewrite to source %s, %s"
-#~ msgstr "Átírás %s, %s forrásra"
-
-#~ msgid "SNAT IP address"
-#~ msgstr "SNAT IP cím"
-
-#~ msgid "SNAT port"
-#~ msgstr "SNAT port"
-
-#~ msgid "Source NAT"
-#~ msgstr "Forrás NAT"
-
-#~ msgid ""
-#~ "Source NAT is a specific form of masquerading which allows fine grained "
-#~ "control over the source IP used for outgoing traffic, for example to map "
-#~ "multiple WAN addresses to internal subnets."
-#~ msgstr ""
-#~ "A forrás NAT az álcázás olyan speciális formája, mely lehetővé teszi a "
-#~ "kimenő forgalomhoz használt forrás IP címek aprólékos szabályozását, "
-#~ "például több WAN cím hozzárendelését a belső alhálózatokhoz."
-
-#~ msgid ""
-#~ "This page allows you to change advanced properties of the port forwarding "
-#~ "entry. In most cases there is no need to modify those settings."
-#~ msgstr ""
-#~ "Ez a lap lehetővé teszi a port továbbítási bejegyzések speciális "
-#~ "tulajdonságainak módosítását. A legtöbb esetben ezeknek a beállításoknak "
-#~ "a módosítása nem szükséges."
-
-#~ msgid ""
-#~ "This page allows you to change advanced properties of the traffic rule "
-#~ "entry, such as matched source and destination hosts."
-#~ msgstr ""
-#~ "Ez a lap lehetővé teszi a forgalmi szabály bejegyzés speciális "
-#~ "tulajdonságainak módosítását, mint a forrás- és célgépek megfeleltetése."
-
-#~ msgid ""
-#~ "You may specify multiple by selecting \"-- custom --\" and then entering "
-#~ "protocols separated by space."
-#~ msgstr ""
-#~ "Az \"-- egyéni --\" lehetőség választásával több protokoll megadása "
-#~ "lehetséges egymástól szóközzell elválasztva."
-
-#~ msgid "Zone %q"
-#~ msgstr "Zóna %q"
diff --git a/luci-app-firewall/po/it/firewall.po b/luci-app-firewall/po/it/firewall.po
index aa522e2f2..406414857 100644
--- a/luci-app-firewall/po/it/firewall.po
+++ b/luci-app-firewall/po/it/firewall.po
@@ -13,123 +13,94 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.4\n"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:127
 msgid "%s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr "%s%s con %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:125
 msgid "%s, %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:26
+msgid "(Unnamed Entry)"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:169
+msgid "(Unnamed Rule)"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:37
+msgid "(Unnamed SNAT)"
+msgstr ""
+
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:180
 msgid "<var>%s</var> and limit to %s"
 msgstr "<var>%s</var> e limita a %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:257
 msgid "Action"
 msgstr "Azione"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone destination "
-"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
-"traffic."
-msgstr ""
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
+msgid "Add"
+msgstr "Aggiungi"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
-"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
-msgstr ""
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
+msgid "Add and edit..."
+msgstr "Aggiungi e modifica..."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:57
 msgid "Advanced Settings"
 msgstr "Opzioni Avanzate"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid "Allow \"invalid\" traffic"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:178
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Permetti routing da <em>zone di origine</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:170
 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:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:89
 msgid "Any"
 msgstr "Qualsiasi"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
-msgid "Any day"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid "Automatic helper assignment"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid ""
-"Automatically assign conntrack helpers based on traffic protocol and port"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
-msgid "Conntrack Settings"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Conntrack helpers"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid "Covered devices"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:88
 msgid "Covered networks"
 msgstr "Reti coperte"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid "Covered subnets"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:22
 msgid "Custom Rules"
 msgstr "Regole Personalizzate"
 
@@ -144,15 +115,23 @@ msgstr ""
 "comandi sono eseguiti dopo ogni riavvio del firewall, giusto dopo le altre "
 "regole che sono state caricate."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:108
+msgid "Destination IP address"
+msgstr "Indirizzo IP destinazione"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:304
 msgid "Destination address"
 msgstr "Indirizzo di destinazione"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:313
 msgid "Destination port"
 msgstr "Porta di destinazione"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:102
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:295
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
 msgid "Destination zone"
 msgstr "Zona di destinazione"
 
@@ -160,97 +139,83 @@ msgstr "Zona di destinazione"
 msgid "Disable"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid ""
-"Do not install extra rules to reject forwarded traffic with conntrack state "
-"<em>invalid</em>. This may be required for complex asymmetric route setups."
-msgstr ""
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:151
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
+msgid "Do not rewrite"
+msgstr "Non riscrivere"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:22
 msgid "Drop invalid packets"
 msgstr "Scarta pacchetti invalidi"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:270
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "Attiva"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:149
 msgid "Enable NAT Loopback"
 msgstr "Attiva NAT Loopback"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:20
 msgid "Enable SYN-flood protection"
 msgstr "Attiva protezione SYN-flood"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:144
 msgid "Enable logging on this zone"
 msgstr "Attiva registro su questa zona"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:43
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:98
 msgid "External IP address"
 msgstr "Indirizzo IP Esterno"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:111
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
 msgid "External port"
 msgstr "Porta Esterna"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
+msgid "External zone"
+msgstr "Zona Esterna"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:158
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:331
 msgid "Extra arguments"
 msgstr "Comandi extra"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid "Extra destination arguments"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
-msgid "Extra iptables arguments"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid "Extra source arguments"
-msgstr ""
-
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
 msgid "Firewall"
 msgstr "Firewall"
@@ -259,162 +224,178 @@ msgstr "Firewall"
 msgid "Firewall - Custom Rules"
 msgstr "Firewall - Regole Personalizzate"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:13
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:8
 msgid "Firewall - Port Forwards"
 msgstr "Firewall - Inoltro Porte"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:12
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:42
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:9
 msgid "Firewall - Traffic Rules"
 msgstr "Firewall - Regole Traffico"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:15
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:11
 msgid "Firewall - Zone Settings"
 msgstr "Firewall - Opzioni delle Zone"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:141
 msgid "Force connection tracking"
 msgstr "Forza tracciamento connessione"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:76
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:27
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:92
 msgid "Forward"
 msgstr "Inoltra"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:116
 msgid "Forward to"
 msgstr "Inoltra a"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:343
 msgid "Friday"
 msgstr "Venerdì"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:106
 msgid "From %s in %s"
 msgstr "Da %s a %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:88
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:104
 msgid "From %s in %s with source %s"
 msgstr "Da %s a %s con sorgente %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:102
 msgid "From %s in %s with source %s and %s"
 msgstr "Da %s a %s con sorgente %s e %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:117
 msgid "From %s on <var>this device</var>"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:115
 msgid "From %s on <var>this device</var> with source %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:113
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:10
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:56
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:16
 msgid "General Settings"
 msgstr "Opzioni Generali"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:51
 msgid "Hardware flow offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:85
 msgid "IPv4"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:185
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:118
 msgid "IPv4 and IPv6"
 msgstr "IPv4 e IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:119
 msgid "IPv4 only"
 msgstr "Solo IPv4"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:87
 msgid "IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:120
 msgid "IPv6 only"
 msgstr "Solo IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:25
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:90
 msgid "Input"
 msgstr "Ingresso"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:157
+msgid "Inter-Zone Forwarding"
+msgstr "Inoltro tra le zone"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:127
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
 msgid "Internal IP address"
 msgstr "Indirizzo IP interno"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:138
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
 msgid "Internal port"
 msgstr "Porta interna"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:121
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
 msgid "Internal zone"
 msgstr "Zona Interna"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:150
 msgid "Limit log messages"
 msgstr "Limita messaggi del registro"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:102
 msgid "MSS clamping"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:101
 msgid "Masquerading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:105
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:162
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:247
 msgid "Match"
 msgstr "Corrispondenza"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:206
 msgid "Match ICMP type"
 msgstr "Corrispondenza tipo ICMP"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:118
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr "Corrispondi traffico inoltrato alla porta o intervallo di porte dato."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:112
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
@@ -422,38 +403,68 @@ msgstr ""
 "Corrispondi traffico in entrata diretto alla porta o intervallo di porte "
 "dato su questo host"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:91
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr ""
+"Corrispondi traffico in entrata originato dalla porta o intervallo di porte "
+"dato su host cliente"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:339
 msgid "Monday"
 msgstr "Lunedì"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:346
 msgid "Month Days"
 msgstr "Giorni del Mese"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:50
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:180
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:60
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
 msgid "Name"
 msgstr "Nome"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:169
-msgid "Network"
-msgstr ""
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
+msgid "New SNAT rule"
+msgstr "Nuova regola SNAT"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
+msgid "New forward rule"
+msgstr "Nuova regola di inoltro"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
+msgid "New input rule"
+msgstr "Nuova regola di ingresso"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
+msgid "New port forward"
+msgstr "Nuova porta di inoltro"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
+msgid "New source NAT"
+msgstr "Nuova sorgente NAT"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:99
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr "Corrispondi solo traffico in entrata diretto al dato indirizzo IP."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:63
 msgid "Only match incoming traffic from these MACs."
 msgstr "Corrispondi solo traffico in entrata da questi MAC."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:75
 msgid "Only match incoming traffic from this IP or range."
 msgstr "Corrispondi solo traffico in entrata da questo IP o intervallo."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:87
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
@@ -461,31 +472,37 @@ msgstr ""
 "Corrispondi solo traffico in entrata originato dalla porta o intervallo di "
 "porte sorgenti su host cliente"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
+msgid "Open ports on router"
+msgstr "Porte aperte sul router"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
+msgid "Other..."
+msgstr "Altri..."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:26
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:91
 msgid "Output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:288
+msgid "Output zone"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:160
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:332
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr "Passa comandi addizionali a iptables. Usare con cura!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
-msgid ""
-"Passing raw iptables arguments to source and destination traffic "
-"classification rules allows to match packets based on other criteria than "
-"interfaces or subnets. These options should be used with extreme care as "
-"invalid values could render the firewall ruleset broken, completely exposing "
-"all services."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:14
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:17
 msgid "Port Forwards"
 msgstr "Inoltri Porta"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:9
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
@@ -493,42 +510,36 @@ msgstr ""
 "L'inoltro delle porte permette ai computer in remoto su Internet di "
 "connettersi a uno specifico computer o servizio presente nella LAN privata"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
-msgid ""
-"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
-"connection tracking."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:39
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:190
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
 msgid "Protocol"
 msgstr "Protocollo"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:139
 msgid ""
 "Redirect matched incoming traffic to the given port on the internal host"
 msgstr "Reindirizza il traffico in entrata alla porta data su host interno"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:128
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "Reindirizza il traffico in entrata allo specifico host interno"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:52
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
@@ -536,20 +547,40 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr "Riavvia Firewall"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:132
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "Limita il Masquerading alle subnet di destinazione date"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:123
 msgid "Restrict Masquerading to given source subnets"
 msgstr "Limita il Masquerading alle subnet sorgente date"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:183
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:115
 msgid "Restrict to address family"
 msgstr "Limita agli indirizzi famiglia"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:132
+msgid "Rewrite matched traffic to the given address."
+msgstr "Riscrivi il traffico verso l'indirizzo dato."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:147
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr ""
+"Riscrivi il traffico corrispondente alla porta sorgente data. Può essere "
+"lasciato vuoto per riscrivere solo l'indirizzo IP."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:266
+msgid "Rewrite to source %s"
+msgstr "Riscrivi alla sorgente %s"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:264
+msgid "Rewrite to source %s, %s"
+msgstr "Riscrivi alla sorgente %s, %s"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:42
 msgid "Routing/NAT Offloading"
 msgstr ""
 
@@ -561,15 +592,23 @@ msgstr ""
 msgid "Rule is enabled"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:131
+msgid "SNAT IP address"
+msgstr "Indirizzo IP SNAT"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:146
+msgid "SNAT port"
+msgstr "Porta SNAT"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:344
 msgid "Saturday"
 msgstr "Sabato"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:47
 msgid "Software based offloading for routing/NAT"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:46
 msgid "Software flow offloading"
 msgstr ""
 
@@ -594,50 +633,69 @@ msgstr ""
 # msgstr ""
 # msgid "Protocol"
 # msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:79
 msgid "Source IP address"
 msgstr "Indirizzo IP di origine"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:261
 msgid "Source MAC address"
 msgstr "Indirizzo MAC di origine"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:194
+msgid "Source NAT"
+msgstr "NAT di origine"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:195
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+"La sorgente NAT è una forma specifica di masquerading che consente un "
+"controllo preciso sull'IP sorgente usato per il traffico in uscita, per "
+"esempio per mappare indirizzi WAN multipli verso le subnet interne."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:270
 msgid "Source address"
 msgstr "Indirizzo di origine"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:279
 msgid "Source port"
 msgstr "Porta di origine"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:254
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
 msgid "Source zone"
 msgstr "Zona di origine"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:357
 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:361
-msgid "Start Time (hh.mm.ss)"
-msgstr ""
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:353
+msgid "Start Time (hh:mm:ss)"
+msgstr "Ora di Inizio (hh:mm:ss)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:359
 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:365
-msgid "Stop Time (hh.mm.ss)"
-msgstr ""
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:355
+msgid "Stop Time (hh:mm:ss)"
+msgstr "Ora di Stop (hh:mm:ss)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:338
 msgid "Sunday"
 msgstr "Domenica"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:12
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
@@ -645,8 +703,7 @@ msgstr ""
 "Il firewall crea delle zone nelle tue interfacce di rete per controllare il "
 "flusso del traffico."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:158
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -663,7 +720,24 @@ msgstr ""
 "alla wan <em>non</em> implica anche un permesso da inoltrare dalla wan alla "
 "lan."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:14
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr ""
+"Questa pagina ti consente di cambiare le opzioni avanzate della voce porta "
+"di inoltro. Nella maggioranza dei casi non serve modificare queste "
+"impostazioni."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:13
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr ""
+"Questa pagina ti consente di cambiare le opzioni avanzate della voce regola "
+"del traffico, come la sorgente corrispondente e gli host di destinazione."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:36
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -678,40 +752,46 @@ 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:349
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:342
 msgid "Thursday"
 msgstr "Giovedì"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
-msgid "Time Restrictions"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:362
 msgid "Time in UTC"
 msgstr "Orario in UTC"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:141
 msgid "To %s at %s on <var>this device</var>"
 msgstr "Verso %s a %s su <var>questo dispositivo</var>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:132
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:157
 msgid "To %s in %s"
 msgstr "Verso %s in %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:143
 msgid "To %s on <var>this device</var>"
 msgstr "Verso %s su <var>questo dispositivo</var>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:130
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:155
 msgid "To %s, %s in %s"
 msgstr "Verso %s, %s in %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
+msgid "To source IP"
+msgstr "Verso IP sorgente"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
+msgid "To source port"
+msgstr "Verso la porta sorgente"
+
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:18
 msgid "Traffic Rules"
 msgstr "Regole di Traffico"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:10
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
@@ -721,290 +801,158 @@ 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:347
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:340
 msgid "Tuesday"
 msgstr "Martedì"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:244
+msgid "Unnamed SNAT"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:67
 msgid "Unnamed forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:76
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
-msgid "Unnamed zone"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid ""
-"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
-"network devices."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid ""
-"Use this option to classify zone traffic by source or destination subnet "
-"instead of networks or devices."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:101
 msgid "Via %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:99
 msgid "Via %s at %s"
 msgstr "Via %s a %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:341
 msgid "Wednesday"
 msgstr "Mercoledì"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:335
 msgid "Week Days"
 msgstr "Giorni della Settimana"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:55
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr ""
+"Puoi specificare multipli selezionando \"-- custom --\" e poi inserendo i "
+"protocolli separati da uno spazio."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:35
+msgid "Zone %q"
+msgstr "Zona %q"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:83
 msgid "Zone ⇒ Forwardings"
 msgstr "Zona ⇒ Inoltri"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:59
 msgid "Zones"
 msgstr "Zone"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:325
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:33
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:98
 msgid "accept"
 msgstr "accetta"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:108
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:141
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:263
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:272
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:281
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:306
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:315
 msgid "any"
 msgstr "qualsiasi"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:120
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:100
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:150
 msgid "any host"
 msgstr "qualsiasi host"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:111
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:138
 msgid "any router IP"
 msgstr "qualsiasi router IP"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:119
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:149
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr "qualsiasi zona"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:327
 msgid "don't track"
 msgstr "non tracciare"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:324
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:32
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:97
 msgid "drop"
 msgstr "scarta"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:326
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:31
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:96
 msgid "reject"
 msgstr "rifiuta"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
-msgid "this new zone"
-msgstr ""
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:82
+msgid "traffic"
+msgstr "traffico"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr ""
-
-#~ msgid "Add"
-#~ msgstr "Aggiungi"
-
-#~ msgid "Add and edit..."
-#~ msgstr "Aggiungi e modifica..."
-
-#~ msgid "Do not rewrite"
-#~ msgstr "Non riscrivere"
-
-#~ msgid "External zone"
-#~ msgstr "Zona Esterna"
-
-#~ msgid "New SNAT rule"
-#~ msgstr "Nuova regola SNAT"
-
-#~ msgid "New forward rule"
-#~ msgstr "Nuova regola di inoltro"
-
-#~ msgid "New input rule"
-#~ msgstr "Nuova regola di ingresso"
-
-#~ msgid "New port forward"
-#~ msgstr "Nuova porta di inoltro"
-
-#~ msgid "New source NAT"
-#~ msgstr "Nuova sorgente NAT"
-
-#~ msgid "Open ports on router"
-#~ msgstr "Porte aperte sul router"
-
-#~ msgid "Other..."
-#~ msgstr "Altri..."
-
-#~ msgid "To source IP"
-#~ msgstr "Verso IP sorgente"
-
-#~ msgid "To source port"
-#~ msgstr "Verso la porta sorgente"
-
-#~ msgid "Destination IP address"
-#~ msgstr "Indirizzo IP destinazione"
-
-#~ msgid "Inter-Zone Forwarding"
-#~ msgstr "Inoltro tra le zone"
-
-#~ msgid "Match forwarded traffic to the given destination port or port range."
-#~ msgstr ""
-#~ "Corrispondi traffico inoltrato alla porta o intervallo di porte dato."
-
-#~ msgid ""
-#~ "Match incoming traffic originating from the given source port or port "
-#~ "range on the client host."
-#~ msgstr ""
-#~ "Corrispondi traffico in entrata originato dalla porta o intervallo di "
-#~ "porte dato su host cliente"
-
-#~ msgid "Rewrite matched traffic to the given address."
-#~ msgstr "Riscrivi il traffico verso l'indirizzo dato."
-
-#~ msgid ""
-#~ "Rewrite matched traffic to the given source port. May be left empty to "
-#~ "only rewrite the IP address."
-#~ msgstr ""
-#~ "Riscrivi il traffico corrispondente alla porta sorgente data. Può essere "
-#~ "lasciato vuoto per riscrivere solo l'indirizzo IP."
-
-#~ msgid "Rewrite to source %s"
-#~ msgstr "Riscrivi alla sorgente %s"
-
-#~ msgid "Rewrite to source %s, %s"
-#~ msgstr "Riscrivi alla sorgente %s, %s"
-
-#~ msgid "SNAT IP address"
-#~ msgstr "Indirizzo IP SNAT"
-
-#~ msgid "SNAT port"
-#~ msgstr "Porta SNAT"
-
-#~ msgid "Source NAT"
-#~ msgstr "NAT di origine"
-
-#~ msgid ""
-#~ "Source NAT is a specific form of masquerading which allows fine grained "
-#~ "control over the source IP used for outgoing traffic, for example to map "
-#~ "multiple WAN addresses to internal subnets."
-#~ msgstr ""
-#~ "La sorgente NAT è una forma specifica di masquerading che consente un "
-#~ "controllo preciso sull'IP sorgente usato per il traffico in uscita, per "
-#~ "esempio per mappare indirizzi WAN multipli verso le subnet interne."
-
-#~ msgid "Start Time (hh:mm:ss)"
-#~ msgstr "Ora di Inizio (hh:mm:ss)"
-
-#~ msgid "Stop Time (hh:mm:ss)"
-#~ msgstr "Ora di Stop (hh:mm:ss)"
-
-#~ msgid ""
-#~ "This page allows you to change advanced properties of the port forwarding "
-#~ "entry. In most cases there is no need to modify those settings."
-#~ msgstr ""
-#~ "Questa pagina ti consente di cambiare le opzioni avanzate della voce "
-#~ "porta di inoltro. Nella maggioranza dei casi non serve modificare queste "
-#~ "impostazioni."
-
-#~ msgid ""
-#~ "This page allows you to change advanced properties of the traffic rule "
-#~ "entry, such as matched source and destination hosts."
-#~ msgstr ""
-#~ "Questa pagina ti consente di cambiare le opzioni avanzate della voce "
-#~ "regola del traffico, come la sorgente corrispondente e gli host di "
-#~ "destinazione."
-
-#~ msgid ""
-#~ "You may specify multiple by selecting \"-- custom --\" and then entering "
-#~ "protocols separated by space."
-#~ msgstr ""
-#~ "Puoi specificare multipli selezionando \"-- custom --\" e poi inserendo i "
-#~ "protocolli separati da uno spazio."
-
-#~ msgid "Zone %q"
-#~ msgstr "Zona %q"
-
-#~ msgid "traffic"
-#~ msgstr "traffico"
diff --git a/luci-app-firewall/po/ja/firewall.po b/luci-app-firewall/po/ja/firewall.po
index 85702e60d..dda7c2ea5 100644
--- a/luci-app-firewall/po/ja/firewall.po
+++ b/luci-app-firewall/po/ja/firewall.po
@@ -3,142 +3,105 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-03-30 17:00+0200\n"
-"PO-Revision-Date: 2019-07-27 22:29+0900\n"
+"PO-Revision-Date: 2018-06-30 23:19+0900\n"
 "Last-Translator: INAGAKI Hiroshi <musashino.open@gmail.com>\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 2.2.3\n"
+"X-Generator: Poedit 2.0.7\n"
 "Language-Team: \n"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:127
 msgid "%s in %s"
 msgstr "%s (%s)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr "%s%s ,%s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:125
 msgid "%s, %s in %s"
 msgstr "%s, %s (%s)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:26
+msgid "(Unnamed Entry)"
+msgstr "(名前設定の無いエントリー)"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:169
+msgid "(Unnamed Rule)"
+msgstr "(名前設定の無いルール)"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:37
+msgid "(Unnamed SNAT)"
+msgstr "(名前設定の無いSNAT)"
+
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr "<var>%d</var> パケット / <var>%s</var>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr ""
 "<var>%d</var> パケット / <var>%s</var>, バースト <var>%d</var> パケット"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:180
 msgid "<var>%s</var> and limit to %s"
 msgstr "<var>%s</var>, %s を上限に設定"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr "転送を許可"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr "入力を許可"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr "出力を許可"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:257
 msgid "Action"
 msgstr "動作"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone destination "
-"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
-"traffic."
-msgstr ""
-"ゾーンの送信先へのトラフィックを区分するために付加する、生の <em>iptables</"
-"em> 引数です。（例: HTTPS 送信トラフィックのみにマッチさせる <code>-p tcp --"
-"dport 443</code>）"
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
+msgid "Add"
+msgstr "追加"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
-"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
-msgstr ""
-"ゾーンを送信元とするトラフィックを区分するために付加する、生の <em>iptables</"
-"em> 引数です。（例: HTTPS 受信トラフィックのみにマッチさせる <code>-p tcp --"
-"sport 443</code>）"
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
+msgid "Add and edit..."
+msgstr "追加及び編集..."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:57
 msgid "Advanced Settings"
 msgstr "詳細設定"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid "Allow \"invalid\" traffic"
-msgstr "\"invalid\" トラフィックの許可"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:178
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "<em>送信元ゾーン</em>からの転送を許可する:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:170
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "<em>宛先ゾーン</em>への転送を許可する:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:89
 msgid "Any"
 msgstr "全て"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
-msgid "Any day"
-msgstr "全日"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid "Automatic helper assignment"
-msgstr "自動ヘルパー割り当て"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid ""
-"Automatically assign conntrack helpers based on traffic protocol and port"
-msgstr ""
-"トラフィックのプロトコルとポートに基づいて、 conntrack ヘルパーを自動的に割り"
-"当てます。"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
-msgid "Conntrack Settings"
-msgstr "Conntrack 設定"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Conntrack helpers"
-msgstr "Conntrack ヘルパー"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid "Covered devices"
-msgstr "カバーされるデバイス"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:88
 msgid "Covered networks"
 msgstr "対象ネットワーク"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid "Covered subnets"
-msgstr "カバーされるサブネット"
-
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:22
 msgid "Custom Rules"
 msgstr "手動設定ルール"
 
@@ -153,15 +116,23 @@ msgstr ""
 "ドは、ファイアウォール機能の起動ごとに、標準のルールが読み込まれた後に実行さ"
 "れます。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:108
+msgid "Destination IP address"
+msgstr "宛先IPアドレス"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:304
 msgid "Destination address"
 msgstr "宛先アドレス"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:313
 msgid "Destination port"
 msgstr "宛先ポート"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:102
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:295
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
 msgid "Destination zone"
 msgstr "宛先ゾーン"
 
@@ -169,99 +140,82 @@ msgstr "宛先ゾーン"
 msgid "Disable"
 msgstr "無効"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr "転送を破棄"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr "入力を破棄"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr "出力を破棄"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid ""
-"Do not install extra rules to reject forwarded traffic with conntrack state "
-"<em>invalid</em>. This may be required for complex asymmetric route setups."
-msgstr ""
-"conntrack ステートが <em>invalid</em> である転送されたトラフィックを拒否する"
-"追加ルールをインストールしません。これは、複雑で非対称なルートのセットアップ"
-"に必要となることがあります。"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:151
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
+msgid "Do not rewrite"
+msgstr "リライトしない"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr "転送を追跡しない"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr "入力を追跡しない"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr "出力を追跡しない"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:22
 msgid "Drop invalid packets"
 msgstr "無効なパケットを遮断する"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:270
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "有効"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:149
 msgid "Enable NAT Loopback"
 msgstr "NATループバックを有効にする"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:20
 msgid "Enable SYN-flood protection"
 msgstr "SYN-Floodプロテクションを有効にする"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:144
 msgid "Enable logging on this zone"
 msgstr "このゾーンのログ記録を有効にする"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:43
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr "実験的な機能です。 QoS/SQM との完全な互換性はありません。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
-msgstr "ゾーン トラフィックのコネクション追跡ヘルパーを明示的に選択します。"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:98
 msgid "External IP address"
 msgstr "外部IPアドレス"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:111
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
 msgid "External port"
 msgstr "外部ポート"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
+msgid "External zone"
+msgstr "外部ゾーン"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:158
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:331
 msgid "Extra arguments"
-msgstr "追加の引数"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid "Extra destination arguments"
-msgstr "追加の送信先引数"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
-msgid "Extra iptables arguments"
-msgstr "追加の iptables 引数"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid "Extra source arguments"
-msgstr "追加の送信元引数"
+msgstr "追加設定"
 
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
 msgid "Firewall"
@@ -271,162 +225,180 @@ msgstr "ファイアウォール"
 msgid "Firewall - Custom Rules"
 msgstr "ファイアウォール - 手動設定ルール"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:13
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:8
 msgid "Firewall - Port Forwards"
 msgstr "ファイアウォール - ポートフォワーディング"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:12
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:42
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:9
 msgid "Firewall - Traffic Rules"
 msgstr "ファイアウォール - トラフィック・ルール"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:15
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:11
 msgid "Firewall - Zone Settings"
 msgstr "ファイアウォール - ゾーン設定"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:141
 msgid "Force connection tracking"
 msgstr "強制的にコネクション追跡を行う"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:76
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:27
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:92
 msgid "Forward"
 msgstr "転送"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:116
 msgid "Forward to"
 msgstr "転送先"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:343
 msgid "Friday"
 msgstr "金曜日"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:106
 msgid "From %s in %s"
 msgstr "送信元 %s (%s)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:88
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:104
 msgid "From %s in %s with source %s"
 msgstr "送信元 %s (%s) , %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:102
 msgid "From %s in %s with source %s and %s"
 msgstr "送信元 %s (%s) , %s, %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:117
 msgid "From %s on <var>this device</var>"
 msgstr "送信元 %s (<var>デバイス</var>)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:115
 msgid "From %s on <var>this device</var> with source %s"
 msgstr "送信元 %s, %s (<var>デバイス</var>)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:113
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr "送信元 %s, %s, %s (<var>デバイス</var>)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:10
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:56
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:16
 msgid "General Settings"
 msgstr "一般設定"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:51
 msgid "Hardware flow offloading"
 msgstr "ハードウェア フローオフロード"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr "IP"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr "IP の範囲"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr "IP"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:85
 msgid "IPv4"
 msgstr "IPv4"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:185
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:118
 msgid "IPv4 and IPv6"
 msgstr "IPv4及びIPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:119
 msgid "IPv4 only"
 msgstr "IPv4のみ"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:87
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:120
 msgid "IPv6 only"
 msgstr "IPv6のみ"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:25
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:90
 msgid "Input"
 msgstr "受信"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:157
+msgid "Inter-Zone Forwarding"
+msgstr "内部ゾーン転送"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:127
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
 msgid "Internal IP address"
 msgstr "内部IPアドレス"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:138
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
 msgid "Internal port"
 msgstr "内部ポート"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:121
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
 msgid "Internal zone"
 msgstr "内部ゾーン"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:150
 msgid "Limit log messages"
 msgstr "ログメッセージを制限"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr "MAC"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr "MAC"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:102
 msgid "MSS clamping"
 msgstr "MSSクランプ"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:101
 msgid "Masquerading"
 msgstr "マスカレード"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:105
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:162
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:247
 msgid "Match"
 msgstr "対象"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:206
 msgid "Match ICMP type"
 msgstr "ICMPタイプの一致"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:118
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr ""
+"設定された宛先ポート(またはポート範囲)に一致した転送トラフィックが対象になり"
+"ます"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:112
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
@@ -434,40 +406,70 @@ msgstr ""
 "設定された宛先ポート(またはポート範囲)に一致した受信トラフィックが対象になり"
 "ます"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:91
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr ""
+"設定されたクライアントホストの送信元ポート(またはポート範囲)からの受信トラ"
+"フィックと一致したトラフィックが対象になります。"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:339
 msgid "Monday"
 msgstr "月曜日"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:346
 msgid "Month Days"
 msgstr "月間"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:50
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:180
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:60
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
 msgid "Name"
 msgstr "名前"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:169
-msgid "Network"
-msgstr "ネットワーク"
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
+msgid "New SNAT rule"
+msgstr "SNATルールの新規作成"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
+msgid "New forward rule"
+msgstr "転送ルールの新規作成"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
+msgid "New input rule"
+msgstr "受信ルールの新規作成"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
+msgid "New port forward"
+msgstr "転送設定の新規作成"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
+msgid "New source NAT"
+msgstr "SNATルールの新規作成"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:99
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr "設定された宛先IPアドレスと一致した受信トラフィックが対象になります。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:63
 msgid "Only match incoming traffic from these MACs."
 msgstr "設定されたMACアドレスと一致した受信したトラフィックが対象になります。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:75
 msgid "Only match incoming traffic from this IP or range."
 msgstr ""
 "設定されたIPアドレス (または範囲) と一致した受信したトラフィックが対象になり"
 "ます。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:87
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
@@ -475,38 +477,39 @@ msgstr ""
 "設定されたクライアントホストの送信元ポート(またはポート範囲)からの受信トラ"
 "フィックと一致したトラフィックのみを対象にします。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
+msgid "Open ports on router"
+msgstr "ポートの開放"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
+msgid "Other..."
+msgstr "その他のプロトコル"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:26
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:91
 msgid "Output"
 msgstr "送信"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:288
+msgid "Output zone"
+msgstr "出力ゾーン"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:160
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:332
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 "iptablesにパススルーする追加の引数を設定してください。ただし、注意して設定し"
 "てください!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
-msgid ""
-"Passing raw iptables arguments to source and destination traffic "
-"classification rules allows to match packets based on other criteria than "
-"interfaces or subnets. These options should be used with extreme care as "
-"invalid values could render the firewall ruleset broken, completely exposing "
-"all services."
-msgstr ""
-"送信元と送信先のトラフィックの区分ルールを、インターフェースやサブネット以外"
-"の基準に基づいてマッチすることができるように、生の iptables 引数を渡します。"
-"これらのオプションは、無効な値がファイアウォール ルールセットの破壊を引き起こ"
-"し、全サービスを外部に晒す恐れがあることに、特段の注意を払い使用されなければ"
-"なりません。"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:14
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:17
 msgid "Port Forwards"
 msgstr "ポートフォワーディング"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:9
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
@@ -515,45 +518,37 @@ msgstr ""
 "ベートなネットワーク上の、特定のコンピュータやサービスへのアクセスを可能にし"
 "ます。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
-msgid ""
-"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
-"connection tracking."
-msgstr ""
-"コネクション追跡をバイパスさせる <em>NOTRACK</em> ルールのインストールを防ぎ"
-"ます。"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:39
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:190
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
 msgid "Protocol"
 msgstr "プロトコル"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:139
 msgid ""
 "Redirect matched incoming traffic to the given port on the internal host"
 msgstr ""
 "ルールに一致した受信トラフィックを、内部ホストの設定されたポートへ転送します"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:128
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "ルールに一致した受信トラフィックを、設定された内部ホストへ転送します"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr "転送を拒否"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr "入力を拒否"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr "出力を拒否"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:52
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 "ハードウェア NAT サポートが必要です。 mt7621 のみにおいて実装されています。"
@@ -562,20 +557,41 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr "ファイアウォールの再起動"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:132
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "設定された宛先サブネットへのマスカレードを制限する"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:123
 msgid "Restrict Masquerading to given source subnets"
 msgstr "設定された送信元サブネットへのマスカレードを制限する"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:183
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:115
 msgid "Restrict to address family"
 msgstr "アドレスファミリの制限"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:132
+msgid "Rewrite matched traffic to the given address."
+msgstr ""
+"ルールに一致したトラフィックの送信元アドレスを設定した値にリライトします。"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:147
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr ""
+"ルールに一致したトラフィックの送信元ポートを設定した値にリライトします。空欄"
+"にした場合、IPアドレスのみを書き直します。"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:266
+msgid "Rewrite to source %s"
+msgstr "送信元 %s にリライト"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:264
+msgid "Rewrite to source %s, %s"
+msgstr "送信元 %s, %s にリライト"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:42
 msgid "Routing/NAT Offloading"
 msgstr "ルーティング/NAT オフロード"
 
@@ -587,62 +603,119 @@ msgstr "ルールは無効です"
 msgid "Rule is enabled"
 msgstr "ルールは有効です"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:131
+msgid "SNAT IP address"
+msgstr "SNAT IPアドレス"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:146
+msgid "SNAT port"
+msgstr "SNAT ポート"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:344
 msgid "Saturday"
 msgstr "土曜日"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:47
 msgid "Software based offloading for routing/NAT"
 msgstr "ルーティング/NAT のための、ソフトウェアベースのオフロードです。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:46
 msgid "Software flow offloading"
 msgstr "ソフトウェア フローオフロード"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+# Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/rrule.lua      #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#
+# msgid "Traffic Redirection"
+# msgstr ""
+#
+# msgid ""
+# "Traffic redirection allows you to change the destination address of "
+# "forwarded packets."
+# msgstr ""
+#
+# msgid "Overview"
+# msgstr ""
+#
+# msgid "Name"
+# msgstr ""
+#
+# msgid "Source zone"
+# msgstr ""
+#
+# msgid "Source MAC-address"
+# msgstr ""
+#
+# msgid "Source port"
+# msgstr ""
+#
+# msgid "Protocol"
+# msgstr ""
+#
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:79
 msgid "Source IP address"
 msgstr "送信元IPアドレス"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:261
 msgid "Source MAC address"
 msgstr "送信元MACアドレス"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:194
+msgid "Source NAT"
+msgstr "送信元NAT"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:195
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+"送信元NAT設定は、複数のWANアドレスを内部のサブネットにマッピングするような、"
+"出力トラフィックに対する送信元IPアドレスのきめ細かい制御を行うマスカレードの"
+"設定フォームです。"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:270
 msgid "Source address"
 msgstr "送信元アドレス"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:279
 msgid "Source port"
 msgstr "送信元ポート"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:254
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
 msgid "Source zone"
 msgstr "送信元ゾーン"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:357
 msgid "Start Date (yyyy-mm-dd)"
 msgstr "開始日 (yyyy-mm-dd)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
-msgid "Start Time (hh.mm.ss)"
-msgstr "開始時刻 (hh.mm.ss)"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:353
+msgid "Start Time (hh:mm:ss)"
+msgstr "開始時刻 (hh:mm:ss)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:359
 msgid "Stop Date (yyyy-mm-dd)"
 msgstr "停止日 (yyyy-mm-dd)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
-msgid "Stop Time (hh.mm.ss)"
-msgstr "停止時刻 (hh.mm.ss)"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:355
+msgid "Stop Time (hh:mm:ss)"
+msgstr "停止時刻 (hh:mm:ss)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:338
 msgid "Sunday"
 msgstr "日曜日"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:12
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
@@ -650,8 +723,7 @@ msgstr ""
 "ファイアウォール機能は、各ネットワークインターフェース上にゾーンを作成してト"
 "ラフィックの制御を行います。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:158
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -667,7 +739,23 @@ msgstr ""
 "向</em>であり、例えばlanからwanへの転送設定は、wanからlanへの転送を<em>許可し"
 "ません。</em>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:14
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr ""
+"このページでは、各転送ルールの詳細設定を行うことができます。ただし、ほとんど"
+"のケースは、これらの設定を変更する必要はありません。"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:13
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr ""
+"このページでは、各トラフィックルールの送信元・宛先ホストの設定などの詳細設定"
+"を行うことができます。"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:36
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -681,40 +769,46 @@ msgstr ""
 "準のポリシーになります。<em>対象ネットワーク</em>は、どのネットワーク設定がこ"
 "のゾーンに属するかを設定します。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:342
 msgid "Thursday"
 msgstr "木曜日"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
-msgid "Time Restrictions"
-msgstr "時間制限"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:362
 msgid "Time in UTC"
 msgstr "UTC時刻を使用"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:141
 msgid "To %s at %s on <var>this device</var>"
 msgstr "宛先 %s, %s (<var>デバイス</var>)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:132
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:157
 msgid "To %s in %s"
 msgstr "宛先 %s (%s)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:143
 msgid "To %s on <var>this device</var>"
 msgstr "宛先 %s (<var>デバイス</var>)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:130
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:155
 msgid "To %s, %s in %s"
 msgstr "宛先 %s, %s (%s)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
+msgid "To source IP"
+msgstr "変換後送信元IP"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
+msgid "To source port"
+msgstr "変換後送信元ポート"
+
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:18
 msgid "Traffic Rules"
 msgstr "トラフィック・ルール"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:10
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
@@ -724,208 +818,158 @@ msgstr ""
 "します。例えば、特定のホスト間や、ルーターのWANポートへのトラフィックの拒否を"
 "設定することができます。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:340
 msgid "Tuesday"
 msgstr "火曜日"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:244
+msgid "Unnamed SNAT"
+msgstr "名称未設定の SNAT"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:67
 msgid "Unnamed forward"
 msgstr "名称未設定の転送"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:76
 msgid "Unnamed rule"
 msgstr "名称未設定のルール"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
-msgid "Unnamed zone"
-msgstr "名称未設定のゾーン"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid ""
-"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
-"network devices."
-msgstr ""
-"生の、または非 <em>uci</em> 管理下にあるデバイスによるゾーン トラフィックの区"
-"分にこのオプションを使用します。"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid ""
-"Use this option to classify zone traffic by source or destination subnet "
-"instead of networks or devices."
-msgstr ""
-"ネットワークまたはデバイスに代わり、アクセス元またはアクセス先サブネットによ"
-"るゾーン トラフィックの区分にこのオプションを使用します。"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:101
 msgid "Via %s"
 msgstr "経由 %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:99
 msgid "Via %s at %s"
 msgstr "経由 %s , %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:341
 msgid "Wednesday"
 msgstr "水曜日"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:335
 msgid "Week Days"
 msgstr "曜日"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:55
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr ""
+"\"-- 手動設定 --\"を選択し、プロトコルをスペースで区切って入力することで複数"
+"のプロトコルを指定することができます。"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:35
+msgid "Zone %q"
+msgstr "ゾーン %q"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:83
 msgid "Zone ⇒ Forwardings"
 msgstr "ゾーン ⇒ 転送"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:59
 msgid "Zones"
 msgstr "ゾーン"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:325
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:33
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:98
 msgid "accept"
 msgstr "許可"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:108
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:141
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:263
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:272
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:281
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:306
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:315
 msgid "any"
 msgstr "全て"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:120
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:100
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:150
 msgid "any host"
 msgstr "全てのホスト"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:111
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:138
 msgid "any router IP"
 msgstr "全てのルーターIP"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:119
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:149
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr "全てのゾーン"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr "日"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:327
 msgid "don't track"
 msgstr "コネクション追跡を行わない"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:324
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:32
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:97
 msgid "drop"
 msgstr "破棄"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr "時間"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr "分"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr "ポート"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr "ポート"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:326
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:31
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:96
 msgid "reject"
 msgstr "拒否"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr "秒"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
-msgid "this new zone"
-msgstr ""
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:82
+msgid "traffic"
+msgstr "トラフィック"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr "タイプ"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr "タイプ"
-
-#~ msgid "Add"
-#~ msgstr "追加"
-
-#~ msgid "Add and edit..."
-#~ msgstr "追加及び編集..."
-
-#~ msgid "Do not rewrite"
-#~ msgstr "リライトしない"
-
-#~ msgid "External zone"
-#~ msgstr "外部ゾーン"
-
-#~ msgid "New SNAT rule"
-#~ msgstr "SNATルールの新規作成"
-
-#~ msgid "New forward rule"
-#~ msgstr "転送ルールの新規作成"
-
-#~ msgid "New input rule"
-#~ msgstr "受信ルールの新規作成"
-
-#~ msgid "New port forward"
-#~ msgstr "転送設定の新規作成"
-
-#~ msgid "New source NAT"
-#~ msgstr "SNATルールの新規作成"
-
-#~ msgid "Open ports on router"
-#~ msgstr "ポートの開放"
-
-#~ msgid "Other..."
-#~ msgstr "その他のプロトコル"
-
-#~ msgid "To source IP"
-#~ msgstr "変換後送信元IP"
-
-#~ msgid "To source port"
-#~ msgstr "変換後送信元ポート"
diff --git a/luci-app-firewall/po/ko/firewall.po b/luci-app-firewall/po/ko/firewall.po
index c916d1122..2d8cbbf43 100644
--- a/luci-app-firewall/po/ko/firewall.po
+++ b/luci-app-firewall/po/ko/firewall.po
@@ -13,123 +13,94 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Pootle 2.0.6\n"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:127
 msgid "%s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr "%s%s ,%s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:125
 msgid "%s, %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:26
+msgid "(Unnamed Entry)"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:169
+msgid "(Unnamed Rule)"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:37
+msgid "(Unnamed SNAT)"
+msgstr ""
+
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:180
 msgid "<var>%s</var> and limit to %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:257
 msgid "Action"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone destination "
-"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
-"traffic."
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
+msgid "Add"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
-"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
-msgstr ""
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
+msgid "Add and edit..."
+msgstr "추가 후 수정..."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:57
 msgid "Advanced Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid "Allow \"invalid\" traffic"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:178
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "<em>Source zone</em> 로부터의 forward 허용:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:170
 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:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:89
 msgid "Any"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
-msgid "Any day"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid "Automatic helper assignment"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid ""
-"Automatically assign conntrack helpers based on traffic protocol and port"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
-msgid "Conntrack Settings"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Conntrack helpers"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid "Covered devices"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:88
 msgid "Covered networks"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid "Covered subnets"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:22
 msgid "Custom Rules"
 msgstr "Custom Rule"
 
@@ -143,15 +114,23 @@ msgstr ""
 "수 있도록 합니다.  입력된 명령어들은 매 방화벽 재시작시 실행되는데 default "
 "ruleset 이 load 된 후 시점입니다."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:108
+msgid "Destination IP address"
+msgstr "Destination IP 주소"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:304
 msgid "Destination address"
 msgstr "Destination 주소"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:313
 msgid "Destination port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:102
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:295
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
 msgid "Destination zone"
 msgstr ""
 
@@ -159,97 +138,83 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid ""
-"Do not install extra rules to reject forwarded traffic with conntrack state "
-"<em>invalid</em>. This may be required for complex asymmetric route setups."
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:151
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
+msgid "Do not rewrite"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:22
 msgid "Drop invalid packets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:270
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "활성화"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:149
 msgid "Enable NAT Loopback"
 msgstr "NAT Loopback 활성화"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:20
 msgid "Enable SYN-flood protection"
 msgstr "SYN-flood protection 활성화"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:144
 msgid "Enable logging on this zone"
 msgstr "zone 의 logging 활성화"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:43
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:98
 msgid "External IP address"
 msgstr "외부 IP 주소"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:111
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
 msgid "External port"
 msgstr "외부 port"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
+msgid "External zone"
+msgstr "외부 zone"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:158
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:331
 msgid "Extra arguments"
 msgstr "추가 argument"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid "Extra destination arguments"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
-msgid "Extra iptables arguments"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid "Extra source arguments"
-msgstr ""
-
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
 msgid "Firewall"
 msgstr "방화벽"
@@ -258,229 +223,279 @@ msgstr "방화벽"
 msgid "Firewall - Custom Rules"
 msgstr "방화벽 - Custom Rules"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:13
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:8
 msgid "Firewall - Port Forwards"
 msgstr "방화벽 - Port Forwards"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:12
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:42
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:9
 msgid "Firewall - Traffic Rules"
 msgstr "방화벽 - Traffic Rules"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:15
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:11
 msgid "Firewall - Zone Settings"
 msgstr "방화벽 - Zone 설정"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:141
 msgid "Force connection tracking"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:76
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:27
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:92
 msgid "Forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:116
 msgid "Forward to"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:343
 msgid "Friday"
 msgstr "금요일"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:106
 msgid "From %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:88
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:104
 msgid "From %s in %s with source %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:102
 msgid "From %s in %s with source %s and %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:117
 msgid "From %s on <var>this device</var>"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:115
 msgid "From %s on <var>this device</var> with source %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:113
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:10
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:56
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:16
 msgid "General Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:51
 msgid "Hardware flow offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:85
 msgid "IPv4"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:185
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:118
 msgid "IPv4 and IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:119
 msgid "IPv4 only"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:87
 msgid "IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:120
 msgid "IPv6 only"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:25
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:90
 msgid "Input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:157
+msgid "Inter-Zone Forwarding"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:127
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
 msgid "Internal IP address"
 msgstr "내부 IP 주소"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:138
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
 msgid "Internal port"
 msgstr "내부 port"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:121
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
 msgid "Internal zone"
 msgstr "내부 zone"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:150
 msgid "Limit log messages"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:102
 msgid "MSS clamping"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:101
 msgid "Masquerading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:105
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:162
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:247
 msgid "Match"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:206
 msgid "Match ICMP type"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:118
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:112
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:91
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:339
 msgid "Monday"
 msgstr "월요일"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:346
 msgid "Month Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:50
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:180
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:60
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
 msgid "Name"
 msgstr "이름"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:169
-msgid "Network"
-msgstr ""
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
+msgid "New SNAT rule"
+msgstr "새로운 SNAT rule"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
+msgid "New forward rule"
+msgstr "새로운 forward rule"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
+msgid "New input rule"
+msgstr "새로운 input rule"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
+msgid "New port forward"
+msgstr "새로운 port forward"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
+msgid "New source NAT"
+msgstr "새로운 source NAT"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:99
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:63
 msgid "Only match incoming traffic from these MACs."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:75
 msgid "Only match incoming traffic from this IP or range."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:87
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
+msgid "Open ports on router"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
+msgid "Other..."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:26
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:91
 msgid "Output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:288
+msgid "Output zone"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:160
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:332
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr "iptables 명령에 추가 인자들을 더합니다.  조심해 사용하세요!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
-msgid ""
-"Passing raw iptables arguments to source and destination traffic "
-"classification rules allows to match packets based on other criteria than "
-"interfaces or subnets. These options should be used with extreme care as "
-"invalid values could render the firewall ruleset broken, completely exposing "
-"all services."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:14
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:17
 msgid "Port Forwards"
 msgstr "Port Forward"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:9
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
@@ -488,42 +503,36 @@ msgstr ""
 "Port forwarding 기능은 인터넷 상의 원격 컴퓨터가 내부 LAN 에 속한 특정 컴퓨터"
 "나 서비스에 접속할 수 있도록 합니다."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
-msgid ""
-"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
-"connection tracking."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:39
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:190
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
 msgid "Protocol"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:139
 msgid ""
 "Redirect matched incoming traffic to the given port on the internal host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:128
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:52
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
@@ -531,20 +540,38 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:132
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "주어진 destination subnet 으로 Masquerading 제한"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:123
 msgid "Restrict Masquerading to given source subnets"
 msgstr "주어진 source subnet 으로 Masquerading 제한"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:183
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:115
 msgid "Restrict to address family"
 msgstr "Address family 제한"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:132
+msgid "Rewrite matched traffic to the given address."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:147
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:266
+msgid "Rewrite to source %s"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:264
+msgid "Rewrite to source %s, %s"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:42
 msgid "Routing/NAT Offloading"
 msgstr ""
 
@@ -556,62 +583,89 @@ msgstr ""
 msgid "Rule is enabled"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:131
+msgid "SNAT IP address"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:146
+msgid "SNAT port"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:344
 msgid "Saturday"
 msgstr "토요일"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:47
 msgid "Software based offloading for routing/NAT"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:46
 msgid "Software flow offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:79
 msgid "Source IP address"
 msgstr "Source IP 주소"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:261
 msgid "Source MAC address"
 msgstr "Source MAC 주소"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:194
+msgid "Source NAT"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:195
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+"Source NAT 기능은 masquerading 의 한 형태로써 outgoing 트래픽이 사용할 "
+"source IP 를 세밀하게 제어할 수 있습니다.  예를 들어 다수의 WAN 주소들을 내"
+"부 subnet 에 매핑(mapping) 할 경우 사용됩니다."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:270
 msgid "Source address"
 msgstr "Source 주소"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:279
 msgid "Source port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:254
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
 msgid "Source zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:357
 msgid "Start Date (yyyy-mm-dd)"
 msgstr "시작 날짜 (yyyy-mm-dd)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
-msgid "Start Time (hh.mm.ss)"
-msgstr ""
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:353
+msgid "Start Time (hh:mm:ss)"
+msgstr "시작 시간 (hh:mm:ss)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:359
 msgid "Stop Date (yyyy-mm-dd)"
 msgstr "종료 날짜 (yyyy-mm-dd)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
-msgid "Stop Time (hh.mm.ss)"
-msgstr ""
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:355
+msgid "Stop Time (hh:mm:ss)"
+msgstr "종료 시간 (hh:mm:ss)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:338
 msgid "Sunday"
 msgstr "일요일"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:12
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
@@ -619,8 +673,7 @@ msgstr ""
 "방화벽 기능을 이용하여 네트워크 인터페이스와 연결된 zone 을 생성할 수 있고 이"
 "를 이용하여 네트워크 traffic flow 를 제어할 수 있습니다."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:158
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -636,7 +689,23 @@ msgstr ""
 "<em>unidirectional</em> 인데, 예를 들어 LAN 에서 WAN 으로의 forward 규칙이 "
 "WAN 에서 LAN 으로의 forward 를 허락하는 것이 아닙니다."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:14
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr ""
+"이 메뉴에서는 port forwarding 의 고급 설정 정보를 변경할 수 있습니다. 대부분"
+"의 경우 이 설정을 수정할 일이 없습니다."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:13
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr ""
+"이 메뉴에서는 traffic rule 항목의 고급 설정, 예를 들어 source host 와 "
+"destination host 매칭, 을 변경할 수 있습니다."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:36
 #, fuzzy
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
@@ -651,40 +720,46 @@ msgstr ""
 "를 오가는 forward traffic 에 대한 정책을 뜻합니다. <em>Covered networks</em> "
 "에서는 zone 의 영향을 받을 네트워크들을 지정할 수 있습니다."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:342
 msgid "Thursday"
 msgstr "목요일"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
-msgid "Time Restrictions"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:362
 msgid "Time in UTC"
 msgstr "UTC 기준시"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:141
 msgid "To %s at %s on <var>this device</var>"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:132
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:157
 msgid "To %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:143
 msgid "To %s on <var>this device</var>"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:130
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:155
 msgid "To %s, %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
+msgid "To source IP"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
+msgid "To source port"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:18
 msgid "Traffic Rules"
 msgstr "Traffic Rule"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:10
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
@@ -694,218 +769,156 @@ msgstr ""
 "다. 예를 들어 특정 host 들 사이의 트래픽을 차단하거나 공유기의 WAN port 를 "
 "open 할때 사용됩니다."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:340
 msgid "Tuesday"
 msgstr "화요일"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:244
+msgid "Unnamed SNAT"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:67
 msgid "Unnamed forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:76
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
-msgid "Unnamed zone"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid ""
-"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
-"network devices."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid ""
-"Use this option to classify zone traffic by source or destination subnet "
-"instead of networks or devices."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:101
 msgid "Via %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:99
 msgid "Via %s at %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:341
 msgid "Wednesday"
 msgstr "수요일"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:335
 msgid "Week Days"
 msgstr "주일"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:55
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:35
+msgid "Zone %q"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:83
 msgid "Zone ⇒ Forwardings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:59
 msgid "Zones"
 msgstr "Zone 내역"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:325
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:33
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:98
 msgid "accept"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:108
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:141
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:263
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:272
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:281
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:306
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:315
 msgid "any"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:120
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:100
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:150
 msgid "any host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:111
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:138
 msgid "any router IP"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:119
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:149
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:327
 msgid "don't track"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:324
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:32
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:97
 msgid "drop"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:326
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:31
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:96
 msgid "reject"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
-msgid "this new zone"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:82
+msgid "traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr ""
-
-#~ msgid "Add and edit..."
-#~ msgstr "추가 후 수정..."
-
-#~ msgid "External zone"
-#~ msgstr "외부 zone"
-
-#~ msgid "New SNAT rule"
-#~ msgstr "새로운 SNAT rule"
-
-#~ msgid "New forward rule"
-#~ msgstr "새로운 forward rule"
-
-#~ msgid "New input rule"
-#~ msgstr "새로운 input rule"
-
-#~ msgid "New port forward"
-#~ msgstr "새로운 port forward"
-
-#~ msgid "New source NAT"
-#~ msgstr "새로운 source NAT"
-
-#~ msgid "Destination IP address"
-#~ msgstr "Destination IP 주소"
-
-#~ msgid ""
-#~ "Source NAT is a specific form of masquerading which allows fine grained "
-#~ "control over the source IP used for outgoing traffic, for example to map "
-#~ "multiple WAN addresses to internal subnets."
-#~ msgstr ""
-#~ "Source NAT 기능은 masquerading 의 한 형태로써 outgoing 트래픽이 사용할 "
-#~ "source IP 를 세밀하게 제어할 수 있습니다.  예를 들어 다수의 WAN 주소들을 "
-#~ "내부 subnet 에 매핑(mapping) 할 경우 사용됩니다."
-
-#~ msgid "Start Time (hh:mm:ss)"
-#~ msgstr "시작 시간 (hh:mm:ss)"
-
-#~ msgid "Stop Time (hh:mm:ss)"
-#~ msgstr "종료 시간 (hh:mm:ss)"
-
-#~ msgid ""
-#~ "This page allows you to change advanced properties of the port forwarding "
-#~ "entry. In most cases there is no need to modify those settings."
-#~ msgstr ""
-#~ "이 메뉴에서는 port forwarding 의 고급 설정 정보를 변경할 수 있습니다. 대부"
-#~ "분의 경우 이 설정을 수정할 일이 없습니다."
-
-#~ msgid ""
-#~ "This page allows you to change advanced properties of the traffic rule "
-#~ "entry, such as matched source and destination hosts."
-#~ msgstr ""
-#~ "이 메뉴에서는 traffic rule 항목의 고급 설정, 예를 들어 source host 와 "
-#~ "destination host 매칭, 을 변경할 수 있습니다."
diff --git a/luci-app-firewall/po/ms/firewall.po b/luci-app-firewall/po/ms/firewall.po
index 56a0f053e..ed239a57c 100644
--- a/luci-app-firewall/po/ms/firewall.po
+++ b/luci-app-firewall/po/ms/firewall.po
@@ -7,123 +7,94 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:127
 msgid "%s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:125
 msgid "%s, %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:26
+msgid "(Unnamed Entry)"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:169
+msgid "(Unnamed Rule)"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:37
+msgid "(Unnamed SNAT)"
+msgstr ""
+
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:180
 msgid "<var>%s</var> and limit to %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:257
 msgid "Action"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone destination "
-"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
-"traffic."
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
+msgid "Add"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
-"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
+msgid "Add and edit..."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:57
 msgid "Advanced Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid "Allow \"invalid\" traffic"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:178
 msgid "Allow forward from <em>source zones</em>:"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:170
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:89
 msgid "Any"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
-msgid "Any day"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid "Automatic helper assignment"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid ""
-"Automatically assign conntrack helpers based on traffic protocol and port"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
-msgid "Conntrack Settings"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Conntrack helpers"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid "Covered devices"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:88
 msgid "Covered networks"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid "Covered subnets"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:22
 msgid "Custom Rules"
 msgstr ""
 
@@ -134,15 +105,23 @@ msgid ""
 "each firewall restart, right after the default ruleset has been loaded."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:108
+msgid "Destination IP address"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:304
 msgid "Destination address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:313
 msgid "Destination port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:102
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:295
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
 msgid "Destination zone"
 msgstr ""
 
@@ -150,97 +129,83 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid ""
-"Do not install extra rules to reject forwarded traffic with conntrack state "
-"<em>invalid</em>. This may be required for complex asymmetric route setups."
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:151
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
+msgid "Do not rewrite"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:22
 msgid "Drop invalid packets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:270
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:149
 msgid "Enable NAT Loopback"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:20
 msgid "Enable SYN-flood protection"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:144
 msgid "Enable logging on this zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:43
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:98
 msgid "External IP address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:111
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
 msgid "External port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
+msgid "External zone"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:158
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:331
 msgid "Extra arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid "Extra destination arguments"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
-msgid "Extra iptables arguments"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid "Extra source arguments"
-msgstr ""
-
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
 msgid "Firewall"
 msgstr ""
@@ -249,270 +214,314 @@ msgstr ""
 msgid "Firewall - Custom Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:13
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:8
 msgid "Firewall - Port Forwards"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:12
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:42
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:9
 msgid "Firewall - Traffic Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:15
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:11
 msgid "Firewall - Zone Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:141
 msgid "Force connection tracking"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:76
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:27
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:92
 msgid "Forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:116
 msgid "Forward to"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:343
 msgid "Friday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:106
 msgid "From %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:88
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:104
 msgid "From %s in %s with source %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:102
 msgid "From %s in %s with source %s and %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:117
 msgid "From %s on <var>this device</var>"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:115
 msgid "From %s on <var>this device</var> with source %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:113
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:10
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:56
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:16
 msgid "General Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:51
 msgid "Hardware flow offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:85
 msgid "IPv4"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:185
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:118
 msgid "IPv4 and IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:119
 msgid "IPv4 only"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:87
 msgid "IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:120
 msgid "IPv6 only"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:25
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:90
 msgid "Input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:157
+msgid "Inter-Zone Forwarding"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:127
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
 msgid "Internal IP address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:138
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
 msgid "Internal port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:121
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
 msgid "Internal zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:150
 msgid "Limit log messages"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:102
 msgid "MSS clamping"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:101
 msgid "Masquerading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:105
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:162
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:247
 msgid "Match"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:206
 msgid "Match ICMP type"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:118
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:112
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:91
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:339
 msgid "Monday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:346
 msgid "Month Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:50
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:180
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:60
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
 msgid "Name"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:169
-msgid "Network"
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
+msgid "New SNAT rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
+msgid "New forward rule"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
+msgid "New input rule"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
+msgid "New port forward"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
+msgid "New source NAT"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:99
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:63
 msgid "Only match incoming traffic from these MACs."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:75
 msgid "Only match incoming traffic from this IP or range."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:87
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
+msgid "Open ports on router"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
+msgid "Other..."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:26
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:91
 msgid "Output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:288
+msgid "Output zone"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:160
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:332
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
-msgid ""
-"Passing raw iptables arguments to source and destination traffic "
-"classification rules allows to match packets based on other criteria than "
-"interfaces or subnets. These options should be used with extreme care as "
-"invalid values could render the firewall ruleset broken, completely exposing "
-"all services."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:14
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:17
 msgid "Port Forwards"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:9
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
-msgid ""
-"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
-"connection tracking."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:39
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:190
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
 msgid "Protocol"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:139
 msgid ""
 "Redirect matched incoming traffic to the given port on the internal host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:128
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:52
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
@@ -520,20 +529,38 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:132
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:123
 msgid "Restrict Masquerading to given source subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:183
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:115
 msgid "Restrict to address family"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:132
+msgid "Rewrite matched traffic to the given address."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:147
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:266
+msgid "Rewrite to source %s"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:264
+msgid "Rewrite to source %s, %s"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:42
 msgid "Routing/NAT Offloading"
 msgstr ""
 
@@ -545,69 +572,92 @@ msgstr ""
 msgid "Rule is enabled"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:131
+msgid "SNAT IP address"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:146
+msgid "SNAT port"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:344
 msgid "Saturday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:47
 msgid "Software based offloading for routing/NAT"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:46
 msgid "Software flow offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:79
 msgid "Source IP address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:261
 msgid "Source MAC address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:194
+msgid "Source NAT"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:195
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:270
 msgid "Source address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:279
 msgid "Source port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:254
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
 msgid "Source zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:357
 msgid "Start Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
-msgid "Start Time (hh.mm.ss)"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:353
+msgid "Start Time (hh:mm:ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:359
 msgid "Stop Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
-msgid "Stop Time (hh.mm.ss)"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:355
+msgid "Stop Time (hh:mm:ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:338
 msgid "Sunday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:12
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:158
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -617,7 +667,19 @@ msgid ""
 "<em>not</em> imply a permission to forward from wan to lan as well."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:14
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:13
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:36
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -626,205 +688,202 @@ 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:349
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:342
 msgid "Thursday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
-msgid "Time Restrictions"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:362
 msgid "Time in UTC"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:141
 msgid "To %s at %s on <var>this device</var>"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:132
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:157
 msgid "To %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:143
 msgid "To %s on <var>this device</var>"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:130
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:155
 msgid "To %s, %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
+msgid "To source IP"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
+msgid "To source port"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:18
 msgid "Traffic Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:10
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
 "the router."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:340
 msgid "Tuesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:244
+msgid "Unnamed SNAT"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:67
 msgid "Unnamed forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:76
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
-msgid "Unnamed zone"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid ""
-"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
-"network devices."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid ""
-"Use this option to classify zone traffic by source or destination subnet "
-"instead of networks or devices."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:101
 msgid "Via %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:99
 msgid "Via %s at %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:341
 msgid "Wednesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:335
 msgid "Week Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:55
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:35
+msgid "Zone %q"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:83
 msgid "Zone ⇒ Forwardings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:59
 msgid "Zones"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:325
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:33
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:98
 msgid "accept"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:108
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:141
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:263
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:272
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:281
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:306
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:315
 msgid "any"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:120
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:100
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:150
 msgid "any host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:111
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:138
 msgid "any router IP"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:119
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:149
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:327
 msgid "don't track"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:324
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:32
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:97
 msgid "drop"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:326
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:31
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:96
 msgid "reject"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
-msgid "this new zone"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:82
+msgid "traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr ""
diff --git a/luci-app-firewall/po/no/firewall.po b/luci-app-firewall/po/no/firewall.po
index 625a6a363..11ed8e8fb 100644
--- a/luci-app-firewall/po/no/firewall.po
+++ b/luci-app-firewall/po/no/firewall.po
@@ -8,123 +8,94 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.6\n"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:127
 msgid "%s in %s"
 msgstr "%s i %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr "%s%s med %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:125
 msgid "%s, %s in %s"
 msgstr "%s, %s i %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:26
+msgid "(Unnamed Entry)"
+msgstr "(oppføring uten navn)"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:169
+msgid "(Unnamed Rule)"
+msgstr "(regel uten navn)"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:37
+msgid "(Unnamed SNAT)"
+msgstr "(SNAT uten navn)"
+
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr "<var>%d</var> pakker per <var>%s</var>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr "<var>%d</var> pakker per <var>%s</var>, burst <var>%d</var>pakker."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:180
 msgid "<var>%s</var> and limit to %s"
 msgstr "<var>%s</var> og begrens til %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:257
 msgid "Action"
 msgstr "Handling"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone destination "
-"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
-"traffic."
-msgstr ""
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
+msgid "Add"
+msgstr "Legg til"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
-"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
-msgstr ""
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
+msgid "Add and edit..."
+msgstr "Legg til og redigere..."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:57
 msgid "Advanced Settings"
 msgstr "Avanserte Innstillinger"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid "Allow \"invalid\" traffic"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:178
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Tillat videresending fra <em>kilde soner</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:170
 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:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:89
 msgid "Any"
 msgstr "Enhver"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
-msgid "Any day"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid "Automatic helper assignment"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid ""
-"Automatically assign conntrack helpers based on traffic protocol and port"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
-msgid "Conntrack Settings"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Conntrack helpers"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid "Covered devices"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:88
 msgid "Covered networks"
 msgstr "Gjeldene nettverk"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid "Covered subnets"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:22
 msgid "Custom Rules"
 msgstr "Egendefinerte Regler"
 
@@ -138,15 +109,23 @@ msgstr ""
 "som ikke dekkes av brannmurens standardoppsett. Kommandoene utføres etter "
 "hver omstart av brannmuren, rett etter at standard regelsett er lastet."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:108
+msgid "Destination IP address"
+msgstr "Destinasjon IP adresse"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:304
 msgid "Destination address"
 msgstr "Destinasjon adresse"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:313
 msgid "Destination port"
 msgstr "Destinasjon port"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:102
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:295
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
 msgid "Destination zone"
 msgstr "Destinasjon sone"
 
@@ -154,97 +133,83 @@ msgstr "Destinasjon sone"
 msgid "Disable"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid ""
-"Do not install extra rules to reject forwarded traffic with conntrack state "
-"<em>invalid</em>. This may be required for complex asymmetric route setups."
-msgstr ""
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:151
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
+msgid "Do not rewrite"
+msgstr "Ikke omskriv"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:22
 msgid "Drop invalid packets"
 msgstr "Forkast ugyldige pakker"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:270
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "Aktiver"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:149
 msgid "Enable NAT Loopback"
 msgstr "Aktiver NAT <abbr title=\"Loopback\">Tilbakekobling</abbr>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:20
 msgid "Enable SYN-flood protection"
 msgstr "Aktiver SYN-flood beskyttelse"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:144
 msgid "Enable logging on this zone"
 msgstr "Aktiver logging av denne sonen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:43
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:98
 msgid "External IP address"
 msgstr "Ekstern IP adressse"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:111
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
 msgid "External port"
 msgstr "Ekstern port"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
+msgid "External zone"
+msgstr "Ekstern sone"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:158
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:331
 msgid "Extra arguments"
 msgstr "Ekstra argumenter"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid "Extra destination arguments"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
-msgid "Extra iptables arguments"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid "Extra source arguments"
-msgstr ""
-
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
 msgid "Firewall"
 msgstr "Brannmur"
@@ -253,163 +218,181 @@ msgstr "Brannmur"
 msgid "Firewall - Custom Rules"
 msgstr "Brannmur - Egendefinerte Regler"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:13
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:8
 msgid "Firewall - Port Forwards"
 msgstr "Brannmur - Port Videresending"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:12
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:42
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:9
 msgid "Firewall - Traffic Rules"
 msgstr "Brannmur - Trafikk Regler"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:15
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:11
 msgid "Firewall - Zone Settings"
 msgstr "Brannmur - Sone Innstillinger"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:141
 msgid "Force connection tracking"
 msgstr ""
 "Bruk <abbr title=\\\"connection tracking\\\">forbindelse sporing</abbr>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:76
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:27
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:92
 msgid "Forward"
 msgstr "Videresend"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:116
 msgid "Forward to"
 msgstr "Videresend til"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:343
 msgid "Friday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:106
 msgid "From %s in %s"
 msgstr "Fra %s i %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:88
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:104
 msgid "From %s in %s with source %s"
 msgstr "Fra %s i %s med kilde %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:102
 msgid "From %s in %s with source %s and %s"
 msgstr "Fra %s i %s med kilde %s og %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:117
 msgid "From %s on <var>this device</var>"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:115
 msgid "From %s on <var>this device</var> with source %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:113
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:10
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:56
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:16
 msgid "General Settings"
 msgstr "Generelle Innstillinger"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:51
 msgid "Hardware flow offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:85
 msgid "IPv4"
 msgstr "IPv4"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:185
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:118
 msgid "IPv4 and IPv6"
 msgstr "IPv4 og IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:119
 msgid "IPv4 only"
 msgstr "Kun IPv4"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:87
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:120
 msgid "IPv6 only"
 msgstr "Kun IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:25
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:90
 msgid "Input"
 msgstr "Inndata"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:157
+msgid "Inter-Zone Forwarding"
+msgstr "Sone til Sone Videresending"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:127
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
 msgid "Internal IP address"
 msgstr "Intern IP adresse"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:138
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
 msgid "Internal port"
 msgstr "Intern port"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:121
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
 msgid "Internal zone"
 msgstr "Intern sone"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:150
 msgid "Limit log messages"
 msgstr "Begrens logging"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:102
 msgid "MSS clamping"
 msgstr "MSS Kontroll (Clamping)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:101
 msgid "Masquerading"
 msgstr "Masquerading"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:105
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:162
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:247
 msgid "Match"
 msgstr "Match"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:206
 msgid "Match ICMP type"
 msgstr "Match ICMP type"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:118
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr ""
+"Match videresendt trafikk til den oppgitte destinasjonsport eller "
+"portområdet."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:112
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
@@ -417,38 +400,68 @@ msgstr ""
 "Match innkommende trafikk rettet mot den oppgitte destinasjonsport eller "
 "portområdet på denne verten"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:91
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr ""
+"Match innkommende trafikk som kommer fra den oppgitte kildeport eller "
+"portområdet på klienten."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:339
 msgid "Monday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:346
 msgid "Month Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:50
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:180
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:60
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
 msgid "Name"
 msgstr "Navn"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:169
-msgid "Network"
-msgstr ""
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
+msgid "New SNAT rule"
+msgstr "Ny SNAT regel"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
+msgid "New forward rule"
+msgstr "Ny videresending regel"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
+msgid "New input rule"
+msgstr "Ny inndata regel"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
+msgid "New port forward"
+msgstr "Ny port videresending"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
+msgid "New source NAT"
+msgstr "Ny kilde NAT"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:99
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr "Match kun innkommende trafikk rettet mot den oppgitt IP adresse."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:63
 msgid "Only match incoming traffic from these MACs."
 msgstr "Match kun innkommende trafikk fra disse MAC adresser."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:75
 msgid "Only match incoming traffic from this IP or range."
 msgstr "Match kun innkommende trafikk fra denne IP eller IP område."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:87
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
@@ -456,31 +469,37 @@ msgstr ""
 "Match kun innkommende trafikk som kommer fra den oppgitte kildeport eller "
 "fra portområdet til klienten"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
+msgid "Open ports on router"
+msgstr "Åpne porter på ruteren"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
+msgid "Other..."
+msgstr "Andre..."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:26
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:91
 msgid "Output"
 msgstr "Utdata"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:288
+msgid "Output zone"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:160
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:332
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr "Sender flere argumenter til iptables. Bruk med forsiktighet!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
-msgid ""
-"Passing raw iptables arguments to source and destination traffic "
-"classification rules allows to match packets based on other criteria than "
-"interfaces or subnets. These options should be used with extreme care as "
-"invalid values could render the firewall ruleset broken, completely exposing "
-"all services."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:14
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:17
 msgid "Port Forwards"
 msgstr "Port Videresendinger"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:9
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
@@ -488,44 +507,38 @@ msgstr ""
 "Port videresending tillater at eksterne datamaskiner på Internett kan koble "
 "seg til en bestemt maskin eller tjeneste innenfor det private LAN."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
-msgid ""
-"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
-"connection tracking."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:39
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:190
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:139
 msgid ""
 "Redirect matched incoming traffic to the given port on the internal host"
 msgstr ""
 "Viderekoble matchet innkommende trafikk til den oppgitte porten på intern "
 "vert"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:128
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "Viderekoble matchet innkommende trafikk til den angitte interne vert"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:52
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
@@ -533,20 +546,40 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:132
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "Begrens Masquerading til oppgitt destinasjons subnett"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:123
 msgid "Restrict Masquerading to given source subnets"
 msgstr "Begrens Masqeuerading til oppgitt kilde subnett"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:183
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:115
 msgid "Restrict to address family"
 msgstr "Begrens til adresse familie"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:132
+msgid "Rewrite matched traffic to the given address."
+msgstr "Omskriv matchet trafikk til den oppgitte adressen."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:147
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr ""
+"Omskriv matchet trafikk til den oppgitte kildeport. Kan stå tom for kun "
+"omskriving av IP adressen."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:266
+msgid "Rewrite to source %s"
+msgstr "Omskriv til kilde %s"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:264
+msgid "Rewrite to source %s, %s"
+msgstr "Omskriv til kilde %s, %s"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:42
 msgid "Routing/NAT Offloading"
 msgstr ""
 
@@ -558,62 +591,89 @@ msgstr ""
 msgid "Rule is enabled"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:131
+msgid "SNAT IP address"
+msgstr "SNAT IP adresse"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:146
+msgid "SNAT port"
+msgstr "SNAT port"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:344
 msgid "Saturday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:47
 msgid "Software based offloading for routing/NAT"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:46
 msgid "Software flow offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:79
 msgid "Source IP address"
 msgstr "Kilde IP adresse"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:261
 msgid "Source MAC address"
 msgstr "Kilde MAC adresse"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:194
+msgid "Source NAT"
+msgstr "Kilde NAT"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:195
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+"Kilde NAT er en spesifikk form for masquerading som tillater finkornet "
+"kontroll over kilde IP adressen som brukes for utgående trafikk, for "
+"eksempel for å mappe flere WAN adresser til interne subnett."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:270
 msgid "Source address"
 msgstr "Kilde adresse"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:279
 msgid "Source port"
 msgstr "Kilde port"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:254
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
 msgid "Source zone"
 msgstr "Kilde sone"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:357
 msgid "Start Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
-msgid "Start Time (hh.mm.ss)"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:353
+msgid "Start Time (hh:mm:ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:359
 msgid "Stop Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
-msgid "Stop Time (hh.mm.ss)"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:355
+msgid "Stop Time (hh:mm:ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:338
 msgid "Sunday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:12
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
@@ -621,8 +681,7 @@ msgstr ""
 "Brannmuren skaper soner over nettverkets grensesnitt for å styre "
 "nettverkstrafikken."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:158
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -638,7 +697,24 @@ msgstr ""
 "ved videresending er <em>enveis</em>, d.v.s at videresending fra LAN til WAN "
 "<em>ikke</em> automatisk også tillater videresending fra WAN til LAN."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:14
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr ""
+"Denne siden lar deg endre avanserte egenskaper til port videresending "
+"oppføringer. I de fleste tilfeller er det ikke nødvendig å endre disse "
+"innstillingene."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:13
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr ""
+"Denne siden lar deg endre de avanserte egenskapene til trafikken regel "
+"oppføringer, som for eksempel matchet kilde og destinasjons vert."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:36
 #, fuzzy
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
@@ -654,40 +730,46 @@ 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:349
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:342
 msgid "Thursday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
-msgid "Time Restrictions"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:362
 msgid "Time in UTC"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:141
 msgid "To %s at %s on <var>this device</var>"
 msgstr "Til %s på %s på <var>denne enheten</var>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:132
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:157
 msgid "To %s in %s"
 msgstr "Til %s i %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:143
 msgid "To %s on <var>this device</var>"
 msgstr "Til %s på <var>denne enheten</var>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:130
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:155
 msgid "To %s, %s in %s"
 msgstr "Til %s, %s i %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
+msgid "To source IP"
+msgstr "Til kilde IP"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
+msgid "To source port"
+msgstr "Til kilde port"
+
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:18
 msgid "Traffic Rules"
 msgstr "Trafikk Regler"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:10
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
@@ -697,290 +779,158 @@ 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:347
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:340
 msgid "Tuesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:244
+msgid "Unnamed SNAT"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:67
 msgid "Unnamed forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:76
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
-msgid "Unnamed zone"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid ""
-"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
-"network devices."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid ""
-"Use this option to classify zone traffic by source or destination subnet "
-"instead of networks or devices."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:101
 msgid "Via %s"
 msgstr "Via %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:99
 msgid "Via %s at %s"
 msgstr "Via %s på %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:341
 msgid "Wednesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:335
 msgid "Week Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:55
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr ""
+"Du kan spesifisere flere ved å velge \"-- egendefinert --\" og deretter "
+"skrive flere protokoller atskilt med mellomrom."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:35
+msgid "Zone %q"
+msgstr "Sone %q"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:83
 msgid "Zone ⇒ Forwardings"
 msgstr "Sone = Videresendinger"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:59
 msgid "Zones"
 msgstr "Soner"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:325
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:33
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:98
 msgid "accept"
 msgstr "godta"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:108
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:141
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:263
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:272
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:281
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:306
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:315
 msgid "any"
 msgstr "enhver"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:120
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:100
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:150
 msgid "any host"
 msgstr "enhver vert"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:111
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:138
 msgid "any router IP"
 msgstr "enhver ruter IP"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:119
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:149
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr "enhver sone"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:327
 msgid "don't track"
 msgstr "ikke track"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:324
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:32
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:97
 msgid "drop"
 msgstr "forkast"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:326
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:31
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:96
 msgid "reject"
 msgstr "avslå"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
-msgid "this new zone"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:82
+msgid "traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr ""
-
-#~ msgid "Add"
-#~ msgstr "Legg til"
-
-#~ msgid "Add and edit..."
-#~ msgstr "Legg til og redigere..."
-
-#~ msgid "Do not rewrite"
-#~ msgstr "Ikke omskriv"
-
-#~ msgid "External zone"
-#~ msgstr "Ekstern sone"
-
-#~ msgid "New SNAT rule"
-#~ msgstr "Ny SNAT regel"
-
-#~ msgid "New forward rule"
-#~ msgstr "Ny videresending regel"
-
-#~ msgid "New input rule"
-#~ msgstr "Ny inndata regel"
-
-#~ msgid "New port forward"
-#~ msgstr "Ny port videresending"
-
-#~ msgid "New source NAT"
-#~ msgstr "Ny kilde NAT"
-
-#~ msgid "Open ports on router"
-#~ msgstr "Åpne porter på ruteren"
-
-#~ msgid "Other..."
-#~ msgstr "Andre..."
-
-#~ msgid "To source IP"
-#~ msgstr "Til kilde IP"
-
-#~ msgid "To source port"
-#~ msgstr "Til kilde port"
-
-#~ msgid "(Unnamed Entry)"
-#~ msgstr "(oppføring uten navn)"
-
-#~ msgid "(Unnamed Rule)"
-#~ msgstr "(regel uten navn)"
-
-#~ msgid "(Unnamed SNAT)"
-#~ msgstr "(SNAT uten navn)"
-
-#~ msgid "Destination IP address"
-#~ msgstr "Destinasjon IP adresse"
-
-#~ msgid "Inter-Zone Forwarding"
-#~ msgstr "Sone til Sone Videresending"
-
-#~ msgid "Match forwarded traffic to the given destination port or port range."
-#~ msgstr ""
-#~ "Match videresendt trafikk til den oppgitte destinasjonsport eller "
-#~ "portområdet."
-
-#~ msgid ""
-#~ "Match incoming traffic originating from the given source port or port "
-#~ "range on the client host."
-#~ msgstr ""
-#~ "Match innkommende trafikk som kommer fra den oppgitte kildeport eller "
-#~ "portområdet på klienten."
-
-#~ msgid "Rewrite matched traffic to the given address."
-#~ msgstr "Omskriv matchet trafikk til den oppgitte adressen."
-
-#~ msgid ""
-#~ "Rewrite matched traffic to the given source port. May be left empty to "
-#~ "only rewrite the IP address."
-#~ msgstr ""
-#~ "Omskriv matchet trafikk til den oppgitte kildeport. Kan stå tom for kun "
-#~ "omskriving av IP adressen."
-
-#~ msgid "Rewrite to source %s"
-#~ msgstr "Omskriv til kilde %s"
-
-#~ msgid "Rewrite to source %s, %s"
-#~ msgstr "Omskriv til kilde %s, %s"
-
-#~ msgid "SNAT IP address"
-#~ msgstr "SNAT IP adresse"
-
-#~ msgid "SNAT port"
-#~ msgstr "SNAT port"
-
-#~ msgid "Source NAT"
-#~ msgstr "Kilde NAT"
-
-#~ msgid ""
-#~ "Source NAT is a specific form of masquerading which allows fine grained "
-#~ "control over the source IP used for outgoing traffic, for example to map "
-#~ "multiple WAN addresses to internal subnets."
-#~ msgstr ""
-#~ "Kilde NAT er en spesifikk form for masquerading som tillater finkornet "
-#~ "kontroll over kilde IP adressen som brukes for utgående trafikk, for "
-#~ "eksempel for å mappe flere WAN adresser til interne subnett."
-
-#~ msgid ""
-#~ "This page allows you to change advanced properties of the port forwarding "
-#~ "entry. In most cases there is no need to modify those settings."
-#~ msgstr ""
-#~ "Denne siden lar deg endre avanserte egenskaper til port videresending "
-#~ "oppføringer. I de fleste tilfeller er det ikke nødvendig å endre disse "
-#~ "innstillingene."
-
-#~ msgid ""
-#~ "This page allows you to change advanced properties of the traffic rule "
-#~ "entry, such as matched source and destination hosts."
-#~ msgstr ""
-#~ "Denne siden lar deg endre de avanserte egenskapene til trafikken regel "
-#~ "oppføringer, som for eksempel matchet kilde og destinasjons vert."
-
-#~ msgid ""
-#~ "You may specify multiple by selecting \"-- custom --\" and then entering "
-#~ "protocols separated by space."
-#~ msgstr ""
-#~ "Du kan spesifisere flere ved å velge \"-- egendefinert --\" og deretter "
-#~ "skrive flere protokoller atskilt med mellomrom."
-
-#~ msgid "Zone %q"
-#~ msgstr "Sone %q"
diff --git a/luci-app-firewall/po/pl/firewall.po b/luci-app-firewall/po/pl/firewall.po
index 5c96d57b7..a3c7b1f92 100644
--- a/luci-app-firewall/po/pl/firewall.po
+++ b/luci-app-firewall/po/pl/firewall.po
@@ -14,124 +14,95 @@ msgstr ""
 "|| n%100>=20) ? 1 : 2);\n"
 "X-Generator: Pootle 2.0.6\n"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:127
 msgid "%s in %s"
 msgstr "%s w %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr "%s%s z %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:125
 msgid "%s, %s in %s"
 msgstr "%s, %s w %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:26
+msgid "(Unnamed Entry)"
+msgstr "(Nienazwany wpis)"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:169
+msgid "(Unnamed Rule)"
+msgstr "(Nienazwana reguła)"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:37
+msgid "(Unnamed SNAT)"
+msgstr "(Nienazwany SNAT)"
+
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr "<var>%d</var> pakiet. na <var>%s</var>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr ""
 "<var>%d</var> pakiet. na <var>%s</var>, popsutych <var>%d</var> pakiet."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:180
 msgid "<var>%s</var> and limit to %s"
 msgstr "<var>%s</var> i ograniczone do %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:257
 msgid "Action"
 msgstr "Działanie"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone destination "
-"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
-"traffic."
-msgstr ""
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
+msgid "Add"
+msgstr "Dodaj"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
-"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
-msgstr ""
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
+msgid "Add and edit..."
+msgstr "Dodaj i edytuj..."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:57
 msgid "Advanced Settings"
 msgstr "Ustawienia zaawansowane"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid "Allow \"invalid\" traffic"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:178
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Zezwól na przekazywanie z <em>source zones</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:170
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "Zezwól na przekazywanie do <em>destination zones</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:89
 msgid "Any"
 msgstr "Każdy"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
-msgid "Any day"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid "Automatic helper assignment"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid ""
-"Automatically assign conntrack helpers based on traffic protocol and port"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
-msgid "Conntrack Settings"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Conntrack helpers"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid "Covered devices"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:88
 msgid "Covered networks"
 msgstr "Objęte sieci"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid "Covered subnets"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:22
 msgid "Custom Rules"
 msgstr "Własne reguły"
 
@@ -145,15 +116,23 @@ msgstr ""
 "są objęte składnią zapory. Polecenia wykonywane są po każdym restarcie "
 "zapory, zaraz po załadowaniu zestawu reguł domyślnych."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:108
+msgid "Destination IP address"
+msgstr "Docelowy adres IP"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:304
 msgid "Destination address"
 msgstr "Adres docelowy"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:313
 msgid "Destination port"
 msgstr "Port docelowy"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:102
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:295
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
 msgid "Destination zone"
 msgstr "Strefa docelowa"
 
@@ -161,97 +140,83 @@ msgstr "Strefa docelowa"
 msgid "Disable"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid ""
-"Do not install extra rules to reject forwarded traffic with conntrack state "
-"<em>invalid</em>. This may be required for complex asymmetric route setups."
-msgstr ""
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:151
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
+msgid "Do not rewrite"
+msgstr "Nie przepisuj"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:22
 msgid "Drop invalid packets"
 msgstr "Porzuć wadliwe pakiety"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:270
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "Włącz"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:149
 msgid "Enable NAT Loopback"
 msgstr "Włącz NAT Loopback"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:20
 msgid "Enable SYN-flood protection"
 msgstr "Włącz ochronę przed atakiem SYN-flood"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:144
 msgid "Enable logging on this zone"
 msgstr "Włącz logowanie na tej strefy"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:43
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:98
 msgid "External IP address"
 msgstr "Zewnętrzne adresy IP"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:111
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
 msgid "External port"
 msgstr "Port zewnętrzny"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
+msgid "External zone"
+msgstr "Strefa zewnętrzna"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:158
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:331
 msgid "Extra arguments"
 msgstr "Dodatkowe argumenty"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid "Extra destination arguments"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
-msgid "Extra iptables arguments"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid "Extra source arguments"
-msgstr ""
-
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 # Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/zones.lua      #
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
@@ -263,162 +228,179 @@ msgstr "Zapora"
 msgid "Firewall - Custom Rules"
 msgstr "Zapora - Reguły własne"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:13
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:8
 msgid "Firewall - Port Forwards"
 msgstr "Zapora - Przekazywanie portów"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:12
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:42
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:9
 msgid "Firewall - Traffic Rules"
 msgstr "Zapora - Reguły ruchu"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:15
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:11
 msgid "Firewall - Zone Settings"
 msgstr "Zapora - Ustawienia strefy"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:141
 msgid "Force connection tracking"
 msgstr "Wymuś śledzenie połączeń"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:76
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:27
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:92
 msgid "Forward"
 msgstr "Przekazuj"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:116
 msgid "Forward to"
 msgstr "Przekazuj do"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:343
 msgid "Friday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:106
 msgid "From %s in %s"
 msgstr "Z %s w %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:88
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:104
 msgid "From %s in %s with source %s"
 msgstr "Z %s w %s ze źródłem %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:102
 msgid "From %s in %s with source %s and %s"
 msgstr "Z %s w %s ze źródłem %s i %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:117
 msgid "From %s on <var>this device</var>"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:115
 msgid "From %s on <var>this device</var> with source %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:113
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:10
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:56
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:16
 msgid "General Settings"
 msgstr "Ustawienia ogólne"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:51
 msgid "Hardware flow offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:85
 msgid "IPv4"
 msgstr "IPv4"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:185
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:118
 msgid "IPv4 and IPv6"
 msgstr "IPv4 i IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:119
 msgid "IPv4 only"
 msgstr "Tylko IPv4"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:87
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:120
 msgid "IPv6 only"
 msgstr "Tylko IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:25
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:90
 msgid "Input"
 msgstr "Ruch przychodzący"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:157
+msgid "Inter-Zone Forwarding"
+msgstr "Przekazywanie pomiędzy strefami"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:127
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
 msgid "Internal IP address"
 msgstr "Wewnętrzny adres IP"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:138
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
 msgid "Internal port"
 msgstr "Wewnętrzny port"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:121
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
 msgid "Internal zone"
 msgstr "Strefa wewnętrzna"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:150
 msgid "Limit log messages"
 msgstr "Ograniczenie logowania"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:102
 msgid "MSS clamping"
 msgstr "Dostosuj MSS"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:101
 msgid "Masquerading"
 msgstr "Maskarada"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:105
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:162
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:247
 msgid "Match"
 msgstr "Dopasuj"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:206
 msgid "Match ICMP type"
 msgstr "Dopasuj typ ICMP"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:118
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr ""
+"Dopasuj przekazywany ruch do danego docelowego portu lub zakresu portów"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:112
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
@@ -426,38 +408,68 @@ msgstr ""
 "Dopasuj ruch przychodzący do danego portu docelowego lub zakresu portów na "
 "tym hoście"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:91
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr ""
+"Dopasuj przychodzący ruch pochodzący z danego portu źródłowego lub zakresu "
+"portów na hoście klienta."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:339
 msgid "Monday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:346
 msgid "Month Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:50
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:180
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:60
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
 msgid "Name"
 msgstr "Nazwa"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:169
-msgid "Network"
-msgstr ""
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
+msgid "New SNAT rule"
+msgstr "Nowa reguła SNAT"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
+msgid "New forward rule"
+msgstr "Nowa reguła przekazywania (forward)"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
+msgid "New input rule"
+msgstr "Nowa reguła wejściowa (input)"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
+msgid "New port forward"
+msgstr "Nowe przekierowanie portu"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
+msgid "New source NAT"
+msgstr "Nowy NAT źródłowy"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:99
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr "Dopasuj tylko przychodzący ruch skierowany do danego adresu IP."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:63
 msgid "Only match incoming traffic from these MACs."
 msgstr "Dopasuj tylko ruch z tych adresów MAC."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:75
 msgid "Only match incoming traffic from this IP or range."
 msgstr "Dopasuj tylko ruch przychodzący z tego adresu IP lub zakresu adresów."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:87
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
@@ -465,32 +477,38 @@ msgstr ""
 "Dopasuj tylko ruch przychodzący z podanego portu źródłowego lub zakresu "
 "portów na hoście klienta"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
+msgid "Open ports on router"
+msgstr "Otwarte porty na routerze"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
+msgid "Other..."
+msgstr "Inne..."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:26
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:91
 msgid "Output"
 msgstr "Wyjście (Output)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:288
+msgid "Output zone"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:160
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:332
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 "Przekazuje dodatkowe argumenty do iptables. Zachowaj szczególną ostrożność!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
-msgid ""
-"Passing raw iptables arguments to source and destination traffic "
-"classification rules allows to match packets based on other criteria than "
-"interfaces or subnets. These options should be used with extreme care as "
-"invalid values could render the firewall ruleset broken, completely exposing "
-"all services."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:14
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:17
 msgid "Port Forwards"
 msgstr "Przekierowania portów"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:9
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
@@ -498,44 +516,38 @@ msgstr ""
 "Przekierowanie portów pozwala komputerom z internetu na połączenia z "
 "komputerami z sieci LAN."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
-msgid ""
-"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
-"connection tracking."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:39
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:190
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
 msgid "Protocol"
 msgstr "Protokół"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:139
 msgid ""
 "Redirect matched incoming traffic to the given port on the internal host"
 msgstr ""
 "Przekieruj ruch przychodzący na podany port do wskazanego hosta w sieci "
 "wewnętrznej"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:128
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "Przekieruj ruch przychodzący do wskazanego hosta w sieci wewnętrznej"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:52
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
@@ -543,22 +555,44 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:132
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "Ogranicz maskaradę do wskazanych sieci docelowych"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:123
 msgid "Restrict Masquerading to given source subnets"
 msgstr "Ogranicz maskaradę do wskazanych sieci źródłowych"
 
 # Wstawiłem rodzinę gdyż gdzieś wcześniej było tak opisane ale klasa pasuje mi tu bardziej.
 # Obsy - niestety ale "rodzina". W gui dotyczy to wyboru IPv4/IPv6, więc "rodzina" a nie klasa.
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:183
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:115
 msgid "Restrict to address family"
 msgstr "Ogranicz do rodziny adresów"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
+# Dosłownie przetłumaczone, nie bardzo wiem czy chodzi o czynność przepisywania pakietu przez usługę czy to jakieś ogólne sformułowanie...
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:132
+msgid "Rewrite matched traffic to the given address."
+msgstr "Przepisz dopasowany ruch do wskazanych adresów."
+
+# Jak wyżej chodzi o przepisanie pakietu przez usługę?
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:147
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr ""
+"Przepisz dopasowany ruch do danego portu źródłowego. Można zostawić puste "
+"aby przepisać tylko adres IP"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:266
+msgid "Rewrite to source %s"
+msgstr "Przepisz do źródła %s"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:264
+msgid "Rewrite to source %s, %s"
+msgstr "Przepisz do źródła %s, %s"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:42
 msgid "Routing/NAT Offloading"
 msgstr ""
 
@@ -570,62 +604,91 @@ msgstr ""
 msgid "Rule is enabled"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:131
+msgid "SNAT IP address"
+msgstr "Adres IP SNAT"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:146
+msgid "SNAT port"
+msgstr "Port SNAT"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:344
 msgid "Saturday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:47
 msgid "Software based offloading for routing/NAT"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:46
 msgid "Software flow offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:79
 msgid "Source IP address"
 msgstr "Źródłowy adres IP"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:261
 msgid "Source MAC address"
 msgstr "Źródłowy adres MAC"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:194
+msgid "Source NAT"
+msgstr "NAT źródłowy"
+
+# http://www.digipedia.pl/def/doc/id/677604507/name/SNAT/
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:195
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+"SNAT używany jest wtedy, gdy zmieniane są adresy pakietów połączenia "
+"wychodzącego, czyli pakiety źródłowe. Wykonywany jest zawsze po routowaniu "
+"(POSTROUTING), a więc w chwili, gdy pakiety są gotowe opuścić host. "
+"IPmasquerading jest formą SNAT."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:270
 msgid "Source address"
 msgstr "Adres źródłowy"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:279
 msgid "Source port"
 msgstr "Port źródłowy"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:254
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
 msgid "Source zone"
 msgstr "Strefa źródłowa"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:357
 msgid "Start Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
-msgid "Start Time (hh.mm.ss)"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:353
+msgid "Start Time (hh:mm:ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:359
 msgid "Stop Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
-msgid "Stop Time (hh.mm.ss)"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:355
+msgid "Stop Time (hh:mm:ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:338
 msgid "Sunday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:12
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
@@ -633,8 +696,7 @@ msgstr ""
 "Firewall tworzy strefy z Twoich interfejsów sieciowych, aby kontrolować ruch "
 "sieciowy."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:158
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -650,7 +712,23 @@ msgstr ""
 "przekazywania jest <em>jednokierunkowa</em>, np. przekazywanie z sieci LAN "
 "do WAN <em>nie</em> implikuje pozwolenia na przekazywanie z sieci WAN do LAN."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:14
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr ""
+"Ta strona pozwala zmienić zaawansowane ustawienia przekierowania portów. W "
+"większości przypadków nie ma potrzeby zmieniać tych ustawień."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:13
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr ""
+"Ta strona pozwala zmienić zaawansowane ustawienia reguły ruchu sieciowego, "
+"takie jak pasujące źródło i hosty docelowe."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:36
 #, fuzzy
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
@@ -665,40 +743,46 @@ 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:349
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:342
 msgid "Thursday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
-msgid "Time Restrictions"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:362
 msgid "Time in UTC"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:141
 msgid "To %s at %s on <var>this device</var>"
 msgstr "Do %s w %s na <var>tym urządzeniu</var>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:132
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:157
 msgid "To %s in %s"
 msgstr "Do %s w %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:143
 msgid "To %s on <var>this device</var>"
 msgstr "Do %s na <var>tym urządzeniu</var>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:130
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:155
 msgid "To %s, %s in %s"
 msgstr "Do %s, %s w %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
+msgid "To source IP"
+msgstr "Do źródłowego IP"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
+msgid "To source port"
+msgstr "Do źródłowego portu"
+
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:18
 msgid "Traffic Rules"
 msgstr "Reguły ruchu sieciowego"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:10
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
@@ -708,292 +792,158 @@ 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:347
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:340
 msgid "Tuesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:244
+msgid "Unnamed SNAT"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:67
 msgid "Unnamed forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:76
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
-msgid "Unnamed zone"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid ""
-"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
-"network devices."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid ""
-"Use this option to classify zone traffic by source or destination subnet "
-"instead of networks or devices."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:101
 msgid "Via %s"
 msgstr "Przez %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:99
 msgid "Via %s at %s"
 msgstr "Przez %s w %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:341
 msgid "Wednesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:335
 msgid "Week Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:55
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr ""
+"Możesz określić kilka wybierając \"-- własne --\" i wpisując protokoły "
+"rozdzielone spacją."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:35
+msgid "Zone %q"
+msgstr "Strefa %q"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:83
 msgid "Zone ⇒ Forwardings"
 msgstr "Strefa ⇒ Przekazywanie"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:59
 msgid "Zones"
 msgstr "Strefy"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:325
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:33
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:98
 msgid "accept"
 msgstr "akceptuj"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:108
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:141
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:263
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:272
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:281
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:306
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:315
 msgid "any"
 msgstr "dowolny"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:120
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:100
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:150
 msgid "any host"
 msgstr "dowolny host"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:111
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:138
 msgid "any router IP"
 msgstr "dowolne IP routera"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:119
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:149
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr "dowolna strefa"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:327
 msgid "don't track"
 msgstr "nie śledź"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:324
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:32
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:97
 msgid "drop"
 msgstr "porzucaj"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:326
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:31
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:96
 msgid "reject"
 msgstr "odrzucaj"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
-msgid "this new zone"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:82
+msgid "traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr ""
-
-#~ msgid "Add"
-#~ msgstr "Dodaj"
-
-#~ msgid "Add and edit..."
-#~ msgstr "Dodaj i edytuj..."
-
-#~ msgid "Do not rewrite"
-#~ msgstr "Nie przepisuj"
-
-#~ msgid "External zone"
-#~ msgstr "Strefa zewnętrzna"
-
-#~ msgid "New SNAT rule"
-#~ msgstr "Nowa reguła SNAT"
-
-#~ msgid "New forward rule"
-#~ msgstr "Nowa reguła przekazywania (forward)"
-
-#~ msgid "New input rule"
-#~ msgstr "Nowa reguła wejściowa (input)"
-
-#~ msgid "New port forward"
-#~ msgstr "Nowe przekierowanie portu"
-
-#~ msgid "New source NAT"
-#~ msgstr "Nowy NAT źródłowy"
-
-#~ msgid "Open ports on router"
-#~ msgstr "Otwarte porty na routerze"
-
-#~ msgid "Other..."
-#~ msgstr "Inne..."
-
-#~ msgid "To source IP"
-#~ msgstr "Do źródłowego IP"
-
-#~ msgid "To source port"
-#~ msgstr "Do źródłowego portu"
-
-#~ msgid "(Unnamed Entry)"
-#~ msgstr "(Nienazwany wpis)"
-
-#~ msgid "(Unnamed Rule)"
-#~ msgstr "(Nienazwana reguła)"
-
-#~ msgid "(Unnamed SNAT)"
-#~ msgstr "(Nienazwany SNAT)"
-
-#~ msgid "Destination IP address"
-#~ msgstr "Docelowy adres IP"
-
-#~ msgid "Inter-Zone Forwarding"
-#~ msgstr "Przekazywanie pomiędzy strefami"
-
-#~ msgid "Match forwarded traffic to the given destination port or port range."
-#~ msgstr ""
-#~ "Dopasuj przekazywany ruch do danego docelowego portu lub zakresu portów"
-
-#~ msgid ""
-#~ "Match incoming traffic originating from the given source port or port "
-#~ "range on the client host."
-#~ msgstr ""
-#~ "Dopasuj przychodzący ruch pochodzący z danego portu źródłowego lub "
-#~ "zakresu portów na hoście klienta."
-
-# Dosłownie przetłumaczone, nie bardzo wiem czy chodzi o czynność przepisywania pakietu przez usługę czy to jakieś ogólne sformułowanie...
-#~ msgid "Rewrite matched traffic to the given address."
-#~ msgstr "Przepisz dopasowany ruch do wskazanych adresów."
-
-# Jak wyżej chodzi o przepisanie pakietu przez usługę?
-#~ msgid ""
-#~ "Rewrite matched traffic to the given source port. May be left empty to "
-#~ "only rewrite the IP address."
-#~ msgstr ""
-#~ "Przepisz dopasowany ruch do danego portu źródłowego. Można zostawić puste "
-#~ "aby przepisać tylko adres IP"
-
-#~ msgid "Rewrite to source %s"
-#~ msgstr "Przepisz do źródła %s"
-
-#~ msgid "Rewrite to source %s, %s"
-#~ msgstr "Przepisz do źródła %s, %s"
-
-#~ msgid "SNAT IP address"
-#~ msgstr "Adres IP SNAT"
-
-#~ msgid "SNAT port"
-#~ msgstr "Port SNAT"
-
-#~ msgid "Source NAT"
-#~ msgstr "NAT źródłowy"
-
-# http://www.digipedia.pl/def/doc/id/677604507/name/SNAT/
-#~ msgid ""
-#~ "Source NAT is a specific form of masquerading which allows fine grained "
-#~ "control over the source IP used for outgoing traffic, for example to map "
-#~ "multiple WAN addresses to internal subnets."
-#~ msgstr ""
-#~ "SNAT używany jest wtedy, gdy zmieniane są adresy pakietów połączenia "
-#~ "wychodzącego, czyli pakiety źródłowe. Wykonywany jest zawsze po "
-#~ "routowaniu (POSTROUTING), a więc w chwili, gdy pakiety są gotowe opuścić "
-#~ "host. IPmasquerading jest formą SNAT."
-
-#~ msgid ""
-#~ "This page allows you to change advanced properties of the port forwarding "
-#~ "entry. In most cases there is no need to modify those settings."
-#~ msgstr ""
-#~ "Ta strona pozwala zmienić zaawansowane ustawienia przekierowania portów. "
-#~ "W większości przypadków nie ma potrzeby zmieniać tych ustawień."
-
-#~ msgid ""
-#~ "This page allows you to change advanced properties of the traffic rule "
-#~ "entry, such as matched source and destination hosts."
-#~ msgstr ""
-#~ "Ta strona pozwala zmienić zaawansowane ustawienia reguły ruchu "
-#~ "sieciowego, takie jak pasujące źródło i hosty docelowe."
-
-#~ msgid ""
-#~ "You may specify multiple by selecting \"-- custom --\" and then entering "
-#~ "protocols separated by space."
-#~ msgstr ""
-#~ "Możesz określić kilka wybierając \"-- własne --\" i wpisując protokoły "
-#~ "rozdzielone spacją."
-
-#~ msgid "Zone %q"
-#~ msgstr "Strefa %q"
diff --git a/luci-app-firewall/po/pt-br/firewall.po b/luci-app-firewall/po/pt-br/firewall.po
index 692640254..e6be5d083 100644
--- a/luci-app-firewall/po/pt-br/firewall.po
+++ b/luci-app-firewall/po/pt-br/firewall.po
@@ -13,123 +13,94 @@ msgstr ""
 "X-Generator: Poedit 2.1.1\n"
 "Language-Team: \n"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:127
 msgid "%s in %s"
 msgstr "%s in %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr "%s%s com %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:125
 msgid "%s, %s in %s"
 msgstr "%s, %s em %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:26
+msgid "(Unnamed Entry)"
+msgstr "(Entrada Sem Nome)"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:169
+msgid "(Unnamed Rule)"
+msgstr "(Regra Sem Nome)"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:37
+msgid "(Unnamed SNAT)"
+msgstr "(SNAT Sem Nome)"
+
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr "<var>%d</var> pcts. por <var>%s</var>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr "<var>%d</var> pcts. por <var>%s</var>, pico <var>%d</var> pcts."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:180
 msgid "<var>%s</var> and limit to %s"
 msgstr "<var>%s</var> e limite a %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr "Aceitar o encaminhamento"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr "Aceitar a entrada"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr "Aceitar a saída"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:257
 msgid "Action"
 msgstr "Ação"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone destination "
-"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
-"traffic."
-msgstr ""
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
+msgid "Add"
+msgstr "Adicionar"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
-"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
-msgstr ""
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
+msgid "Add and edit..."
+msgstr "Adicionar e editar..."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:57
 msgid "Advanced Settings"
 msgstr "Configurações Avançadas"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid "Allow \"invalid\" traffic"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:178
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Permite o encaminhamento da <em>zona de origem</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:170
 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:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:89
 msgid "Any"
 msgstr "Qualquer"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
-msgid "Any day"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid "Automatic helper assignment"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid ""
-"Automatically assign conntrack helpers based on traffic protocol and port"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
-msgid "Conntrack Settings"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Conntrack helpers"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid "Covered devices"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:88
 msgid "Covered networks"
 msgstr "Redes cobertas"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid "Covered subnets"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:22
 msgid "Custom Rules"
 msgstr "Regras Personalizadas"
 
@@ -143,15 +114,23 @@ msgstr ""
 "cobertos por esta ferramenta. Os comandos serão executados após cada "
 "reinício do firewall, logo após a carga do conjunto de regras padrão."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:108
+msgid "Destination IP address"
+msgstr "Endereço IP de destino"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:304
 msgid "Destination address"
 msgstr "Endereço de destino"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:313
 msgid "Destination port"
 msgstr "Porta de destino"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:102
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:295
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
 msgid "Destination zone"
 msgstr "Zona de destino"
 
@@ -159,98 +138,84 @@ msgstr "Zona de destino"
 msgid "Disable"
 msgstr "Desabilitar"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr "Descartar o encaminhamento"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr "Descartar a entrada"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr "Descartar a saída"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid ""
-"Do not install extra rules to reject forwarded traffic with conntrack state "
-"<em>invalid</em>. This may be required for complex asymmetric route setups."
-msgstr ""
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:151
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
+msgid "Do not rewrite"
+msgstr "Não sobrescreva"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr "Não rastrear o encaminhamento"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr "Não rastrear a entrada"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr "Não rastrear a saída"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:22
 msgid "Drop invalid packets"
 msgstr "Descartar pacotes inválidos"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:270
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "Habilitar"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:149
 msgid "Enable NAT Loopback"
 msgstr "Habilite o Loopback do NAT"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:20
 msgid "Enable SYN-flood protection"
 msgstr "Habilite proteção contra SYN-flood"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:144
 msgid "Enable logging on this zone"
 msgstr "Habilite o registro nesta zona"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:43
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 "Funcionalidade experimental. Ela não é totalmente compatível com QoS/SQM."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:98
 msgid "External IP address"
 msgstr "Endereço IP externo"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:111
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
 msgid "External port"
 msgstr "Porta Externa"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
+msgid "External zone"
+msgstr "Zona externa"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:158
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:331
 msgid "Extra arguments"
 msgstr "Argumentos extras"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid "Extra destination arguments"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
-msgid "Extra iptables arguments"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid "Extra source arguments"
-msgstr ""
-
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
 msgid "Firewall"
 msgstr "Firewall"
@@ -259,162 +224,180 @@ msgstr "Firewall"
 msgid "Firewall - Custom Rules"
 msgstr "Firewall - Regras personalizadas"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:13
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:8
 msgid "Firewall - Port Forwards"
 msgstr "Firewall - Encaminhamento de Portas"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:12
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:42
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:9
 msgid "Firewall - Traffic Rules"
 msgstr "Firewall - Regras de Tráfego"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:15
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:11
 msgid "Firewall - Zone Settings"
 msgstr "Firewall - Configurações de Zona"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:141
 msgid "Force connection tracking"
 msgstr "Force o rastreamento da conexão"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:76
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:27
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:92
 msgid "Forward"
 msgstr "Encaminhar"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:116
 msgid "Forward to"
 msgstr "Encaminhar para"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:343
 msgid "Friday"
 msgstr "Sexta-feira"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:106
 msgid "From %s in %s"
 msgstr "Vindo de %s em %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:88
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:104
 msgid "From %s in %s with source %s"
 msgstr "Vindo de %s em %s com origem %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:102
 msgid "From %s in %s with source %s and %s"
 msgstr "Vindo de %s em %s com origem %s e %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:117
 msgid "From %s on <var>this device</var>"
 msgstr "De %s <var>neste dispositivo</var>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:115
 msgid "From %s on <var>this device</var> with source %s"
 msgstr "De %s <var>neste dispositivo</var> com origem %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:113
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr "De %s <var>neste dispositivo</var> com origem %s e %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:10
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:56
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:16
 msgid "General Settings"
 msgstr "Configurações Gerais"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:51
 msgid "Hardware flow offloading"
 msgstr "Aceleração de fluxo de dados via Hardware"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr "IP"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr "Faixa IP"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr "IPs"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:85
 msgid "IPv4"
 msgstr "IPv4"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:185
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:118
 msgid "IPv4 and IPv6"
 msgstr "IPv4 e IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:119
 msgid "IPv4 only"
 msgstr "Somente IPv4"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:87
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:120
 msgid "IPv6 only"
 msgstr "Somente IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:25
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:90
 msgid "Input"
 msgstr "Entrada"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:157
+msgid "Inter-Zone Forwarding"
+msgstr "Encaminhamento entre Zonas"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:127
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
 msgid "Internal IP address"
 msgstr "Endereço IP interno"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:138
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
 msgid "Internal port"
 msgstr "Porta Interna"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:121
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
 msgid "Internal zone"
 msgstr "Zona interna"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:150
 msgid "Limit log messages"
 msgstr "Limita as mensagens de registro"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr "MAC"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr "MACs"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:102
 msgid "MSS clamping"
 msgstr "Ajuste do MSS"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:101
 msgid "Masquerading"
 msgstr "Mascaramento"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:105
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:162
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:247
 msgid "Match"
 msgstr "Casa"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:206
 msgid "Match ICMP type"
 msgstr "Casa com ICMP tipo"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:118
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr ""
+"Casa o tráfego encaminhado para uma porta ou faixa de portas de destino "
+"específica."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:112
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
@@ -422,39 +405,69 @@ msgstr ""
 "Casa o tráfego entrante direcionado para uma porta ou faixa de portas de "
 "destino específica neste computador"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:91
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr ""
+"Casa o tráfego entrante originado de uma porta ou faixa de portas no "
+"equipamento cliente."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:339
 msgid "Monday"
 msgstr "Segunda-Feira"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:346
 msgid "Month Days"
 msgstr "Dias do mês"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:50
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:180
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:60
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
 msgid "Name"
 msgstr "Nome"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:169
-msgid "Network"
-msgstr ""
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
+msgid "New SNAT rule"
+msgstr "Nova regra de SNAT"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
+msgid "New forward rule"
+msgstr "Nova regra de encaminhamento"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
+msgid "New input rule"
+msgstr "Nova regra de entrada"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
+msgid "New port forward"
+msgstr "Novo encaminhamento de porta"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
+msgid "New source NAT"
+msgstr "Nova origem NAT"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:99
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
 "Somente case o tráfego entrante direcionado para o endereço IP fornecido."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:63
 msgid "Only match incoming traffic from these MACs."
 msgstr "Somente case o tráfego entrante destes endereços MAC."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:75
 msgid "Only match incoming traffic from this IP or range."
 msgstr "Somente case o tráfego entrante desta faixa de endereços IP."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:87
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
@@ -462,31 +475,37 @@ msgstr ""
 "Somente case o tráfego entrante vindo da porta de origem fornecida ou "
 "intervalo de portas no equipamento cliente"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
+msgid "Open ports on router"
+msgstr "Abrir portas no roteador"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
+msgid "Other..."
+msgstr "Outro..."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:26
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:91
 msgid "Output"
 msgstr "Saída"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:288
+msgid "Output zone"
+msgstr "Zona de saída"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:160
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:332
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr "Passa argumentos adicionais para o iptables. Use com cuidado!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
-msgid ""
-"Passing raw iptables arguments to source and destination traffic "
-"classification rules allows to match packets based on other criteria than "
-"interfaces or subnets. These options should be used with extreme care as "
-"invalid values could render the firewall ruleset broken, completely exposing "
-"all services."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:14
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:17
 msgid "Port Forwards"
 msgstr "Encaminhamentos de Porta"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:9
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
@@ -494,43 +513,37 @@ msgstr ""
 "O encaminhamento de portas permite que computadores remotos na Internet "
 "conectem a um computador ou serviço específico dentro da rede local privada."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
-msgid ""
-"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
-"connection tracking."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:39
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:190
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:139
 msgid ""
 "Redirect matched incoming traffic to the given port on the internal host"
 msgstr ""
 "Redireciona tráfego entrante para a porta especificada no computador interno"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:128
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "Redireciona tráfego entrante para o computador interno especificado"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr "Recusar encaminhamento"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr "Recusar entrada"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr "Recusar saída"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:52
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr "Requer suporte de NAT em hardware. Implementado ao menos para mt7621"
 
@@ -538,20 +551,40 @@ msgstr "Requer suporte de NAT em hardware. Implementado ao menos para mt7621"
 msgid "Restart Firewall"
 msgstr "Reiniciar o Firewall"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:132
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "Restringe o mascaramento para uma subrede de destino específica"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:123
 msgid "Restrict Masquerading to given source subnets"
 msgstr "Restringe o mascaramento para uma subrede de origem específica"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:183
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:115
 msgid "Restrict to address family"
 msgstr "Restringe para uma família de endereços"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:132
+msgid "Rewrite matched traffic to the given address."
+msgstr "Reescreva o tráfego correspondente para o endereço fornecido."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:147
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr ""
+"Reescreva o tráfego correspondente para a porta de origem fornecida. Pode "
+"ficar em branco para somente reescrever o endereço IP."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:266
+msgid "Rewrite to source %s"
+msgstr "Reescrever para a origem %s"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:264
+msgid "Rewrite to source %s, %s"
+msgstr "Reescrever para a origem %s, %s"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:42
 msgid "Routing/NAT Offloading"
 msgstr "Aceleração de Roteamento/NAT"
 
@@ -563,62 +596,89 @@ msgstr "A regra está desabilitada"
 msgid "Rule is enabled"
 msgstr "A regra está habilitada"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:131
+msgid "SNAT IP address"
+msgstr "Endereço IP da SNAT"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:146
+msgid "SNAT port"
+msgstr "Porta da SNAT"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:344
 msgid "Saturday"
 msgstr "Sábado"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:47
 msgid "Software based offloading for routing/NAT"
 msgstr "Aceleração de roteamento/NAT baseada em Software"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:46
 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:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:79
 msgid "Source IP address"
 msgstr "Endereço IP de origem"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:261
 msgid "Source MAC address"
 msgstr "Endereço MAC de origem"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:194
+msgid "Source NAT"
+msgstr "NAT origem"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:195
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+"NAT origem é uma forma específica de mascaramento que permite o controle "
+"fino do endereço IP de origem usado no tráfego sainte. Por exemplo, para "
+"mapear múltiplos endereços WAN para subredes internas."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:270
 msgid "Source address"
 msgstr "Endereço de origem"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:279
 msgid "Source port"
 msgstr "Porta de origem"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:254
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
 msgid "Source zone"
 msgstr "Zona de origem"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:357
 msgid "Start Date (yyyy-mm-dd)"
 msgstr "Dia inicial (aaaa-mm-dd)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
-msgid "Start Time (hh.mm.ss)"
-msgstr ""
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:353
+msgid "Start Time (hh:mm:ss)"
+msgstr "Hora inicial (hh:mm:ss)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:359
 msgid "Stop Date (yyyy-mm-dd)"
 msgstr "Dia final (aaaa-mm-dd)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
-msgid "Stop Time (hh.mm.ss)"
-msgstr ""
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:355
+msgid "Stop Time (hh:mm:ss)"
+msgstr "Hora final (hh:mm:ss)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:338
 msgid "Sunday"
 msgstr "Domingo"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:12
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
@@ -626,8 +686,7 @@ msgstr ""
 "O firewall cria zonas sobre as interfaces de rede para controlar o fluxo do "
 "tráfego de rede."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:158
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -643,7 +702,24 @@ msgstr ""
 "encaminhamento é <em>unidirecional</em>, ex: um encaminhamento da LAN para "
 "WAN <em>não</em> implica na permissão de encaminhar da WAN para LAN."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:14
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr ""
+"Esta página permite que você mude propriedades avançadas da entrada do "
+"encaminhamento de porta. Na maioria dos casos, não é necessário modificar "
+"estas configurações."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:13
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr ""
+"Esta página permite que você mude propriedades avançadas da entrada da regra "
+"de tráfego, como os equipamentos de origem e destino."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:36
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -658,40 +734,46 @@ 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:349
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:342
 msgid "Thursday"
 msgstr "Quita-feira"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
-msgid "Time Restrictions"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:362
 msgid "Time in UTC"
 msgstr "Hora em UTC"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:141
 msgid "To %s at %s on <var>this device</var>"
 msgstr "Para %s em %s <var>neste dispositivo</var>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:132
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:157
 msgid "To %s in %s"
 msgstr "Para %s em %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:143
 msgid "To %s on <var>this device</var>"
 msgstr "Para %s <var>neste dispositivo</var>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:130
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:155
 msgid "To %s, %s in %s"
 msgstr "Para %s, %s em %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
+msgid "To source IP"
+msgstr "Para o endereço IP de origem"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
+msgid "To source port"
+msgstr "Para a porta de origem"
+
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:18
 msgid "Traffic Rules"
 msgstr "Regras de tráfego"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:10
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
@@ -701,306 +783,159 @@ 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:347
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:340
 msgid "Tuesday"
 msgstr "Terça-feira"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:244
+msgid "Unnamed SNAT"
+msgstr "SNAT sem nome"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:67
 msgid "Unnamed forward"
 msgstr "Encaminhamento sem nome"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:76
 msgid "Unnamed rule"
 msgstr "Regra sem nome"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
-msgid "Unnamed zone"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid ""
-"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
-"network devices."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid ""
-"Use this option to classify zone traffic by source or destination subnet "
-"instead of networks or devices."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:101
 msgid "Via %s"
 msgstr "Via %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:99
 msgid "Via %s at %s"
 msgstr "Via %s at %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:341
 msgid "Wednesday"
 msgstr "Quarta-feira"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:335
 msgid "Week Days"
 msgstr "Dias da semana"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:55
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr ""
+"Você pode especificar múltiplas entradas selecionando \"-- personalizado --"
+"\" e então entrando os protocolos separados por espaço."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:35
+msgid "Zone %q"
+msgstr "Zona %q"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:83
 msgid "Zone ⇒ Forwardings"
 msgstr "Zona ⇒ Encaminhamentos"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:59
 msgid "Zones"
 msgstr "Zonas"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:325
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:33
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:98
 msgid "accept"
 msgstr "aceitar"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:108
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:141
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:263
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:272
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:281
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:306
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:315
 msgid "any"
 msgstr "qualquer"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:120
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:100
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:150
 msgid "any host"
 msgstr "qualquer equipamento"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:111
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:138
 msgid "any router IP"
 msgstr "qualquer endereço IP do roteador"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:119
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:149
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr "qualquer zona"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr "dia"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:327
 msgid "don't track"
 msgstr "não rastrear"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:324
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:32
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:97
 msgid "drop"
 msgstr "descartar"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr "hora"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr "minuto"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr "não"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr "porta"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr "portas"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:326
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:31
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:96
 msgid "reject"
 msgstr "rejeitar"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr "segundo"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
-msgid "this new zone"
-msgstr ""
+# 20140621: edersg: tradução
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:82
+msgid "traffic"
+msgstr "tráfego"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr "tipo"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr "tipos"
-
-#~ msgid "Add"
-#~ msgstr "Adicionar"
-
-#~ msgid "Add and edit..."
-#~ msgstr "Adicionar e editar..."
-
-#~ msgid "Do not rewrite"
-#~ msgstr "Não sobrescreva"
-
-#~ msgid "External zone"
-#~ msgstr "Zona externa"
-
-#~ msgid "New SNAT rule"
-#~ msgstr "Nova regra de SNAT"
-
-#~ msgid "New forward rule"
-#~ msgstr "Nova regra de encaminhamento"
-
-#~ msgid "New input rule"
-#~ msgstr "Nova regra de entrada"
-
-#~ msgid "New port forward"
-#~ msgstr "Novo encaminhamento de porta"
-
-#~ msgid "New source NAT"
-#~ msgstr "Nova origem NAT"
-
-#~ msgid "Open ports on router"
-#~ msgstr "Abrir portas no roteador"
-
-#~ msgid "Other..."
-#~ msgstr "Outro..."
-
-#~ msgid "To source IP"
-#~ msgstr "Para o endereço IP de origem"
-
-#~ msgid "To source port"
-#~ msgstr "Para a porta de origem"
-
-#~ msgid "Output zone"
-#~ msgstr "Zona de saída"
-
-#~ msgid "(Unnamed Entry)"
-#~ msgstr "(Entrada Sem Nome)"
-
-#~ msgid "(Unnamed Rule)"
-#~ msgstr "(Regra Sem Nome)"
-
-#~ msgid "(Unnamed SNAT)"
-#~ msgstr "(SNAT Sem Nome)"
-
-#~ msgid "Destination IP address"
-#~ msgstr "Endereço IP de destino"
-
-#~ msgid "Inter-Zone Forwarding"
-#~ msgstr "Encaminhamento entre Zonas"
-
-#~ msgid "Match forwarded traffic to the given destination port or port range."
-#~ msgstr ""
-#~ "Casa o tráfego encaminhado para uma porta ou faixa de portas de destino "
-#~ "específica."
-
-#~ msgid ""
-#~ "Match incoming traffic originating from the given source port or port "
-#~ "range on the client host."
-#~ msgstr ""
-#~ "Casa o tráfego entrante originado de uma porta ou faixa de portas no "
-#~ "equipamento cliente."
-
-#~ msgid "Rewrite matched traffic to the given address."
-#~ msgstr "Reescreva o tráfego correspondente para o endereço fornecido."
-
-#~ msgid ""
-#~ "Rewrite matched traffic to the given source port. May be left empty to "
-#~ "only rewrite the IP address."
-#~ msgstr ""
-#~ "Reescreva o tráfego correspondente para a porta de origem fornecida. Pode "
-#~ "ficar em branco para somente reescrever o endereço IP."
-
-#~ msgid "Rewrite to source %s"
-#~ msgstr "Reescrever para a origem %s"
-
-#~ msgid "Rewrite to source %s, %s"
-#~ msgstr "Reescrever para a origem %s, %s"
-
-#~ msgid "SNAT IP address"
-#~ msgstr "Endereço IP da SNAT"
-
-#~ msgid "SNAT port"
-#~ msgstr "Porta da SNAT"
-
-#~ msgid "Source NAT"
-#~ msgstr "NAT origem"
-
-#~ msgid ""
-#~ "Source NAT is a specific form of masquerading which allows fine grained "
-#~ "control over the source IP used for outgoing traffic, for example to map "
-#~ "multiple WAN addresses to internal subnets."
-#~ msgstr ""
-#~ "NAT origem é uma forma específica de mascaramento que permite o controle "
-#~ "fino do endereço IP de origem usado no tráfego sainte. Por exemplo, para "
-#~ "mapear múltiplos endereços WAN para subredes internas."
-
-#~ msgid "Start Time (hh:mm:ss)"
-#~ msgstr "Hora inicial (hh:mm:ss)"
-
-#~ msgid "Stop Time (hh:mm:ss)"
-#~ msgstr "Hora final (hh:mm:ss)"
-
-#~ msgid ""
-#~ "This page allows you to change advanced properties of the port forwarding "
-#~ "entry. In most cases there is no need to modify those settings."
-#~ msgstr ""
-#~ "Esta página permite que você mude propriedades avançadas da entrada do "
-#~ "encaminhamento de porta. Na maioria dos casos, não é necessário modificar "
-#~ "estas configurações."
-
-#~ msgid ""
-#~ "This page allows you to change advanced properties of the traffic rule "
-#~ "entry, such as matched source and destination hosts."
-#~ msgstr ""
-#~ "Esta página permite que você mude propriedades avançadas da entrada da "
-#~ "regra de tráfego, como os equipamentos de origem e destino."
-
-#~ msgid "Unnamed SNAT"
-#~ msgstr "SNAT sem nome"
-
-#~ msgid ""
-#~ "You may specify multiple by selecting \"-- custom --\" and then entering "
-#~ "protocols separated by space."
-#~ msgstr ""
-#~ "Você pode especificar múltiplas entradas selecionando \"-- personalizado "
-#~ "--\" e então entrando os protocolos separados por espaço."
-
-#~ msgid "Zone %q"
-#~ msgstr "Zona %q"
-
-# 20140621: edersg: tradução
-#~ msgid "traffic"
-#~ msgstr "tráfego"
diff --git a/luci-app-firewall/po/pt/firewall.po b/luci-app-firewall/po/pt/firewall.po
index 281c6b17b..907dd7ec0 100644
--- a/luci-app-firewall/po/pt/firewall.po
+++ b/luci-app-firewall/po/pt/firewall.po
@@ -13,123 +13,94 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.6\n"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:127
 msgid "%s in %s"
 msgstr "%s em %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr "%s%s with %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:125
 msgid "%s, %s in %s"
 msgstr "%s, %s em %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:26
+msgid "(Unnamed Entry)"
+msgstr "(Entrada Sem Nome)"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:169
+msgid "(Unnamed Rule)"
+msgstr "(Regra Sem Nome)"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:37
+msgid "(Unnamed SNAT)"
+msgstr "(SNAT Sem Nome)"
+
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr "<var>%d</var> pkts. por <var>%s</var>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:180
 msgid "<var>%s</var> and limit to %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:257
 msgid "Action"
 msgstr "Acção"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone destination "
-"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
-"traffic."
-msgstr ""
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
+msgid "Add"
+msgstr "Adicionar"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
-"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
-msgstr ""
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
+msgid "Add and edit..."
+msgstr "Adicionar e editar..."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:57
 msgid "Advanced Settings"
 msgstr "Definições Avançadas"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid "Allow \"invalid\" traffic"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:178
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Permitir encaminhamento de <em>zonas de origem</em>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:170
 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:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:89
 msgid "Any"
 msgstr "Qualquer"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
-msgid "Any day"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid "Automatic helper assignment"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid ""
-"Automatically assign conntrack helpers based on traffic protocol and port"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
-msgid "Conntrack Settings"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Conntrack helpers"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid "Covered devices"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:88
 msgid "Covered networks"
 msgstr "Redes abrangidas"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid "Covered subnets"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:22
 msgid "Custom Rules"
 msgstr "Regras Personalizadas"
 
@@ -144,15 +115,23 @@ msgstr ""
 "comandos são executados a seguir ao reinicio da firewall, logo a seguir ao "
 "conjunto de regras predefinidas serem carregadas."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:108
+msgid "Destination IP address"
+msgstr "Endereço IP de destino"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:304
 msgid "Destination address"
 msgstr "Endereço de destino"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:313
 msgid "Destination port"
 msgstr "Porta de destino"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:102
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:295
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
 msgid "Destination zone"
 msgstr "Zona de destino"
 
@@ -160,97 +139,83 @@ msgstr "Zona de destino"
 msgid "Disable"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid ""
-"Do not install extra rules to reject forwarded traffic with conntrack state "
-"<em>invalid</em>. This may be required for complex asymmetric route setups."
-msgstr ""
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:151
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
+msgid "Do not rewrite"
+msgstr "Não re-escrever"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:22
 msgid "Drop invalid packets"
 msgstr "Cancelar pacotes inválidos"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:270
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "Ativar"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:149
 msgid "Enable NAT Loopback"
 msgstr "Ativar NAT Loopback"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:20
 msgid "Enable SYN-flood protection"
 msgstr "Ativar a Proteção SYN-flood"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:144
 msgid "Enable logging on this zone"
 msgstr "Ativar registo nesta zona"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:43
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:98
 msgid "External IP address"
 msgstr "Endereço IP externo"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:111
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
 msgid "External port"
 msgstr "Porta externa"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
+msgid "External zone"
+msgstr "Zona externa"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:158
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:331
 msgid "Extra arguments"
 msgstr "Argumentos extra"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid "Extra destination arguments"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
-msgid "Extra iptables arguments"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid "Extra source arguments"
-msgstr ""
-
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
 msgid "Firewall"
 msgstr "Firewall"
@@ -259,163 +224,181 @@ msgstr "Firewall"
 msgid "Firewall - Custom Rules"
 msgstr "Firewall - Regras Personalizadas"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:13
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:8
 msgid "Firewall - Port Forwards"
 msgstr "Firewall - Encaminhamento de Portas"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:12
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:42
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:9
 msgid "Firewall - Traffic Rules"
 msgstr "Firewall - Regras de Tráfego"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:15
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:11
 msgid "Firewall - Zone Settings"
 msgstr "Firewall - Definições de Zona"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:141
 msgid "Force connection tracking"
 msgstr "Forçar rasto de ligação"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:76
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:27
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:92
 msgid "Forward"
 msgstr "Encaminhar"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:116
 msgid "Forward to"
 msgstr "Encaminhar para"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:343
 msgid "Friday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:106
 msgid "From %s in %s"
 msgstr "De %s em %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:88
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:104
 msgid "From %s in %s with source %s"
 msgstr "De %s em %s com origem %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:102
 msgid "From %s in %s with source %s and %s"
 msgstr "De %s em %s com origem %s e %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:117
 msgid "From %s on <var>this device</var>"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:115
 msgid "From %s on <var>this device</var> with source %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:113
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:10
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:56
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:16
 msgid "General Settings"
 msgstr "Definições Gerais"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:51
 msgid "Hardware flow offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:85
 msgid "IPv4"
 msgstr "IPv4"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:185
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:118
 msgid "IPv4 and IPv6"
 msgstr "IPv4 e IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:119
 msgid "IPv4 only"
 msgstr "Só IPv4"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:87
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:120
 msgid "IPv6 only"
 msgstr "Só IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:25
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:90
 msgid "Input"
 msgstr "Entrada"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:157
+msgid "Inter-Zone Forwarding"
+msgstr "Encaminhamento Inter-Zona"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:127
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
 msgid "Internal IP address"
 msgstr "Endereço IP interno"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:138
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
 msgid "Internal port"
 msgstr "Porta interna"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:121
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
 msgid "Internal zone"
 msgstr "Zona Interna"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:150
 msgid "Limit log messages"
 msgstr "Limitar registo de mensagens"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:102
 #, fuzzy
 msgid "MSS clamping"
 msgstr "MSS-Correction"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:101
 msgid "Masquerading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:105
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:162
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:247
 msgid "Match"
 msgstr "Corresponder"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:206
 msgid "Match ICMP type"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:118
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr ""
+"O tráfego encaminhado corresponde a uma determinada porta de destino ou "
+"intervalo de portas."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:112
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
@@ -423,38 +406,68 @@ msgstr ""
 "O tráfego de entrada corresponde a uma dada porta de destino ou intervalo de "
 "portas neste host"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:91
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr ""
+"O tráfego de entrada corresponde a uma dada porta ou de um intervalo de "
+"portas no host cliente."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:339
 msgid "Monday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:346
 msgid "Month Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:50
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:180
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:60
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
 msgid "Name"
 msgstr "Nome"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:169
-msgid "Network"
-msgstr ""
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
+msgid "New SNAT rule"
+msgstr "Nova regra SNAT"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
+msgid "New forward rule"
+msgstr "Nova regra de encaminhamento"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
+msgid "New input rule"
+msgstr "Nova regra de entrada"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
+msgid "New port forward"
+msgstr "Novo encaminhamento de porta"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
+msgid "New source NAT"
+msgstr "Nova origem de NAT"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:99
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr "Só se tráfego de entrada corresponder ao endereço IP fornecido."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:63
 msgid "Only match incoming traffic from these MACs."
 msgstr "Só se o tráfego de entrada corresponder a um destes MACs."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:75
 msgid "Only match incoming traffic from this IP or range."
 msgstr "Só se o tráfego de entrada corresponder a este IP ou intervalo."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:87
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
@@ -462,31 +475,37 @@ msgstr ""
 "Só se o tráfego de entrada corresponder à porta de origem fornecida ou de um "
 "intervalo de portas no host cliente"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
+msgid "Open ports on router"
+msgstr "Abrir portas no router"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
+msgid "Other..."
+msgstr "Outro..."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:26
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:91
 msgid "Output"
 msgstr "Saída"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:288
+msgid "Output zone"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:160
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:332
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr "Passa argumentos adicionais para o iptables. Usar com cuidado!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
-msgid ""
-"Passing raw iptables arguments to source and destination traffic "
-"classification rules allows to match packets based on other criteria than "
-"interfaces or subnets. These options should be used with extreme care as "
-"invalid values could render the firewall ruleset broken, completely exposing "
-"all services."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:14
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:17
 msgid "Port Forwards"
 msgstr "Encaminhamento de Portas"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:9
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
@@ -494,44 +513,38 @@ msgstr ""
 "O Encaminhamento de Portas permite que computadores remotos na internet se "
 "liguem a um computador ou serviço especifico na rede privada (LAN)."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
-msgid ""
-"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
-"connection tracking."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:39
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:190
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:139
 msgid ""
 "Redirect matched incoming traffic to the given port on the internal host"
 msgstr ""
 "Redirecionar a entrada de trafego correspondente à porta fornecida no host "
 "interno"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:128
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "Redirecionar o tráfego de entrada correspondente para o host interno"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:52
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
@@ -539,20 +552,38 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:132
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:123
 msgid "Restrict Masquerading to given source subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:183
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:115
 msgid "Restrict to address family"
 msgstr "Restringir a família de endereços"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:132
+msgid "Rewrite matched traffic to the given address."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:147
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:266
+msgid "Rewrite to source %s"
+msgstr "Re-escrever para a origem %s"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:264
+msgid "Rewrite to source %s, %s"
+msgstr "Re-escrever para a origem %s, %s"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:42
 msgid "Routing/NAT Offloading"
 msgstr ""
 
@@ -564,62 +595,89 @@ msgstr ""
 msgid "Rule is enabled"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:131
+msgid "SNAT IP address"
+msgstr "Endereço IP da SNAT"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:146
+msgid "SNAT port"
+msgstr "Porta SNAT"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:344
 msgid "Saturday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:47
 msgid "Software based offloading for routing/NAT"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:46
 msgid "Software flow offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:79
 msgid "Source IP address"
 msgstr "Endereço IP de origem"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:261
 msgid "Source MAC address"
 msgstr "Endereço MAC de origem"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:194
+msgid "Source NAT"
+msgstr "NAT de origem"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:195
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+"NAT de origem é uma forma especifica de mascarar que permite um controlo "
+"melhorado sobre o IP de origem usado para o tráfego de saída, por exemplo, "
+"para mapear múltiplos endereços para as sub-redes internas."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:270
 msgid "Source address"
 msgstr "Endereço de origem"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:279
 msgid "Source port"
 msgstr "Porta de origem"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:254
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
 msgid "Source zone"
 msgstr "Zona de origem"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:357
 msgid "Start Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
-msgid "Start Time (hh.mm.ss)"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:353
+msgid "Start Time (hh:mm:ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:359
 msgid "Stop Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
-msgid "Stop Time (hh.mm.ss)"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:355
+msgid "Stop Time (hh:mm:ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:338
 msgid "Sunday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:12
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
@@ -627,8 +685,7 @@ msgstr ""
 "A firewall cria zonas sobre as interfaces de rede para controlar o fluxo do "
 "tráfego."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:158
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -638,7 +695,21 @@ msgid ""
 "<em>not</em> imply a permission to forward from wan to lan as well."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:14
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:13
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr ""
+"Esta página permite-lhe alterar as definições avançadas da regra de entrada "
+"de tráfego, tal como correspondências de hosts de origem e destino."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:36
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -647,40 +718,46 @@ 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:349
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:342
 msgid "Thursday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
-msgid "Time Restrictions"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:362
 msgid "Time in UTC"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:141
 msgid "To %s at %s on <var>this device</var>"
 msgstr "Para %s no %s em <var>este dispositivo</var>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:132
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:157
 msgid "To %s in %s"
 msgstr "Para %s em %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:143
 msgid "To %s on <var>this device</var>"
 msgstr "Para %s em <var>este dispositivo</var>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:130
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:155
 msgid "To %s, %s in %s"
 msgstr "Para %s, %s em %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
+msgid "To source IP"
+msgstr "Para o IP de origem"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
+msgid "To source port"
+msgstr "Para a porta de origem"
+
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:18
 msgid "Traffic Rules"
 msgstr "Regras de Tráfego"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:10
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
@@ -690,273 +767,158 @@ 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:347
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:340
 msgid "Tuesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:244
+msgid "Unnamed SNAT"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:67
 msgid "Unnamed forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:76
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
-msgid "Unnamed zone"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid ""
-"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
-"network devices."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid ""
-"Use this option to classify zone traffic by source or destination subnet "
-"instead of networks or devices."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:101
 msgid "Via %s"
 msgstr "Via %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:99
 msgid "Via %s at %s"
 msgstr "Via %s no %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:341
 msgid "Wednesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:335
 msgid "Week Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:55
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr ""
+"Pode especificar múltiplos seleccionando \"-- personalizado --\" e depois "
+"introduzir os protocolos separados por espaço."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:35
+msgid "Zone %q"
+msgstr "Zona %q"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:83
 msgid "Zone ⇒ Forwardings"
 msgstr "Zona ⇒ Encaminhamentos"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:59
 msgid "Zones"
 msgstr "Zonas"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:325
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:33
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:98
 msgid "accept"
 msgstr "aceitar"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:108
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:141
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:263
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:272
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:281
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:306
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:315
 msgid "any"
 msgstr "qualquer"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:120
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:100
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:150
 msgid "any host"
 msgstr "qualquer host"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:111
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:138
 msgid "any router IP"
 msgstr "qualquer IP do router"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:119
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:149
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr "qualquer zona"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:327
 msgid "don't track"
 msgstr "não seguir"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:324
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:32
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:97
 msgid "drop"
 msgstr "drop"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:326
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:31
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:96
 msgid "reject"
 msgstr "rejeitar"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
-msgid "this new zone"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:82
+msgid "traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr ""
-
-#~ msgid "Add"
-#~ msgstr "Adicionar"
-
-#~ msgid "Add and edit..."
-#~ msgstr "Adicionar e editar..."
-
-#~ msgid "Do not rewrite"
-#~ msgstr "Não re-escrever"
-
-#~ msgid "External zone"
-#~ msgstr "Zona externa"
-
-#~ msgid "New SNAT rule"
-#~ msgstr "Nova regra SNAT"
-
-#~ msgid "New forward rule"
-#~ msgstr "Nova regra de encaminhamento"
-
-#~ msgid "New input rule"
-#~ msgstr "Nova regra de entrada"
-
-#~ msgid "New port forward"
-#~ msgstr "Novo encaminhamento de porta"
-
-#~ msgid "New source NAT"
-#~ msgstr "Nova origem de NAT"
-
-#~ msgid "Open ports on router"
-#~ msgstr "Abrir portas no router"
-
-#~ msgid "Other..."
-#~ msgstr "Outro..."
-
-#~ msgid "To source IP"
-#~ msgstr "Para o IP de origem"
-
-#~ msgid "To source port"
-#~ msgstr "Para a porta de origem"
-
-#~ msgid "(Unnamed Entry)"
-#~ msgstr "(Entrada Sem Nome)"
-
-#~ msgid "(Unnamed Rule)"
-#~ msgstr "(Regra Sem Nome)"
-
-#~ msgid "(Unnamed SNAT)"
-#~ msgstr "(SNAT Sem Nome)"
-
-#~ msgid "Destination IP address"
-#~ msgstr "Endereço IP de destino"
-
-#~ msgid "Inter-Zone Forwarding"
-#~ msgstr "Encaminhamento Inter-Zona"
-
-#~ msgid "Match forwarded traffic to the given destination port or port range."
-#~ msgstr ""
-#~ "O tráfego encaminhado corresponde a uma determinada porta de destino ou "
-#~ "intervalo de portas."
-
-#~ msgid ""
-#~ "Match incoming traffic originating from the given source port or port "
-#~ "range on the client host."
-#~ msgstr ""
-#~ "O tráfego de entrada corresponde a uma dada porta ou de um intervalo de "
-#~ "portas no host cliente."
-
-#~ msgid "Rewrite to source %s"
-#~ msgstr "Re-escrever para a origem %s"
-
-#~ msgid "Rewrite to source %s, %s"
-#~ msgstr "Re-escrever para a origem %s, %s"
-
-#~ msgid "SNAT IP address"
-#~ msgstr "Endereço IP da SNAT"
-
-#~ msgid "SNAT port"
-#~ msgstr "Porta SNAT"
-
-#~ msgid "Source NAT"
-#~ msgstr "NAT de origem"
-
-#~ msgid ""
-#~ "Source NAT is a specific form of masquerading which allows fine grained "
-#~ "control over the source IP used for outgoing traffic, for example to map "
-#~ "multiple WAN addresses to internal subnets."
-#~ msgstr ""
-#~ "NAT de origem é uma forma especifica de mascarar que permite um controlo "
-#~ "melhorado sobre o IP de origem usado para o tráfego de saída, por "
-#~ "exemplo, para mapear múltiplos endereços para as sub-redes internas."
-
-#~ msgid ""
-#~ "This page allows you to change advanced properties of the traffic rule "
-#~ "entry, such as matched source and destination hosts."
-#~ msgstr ""
-#~ "Esta página permite-lhe alterar as definições avançadas da regra de "
-#~ "entrada de tráfego, tal como correspondências de hosts de origem e "
-#~ "destino."
-
-#~ msgid ""
-#~ "You may specify multiple by selecting \"-- custom --\" and then entering "
-#~ "protocols separated by space."
-#~ msgstr ""
-#~ "Pode especificar múltiplos seleccionando \"-- personalizado --\" e depois "
-#~ "introduzir os protocolos separados por espaço."
-
-#~ msgid "Zone %q"
-#~ msgstr "Zona %q"
diff --git a/luci-app-firewall/po/ro/firewall.po b/luci-app-firewall/po/ro/firewall.po
index 30d3d89e5..555d9d7ad 100644
--- a/luci-app-firewall/po/ro/firewall.po
+++ b/luci-app-firewall/po/ro/firewall.po
@@ -12,123 +12,94 @@ msgstr ""
 "20)) ? 1 : 2);;\n"
 "X-Generator: Pootle 2.0.6\n"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:127
 msgid "%s in %s"
 msgstr "%s în %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr "%s%s cu %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:125
 msgid "%s, %s in %s"
 msgstr "%s, %s în %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:26
+msgid "(Unnamed Entry)"
+msgstr "(Intrare fără nume)"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:169
+msgid "(Unnamed Rule)"
+msgstr "(Regulă fără nume)"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:37
+msgid "(Unnamed SNAT)"
+msgstr "(SNAT fără nume)"
+
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:180
 msgid "<var>%s</var> and limit to %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:257
 msgid "Action"
 msgstr "Acţiune"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone destination "
-"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
-"traffic."
-msgstr ""
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
+msgid "Add"
+msgstr "Adaugă"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
-"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
-msgstr ""
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
+msgid "Add and edit..."
+msgstr "Adaugă şi editează..."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:57
 msgid "Advanced Settings"
 msgstr "Setări avansate"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid "Allow \"invalid\" traffic"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:178
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Permite trecerea din <em>zonele sursa</em>."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:170
 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:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:89
 msgid "Any"
 msgstr "Oricare"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
-msgid "Any day"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid "Automatic helper assignment"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid ""
-"Automatically assign conntrack helpers based on traffic protocol and port"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
-msgid "Conntrack Settings"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Conntrack helpers"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid "Covered devices"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:88
 msgid "Covered networks"
 msgstr "Retele acoperite"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid "Covered subnets"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:22
 msgid "Custom Rules"
 msgstr "Reguli suplimentare"
 
@@ -139,15 +110,23 @@ msgid ""
 "each firewall restart, right after the default ruleset has been loaded."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:108
+msgid "Destination IP address"
+msgstr "Destinaţie adresă IP"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:304
 msgid "Destination address"
 msgstr "Destinaţie adresă"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:313
 msgid "Destination port"
 msgstr "Portul destinatie"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:102
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:295
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
 msgid "Destination zone"
 msgstr "Zona destinatie"
 
@@ -155,97 +134,83 @@ msgstr "Zona destinatie"
 msgid "Disable"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid ""
-"Do not install extra rules to reject forwarded traffic with conntrack state "
-"<em>invalid</em>. This may be required for complex asymmetric route setups."
-msgstr ""
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:151
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
+msgid "Do not rewrite"
+msgstr "Nu rescrie"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:22
 msgid "Drop invalid packets"
 msgstr "Descarcă pachetele invalide"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:270
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "Activează"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:149
 msgid "Enable NAT Loopback"
 msgstr "Activează loopback NAT"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:20
 msgid "Enable SYN-flood protection"
 msgstr "Activează protecţia SYN-flood"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:144
 msgid "Enable logging on this zone"
 msgstr "Activeaza log in aceasta zona"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:43
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:98
 msgid "External IP address"
 msgstr "Adresă IP externă"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:111
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
 msgid "External port"
 msgstr "Port extern"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
+msgid "External zone"
+msgstr "Zonă externă"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:158
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:331
 msgid "Extra arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid "Extra destination arguments"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
-msgid "Extra iptables arguments"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid "Extra source arguments"
-msgstr ""
-
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
 msgid "Firewall"
 msgstr "Firewall"
@@ -254,270 +219,314 @@ msgstr "Firewall"
 msgid "Firewall - Custom Rules"
 msgstr "Firewall - Reguli particularizate"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:13
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:8
 msgid "Firewall - Port Forwards"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:12
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:42
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:9
 msgid "Firewall - Traffic Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:15
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:11
 msgid "Firewall - Zone Settings"
 msgstr "Setari zona la firewall"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:141
 msgid "Force connection tracking"
 msgstr "Forteaza urmarirea conexiunilor"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:76
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:27
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:92
 msgid "Forward"
 msgstr "Forward"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:116
 msgid "Forward to"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:343
 msgid "Friday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:106
 msgid "From %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:88
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:104
 msgid "From %s in %s with source %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:102
 msgid "From %s in %s with source %s and %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:117
 msgid "From %s on <var>this device</var>"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:115
 msgid "From %s on <var>this device</var> with source %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:113
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:10
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:56
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:16
 msgid "General Settings"
 msgstr "Setari generale"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:51
 msgid "Hardware flow offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:85
 msgid "IPv4"
 msgstr "IPv4"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:185
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:118
 msgid "IPv4 and IPv6"
 msgstr "IPv4 şi IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:119
 msgid "IPv4 only"
 msgstr "doar IPv4"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:87
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:120
 msgid "IPv6 only"
 msgstr "doar IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:25
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:90
 msgid "Input"
 msgstr "Intrare"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:157
+msgid "Inter-Zone Forwarding"
+msgstr "Forwardare intre-zone"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:127
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
 msgid "Internal IP address"
 msgstr "Adresa IP interna"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:138
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
 msgid "Internal port"
 msgstr "Port intern"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:121
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
 msgid "Internal zone"
 msgstr "Zonă internă"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:150
 msgid "Limit log messages"
 msgstr "Limitează mesaje în log"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:102
 msgid "MSS clamping"
 msgstr "Ajustare MSS"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:101
 msgid "Masquerading"
 msgstr "Translatare"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:105
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:162
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:247
 msgid "Match"
 msgstr "Potrivire"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:206
 msgid "Match ICMP type"
 msgstr "Potriveste pe tipul de ICMP"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:118
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:112
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:91
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:339
 msgid "Monday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:346
 msgid "Month Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:50
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:180
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:60
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
 msgid "Name"
 msgstr "Nume"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:169
-msgid "Network"
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
+msgid "New SNAT rule"
+msgstr "Regulă nouă SNAT"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
+msgid "New forward rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
+msgid "New input rule"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
+msgid "New port forward"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
+msgid "New source NAT"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:99
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:63
 msgid "Only match incoming traffic from these MACs."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:75
 msgid "Only match incoming traffic from this IP or range."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:87
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
+msgid "Open ports on router"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
+msgid "Other..."
+msgstr "Altele..."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:26
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:91
 msgid "Output"
 msgstr "Ieşire"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:288
+msgid "Output zone"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:160
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:332
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
-msgid ""
-"Passing raw iptables arguments to source and destination traffic "
-"classification rules allows to match packets based on other criteria than "
-"interfaces or subnets. These options should be used with extreme care as "
-"invalid values could render the firewall ruleset broken, completely exposing "
-"all services."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:14
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:17
 msgid "Port Forwards"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:9
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
-msgid ""
-"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
-"connection tracking."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:39
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:190
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
 msgid "Protocol"
 msgstr "Protocol"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:139
 msgid ""
 "Redirect matched incoming traffic to the given port on the internal host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:128
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:52
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
@@ -525,20 +534,38 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:132
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:123
 msgid "Restrict Masquerading to given source subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:183
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:115
 msgid "Restrict to address family"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:132
+msgid "Rewrite matched traffic to the given address."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:147
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:266
+msgid "Rewrite to source %s"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:264
+msgid "Rewrite to source %s, %s"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:42
 msgid "Routing/NAT Offloading"
 msgstr ""
 
@@ -550,69 +577,92 @@ msgstr ""
 msgid "Rule is enabled"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:131
+msgid "SNAT IP address"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:146
+msgid "SNAT port"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:344
 msgid "Saturday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:47
 msgid "Software based offloading for routing/NAT"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:46
 msgid "Software flow offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:79
 msgid "Source IP address"
 msgstr "Sursă adresă IP"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:261
 msgid "Source MAC address"
 msgstr "Sursă adresă MAC"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:194
+msgid "Source NAT"
+msgstr "Sursă NAT"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:195
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:270
 msgid "Source address"
 msgstr "Adresa sursa"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:279
 msgid "Source port"
 msgstr "Port sursa"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:254
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
 msgid "Source zone"
 msgstr "Zona sursa"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:357
 msgid "Start Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
-msgid "Start Time (hh.mm.ss)"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:353
+msgid "Start Time (hh:mm:ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:359
 msgid "Stop Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
-msgid "Stop Time (hh.mm.ss)"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:355
+msgid "Stop Time (hh:mm:ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:338
 msgid "Sunday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:12
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:158
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -622,7 +672,19 @@ msgid ""
 "<em>not</em> imply a permission to forward from wan to lan as well."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:14
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:13
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:36
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -631,244 +693,202 @@ 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:349
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:342
 msgid "Thursday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
-msgid "Time Restrictions"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:362
 msgid "Time in UTC"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:141
 msgid "To %s at %s on <var>this device</var>"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:132
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:157
 msgid "To %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:143
 msgid "To %s on <var>this device</var>"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:130
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:155
 msgid "To %s, %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
+msgid "To source IP"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
+msgid "To source port"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:18
 msgid "Traffic Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:10
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
 "the router."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:340
 msgid "Tuesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:244
+msgid "Unnamed SNAT"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:67
 msgid "Unnamed forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:76
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
-msgid "Unnamed zone"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid ""
-"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
-"network devices."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid ""
-"Use this option to classify zone traffic by source or destination subnet "
-"instead of networks or devices."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:101
 msgid "Via %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:99
 msgid "Via %s at %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:341
 msgid "Wednesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:335
 msgid "Week Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:55
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:35
+msgid "Zone %q"
+msgstr "Zona %q"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:83
 msgid "Zone ⇒ Forwardings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:59
 msgid "Zones"
 msgstr "Zone"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:325
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:33
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:98
 msgid "accept"
 msgstr "accept"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:108
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:141
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:263
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:272
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:281
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:306
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:315
 msgid "any"
 msgstr "oricare"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:120
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:100
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:150
 msgid "any host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:111
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:138
 msgid "any router IP"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:119
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:149
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:327
 msgid "don't track"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:324
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:32
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:97
 msgid "drop"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:326
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:31
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:96
 msgid "reject"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
-msgid "this new zone"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:82
+msgid "traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr ""
-
-#~ msgid "Add"
-#~ msgstr "Adaugă"
-
-#~ msgid "Add and edit..."
-#~ msgstr "Adaugă şi editează..."
-
-#~ msgid "Do not rewrite"
-#~ msgstr "Nu rescrie"
-
-#~ msgid "External zone"
-#~ msgstr "Zonă externă"
-
-#~ msgid "New SNAT rule"
-#~ msgstr "Regulă nouă SNAT"
-
-#~ msgid "Other..."
-#~ msgstr "Altele..."
-
-#~ msgid "(Unnamed Entry)"
-#~ msgstr "(Intrare fără nume)"
-
-#~ msgid "(Unnamed Rule)"
-#~ msgstr "(Regulă fără nume)"
-
-#~ msgid "(Unnamed SNAT)"
-#~ msgstr "(SNAT fără nume)"
-
-#~ msgid "Destination IP address"
-#~ msgstr "Destinaţie adresă IP"
-
-#~ msgid "Inter-Zone Forwarding"
-#~ msgstr "Forwardare intre-zone"
-
-#~ msgid "Source NAT"
-#~ msgstr "Sursă NAT"
-
-#~ msgid "Zone %q"
-#~ msgstr "Zona %q"
diff --git a/luci-app-firewall/po/ru/firewall.po b/luci-app-firewall/po/ru/firewall.po
index ca8dc439c..e049d9fba 100644
--- a/luci-app-firewall/po/ru/firewall.po
+++ b/luci-app-firewall/po/ru/firewall.po
@@ -3,11 +3,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: LuCI: firewall\n"
 "POT-Creation-Date: 2013-09-05 16:02+0200\n"
-"PO-Revision-Date: 2019-07-27 23:09+0300\n"
+"PO-Revision-Date: 2018-09-06 09:29+0300\n"
 "Language-Team: http://cyber-place.ru\n"
 "MIME-Version: 1.0\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2\n"
+"X-Generator: Poedit 1.8.7.1\n"
 "Last-Translator: Anton Kikin <a.kikin@tano-systems.com>\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n"
 "%100<10 || n%100>=20) ? 1 : 2);\n"
@@ -15,131 +15,94 @@ msgstr ""
 "Project-Info: Это технический перевод, не дословный. Главное-удобный русский "
 "интерфейс, все проверялось в графическом режиме, совместим с другими apps\n"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:127
 msgid "%s in %s"
 msgstr "%s в %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr "%s%s с %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:125
 msgid "%s, %s in %s"
 msgstr "%s, %s в %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:26
+msgid "(Unnamed Entry)"
+msgstr "(Запись без имени)"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:169
+msgid "(Unnamed Rule)"
+msgstr "(Правило без имени)"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:37
+msgid "(Unnamed SNAT)"
+msgstr "(SNAT без имени)"
+
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr "<var>%d</var> пакетов за <var>%s</var>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr "<var>%d</var> пакетов за <var>%s</var>, подряд <var>%d</var> пакетов"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:180
 msgid "<var>%s</var> and limit to %s"
 msgstr "<var>%s</var> с пределом в %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr "Принимать перенаправляемый трафик"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr "Принимать входящий трафик"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr "Принимать исходящий трафик"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:257
 msgid "Action"
 msgstr "Действие"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone destination "
-"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
-"traffic."
-msgstr ""
-"Дополнительные аргументы <em>iptables</em> для классификации трафика зоны "
-"назначения, например <code>-p tcp --dport 443</code> для соответствия только "
-"исходящему HTTPS трафику."
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
+msgid "Add"
+msgstr "Добавить"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
-"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
-msgstr ""
-"Дополнительные аргументы <em>iptables</em> для классификации трафика зоны "
-"источника, например <code>-p tcp --sport 443</code> для соответствия только "
-"входящему HTTPS трафику."
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
+msgid "Add and edit..."
+msgstr "Добавить и редактировать..."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:57
 msgid "Advanced Settings"
 msgstr "Дополнительные настройки"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid "Allow \"invalid\" traffic"
-msgstr "Разрешить «недействительный» трафик"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:178
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Разрешить перенаправление из <em>'зон источников'</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:170
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "Разрешить перенаправление в <em>'зоны назначения'</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:89
 msgid "Any"
 msgstr "Любой"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
-msgid "Any day"
-msgstr "Любой день"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid "Automatic helper assignment"
-msgstr "Автоматическое назначение помощников"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid ""
-"Automatically assign conntrack helpers based on traffic protocol and port"
-msgstr ""
-"Автоматическое назначение помощников отслеживания соединений (conntrack) на "
-"основе протокола и порта трафика."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
-msgid "Conntrack Settings"
-msgstr "Отслеживание соединений (conntrack)"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Conntrack helpers"
-msgstr "Помощники отслеживания соединений"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid "Covered devices"
-msgstr "Охватываемые устройства"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:88
 msgid "Covered networks"
-msgstr "Охватываемые сети"
+msgstr "Использовать сети"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid "Covered subnets"
-msgstr "Охватываемые подсети"
-
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:22
 msgid "Custom Rules"
 msgstr "Пользовательские правила"
 
@@ -154,15 +117,23 @@ msgstr ""
 "каждой перезагрузки межсетевого экрана, сразу после загрузки набора правил "
 "по умолчанию."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:108
+msgid "Destination IP address"
+msgstr "IP-адрес назначения"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:304
 msgid "Destination address"
 msgstr "Адрес назначения"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:313
 msgid "Destination port"
 msgstr "Порт назначения"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:102
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:295
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
 msgid "Destination zone"
 msgstr "Зона назначения"
 
@@ -170,102 +141,83 @@ msgstr "Зона назначения"
 msgid "Disable"
 msgstr "Отключить"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr "Отклонять перенаправляемый трафик"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr "Отклонять входящий трафик"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr "Отклонять исходящий трафик"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid ""
-"Do not install extra rules to reject forwarded traffic with conntrack state "
-"<em>invalid</em>. This may be required for complex asymmetric route setups."
-msgstr ""
-"Не устанавливать дополнительные правила для отклонения перенаправляемого "
-"трафика с состоянием <em>недействительный</em> (<em>invalid</em>). Это может "
-"потребоваться для сложных настроек асимметричной маршрутизации."
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:151
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
+msgid "Do not rewrite"
+msgstr "Не перезаписывать"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr "Не отслеживать перенаправляемый трафик"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr "Не отслеживать входящий трафик"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr "Не отслеживать исходящий трафик"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:22
 msgid "Drop invalid packets"
 msgstr "Отбрасывать некорректные пакеты"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:270
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "Включить"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:149
 msgid "Enable NAT Loopback"
 msgstr "Включить NAT Loopback"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:20
 msgid "Enable SYN-flood protection"
 msgstr "Включить защиту от SYN-flood атак"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:144
 msgid "Enable logging on this zone"
 msgstr "Включить журналирование в этой зоне"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:43
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr "Экспериментальный функционал. Не полностью совместим с QoS/SQM."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
-msgstr ""
-"Явно определяет допустимые варианты помощников (helpers) отслеживания "
-"соединений (connection tracking) трафика в зоне."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:98
 msgid "External IP address"
 msgstr "Внешний IP-адрес"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:111
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
 msgid "External port"
 msgstr "Внешний порт"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
+msgid "External zone"
+msgstr "Внешняя зона"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:158
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:331
 msgid "Extra arguments"
 msgstr "Дополнительные аргументы"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid "Extra destination arguments"
-msgstr "Дополнительные аргументы для назначения"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
-msgid "Extra iptables arguments"
-msgstr "Дополнительные аргументы iptables"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid "Extra source arguments"
-msgstr "Дополнительные аргументы для источника"
-
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
 msgid "Firewall"
 msgstr "Межсетевой экран"
@@ -274,162 +226,179 @@ msgstr "Межсетевой экран"
 msgid "Firewall - Custom Rules"
 msgstr "Межсетевой экран - Пользовательские правила"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:13
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:8
 msgid "Firewall - Port Forwards"
 msgstr "Межсетевой экран - Перенаправление портов"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:12
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:42
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:9
 msgid "Firewall - Traffic Rules"
 msgstr "Межсетевой экран - Правила для трафика"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:15
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:11
 msgid "Firewall - Zone Settings"
 msgstr "Межсетевой экран - Настройка зон"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:141
 msgid "Force connection tracking"
-msgstr "Принудительно включать отслеживание соединений"
+msgstr "Включить отслеживание соединений"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:76
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:27
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:92
 msgid "Forward"
 msgstr "Перенаправление"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:116
 msgid "Forward to"
 msgstr "Перенаправлять на"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:343
 msgid "Friday"
 msgstr "Пятница"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:106
 msgid "From %s in %s"
 msgstr "Из %s в %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:88
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:104
 msgid "From %s in %s with source %s"
 msgstr "Из %s в %s с источником %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:102
 msgid "From %s in %s with source %s and %s"
 msgstr "Из %s в %s с источниками %s и %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:117
 msgid "From %s on <var>this device</var>"
 msgstr "Из %s в <var>это устройство</var>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:115
 msgid "From %s on <var>this device</var> with source %s"
 msgstr "Из %s в <var>это устройство</var> с источником %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:113
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr "Из %s в <var>это устройство</var> с источниками %s and %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:10
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:56
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:16
 msgid "General Settings"
 msgstr "Основные настройки"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:51
 msgid "Hardware flow offloading"
 msgstr "Аппаратный flow offloading"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr "IP-адрес"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr "Диапазон IP-адресов"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr "IP-адреса"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:85
 msgid "IPv4"
 msgstr "IPv4"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:185
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:118
 msgid "IPv4 and IPv6"
 msgstr "IPv4 и IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:119
 msgid "IPv4 only"
 msgstr "Только IPv4"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:87
 msgid "IPv6"
-msgstr ""
+msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:120
 msgid "IPv6 only"
 msgstr "Только IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:25
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:90
 msgid "Input"
 msgstr "Входящий трафик"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:157
+msgid "Inter-Zone Forwarding"
+msgstr "Перенаправление между зонами"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:127
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
 msgid "Internal IP address"
 msgstr "Внутренний IP-адрес"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:138
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
 msgid "Internal port"
 msgstr "Внутренний порт"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:121
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
 msgid "Internal zone"
 msgstr "Внутренняя зона"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:150
 msgid "Limit log messages"
 msgstr "Ограничить журнал сообщений"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr "MAC-адрес"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr "MAC-адреса"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:102
 msgid "MSS clamping"
 msgstr "Ограничение MSS"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:101
 msgid "Masquerading"
 msgstr "Маскарадинг"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:105
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:162
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:247
 msgid "Match"
 msgstr "Входящий трафик"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:206
 msgid "Match ICMP type"
 msgstr "Соответствовать ICMP типу"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:118
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr ""
+"Перенаправлять соответствующий трафик на указанный порт или диапазон портов."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:112
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
@@ -437,41 +406,71 @@ msgstr ""
 "Порт или диапазон портов, входящие подключения на который будут "
 "перенаправляться на внутренний порт внутреннего IP-адреса (см. ниже)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:91
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr ""
+"Выбирать входящий трафик, исходящий из порта или диапазона портов "
+"клиентского хоста."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:339
 msgid "Monday"
 msgstr "Понедельник"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:346
 msgid "Month Days"
 msgstr "Дни месяца"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:50
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:180
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:60
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
 msgid "Name"
 msgstr "Имя"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:169
-msgid "Network"
-msgstr "Сеть"
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
+msgid "New SNAT rule"
+msgstr "Новое правило SNAT"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
+msgid "New forward rule"
+msgstr "Новое правило перенаправления"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
+msgid "New input rule"
+msgstr "Новое правило для входящего трафика"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
+msgid "New port forward"
+msgstr "Новое перенаправление порта"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
+msgid "New source NAT"
+msgstr "Новый SNAT"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:99
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
 "Применять правило только для входящих подключений на указанный IP-адрес"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:63
 msgid "Only match incoming traffic from these MACs."
 msgstr "Применять правило только для входящего трафика от этих MAC-адресов."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:75
 msgid "Only match incoming traffic from this IP or range."
 msgstr ""
 "Применять правило только для входящего трафика от этого IP-адреса или "
 "диапазона адресов."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:87
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
@@ -479,38 +478,39 @@ msgstr ""
 "Применять правило только для входящего трафика от указанного порта или "
 "диапазона портов клиентского хоста"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
+msgid "Open ports on router"
+msgstr "Открыть порты на маршрутизаторе"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
+msgid "Other..."
+msgstr "Другое..."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:26
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:91
 msgid "Output"
 msgstr "Исходящий трафик"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:288
+msgid "Output zone"
+msgstr "Исходящая зона"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:160
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:332
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 "Передаёт дополнительные аргументы таблице iptables. Используйте с "
 "осторожностью!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
-msgid ""
-"Passing raw iptables arguments to source and destination traffic "
-"classification rules allows to match packets based on other criteria than "
-"interfaces or subnets. These options should be used with extreme care as "
-"invalid values could render the firewall ruleset broken, completely exposing "
-"all services."
-msgstr ""
-"Передача аргументов iptables в правилах классификации входящего и исходящего "
-"трафика позволяет сопоставлять пакеты, основанные на других критериях, "
-"нежели чем интерфейсы или подсети. Эти опции следует использовать с особой "
-"осторожностью, так как неверные значения могут привести к нарушению работы "
-"правил межсетевого экрана, полностью открывая доступ ко всем службам системы."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:14
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:17
 msgid "Port Forwards"
 msgstr "Перенаправление портов"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:9
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
@@ -518,46 +518,38 @@ msgstr ""
 "Перенаправленные портов позволяет удалённым компьютерам из Интернета "
 "соединяться с компьютером или службой внутри частной локальной сети."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
-msgid ""
-"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
-"connection tracking."
-msgstr ""
-"Предотвратить установку <em>NOTRACK</em> правил, которые позволяют обходить "
-"отслеживание соединений (connection tracking)."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:39
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:190
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
 msgid "Protocol"
 msgstr "Протокол"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:139
 msgid ""
 "Redirect matched incoming traffic to the given port on the internal host"
 msgstr ""
 "Перенаправлять трафик на указанный порт или диапазон портов внутреннего IP-"
 "адреса"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:128
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "Перенаправлять трафик на указанный IP-адрес"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr "Сбрасывать перенаправляемый трафик"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr "Сбрасывать входящий трафик"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr "Сбрасывать исходящий трафик"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:52
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 "Требуется аппаратная поддержка NAT. Реализовано, по крайней мере, для mt7621"
@@ -566,20 +558,40 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr "Перезапустить межсетевой экран"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:132
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "Использовать маскарадинг только для указанных подсетей-получателей"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:123
 msgid "Restrict Masquerading to given source subnets"
 msgstr "Использовать маскарадинг только для указанных подсетей-отправителей"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:183
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:115
 msgid "Restrict to address family"
 msgstr "Использовать протокол"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:132
+msgid "Rewrite matched traffic to the given address."
+msgstr "Перенаправлять соответствующий трафик к указанному адресу."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:147
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr ""
+"Перенаправлять соответствующий трафик к указанному порту источника. Может "
+"быть пустым в случае, если необходимо перенаправить только IP-адрес."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:266
+msgid "Rewrite to source %s"
+msgstr "Перенаправлять к источнику %s"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:264
+msgid "Rewrite to source %s, %s"
+msgstr "Перенаправлять к источнику %s, %s"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:42
 msgid "Routing/NAT Offloading"
 msgstr "Маршрутизация/NAT offloading"
 
@@ -591,69 +603,96 @@ msgstr "Правило отключено"
 msgid "Rule is enabled"
 msgstr "Правило включено"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:131
+msgid "SNAT IP address"
+msgstr "IP-адрес SNAT"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:146
+msgid "SNAT port"
+msgstr "Порт SNAT"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:344
 msgid "Saturday"
 msgstr "Суббота"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:47
 msgid "Software based offloading for routing/NAT"
 msgstr "Программная реализация offloading для маршрутизации/NAT"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:46
 msgid "Software flow offloading"
 msgstr "Программный flow offloading"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:79
 msgid "Source IP address"
 msgstr "IP-адрес источника"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:261
 msgid "Source MAC address"
 msgstr "MAC-адрес источника"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:194
+msgid "Source NAT"
+msgstr "NAT источника"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:195
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+"SNAT - это особая форма маскарадинга (masquerading), позволяющая "
+"осуществлять детальный контроль над IP-адресом источника для исходящего "
+"трафика, например, перенаправление нескольких WAN-адресов во внутреннюю "
+"подсеть."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:270
 msgid "Source address"
 msgstr "Адрес источника"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:279
 msgid "Source port"
 msgstr "Порт источника"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:254
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
 msgid "Source zone"
 msgstr "Зона источника"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:357
 msgid "Start Date (yyyy-mm-dd)"
 msgstr "Дата начала (год-мес-день)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
-msgid "Start Time (hh.mm.ss)"
-msgstr "Время начала (чч.мм.сс)"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:353
+msgid "Start Time (hh:mm:ss)"
+msgstr "Время начала (чч:мм:сс)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:359
 msgid "Stop Date (yyyy-mm-dd)"
 msgstr "Дата окончания (год-мес-день)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
-msgid "Stop Time (hh.mm.ss)"
-msgstr "Время окончания (чч.мм.сс)"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:355
+msgid "Stop Time (hh:mm:ss)"
+msgstr "Время окончания (чч:мм:сс)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:338
 msgid "Sunday"
 msgstr "Воскресенье"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:12
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
 msgstr "Межсетевой экран создает зоны в вашей сети для контроля трафика."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:158
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -670,7 +709,23 @@ msgstr ""
 "перенаправление из lan в wan <em>'не'</em> допускает перенаправление трафика "
 "из wan в lan."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:14
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr ""
+"На этой странице можно изменить расширенные настройки перенаправления портов."
+"В большинстве случаев нет необходимости изменять эти параметры."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:13
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr ""
+"На этой странице можно изменить расширенные настройки правил для трафика.В "
+"большинстве случаев нет необходимости изменять эти параметры."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:36
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -685,40 +740,46 @@ msgstr ""
 "различными сетями внутри зоны. <em>'Использовать сети'</em> указывает, какие "
 "доступные сети являются членами этой зоны."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:342
 msgid "Thursday"
 msgstr "Четверг"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
-msgid "Time Restrictions"
-msgstr "Временные ограничения"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:362
 msgid "Time in UTC"
 msgstr "Время UTC"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:141
 msgid "To %s at %s on <var>this device</var>"
 msgstr "К %s, %s на <var>этом устройстве</var>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:132
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:157
 msgid "To %s in %s"
 msgstr "К %s в %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:143
 msgid "To %s on <var>this device</var>"
 msgstr "К %s на <var>этом устройстве</var>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:130
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:155
 msgid "To %s, %s in %s"
 msgstr "К %s, %s в %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
+msgid "To source IP"
+msgstr "К IP-адресу источника"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
+msgid "To source port"
+msgstr "К порту источника"
+
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:18
 msgid "Traffic Rules"
 msgstr "Правила для трафика"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:10
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
@@ -728,211 +789,158 @@ msgstr ""
 "зонами, например, запрет трафика между некоторыми хостами или открытие WAN-"
 "портов маршрутизатора."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:340
 msgid "Tuesday"
 msgstr "Вторник"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:244
+msgid "Unnamed SNAT"
+msgstr "SNAT без имени"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:67
 msgid "Unnamed forward"
 msgstr "Перенаправление без имени"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:76
 msgid "Unnamed rule"
 msgstr "Правило без имени"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
-msgid "Unnamed zone"
-msgstr "Зона без имени"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid ""
-"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
-"network devices."
-msgstr ""
-"Используйте эту опцию для классификации трафика зоны по сетевым устройствам, "
-"управляемым не через <em>uci</em>."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid ""
-"Use this option to classify zone traffic by source or destination subnet "
-"instead of networks or devices."
-msgstr ""
-"Используйте эту опцию для классификации трафика зоны по источнику или "
-"подсети назначения вместо сети или устройств."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:101
 msgid "Via %s"
 msgstr "Через %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:99
 msgid "Via %s at %s"
 msgstr "Через %s, %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:341
 msgid "Wednesday"
 msgstr "Среда"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:335
 msgid "Week Days"
 msgstr "Дни недели"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:55
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr ""
+"Вы можете указать несколько, выбрав '-- пользовательский --' и перечислив "
+"через пробел названия протоколов."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:35
+msgid "Zone %q"
+msgstr "Зона %q"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:83
 msgid "Zone ⇒ Forwardings"
 msgstr "Зона ⇒ Перенаправления"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:59
 msgid "Zones"
 msgstr "Зоны"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:325
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:33
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:98
 msgid "accept"
 msgstr "принимать"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:108
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:141
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:263
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:272
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:281
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:306
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:315
 msgid "any"
 msgstr "любой"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:120
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:100
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:150
 msgid "any host"
 msgstr "любого хоста"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:111
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:138
 msgid "any router IP"
 msgstr "любой IP-адрес маршрутизатора"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:119
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:149
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr "любой зоны"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr "день"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:327
 msgid "don't track"
 msgstr "не отслеживать"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:324
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:32
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:97
 msgid "drop"
 msgstr "не обрабатывать"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr "час"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr "минута"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr "нет"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr "порт"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr "порты"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:326
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:31
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:96
 msgid "reject"
 msgstr "отвергать"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr "секунда"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
-msgid "this new zone"
-msgstr ""
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:82
+msgid "traffic"
+msgstr "трафик"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr "тип"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr "типы"
-
-#~ msgid "Add"
-#~ msgstr "Добавить"
-
-#~ msgid "Add and edit..."
-#~ msgstr "Добавить и редактировать..."
-
-#~ msgid "Do not rewrite"
-#~ msgstr "Не перезаписывать"
-
-#~ msgid "External zone"
-#~ msgstr "Внешняя зона"
-
-#~ msgid "New SNAT rule"
-#~ msgstr "Новое правило SNAT"
-
-#~ msgid "New forward rule"
-#~ msgstr "Новое правило перенаправления"
-
-#~ msgid "New input rule"
-#~ msgstr "Новое правило для входящего трафика"
-
-#~ msgid "New port forward"
-#~ msgstr "Новое перенаправление порта"
-
-#~ msgid "New source NAT"
-#~ msgstr "Новый SNAT"
-
-#~ msgid "Open ports on router"
-#~ msgstr "Открыть порты на маршрутизаторе"
-
-#~ msgid "Other..."
-#~ msgstr "Другое..."
-
-#~ msgid "To source IP"
-#~ msgstr "К IP-адресу источника"
-
-#~ msgid "To source port"
-#~ msgstr "К порту источника"
-
-#~ msgid "Output zone"
-#~ msgstr "Исходящая зона"
diff --git a/luci-app-firewall/po/sk/firewall.po b/luci-app-firewall/po/sk/firewall.po
index 40ea67f27..ee7b7c9a7 100644
--- a/luci-app-firewall/po/sk/firewall.po
+++ b/luci-app-firewall/po/sk/firewall.po
@@ -8,123 +8,94 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:127
 msgid "%s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:125
 msgid "%s, %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:26
+msgid "(Unnamed Entry)"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:169
+msgid "(Unnamed Rule)"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:37
+msgid "(Unnamed SNAT)"
+msgstr ""
+
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:180
 msgid "<var>%s</var> and limit to %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:257
 msgid "Action"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone destination "
-"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
-"traffic."
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
+msgid "Add"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
-"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
+msgid "Add and edit..."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:57
 msgid "Advanced Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid "Allow \"invalid\" traffic"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:178
 msgid "Allow forward from <em>source zones</em>:"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:170
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:89
 msgid "Any"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
-msgid "Any day"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid "Automatic helper assignment"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid ""
-"Automatically assign conntrack helpers based on traffic protocol and port"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
-msgid "Conntrack Settings"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Conntrack helpers"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid "Covered devices"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:88
 msgid "Covered networks"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid "Covered subnets"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:22
 msgid "Custom Rules"
 msgstr ""
 
@@ -135,15 +106,23 @@ msgid ""
 "each firewall restart, right after the default ruleset has been loaded."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:108
+msgid "Destination IP address"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:304
 msgid "Destination address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:313
 msgid "Destination port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:102
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:295
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
 msgid "Destination zone"
 msgstr ""
 
@@ -151,97 +130,83 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid ""
-"Do not install extra rules to reject forwarded traffic with conntrack state "
-"<em>invalid</em>. This may be required for complex asymmetric route setups."
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:151
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
+msgid "Do not rewrite"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:22
 msgid "Drop invalid packets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:270
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:149
 msgid "Enable NAT Loopback"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:20
 msgid "Enable SYN-flood protection"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:144
 msgid "Enable logging on this zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:43
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:98
 msgid "External IP address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:111
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
 msgid "External port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
+msgid "External zone"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:158
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:331
 msgid "Extra arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid "Extra destination arguments"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
-msgid "Extra iptables arguments"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid "Extra source arguments"
-msgstr ""
-
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
 msgid "Firewall"
 msgstr ""
@@ -250,270 +215,314 @@ msgstr ""
 msgid "Firewall - Custom Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:13
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:8
 msgid "Firewall - Port Forwards"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:12
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:42
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:9
 msgid "Firewall - Traffic Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:15
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:11
 msgid "Firewall - Zone Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:141
 msgid "Force connection tracking"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:76
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:27
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:92
 msgid "Forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:116
 msgid "Forward to"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:343
 msgid "Friday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:106
 msgid "From %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:88
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:104
 msgid "From %s in %s with source %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:102
 msgid "From %s in %s with source %s and %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:117
 msgid "From %s on <var>this device</var>"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:115
 msgid "From %s on <var>this device</var> with source %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:113
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:10
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:56
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:16
 msgid "General Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:51
 msgid "Hardware flow offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:85
 msgid "IPv4"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:185
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:118
 msgid "IPv4 and IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:119
 msgid "IPv4 only"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:87
 msgid "IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:120
 msgid "IPv6 only"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:25
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:90
 msgid "Input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:157
+msgid "Inter-Zone Forwarding"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:127
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
 msgid "Internal IP address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:138
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
 msgid "Internal port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:121
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
 msgid "Internal zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:150
 msgid "Limit log messages"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:102
 msgid "MSS clamping"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:101
 msgid "Masquerading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:105
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:162
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:247
 msgid "Match"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:206
 msgid "Match ICMP type"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:118
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:112
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:91
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:339
 msgid "Monday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:346
 msgid "Month Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:50
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:180
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:60
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
 msgid "Name"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:169
-msgid "Network"
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
+msgid "New SNAT rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
+msgid "New forward rule"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
+msgid "New input rule"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
+msgid "New port forward"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
+msgid "New source NAT"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:99
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:63
 msgid "Only match incoming traffic from these MACs."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:75
 msgid "Only match incoming traffic from this IP or range."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:87
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
+msgid "Open ports on router"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
+msgid "Other..."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:26
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:91
 msgid "Output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:288
+msgid "Output zone"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:160
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:332
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
-msgid ""
-"Passing raw iptables arguments to source and destination traffic "
-"classification rules allows to match packets based on other criteria than "
-"interfaces or subnets. These options should be used with extreme care as "
-"invalid values could render the firewall ruleset broken, completely exposing "
-"all services."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:14
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:17
 msgid "Port Forwards"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:9
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
-msgid ""
-"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
-"connection tracking."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:39
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:190
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
 msgid "Protocol"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:139
 msgid ""
 "Redirect matched incoming traffic to the given port on the internal host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:128
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:52
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
@@ -521,20 +530,38 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:132
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:123
 msgid "Restrict Masquerading to given source subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:183
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:115
 msgid "Restrict to address family"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:132
+msgid "Rewrite matched traffic to the given address."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:147
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:266
+msgid "Rewrite to source %s"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:264
+msgid "Rewrite to source %s, %s"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:42
 msgid "Routing/NAT Offloading"
 msgstr ""
 
@@ -546,69 +573,92 @@ msgstr ""
 msgid "Rule is enabled"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:131
+msgid "SNAT IP address"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:146
+msgid "SNAT port"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:344
 msgid "Saturday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:47
 msgid "Software based offloading for routing/NAT"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:46
 msgid "Software flow offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:79
 msgid "Source IP address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:261
 msgid "Source MAC address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:194
+msgid "Source NAT"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:195
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:270
 msgid "Source address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:279
 msgid "Source port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:254
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
 msgid "Source zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:357
 msgid "Start Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
-msgid "Start Time (hh.mm.ss)"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:353
+msgid "Start Time (hh:mm:ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:359
 msgid "Stop Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
-msgid "Stop Time (hh.mm.ss)"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:355
+msgid "Stop Time (hh:mm:ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:338
 msgid "Sunday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:12
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:158
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -618,7 +668,19 @@ msgid ""
 "<em>not</em> imply a permission to forward from wan to lan as well."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:14
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:13
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:36
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -627,205 +689,202 @@ 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:349
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:342
 msgid "Thursday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
-msgid "Time Restrictions"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:362
 msgid "Time in UTC"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:141
 msgid "To %s at %s on <var>this device</var>"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:132
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:157
 msgid "To %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:143
 msgid "To %s on <var>this device</var>"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:130
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:155
 msgid "To %s, %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
+msgid "To source IP"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
+msgid "To source port"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:18
 msgid "Traffic Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:10
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
 "the router."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:340
 msgid "Tuesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:244
+msgid "Unnamed SNAT"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:67
 msgid "Unnamed forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:76
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
-msgid "Unnamed zone"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid ""
-"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
-"network devices."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid ""
-"Use this option to classify zone traffic by source or destination subnet "
-"instead of networks or devices."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:101
 msgid "Via %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:99
 msgid "Via %s at %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:341
 msgid "Wednesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:335
 msgid "Week Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:55
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:35
+msgid "Zone %q"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:83
 msgid "Zone ⇒ Forwardings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:59
 msgid "Zones"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:325
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:33
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:98
 msgid "accept"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:108
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:141
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:263
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:272
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:281
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:306
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:315
 msgid "any"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:120
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:100
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:150
 msgid "any host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:111
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:138
 msgid "any router IP"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:119
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:149
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:327
 msgid "don't track"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:324
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:32
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:97
 msgid "drop"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:326
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:31
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:96
 msgid "reject"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
-msgid "this new zone"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:82
+msgid "traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr ""
diff --git a/luci-app-firewall/po/sv/firewall.po b/luci-app-firewall/po/sv/firewall.po
index d885c0398..f74da0997 100644
--- a/luci-app-firewall/po/sv/firewall.po
+++ b/luci-app-firewall/po/sv/firewall.po
@@ -9,123 +9,94 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:127
 msgid "%s in %s"
 msgstr "%s i %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr "%s%s med %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:125
 msgid "%s, %s in %s"
 msgstr "%2, %s i %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:26
+msgid "(Unnamed Entry)"
+msgstr "(Namnlös post)"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:169
+msgid "(Unnamed Rule)"
+msgstr "(Namnlös regel)"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:37
+msgid "(Unnamed SNAT)"
+msgstr "(Namnlös SNAT)"
+
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr "<var>%d</var> pkt. per <var>%s</var>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr "<var>%d</var> pkt. per <var>%s</var>, brustna <var>%d</var> pkt."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:180
 msgid "<var>%s</var> and limit to %s"
 msgstr "<var>%s</var> och gränsen till %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:257
 msgid "Action"
 msgstr "Åtgärd"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone destination "
-"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
-"traffic."
-msgstr ""
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
+msgid "Add"
+msgstr "Lägg till"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
-"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
-msgstr ""
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
+msgid "Add and edit..."
+msgstr "Lägg till och redigera..."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:57
 msgid "Advanced Settings"
 msgstr "Avancerade inställningar"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid "Allow \"invalid\" traffic"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:178
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Tillåt vidarebefordring från <em>källzonerna</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:170
 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:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:89
 msgid "Any"
 msgstr "Alla"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
-msgid "Any day"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid "Automatic helper assignment"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid ""
-"Automatically assign conntrack helpers based on traffic protocol and port"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
-msgid "Conntrack Settings"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Conntrack helpers"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid "Covered devices"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:88
 msgid "Covered networks"
 msgstr "Nätverk som omfattas"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid "Covered subnets"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:22
 msgid "Custom Rules"
 msgstr "Anpassade regler"
 
@@ -136,15 +107,23 @@ msgid ""
 "each firewall restart, right after the default ruleset has been loaded."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:108
+msgid "Destination IP address"
+msgstr "Destinationens IP-adress"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:304
 msgid "Destination address"
 msgstr "Destinationens adress"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:313
 msgid "Destination port"
 msgstr "Destinationsport"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:102
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:295
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
 msgid "Destination zone"
 msgstr "Destinationens zon"
 
@@ -152,97 +131,83 @@ msgstr "Destinationens zon"
 msgid "Disable"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid ""
-"Do not install extra rules to reject forwarded traffic with conntrack state "
-"<em>invalid</em>. This may be required for complex asymmetric route setups."
-msgstr ""
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:151
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
+msgid "Do not rewrite"
+msgstr "Skriv inte om igen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:22
 msgid "Drop invalid packets"
 msgstr "Släpp ogiltiga paket"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:270
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "Aktivera"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:149
 msgid "Enable NAT Loopback"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:20
 msgid "Enable SYN-flood protection"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:144
 msgid "Enable logging on this zone"
 msgstr "Aktivera loggning i den här zonen"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:43
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:98
 msgid "External IP address"
 msgstr "Extern IP-adress"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:111
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
 msgid "External port"
 msgstr "Extern port"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
+msgid "External zone"
+msgstr "Extern zon"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:158
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:331
 msgid "Extra arguments"
 msgstr "Extra argument"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid "Extra destination arguments"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
-msgid "Extra iptables arguments"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid "Extra source arguments"
-msgstr ""
-
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
 msgid "Firewall"
 msgstr "Brandvägg"
@@ -251,162 +216,180 @@ msgstr "Brandvägg"
 msgid "Firewall - Custom Rules"
 msgstr "Brandvägg - Anpassade regler"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:13
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:8
 msgid "Firewall - Port Forwards"
 msgstr "Brandvägg - Vidarebefordring av port"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:12
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:42
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:9
 msgid "Firewall - Traffic Rules"
 msgstr "Brandvägg - Trafikregler"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:15
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:11
 msgid "Firewall - Zone Settings"
 msgstr "Brandvägg - Zoninställningar"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:141
 msgid "Force connection tracking"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:76
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:27
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:92
 msgid "Forward"
 msgstr "Vidarebefordra"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:116
 msgid "Forward to"
 msgstr "Vidarebefordra till"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:343
 msgid "Friday"
 msgstr "Fredag"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:106
 msgid "From %s in %s"
 msgstr "Från %s i %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:88
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:104
 msgid "From %s in %s with source %s"
 msgstr "Från %s i %s med källa %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:102
 msgid "From %s in %s with source %s and %s"
 msgstr "Från %s i %s med källa %s och %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:117
 msgid "From %s on <var>this device</var>"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:115
 msgid "From %s on <var>this device</var> with source %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:113
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:10
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:56
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:16
 msgid "General Settings"
 msgstr "Generella inställningar"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:51
 msgid "Hardware flow offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:85
 msgid "IPv4"
 msgstr "IPv4"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:185
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:118
 msgid "IPv4 and IPv6"
 msgstr "IPv4 och IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:119
 msgid "IPv4 only"
 msgstr "Endast IPv4"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:87
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:120
 msgid "IPv6 only"
 msgstr "Endast IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:25
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:90
 msgid "Input"
 msgstr "Inmatning"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:157
+msgid "Inter-Zone Forwarding"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:127
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
 msgid "Internal IP address"
 msgstr "Intern IP-adress"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:138
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
 msgid "Internal port"
 msgstr "Intern port"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:121
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
 msgid "Internal zone"
 msgstr "Intern zon"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:150
 msgid "Limit log messages"
 msgstr "Begränsa loggmeddelanden"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:102
 msgid "MSS clamping"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:101
 msgid "Masquerading"
 msgstr "Maskering"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:105
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:162
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:247
 msgid "Match"
 msgstr "Matcha"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:206
 msgid "Match ICMP type"
 msgstr "Matchar ICMP-typ"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:118
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr ""
+"Matcha vidarebefordrad trafik till den angivna destinationsporten eller "
+"portens räckvidd."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:112
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
@@ -414,110 +397,138 @@ msgstr ""
 "Matcha inkommande trafik dirigerad till den angivna destinationsporten eller "
 "portens räckvidd på den här värden"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:91
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:339
 msgid "Monday"
 msgstr "Måndag"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:346
 msgid "Month Days"
 msgstr "Dagar i månaden"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:50
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:180
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:60
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
 msgid "Name"
 msgstr "Namn"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:169
-msgid "Network"
-msgstr ""
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
+msgid "New SNAT rule"
+msgstr "Ny SNAT-regel"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
+msgid "New forward rule"
+msgstr "Ny regel för vidarebefordring"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
+msgid "New input rule"
+msgstr "Ny inmatningsregel"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
+msgid "New port forward"
+msgstr "Ny vidarebefordring av port"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
+msgid "New source NAT"
+msgstr "Ny käll-NAT"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:99
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:63
 msgid "Only match incoming traffic from these MACs."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:75
 msgid "Only match incoming traffic from this IP or range."
 msgstr ""
 "Matcha endast inkommande trafik från den här IP-adressen eller räckvidden."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:87
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
+msgid "Open ports on router"
+msgstr "Öppna portar i router"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
+msgid "Other..."
+msgstr "Andra..."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:26
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:91
 msgid "Output"
 msgstr "Utmatning"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:288
+msgid "Output zone"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:160
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:332
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
-msgid ""
-"Passing raw iptables arguments to source and destination traffic "
-"classification rules allows to match packets based on other criteria than "
-"interfaces or subnets. These options should be used with extreme care as "
-"invalid values could render the firewall ruleset broken, completely exposing "
-"all services."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:14
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:17
 msgid "Port Forwards"
 msgstr "Vidarebefordringar av port"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:9
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
-msgid ""
-"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
-"connection tracking."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:39
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:190
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:139
 msgid ""
 "Redirect matched incoming traffic to the given port on the internal host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:128
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:52
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
@@ -525,20 +536,38 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr "Starta om brandvägg"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:132
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:123
 msgid "Restrict Masquerading to given source subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:183
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:115
 msgid "Restrict to address family"
 msgstr "Begränsa till adressfamilj"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:132
+msgid "Rewrite matched traffic to the given address."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:147
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:266
+msgid "Rewrite to source %s"
+msgstr "Skriv om igen till källan %s"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:264
+msgid "Rewrite to source %s, %s"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:42
 msgid "Routing/NAT Offloading"
 msgstr ""
 
@@ -550,69 +579,92 @@ msgstr ""
 msgid "Rule is enabled"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:131
+msgid "SNAT IP address"
+msgstr "IP-adress för SNAT"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:146
+msgid "SNAT port"
+msgstr "SNAT-port"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:344
 msgid "Saturday"
 msgstr "Lördag"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:47
 msgid "Software based offloading for routing/NAT"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:46
 msgid "Software flow offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:79
 msgid "Source IP address"
 msgstr "IP-adress för källa"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:261
 msgid "Source MAC address"
 msgstr "MAC-adress för källa"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:194
+msgid "Source NAT"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:195
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:270
 msgid "Source address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:279
 msgid "Source port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:254
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
 msgid "Source zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:357
 msgid "Start Date (yyyy-mm-dd)"
 msgstr "Startdatum (åååå-mm-dd)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
-msgid "Start Time (hh.mm.ss)"
-msgstr ""
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:353
+msgid "Start Time (hh:mm:ss)"
+msgstr "Starttid (tt:mm:ss)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:359
 msgid "Stop Date (yyyy-mm-dd)"
 msgstr "Stopptid (åååå-mm-dd)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
-msgid "Stop Time (hh.mm.ss)"
-msgstr ""
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:355
+msgid "Stop Time (hh:mm:ss)"
+msgstr "Stopptid (tt:mm:ss)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:338
 msgid "Sunday"
 msgstr "Söndag"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:12
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:158
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -622,7 +674,19 @@ msgid ""
 "<em>not</em> imply a permission to forward from wan to lan as well."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:14
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:13
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:36
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -631,276 +695,202 @@ 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:349
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:342
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
-msgid "Time Restrictions"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:362
 msgid "Time in UTC"
 msgstr "Tid enligt UTC"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:141
 msgid "To %s at %s on <var>this device</var>"
 msgstr "Till %s vid %s på <var>den här enheten</var>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:132
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:157
 msgid "To %s in %s"
 msgstr "Till %s i %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:143
 msgid "To %s on <var>this device</var>"
 msgstr "Till %s på <var>den här enheten</var>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:130
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:155
 msgid "To %s, %s in %s"
 msgstr "Till %s, %s i %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
+msgid "To source IP"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
+msgid "To source port"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:18
 msgid "Traffic Rules"
 msgstr "Trafikregler"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:10
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
 "the router."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:340
 msgid "Tuesday"
 msgstr "Tisdag"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:244
+msgid "Unnamed SNAT"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:67
 msgid "Unnamed forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:76
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
-msgid "Unnamed zone"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid ""
-"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
-"network devices."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid ""
-"Use this option to classify zone traffic by source or destination subnet "
-"instead of networks or devices."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:101
 msgid "Via %s"
 msgstr "Via %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:99
 msgid "Via %s at %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:341
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:335
 msgid "Week Days"
 msgstr "Veckodagar"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:55
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:35
+msgid "Zone %q"
+msgstr "Zon %q"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:83
 msgid "Zone ⇒ Forwardings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:59
 msgid "Zones"
 msgstr "Zoner"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:325
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:33
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:98
 msgid "accept"
 msgstr "acceptera"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:108
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:141
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:263
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:272
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:281
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:306
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:315
 msgid "any"
 msgstr "alla"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:120
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:100
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:150
 msgid "any host"
 msgstr "alla värdar"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:111
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:138
 msgid "any router IP"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:119
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:149
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr "alla zoner"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:327
 msgid "don't track"
 msgstr "spåra inte"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:324
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:32
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:97
 msgid "drop"
 msgstr "släpp"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:326
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:31
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:96
 msgid "reject"
 msgstr "neka"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
-msgid "this new zone"
-msgstr ""
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:82
+msgid "traffic"
+msgstr "trafik"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr ""
-
-#~ msgid "Add"
-#~ msgstr "Lägg till"
-
-#~ msgid "Add and edit..."
-#~ msgstr "Lägg till och redigera..."
-
-#~ msgid "Do not rewrite"
-#~ msgstr "Skriv inte om igen"
-
-#~ msgid "External zone"
-#~ msgstr "Extern zon"
-
-#~ msgid "New SNAT rule"
-#~ msgstr "Ny SNAT-regel"
-
-#~ msgid "New forward rule"
-#~ msgstr "Ny regel för vidarebefordring"
-
-#~ msgid "New input rule"
-#~ msgstr "Ny inmatningsregel"
-
-#~ msgid "New port forward"
-#~ msgstr "Ny vidarebefordring av port"
-
-#~ msgid "New source NAT"
-#~ msgstr "Ny käll-NAT"
-
-#~ msgid "Open ports on router"
-#~ msgstr "Öppna portar i router"
-
-#~ msgid "Other..."
-#~ msgstr "Andra..."
-
-#~ msgid "(Unnamed Entry)"
-#~ msgstr "(Namnlös post)"
-
-#~ msgid "(Unnamed Rule)"
-#~ msgstr "(Namnlös regel)"
-
-#~ msgid "(Unnamed SNAT)"
-#~ msgstr "(Namnlös SNAT)"
-
-#~ msgid "Destination IP address"
-#~ msgstr "Destinationens IP-adress"
-
-#~ msgid "Match forwarded traffic to the given destination port or port range."
-#~ msgstr ""
-#~ "Matcha vidarebefordrad trafik till den angivna destinationsporten eller "
-#~ "portens räckvidd."
-
-#~ msgid "Rewrite to source %s"
-#~ msgstr "Skriv om igen till källan %s"
-
-#~ msgid "SNAT IP address"
-#~ msgstr "IP-adress för SNAT"
-
-#~ msgid "SNAT port"
-#~ msgstr "SNAT-port"
-
-#~ msgid "Start Time (hh:mm:ss)"
-#~ msgstr "Starttid (tt:mm:ss)"
-
-#~ msgid "Stop Time (hh:mm:ss)"
-#~ msgstr "Stopptid (tt:mm:ss)"
-
-#~ msgid "Zone %q"
-#~ msgstr "Zon %q"
-
-#~ msgid "traffic"
-#~ msgstr "trafik"
diff --git a/luci-app-firewall/po/templates/firewall.pot b/luci-app-firewall/po/templates/firewall.pot
index 492d8aa8e..e08ff3ffd 100644
--- a/luci-app-firewall/po/templates/firewall.pot
+++ b/luci-app-firewall/po/templates/firewall.pot
@@ -1,123 +1,94 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=UTF-8"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:127
 msgid "%s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:125
 msgid "%s, %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:26
+msgid "(Unnamed Entry)"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:169
+msgid "(Unnamed Rule)"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:37
+msgid "(Unnamed SNAT)"
+msgstr ""
+
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:180
 msgid "<var>%s</var> and limit to %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:257
 msgid "Action"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone destination "
-"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
-"traffic."
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
+msgid "Add"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
-"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
+msgid "Add and edit..."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:57
 msgid "Advanced Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid "Allow \"invalid\" traffic"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:178
 msgid "Allow forward from <em>source zones</em>:"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:170
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:89
 msgid "Any"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
-msgid "Any day"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid "Automatic helper assignment"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid ""
-"Automatically assign conntrack helpers based on traffic protocol and port"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
-msgid "Conntrack Settings"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Conntrack helpers"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid "Covered devices"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:88
 msgid "Covered networks"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid "Covered subnets"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:22
 msgid "Custom Rules"
 msgstr ""
 
@@ -128,15 +99,23 @@ msgid ""
 "each firewall restart, right after the default ruleset has been loaded."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:108
+msgid "Destination IP address"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:304
 msgid "Destination address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:313
 msgid "Destination port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:102
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:295
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
 msgid "Destination zone"
 msgstr ""
 
@@ -144,97 +123,83 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid ""
-"Do not install extra rules to reject forwarded traffic with conntrack state "
-"<em>invalid</em>. This may be required for complex asymmetric route setups."
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:151
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
+msgid "Do not rewrite"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:22
 msgid "Drop invalid packets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:270
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:149
 msgid "Enable NAT Loopback"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:20
 msgid "Enable SYN-flood protection"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:144
 msgid "Enable logging on this zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:43
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:98
 msgid "External IP address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:111
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
 msgid "External port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
+msgid "External zone"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:158
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:331
 msgid "Extra arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid "Extra destination arguments"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
-msgid "Extra iptables arguments"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid "Extra source arguments"
-msgstr ""
-
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
 msgid "Firewall"
 msgstr ""
@@ -243,270 +208,314 @@ msgstr ""
 msgid "Firewall - Custom Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:13
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:8
 msgid "Firewall - Port Forwards"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:12
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:42
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:9
 msgid "Firewall - Traffic Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:15
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:11
 msgid "Firewall - Zone Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:141
 msgid "Force connection tracking"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:76
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:27
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:92
 msgid "Forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:116
 msgid "Forward to"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:343
 msgid "Friday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:106
 msgid "From %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:88
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:104
 msgid "From %s in %s with source %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:102
 msgid "From %s in %s with source %s and %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:117
 msgid "From %s on <var>this device</var>"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:115
 msgid "From %s on <var>this device</var> with source %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:113
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:10
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:56
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:16
 msgid "General Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:51
 msgid "Hardware flow offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:85
 msgid "IPv4"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:185
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:118
 msgid "IPv4 and IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:119
 msgid "IPv4 only"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:87
 msgid "IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:120
 msgid "IPv6 only"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:25
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:90
 msgid "Input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:157
+msgid "Inter-Zone Forwarding"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:127
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
 msgid "Internal IP address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:138
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
 msgid "Internal port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:121
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
 msgid "Internal zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:150
 msgid "Limit log messages"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:102
 msgid "MSS clamping"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:101
 msgid "Masquerading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:105
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:162
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:247
 msgid "Match"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:206
 msgid "Match ICMP type"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:118
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:112
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:91
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:339
 msgid "Monday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:346
 msgid "Month Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:50
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:180
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:60
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
 msgid "Name"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:169
-msgid "Network"
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
+msgid "New SNAT rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
+msgid "New forward rule"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
+msgid "New input rule"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
+msgid "New port forward"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
+msgid "New source NAT"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:99
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:63
 msgid "Only match incoming traffic from these MACs."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:75
 msgid "Only match incoming traffic from this IP or range."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:87
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
+msgid "Open ports on router"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
+msgid "Other..."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:26
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:91
 msgid "Output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:288
+msgid "Output zone"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:160
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:332
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
-msgid ""
-"Passing raw iptables arguments to source and destination traffic "
-"classification rules allows to match packets based on other criteria than "
-"interfaces or subnets. These options should be used with extreme care as "
-"invalid values could render the firewall ruleset broken, completely exposing "
-"all services."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:14
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:17
 msgid "Port Forwards"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:9
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
-msgid ""
-"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
-"connection tracking."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:39
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:190
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
 msgid "Protocol"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:139
 msgid ""
 "Redirect matched incoming traffic to the given port on the internal host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:128
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:52
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
@@ -514,20 +523,38 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:132
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:123
 msgid "Restrict Masquerading to given source subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:183
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:115
 msgid "Restrict to address family"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:132
+msgid "Rewrite matched traffic to the given address."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:147
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:266
+msgid "Rewrite to source %s"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:264
+msgid "Rewrite to source %s, %s"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:42
 msgid "Routing/NAT Offloading"
 msgstr ""
 
@@ -539,69 +566,92 @@ msgstr ""
 msgid "Rule is enabled"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:131
+msgid "SNAT IP address"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:146
+msgid "SNAT port"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:344
 msgid "Saturday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:47
 msgid "Software based offloading for routing/NAT"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:46
 msgid "Software flow offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:79
 msgid "Source IP address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:261
 msgid "Source MAC address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:194
+msgid "Source NAT"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:195
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:270
 msgid "Source address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:279
 msgid "Source port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:254
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
 msgid "Source zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:357
 msgid "Start Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
-msgid "Start Time (hh.mm.ss)"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:353
+msgid "Start Time (hh:mm:ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:359
 msgid "Stop Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
-msgid "Stop Time (hh.mm.ss)"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:355
+msgid "Stop Time (hh:mm:ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:338
 msgid "Sunday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:12
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:158
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -611,7 +661,19 @@ msgid ""
 "<em>not</em> imply a permission to forward from wan to lan as well."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:14
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:13
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:36
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -620,205 +682,202 @@ 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:349
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:342
 msgid "Thursday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
-msgid "Time Restrictions"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:362
 msgid "Time in UTC"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:141
 msgid "To %s at %s on <var>this device</var>"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:132
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:157
 msgid "To %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:143
 msgid "To %s on <var>this device</var>"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:130
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:155
 msgid "To %s, %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
+msgid "To source IP"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
+msgid "To source port"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:18
 msgid "Traffic Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:10
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
 "the router."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:340
 msgid "Tuesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:244
+msgid "Unnamed SNAT"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:67
 msgid "Unnamed forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:76
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
-msgid "Unnamed zone"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid ""
-"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
-"network devices."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid ""
-"Use this option to classify zone traffic by source or destination subnet "
-"instead of networks or devices."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:101
 msgid "Via %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:99
 msgid "Via %s at %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:341
 msgid "Wednesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:335
 msgid "Week Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:55
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:35
+msgid "Zone %q"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:83
 msgid "Zone ⇒ Forwardings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:59
 msgid "Zones"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:325
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:33
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:98
 msgid "accept"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:108
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:141
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:263
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:272
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:281
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:306
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:315
 msgid "any"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:120
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:100
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:150
 msgid "any host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:111
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:138
 msgid "any router IP"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:119
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:149
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:327
 msgid "don't track"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:324
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:32
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:97
 msgid "drop"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:326
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:31
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:96
 msgid "reject"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
-msgid "this new zone"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:82
+msgid "traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr ""
diff --git a/luci-app-firewall/po/tr/firewall.po b/luci-app-firewall/po/tr/firewall.po
index 111330637..f5c95b9b4 100644
--- a/luci-app-firewall/po/tr/firewall.po
+++ b/luci-app-firewall/po/tr/firewall.po
@@ -8,123 +8,94 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:127
 msgid "%s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:125
 msgid "%s, %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:26
+msgid "(Unnamed Entry)"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:169
+msgid "(Unnamed Rule)"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:37
+msgid "(Unnamed SNAT)"
+msgstr ""
+
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:180
 msgid "<var>%s</var> and limit to %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:257
 msgid "Action"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone destination "
-"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
-"traffic."
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
+msgid "Add"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
-"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
+msgid "Add and edit..."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:57
 msgid "Advanced Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid "Allow \"invalid\" traffic"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:178
 msgid "Allow forward from <em>source zones</em>:"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:170
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:89
 msgid "Any"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
-msgid "Any day"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid "Automatic helper assignment"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid ""
-"Automatically assign conntrack helpers based on traffic protocol and port"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
-msgid "Conntrack Settings"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Conntrack helpers"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid "Covered devices"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:88
 msgid "Covered networks"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid "Covered subnets"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:22
 msgid "Custom Rules"
 msgstr ""
 
@@ -135,15 +106,23 @@ msgid ""
 "each firewall restart, right after the default ruleset has been loaded."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:108
+msgid "Destination IP address"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:304
 msgid "Destination address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:313
 msgid "Destination port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:102
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:295
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
 msgid "Destination zone"
 msgstr ""
 
@@ -151,97 +130,83 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid ""
-"Do not install extra rules to reject forwarded traffic with conntrack state "
-"<em>invalid</em>. This may be required for complex asymmetric route setups."
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:151
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
+msgid "Do not rewrite"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:22
 msgid "Drop invalid packets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:270
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:149
 msgid "Enable NAT Loopback"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:20
 msgid "Enable SYN-flood protection"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:144
 msgid "Enable logging on this zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:43
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:98
 msgid "External IP address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:111
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
 msgid "External port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
+msgid "External zone"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:158
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:331
 msgid "Extra arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid "Extra destination arguments"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
-msgid "Extra iptables arguments"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid "Extra source arguments"
-msgstr ""
-
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
 msgid "Firewall"
 msgstr ""
@@ -250,270 +215,314 @@ msgstr ""
 msgid "Firewall - Custom Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:13
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:8
 msgid "Firewall - Port Forwards"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:12
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:42
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:9
 msgid "Firewall - Traffic Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:15
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:11
 msgid "Firewall - Zone Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:141
 msgid "Force connection tracking"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:76
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:27
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:92
 msgid "Forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:116
 msgid "Forward to"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:343
 msgid "Friday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:106
 msgid "From %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:88
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:104
 msgid "From %s in %s with source %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:102
 msgid "From %s in %s with source %s and %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:117
 msgid "From %s on <var>this device</var>"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:115
 msgid "From %s on <var>this device</var> with source %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:113
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:10
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:56
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:16
 msgid "General Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:51
 msgid "Hardware flow offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:85
 msgid "IPv4"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:185
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:118
 msgid "IPv4 and IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:119
 msgid "IPv4 only"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:87
 msgid "IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:120
 msgid "IPv6 only"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:25
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:90
 msgid "Input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:157
+msgid "Inter-Zone Forwarding"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:127
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
 msgid "Internal IP address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:138
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
 msgid "Internal port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:121
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
 msgid "Internal zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:150
 msgid "Limit log messages"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:102
 msgid "MSS clamping"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:101
 msgid "Masquerading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:105
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:162
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:247
 msgid "Match"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:206
 msgid "Match ICMP type"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:118
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:112
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:91
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:339
 msgid "Monday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:346
 msgid "Month Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:50
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:180
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:60
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
 msgid "Name"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:169
-msgid "Network"
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
+msgid "New SNAT rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
+msgid "New forward rule"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
+msgid "New input rule"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
+msgid "New port forward"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
+msgid "New source NAT"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:99
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:63
 msgid "Only match incoming traffic from these MACs."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:75
 msgid "Only match incoming traffic from this IP or range."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:87
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
+msgid "Open ports on router"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
+msgid "Other..."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:26
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:91
 msgid "Output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:288
+msgid "Output zone"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:160
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:332
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
-msgid ""
-"Passing raw iptables arguments to source and destination traffic "
-"classification rules allows to match packets based on other criteria than "
-"interfaces or subnets. These options should be used with extreme care as "
-"invalid values could render the firewall ruleset broken, completely exposing "
-"all services."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:14
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:17
 msgid "Port Forwards"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:9
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
-msgid ""
-"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
-"connection tracking."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:39
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:190
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
 msgid "Protocol"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:139
 msgid ""
 "Redirect matched incoming traffic to the given port on the internal host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:128
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:52
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
@@ -521,20 +530,38 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:132
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:123
 msgid "Restrict Masquerading to given source subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:183
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:115
 msgid "Restrict to address family"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:132
+msgid "Rewrite matched traffic to the given address."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:147
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:266
+msgid "Rewrite to source %s"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:264
+msgid "Rewrite to source %s, %s"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:42
 msgid "Routing/NAT Offloading"
 msgstr ""
 
@@ -546,69 +573,92 @@ msgstr ""
 msgid "Rule is enabled"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:131
+msgid "SNAT IP address"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:146
+msgid "SNAT port"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:344
 msgid "Saturday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:47
 msgid "Software based offloading for routing/NAT"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:46
 msgid "Software flow offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:79
 msgid "Source IP address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:261
 msgid "Source MAC address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:194
+msgid "Source NAT"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:195
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:270
 msgid "Source address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:279
 msgid "Source port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:254
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
 msgid "Source zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:357
 msgid "Start Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
-msgid "Start Time (hh.mm.ss)"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:353
+msgid "Start Time (hh:mm:ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:359
 msgid "Stop Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
-msgid "Stop Time (hh.mm.ss)"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:355
+msgid "Stop Time (hh:mm:ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:338
 msgid "Sunday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:12
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:158
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -618,7 +668,19 @@ msgid ""
 "<em>not</em> imply a permission to forward from wan to lan as well."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:14
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:13
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:36
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -627,205 +689,202 @@ 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:349
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:342
 msgid "Thursday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
-msgid "Time Restrictions"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:362
 msgid "Time in UTC"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:141
 msgid "To %s at %s on <var>this device</var>"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:132
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:157
 msgid "To %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:143
 msgid "To %s on <var>this device</var>"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:130
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:155
 msgid "To %s, %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
+msgid "To source IP"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
+msgid "To source port"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:18
 msgid "Traffic Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:10
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
 "the router."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:340
 msgid "Tuesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:244
+msgid "Unnamed SNAT"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:67
 msgid "Unnamed forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:76
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
-msgid "Unnamed zone"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid ""
-"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
-"network devices."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid ""
-"Use this option to classify zone traffic by source or destination subnet "
-"instead of networks or devices."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:101
 msgid "Via %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:99
 msgid "Via %s at %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:341
 msgid "Wednesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:335
 msgid "Week Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:55
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:35
+msgid "Zone %q"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:83
 msgid "Zone ⇒ Forwardings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:59
 msgid "Zones"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:325
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:33
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:98
 msgid "accept"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:108
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:141
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:263
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:272
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:281
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:306
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:315
 msgid "any"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:120
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:100
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:150
 msgid "any host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:111
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:138
 msgid "any router IP"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:119
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:149
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:327
 msgid "don't track"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:324
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:32
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:97
 msgid "drop"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:326
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:31
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:96
 msgid "reject"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
-msgid "this new zone"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:82
+msgid "traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr ""
diff --git a/luci-app-firewall/po/uk/firewall.po b/luci-app-firewall/po/uk/firewall.po
index 8dd0b5a0a..40b3fb993 100644
--- a/luci-app-firewall/po/uk/firewall.po
+++ b/luci-app-firewall/po/uk/firewall.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: \n"
-"PO-Revision-Date: 2019-09-21 22:10+0300\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2018-12-29 23:25+0200\n"
 "Last-Translator: Yurii <yuripet@gmail.com>\n"
 "Language-Team: none\n"
 "Language: uk\n"
@@ -9,136 +9,94 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:127
 msgid "%s in %s"
 msgstr "%s у %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr "%s%s із %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:125
 msgid "%s, %s in %s"
 msgstr "%s, %s у %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:26
+msgid "(Unnamed Entry)"
+msgstr "(Запис без назви)"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:169
+msgid "(Unnamed Rule)"
+msgstr "(Правило без назви)"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:37
+msgid "(Unnamed SNAT)"
+msgstr "(SNAT без назви)"
+
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr "<var>%d</var> пакетів за <var>%s</var>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr "<var>%d</var> пакетів за <var>%s</var>, підряд <var>%d</var> пакетів"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:180
 msgid "<var>%s</var> and limit to %s"
 msgstr "<var>%s</var> з лімітом %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr "Приймати переспрямовування"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr "Приймати вхідний"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr "Приймати вихідний"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:257
 msgid "Action"
 msgstr "Дія"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone destination "
-"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
-"traffic."
-msgstr ""
-"Додаткові аргументи raw <em>iptables</em> для класифікації трафіку "
-"призначення зони, наприклад, <code>-p tcp --dport 443</code>, щоб зіставляти "
-"лише вихідний трафік HTTPS."
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
+msgid "Add"
+msgstr "Додати"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
-"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
-msgstr ""
-"Додаткові аргументи raw <em>iptables</em> для класифікації трафіку джерела "
-"зони, наприклад, <code>-p tcp --sport 443</code>, щоб зіставляти лише "
-"вхідний трафік HTTPS."
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
+msgid "Add and edit..."
+msgstr "Додати та редагувати..."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:57
 msgid "Advanced Settings"
 msgstr "Розширені настройки"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid "Allow \"invalid\" traffic"
-msgstr "Дозволити \"неправильний\" трафік"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:178
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Дозволити переспрямовування від <em>зон джерела</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:170
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "Дозволити переспрямовування до <em>зон призначення</em>:"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:89
 msgid "Any"
 msgstr "Будь-який"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
-msgid "Any day"
-msgstr "Будь-який день"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid "Automatic helper assignment"
-msgstr "Автоматичне призначення помічника"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid ""
-"Automatically assign conntrack helpers based on traffic protocol and port"
-msgstr ""
-"Автоматично призначати помічників відслідковування з'єднань (<abbr title="
-"\"Connection tracking\">Conntrack</abbr>) на підставі протоколу та порту "
-"трафіку"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
-msgid "Conntrack Settings"
-msgstr ""
-"Параметри відслідковування з'єднань (<abbr title=\"Connection tracking"
-"\">Conntrack</abbr>)"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Conntrack helpers"
-msgstr ""
-"Помічники відслідковування з'єднань (<abbr title=\"Connection tracking"
-"\">Conntrack</abbr>)"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid "Covered devices"
-msgstr "Охоплені пристрої"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:88
 msgid "Covered networks"
-msgstr "Охоплені мережі"
+msgstr "Покриті мережі"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid "Covered subnets"
-msgstr "Охоплені підмережі"
-
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:22
 msgid "Custom Rules"
 msgstr "Настроювані правила"
 
@@ -149,19 +107,27 @@ msgid ""
 "each firewall restart, right after the default ruleset has been loaded."
 msgstr ""
 "Настроювані правила дозволяють виконувати довільні команди <em>iptables</"
-"em>, які в іншому випадку не охоплено в межах брандмауера. Команди "
+"em>, які в іншому випадку не охоплені в межах брандмауера. Команди "
 "виконуються після кожного перезавантаження брандмауера, відразу після "
 "завантаження типового набору правил."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:108
+msgid "Destination IP address"
+msgstr "IP-адреса призначення"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:304
 msgid "Destination address"
 msgstr "Адреса призначення"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:313
 msgid "Destination port"
 msgstr "Порт призначення"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:102
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:295
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
 msgid "Destination zone"
 msgstr "Зона призначення"
 
@@ -169,102 +135,83 @@ msgstr "Зона призначення"
 msgid "Disable"
 msgstr "Вимкнути"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr "Відкидати переспрямовування"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr "Відкидати вхідний"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr "Відкидати вихідний"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid ""
-"Do not install extra rules to reject forwarded traffic with conntrack state "
-"<em>invalid</em>. This may be required for complex asymmetric route setups."
-msgstr ""
-"Не встановлювати додаткові правила для відхилення переспрямованого трафіку "
-"зі станом відслідковування з'єднань <em>invalid</em>. Це може знадобитися "
-"для складних налаштувань асиметричного маршруту."
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:151
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
+msgid "Do not rewrite"
+msgstr "Не перезаписувати"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr "Не відслідковувати переспрямовування"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr "Не відслідковувати вхідний"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr "Не відслідковувати вихідний"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:22
 msgid "Drop invalid packets"
 msgstr "Відкидати помилкові пакети"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:270
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "Увімкнути"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:149
 msgid "Enable NAT Loopback"
 msgstr "Увімкнути NAT Loopback"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:20
 msgid "Enable SYN-flood protection"
 msgstr "Увімкнути захист від SYN-flood"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:144
 msgid "Enable logging on this zone"
 msgstr "Увімкнути реєстрування у цій зоні"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:43
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr "Експериментальна функція. Не повністю сумісно з QoS / SQM."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
-msgstr ""
-"В явному вигляді дозволені помічники відслідковування з'єднань для трафіку "
-"зони"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:98
 msgid "External IP address"
 msgstr "Зовнішня IP-адреса"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:111
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
 msgid "External port"
 msgstr "Зовнішній порт"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
+msgid "External zone"
+msgstr "Зовнішня зона"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:158
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:331
 msgid "Extra arguments"
 msgstr "Додаткові аргументи"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid "Extra destination arguments"
-msgstr "Додаткові аргументи для призначення"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
-msgid "Extra iptables arguments"
-msgstr "Додаткові аргументи iptables"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid "Extra source arguments"
-msgstr "Додаткові аргументи для джерела"
-
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
 msgid "Firewall"
 msgstr "Брандмауер"
@@ -273,162 +220,180 @@ msgstr "Брандмауер"
 msgid "Firewall - Custom Rules"
 msgstr "Брандмауер — Настроювані правила"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:13
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:8
 msgid "Firewall - Port Forwards"
 msgstr "Брандмауер — Переспрямовування портів"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:12
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:42
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:9
 msgid "Firewall - Traffic Rules"
 msgstr "Брандмауер — Правила трафіка"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:15
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:11
 msgid "Firewall - Zone Settings"
 msgstr "Брандмауер — Параметри зон"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:141
 msgid "Force connection tracking"
-msgstr "Примусове відслідковування з'єднань"
+msgstr "Увімкнути відстеження з'єднань"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:76
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:27
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:92
 msgid "Forward"
 msgstr "Переспрямовування"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:116
 msgid "Forward to"
 msgstr "переспрямовування до"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:343
 msgid "Friday"
 msgstr "П'ятниця"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:106
 msgid "From %s in %s"
 msgstr "%s у %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:88
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:104
 msgid "From %s in %s with source %s"
 msgstr "%s у %s з джерелом %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:102
 msgid "From %s in %s with source %s and %s"
 msgstr "%s у %s з джерелом %s та %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:117
 msgid "From %s on <var>this device</var>"
 msgstr "Від %s на <var>цьому пристрої</var>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:115
 msgid "From %s on <var>this device</var> with source %s"
 msgstr "Від %s на <var>цьому пристрої</var> з джерелом %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:113
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr "Від %s на <var>цьому пристрої</var> з джерелом %s та %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:10
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:56
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:16
 msgid "General Settings"
-msgstr "Загальні параметри"
+msgstr "Загальні настройки"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:51
 msgid "Hardware flow offloading"
 msgstr "Апаратні засоби розвантаження потоку"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr "IP-адреса"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr "Діапазон IP"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr "IP-адреси"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:85
 msgid "IPv4"
 msgstr "IPv4"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:185
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:118
 msgid "IPv4 and IPv6"
 msgstr "IPv4 та IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:119
 msgid "IPv4 only"
 msgstr "Лише IPv4"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:87
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:120
 msgid "IPv6 only"
 msgstr "Лише IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:25
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:90
 msgid "Input"
 msgstr "Вхідний"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:157
+msgid "Inter-Zone Forwarding"
+msgstr "Переспрямовування між зонами"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:127
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
 msgid "Internal IP address"
 msgstr "Внутрішня IP-адреса"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:138
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
 msgid "Internal port"
 msgstr "Внутрішній порт"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:121
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
 msgid "Internal zone"
 msgstr "Внутрішня зона"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:150
 msgid "Limit log messages"
 msgstr "Обмеження повідомлень журналу"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr "MAC-адреса"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr "MAC-адреси"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:102
 msgid "MSS clamping"
 msgstr "Затискання MSS"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:101
 msgid "Masquerading"
 msgstr "Підміна"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:105
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:162
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:247
 msgid "Match"
 msgstr "Зіставляти"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:206
 msgid "Match ICMP type"
 msgstr "Зіставляти ICMP типу"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:118
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr ""
+"Зіставляти трафік, що переспрямовується на заданий порт призначення або "
+"діапазон портів."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:112
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
@@ -436,38 +401,68 @@ msgstr ""
 "Зіставляти вхідний трафік, спрямований на заданий порт призначення або "
 "діапазон портів цього вузла."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:91
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr ""
+"Зіставляти вхідний трафік, що виникає на заданому порту джерела або "
+"діапазоні портів вузла клієнта."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:339
 msgid "Monday"
 msgstr "Понеділок"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:346
 msgid "Month Days"
 msgstr "Дні місяця"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:50
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:180
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:60
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
 msgid "Name"
 msgstr "Ім'я"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:169
-msgid "Network"
-msgstr "Мережа"
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
+msgid "New SNAT rule"
+msgstr "Нове правило SNAT"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
+msgid "New forward rule"
+msgstr "Нове правило переспрямовування"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
+msgid "New input rule"
+msgstr "Нове вхідне правило"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
+msgid "New port forward"
+msgstr "Нове переспрямовування порту"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
+msgid "New source NAT"
+msgstr "Новий NAT джерела"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:99
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr "Зіставляти тільки вхідний трафік, спрямований на задану IP-адресу."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:63
 msgid "Only match incoming traffic from these MACs."
 msgstr "Зіставляти тільки вхідний трафік від цих MAC-адрес."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:75
 msgid "Only match incoming traffic from this IP or range."
 msgstr "Зіставляти тільки вхідний трафік від цього IP чи діапазону."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:87
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
@@ -475,37 +470,38 @@ msgstr ""
 "Зіставляти тільки вхідний трафік, що виникає на заданому порту джерела або "
 "діапазоні портів вузла клієнта."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
+msgid "Open ports on router"
+msgstr "Відкрити порти на роутері"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
+msgid "Other..."
+msgstr "Інше..."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:26
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:91
 msgid "Output"
 msgstr "Вихідний"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:288
+msgid "Output zone"
+msgstr "Вихідна зона"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:160
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:332
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 "Передача додаткових аргументів для IPTables. Використовуйте з обережністю!"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
-msgid ""
-"Passing raw iptables arguments to source and destination traffic "
-"classification rules allows to match packets based on other criteria than "
-"interfaces or subnets. These options should be used with extreme care as "
-"invalid values could render the firewall ruleset broken, completely exposing "
-"all services."
-msgstr ""
-"Передавання аргументів raw iptables до правил класифікації вихідного трафіку "
-"та трафіку призначення дозволяє зіставляти пакети на підставі інших "
-"критеріїв, ніж інтерфейси чи підмережі. Ці параметри слід використовувати з "
-"особливою обережністю, оскільки невірні значення можуть призвести до "
-"порушення набору правил брандмауера, повністю відкриваючи всі служби."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:14
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:17
 msgid "Port Forwards"
 msgstr "Переспрямовування портів"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:9
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
@@ -513,45 +509,37 @@ msgstr ""
 "Переспрямовування портів дозволяє віддаленим комп'ютерам з Інтернету "
 "підключатися до певного комп'ютера або служби у приватній мережі."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
-msgid ""
-"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
-"connection tracking."
-msgstr ""
-"Запобігати встановленню правил NOTRACK, які могли б обійти відслідковування "
-"з'єднань."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:39
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:190
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
 msgid "Protocol"
 msgstr "Протокол"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:139
 msgid ""
 "Redirect matched incoming traffic to the given port on the internal host"
 msgstr ""
 "Переспрямувати відповідний вхідний трафік на заданий порт внутрішнього вузла"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:128
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "Переспрямувати відповідний вхідний трафік на заданий внутрішній вузол"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr "Відхиляти переспрямовування"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr "Відхиляти вхідний"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr "Відхиляти вихідний"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:52
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr "Необхідна апаратна підтримка NAT. Упроваджено принаймні для mt7621"
 
@@ -559,20 +547,40 @@ msgstr "Необхідна апаратна підтримка NAT. Упрова
 msgid "Restart Firewall"
 msgstr "Перезавантажити брандмауер"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:132
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "Обмежити підміну заданими підмережами призначення"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:123
 msgid "Restrict Masquerading to given source subnets"
 msgstr "Обмежити підміну заданими підмережами джерела"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:183
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:115
 msgid "Restrict to address family"
 msgstr "Обмежити сімейство протоколів"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:132
+msgid "Rewrite matched traffic to the given address."
+msgstr "Переписувати зіставлений трафік на вказану адресу."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:147
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr ""
+"Переписувати зіставлений трафік на вказаний порт джерела. Може залишатися "
+"порожнім, щоб переписувати тільки IP-адресу."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:266
+msgid "Rewrite to source %s"
+msgstr "перезапис на джерело %s"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:264
+msgid "Rewrite to source %s, %s"
+msgstr "перезапис на джерело %s, %s"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:42
 msgid "Routing/NAT Offloading"
 msgstr "Розвантаження маршрутизації/NAT"
 
@@ -584,62 +592,89 @@ msgstr "Правило вимкнено"
 msgid "Rule is enabled"
 msgstr "Правило ввімкнено"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:131
+msgid "SNAT IP address"
+msgstr "IP-адреса SNAT"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:146
+msgid "SNAT port"
+msgstr "Порт SNAT"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:344
 msgid "Saturday"
 msgstr "Субота"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:47
 msgid "Software based offloading for routing/NAT"
 msgstr "Програмне розвантаження для маршрутизації/NAT"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:46
 msgid "Software flow offloading"
 msgstr "Програмне розвантаження потоку"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:79
 msgid "Source IP address"
 msgstr "IP-адреса джерела"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:261
 msgid "Source MAC address"
 msgstr "MAC-адреса джерела"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:194
+msgid "Source NAT"
+msgstr "NAT джерела"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:195
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+"NAT джерела є специфічною формою маскування, яка дозволяє мати детальний "
+"контроль над IP джерела, що використовуються для вихідного трафіку, "
+"наприклад, для зіставлення кількох WAN-адрес внутрішнім підмережам."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:270
 msgid "Source address"
 msgstr "Адреса джерела"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:279
 msgid "Source port"
 msgstr "Порт джерела"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:254
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
 msgid "Source zone"
 msgstr "Зона джерела"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:357
 msgid "Start Date (yyyy-mm-dd)"
 msgstr "Дата початку (рррр-мм-дд)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
-msgid "Start Time (hh.mm.ss)"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:353
+msgid "Start Time (hh:mm:ss)"
 msgstr "Час початку (гг:хх:сс)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:359
 msgid "Stop Date (yyyy-mm-dd)"
 msgstr "Дата зупинки (рррр-мм-дд)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
-msgid "Stop Time (hh.mm.ss)"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:355
+msgid "Stop Time (hh:mm:ss)"
 msgstr "Час зупинки (гг:хх:сс)"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:338
 msgid "Sunday"
 msgstr "Неділя"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:12
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
@@ -647,8 +682,7 @@ msgstr ""
 "Брандмауер створює зони поверх ваших мережевих інтерфейсів для управління "
 "потоком мережевого трафіку."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:158
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -665,7 +699,24 @@ msgstr ""
 "від LAN до WAN <em>не</em> означає, що є також дозвіл спрямовувати від WAN "
 "до LAN."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:14
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr ""
+"На цій сторінці можна змінити додаткові властивості елемента "
+"переспрямовування портів. У більшості випадків змінювати ці параметри немає "
+"потреби."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:13
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr ""
+"На цій сторінці можна змінити додаткові властивості елемента правил трафіка, "
+"таких як відповідні параметри джерела та вузлів призначення."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:36
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -679,40 +730,46 @@ msgstr ""
 "трафіку між різними мережами в межах зони. Пункт <em>Покриті мережі</em> "
 "визначає, які доступні мережі є членами цієї зони."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:342
 msgid "Thursday"
 msgstr "Четвер"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
-msgid "Time Restrictions"
-msgstr "Часові обмеження"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:362
 msgid "Time in UTC"
 msgstr "Час в UTC"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:141
 msgid "To %s at %s on <var>this device</var>"
 msgstr "%s на %s <var>цього пристрою</var>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:132
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:157
 msgid "To %s in %s"
 msgstr "%s у %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:143
 msgid "To %s on <var>this device</var>"
 msgstr "%s на <var>цього пристрою</var>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:130
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:155
 msgid "To %s, %s in %s"
 msgstr "%s, %s у %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
+msgid "To source IP"
+msgstr "До IP джерела"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
+msgid "To source port"
+msgstr "До порту джерела"
+
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:18
 msgid "Traffic Rules"
 msgstr "Правила трафіка"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:10
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
@@ -722,169 +779,158 @@ msgstr ""
 "різними зонами, наприклад, відхиляти трафік між певними вузлами або відкрити "
 "порти WAN на маршрутизаторі."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:340
 msgid "Tuesday"
 msgstr "Вівторок"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:244
+msgid "Unnamed SNAT"
+msgstr "SNAT без назви"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:67
 msgid "Unnamed forward"
 msgstr "Переспрямовування без назви"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:76
 msgid "Unnamed rule"
 msgstr "Правило без назви"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
-msgid "Unnamed zone"
-msgstr "Зона без назви"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid ""
-"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
-"network devices."
-msgstr ""
-"Використовуйте цей параметр для класифікації трафіку зон за мережевими "
-"пристроями <em>raw</em>, які не управляються через <em>uci</em>."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid ""
-"Use this option to classify zone traffic by source or destination subnet "
-"instead of networks or devices."
-msgstr ""
-"Використовуйте цей параметр для класифікації трафіку зон за підмережею "
-"джерела чи призначення замість мереж або пристроїв."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:101
 msgid "Via %s"
 msgstr "Через %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:99
 msgid "Via %s at %s"
 msgstr "Через %s на %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:341
 msgid "Wednesday"
 msgstr "Середа"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:335
 msgid "Week Days"
 msgstr "Дні тижня"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:55
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr ""
+"Ви можете вказати кілька протоколів, вибравши \"-- додатково --\", а потім "
+"увівши їх, розділяючи пробілами."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:35
+msgid "Zone %q"
+msgstr "Зона %q"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:83
 msgid "Zone ⇒ Forwardings"
 msgstr "Зона ⇒ Переспрямовування"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:59
 msgid "Zones"
 msgstr "Зони"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:325
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:33
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:98
 msgid "accept"
 msgstr "приймати"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:108
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:141
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:263
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:272
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:281
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:306
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:315
 msgid "any"
 msgstr "будь-який"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:120
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:100
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:150
 msgid "any host"
 msgstr "будь-який вузол"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:111
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:138
 msgid "any router IP"
 msgstr "будь-який IP роутера"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:119
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:149
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr "будь-якій зоні"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr "день"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:327
 msgid "don't track"
 msgstr "не відстеж."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:324
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:32
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:97
 msgid "drop"
 msgstr "опускати"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr "година"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr "хвилина"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr "не"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr "порт"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr "порти"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:326
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:31
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:96
 msgid "reject"
 msgstr "відкидати"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
-msgstr "секунду"
+msgstr "секунда"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
-msgid "this new zone"
-msgstr "ця нова зона"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:82
+msgid "traffic"
+msgstr "трафік"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr "типом"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr "типами"
diff --git a/luci-app-firewall/po/vi/firewall.po b/luci-app-firewall/po/vi/firewall.po
index 31868bac6..d25d15b08 100644
--- a/luci-app-firewall/po/vi/firewall.po
+++ b/luci-app-firewall/po/vi/firewall.po
@@ -13,123 +13,94 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:127
 msgid "%s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:125
 msgid "%s, %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:26
+msgid "(Unnamed Entry)"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:169
+msgid "(Unnamed Rule)"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:37
+msgid "(Unnamed SNAT)"
+msgstr ""
+
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:180
 msgid "<var>%s</var> and limit to %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:257
 msgid "Action"
 msgstr "Action"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone destination "
-"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
-"traffic."
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
+msgid "Add"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
-"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
+msgid "Add and edit..."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:57
 msgid "Advanced Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid "Allow \"invalid\" traffic"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:178
 msgid "Allow forward from <em>source zones</em>:"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:170
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:89
 msgid "Any"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
-msgid "Any day"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid "Automatic helper assignment"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid ""
-"Automatically assign conntrack helpers based on traffic protocol and port"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
-msgid "Conntrack Settings"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Conntrack helpers"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid "Covered devices"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:88
 msgid "Covered networks"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid "Covered subnets"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:22
 msgid "Custom Rules"
 msgstr ""
 
@@ -140,15 +111,23 @@ msgid ""
 "each firewall restart, right after the default ruleset has been loaded."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:108
+msgid "Destination IP address"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:304
 msgid "Destination address"
 msgstr "Địa chỉ điểm đến"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:313
 msgid "Destination port"
 msgstr "Cổng điểm đến"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:102
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:295
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
 #, fuzzy
 msgid "Destination zone"
 msgstr "Điểm đến"
@@ -157,98 +136,84 @@ msgstr "Điểm đến"
 msgid "Disable"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid ""
-"Do not install extra rules to reject forwarded traffic with conntrack state "
-"<em>invalid</em>. This may be required for complex asymmetric route setups."
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:151
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
+msgid "Do not rewrite"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:22
 msgid "Drop invalid packets"
 msgstr "Bỏ qua nhưng gói không hợp lý"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:270
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:149
 msgid "Enable NAT Loopback"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:20
 #, fuzzy
 msgid "Enable SYN-flood protection"
 msgstr "SYN-flood bảo vệ "
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:144
 msgid "Enable logging on this zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:43
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:98
 msgid "External IP address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:111
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
 msgid "External port"
 msgstr "External port"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
+msgid "External zone"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:158
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:331
 msgid "Extra arguments"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid "Extra destination arguments"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
-msgid "Extra iptables arguments"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid "Extra source arguments"
-msgstr ""
-
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
 msgid "Firewall"
 msgstr "Firewall"
@@ -257,273 +222,317 @@ msgstr "Firewall"
 msgid "Firewall - Custom Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:13
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:8
 msgid "Firewall - Port Forwards"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:12
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:42
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:9
 msgid "Firewall - Traffic Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:15
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:11
 msgid "Firewall - Zone Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:141
 msgid "Force connection tracking"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:76
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:27
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:92
 msgid "Forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:116
 msgid "Forward to"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:343
 msgid "Friday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:106
 msgid "From %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:88
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:104
 msgid "From %s in %s with source %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:102
 msgid "From %s in %s with source %s and %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:117
 msgid "From %s on <var>this device</var>"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:115
 msgid "From %s on <var>this device</var> with source %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:113
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:10
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:56
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:16
 msgid "General Settings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:51
 msgid "Hardware flow offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:85
 msgid "IPv4"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:185
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:118
 msgid "IPv4 and IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:119
 msgid "IPv4 only"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:87
 msgid "IPv6"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:120
 msgid "IPv6 only"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:25
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:90
 msgid "Input"
 msgstr "Input"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:157
+msgid "Inter-Zone Forwarding"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:127
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
 #, fuzzy
 msgid "Internal IP address"
 msgstr "Internal address"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:138
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
 #, fuzzy
 msgid "Internal port"
 msgstr "External port"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:121
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
 msgid "Internal zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:150
 msgid "Limit log messages"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:102
 #, fuzzy
 msgid "MSS clamping"
 msgstr "MSS Clamping"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:101
 msgid "Masquerading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:105
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:162
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:247
 msgid "Match"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:206
 msgid "Match ICMP type"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:118
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:112
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:91
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:339
 msgid "Monday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:346
 msgid "Month Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:50
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:180
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:60
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
 msgid "Name"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:169
-msgid "Network"
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
+msgid "New SNAT rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
+msgid "New forward rule"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
+msgid "New input rule"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
+msgid "New port forward"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
+msgid "New source NAT"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:99
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:63
 msgid "Only match incoming traffic from these MACs."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:75
 msgid "Only match incoming traffic from this IP or range."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:87
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
+msgid "Open ports on router"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
+msgid "Other..."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:26
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:91
 msgid "Output"
 msgstr "Output"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:288
+msgid "Output zone"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:160
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:332
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
-msgid ""
-"Passing raw iptables arguments to source and destination traffic "
-"classification rules allows to match packets based on other criteria than "
-"interfaces or subnets. These options should be used with extreme care as "
-"invalid values could render the firewall ruleset broken, completely exposing "
-"all services."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:14
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:17
 msgid "Port Forwards"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:9
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
-msgid ""
-"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
-"connection tracking."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:39
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:190
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
 msgid "Protocol"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:139
 msgid ""
 "Redirect matched incoming traffic to the given port on the internal host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:128
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:52
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr ""
 
@@ -531,20 +540,38 @@ msgstr ""
 msgid "Restart Firewall"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:132
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:123
 msgid "Restrict Masquerading to given source subnets"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:183
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:115
 msgid "Restrict to address family"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:132
+msgid "Rewrite matched traffic to the given address."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:147
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:266
+msgid "Rewrite to source %s"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:264
+msgid "Rewrite to source %s, %s"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:42
 msgid "Routing/NAT Offloading"
 msgstr ""
 
@@ -556,65 +583,89 @@ msgstr ""
 msgid "Rule is enabled"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:131
+msgid "SNAT IP address"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:146
+msgid "SNAT port"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:344
 msgid "Saturday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:47
 msgid "Software based offloading for routing/NAT"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:46
 msgid "Software flow offloading"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:79
 #, fuzzy
 msgid "Source IP address"
 msgstr "Đỉa chỉ MAC nguồn"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:261
 msgid "Source MAC address"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:194
+msgid "Source NAT"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:195
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:270
 #, fuzzy
 msgid "Source address"
 msgstr "Đỉa chỉ MAC nguồn"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:279
 msgid "Source port"
 msgstr "Cổng nguồn"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:254
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
 #, fuzzy
 msgid "Source zone"
 msgstr "Cổng nguồn"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:357
 msgid "Start Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
-msgid "Start Time (hh.mm.ss)"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:353
+msgid "Start Time (hh:mm:ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:359
 msgid "Stop Date (yyyy-mm-dd)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
-msgid "Stop Time (hh.mm.ss)"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:355
+msgid "Stop Time (hh:mm:ss)"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:338
 msgid "Sunday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:12
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
@@ -622,8 +673,7 @@ msgstr ""
 "The firewall tạo zones trên giao diện mạng lưới để điều triển sự dòng lưu "
 "thông của mạng."
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:158
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -633,7 +683,19 @@ msgid ""
 "<em>not</em> imply a permission to forward from wan to lan as well."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:14
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:13
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:36
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -642,205 +704,202 @@ 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:349
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:342
 msgid "Thursday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
-msgid "Time Restrictions"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:362
 msgid "Time in UTC"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:141
 msgid "To %s at %s on <var>this device</var>"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:132
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:157
 msgid "To %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:143
 msgid "To %s on <var>this device</var>"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:130
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:155
 msgid "To %s, %s in %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
+msgid "To source IP"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
+msgid "To source port"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:18
 msgid "Traffic Rules"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:10
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
 "the router."
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:340
 msgid "Tuesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:244
+msgid "Unnamed SNAT"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:67
 msgid "Unnamed forward"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:76
 msgid "Unnamed rule"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
-msgid "Unnamed zone"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid ""
-"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
-"network devices."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid ""
-"Use this option to classify zone traffic by source or destination subnet "
-"instead of networks or devices."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:101
 msgid "Via %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:99
 msgid "Via %s at %s"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:341
 msgid "Wednesday"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:335
 msgid "Week Days"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:55
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:35
+msgid "Zone %q"
+msgstr ""
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:83
 msgid "Zone ⇒ Forwardings"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:59
 msgid "Zones"
 msgstr "Zones"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:325
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:33
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:98
 msgid "accept"
 msgstr "chấp nhận"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:108
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:141
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:263
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:272
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:281
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:306
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:315
 msgid "any"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:120
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:100
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:150
 msgid "any host"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:111
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:138
 msgid "any router IP"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:119
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:149
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:327
 msgid "don't track"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:324
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:32
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:97
 msgid "drop"
 msgstr "drop"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:326
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:31
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:96
 msgid "reject"
 msgstr "Không chấp nhận"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
-msgid "this new zone"
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:82
+msgid "traffic"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr ""
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr ""
diff --git a/luci-app-firewall/po/zh-cn/firewall.po b/luci-app-firewall/po/zh-cn/firewall.po
index 28cd88b5c..3df951c10 100644
--- a/luci-app-firewall/po/zh-cn/firewall.po
+++ b/luci-app-firewall/po/zh-cn/firewall.po
@@ -11,123 +11,94 @@ msgstr ""
 "PO-Revision-Date: 2018-08-08 08:28+0800\n"
 "X-Generator: Gtranslator 2.91.7\n"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:127
 msgid "%s in %s"
 msgstr "%s 位于 %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr "%s%s 和 %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:125
 msgid "%s, %s in %s"
 msgstr "%s, %s 位于 %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:26
+msgid "(Unnamed Entry)"
+msgstr "（未命名条目）"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:169
+msgid "(Unnamed Rule)"
+msgstr "（未命名规则）"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:37
+msgid "(Unnamed SNAT)"
+msgstr "（未命名 SNAT）"
+
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr "<var>%d</var> 数据包/<var>%s</var>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr "<var>%d</var> 数据包/<var>%s</var>，突发 <var>%d</var> 数据包。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:180
 msgid "<var>%s</var> and limit to %s"
 msgstr "<var>%s</var> 并限制到 %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr "接受转发"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr "接受入站"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr "接受出站"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:257
 msgid "Action"
 msgstr "动作"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone destination "
-"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
-"traffic."
-msgstr ""
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
+msgid "Add"
+msgstr "添加"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
-"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
-msgstr ""
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
+msgid "Add and edit..."
+msgstr "添加并编辑…"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:57
 msgid "Advanced Settings"
 msgstr "高级设置"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid "Allow \"invalid\" traffic"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:178
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "允许从<em>源区域</em>转发："
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:170
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "允许转发到<em>目标区域</em>："
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:89
 msgid "Any"
 msgstr "任何"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
-msgid "Any day"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid "Automatic helper assignment"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid ""
-"Automatically assign conntrack helpers based on traffic protocol and port"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
-msgid "Conntrack Settings"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Conntrack helpers"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid "Covered devices"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:88
 msgid "Covered networks"
 msgstr "覆盖网络"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid "Covered subnets"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:22
 msgid "Custom Rules"
 msgstr "自定义规则"
 
@@ -140,15 +111,23 @@ msgstr ""
 "自定义规则允许您执行不属于防火墙框架的任意 iptables 命令。每次重启防火墙时，"
 "在默认的规则运行后这些命令将立即执行。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:108
+msgid "Destination IP address"
+msgstr "目标 IP 地址"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:304
 msgid "Destination address"
 msgstr "目标地址"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:313
 msgid "Destination port"
 msgstr "目标端口"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:102
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:295
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
 msgid "Destination zone"
 msgstr "目标区域"
 
@@ -156,97 +135,83 @@ msgstr "目标区域"
 msgid "Disable"
 msgstr "禁用"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr "丢弃转发"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr "丢弃入站"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr "丢弃出站"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid ""
-"Do not install extra rules to reject forwarded traffic with conntrack state "
-"<em>invalid</em>. This may be required for complex asymmetric route setups."
-msgstr ""
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:151
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
+msgid "Do not rewrite"
+msgstr "不重写"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr "不跟踪转发"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr "不跟踪入站"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr "不跟踪出站"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:22
 msgid "Drop invalid packets"
 msgstr "丢弃无效数据包"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:270
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "启用"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:149
 msgid "Enable NAT Loopback"
 msgstr "启用 NAT 环回"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:20
 msgid "Enable SYN-flood protection"
 msgstr "启用 SYN-flood 防御"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:144
 msgid "Enable logging on this zone"
 msgstr "启用此区域的日志记录"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:43
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr "实验特性。与 QoS/SQM 不完全兼容。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:98
 msgid "External IP address"
 msgstr "外部 IP 地址"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:111
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
 msgid "External port"
 msgstr "外部端口"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
+msgid "External zone"
+msgstr "外部区域"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:158
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:331
 msgid "Extra arguments"
 msgstr "附加参数"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid "Extra destination arguments"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
-msgid "Extra iptables arguments"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid "Extra source arguments"
-msgstr ""
-
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
 msgid "Firewall"
 msgstr "防火墙"
@@ -255,271 +220,315 @@ msgstr "防火墙"
 msgid "Firewall - Custom Rules"
 msgstr "防火墙 - 自定义规则"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:13
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:8
 msgid "Firewall - Port Forwards"
 msgstr "防火墙 - 端口转发"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:12
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:42
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:9
 msgid "Firewall - Traffic Rules"
 msgstr "防火墙 - 通信规则"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:15
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:11
 msgid "Firewall - Zone Settings"
 msgstr "防火墙 - 区域设置"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:141
 msgid "Force connection tracking"
 msgstr "强制连接追踪"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:76
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:27
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:92
 msgid "Forward"
 msgstr "转发"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:116
 msgid "Forward to"
 msgstr "转发到"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:343
 msgid "Friday"
 msgstr "星期五"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:106
 msgid "From %s in %s"
 msgstr "来自 %s 位于 %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:88
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:104
 msgid "From %s in %s with source %s"
 msgstr "来自 %s 位于 %s 源于 %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:102
 msgid "From %s in %s with source %s and %s"
 msgstr "来自 %s 位于 %s 源端口 %s 源 MAC %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:117
 msgid "From %s on <var>this device</var>"
 msgstr "来自 %s 位于<var>本设备</var>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:115
 msgid "From %s on <var>this device</var> with source %s"
 msgstr "来自 %s 位于<var>本设备</var>源于 %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:113
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr "来自 %s 位于<var>本设备</var>源端口 %s 源 MAC %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:10
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:56
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:16
 msgid "General Settings"
 msgstr "基本设置"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:51
 msgid "Hardware flow offloading"
 msgstr "硬件流量分载"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr "IP"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr "IP 范围"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr "IP"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:85
 msgid "IPv4"
 msgstr "IPv4"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:185
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:118
 msgid "IPv4 and IPv6"
 msgstr "IPv4 和 IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:119
 msgid "IPv4 only"
 msgstr "仅 IPv4"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:87
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:120
 msgid "IPv6 only"
 msgstr "仅 IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:25
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:90
 msgid "Input"
 msgstr "入站数据"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:157
+msgid "Inter-Zone Forwarding"
+msgstr "端口触发"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:127
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
 msgid "Internal IP address"
 msgstr "内部 IP 地址"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:138
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
 msgid "Internal port"
 msgstr "内部端口"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:121
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
 msgid "Internal zone"
 msgstr "内部区域"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:150
 msgid "Limit log messages"
 msgstr "限制日志信息"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr "MAC"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr "MAC"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:102
 msgid "MSS clamping"
 msgstr "MSS 钳制"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:101
 msgid "Masquerading"
 msgstr "IP 动态伪装"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:105
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:162
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:247
 msgid "Match"
 msgstr "匹配规则"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:206
 msgid "Match ICMP type"
 msgstr "匹配 ICMP 类型"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:118
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr "匹配指定目标端口或目标端口范围的转发流量。"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:112
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
 msgstr "匹配指向此主机上指定目标端口或目标端口范围的入站流量。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:91
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr "匹配来自客户端主机上指定源端口或源端口范围的入站流量。"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:339
 msgid "Monday"
 msgstr "星期一"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:346
 msgid "Month Days"
 msgstr "日期"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:50
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:180
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:60
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
 msgid "Name"
 msgstr "名字"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:169
-msgid "Network"
-msgstr ""
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
+msgid "New SNAT rule"
+msgstr "新建 SNAT 规则"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
+msgid "New forward rule"
+msgstr "新建转发规则"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
+msgid "New input rule"
+msgstr "新建进入规则"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
+msgid "New port forward"
+msgstr "新建端口转发"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
+msgid "New source NAT"
+msgstr "新建 Source NAT"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:99
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr "仅匹配指定目的 IP 地址的入站流量。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:63
 msgid "Only match incoming traffic from these MACs."
 msgstr "仅匹配来自这些 MAC 的入站流量。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:75
 msgid "Only match incoming traffic from this IP or range."
 msgstr "仅匹配来自此 IP 或 IP 范围的入站流量。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:87
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
 msgstr "仅匹配源自客户端主机上给定源端口或源端口范围的入站流量。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
+msgid "Open ports on router"
+msgstr "打开路由器端口"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
+msgid "Other..."
+msgstr "其它..."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:26
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:91
 msgid "Output"
 msgstr "出站数据"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:288
+msgid "Output zone"
+msgstr "出站区域"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:160
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:332
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr "传递到 iptables 的额外参数。小心使用！"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
-msgid ""
-"Passing raw iptables arguments to source and destination traffic "
-"classification rules allows to match packets based on other criteria than "
-"interfaces or subnets. These options should be used with extreme care as "
-"invalid values could render the firewall ruleset broken, completely exposing "
-"all services."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:14
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:17
 msgid "Port Forwards"
 msgstr "端口转发"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:9
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
 msgstr ""
 "端口转发允许 Internet 上的远程计算机连接到内部网络中的特定计算机或服务。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
-msgid ""
-"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
-"connection tracking."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:39
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:190
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
 msgid "Protocol"
 msgstr "协议"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:139
 msgid ""
 "Redirect matched incoming traffic to the given port on the internal host"
 msgstr "重定向匹配的入站流量到内部主机的端口"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:128
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "重定向匹配的入站流量到指定的内部主机"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr "拒绝转发"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr "拒绝入站"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr "拒绝出站"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:52
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr "需要硬件 NAT 支持。目前 mt7621 已实现"
 
@@ -527,20 +536,38 @@ msgstr "需要硬件 NAT 支持。目前 mt7621 已实现"
 msgid "Restart Firewall"
 msgstr "重启防火墙"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:132
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "要限制 IP 动态伪装的目标子网"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:123
 msgid "Restrict Masquerading to given source subnets"
 msgstr "要限制 IP 动态伪装的源子网"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:183
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:115
 msgid "Restrict to address family"
 msgstr "限制地址"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:132
+msgid "Rewrite matched traffic to the given address."
+msgstr "将匹配流量的源地址改写成指定地址。"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:147
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr "将匹配流量的源端口改写成指定端口。留空只改写 IP 地址。"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:266
+msgid "Rewrite to source %s"
+msgstr "源地址改写成 %s"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:264
+msgid "Rewrite to source %s, %s"
+msgstr "源地址改写成 %s, %s"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:42
 msgid "Routing/NAT Offloading"
 msgstr "Routing/NAT 分载"
 
@@ -552,69 +579,94 @@ msgstr "规则已禁用"
 msgid "Rule is enabled"
 msgstr "规则已启用"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:131
+msgid "SNAT IP address"
+msgstr "SNAT IP 地址"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:146
+msgid "SNAT port"
+msgstr "SNAT 端口"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:344
 msgid "Saturday"
 msgstr "星期六"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:47
 msgid "Software based offloading for routing/NAT"
 msgstr "基于软件的 Routing/NAT 分载"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:46
 msgid "Software flow offloading"
 msgstr "软件流量分载"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:79
 msgid "Source IP address"
 msgstr "源 IP 地址"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:261
 msgid "Source MAC address"
 msgstr "源 MAC 地址"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:194
+msgid "Source NAT"
+msgstr "Source NAT"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:195
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+"Source NAT 是一种特殊形式的封包伪装，它允许精细的控制传出流量的源 IP，例如："
+"将多个 WAN 地址映射到内部子网。"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:270
 msgid "Source address"
 msgstr "源地址"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:279
 msgid "Source port"
 msgstr "源端口"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:254
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
 msgid "Source zone"
 msgstr "源区域"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:357
 msgid "Start Date (yyyy-mm-dd)"
 msgstr "开始日期（yyyy-mm-dd）"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
-msgid "Start Time (hh.mm.ss)"
-msgstr ""
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:353
+msgid "Start Time (hh:mm:ss)"
+msgstr "开始时间（hh:mm:ss）"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:359
 msgid "Stop Date (yyyy-mm-dd)"
 msgstr "停止日期（yyyy-mm-dd）"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
-msgid "Stop Time (hh.mm.ss)"
-msgstr ""
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:355
+msgid "Stop Time (hh:mm:ss)"
+msgstr "停止时间（hh:mm:ss）"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:338
 msgid "Sunday"
 msgstr "星期日"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:12
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
 msgstr "防火墙通过在网络接口上创建区域来控制网络流量。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:158
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -628,7 +680,19 @@ msgstr ""
 "strong> 的区域的需转发流量。转发规则的作用是<em>单向</em>的，例如：一条允许"
 "从 lan 到 wan 的转发规则并不隐含有允许相反方向从 wan 到 lan 的流量转发。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:14
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr "本页面可以更改端口转发的高级设置。大多数情况下，不需要更改这些设置。"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:13
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr "本页面可以更改通信规则的高级设置，比如：需匹配的源主机和目标主机。"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:36
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -640,40 +704,46 @@ msgstr ""
 "域入站和出站流量的默认策略，<em>转发</em>选项描述该区域内不同网络之间的流量转"
 "发策略。<em>覆盖网络</em>指定从属于这个区域的网络。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:342
 msgid "Thursday"
 msgstr "星期四"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
-msgid "Time Restrictions"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:362
 msgid "Time in UTC"
 msgstr "UTC 时间"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:141
 msgid "To %s at %s on <var>this device</var>"
 msgstr "到 %s 在 %s 位于<var>本设备</var>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:132
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:157
 msgid "To %s in %s"
 msgstr "到 %s 位于 %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:143
 msgid "To %s on <var>this device</var>"
 msgstr "到 %s 位于<var>本设备</var>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:130
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:155
 msgid "To %s, %s in %s"
 msgstr "到 %s, %s 位于 %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
+msgid "To source IP"
+msgstr "到源 IP"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
+msgid "To source port"
+msgstr "到源端口"
+
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:18
 msgid "Traffic Rules"
 msgstr "通信规则"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:10
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
@@ -682,292 +752,156 @@ msgstr ""
 "通信规则定义了不同区域间的数据包传输策略，例如：拒绝一些主机之间的通信，开放"
 "路由器 WAN 上的端口。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:340
 msgid "Tuesday"
 msgstr "星期二"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:244
+msgid "Unnamed SNAT"
+msgstr "未命名 SNAT"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:67
 msgid "Unnamed forward"
 msgstr "未命名转发"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:76
 msgid "Unnamed rule"
 msgstr "未命名规则"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
-msgid "Unnamed zone"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid ""
-"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
-"network devices."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid ""
-"Use this option to classify zone traffic by source or destination subnet "
-"instead of networks or devices."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:101
 msgid "Via %s"
 msgstr "通过 %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:99
 msgid "Via %s at %s"
 msgstr "通过 %s 在 %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:341
 msgid "Wednesday"
 msgstr "星期三"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:335
 msgid "Week Days"
 msgstr "星期"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:55
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr "您也可以选择“--自定义--”来定义多个协议，在多个协议间需加空格。"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:35
+msgid "Zone %q"
+msgstr "区域 %q"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:83
 msgid "Zone ⇒ Forwardings"
 msgstr "区域 ⇒ 转发"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:59
 msgid "Zones"
 msgstr "区域"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:325
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:33
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:98
 msgid "accept"
 msgstr "接受"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:108
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:141
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:263
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:272
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:281
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:306
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:315
 msgid "any"
 msgstr "所有"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:120
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:100
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:150
 msgid "any host"
 msgstr "所有主机"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:111
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:138
 msgid "any router IP"
 msgstr "所有路由 IP"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:119
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:149
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr "所有区域"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr "日"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:327
 msgid "don't track"
 msgstr "不跟踪"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:324
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:32
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:97
 msgid "drop"
 msgstr "丢弃"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr "小时"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr "分钟"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr "非"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr "端口"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr "端口"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:326
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:31
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:96
 msgid "reject"
 msgstr "拒绝"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr "秒"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
-msgid "this new zone"
-msgstr ""
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:82
+msgid "traffic"
+msgstr "通信"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr "类型"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr "类型"
-
-#~ msgid "Add"
-#~ msgstr "添加"
-
-#~ msgid "Add and edit..."
-#~ msgstr "添加并编辑…"
-
-#~ msgid "Do not rewrite"
-#~ msgstr "不重写"
-
-#~ msgid "External zone"
-#~ msgstr "外部区域"
-
-#~ msgid "New SNAT rule"
-#~ msgstr "新建 SNAT 规则"
-
-#~ msgid "New forward rule"
-#~ msgstr "新建转发规则"
-
-#~ msgid "New input rule"
-#~ msgstr "新建进入规则"
-
-#~ msgid "New port forward"
-#~ msgstr "新建端口转发"
-
-#~ msgid "New source NAT"
-#~ msgstr "新建 Source NAT"
-
-#~ msgid "Open ports on router"
-#~ msgstr "打开路由器端口"
-
-#~ msgid "Other..."
-#~ msgstr "其它..."
-
-#~ msgid "To source IP"
-#~ msgstr "到源 IP"
-
-#~ msgid "To source port"
-#~ msgstr "到源端口"
-
-#~ msgid "Output zone"
-#~ msgstr "出站区域"
-
-#~ msgid "(Unnamed Entry)"
-#~ msgstr "（未命名条目）"
-
-#~ msgid "(Unnamed Rule)"
-#~ msgstr "（未命名规则）"
-
-#~ msgid "(Unnamed SNAT)"
-#~ msgstr "（未命名 SNAT）"
-
-#~ msgid "Destination IP address"
-#~ msgstr "目标 IP 地址"
-
-#~ msgid "Inter-Zone Forwarding"
-#~ msgstr "端口触发"
-
-#~ msgid "Match forwarded traffic to the given destination port or port range."
-#~ msgstr "匹配指定目标端口或目标端口范围的转发流量。"
-
-#~ msgid ""
-#~ "Match incoming traffic originating from the given source port or port "
-#~ "range on the client host."
-#~ msgstr "匹配来自客户端主机上指定源端口或源端口范围的入站流量。"
-
-#~ msgid "Rewrite matched traffic to the given address."
-#~ msgstr "将匹配流量的源地址改写成指定地址。"
-
-#~ msgid ""
-#~ "Rewrite matched traffic to the given source port. May be left empty to "
-#~ "only rewrite the IP address."
-#~ msgstr "将匹配流量的源端口改写成指定端口。留空只改写 IP 地址。"
-
-#~ msgid "Rewrite to source %s"
-#~ msgstr "源地址改写成 %s"
-
-#~ msgid "Rewrite to source %s, %s"
-#~ msgstr "源地址改写成 %s, %s"
-
-#~ msgid "SNAT IP address"
-#~ msgstr "SNAT IP 地址"
-
-#~ msgid "SNAT port"
-#~ msgstr "SNAT 端口"
-
-#~ msgid "Source NAT"
-#~ msgstr "Source NAT"
-
-#~ msgid ""
-#~ "Source NAT is a specific form of masquerading which allows fine grained "
-#~ "control over the source IP used for outgoing traffic, for example to map "
-#~ "multiple WAN addresses to internal subnets."
-#~ msgstr ""
-#~ "Source NAT 是一种特殊形式的封包伪装，它允许精细的控制传出流量的源 IP，例"
-#~ "如：将多个 WAN 地址映射到内部子网。"
-
-#~ msgid "Start Time (hh:mm:ss)"
-#~ msgstr "开始时间（hh:mm:ss）"
-
-#~ msgid "Stop Time (hh:mm:ss)"
-#~ msgstr "停止时间（hh:mm:ss）"
-
-#~ msgid ""
-#~ "This page allows you to change advanced properties of the port forwarding "
-#~ "entry. In most cases there is no need to modify those settings."
-#~ msgstr ""
-#~ "本页面可以更改端口转发的高级设置。大多数情况下，不需要更改这些设置。"
-
-#~ msgid ""
-#~ "This page allows you to change advanced properties of the traffic rule "
-#~ "entry, such as matched source and destination hosts."
-#~ msgstr "本页面可以更改通信规则的高级设置，比如：需匹配的源主机和目标主机。"
-
-#~ msgid "Unnamed SNAT"
-#~ msgstr "未命名 SNAT"
-
-#~ msgid ""
-#~ "You may specify multiple by selecting \"-- custom --\" and then entering "
-#~ "protocols separated by space."
-#~ msgstr "您也可以选择“--自定义--”来定义多个协议，在多个协议间需加空格。"
-
-#~ msgid "Zone %q"
-#~ msgstr "区域 %q"
-
-#~ msgid "traffic"
-#~ msgstr "通信"
diff --git a/luci-app-firewall/po/zh-tw/firewall.po b/luci-app-firewall/po/zh-tw/firewall.po
index 9754bc7a5..581662642 100644
--- a/luci-app-firewall/po/zh-tw/firewall.po
+++ b/luci-app-firewall/po/zh-tw/firewall.po
@@ -11,123 +11,94 @@ msgstr ""
 "PO-Revision-Date: 2018-08-08 08:28+0800\n"
 "X-Generator: Gtranslator 2.91.7\n"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:127
 msgid "%s in %s"
 msgstr "%s 位於 %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:242
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:154
 msgid "%s%s with %s"
 msgstr "%s%s 和 %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:125
 msgid "%s, %s in %s"
 msgstr "%s, %s 位於 %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:275
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:26
+msgid "(Unnamed Entry)"
+msgstr "（未命名條目）"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:169
+msgid "(Unnamed Rule)"
+msgstr "（未命名規則）"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:37
+msgid "(Unnamed SNAT)"
+msgstr "（未命名 SNAT）"
+
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:195
 msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr "<var>%d</var> 資料包/<var>%s</var>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:271
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:192
 msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr "<var>%d</var> 資料包/<var>%s</var>，突發 <var>%d</var> 資料包。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:180
 msgid "<var>%s</var> and limit to %s"
 msgstr "<var>%s</var> 並限制到 %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:293
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:214
 msgid "Accept forward"
 msgstr "接受轉發"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:303
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:224
 msgid "Accept input"
 msgstr "接受入站"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:283
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:204
 msgid "Accept output"
 msgstr "接受出站"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:257
 msgid "Action"
 msgstr "動作"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone destination "
-"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
-"traffic."
-msgstr ""
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
+msgid "Add"
+msgstr "新增"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid ""
-"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
-"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
-msgstr ""
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
+msgid "Add and edit..."
+msgstr "新增並編輯…"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:57
 msgid "Advanced Settings"
 msgstr "高階設定"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid "Allow \"invalid\" traffic"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:178
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "允許從<em>源區域</em>轉發："
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:170
 msgid "Allow forward to <em>destination zones</em>:"
 msgstr "允許轉發到<em>目標區域</em>："
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:89
 msgid "Any"
 msgstr "任何"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
-msgid "Any day"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid "Automatic helper assignment"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
-msgid ""
-"Automatically assign conntrack helpers based on traffic protocol and port"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
-msgid "Conntrack Settings"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Conntrack helpers"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid "Covered devices"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:88
 msgid "Covered networks"
 msgstr "覆蓋網路"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid "Covered subnets"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:19
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:22
 msgid "Custom Rules"
 msgstr "自訂規則"
 
@@ -140,15 +111,23 @@ msgstr ""
 "自訂規則允許您執行不屬於防火牆框架的任意 iptables 指令。每次重啟防火牆時，在"
 "預設的規則執行後這些指令將立即執行。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:108
+msgid "Destination IP address"
+msgstr "目標 IP 位址"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:304
 msgid "Destination address"
 msgstr "目標位址"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:313
 msgid "Destination port"
 msgstr "目標埠"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:102
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:295
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
 msgid "Destination zone"
 msgstr "目標區域"
 
@@ -156,97 +135,83 @@ msgstr "目標區域"
 msgid "Disable"
 msgstr "禁用"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:299
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:220
 msgid "Discard forward"
 msgstr "丟棄轉發"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:309
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:230
 msgid "Discard input"
 msgstr "丟棄入站"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:289
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:210
 msgid "Discard output"
 msgstr "丟棄出站"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
-msgid ""
-"Do not install extra rules to reject forwarded traffic with conntrack state "
-"<em>invalid</em>. This may be required for complex asymmetric route setups."
-msgstr ""
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:151
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
+msgid "Do not rewrite"
+msgstr "不重寫"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
 msgid "Do not track forward"
 msgstr "不跟蹤轉發"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:307
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:228
 msgid "Do not track input"
 msgstr "不跟蹤入站"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:287
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:208
 msgid "Do not track output"
 msgstr "不跟蹤出站"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:22
 msgid "Drop invalid packets"
 msgstr "丟棄無效資料包"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:270
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
 msgid "Enable"
 msgstr "啟用"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:149
 msgid "Enable NAT Loopback"
 msgstr "啟用 NAT 環回"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:20
 msgid "Enable SYN-flood protection"
 msgstr "啟用 SYN-flood 防禦"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:144
 msgid "Enable logging on this zone"
 msgstr "啟用此區域的日誌記錄"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:43
 msgid "Experimental feature. Not fully compatible with QoS/SQM."
 msgstr "實驗特性。與 QoS/SQM 不完全相容。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
-msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:98
 msgid "External IP address"
 msgstr "外部 IP 位址"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:111
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
 msgid "External port"
 msgstr "外部埠"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
+msgid "External zone"
+msgstr "外部區域"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:158
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:331
 msgid "Extra arguments"
 msgstr "附加引數"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
-msgid "Extra destination arguments"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
-msgid "Extra iptables arguments"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
-msgid "Extra source arguments"
-msgstr ""
-
 #: applications/luci-app-firewall/luasrc/controller/firewall.lua:6
 msgid "Firewall"
 msgstr "防火牆"
@@ -255,270 +220,314 @@ msgstr "防火牆"
 msgid "Firewall - Custom Rules"
 msgstr "防火牆 - 自訂規則"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:13
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:8
 msgid "Firewall - Port Forwards"
 msgstr "防火牆 - 埠轉發"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:12
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:42
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:172
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:9
 msgid "Firewall - Traffic Rules"
 msgstr "防火牆 - 通訊規則"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:15
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:28
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:11
 msgid "Firewall - Zone Settings"
 msgstr "防火牆 - 區域設定"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:141
 msgid "Force connection tracking"
 msgstr "強制連線追蹤"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:76
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:27
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:92
 msgid "Forward"
 msgstr "轉發"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:116
 msgid "Forward to"
 msgstr "轉發到"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:343
 msgid "Friday"
 msgstr "星期五"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:62
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:64
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:106
 msgid "From %s in %s"
 msgstr "來自 %s 位於 %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:60
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:88
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:104
 msgid "From %s in %s with source %s"
 msgstr "來自 %s 位於 %s 源於 %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:102
 msgid "From %s in %s with source %s and %s"
 msgstr "來自 %s 位於 %s 源埠 %s 源 MAC %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:117
 msgid "From %s on <var>this device</var>"
 msgstr "來自 %s 位於<var>本裝置</var>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:115
 msgid "From %s on <var>this device</var> with source %s"
 msgstr "來自 %s 位於<var>本裝置</var>源於 %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:71
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:113
 msgid "From %s on <var>this device</var> with source %s and %s"
 msgstr "來自 %s 位於<var>本裝置</var>源埠 %s 源 MAC %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:10
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:56
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:16
 msgid "General Settings"
 msgstr "基本設定"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:51
 msgid "Hardware flow offloading"
 msgstr "硬體流量分載"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:157
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:75
 msgid "IP"
 msgstr "IP"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:167
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:83
 msgid "IP range"
 msgstr "IP 範圍"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:175
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:100
 msgid "IPs"
 msgstr "IP"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:216
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:85
 msgid "IPv4"
 msgstr "IPv4"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:185
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:118
 msgid "IPv4 and IPv6"
 msgstr "IPv4 和 IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:119
 msgid "IPv4 only"
 msgstr "僅 IPv4"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:87
 msgid "IPv6"
 msgstr "IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:120
 msgid "IPv6 only"
 msgstr "僅 IPv6"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:25
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:90
 msgid "Input"
 msgstr "入站資料"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:157
+msgid "Inter-Zone Forwarding"
+msgstr "埠觸發"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:127
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
 msgid "Internal IP address"
 msgstr "內部 IP 位址"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:138
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
 msgid "Internal port"
 msgstr "內部埠"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:121
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
 msgid "Internal zone"
 msgstr "內部區域"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:150
 msgid "Limit log messages"
 msgstr "限制日誌資訊"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:96
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:31
 msgid "MAC"
 msgstr "MAC"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:104
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:40
 msgid "MACs"
 msgstr "MAC"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:102
 msgid "MSS clamping"
 msgstr "MSS 鉗制"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:101
 msgid "Masquerading"
 msgstr "IP 動態偽裝"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:105
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:162
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:247
 msgid "Match"
 msgstr "匹配規則"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:206
 msgid "Match ICMP type"
 msgstr "匹配 ICMP 型別"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:118
+msgid "Match forwarded traffic to the given destination port or port range."
+msgstr "匹配指定目標埠或目標埠範圍的轉發流量。"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:112
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
 "on this host"
 msgstr "匹配指向此主機上指定目標埠或目標埠範圍的入站流量。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:91
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host."
+msgstr "匹配來自客戶端主機上指定源埠或源埠範圍的入站流量。"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:339
 msgid "Monday"
 msgstr "星期一"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:346
 msgid "Month Days"
 msgstr "日期"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:36
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:50
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:180
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:60
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
 msgid "Name"
 msgstr "名字"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:169
-msgid "Network"
-msgstr ""
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
+msgid "New SNAT rule"
+msgstr "新建 SNAT 規則"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
+msgid "New forward rule"
+msgstr "新建轉發規則"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
+msgid "New input rule"
+msgstr "新建進入規則"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
+msgid "New port forward"
+msgstr "新建埠轉發"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
+msgid "New source NAT"
+msgstr "新建 Source NAT"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:99
 msgid "Only match incoming traffic directed at the given IP address."
 msgstr "僅匹配指定目的 IP 位址的入站流量。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:63
 msgid "Only match incoming traffic from these MACs."
 msgstr "僅匹配來自這些 MAC 的入站流量。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:75
 msgid "Only match incoming traffic from this IP or range."
 msgstr "僅匹配來自此 IP 或 IP 範圍的入站流量。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:87
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
 msgstr "僅匹配源自客戶端主機上給定源埠或源埠範圍的入站流量。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
+msgid "Open ports on router"
+msgstr "開啟路由器埠"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
+msgid "Other..."
+msgstr "其它..."
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:75
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:26
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:91
 msgid "Output"
 msgstr "出站資料"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:288
+msgid "Output zone"
+msgstr "出站區域"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:159
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:160
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:332
 msgid "Passes additional arguments to iptables. Use with care!"
 msgstr "傳遞到 iptables 的額外引數。小心使用！"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
-msgid ""
-"Passing raw iptables arguments to source and destination traffic "
-"classification rules allows to match packets based on other criteria than "
-"interfaces or subnets. These options should be used with extreme care as "
-"invalid values could render the firewall ruleset broken, completely exposing "
-"all services."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:14
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:17
 msgid "Port Forwards"
 msgstr "埠轉發"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:9
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
 msgstr "埠轉發允許 Internet 上的遠端計算機連線到內部網路中的特定計算機或服務。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
-msgid ""
-"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
-"connection tracking."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:39
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:190
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
 msgid "Protocol"
 msgstr "協議"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:139
 msgid ""
 "Redirect matched incoming traffic to the given port on the internal host"
 msgstr "重定向匹配的入站流量到內部主機的埠"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:128
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "重定向匹配的入站流量到指定的內部主機"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:295
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:216
 msgid "Refuse forward"
 msgstr "拒絕轉發"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:305
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:226
 msgid "Refuse input"
 msgstr "拒絕入站"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:285
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:206
 msgid "Refuse output"
 msgstr "拒絕出站"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:52
 msgid "Requires hardware NAT support. Implemented at least for mt7621"
 msgstr "需要硬體 NAT 支援。目前 mt7621 已實現"
 
@@ -526,20 +535,38 @@ msgstr "需要硬體 NAT 支援。目前 mt7621 已實現"
 msgid "Restart Firewall"
 msgstr "重啟防火牆"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:132
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "要限制 IP 動態偽裝的目標子網"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:123
 msgid "Restrict Masquerading to given source subnets"
 msgstr "要限制 IP 動態偽裝的源子網"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:183
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:115
 msgid "Restrict to address family"
 msgstr "限制位址"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:132
+msgid "Rewrite matched traffic to the given address."
+msgstr "將匹配流量的源位址改寫成指定位址。"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:147
+msgid ""
+"Rewrite matched traffic to the given source port. May be left empty to only "
+"rewrite the IP address."
+msgstr "將匹配流量的源埠改寫成指定埠。留空只改寫 IP 位址。"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:266
+msgid "Rewrite to source %s"
+msgstr "源位址改寫成 %s"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:264
+msgid "Rewrite to source %s, %s"
+msgstr "源位址改寫成 %s, %s"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:42
 msgid "Routing/NAT Offloading"
 msgstr "Routing/NAT 分載"
 
@@ -551,69 +578,94 @@ msgstr "規則已禁用"
 msgid "Rule is enabled"
 msgstr "規則已啟用"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:131
+msgid "SNAT IP address"
+msgstr "SNAT IP 位址"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:146
+msgid "SNAT port"
+msgstr "SNAT 埠"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:344
 msgid "Saturday"
 msgstr "星期六"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:47
 msgid "Software based offloading for routing/NAT"
 msgstr "基於軟體的 Routing/NAT 分載"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:46
 msgid "Software flow offloading"
 msgstr "軟體流量分載"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:74
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:79
 msgid "Source IP address"
 msgstr "源 IP 位址"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:62
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:261
 msgid "Source MAC address"
 msgstr "源 MAC 位址"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:194
+msgid "Source NAT"
+msgstr "Source NAT"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:195
+msgid ""
+"Source NAT is a specific form of masquerading which allows fine grained "
+"control over the source IP used for outgoing traffic, for example to map "
+"multiple WAN addresses to internal subnets."
+msgstr ""
+"Source NAT 是一種特殊形式的封包偽裝，它允許精細的控制傳出流量的源 IP，例如："
+"將多個 WAN 位址對映到內部子網。"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:270
 msgid "Source address"
 msgstr "源位址"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:86
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:279
 msgid "Source port"
 msgstr "源埠"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:54
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:73
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:254
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
 msgid "Source zone"
 msgstr "源區域"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:357
 msgid "Start Date (yyyy-mm-dd)"
 msgstr "開始日期（yyyy-mm-dd）"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
-msgid "Start Time (hh.mm.ss)"
-msgstr ""
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:353
+msgid "Start Time (hh:mm:ss)"
+msgstr "開始時間（hh:mm:ss）"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:359
 msgid "Stop Date (yyyy-mm-dd)"
 msgstr "停止日期（yyyy-mm-dd）"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
-msgid "Stop Time (hh.mm.ss)"
-msgstr ""
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:355
+msgid "Stop Time (hh:mm:ss)"
+msgstr "停止時間（hh:mm:ss）"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:338
 msgid "Sunday"
 msgstr "星期日"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:12
 msgid ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
 msgstr "防火牆通過在網路介面上建立區域來控制網路流量。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:158
 msgid ""
 "The options below control the forwarding policies between this zone (%s) and "
 "other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -627,7 +679,19 @@ msgstr ""
 "strong> 的區域的需轉發流量。轉發規則的作用是<em>單向</em>的，例如：一條允許"
 "從 lan 到 wan 的轉發規則並不隱含有允許相反方向從 wan 到 lan 的流量轉發。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:14
+msgid ""
+"This page allows you to change advanced properties of the port forwarding "
+"entry. In most cases there is no need to modify those settings."
+msgstr "本頁面可以更改埠轉發的高階設定。大多數情況下，不需要更改這些設定。"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:13
+msgid ""
+"This page allows you to change advanced properties of the traffic rule "
+"entry, such as matched source and destination hosts."
+msgstr "本頁面可以更改通訊規則的高階設定，比如：需匹配的源主機和目標主機。"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:36
 msgid ""
 "This section defines common properties of %q. The <em>input</em> and "
 "<em>output</em> options set the default policies for traffic entering and "
@@ -639,40 +703,46 @@ msgstr ""
 "域入站和出站流量的預設策略，<em>轉發</em>選項描述該區域內不同網路之間的流量轉"
 "發策略。<em>覆蓋網路</em>指定從屬於這個區域的網路。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:342
 msgid "Thursday"
 msgstr "星期四"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
-msgid "Time Restrictions"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:362
 msgid "Time in UTC"
 msgstr "UTC 時間"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:96
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:141
 msgid "To %s at %s on <var>this device</var>"
 msgstr "到 %s 在 %s 位於<var>本裝置</var>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:89
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:132
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:157
 msgid "To %s in %s"
 msgstr "到 %s 位於 %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:98
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:143
 msgid "To %s on <var>this device</var>"
 msgstr "到 %s 位於<var>本裝置</var>"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:87
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:130
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:155
 msgid "To %s, %s in %s"
 msgstr "到 %s, %s 位於 %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
-#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
+msgid "To source IP"
+msgstr "到源 IP"
+
+#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
+msgid "To source port"
+msgstr "到源埠"
+
+#: applications/luci-app-firewall/luasrc/controller/firewall.lua:18
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:18
 msgid "Traffic Rules"
 msgstr "通訊規則"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:10
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
 "for example to reject traffic between certain hosts or to open WAN ports on "
@@ -681,291 +751,156 @@ msgstr ""
 "通訊規則定義了不同區域間的資料包傳輸策略，例如：拒絕一些主機之間的通訊，開放"
 "路由器 WAN 上的埠。"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:340
 msgid "Tuesday"
 msgstr "星期二"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:244
+msgid "Unnamed SNAT"
+msgstr "未命名 SNAT"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:67
 msgid "Unnamed forward"
 msgstr "未命名轉發"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:76
 msgid "Unnamed rule"
 msgstr "未命名規則"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
-msgid "Unnamed zone"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
-msgid ""
-"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
-"network devices."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
-msgid ""
-"Use this option to classify zone traffic by source or destination subnet "
-"instead of networks or devices."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:101
 msgid "Via %s"
 msgstr "通過 %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:70
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:99
 msgid "Via %s at %s"
 msgstr "通過 %s 在 %s"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:341
 msgid "Wednesday"
 msgstr "星期三"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:335
 msgid "Week Days"
 msgstr "星期"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:55
+msgid ""
+"You may specify multiple by selecting \"-- custom --\" and then entering "
+"protocols separated by space."
+msgstr "您也可以選擇“--自訂--”來定義多個協議，在多個協議間需加空格。"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:29
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:35
+msgid "Zone %q"
+msgstr "區域 %q"
+
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:83
 msgid "Zone ⇒ Forwardings"
 msgstr "區域 ⇒ 轉發"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:59
 msgid "Zones"
 msgstr "區域"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:325
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:33
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:98
 msgid "accept"
 msgstr "接受"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:66
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:78
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:90
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:108
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:141
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:82
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:263
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:272
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:281
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:306
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:315
 msgid "any"
 msgstr "所有"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:120
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:100
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:128
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:150
 msgid "any host"
 msgstr "所有主機"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:66
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:69
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:94
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:95
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:111
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:138
 msgid "any router IP"
 msgstr "所有路由 IP"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:119
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:149
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
 msgid "any zone"
 msgstr "所有區域"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:267
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:189
 msgid "day"
 msgstr "日"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:327
 msgid "don't track"
 msgstr "不跟蹤"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:324
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:81
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:32
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:97
 msgid "drop"
 msgstr "丟棄"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:265
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:187
 msgid "hour"
 msgstr "小時"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:263
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:185
 msgid "minute"
 msgstr "分鐘"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:86
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:20
 msgid "not"
 msgstr "非"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:121
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:50
 msgid "port"
 msgstr "埠"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:131
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:140
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:55
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:65
 msgid "ports"
 msgstr "埠"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:326
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zone-details.lua:80
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:31
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:96
 msgid "reject"
 msgstr "拒絕"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:261
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:183
 msgid "second"
 msgstr "秒"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
-msgid "this new zone"
-msgstr ""
+#: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:82
+msgid "traffic"
+msgstr "通訊"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
 msgid "type"
 msgstr "型別"
 
-#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:209
 #: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
 msgid "types"
 msgstr "型別"
-
-#~ msgid "Add"
-#~ msgstr "新增"
-
-#~ msgid "Add and edit..."
-#~ msgstr "新增並編輯…"
-
-#~ msgid "Do not rewrite"
-#~ msgstr "不重寫"
-
-#~ msgid "External zone"
-#~ msgstr "外部區域"
-
-#~ msgid "New SNAT rule"
-#~ msgstr "新建 SNAT 規則"
-
-#~ msgid "New forward rule"
-#~ msgstr "新建轉發規則"
-
-#~ msgid "New input rule"
-#~ msgstr "新建進入規則"
-
-#~ msgid "New port forward"
-#~ msgstr "新建埠轉發"
-
-#~ msgid "New source NAT"
-#~ msgstr "新建 Source NAT"
-
-#~ msgid "Open ports on router"
-#~ msgstr "開啟路由器埠"
-
-#~ msgid "Other..."
-#~ msgstr "其它..."
-
-#~ msgid "To source IP"
-#~ msgstr "到源 IP"
-
-#~ msgid "To source port"
-#~ msgstr "到源埠"
-
-#~ msgid "Output zone"
-#~ msgstr "出站區域"
-
-#~ msgid "(Unnamed Entry)"
-#~ msgstr "（未命名條目）"
-
-#~ msgid "(Unnamed Rule)"
-#~ msgstr "（未命名規則）"
-
-#~ msgid "(Unnamed SNAT)"
-#~ msgstr "（未命名 SNAT）"
-
-#~ msgid "Destination IP address"
-#~ msgstr "目標 IP 位址"
-
-#~ msgid "Inter-Zone Forwarding"
-#~ msgstr "埠觸發"
-
-#~ msgid "Match forwarded traffic to the given destination port or port range."
-#~ msgstr "匹配指定目標埠或目標埠範圍的轉發流量。"
-
-#~ msgid ""
-#~ "Match incoming traffic originating from the given source port or port "
-#~ "range on the client host."
-#~ msgstr "匹配來自客戶端主機上指定源埠或源埠範圍的入站流量。"
-
-#~ msgid "Rewrite matched traffic to the given address."
-#~ msgstr "將匹配流量的源位址改寫成指定位址。"
-
-#~ msgid ""
-#~ "Rewrite matched traffic to the given source port. May be left empty to "
-#~ "only rewrite the IP address."
-#~ msgstr "將匹配流量的源埠改寫成指定埠。留空只改寫 IP 位址。"
-
-#~ msgid "Rewrite to source %s"
-#~ msgstr "源位址改寫成 %s"
-
-#~ msgid "Rewrite to source %s, %s"
-#~ msgstr "源位址改寫成 %s, %s"
-
-#~ msgid "SNAT IP address"
-#~ msgstr "SNAT IP 位址"
-
-#~ msgid "SNAT port"
-#~ msgstr "SNAT 埠"
-
-#~ msgid "Source NAT"
-#~ msgstr "Source NAT"
-
-#~ msgid ""
-#~ "Source NAT is a specific form of masquerading which allows fine grained "
-#~ "control over the source IP used for outgoing traffic, for example to map "
-#~ "multiple WAN addresses to internal subnets."
-#~ msgstr ""
-#~ "Source NAT 是一種特殊形式的封包偽裝，它允許精細的控制傳出流量的源 IP，例"
-#~ "如：將多個 WAN 位址對映到內部子網。"
-
-#~ msgid "Start Time (hh:mm:ss)"
-#~ msgstr "開始時間（hh:mm:ss）"
-
-#~ msgid "Stop Time (hh:mm:ss)"
-#~ msgstr "停止時間（hh:mm:ss）"
-
-#~ msgid ""
-#~ "This page allows you to change advanced properties of the port forwarding "
-#~ "entry. In most cases there is no need to modify those settings."
-#~ msgstr "本頁面可以更改埠轉發的高階設定。大多數情況下，不需要更改這些設定。"
-
-#~ msgid ""
-#~ "This page allows you to change advanced properties of the traffic rule "
-#~ "entry, such as matched source and destination hosts."
-#~ msgstr "本頁面可以更改通訊規則的高階設定，比如：需匹配的源主機和目標主機。"
-
-#~ msgid "Unnamed SNAT"
-#~ msgstr "未命名 SNAT"
-
-#~ msgid ""
-#~ "You may specify multiple by selecting \"-- custom --\" and then entering "
-#~ "protocols separated by space."
-#~ msgstr "您也可以選擇“--自訂--”來定義多個協議，在多個協議間需加空格。"
-
-#~ msgid "Zone %q"
-#~ msgstr "區域 %q"
-
-#~ msgid "traffic"
-#~ msgstr "通訊"