luci-0.10: merge r6825-r6830

applications/luci-upnp/luasrc/model/cbi/upnp/upnp.lua

@@ -38,6 +38,7 @@ function e.write(self, section, value)
 	Value.write(self, section, value)
 end
 
+s:option(Flag, "enable_natpmp", translate("Enable NAT-PMP")).rmempty = true
 s:option(Flag, "secure_mode", translate("Enable secure mode")).rmempty = true
 s:option(Flag, "log_output", translate("Log output")).rmempty = true
 s:option(Value, "download", translate("Downlink"), "kByte/s").rmempty = true

libs/sys/luasrc/sys/iptparser.lua

@@ -28,12 +28,25 @@ module("luci.sys.iptparser")
 --- Create a new iptables parser object.
 -- @class	function
 -- @name	IptParser
+-- @param	family	Number specifying the address family. 4 for IPv4, 6 for IPv6
 -- @return	IptParser instance
 IptParser = luci.util.class()
 
-function IptParser.__init__( self, ... )
+function IptParser.__init__( self, family )
+	self._family = (tonumber(family) == 6) and 6 or 4
 	self._rules  = { }
 	self._chains = { }
+
+	if self._family == 4 then
+		self._nulladdr = "0.0.0.0/0"
+		self._tables   = { "filter", "nat", "mangle", "raw" }
+		self._command  = "iptables -t %s --line-numbers -nxvL"
+	else
+		self._nulladdr = "::/0"
+		self._tables   = { "filter", "mangle", "raw" }
+		self._command  = "ip6tables -t %s --line-numbers -nxvL"
+	end
+
 	self:_parse_rules()
 end
 
@@ -49,9 +62,9 @@ end
 --  <li> protocol	 - Match rules that match the given protocol, rules with
 -- 						protocol "all" are always matched
 --  <li> source		 - Match rules with the given source, rules with source
--- 						"0.0.0.0/0" are always matched
+-- 						"0.0.0.0/0" (::/0) are always matched
 --  <li> destination - Match rules with the given destination, rules with
--- 						destination "0.0.0.0/0" are always matched
+-- 						destination "0.0.0.0/0" (::/0) are always matched
 --  <li> inputif	 - Match rules with the given input interface, rules
 -- 						with input	interface "*" (=all) are always matched
 --  <li> outputif	 - Match rules with the given output interface, rules
@@ -76,8 +89,8 @@ end
 -- 						or "*" for all interfaces
 --  <li> outputif	 - Output interface of the rule,e.g. "eth0.0"
 -- 						or "*" for all interfaces
---  <li> source		 - The source ip range, e.g. "0.0.0.0/0"
---  <li> destination - The destination ip range, e.g. "0.0.0.0/0"
+--  <li> source		 - The source ip range, e.g. "0.0.0.0/0" (::/0)
+--  <li> destination - The destination ip range, e.g. "0.0.0.0/0" (::/0)
 --  <li> options	 - A list of specific options of the rule,
 -- 						e.g. { "reject-with", "tcp-reset" }
 --  <li> packets	 - The number of packets matched by the rule
@@ -102,8 +115,8 @@ function IptParser.find( self, args )
 	local args = args or { }
 	local rv   = { }
 
-	args.source      = args.source      and luci.ip.IPv4(args.source)
-	args.destination = args.destination and luci.ip.IPv4(args.destination)
+	args.source      = args.source      and self:_parse_addr(args.source)
+	args.destination = args.destination and self:_parse_addr(args.destination)
 
 	for i, rule in ipairs(self._rules) do
 		local match = true
@@ -137,16 +150,16 @@ function IptParser.find( self, args )
 
 		-- match source
 		if not ( match == true and (
-			not args.source or rule.source == "0.0.0.0/0" or
-			luci.ip.IPv4(rule.source):contains(args.source)
+			not args.source or rule.source == self._nulladdr or
+			self:_parse_addr(rule.source):contains(args.source)
 		) ) then
 			match = false
 		end
 
 		-- match destination
 		if not ( match == true and (
-			not args.destination or rule.destination == "0.0.0.0/0" or
-			luci.ip.IPv4(rule.destination):contains(args.destination)
+			not args.destination or rule.destination == self._nulladdr or
+			self:_parse_addr(rule.destination):contains(args.destination)
 		) ) then
 			match = false
 		end
@@ -202,6 +215,13 @@ function IptParser.resync( self )
 end
 
 
+--- Find the names of all tables.
+-- @return		Table of table names.
+function IptParser.tables( self )
+	return self._tables
+end
+
+
 --- Find the names of all chains within the given table name.
 -- @param table	String containing the table name
 -- @return		Table of chain names in the order they occur.
@@ -241,26 +261,35 @@ function IptParser.is_custom_target( self, target )
 end
 
 
+-- [internal] Parse address according to family.
+function IptParser._parse_addr( self, addr )
+	if self._family == 4 then
+		return luci.ip.IPv4(addr)
+	else
+		return luci.ip.IPv6(addr)
+	end
+end
+
 -- [internal] Parse iptables output from all tables.
 function IptParser._parse_rules( self )
 
-	for i, tbl in ipairs({ "filter", "nat", "mangle" }) do
+	for i, tbl in ipairs(self._tables) do
 
 		self._chains[tbl] = { }
 
-		for i, rule in ipairs(luci.util.execl("iptables -t " .. tbl .. " --line-numbers -nxvL")) do
+		for i, rule in ipairs(luci.util.execl(self._command % tbl)) do
 
-			if rule:find( "Chain " ) == 1 then
+			if rule:find( "^Chain " ) == 1 then
 
 				local crefs
 				local cname, cpol, cpkt, cbytes = rule:match(
-					"Chain ([^%s]*) %(policy (%w+) " ..
+					"^Chain ([^%s]*) %(policy (%w+) " ..
 					"(%d+) packets, (%d+) bytes%)"
 				)
 
 				if not cname then
 					cname, crefs = rule:match(
-						"Chain ([^%s]*) %((%d+) references%)"
+						"^Chain ([^%s]*) %((%d+) references%)"
 					)
 				end
 
@@ -284,6 +313,11 @@ function IptParser._parse_rules( self )
 						table.insert(rule_parts, 4, nil)
 					end
 
+					-- ip6tables opt column is usually zero-width
+					if self._family == 6 then
+						table.insert(rule_parts, 6, "--")
+					end
+
 					rule_details["table"]       = tbl
 					rule_details["chain"]       = self._chain
 					rule_details["index"]       = tonumber(rule_parts[1])

modules/admin-full/luasrc/controller/admin/status.lua

@@ -2,6 +2,7 @@
 LuCI - Lua Configuration Interface
 
 Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -19,7 +20,7 @@ function index()
 
 	entry({"admin", "status"}, template("admin_status/index"), i18n("Status"), 20).index = true
 	entry({"admin", "status", "interfaces"}, template("admin_status/interfaces"), i18n("Interfaces"), 1)
-	entry({"admin", "status", "iptables"}, call("action_iptables"), i18n("Firewall"), 2)
+	entry({"admin", "status", "iptables"}, call("action_iptables"), i18n("Firewall"), 2).leaf = true
 	entry({"admin", "status", "conntrack"}, template("admin_status/conntrack"), i18n("Active Connections"), 3)
 	entry({"admin", "status", "routes"}, template("admin_status/routes"), i18n("Routes"), 4)
 	entry({"admin", "status", "syslog"}, call("action_syslog"), i18n("System Log"), 5)
@@ -46,8 +47,12 @@ function action_dmesg()
 end
 
 function action_iptables()
-	if luci.http.formvalue("zero") == "1" then
-		luci.util.exec("iptables -Z")
+	if luci.http.formvalue("zero") then
+		if luci.http.formvalue("zero") == "6" then
+			luci.util.exec("ip6tables -Z")
+		else
+			luci.util.exec("iptables -Z")
+		end
 		luci.http.redirect(
 			luci.dispatcher.build_url("admin", "status", "iptables")
 		)

modules/admin-full/luasrc/view/admin_status/iptables.htm

@@ -1,7 +1,7 @@
 <%#
 LuCI - Lua Configuration Interface
 Copyright 2008-2009 Steven Barth <steven@midlink.org>
-Copyright 2008-2009 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+Copyright 2008-2011 Jo-Philipp Wich <xm@subsignal.org>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -17,8 +17,17 @@ $Id$
 
 	require "luci.sys.iptparser"
 	require "luci.tools.webadmin"
+	require "luci.fs"
 
-	local ipt = luci.sys.iptparser.IptParser()
+	local has_ip6tables = luci.fs.access("/usr/sbin/ip6tables")
+	local mode = 4
+
+	if has_ip6tables then
+		mode = luci.dispatcher.context.requestpath
+	    mode = tonumber(mode[#mode] ~= "iptables" and mode[#mode]) or 4
+	end
+
+	local ipt = luci.sys.iptparser.IptParser(mode)
 	local wba = luci.tools.webadmin
 
 	local rowcnt = 1
@@ -45,23 +54,41 @@ $Id$
 		return i
 	end
 
+	local tables = { "Filter", "NAT", "Mangle", "Raw" }
+	if mode == 6 then
+		tables = { "Filter", "Mangle", "Raw" }
+	end
 -%>
 
 <%+header%>
 
+<style type="text/css">
+	span:target {
+		color: blue;
+		text-decoration: underline;
+	}
+</style>
+
 <h2><a id="content" name="content"><%:Firewall Status%></a></h2>
 
+<% if has_ip6tables then %>
+<ul class="cbi-tabmenu">
+	<li class="cbi-tab<%= mode ~= 4 and "-disabled" %>"><a href="<%=luci.dispatcher.build_url("admin/status/iptables/4")%>"><%:IPv4 Firewall%></a></li>
+	<li class="cbi-tab<%= mode ~= 6 and "-disabled" %>"><a href="<%=luci.dispatcher.build_url("admin/status/iptables/6")%>"><%:IPv6 Firewall%></a></li>
+</ul>
+<% end %>
+
 <form method="post" action="<%=REQUEST_URI%>">
 	<div class="cbi-map">
 		<fieldset class="cbi-section">
 			<h3><%:Actions%></h3>
 			<ul>
-				<li><a href="<%=REQUEST_URI%>?zero=1"><%:Reset Counters%></a></li>
+				<li><a href="<%=REQUEST_URI%>?zero=<%=mode%>"><%:Reset Counters%></a></li>
 				<li><a href="<%=REQUEST_URI%>?restart=1"><%:Restart Firewall%></a></li>
 			</ul>
 			<br /><br />
 
-			<% for _, tbl in ipairs({"Filter", "NAT", "Mangle"}) do chaincnt = 0 %>
+			<% for _, tbl in ipairs(tables) do chaincnt = 0 %>
 				<h3><%:Table%>: <%=tbl%></h3>
 				<table class="cbi-section-table" style="font-size:90%">
 					<% for _, chain in ipairs(ipt:chains(tbl)) do
@@ -71,13 +98,13 @@ $Id$
 					%>
 						<tr class="cbi-section-table-titles cbi-rowstyle-<%=rowstyle()%>">
 							<th class="cbi-section-table-cell" style="text-align:left" colspan="11">
-								<br /><a name="rule_<%=tbl:lower()%>_<%=chain%>"></a>
+								<br /><span id="rule_<%=tbl:lower()%>_<%=chain%>">
 								<%:Chain%> <em><%=chain%></em>
 								(<%- if chaininfo.policy then -%>
 									<%:Policy%>: <em><%=chaininfo.policy%></em>, <%:Packets%>: <%=chaininfo.packets%>, <%:Traffic%>: <%=wba.byte_format(chaininfo.bytes)-%>
 								<%- else -%>
 									<%:References%>: <%=chaininfo.references-%>
-								<%- end -%>)
+								<%- end -%>)</span>
 							</th>
 						</tr>
 						<tr class="cbi-section-table-descr">

po/ca/base.po

@@ -937,12 +937,18 @@ msgstr ""
 msgid "IPv4"
 msgstr ""
 
+msgid "IPv4 Firewall"
+msgstr ""
+
 msgid "IPv4-Address"
 msgstr ""
 
 msgid "IPv6"
 msgstr "IPv6"
 
+msgid "IPv6 Firewall"
+msgstr ""
+
 msgid "IPv6 Setup"
 msgstr ""
 
@@ -1315,6 +1321,12 @@ msgstr ""
 msgid "Mounted file systems"
 msgstr "Sistemes de fitxers muntats"
 
+msgid "Move down"
+msgstr ""
+
+msgid "Move up"
+msgstr ""
+
 msgid "Multicast Rate"
 msgstr "Taxa Multicast"
 
@@ -1768,6 +1780,9 @@ msgstr "Desa"
 msgid "Save & Apply"
 msgstr "Desa & Aplica"
 
+msgid "Save & Apply"
+msgstr ""
+
 msgid "Scan"
 msgstr "Escaneja"
 
@@ -1854,6 +1869,9 @@ msgstr ""
 "Ho sento, l'OpenWRT no suporta una actualització del sistema en aquesdta "
 "plataforma.<br />Has actualitzar manualment el teu dispositiu."
 
+msgid "Sort"
+msgstr ""
+
 msgid "Source"
 msgstr "Origen"
 

po/ca/upnp.po

@@ -13,13 +13,45 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-#. Universal Plug & Play
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:1
-msgid "Universal Plug & Play"
-msgstr "Universal Plug & Play"
+msgid "Active UPnP Redirects"
+msgstr ""
+
+msgid "Client Address"
+msgstr ""
+
+msgid "Client Port"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Delete Redirect"
+msgstr ""
+
+msgid "Downlink"
+msgstr "Enllaç de baixada"
+
+msgid "Enable NAT-PMP"
+msgstr ""
+
+msgid "Enable UPnP Service"
+msgstr ""
+
+msgid "Enable secure mode"
+msgstr "Activa mode segur"
+
+msgid "External Port"
+msgstr ""
+
+msgid "Log output"
+msgstr "Registra la sortida"
+
+msgid "Protocol"
+msgstr ""
+
+msgid "There are no active redirects."
+msgstr ""
 
-#. UPNP allows clients in the local network to automatically configure the router.
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:2
 msgid ""
 "UPNP allows clients in the local network to automatically configure the "
 "router."
@@ -27,31 +59,23 @@ msgstr ""
 "UPnP permet als clients de la xarxa local configurar automàticament el "
 "router."
 
-#. UPNP should only be enabled if absolutely necessary as it can result in high security risks for your network.
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:3
 msgid ""
-"UPNP should only be enabled if absolutely necessary as it can result in high "
-"security risks for your network."
+"UPnP allows clients in the local network to automatically configure the "
+"router."
 msgstr ""
-"Només s'hauria d'activar l'UPnP si és absolutament necessari, ja que en "
-"poden resultar alts riscos de seguretat a la teva xarxa."
 
-#. Enable secure mode
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:4
-msgid "Enable secure mode"
-msgstr "Activa mode segur"
+msgid "Universal Plug & Play"
+msgstr "Universal Plug & Play"
 
-#. Log output
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:5
-msgid "Log output"
-msgstr "Registra la sortida"
-
-#. Downlink
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:6
-msgid "Downlink"
-msgstr "Enllaç de baixada"
-
-#. Uplink
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:7
 msgid "Uplink"
 msgstr "Enllaç de pujada"
+
+msgid "enable"
+msgstr ""
+
+#~ msgid ""
+#~ "UPNP should only be enabled if absolutely necessary as it can result in "
+#~ "high security risks for your network."
+#~ msgstr ""
+#~ "Només s'hauria d'activar l'UPnP si és absolutament necessari, ja que en "
+#~ "poden resultar alts riscos de seguretat a la teva xarxa."

po/de/base.po

@@ -937,12 +937,18 @@ msgstr "IP Aliases"
 msgid "IPv4"
 msgstr "IPv4"
 
+msgid "IPv4 Firewall"
+msgstr ""
+
 msgid "IPv4-Address"
 msgstr "IPv4-Adresse"
 
 msgid "IPv6"
 msgstr "IPv6"
 
+msgid "IPv6 Firewall"
+msgstr ""
+
 msgid "IPv6 Setup"
 msgstr "IPv6 Einstellungen"
 
@@ -1322,6 +1328,12 @@ msgstr ""
 msgid "Mounted file systems"
 msgstr "Eingehängte Dateisysteme"
 
+msgid "Move down"
+msgstr ""
+
+msgid "Move up"
+msgstr ""
+
 msgid "Multicast Rate"
 msgstr "Multicastrate"
 
@@ -1784,6 +1796,9 @@ msgstr "Speichern"
 msgid "Save & Apply"
 msgstr "Speichern & Anwenden"
 
+msgid "Save & Apply"
+msgstr ""
+
 msgid "Scan"
 msgstr "Scan"
 
@@ -1871,6 +1886,9 @@ msgstr ""
 "Sorry. OpenWrt unterstützt kein Systemupdate auf dieser Platform.<br /> Sie "
 "müssen das Gerät manuell neu flashen."
 
+msgid "Sort"
+msgstr ""
+
 msgid "Source"
 msgstr "Quelle"
 

po/de/upnp.po

@@ -12,13 +12,45 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#. Universal Plug & Play
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:1
-msgid "Universal Plug & Play"
-msgstr "Universal Plug & Play"
+msgid "Active UPnP Redirects"
+msgstr ""
+
+msgid "Client Address"
+msgstr ""
+
+msgid "Client Port"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Delete Redirect"
+msgstr ""
+
+msgid "Downlink"
+msgstr "Downlink"
+
+msgid "Enable NAT-PMP"
+msgstr ""
+
+msgid "Enable UPnP Service"
+msgstr ""
+
+msgid "Enable secure mode"
+msgstr "Sicheren Modus aktivieren"
+
+msgid "External Port"
+msgstr ""
+
+msgid "Log output"
+msgstr "Ausgabe protokollieren"
+
+msgid "Protocol"
+msgstr ""
+
+msgid "There are no active redirects."
+msgstr ""
 
-#. UPNP allows clients in the local network to automatically configure the router.
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:2
 msgid ""
 "UPNP allows clients in the local network to automatically configure the "
 "router."
@@ -26,31 +58,23 @@ msgstr ""
 "UPNP ermöglicht die automatische Konfiguration des Routers durch Clients im "
 "lokalen Netzwerk."
 
-#. UPNP should only be enabled if absolutely necessary as it can result in high security risks for your network.
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:3
 msgid ""
-"UPNP should only be enabled if absolutely necessary as it can result in high "
-"security risks for your network."
+"UPnP allows clients in the local network to automatically configure the "
+"router."
 msgstr ""
-"UPNP sollte nur wenn unbedingt nötig aktiviert werden, da es ein "
-"Sicherheitsrisiko für das Netzwerk darstellen kann."
 
-#. Enable secure mode
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:4
-msgid "Enable secure mode"
-msgstr "Sicheren Modus aktivieren"
+msgid "Universal Plug & Play"
+msgstr "Universal Plug & Play"
 
-#. Log output
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:5
-msgid "Log output"
-msgstr "Ausgabe protokollieren"
-
-#. Downlink
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:6
-msgid "Downlink"
-msgstr "Downlink"
-
-#. Uplink
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:7
 msgid "Uplink"
 msgstr "Uplink"
+
+msgid "enable"
+msgstr ""
+
+#~ msgid ""
+#~ "UPNP should only be enabled if absolutely necessary as it can result in "
+#~ "high security risks for your network."
+#~ msgstr ""
+#~ "UPNP sollte nur wenn unbedingt nötig aktiviert werden, da es ein "
+#~ "Sicherheitsrisiko für das Netzwerk darstellen kann."

po/el/base.po

@@ -940,12 +940,18 @@ msgstr ""
 msgid "IPv4"
 msgstr ""
 
+msgid "IPv4 Firewall"
+msgstr ""
+
 msgid "IPv4-Address"
 msgstr ""
 
 msgid "IPv6"
 msgstr "IPv6"
 
+msgid "IPv6 Firewall"
+msgstr ""
+
 msgid "IPv6 Setup"
 msgstr ""
 
@@ -1317,6 +1323,12 @@ msgstr ""
 msgid "Mounted file systems"
 msgstr "Προσαρτημένα συστήματα αρχείων"
 
+msgid "Move down"
+msgstr ""
+
+msgid "Move up"
+msgstr ""
+
 msgid "Multicast Rate"
 msgstr "Ρυθμός Multicast"
 
@@ -1770,6 +1782,9 @@ msgstr "Αποθήκευση"
 msgid "Save & Apply"
 msgstr "Αποθήκευση & Εφαρμογή"
 
+msgid "Save & Apply"
+msgstr ""
+
 msgid "Scan"
 msgstr "Σάρωση"
 
@@ -1858,6 +1873,9 @@ msgstr ""
 "Συγνώμη. Το OpenWrt δεν υποστηρίζει αναβάθμιση συστήματος σε αυτή την "
 "πλατφόρμα.<br /> Χρειάζεται να φλασάρετε την συσκευή σας χειροκίνητα."
 
+msgid "Sort"
+msgstr ""
+
 msgid "Source"
 msgstr "Πηγή"
 

po/el/upnp.po

@@ -12,41 +12,60 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#. Universal Plug & Play
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:1
-msgid "Universal Plug & Play"
+msgid "Active UPnP Redirects"
+msgstr ""
+
+msgid "Client Address"
+msgstr ""
+
+msgid "Client Port"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Delete Redirect"
+msgstr ""
+
+msgid "Downlink"
+msgstr ""
+
+msgid "Enable NAT-PMP"
+msgstr ""
+
+msgid "Enable UPnP Service"
+msgstr ""
+
+msgid "Enable secure mode"
+msgstr ""
+
+msgid "External Port"
+msgstr ""
+
+msgid "Log output"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "There are no active redirects."
 msgstr ""
 
-#. UPNP allows clients in the local network to automatically configure the router.
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:2
 msgid ""
 "UPNP allows clients in the local network to automatically configure the "
 "router."
 msgstr ""
 
-#. UPNP should only be enabled if absolutely necessary as it can result in high security risks for your network.
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:3
 msgid ""
-"UPNP should only be enabled if absolutely necessary as it can result in high "
-"security risks for your network."
+"UPnP allows clients in the local network to automatically configure the "
+"router."
 msgstr ""
 
-#. Enable secure mode
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:4
-msgid "Enable secure mode"
+msgid "Universal Plug & Play"
 msgstr ""
 
-#. Log output
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:5
-msgid "Log output"
-msgstr ""
-
-#. Downlink
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:6
-msgid "Downlink"
-msgstr ""
-
-#. Uplink
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:7
 msgid "Uplink"
 msgstr ""
+
+msgid "enable"
+msgstr ""

po/en/base.po

@@ -925,12 +925,18 @@ msgstr ""
 msgid "IPv4"
 msgstr ""
 
+msgid "IPv4 Firewall"
+msgstr ""
+
 msgid "IPv4-Address"
 msgstr ""
 
 msgid "IPv6"
 msgstr "IPv6"
 
+msgid "IPv6 Firewall"
+msgstr ""
+
 msgid "IPv6 Setup"
 msgstr ""
 
@@ -1295,6 +1301,12 @@ msgstr ""
 msgid "Mounted file systems"
 msgstr "Mounted file systems"
 
+msgid "Move down"
+msgstr ""
+
+msgid "Move up"
+msgstr ""
+
 msgid "Multicast Rate"
 msgstr "Multicast Rate"
 
@@ -1737,6 +1749,9 @@ msgstr "Save"
 msgid "Save & Apply"
 msgstr "Save & Apply"
 
+msgid "Save & Apply"
+msgstr ""
+
 msgid "Scan"
 msgstr "Scan"
 
@@ -1821,6 +1836,9 @@ msgstr ""
 "Sorry. OpenWrt does not support a system upgrade on this platform.<br /> You "
 "need to manually flash your device."
 
+msgid "Sort"
+msgstr ""
+
 msgid "Source"
 msgstr "Source"
 

po/en/upnp.po

@@ -12,45 +12,69 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#. Universal Plug & Play
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:1
-msgid "Universal Plug & Play"
-msgstr "Universal Plug & Play"
-
-#. UPNP allows clients in the local network to automatically configure the router.
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:2
-msgid ""
-"UPNP allows clients in the local network to automatically configure the "
-"router."
+msgid "Active UPnP Redirects"
 msgstr ""
-"UPNP allows clients in the local network to automatically configure the "
-"router."
 
-#. UPNP should only be enabled if absolutely necessary as it can result in high security risks for your network.
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:3
-msgid ""
-"UPNP should only be enabled if absolutely necessary as it can result in high "
-"security risks for your network."
+msgid "Client Address"
 msgstr ""
-"UPNP should only be enabled if absolutely necessary as it can result in high "
-"security risks for your network."
 
-#. Enable secure mode
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:4
-msgid "Enable secure mode"
-msgstr "Enable secure mode"
+msgid "Client Port"
+msgstr ""
 
-#. Log output
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:5
-msgid "Log output"
-msgstr "Log output"
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Delete Redirect"
+msgstr ""
 
-#. Downlink
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:6
 msgid "Downlink"
 msgstr "Downlink"
 
-#. Uplink
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:7
+msgid "Enable NAT-PMP"
+msgstr ""
+
+msgid "Enable UPnP Service"
+msgstr ""
+
+msgid "Enable secure mode"
+msgstr "Enable secure mode"
+
+msgid "External Port"
+msgstr ""
+
+msgid "Log output"
+msgstr "Log output"
+
+msgid "Protocol"
+msgstr ""
+
+msgid "There are no active redirects."
+msgstr ""
+
+msgid ""
+"UPNP allows clients in the local network to automatically configure the "
+"router."
+msgstr ""
+"UPNP allows clients in the local network to automatically configure the "
+"router."
+
+msgid ""
+"UPnP allows clients in the local network to automatically configure the "
+"router."
+msgstr ""
+
+msgid "Universal Plug & Play"
+msgstr "Universal Plug & Play"
+
 msgid "Uplink"
 msgstr "Uplink"
+
+msgid "enable"
+msgstr ""
+
+#~ msgid ""
+#~ "UPNP should only be enabled if absolutely necessary as it can result in "
+#~ "high security risks for your network."
+#~ msgstr ""
+#~ "UPNP should only be enabled if absolutely necessary as it can result in "
+#~ "high security risks for your network."

po/es/base.po

@@ -941,12 +941,18 @@ msgstr ""
 msgid "IPv4"
 msgstr ""
 
+msgid "IPv4 Firewall"
+msgstr ""
+
 msgid "IPv4-Address"
 msgstr ""
 
 msgid "IPv6"
 msgstr "IPv6"
 
+msgid "IPv6 Firewall"
+msgstr ""
+
 msgid "IPv6 Setup"
 msgstr ""
 
@@ -1319,6 +1325,12 @@ msgstr ""
 msgid "Mounted file systems"
 msgstr "Sistemas de archivo montados"
 
+msgid "Move down"
+msgstr ""
+
+msgid "Move up"
+msgstr ""
+
 msgid "Multicast Rate"
 msgstr "Multicast Rate"
 
@@ -1769,6 +1781,9 @@ msgstr "Guardar"
 msgid "Save & Apply"
 msgstr "Guardar & Aplicar"
 
+msgid "Save & Apply"
+msgstr ""
+
 msgid "Scan"
 msgstr "Escanear"
 
@@ -1854,6 +1869,9 @@ msgstr ""
 "plataforma. <br /> Para poder flashear este dispositivo deberá hacerlo en "
 "forma manual."
 
+msgid "Sort"
+msgstr ""
+
 msgid "Source"
 msgstr "Origen"
 

po/es/upnp.po

@@ -11,13 +11,45 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-#. Universal Plug & Play
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:1
-msgid "Universal Plug & Play"
-msgstr "Universal Plug & Play"
+msgid "Active UPnP Redirects"
+msgstr ""
+
+msgid "Client Address"
+msgstr ""
+
+msgid "Client Port"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Delete Redirect"
+msgstr ""
+
+msgid "Downlink"
+msgstr "Enlace de bajada (downlink)"
+
+msgid "Enable NAT-PMP"
+msgstr ""
+
+msgid "Enable UPnP Service"
+msgstr ""
+
+msgid "Enable secure mode"
+msgstr "Habilitar modo seguro"
+
+msgid "External Port"
+msgstr ""
+
+msgid "Log output"
+msgstr "Loguear salida"
+
+msgid "Protocol"
+msgstr ""
+
+msgid "There are no active redirects."
+msgstr ""
 
-#. UPNP allows clients in the local network to automatically configure the router.
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:2
 msgid ""
 "UPNP allows clients in the local network to automatically configure the "
 "router."
@@ -25,31 +57,23 @@ msgstr ""
 "UPNP permite a los clientes conectados a la red local configurar "
 "automáticamente el ruteador (router)."
 
-#. UPNP should only be enabled if absolutely necessary as it can result in high security risks for your network.
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:3
 msgid ""
-"UPNP should only be enabled if absolutely necessary as it can result in high "
-"security risks for your network."
+"UPnP allows clients in the local network to automatically configure the "
+"router."
 msgstr ""
-"UPNP sólo deberia habilitarse si es abasolutamente necesario ya que puede "
-"comprometer la seguridad de su red."
 
-#. Enable secure mode
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:4
-msgid "Enable secure mode"
-msgstr "Habilitar modo seguro"
+msgid "Universal Plug & Play"
+msgstr "Universal Plug & Play"
 
-#. Log output
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:5
-msgid "Log output"
-msgstr "Loguear salida"
-
-#. Downlink
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:6
-msgid "Downlink"
-msgstr "Enlace de bajada (downlink)"
-
-#. Uplink
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:7
 msgid "Uplink"
 msgstr "Enlace de subida (uplink)"
+
+msgid "enable"
+msgstr ""
+
+#~ msgid ""
+#~ "UPNP should only be enabled if absolutely necessary as it can result in "
+#~ "high security risks for your network."
+#~ msgstr ""
+#~ "UPNP sólo deberia habilitarse si es abasolutamente necesario ya que puede "
+#~ "comprometer la seguridad de su red."

po/fr/base.po

@@ -918,12 +918,18 @@ msgstr ""
 msgid "IPv4"
 msgstr ""
 
+msgid "IPv4 Firewall"
+msgstr ""
+
 msgid "IPv4-Address"
 msgstr ""
 
 msgid "IPv6"
 msgstr ""
 
+msgid "IPv6 Firewall"
+msgstr ""
+
 msgid "IPv6 Setup"
 msgstr ""
 
@@ -1293,6 +1299,12 @@ msgstr ""
 msgid "Mounted file systems"
 msgstr "Systèmes de fichiers montés"
 
+msgid "Move down"
+msgstr ""
+
+msgid "Move up"
+msgstr ""
+
 msgid "Multicast Rate"
 msgstr ""
 
@@ -1740,6 +1752,9 @@ msgstr "Sauvegarder"
 msgid "Save & Apply"
 msgstr "Sauvegarder et Appliquer"
 
+msgid "Save & Apply"
+msgstr ""
+
 msgid "Scan"
 msgstr "Scan"
 
@@ -1826,6 +1841,9 @@ msgstr ""
 "Sorry. OpenWrt does not support a system upgrade on this platform.<br /> You "
 "need to manually flash your device."
 
+msgid "Sort"
+msgstr ""
+
 msgid "Source"
 msgstr "Source"
 

po/fr/upnp.po

@@ -12,41 +12,60 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#. Universal Plug & Play
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:1
-msgid "Universal Plug & Play"
+msgid "Active UPnP Redirects"
+msgstr ""
+
+msgid "Client Address"
+msgstr ""
+
+msgid "Client Port"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Delete Redirect"
+msgstr ""
+
+msgid "Downlink"
+msgstr ""
+
+msgid "Enable NAT-PMP"
+msgstr ""
+
+msgid "Enable UPnP Service"
+msgstr ""
+
+msgid "Enable secure mode"
+msgstr ""
+
+msgid "External Port"
+msgstr ""
+
+msgid "Log output"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "There are no active redirects."
 msgstr ""
 
-#. UPNP allows clients in the local network to automatically configure the router.
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:2
 msgid ""
 "UPNP allows clients in the local network to automatically configure the "
 "router."
 msgstr ""
 
-#. UPNP should only be enabled if absolutely necessary as it can result in high security risks for your network.
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:3
 msgid ""
-"UPNP should only be enabled if absolutely necessary as it can result in high "
-"security risks for your network."
+"UPnP allows clients in the local network to automatically configure the "
+"router."
 msgstr ""
 
-#. Enable secure mode
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:4
-msgid "Enable secure mode"
+msgid "Universal Plug & Play"
 msgstr ""
 
-#. Log output
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:5
-msgid "Log output"
-msgstr ""
-
-#. Downlink
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:6
-msgid "Downlink"
-msgstr ""
-
-#. Uplink
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:7
 msgid "Uplink"
 msgstr ""
+
+msgid "enable"
+msgstr ""

po/it/base.po

@@ -940,12 +940,18 @@ msgstr ""
 msgid "IPv4"
 msgstr ""
 
+msgid "IPv4 Firewall"
+msgstr ""
+
 msgid "IPv4-Address"
 msgstr ""
 
 msgid "IPv6"
 msgstr ""
 
+msgid "IPv6 Firewall"
+msgstr ""
+
 msgid "IPv6 Setup"
 msgstr ""
 
@@ -1323,6 +1329,12 @@ msgstr ""
 msgid "Mounted file systems"
 msgstr "File system montati"
 
+msgid "Move down"
+msgstr ""
+
+msgid "Move up"
+msgstr ""
+
 msgid "Multicast Rate"
 msgstr "Velocità multicast"
 
@@ -1774,6 +1786,9 @@ msgstr "Salva"
 msgid "Save & Apply"
 msgstr "Salva & applica"
 
+msgid "Save & Apply"
+msgstr ""
+
 msgid "Scan"
 msgstr "Scan"
 
@@ -1860,6 +1875,9 @@ msgstr ""
 "Sorry. OpenWrt does not support a system upgrade on this platform.<br /> You "
 "need to manually flash your device."
 
+msgid "Sort"
+msgstr ""
+
 msgid "Source"
 msgstr "Origine"
 

po/it/upnp.po

@@ -12,41 +12,60 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#. Universal Plug & Play
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:1
-msgid "Universal Plug & Play"
+msgid "Active UPnP Redirects"
+msgstr ""
+
+msgid "Client Address"
+msgstr ""
+
+msgid "Client Port"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Delete Redirect"
+msgstr ""
+
+msgid "Downlink"
+msgstr ""
+
+msgid "Enable NAT-PMP"
+msgstr ""
+
+msgid "Enable UPnP Service"
+msgstr ""
+
+msgid "Enable secure mode"
+msgstr ""
+
+msgid "External Port"
+msgstr ""
+
+msgid "Log output"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "There are no active redirects."
 msgstr ""
 
-#. UPNP allows clients in the local network to automatically configure the router.
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:2
 msgid ""
 "UPNP allows clients in the local network to automatically configure the "
 "router."
 msgstr ""
 
-#. UPNP should only be enabled if absolutely necessary as it can result in high security risks for your network.
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:3
 msgid ""
-"UPNP should only be enabled if absolutely necessary as it can result in high "
-"security risks for your network."
+"UPnP allows clients in the local network to automatically configure the "
+"router."
 msgstr ""
 
-#. Enable secure mode
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:4
-msgid "Enable secure mode"
+msgid "Universal Plug & Play"
 msgstr ""
 
-#. Log output
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:5
-msgid "Log output"
-msgstr ""
-
-#. Downlink
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:6
-msgid "Downlink"
-msgstr ""
-
-#. Uplink
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:7
 msgid "Uplink"
 msgstr ""
+
+msgid "enable"
+msgstr ""

po/ja/base.po

@@ -945,12 +945,18 @@ msgstr "IPエイリアス"
 msgid "IPv4"
 msgstr "IPv4"
 
+msgid "IPv4 Firewall"
+msgstr ""
+
 msgid "IPv4-Address"
 msgstr "IPv4-アドレス"
 
 msgid "IPv6"
 msgstr "IPv6"
 
+msgid "IPv6 Firewall"
+msgstr ""
+
 msgid "IPv6 Setup"
 msgstr "IPv6設定"
 
@@ -1317,6 +1323,12 @@ msgstr ""
 msgid "Mounted file systems"
 msgstr "マウント中のファイルシステム"
 
+msgid "Move down"
+msgstr ""
+
+msgid "Move up"
+msgstr ""
+
 msgid "Multicast Rate"
 msgstr "マルチキャストレート"
 
@@ -1771,6 +1783,9 @@ msgstr "保存"
 msgid "Save & Apply"
 msgstr "保存 & 適用"
 
+msgid "Save & Apply"
+msgstr ""
+
 msgid "Scan"
 msgstr "スキャン"
 
@@ -1856,6 +1871,9 @@ msgstr ""
 "申し訳ありません。OpenWrtではこのプラットフォーム上でのシステムアップレードを"
 "行うことができません。<br />手動でデバイスを更新してください。"
 
+msgid "Sort"
+msgstr ""
+
 msgid "Source"
 msgstr "送信元"
 

po/ja/upnp.po

@@ -12,43 +12,67 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#. Universal Plug & Play
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:1
-msgid "Universal Plug & Play"
-msgstr "ユニバーサル プラグ & プレイ"
+msgid "Active UPnP Redirects"
+msgstr ""
+
+msgid "Client Address"
+msgstr ""
+
+msgid "Client Port"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Delete Redirect"
+msgstr ""
+
+msgid "Downlink"
+msgstr "ダウンリンク"
+
+msgid "Enable NAT-PMP"
+msgstr ""
+
+msgid "Enable UPnP Service"
+msgstr ""
+
+msgid "Enable secure mode"
+msgstr "セキュアモードを有効にする"
+
+msgid "External Port"
+msgstr ""
+
+msgid "Log output"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "There are no active redirects."
+msgstr ""
 
-#. UPNP allows clients in the local network to automatically configure the router.
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:2
 msgid ""
 "UPNP allows clients in the local network to automatically configure the "
 "router."
 msgstr ""
 
-#. UPNP should only be enabled if absolutely necessary as it can result in high security risks for your network.
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:3
 msgid ""
-"UPNP should only be enabled if absolutely necessary as it can result in high "
-"security risks for your network."
-msgstr ""
-"UPnPはあなたの使用するネットワークに対して、セキュリティリスクが生じる可能性があるため、"
-"必要な場合のみ有効にしてください。"
-
-#. Enable secure mode
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:4
-msgid "Enable secure mode"
-msgstr "セキュアモードを有効にする"
-
-#. Log output
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:5
-msgid "Log output"
+"UPnP allows clients in the local network to automatically configure the "
+"router."
 msgstr ""
 
-#. Downlink
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:6
-msgid "Downlink"
-msgstr "ダウンリンク"
+msgid "Universal Plug & Play"
+msgstr "ユニバーサル プラグ & プレイ"
 
-#. Uplink
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:7
 msgid "Uplink"
 msgstr "アップリンク"
+
+msgid "enable"
+msgstr ""
+
+#~ msgid ""
+#~ "UPNP should only be enabled if absolutely necessary as it can result in "
+#~ "high security risks for your network."
+#~ msgstr ""
+#~ "UPnPはあなたの使用するネットワークに対して、セキュリティリスクが生じる可能"
+#~ "性があるため、必要な場合のみ有効にしてください。"

po/ms/base.po

@@ -906,12 +906,18 @@ msgstr ""
 msgid "IPv4"
 msgstr ""
 
+msgid "IPv4 Firewall"
+msgstr ""
+
 msgid "IPv4-Address"
 msgstr ""
 
 msgid "IPv6"
 msgstr "Konfigurasi IPv6"
 
+msgid "IPv6 Firewall"
+msgstr ""
+
 msgid "IPv6 Setup"
 msgstr "Setup IPv6"
 
@@ -1279,6 +1285,12 @@ msgstr ""
 msgid "Mounted file systems"
 msgstr "Mounted fail sistems"
 
+msgid "Move down"
+msgstr ""
+
+msgid "Move up"
+msgstr ""
+
 msgid "Multicast Rate"
 msgstr "Multicast Rate"
 
@@ -1720,6 +1732,9 @@ msgstr "Simpan"
 msgid "Save & Apply"
 msgstr "Simpan & Melaksanakan"
 
+msgid "Save & Apply"
+msgstr ""
+
 msgid "Scan"
 msgstr "Scan"
 
@@ -1803,6 +1818,9 @@ msgstr ""
 "Maafkan. OpenWRT tidak menyokong meningkatkan sistem pada peron ini. <br /"
 ">Anda perlu flash peranti anda secara manual."
 
+msgid "Sort"
+msgstr ""
+
 msgid "Source"
 msgstr "Sumber"
 

po/no/base.po

@@ -925,12 +925,18 @@ msgstr ""
 msgid "IPv4"
 msgstr ""
 
+msgid "IPv4 Firewall"
+msgstr ""
+
 msgid "IPv4-Address"
 msgstr ""
 
 msgid "IPv6"
 msgstr "IPv6"
 
+msgid "IPv6 Firewall"
+msgstr ""
+
 msgid "IPv6 Setup"
 msgstr "IPv6 Oppsett"
 
@@ -1292,6 +1298,12 @@ msgstr ""
 msgid "Mounted file systems"
 msgstr "Monterte filsystemer"
 
+msgid "Move down"
+msgstr ""
+
+msgid "Move up"
+msgstr ""
+
 msgid "Multicast Rate"
 msgstr "Multicast hastighet"
 
@@ -1736,6 +1748,9 @@ msgstr "Lagre"
 msgid "Save & Apply"
 msgstr "Lagre & Aktiver"
 
+msgid "Save & Apply"
+msgstr ""
+
 msgid "Scan"
 msgstr "Skann"
 
@@ -1819,6 +1834,9 @@ msgstr ""
 "Beklager. OpenWrt støtter ikke systemoppgradering på denne plattformen.<br /"
 "> Du må flashe enheten manuelt."
 
+msgid "Sort"
+msgstr ""
+
 msgid "Source"
 msgstr "Kilde"
 

po/pl/base.po

@@ -868,12 +868,18 @@ msgstr ""
 msgid "IPv4"
 msgstr ""
 
+msgid "IPv4 Firewall"
+msgstr ""
+
 msgid "IPv4-Address"
 msgstr ""
 
 msgid "IPv6"
 msgstr ""
 
+msgid "IPv6 Firewall"
+msgstr ""
+
 msgid "IPv6 Setup"
 msgstr ""
 
@@ -1221,6 +1227,12 @@ msgstr ""
 msgid "Mounted file systems"
 msgstr ""
 
+msgid "Move down"
+msgstr ""
+
+msgid "Move up"
+msgstr ""
+
 msgid "Multicast Rate"
 msgstr ""
 
@@ -1653,6 +1665,9 @@ msgstr ""
 msgid "Save & Apply"
 msgstr ""
 
+msgid "Save & Apply"
+msgstr ""
+
 msgid "Scan"
 msgstr ""
 
@@ -1734,6 +1749,9 @@ msgid ""
 "need to manually flash your device."
 msgstr ""
 
+msgid "Sort"
+msgstr ""
+
 msgid "Source"
 msgstr ""
 

po/pt/base.po

@@ -944,12 +944,18 @@ msgstr ""
 msgid "IPv4"
 msgstr ""
 
+msgid "IPv4 Firewall"
+msgstr ""
+
 msgid "IPv4-Address"
 msgstr ""
 
 msgid "IPv6"
 msgstr "Configuração IPv6"
 
+msgid "IPv6 Firewall"
+msgstr ""
+
 msgid "IPv6 Setup"
 msgstr ""
 
@@ -1324,6 +1330,12 @@ msgstr ""
 msgid "Mounted file systems"
 msgstr "Sistemas de arquivos montados"
 
+msgid "Move down"
+msgstr ""
+
+msgid "Move up"
+msgstr ""
+
 msgid "Multicast Rate"
 msgstr "Taxa de Multicast"
 
@@ -1775,6 +1787,9 @@ msgstr "Salvar"
 msgid "Save & Apply"
 msgstr "Salvar & Aplicar"
 
+msgid "Save & Apply"
+msgstr ""
+
 msgid "Scan"
 msgstr "Procurar"
 
@@ -1862,6 +1877,9 @@ msgstr ""
 "plataforma.<br /> É necessário carregar manualmente uma imagem para a flash "
 "do seu equipamento."
 
+msgid "Sort"
+msgstr ""
+
 msgid "Source"
 msgstr "Origem"
 

po/pt/upnp.po

@@ -12,44 +12,68 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#. Universal Plug & Play
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:1
-msgid "Universal Plug & Play"
-msgstr "Plug & Play Universal"
+msgid "Active UPnP Redirects"
+msgstr ""
+
+msgid "Client Address"
+msgstr ""
+
+msgid "Client Port"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Delete Redirect"
+msgstr ""
+
+msgid "Downlink"
+msgstr "Link para download"
+
+msgid "Enable NAT-PMP"
+msgstr ""
+
+msgid "Enable UPnP Service"
+msgstr ""
+
+msgid "Enable secure mode"
+msgstr "Enable secure mode"
+
+msgid "External Port"
+msgstr ""
+
+msgid "Log output"
+msgstr "Log de saída"
+
+msgid "Protocol"
+msgstr ""
+
+msgid "There are no active redirects."
+msgstr ""
 
-#. UPNP allows clients in the local network to automatically configure the router.
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:2
 msgid ""
 "UPNP allows clients in the local network to automatically configure the "
 "router."
 msgstr ""
 "UPNP permite os clientes da rede local automaticamente configurar o roteador."
 
-#. UPNP should only be enabled if absolutely necessary as it can result in high security risks for your network.
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:3
 msgid ""
-"UPNP should only be enabled if absolutely necessary as it can result in high "
-"security risks for your network."
+"UPnP allows clients in the local network to automatically configure the "
+"router."
 msgstr ""
-"O UPNP deve ser ativado apenas se for absolutamente necessário, pois ele "
-"pode resultar em elevados riscos de segurança para sua rede."
 
-#. Enable secure mode
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:4
-msgid "Enable secure mode"
-msgstr "Enable secure mode"
+msgid "Universal Plug & Play"
+msgstr "Plug & Play Universal"
 
-#. Log output
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:5
-msgid "Log output"
-msgstr "Log de saída"
-
-#. Downlink
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:6
-msgid "Downlink"
-msgstr "Link para download"
-
-#. Uplink
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:7
 msgid "Uplink"
 msgstr "Link para Upload"
+
+msgid "enable"
+msgstr ""
+
+#~ msgid ""
+#~ "UPNP should only be enabled if absolutely necessary as it can result in "
+#~ "high security risks for your network."
+#~ msgstr ""
+#~ "O UPNP deve ser ativado apenas se for absolutamente necessário, pois ele "
+#~ "pode resultar em elevados riscos de segurança para sua rede."

po/pt_BR/base.po

@@ -942,12 +942,18 @@ msgstr ""
 msgid "IPv4"
 msgstr ""
 
+msgid "IPv4 Firewall"
+msgstr ""
+
 msgid "IPv4-Address"
 msgstr ""
 
 msgid "IPv6"
 msgstr "Configuração IPv6"
 
+msgid "IPv6 Firewall"
+msgstr ""
+
 msgid "IPv6 Setup"
 msgstr ""
 
@@ -1322,6 +1328,12 @@ msgstr ""
 msgid "Mounted file systems"
 msgstr "Sistemas de arquivos montados"
 
+msgid "Move down"
+msgstr ""
+
+msgid "Move up"
+msgstr ""
+
 msgid "Multicast Rate"
 msgstr "Taxa de Multicast"
 
@@ -1773,6 +1785,9 @@ msgstr "Salvar"
 msgid "Save & Apply"
 msgstr "Salvar & Aplicar"
 
+msgid "Save & Apply"
+msgstr ""
+
 msgid "Scan"
 msgstr "Procurar"
 
@@ -1860,6 +1875,9 @@ msgstr ""
 "plataforma.<br /> É necessário carregar manualmente uma imagem para a flash "
 "do seu equipamento."
 
+msgid "Sort"
+msgstr ""
+
 msgid "Source"
 msgstr "Origem"
 

po/pt_BR/upnp.po

@@ -12,44 +12,68 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#. Universal Plug & Play
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:1
-msgid "Universal Plug & Play"
-msgstr "Plug & Play Universal"
+msgid "Active UPnP Redirects"
+msgstr ""
+
+msgid "Client Address"
+msgstr ""
+
+msgid "Client Port"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Delete Redirect"
+msgstr ""
+
+msgid "Downlink"
+msgstr "Link para download"
+
+msgid "Enable NAT-PMP"
+msgstr ""
+
+msgid "Enable UPnP Service"
+msgstr ""
+
+msgid "Enable secure mode"
+msgstr "Enable secure mode"
+
+msgid "External Port"
+msgstr ""
+
+msgid "Log output"
+msgstr "Log de saída"
+
+msgid "Protocol"
+msgstr ""
+
+msgid "There are no active redirects."
+msgstr ""
 
-#. UPNP allows clients in the local network to automatically configure the router.
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:2
 msgid ""
 "UPNP allows clients in the local network to automatically configure the "
 "router."
 msgstr ""
 "UPNP permite os clientes da rede local automaticamente configurar o roteador."
 
-#. UPNP should only be enabled if absolutely necessary as it can result in high security risks for your network.
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:3
 msgid ""
-"UPNP should only be enabled if absolutely necessary as it can result in high "
-"security risks for your network."
+"UPnP allows clients in the local network to automatically configure the "
+"router."
 msgstr ""
-"O UPNP deve ser ativado apenas se for absolutamente necessário, pois ele "
-"pode resultar em elevados riscos de segurança para sua rede."
 
-#. Enable secure mode
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:4
-msgid "Enable secure mode"
-msgstr "Enable secure mode"
+msgid "Universal Plug & Play"
+msgstr "Plug & Play Universal"
 
-#. Log output
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:5
-msgid "Log output"
-msgstr "Log de saída"
-
-#. Downlink
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:6
-msgid "Downlink"
-msgstr "Link para download"
-
-#. Uplink
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:7
 msgid "Uplink"
 msgstr "Link para Upload"
+
+msgid "enable"
+msgstr ""
+
+#~ msgid ""
+#~ "UPNP should only be enabled if absolutely necessary as it can result in "
+#~ "high security risks for your network."
+#~ msgstr ""
+#~ "O UPNP deve ser ativado apenas se for absolutamente necessário, pois ele "
+#~ "pode resultar em elevados riscos de segurança para sua rede."

po/ru/base.po

@@ -943,12 +943,18 @@ msgstr ""
 msgid "IPv4"
 msgstr ""
 
+msgid "IPv4 Firewall"
+msgstr ""
+
 msgid "IPv4-Address"
 msgstr ""
 
 msgid "IPv6"
 msgstr ""
 
+msgid "IPv6 Firewall"
+msgstr ""
+
 msgid "IPv6 Setup"
 msgstr ""
 
@@ -1322,6 +1328,12 @@ msgstr ""
 msgid "Mounted file systems"
 msgstr "Монтированные файловые системы\""
 
+msgid "Move down"
+msgstr ""
+
+msgid "Move up"
+msgstr ""
+
 msgid "Multicast Rate"
 msgstr ""
 
@@ -1778,6 +1790,9 @@ msgstr "Сохранить"
 msgid "Save & Apply"
 msgstr "Сохранить & Принять"
 
+msgid "Save & Apply"
+msgstr ""
+
 msgid "Scan"
 msgstr ""
 
@@ -1865,6 +1880,9 @@ msgstr ""
 "Sorry. OpenWrt does not support a system upgrade on this platform.<br /> You "
 "need to manually flash your device."
 
+msgid "Sort"
+msgstr ""
+
 msgid "Source"
 msgstr ""
 

po/ru/upnp.po

@@ -12,41 +12,60 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#. Universal Plug & Play
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:1
-msgid "Universal Plug & Play"
+msgid "Active UPnP Redirects"
+msgstr ""
+
+msgid "Client Address"
+msgstr ""
+
+msgid "Client Port"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Delete Redirect"
+msgstr ""
+
+msgid "Downlink"
+msgstr ""
+
+msgid "Enable NAT-PMP"
+msgstr ""
+
+msgid "Enable UPnP Service"
+msgstr ""
+
+msgid "Enable secure mode"
+msgstr ""
+
+msgid "External Port"
+msgstr ""
+
+msgid "Log output"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "There are no active redirects."
 msgstr ""
 
-#. UPNP allows clients in the local network to automatically configure the router.
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:2
 msgid ""
 "UPNP allows clients in the local network to automatically configure the "
 "router."
 msgstr ""
 
-#. UPNP should only be enabled if absolutely necessary as it can result in high security risks for your network.
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:3
 msgid ""
-"UPNP should only be enabled if absolutely necessary as it can result in high "
-"security risks for your network."
+"UPnP allows clients in the local network to automatically configure the "
+"router."
 msgstr ""
 
-#. Enable secure mode
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:4
-msgid "Enable secure mode"
+msgid "Universal Plug & Play"
 msgstr ""
 
-#. Log output
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:5
-msgid "Log output"
-msgstr ""
-
-#. Downlink
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:6
-msgid "Downlink"
-msgstr ""
-
-#. Uplink
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:7
 msgid "Uplink"
 msgstr ""
+
+msgid "enable"
+msgstr ""

po/templates/base.pot

@@ -871,12 +871,18 @@ msgstr ""
 msgid "IPv4"
 msgstr ""
 
+msgid "IPv4 Firewall"
+msgstr ""
+
 msgid "IPv4-Address"
 msgstr ""
 
 msgid "IPv6"
 msgstr ""
 
+msgid "IPv6 Firewall"
+msgstr ""
+
 msgid "IPv6 Setup"
 msgstr ""
 
@@ -1224,6 +1230,12 @@ msgstr ""
 msgid "Mounted file systems"
 msgstr ""
 
+msgid "Move down"
+msgstr ""
+
+msgid "Move up"
+msgstr ""
+
 msgid "Multicast Rate"
 msgstr ""
 
@@ -1656,6 +1668,9 @@ msgstr ""
 msgid "Save & Apply"
 msgstr ""
 
+msgid "Save & Apply"
+msgstr ""
+
 msgid "Scan"
 msgstr ""
 
@@ -1737,6 +1752,9 @@ msgid ""
 "need to manually flash your device."
 msgstr ""
 
+msgid "Sort"
+msgstr ""
+
 msgid "Source"
 msgstr ""
 

po/templates/upnp.pot

@@ -1,43 +1,60 @@
-#  upnp.pot
-#  generated from ./applications/luci-upnp/luasrc/i18n/upnp.en.lua
 msgid ""
 msgstr "Content-Type: text/plain; charset=UTF-8"
 
-#. Universal Plug & Play
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:1
-msgid "Universal Plug & Play"
+msgid "Active UPnP Redirects"
+msgstr ""
+
+msgid "Client Address"
+msgstr ""
+
+msgid "Client Port"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Delete Redirect"
+msgstr ""
+
+msgid "Downlink"
+msgstr ""
+
+msgid "Enable NAT-PMP"
+msgstr ""
+
+msgid "Enable UPnP Service"
+msgstr ""
+
+msgid "Enable secure mode"
+msgstr ""
+
+msgid "External Port"
+msgstr ""
+
+msgid "Log output"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "There are no active redirects."
 msgstr ""
 
-#. UPNP allows clients in the local network to automatically configure the router.
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:2
 msgid ""
 "UPNP allows clients in the local network to automatically configure the "
 "router."
 msgstr ""
 
-#. UPNP should only be enabled if absolutely necessary as it can result in high security risks for your network.
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:3
 msgid ""
-"UPNP should only be enabled if absolutely necessary as it can result in high "
-"security risks for your network."
+"UPnP allows clients in the local network to automatically configure the "
+"router."
 msgstr ""
 
-#. Enable secure mode
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:4
-msgid "Enable secure mode"
+msgid "Universal Plug & Play"
 msgstr ""
 
-#. Log output
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:5
-msgid "Log output"
-msgstr ""
-
-#. Downlink
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:6
-msgid "Downlink"
-msgstr ""
-
-#. Uplink
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:7
 msgid "Uplink"
 msgstr ""
+
+msgid "enable"
+msgstr ""

po/vi/base.po

@@ -934,12 +934,18 @@ msgstr ""
 msgid "IPv4"
 msgstr ""
 
+msgid "IPv4 Firewall"
+msgstr ""
+
 msgid "IPv4-Address"
 msgstr ""
 
 msgid "IPv6"
 msgstr "IPv6"
 
+msgid "IPv6 Firewall"
+msgstr ""
+
 msgid "IPv6 Setup"
 msgstr ""
 
@@ -1309,6 +1315,12 @@ msgstr ""
 msgid "Mounted file systems"
 msgstr "Lắp tập tin hệ thống"
 
+msgid "Move down"
+msgstr ""
+
+msgid "Move up"
+msgstr ""
+
 msgid "Multicast Rate"
 msgstr "Multicast Rate"
 
@@ -1759,6 +1771,9 @@ msgstr "Lưu"
 msgid "Save & Apply"
 msgstr "Lưu & áp dụng "
 
+msgid "Save & Apply"
+msgstr ""
+
 msgid "Scan"
 msgstr "Scan"
 
@@ -1844,6 +1859,9 @@ msgstr ""
 "Xin lỗi. OpenWrt không hỗ trợ nâng cấp hệ thống trên platform này. <br /> "
 "Bạn cần tự flash thiết bị của bạn. "
 
+msgid "Sort"
+msgstr ""
+
 msgid "Source"
 msgstr "Nguồn"
 

po/vi/upnp.po

@@ -13,44 +13,68 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-#. Universal Plug & Play
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:1
-msgid "Universal Plug & Play"
-msgstr "Universal Plug & Play"
+msgid "Active UPnP Redirects"
+msgstr ""
+
+msgid "Client Address"
+msgstr ""
+
+msgid "Client Port"
+msgstr ""
+
+msgid "Collecting data..."
+msgstr ""
+
+msgid "Delete Redirect"
+msgstr ""
+
+msgid "Downlink"
+msgstr "Downlink"
+
+msgid "Enable NAT-PMP"
+msgstr ""
+
+msgid "Enable UPnP Service"
+msgstr ""
+
+msgid "Enable secure mode"
+msgstr "Kích hoạt chế độ an toàn"
+
+msgid "External Port"
+msgstr ""
+
+msgid "Log output"
+msgstr "Log output"
+
+msgid "Protocol"
+msgstr ""
+
+msgid "There are no active redirects."
+msgstr ""
 
-#. UPNP allows clients in the local network to automatically configure the router.
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:2
 msgid ""
 "UPNP allows clients in the local network to automatically configure the "
 "router."
 msgstr ""
 "UPNP cho phép đối tượng trong mạng địa phương tự động định dạng bộ định tuyến"
 
-#. UPNP should only be enabled if absolutely necessary as it can result in high security risks for your network.
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:3
 msgid ""
-"UPNP should only be enabled if absolutely necessary as it can result in high "
-"security risks for your network."
+"UPnP allows clients in the local network to automatically configure the "
+"router."
 msgstr ""
-"Chỉ nên kích hoạt UPNP khi thật cần thiết vì nó có thể gây nguy hiểm cho "
-"mạng lưới"
 
-#. Enable secure mode
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:4
-msgid "Enable secure mode"
-msgstr "Kích hoạt chế độ an toàn"
+msgid "Universal Plug & Play"
+msgstr "Universal Plug & Play"
 
-#. Log output
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:5
-msgid "Log output"
-msgstr "Log output"
-
-#. Downlink
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:6
-msgid "Downlink"
-msgstr "Downlink"
-
-#. Uplink
-#: applications/luci-upnp/luasrc/i18n/upnp.en.lua:7
 msgid "Uplink"
 msgstr "Uplink"
+
+msgid "enable"
+msgstr ""
+
+#~ msgid ""
+#~ "UPNP should only be enabled if absolutely necessary as it can result in "
+#~ "high security risks for your network."
+#~ msgstr ""
+#~ "Chỉ nên kích hoạt UPNP khi thật cần thiết vì nó có thể gây nguy hiểm cho "
+#~ "mạng lưới"

po/zh_CN/base.po

@@ -888,12 +888,18 @@ msgstr ""
 msgid "IPv4"
 msgstr ""
 
+msgid "IPv4 Firewall"
+msgstr ""
+
 msgid "IPv4-Address"
 msgstr ""
 
 msgid "IPv6"
 msgstr "IPv6"
 
+msgid "IPv6 Firewall"
+msgstr ""
+
 msgid "IPv6 Setup"
 msgstr ""
 
@@ -1243,6 +1249,12 @@ msgstr ""
 msgid "Mounted file systems"
 msgstr ""
 
+msgid "Move down"
+msgstr ""
+
+msgid "Move up"
+msgstr ""
+
 msgid "Multicast Rate"
 msgstr ""
 
@@ -1677,6 +1689,9 @@ msgstr "保存"
 msgid "Save & Apply"
 msgstr "保存& 应用"
 
+msgid "Save & Apply"
+msgstr ""
+
 msgid "Scan"
 msgstr "搜索"
 
@@ -1758,6 +1773,9 @@ msgid ""
 "need to manually flash your device."
 msgstr ""
 
+msgid "Sort"
+msgstr ""
+
 msgid "Source"
 msgstr ""