po: update firewall translations

20 files changed, 3387 insertions, 1325 deletions

diff --git a/po/ca/firewall.po b/po/ca/firewall.po
index 2a9537d07..5e5bbd1b5 100644
--- a/po/ca/firewall.po
+++ b/po/ca/firewall.po
@@ -13,6 +13,9 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
+msgid "%s%s with %s"
+msgstr ""
+
 msgid "(Unnamed Entry)"
 msgstr ""
 
@@ -28,33 +31,32 @@ msgstr ""
 msgid "-- custom --"
 msgstr ""
 
-msgid "Action"
-msgstr "Acció"
+msgid "<var>%d</var> pkts. per <var>%s</var>"
+msgstr ""
 
-msgid "Add"
+msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr ""
 
-msgid "Add and edit..."
+msgid "<var>%s</var> and limit to %s"
 msgstr ""
 
-msgid "Advanced Options"
+msgid "Accept forward"
 msgstr ""
 
-msgid "Advanced Rules"
-msgstr "Regles avançades"
+msgid "Accept input"
+msgstr ""
 
-msgid "Advanced Settings"
+msgid "Action"
+msgstr "Acció"
+
+msgid "Add"
 msgstr ""
 
-msgid ""
-"Advanced rules let you customize the firewall to your needs. Only new "
-"connections will be matched. Packets belonging to already open connections "
-"are automatically allowed to pass the firewall."
+msgid "Add and edit..."
+msgstr ""
+
+msgid "Advanced Settings"
 msgstr ""
-"Les regles avançades et deixen personalitzar el teu tallafocs per les teves "
-"necessitats. Només s'hi correspondran les connexions noves. Als paquets que "
-"pertanyen una connexió oberta se'ls permet passar el tallafocs "
-"automàticament."
 
 msgid "Allow forward from <em>source zones</em>:"
 msgstr ""
@@ -71,9 +73,6 @@ msgstr ""
 msgid "Custom Rules"
 msgstr ""
 
-msgid "Custom Rules (/etc/firewall.user)"
-msgstr ""
-
 msgid ""
 "Custom rules allow you to execute arbritary iptables commands which are not "
 "otherwise covered by the firewall framework. The commands are executed after "
@@ -96,12 +95,21 @@ msgstr "Port de destí"
 msgid "Destination zone"
 msgstr "Destí"
 
-msgid "Device"
+msgid "Discard forward"
+msgstr ""
+
+msgid "Discard input"
 msgstr ""
 
 msgid "Do not rewrite"
 msgstr ""
 
+msgid "Do not track forward"
+msgstr ""
+
+msgid "Do not track input"
+msgstr ""
+
 msgid "Drop invalid packets"
 msgstr "Descarta els paquets invàlids"
 
@@ -136,20 +144,39 @@ msgstr ""
 msgid "Firewall - Zone Settings"
 msgstr ""
 
-msgid ""
-"For DNAT, match incoming traffic directed at the given destination ip "
-"address. For SNAT rewrite the source address to the given address."
-msgstr ""
-
 msgid "Force connection tracking"
 msgstr ""
 
 msgid "Forward"
 msgstr ""
 
+msgid "Forward to %s in %s"
+msgstr ""
+
+msgid "Forward to %s, %s in %s"
+msgstr ""
+
+msgid "From %s in %s"
+msgstr ""
+
+msgid "From %s in %s with source %s"
+msgstr ""
+
+msgid "From %s in %s with source %s and %s"
+msgstr ""
+
 msgid "General Settings"
 msgstr ""
 
+msgid "IP"
+msgstr ""
+
+msgid "IP range"
+msgstr ""
+
+msgid "IPs"
+msgstr ""
+
 msgid "IPv4"
 msgstr ""
 
@@ -188,6 +215,12 @@ msgstr "Port intern (opcional)"
 msgid "Limit log messages"
 msgstr ""
 
+msgid "MAC"
+msgstr ""
+
+msgid "MACs"
+msgstr ""
+
 #, fuzzy
 msgid "MSS clamping"
 msgstr "Clamping MSS"
@@ -208,11 +241,6 @@ msgstr ""
 
 msgid ""
 "Match incoming traffic originating from the given source port or port range "
-"on the client host"
-msgstr ""
-
-msgid ""
-"Match incoming traffic originating from the given source port or port range "
 "on the client host."
 msgstr ""
 
@@ -257,27 +285,14 @@ msgstr ""
 msgid "Output"
 msgstr "Sortida"
 
-msgid "Overview"
-msgstr ""
-
 msgid "Port Forwards"
 msgstr ""
 
-msgid "Port forwarding"
-msgstr "Readreçament de port"
-
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
 msgstr ""
 
-msgid ""
-"Port forwarding allows to provide network services in the internal network "
-"to an external network."
-msgstr ""
-"El readreçament de ports permet proveir serveis de la xarxa interna a una "
-"xarxa externa."
-
 msgid "Protocol"
 msgstr ""
 
@@ -288,10 +303,10 @@ msgstr ""
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr ""
 
-msgid "Redirection type"
+msgid "Refuse forward"
 msgstr ""
 
-msgid "Redirections"
+msgid "Refuse input"
 msgstr ""
 
 msgid "Restrict Masquerading to given destination subnets"
@@ -311,7 +326,10 @@ msgid ""
 "rewrite the IP address."
 msgstr ""
 
-msgid "Rules"
+msgid "Rewrite to source %s"
+msgstr ""
+
+msgid "Rewrite to source %s, %s"
 msgstr ""
 
 msgid "SNAT"
@@ -387,24 +405,32 @@ msgid ""
 "networks</em> specifies which available networks are member of this zone."
 msgstr ""
 
-msgid "To source IP"
+msgid "To %s"
 msgstr ""
 
-msgid "To source port"
+msgid "To %s at %s"
+msgstr ""
+
+msgid "To %s at %s on <var>this device</var>"
 msgstr ""
 
-msgid "Traffic Redirection"
-msgstr "Readreçament de tràfic"
+msgid "To %s in %s"
+msgstr ""
 
-msgid "Traffic Rules"
+msgid "To %s on <var>this device</var>"
 msgstr ""
 
-msgid ""
-"Traffic redirection allows you to change the destination address of "
-"forwarded packets."
+msgid "To %s, %s in %s"
+msgstr ""
+
+msgid "To source IP"
+msgstr ""
+
+msgid "To source port"
+msgstr ""
+
+msgid "Traffic Rules"
 msgstr ""
-"El readreçament de tràfic et permet canviar l'adreça destí dels paquets "
-"reenviats."
 
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
@@ -435,15 +461,84 @@ msgstr "accepta"
 msgid "any"
 msgstr ""
 
+msgid "any host"
+msgstr ""
+
+msgid "any router IP"
+msgstr ""
+
+msgid "any zone"
+msgstr ""
+
+msgid "day"
+msgstr ""
+
 msgid "don't track"
 msgstr ""
 
 msgid "drop"
 msgstr "descarta"
 
+msgid "hour"
+msgstr ""
+
+msgid "minute"
+msgstr ""
+
+msgid "not"
+msgstr ""
+
+msgid "port"
+msgstr ""
+
+msgid "ports"
+msgstr ""
+
 msgid "reject"
 msgstr "rebutja"
 
+msgid "second"
+msgstr ""
+
+msgid "type"
+msgstr ""
+
+msgid "types"
+msgstr ""
+
+#~ msgid "Advanced Rules"
+#~ msgstr "Regles avançades"
+
+#~ msgid ""
+#~ "Advanced rules let you customize the firewall to your needs. Only new "
+#~ "connections will be matched. Packets belonging to already open "
+#~ "connections are automatically allowed to pass the firewall."
+#~ msgstr ""
+#~ "Les regles avançades et deixen personalitzar el teu tallafocs per les "
+#~ "teves necessitats. Només s'hi correspondran les connexions noves. Als "
+#~ "paquets que pertanyen una connexió oberta se'ls permet passar el "
+#~ "tallafocs automàticament."
+
+#~ msgid "Port forwarding"
+#~ msgstr "Readreçament de port"
+
+#~ msgid ""
+#~ "Port forwarding allows to provide network services in the internal "
+#~ "network to an external network."
+#~ msgstr ""
+#~ "El readreçament de ports permet proveir serveis de la xarxa interna a una "
+#~ "xarxa externa."
+
+#~ msgid "Traffic Redirection"
+#~ msgstr "Readreçament de tràfic"
+
+#~ msgid ""
+#~ "Traffic redirection allows you to change the destination address of "
+#~ "forwarded packets."
+#~ msgstr ""
+#~ "El readreçament de tràfic et permet canviar l'adreça destí dels paquets "
+#~ "reenviats."
+
 #, fuzzy
 #~ msgid "Network"
 #~ msgstr "Xarxes"
diff --git a/po/de/firewall.po b/po/de/firewall.po
index dc0f482ef..5e3833aa3 100644
--- a/po/de/firewall.po
+++ b/po/de/firewall.po
@@ -13,48 +13,51 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.4\n"
 
+msgid "%s%s with %s"
+msgstr "%s%s mit %s"
+
 msgid "(Unnamed Entry)"
-msgstr ""
+msgstr "(Unbenannter Eintrag)"
 
 msgid "(Unnamed SNAT)"
-msgstr ""
+msgstr "(Unbennanter SNAT-Eintrag)"
 
 msgid "(optional)"
 msgstr "(optional)"
 
 msgid "-- Please choose --"
-msgstr ""
+msgstr "-- Bitte wählen --"
 
 msgid "-- custom --"
-msgstr ""
+msgstr "-- benutzerdefiniert --"
+
+msgid "<var>%d</var> pkts. per <var>%s</var>"
+msgstr "<var>%d</var> Pkte. pro <var>%s</var>"
+
+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."
+
+msgid "<var>%s</var> and limit to %s"
+msgstr "<var>%s</var> und limitieren auf %s"
+
+msgid "Accept forward"
+msgstr "Weiterleitung erlauben"
+
+msgid "Accept input"
+msgstr "Eingang erlauben"
 
 msgid "Action"
 msgstr "Aktion"
 
 msgid "Add"
-msgstr ""
+msgstr "Hinzufügen"
 
 msgid "Add and edit..."
-msgstr ""
-
-msgid "Advanced Options"
-msgstr "Erweiterte Optionen"
-
-msgid "Advanced Rules"
-msgstr "Erweiterte Regeln"
+msgstr "Hinzufügen und bearbeiten..."
 
 msgid "Advanced Settings"
 msgstr "Erweiterte Einstellungen"
 
-msgid ""
-"Advanced rules let you customize the firewall to your needs. Only new "
-"connections will be matched. Packets belonging to already open connections "
-"are automatically allowed to pass the firewall."
-msgstr ""
-"Mit erweiterten Regeln kann die Firewall an die eigenen Bedürfnisse "
-"angepasst werden. Es werden nur neue Verbindungen betrachtet. Pakete, die zu "
-"bereits bestehenden Verbindungen gehören werden automatisch akzeptiert."
-
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Erlaube Weiterleitung von <em>Quellzone</em>:"
 
@@ -70,20 +73,21 @@ msgstr "Abgedeckte Netzwerke"
 msgid "Custom Rules"
 msgstr "Benutzerdefinierte Regeln"
 
-msgid "Custom Rules (/etc/firewall.user)"
-msgstr "Benutzerdefinierte Regeln (/etc/firewall.user)"
-
 msgid ""
 "Custom rules allow you to execute arbritary iptables commands which are not "
 "otherwise covered by the firewall framework. The commands are executed after "
 "each firewall restart, right after the default ruleset has been loaded."
 msgstr ""
+"Benutzerdefinierte Regeln ermöglichen das Ausführen belieber iptables-"
+"Befehle welche durch das Firewall-Framework nicht unterstützt werden. Die "
+"Befehle werden mit jedem Firewall-Neustart abgearbeitet, direkt nach dem "
+"Laden der Basisregeln."
 
 msgid "Destination"
 msgstr "Ziel"
 
 msgid "Destination IP address"
-msgstr ""
+msgstr "Ziel IP-Adresse"
 
 msgid "Destination address"
 msgstr "Zieladresse"
@@ -94,11 +98,20 @@ msgstr "Zielport"
 msgid "Destination zone"
 msgstr "Ziel-Zone"
 
-msgid "Device"
-msgstr "Gerät"
+msgid "Discard forward"
+msgstr "Weiterleitung verwerfen"
+
+msgid "Discard input"
+msgstr "Eingang verwerfen"
 
 msgid "Do not rewrite"
-msgstr ""
+msgstr "Nicht umschreiben"
+
+msgid "Do not track forward"
+msgstr "Weiterleitung nicht verfolgen"
+
+msgid "Do not track input"
+msgstr "Eingang nicht verfolgen"
 
 msgid "Drop invalid packets"
 msgstr "Ungültige Pakete verwerfen"
@@ -122,35 +135,52 @@ msgid "Firewall"
 msgstr "Firewall"
 
 msgid "Firewall - Custom Rules"
-msgstr ""
+msgstr "Firewall - Benutzerdefinierte Regeln"
 
 msgid "Firewall - Port Forwards"
-msgstr ""
+msgstr "Firewall - Portweiterleitungen"
 
 msgid "Firewall - Traffic Rules"
-msgstr ""
+msgstr "Firewall - Verkehrsregeln"
 
 msgid "Firewall - Zone Settings"
 msgstr "Firewall - Zoneneinstellungen"
 
-msgid ""
-"For DNAT, match incoming traffic directed at the given destination ip "
-"address. For SNAT rewrite the source address to the given address."
-msgstr ""
-"Für DNAT Regeln wird der Verkehr nach der angegeben Zieladresse gefiltert. "
-"Bei SNAT Regeln ist dieses die Quelladresse für umgeschriebene Pakete."
-
 msgid "Force connection tracking"
 msgstr "Connectiontracking erzwingen"
 
 msgid "Forward"
 msgstr "Weitergeleitet"
 
+msgid "Forward to %s in %s"
+msgstr "Weiterleiten zu %s in %s"
+
+msgid "Forward to %s, %s in %s"
+msgstr "Weiterleiten zu %s, %s in %s"
+
+msgid "From %s in %s"
+msgstr "Von %s in %s"
+
+msgid "From %s in %s with source %s"
+msgstr "Von %s in %s mit Quell-%s"
+
+msgid "From %s in %s with source %s and %s"
+msgstr "Von %s in %s mit Quell-%s und %s"
+
 msgid "General Settings"
 msgstr "Allgemein"
 
+msgid "IP"
+msgstr "IP"
+
+msgid "IP range"
+msgstr "IP-Bereich"
+
+msgid "IPs"
+msgstr "IPs"
+
 msgid "IPv4"
-msgstr ""
+msgstr "IPv4"
 
 msgid "IPv4 and IPv6"
 msgstr "IPv4 und IPv6"
@@ -159,7 +189,7 @@ msgid "IPv4 only"
 msgstr "nur IPv4"
 
 msgid "IPv6"
-msgstr ""
+msgstr "IPv6"
 
 msgid "IPv6 only"
 msgstr "nur IPv6"
@@ -185,6 +215,12 @@ msgstr "Interner Port (optional)"
 msgid "Limit log messages"
 msgstr "Protokollnachrichten limitieren"
 
+msgid "MAC"
+msgstr "MAC"
+
+msgid "MACs"
+msgstr "MACs"
+
 msgid "MSS clamping"
 msgstr "MSS Korrektur"
 
@@ -195,7 +231,7 @@ msgid "Match ICMP type"
 msgstr "Nach ICMP-Typ filtern"
 
 msgid "Match forwarded traffic to the given destination port or port range."
-msgstr ""
+msgstr "Selektiert weitergeleiteten Verkehr nach den angegebenen Ziel-Ports."
 
 msgid ""
 "Match incoming traffic directed at the given destination port or port range "
@@ -206,77 +242,59 @@ msgstr ""
 
 msgid ""
 "Match incoming traffic originating from the given source port or port range "
-"on the client host"
-msgstr ""
-"Eingehende Verbindungen filtern welche von dem angegebenen Port oder "
-"Portbereich des Clients ausgehen"
-
-msgid ""
-"Match incoming traffic originating from the given source port or port range "
 "on the client host."
-msgstr ""
+msgstr "Selektiert eingehenden Verkehr nach den angegebenen Quell-Ports."
 
 msgid "Name"
 msgstr "Name"
 
 msgid "New SNAT rule"
-msgstr ""
+msgstr "Neue SNAT-Regel"
 
 msgid "New forward rule"
-msgstr ""
+msgstr "Neuer Weiterleitungsregel"
 
 msgid "New input rule"
-msgstr ""
+msgstr "Neue Eingangsregel"
 
 msgid "New port forward"
-msgstr ""
+msgstr "Neue Portweiterleitung"
 
 msgid "New source NAT"
-msgstr ""
+msgstr "Neues SNAT"
 
 msgid "Only match incoming traffic directed at the given IP address."
-msgstr ""
+msgstr "Selektiere nur Verkehr der an die angegebene IP-Adresse gerichtet ist."
 
 msgid "Only match incoming traffic from these MACs."
-msgstr ""
+msgstr "Selektiere nur Verkehr von den angegebenen MAC-Adressen."
 
 msgid "Only match incoming traffic from this IP or range."
-msgstr ""
+msgstr "Selektiere nur Verkehr vom angebenem Quell-IP-Adressbereich."
 
 msgid ""
 "Only match incoming traffic originating from the given source port or port "
 "range on the client host"
-msgstr ""
+msgstr "Selektiere nur Verkehr von den angegebenen Quell-Ports auf dem Client."
 
 msgid "Open ports on router"
-msgstr ""
+msgstr "Ports auf dem Router öffnen"
 
 msgid "Other..."
-msgstr ""
+msgstr "Anderes..."
 
 msgid "Output"
 msgstr "Ausgang"
 
-msgid "Overview"
-msgstr "Übersicht"
-
 msgid "Port Forwards"
-msgstr ""
-
-msgid "Port forwarding"
-msgstr "Portweiterleitung"
+msgstr "Portweiterleitungen"
 
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
 msgstr ""
-
-msgid ""
-"Port forwarding allows to provide network services in the internal network "
-"to an external network."
-msgstr ""
-"Portweiterleitungen ermöglichen es interne Netzwerkdienste aus einem "
-"externen Netzwerk heraus erreichbar zu machen."
+"Portweiterleitungen ermöglichen es entfernten Rechnern im Internet auf "
+"bestimmte Computer oder Dienste im lokalen LAN zuzugreifen."
 
 msgid "Protocol"
 msgstr "Protokoll"
@@ -290,11 +308,11 @@ msgstr ""
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "Gefilterte Verbindungen an den angegeben internen Host weiterleiten"
 
-msgid "Redirection type"
-msgstr "Typ der Weiterleitung"
+msgid "Refuse forward"
+msgstr "Weiterleitung zurückweisen"
 
-msgid "Redirections"
-msgstr "Weiterleitungen"
+msgid "Refuse input"
+msgstr "Eingang zurückweisen"
 
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "NAT auf die angegebenen Ziel-Subnetze beschränken"
@@ -306,24 +324,29 @@ msgid "Restrict to address family"
 msgstr "Beschränke auf Adressfamilie"
 
 msgid "Rewrite matched traffic to the given address."
-msgstr ""
+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 "Rules"
-msgstr "Regeln"
+msgid "Rewrite to source %s, %s"
+msgstr "Schreibe um auf Quell-%s, %s"
 
 msgid "SNAT"
-msgstr ""
+msgstr "SNAT"
 
 msgid "SNAT IP address"
-msgstr ""
+msgstr "SNAT-IP-Adresse"
 
 msgid "SNAT port"
-msgstr ""
+msgstr "SNAT-Port"
 
 msgid "Source"
 msgstr "Quelle"
@@ -335,13 +358,16 @@ msgid "Source MAC address"
 msgstr "Quell-MAC-Adresse"
 
 msgid "Source NAT"
-msgstr ""
+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 "Source address"
 msgstr "Quelladresse"
@@ -380,11 +406,16 @@ 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 ""
 "This section defines common properties of %q. The <em>input</em> and "
@@ -400,29 +431,41 @@ msgstr ""
 "Schnittstellen innerhalb dieser Zone zu. <em>Abgedeckte Netzwerke</em> "
 "definieren die Zugehörigkeit von Schnittstellen zu dieser Zone."
 
+msgid "To %s"
+msgstr "Zu %s"
+
+msgid "To %s at %s"
+msgstr "Zu %s an %s"
+
+msgid "To %s at %s on <var>this device</var>"
+msgstr "Zu %s an %s auf <var>diesem Gerät</var>"
+
+msgid "To %s in %s"
+msgstr "Zu %s in %s"
+
+msgid "To %s on <var>this device</var>"
+msgstr "Zu %s auf <var>diesem Gerät</var>"
+
+msgid "To %s, %s in %s"
+msgstr "Zu %s, %s in %s"
+
 msgid "To source IP"
-msgstr ""
+msgstr "Zu Quell-IP"
 
 msgid "To source port"
-msgstr ""
-
-msgid "Traffic Redirection"
-msgstr "Umleitungen"
+msgstr "Zu Quell-Port"
 
 msgid "Traffic Rules"
-msgstr ""
-
-msgid ""
-"Traffic redirection allows you to change the destination address of "
-"forwarded packets."
-msgstr ""
-"Umleitungen erlauben es das Ziel von weitergeleiteten Paketen zu verändern."
+msgstr "Verkehrsregeln"
 
 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 ""
+"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."
 
 msgid "Via"
 msgstr "Über"
@@ -431,6 +474,8 @@ 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"
@@ -447,15 +492,125 @@ msgstr "annehmen"
 msgid "any"
 msgstr "beliebig"
 
+msgid "any host"
+msgstr "beliebiger Rechner"
+
+msgid "any router IP"
+msgstr "beliebige Router-IP"
+
+msgid "any zone"
+msgstr "beliebige Zone"
+
+msgid "day"
+msgstr "Tag"
+
 msgid "don't track"
-msgstr ""
+msgstr "nicht verfolgen"
 
 msgid "drop"
 msgstr "verwerfen"
 
+msgid "hour"
+msgstr "Stunde"
+
+msgid "minute"
+msgstr "Minute"
+
+msgid "not"
+msgstr "nicht"
+
+msgid "port"
+msgstr "Port"
+
+msgid "ports"
+msgstr "Ports"
+
 msgid "reject"
 msgstr "zurückweisen"
 
+msgid "second"
+msgstr "Sekunde"
+
+msgid "type"
+msgstr "Typ"
+
+msgid "types"
+msgstr "Typen"
+
+#~ msgid "Accept"
+#~ msgstr "Akzeptiere"
+
+#~ msgid "Discard"
+#~ msgstr "Verwerfe"
+
+#~ msgid "Advanced Options"
+#~ msgstr "Erweiterte Optionen"
+
+#~ msgid "Advanced Rules"
+#~ msgstr "Erweiterte Regeln"
+
+#~ msgid ""
+#~ "Advanced rules let you customize the firewall to your needs. Only new "
+#~ "connections will be matched. Packets belonging to already open "
+#~ "connections are automatically allowed to pass the firewall."
+#~ msgstr ""
+#~ "Mit erweiterten Regeln kann die Firewall an die eigenen Bedürfnisse "
+#~ "angepasst werden. Es werden nur neue Verbindungen betrachtet. Pakete, die "
+#~ "zu bereits bestehenden Verbindungen gehören werden automatisch akzeptiert."
+
+#~ msgid "Custom Rules (/etc/firewall.user)"
+#~ msgstr "Benutzerdefinierte Regeln (/etc/firewall.user)"
+
+#~ msgid "Device"
+#~ msgstr "Gerät"
+
+#~ msgid ""
+#~ "For DNAT, match incoming traffic directed at the given destination ip "
+#~ "address. For SNAT rewrite the source address to the given address."
+#~ msgstr ""
+#~ "Für DNAT Regeln wird der Verkehr nach der angegeben Zieladresse "
+#~ "gefiltert. Bei SNAT Regeln ist dieses die Quelladresse für umgeschriebene "
+#~ "Pakete."
+
+#~ msgid ""
+#~ "Match incoming traffic originating from the given source port or port "
+#~ "range on the client host"
+#~ msgstr ""
+#~ "Eingehende Verbindungen filtern welche von dem angegebenen Port oder "
+#~ "Portbereich des Clients ausgehen"
+
+#~ msgid "Overview"
+#~ msgstr "Übersicht"
+
+#~ msgid "Port forwarding"
+#~ msgstr "Portweiterleitung"
+
+#~ msgid ""
+#~ "Port forwarding allows to provide network services in the internal "
+#~ "network to an external network."
+#~ msgstr ""
+#~ "Portweiterleitungen ermöglichen es interne Netzwerkdienste aus einem "
+#~ "externen Netzwerk heraus erreichbar zu machen."
+
+#~ msgid "Redirection type"
+#~ msgstr "Typ der Weiterleitung"
+
+#~ msgid "Redirections"
+#~ msgstr "Weiterleitungen"
+
+#~ msgid "Rules"
+#~ msgstr "Regeln"
+
+#~ msgid "Traffic Redirection"
+#~ msgstr "Umleitungen"
+
+#~ msgid ""
+#~ "Traffic redirection allows you to change the destination address of "
+#~ "forwarded packets."
+#~ msgstr ""
+#~ "Umleitungen erlauben es das Ziel von weitergeleiteten Paketen zu "
+#~ "verändern."
+
 #, fuzzy
 #~ msgid "Network"
 #~ msgstr "Netzwerke"
diff --git a/po/el/firewall.po b/po/el/firewall.po
index c053d6ebc..d22446661 100644
--- a/po/el/firewall.po
+++ b/po/el/firewall.po
@@ -11,6 +11,9 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
+msgid "%s%s with %s"
+msgstr ""
+
 msgid "(Unnamed Entry)"
 msgstr ""
 
@@ -26,33 +29,32 @@ msgstr ""
 msgid "-- custom --"
 msgstr ""
 
-msgid "Action"
-msgstr "Ενέργεια"
+msgid "<var>%d</var> pkts. per <var>%s</var>"
+msgstr ""
 
-msgid "Add"
+msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr ""
 
-msgid "Add and edit..."
+msgid "<var>%s</var> and limit to %s"
 msgstr ""
 
-msgid "Advanced Options"
+msgid "Accept forward"
 msgstr ""
 
-msgid "Advanced Rules"
-msgstr "Προχωρημένοι Κανόνες"
+msgid "Accept input"
+msgstr ""
 
-msgid "Advanced Settings"
+msgid "Action"
+msgstr "Ενέργεια"
+
+msgid "Add"
 msgstr ""
 
-msgid ""
-"Advanced rules let you customize the firewall to your needs. Only new "
-"connections will be matched. Packets belonging to already open connections "
-"are automatically allowed to pass the firewall."
+msgid "Add and edit..."
+msgstr ""
+
+msgid "Advanced Settings"
 msgstr ""
-"Οι προχωρημένοι κανόνες σας επιτρέπουν να προσαρμόσετε το τείχος προστασίας "
-"στις δικές σας ανάγκες. Οι κανόνες θα εφαρμόζονται μόνο στις νέες συνδέσεις. "
-"Πακέτα που ανήκουν σε ήδη ανοιχτές συνδέσεις, θα περνάνε αυτόματα το τείχος "
-"προστασίας."
 
 msgid "Allow forward from <em>source zones</em>:"
 msgstr ""
@@ -69,9 +71,6 @@ msgstr ""
 msgid "Custom Rules"
 msgstr ""
 
-msgid "Custom Rules (/etc/firewall.user)"
-msgstr ""
-
 msgid ""
 "Custom rules allow you to execute arbritary iptables commands which are not "
 "otherwise covered by the firewall framework. The commands are executed after "
@@ -94,12 +93,21 @@ msgstr "Θύρα προορισμού"
 msgid "Destination zone"
 msgstr "Προορισμός"
 
-msgid "Device"
+msgid "Discard forward"
+msgstr ""
+
+msgid "Discard input"
 msgstr ""
 
 msgid "Do not rewrite"
 msgstr ""
 
+msgid "Do not track forward"
+msgstr ""
+
+msgid "Do not track input"
+msgstr ""
+
 msgid "Drop invalid packets"
 msgstr "Αγνόηση μη-έγκυρων πακετών"
 
@@ -134,20 +142,39 @@ msgstr ""
 msgid "Firewall - Zone Settings"
 msgstr ""
 
-msgid ""
-"For DNAT, match incoming traffic directed at the given destination ip "
-"address. For SNAT rewrite the source address to the given address."
-msgstr ""
-
 msgid "Force connection tracking"
 msgstr ""
 
 msgid "Forward"
 msgstr ""
 
+msgid "Forward to %s in %s"
+msgstr ""
+
+msgid "Forward to %s, %s in %s"
+msgstr ""
+
+msgid "From %s in %s"
+msgstr ""
+
+msgid "From %s in %s with source %s"
+msgstr ""
+
+msgid "From %s in %s with source %s and %s"
+msgstr ""
+
 msgid "General Settings"
 msgstr ""
 
+msgid "IP"
+msgstr ""
+
+msgid "IP range"
+msgstr ""
+
+msgid "IPs"
+msgstr ""
+
 msgid "IPv4"
 msgstr ""
 
@@ -186,6 +213,12 @@ msgstr "Εσωτερική θύρα (προαιρετικό)"
 msgid "Limit log messages"
 msgstr ""
 
+msgid "MAC"
+msgstr ""
+
+msgid "MACs"
+msgstr ""
+
 #, fuzzy
 msgid "MSS clamping"
 msgstr "Περιορισμός MSS"
@@ -206,11 +239,6 @@ msgstr ""
 
 msgid ""
 "Match incoming traffic originating from the given source port or port range "
-"on the client host"
-msgstr ""
-
-msgid ""
-"Match incoming traffic originating from the given source port or port range "
 "on the client host."
 msgstr ""
 
@@ -255,27 +283,14 @@ msgstr ""
 msgid "Output"
 msgstr "Έξοδος"
 
-msgid "Overview"
-msgstr ""
-
 msgid "Port Forwards"
 msgstr ""
 
-msgid "Port forwarding"
-msgstr "Προώθηση θυρών"
-
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
 msgstr ""
 
-msgid ""
-"Port forwarding allows to provide network services in the internal network "
-"to an external network."
-msgstr ""
-"Η προώθηση θυρών επιτρέπει σε υπηρεσίες δικτύου που λειτουργούν μέσα σε ένα "
-"εσωτερικό δίκτυο, να γίνονται διαθέσιμες και σε ένα εξωτερικό."
-
 msgid "Protocol"
 msgstr ""
 
@@ -286,10 +301,10 @@ msgstr ""
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr ""
 
-msgid "Redirection type"
+msgid "Refuse forward"
 msgstr ""
 
-msgid "Redirections"
+msgid "Refuse input"
 msgstr ""
 
 msgid "Restrict Masquerading to given destination subnets"
@@ -309,7 +324,10 @@ msgid ""
 "rewrite the IP address."
 msgstr ""
 
-msgid "Rules"
+msgid "Rewrite to source %s"
+msgstr ""
+
+msgid "Rewrite to source %s, %s"
 msgstr ""
 
 msgid "SNAT"
@@ -385,24 +403,32 @@ msgid ""
 "networks</em> specifies which available networks are member of this zone."
 msgstr ""
 
-msgid "To source IP"
+msgid "To %s"
 msgstr ""
 
-msgid "To source port"
+msgid "To %s at %s"
+msgstr ""
+
+msgid "To %s at %s on <var>this device</var>"
 msgstr ""
 
-msgid "Traffic Redirection"
-msgstr "Ανακατεύθυνση Κίνησης"
+msgid "To %s in %s"
+msgstr ""
 
-msgid "Traffic Rules"
+msgid "To %s on <var>this device</var>"
 msgstr ""
 
-msgid ""
-"Traffic redirection allows you to change the destination address of "
-"forwarded packets."
+msgid "To %s, %s in %s"
+msgstr ""
+
+msgid "To source IP"
+msgstr ""
+
+msgid "To source port"
+msgstr ""
+
+msgid "Traffic Rules"
 msgstr ""
-"Η ανακατεύθυνση κίνησης σας επιτρέπει να αλλάξετε την διεύθυνση προορισμού "
-"των προωθημένων πακέτων."
 
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
@@ -433,15 +459,84 @@ msgstr "αποδοχή"
 msgid "any"
 msgstr ""
 
+msgid "any host"
+msgstr ""
+
+msgid "any router IP"
+msgstr ""
+
+msgid "any zone"
+msgstr ""
+
+msgid "day"
+msgstr ""
+
 msgid "don't track"
 msgstr ""
 
 msgid "drop"
 msgstr "αγνόηση"
 
+msgid "hour"
+msgstr ""
+
+msgid "minute"
+msgstr ""
+
+msgid "not"
+msgstr ""
+
+msgid "port"
+msgstr ""
+
+msgid "ports"
+msgstr ""
+
 msgid "reject"
 msgstr "απόρριψη"
 
+msgid "second"
+msgstr ""
+
+msgid "type"
+msgstr ""
+
+msgid "types"
+msgstr ""
+
+#~ msgid "Advanced Rules"
+#~ msgstr "Προχωρημένοι Κανόνες"
+
+#~ msgid ""
+#~ "Advanced rules let you customize the firewall to your needs. Only new "
+#~ "connections will be matched. Packets belonging to already open "
+#~ "connections are automatically allowed to pass the firewall."
+#~ msgstr ""
+#~ "Οι προχωρημένοι κανόνες σας επιτρέπουν να προσαρμόσετε το τείχος "
+#~ "προστασίας στις δικές σας ανάγκες. Οι κανόνες θα εφαρμόζονται μόνο στις "
+#~ "νέες συνδέσεις. Πακέτα που ανήκουν σε ήδη ανοιχτές συνδέσεις, θα περνάνε "
+#~ "αυτόματα το τείχος προστασίας."
+
+#~ msgid "Port forwarding"
+#~ msgstr "Προώθηση θυρών"
+
+#~ msgid ""
+#~ "Port forwarding allows to provide network services in the internal "
+#~ "network to an external network."
+#~ msgstr ""
+#~ "Η προώθηση θυρών επιτρέπει σε υπηρεσίες δικτύου που λειτουργούν μέσα σε "
+#~ "ένα εσωτερικό δίκτυο, να γίνονται διαθέσιμες και σε ένα εξωτερικό."
+
+#~ msgid "Traffic Redirection"
+#~ msgstr "Ανακατεύθυνση Κίνησης"
+
+#~ msgid ""
+#~ "Traffic redirection allows you to change the destination address of "
+#~ "forwarded packets."
+#~ msgstr ""
+#~ "Η ανακατεύθυνση κίνησης σας επιτρέπει να αλλάξετε την διεύθυνση "
+#~ "προορισμού των προωθημένων πακέτων."
+
 #, fuzzy
 #~ msgid "Network"
 #~ msgstr "Δίκτυα"
diff --git a/po/en/firewall.po b/po/en/firewall.po
index 51d9e04d9..7aacd2f7a 100644
--- a/po/en/firewall.po
+++ b/po/en/firewall.po
@@ -11,6 +11,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "%s%s with %s"
+msgstr ""
+
 msgid "(Unnamed Entry)"
 msgstr ""
 
@@ -26,63 +29,32 @@ msgstr ""
 msgid "-- custom --"
 msgstr ""
 
-msgid "Action"
-msgstr "Action"
+msgid "<var>%d</var> pkts. per <var>%s</var>"
+msgstr ""
 
-msgid "Add"
+msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr ""
 
-msgid "Add and edit..."
+msgid "<var>%s</var> and limit to %s"
 msgstr ""
 
-msgid "Advanced Options"
+msgid "Accept forward"
 msgstr ""
 
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-# Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/trule.lua      #
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-#
-# msgid "Name"
-# msgstr ""
-#
-# msgid "(optional)"
-# msgstr ""
-#
-# msgid "Protocol"
-# msgstr ""
-#
-# msgid "Source port"
-# msgstr ""
-#
-# msgid "Destination port"
-# msgstr ""
-#
-# msgid "Action"
-# msgstr ""
-#
-# msgid "drop"
-# msgstr ""
-#
-# msgid "accept"
-# msgstr ""
-#
-# msgid "reject"
-# msgstr ""
-#
-msgid "Advanced Rules"
-msgstr "Advanced Rules"
+msgid "Accept input"
+msgstr ""
 
-msgid "Advanced Settings"
+msgid "Action"
+msgstr "Action"
+
+msgid "Add"
 msgstr ""
 
-msgid ""
-"Advanced rules let you customize the firewall to your needs. Only new "
-"connections will be matched. Packets belonging to already open connections "
-"are automatically allowed to pass the firewall."
+msgid "Add and edit..."
+msgstr ""
+
+msgid "Advanced Settings"
 msgstr ""
-"Advanced rules let you customize the firewall to your needs. Only new "
-"connections will be matched. Packets belonging to already open connections "
-"are automatically allowed to pass the firewall."
 
 msgid "Allow forward from <em>source zones</em>:"
 msgstr ""
@@ -99,9 +71,6 @@ msgstr ""
 msgid "Custom Rules"
 msgstr ""
 
-msgid "Custom Rules (/etc/firewall.user)"
-msgstr ""
-
 msgid ""
 "Custom rules allow you to execute arbritary iptables commands which are not "
 "otherwise covered by the firewall framework. The commands are executed after "
@@ -123,12 +92,21 @@ msgstr "Destination port"
 msgid "Destination zone"
 msgstr "Destination zone"
 
-msgid "Device"
-msgstr "Device"
+msgid "Discard forward"
+msgstr ""
+
+msgid "Discard input"
+msgstr ""
 
 msgid "Do not rewrite"
 msgstr ""
 
+msgid "Do not track forward"
+msgstr ""
+
+msgid "Do not track input"
+msgstr ""
+
 msgid "Drop invalid packets"
 msgstr "Drop invalid packets"
 
@@ -166,20 +144,39 @@ msgstr ""
 msgid "Firewall - Zone Settings"
 msgstr ""
 
-msgid ""
-"For DNAT, match incoming traffic directed at the given destination ip "
-"address. For SNAT rewrite the source address to the given address."
-msgstr ""
-
 msgid "Force connection tracking"
 msgstr ""
 
 msgid "Forward"
 msgstr "Forward"
 
+msgid "Forward to %s in %s"
+msgstr ""
+
+msgid "Forward to %s, %s in %s"
+msgstr ""
+
+msgid "From %s in %s"
+msgstr ""
+
+msgid "From %s in %s with source %s"
+msgstr ""
+
+msgid "From %s in %s with source %s and %s"
+msgstr ""
+
 msgid "General Settings"
 msgstr ""
 
+msgid "IP"
+msgstr ""
+
+msgid "IP range"
+msgstr ""
+
+msgid "IPs"
+msgstr ""
+
 msgid "IPv4"
 msgstr ""
 
@@ -216,6 +213,12 @@ msgstr "Internal port (optional)"
 msgid "Limit log messages"
 msgstr ""
 
+msgid "MAC"
+msgstr ""
+
+msgid "MACs"
+msgstr ""
+
 msgid "MSS clamping"
 msgstr "MSS clamping"
 
@@ -237,13 +240,6 @@ msgstr ""
 
 msgid ""
 "Match incoming traffic originating from the given source port or port range "
-"on the client host"
-msgstr ""
-"Match incoming traffic originating from the given source port or port range "
-"on the client host"
-
-msgid ""
-"Match incoming traffic originating from the given source port or port range "
 "on the client host."
 msgstr ""
 
@@ -288,46 +284,14 @@ msgstr ""
 msgid "Output"
 msgstr "Output"
 
-msgid "Overview"
-msgstr "Overview"
-
 msgid "Port Forwards"
 msgstr ""
 
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-# Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/miniportfw.lua #
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-#
-# msgid "Name"
-# msgstr ""
-#
-# msgid "(optional)"
-# msgstr ""
-#
-# msgid "Protocol"
-# msgstr ""
-#
-# msgid "External port"
-# msgstr ""
-#
-# msgid "Internal IP address"
-# msgstr ""
-#
-msgid "Port forwarding"
-msgstr "Port forwarding"
-
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
 msgstr ""
 
-msgid ""
-"Port forwarding allows to provide network services in the internal network "
-"to an external network."
-msgstr ""
-"Port forwarding allows to provide network services in the internal network "
-"to an external network."
-
 msgid "Protocol"
 msgstr "Protocol"
 
@@ -339,10 +303,10 @@ msgstr ""
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "Redirect matched incoming traffic to the specified internal host"
 
-msgid "Redirection type"
+msgid "Refuse forward"
 msgstr ""
 
-msgid "Redirections"
+msgid "Refuse input"
 msgstr ""
 
 msgid "Restrict Masquerading to given destination subnets"
@@ -362,8 +326,11 @@ msgid ""
 "rewrite the IP address."
 msgstr ""
 
-msgid "Rules"
-msgstr "Rules"
+msgid "Rewrite to source %s"
+msgstr ""
+
+msgid "Rewrite to source %s, %s"
+msgstr ""
 
 msgid "SNAT"
 msgstr ""
@@ -465,34 +432,32 @@ msgid ""
 "networks</em> specifies which available networks are member of this zone."
 msgstr ""
 
-msgid "To source IP"
+msgid "To %s"
 msgstr ""
 
-msgid "To source port"
+msgid "To %s at %s"
 msgstr ""
 
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-# Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/redirect.lua   #
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-#
-# msgid "Name"
-# msgstr ""
-#
-# msgid "Protocol"
-# msgstr ""
-#
-msgid "Traffic Redirection"
-msgstr "Traffic Redirection"
+msgid "To %s at %s on <var>this device</var>"
+msgstr ""
 
-msgid "Traffic Rules"
+msgid "To %s in %s"
 msgstr ""
 
-msgid ""
-"Traffic redirection allows you to change the destination address of "
-"forwarded packets."
+msgid "To %s on <var>this device</var>"
+msgstr ""
+
+msgid "To %s, %s in %s"
+msgstr ""
+
+msgid "To source IP"
+msgstr ""
+
+msgid "To source port"
+msgstr ""
+
+msgid "Traffic Rules"
 msgstr ""
-"Traffic redirection allows you to change the destination address of "
-"forwarded packets."
 
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
@@ -523,15 +488,159 @@ msgstr "accept"
 msgid "any"
 msgstr "any"
 
+msgid "any host"
+msgstr ""
+
+msgid "any router IP"
+msgstr ""
+
+msgid "any zone"
+msgstr ""
+
+msgid "day"
+msgstr ""
+
 msgid "don't track"
 msgstr ""
 
 msgid "drop"
 msgstr "drop"
 
+msgid "hour"
+msgstr ""
+
+msgid "minute"
+msgstr ""
+
+msgid "not"
+msgstr ""
+
+msgid "port"
+msgstr ""
+
+msgid "ports"
+msgstr ""
+
 msgid "reject"
 msgstr "reject"
 
+msgid "second"
+msgstr ""
+
+msgid "type"
+msgstr ""
+
+msgid "types"
+msgstr ""
+
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+# Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/trule.lua      #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#
+# msgid "Name"
+# msgstr ""
+#
+# msgid "(optional)"
+# msgstr ""
+#
+# msgid "Protocol"
+# msgstr ""
+#
+# msgid "Source port"
+# msgstr ""
+#
+# msgid "Destination port"
+# msgstr ""
+#
+# msgid "Action"
+# msgstr ""
+#
+# msgid "drop"
+# msgstr ""
+#
+# msgid "accept"
+# msgstr ""
+#
+# msgid "reject"
+# msgstr ""
+#
+#~ msgid "Advanced Rules"
+#~ msgstr "Advanced Rules"
+
+#~ msgid ""
+#~ "Advanced rules let you customize the firewall to your needs. Only new "
+#~ "connections will be matched. Packets belonging to already open "
+#~ "connections are automatically allowed to pass the firewall."
+#~ msgstr ""
+#~ "Advanced rules let you customize the firewall to your needs. Only new "
+#~ "connections will be matched. Packets belonging to already open "
+#~ "connections are automatically allowed to pass the firewall."
+
+#~ msgid "Device"
+#~ msgstr "Device"
+
+#~ msgid ""
+#~ "Match incoming traffic originating from the given source port or port "
+#~ "range on the client host"
+#~ msgstr ""
+#~ "Match incoming traffic originating from the given source port or port "
+#~ "range on the client host"
+
+#~ msgid "Overview"
+#~ msgstr "Overview"
+
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+# Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/miniportfw.lua #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#
+# msgid "Name"
+# msgstr ""
+#
+# msgid "(optional)"
+# msgstr ""
+#
+# msgid "Protocol"
+# msgstr ""
+#
+# msgid "External port"
+# msgstr ""
+#
+# msgid "Internal IP address"
+# msgstr ""
+#
+#~ msgid "Port forwarding"
+#~ msgstr "Port forwarding"
+
+#~ msgid ""
+#~ "Port forwarding allows to provide network services in the internal "
+#~ "network to an external network."
+#~ msgstr ""
+#~ "Port forwarding allows to provide network services in the internal "
+#~ "network to an external network."
+
+#~ msgid "Rules"
+#~ msgstr "Rules"
+
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+# Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/redirect.lua   #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#
+# msgid "Name"
+# msgstr ""
+#
+# msgid "Protocol"
+# msgstr ""
+#
+#~ msgid "Traffic Redirection"
+#~ msgstr "Traffic Redirection"
+
+#~ msgid ""
+#~ "Traffic redirection allows you to change the destination address of "
+#~ "forwarded packets."
+#~ msgstr ""
+#~ "Traffic redirection allows you to change the destination address of "
+#~ "forwarded packets."
+
 #~ msgid "Network"
 #~ msgstr "Network"
 
diff --git a/po/es/firewall.po b/po/es/firewall.po
index 7b1399bb4..f9623133e 100644
--- a/po/es/firewall.po
+++ b/po/es/firewall.po
@@ -11,6 +11,9 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
+msgid "%s%s with %s"
+msgstr ""
+
 msgid "(Unnamed Entry)"
 msgstr ""
 
@@ -26,33 +29,32 @@ msgstr ""
 msgid "-- custom --"
 msgstr ""
 
-msgid "Action"
-msgstr "Acción"
+msgid "<var>%d</var> pkts. per <var>%s</var>"
+msgstr ""
 
-msgid "Add"
+msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr ""
 
-msgid "Add and edit..."
+msgid "<var>%s</var> and limit to %s"
 msgstr ""
 
-msgid "Advanced Options"
+msgid "Accept forward"
 msgstr ""
 
-msgid "Advanced Rules"
-msgstr "Reglas avanzadas"
+msgid "Accept input"
+msgstr ""
 
-msgid "Advanced Settings"
+msgid "Action"
+msgstr "Acción"
+
+msgid "Add"
 msgstr ""
 
-msgid ""
-"Advanced rules let you customize the firewall to your needs. Only new "
-"connections will be matched. Packets belonging to already open connections "
-"are automatically allowed to pass the firewall."
+msgid "Add and edit..."
+msgstr ""
+
+msgid "Advanced Settings"
 msgstr ""
-"Las reglas avanzadas le permite personalizar el corta fuego según sus "
-"necesidades. Sólamente las nuevas conexiones serán afectadas por las reglas. "
-"Los paquetes pertenecientes a conexiones ya abierta, se les permite el libre "
-"paso por el corta fuego."
 
 msgid "Allow forward from <em>source zones</em>:"
 msgstr ""
@@ -69,9 +71,6 @@ msgstr ""
 msgid "Custom Rules"
 msgstr ""
 
-msgid "Custom Rules (/etc/firewall.user)"
-msgstr ""
-
 msgid ""
 "Custom rules allow you to execute arbritary iptables commands which are not "
 "otherwise covered by the firewall framework. The commands are executed after "
@@ -94,12 +93,21 @@ msgstr "Puerto de destino"
 msgid "Destination zone"
 msgstr "Destino"
 
-msgid "Device"
+msgid "Discard forward"
+msgstr ""
+
+msgid "Discard input"
 msgstr ""
 
 msgid "Do not rewrite"
 msgstr ""
 
+msgid "Do not track forward"
+msgstr ""
+
+msgid "Do not track input"
+msgstr ""
+
 msgid "Drop invalid packets"
 msgstr "Rechazar paquetes inválidos"
 
@@ -134,20 +142,39 @@ msgstr ""
 msgid "Firewall - Zone Settings"
 msgstr ""
 
-msgid ""
-"For DNAT, match incoming traffic directed at the given destination ip "
-"address. For SNAT rewrite the source address to the given address."
-msgstr ""
-
 msgid "Force connection tracking"
 msgstr ""
 
 msgid "Forward"
 msgstr ""
 
+msgid "Forward to %s in %s"
+msgstr ""
+
+msgid "Forward to %s, %s in %s"
+msgstr ""
+
+msgid "From %s in %s"
+msgstr ""
+
+msgid "From %s in %s with source %s"
+msgstr ""
+
+msgid "From %s in %s with source %s and %s"
+msgstr ""
+
 msgid "General Settings"
 msgstr ""
 
+msgid "IP"
+msgstr ""
+
+msgid "IP range"
+msgstr ""
+
+msgid "IPs"
+msgstr ""
+
 msgid "IPv4"
 msgstr ""
 
@@ -186,6 +213,12 @@ msgstr "Puerto interno (opcional)"
 msgid "Limit log messages"
 msgstr ""
 
+msgid "MAC"
+msgstr ""
+
+msgid "MACs"
+msgstr ""
+
 #, fuzzy
 msgid "MSS clamping"
 msgstr "MSS Clamping"
@@ -206,11 +239,6 @@ msgstr ""
 
 msgid ""
 "Match incoming traffic originating from the given source port or port range "
-"on the client host"
-msgstr ""
-
-msgid ""
-"Match incoming traffic originating from the given source port or port range "
 "on the client host."
 msgstr ""
 
@@ -255,27 +283,14 @@ msgstr ""
 msgid "Output"
 msgstr "Salida"
 
-msgid "Overview"
-msgstr ""
-
 msgid "Port Forwards"
 msgstr ""
 
-msgid "Port forwarding"
-msgstr "Reenvío de puerto"
-
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
 msgstr ""
 
-msgid ""
-"Port forwarding allows to provide network services in the internal network "
-"to an external network."
-msgstr ""
-"El reenvío de puerto permite proveer servicios de red en una red interna a "
-"una red externa (por ejemplo Internet)"
-
 msgid "Protocol"
 msgstr ""
 
@@ -286,10 +301,10 @@ msgstr ""
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr ""
 
-msgid "Redirection type"
+msgid "Refuse forward"
 msgstr ""
 
-msgid "Redirections"
+msgid "Refuse input"
 msgstr ""
 
 msgid "Restrict Masquerading to given destination subnets"
@@ -309,7 +324,10 @@ msgid ""
 "rewrite the IP address."
 msgstr ""
 
-msgid "Rules"
+msgid "Rewrite to source %s"
+msgstr ""
+
+msgid "Rewrite to source %s, %s"
 msgstr ""
 
 msgid "SNAT"
@@ -385,24 +403,32 @@ msgid ""
 "networks</em> specifies which available networks are member of this zone."
 msgstr ""
 
-msgid "To source IP"
+msgid "To %s"
 msgstr ""
 
-msgid "To source port"
+msgid "To %s at %s"
+msgstr ""
+
+msgid "To %s at %s on <var>this device</var>"
 msgstr ""
 
-msgid "Traffic Redirection"
-msgstr "Redirección de tráfico"
+msgid "To %s in %s"
+msgstr ""
 
-msgid "Traffic Rules"
+msgid "To %s on <var>this device</var>"
 msgstr ""
 
-msgid ""
-"Traffic redirection allows you to change the destination address of "
-"forwarded packets."
+msgid "To %s, %s in %s"
+msgstr ""
+
+msgid "To source IP"
+msgstr ""
+
+msgid "To source port"
+msgstr ""
+
+msgid "Traffic Rules"
 msgstr ""
-"La redirección de tráfico permite cambiar la dirección de destino de los "
-"paquetes reenviados."
 
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
@@ -433,15 +459,84 @@ msgstr "aceptar"
 msgid "any"
 msgstr ""
 
+msgid "any host"
+msgstr ""
+
+msgid "any router IP"
+msgstr ""
+
+msgid "any zone"
+msgstr ""
+
+msgid "day"
+msgstr ""
+
 msgid "don't track"
 msgstr ""
 
 msgid "drop"
 msgstr "rechazar"
 
+msgid "hour"
+msgstr ""
+
+msgid "minute"
+msgstr ""
+
+msgid "not"
+msgstr ""
+
+msgid "port"
+msgstr ""
+
+msgid "ports"
+msgstr ""
+
 msgid "reject"
 msgstr "desechar"
 
+msgid "second"
+msgstr ""
+
+msgid "type"
+msgstr ""
+
+msgid "types"
+msgstr ""
+
+#~ msgid "Advanced Rules"
+#~ msgstr "Reglas avanzadas"
+
+#~ msgid ""
+#~ "Advanced rules let you customize the firewall to your needs. Only new "
+#~ "connections will be matched. Packets belonging to already open "
+#~ "connections are automatically allowed to pass the firewall."
+#~ msgstr ""
+#~ "Las reglas avanzadas le permite personalizar el corta fuego según sus "
+#~ "necesidades. Sólamente las nuevas conexiones serán afectadas por las "
+#~ "reglas. Los paquetes pertenecientes a conexiones ya abierta, se les "
+#~ "permite el libre paso por el corta fuego."
+
+#~ msgid "Port forwarding"
+#~ msgstr "Reenvío de puerto"
+
+#~ msgid ""
+#~ "Port forwarding allows to provide network services in the internal "
+#~ "network to an external network."
+#~ msgstr ""
+#~ "El reenvío de puerto permite proveer servicios de red en una red interna "
+#~ "a una red externa (por ejemplo Internet)"
+
+#~ msgid "Traffic Redirection"
+#~ msgstr "Redirección de tráfico"
+
+#~ msgid ""
+#~ "Traffic redirection allows you to change the destination address of "
+#~ "forwarded packets."
+#~ msgstr ""
+#~ "La redirección de tráfico permite cambiar la dirección de destino de los "
+#~ "paquetes reenviados."
+
 #, fuzzy
 #~ msgid "Network"
 #~ msgstr "Redes"
diff --git a/po/fr/firewall.po b/po/fr/firewall.po
index 35f25c73a..6bb38ef73 100644
--- a/po/fr/firewall.po
+++ b/po/fr/firewall.po
@@ -13,6 +13,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Pootle 2.0.4\n"
 
+msgid "%s%s with %s"
+msgstr ""
+
 msgid "(Unnamed Entry)"
 msgstr ""
 
@@ -28,6 +31,21 @@ msgstr ""
 msgid "-- custom --"
 msgstr ""
 
+msgid "<var>%d</var> pkts. per <var>%s</var>"
+msgstr ""
+
+msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
+msgstr ""
+
+msgid "<var>%s</var> and limit to %s"
+msgstr ""
+
+msgid "Accept forward"
+msgstr ""
+
+msgid "Accept input"
+msgstr ""
+
 msgid "Action"
 msgstr "Action"
 
@@ -37,56 +55,9 @@ msgstr ""
 msgid "Add and edit..."
 msgstr ""
 
-msgid "Advanced Options"
-msgstr "Options avancées"
-
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-#  applications/luci-fw/luasrc/model/cbi/luci_fw/trule.lua                    #
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-#
-# msgid "Name"
-# msgstr ""
-#
-# msgid "(optional)"
-# msgstr ""
-#
-# msgid "Protocol"
-# msgstr ""
-#
-# msgid "Source port"
-# msgstr ""
-#
-# msgid "Destination port"
-# msgstr ""
-#
-# msgid "Action"
-# msgstr ""
-#
-# msgid "drop"
-# msgstr ""
-#
-# msgid "accept"
-# msgstr ""
-#
-# msgid "reject"
-# msgstr ""
-#
-msgid "Advanced Rules"
-msgstr "Règles avancées"
-
 msgid "Advanced Settings"
 msgstr "Paramètres avancés"
 
-msgid ""
-"Advanced rules let you customize the firewall to your needs. Only new "
-"connections will be matched. Packets belonging to already open connections "
-"are automatically allowed to pass the firewall."
-msgstr ""
-"Les règles avancées vous laissent personnaliser le pare-feu selon vos "
-"besoins. Seules les nouvelles connexions seront prises en compte. Les "
-"paquets appartenant à des connexions déjà ouvertes sont automatiquement "
-"admis à passer le pare-feu."
-
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Permettre la transmission des <em>zones source</em> :"
 
@@ -102,9 +73,6 @@ msgstr "Réseaux couverts"
 msgid "Custom Rules"
 msgstr "Régles spécifiques"
 
-msgid "Custom Rules (/etc/firewall.user)"
-msgstr "Règles spécifiques (/etc/firewall.user)"
-
 msgid ""
 "Custom rules allow you to execute arbritary iptables commands which are not "
 "otherwise covered by the firewall framework. The commands are executed after "
@@ -126,12 +94,21 @@ msgstr "Port de destination"
 msgid "Destination zone"
 msgstr "Zone de destination"
 
-msgid "Device"
-msgstr "Équipement"
+msgid "Discard forward"
+msgstr ""
+
+msgid "Discard input"
+msgstr ""
 
 msgid "Do not rewrite"
 msgstr ""
 
+msgid "Do not track forward"
+msgstr ""
+
+msgid "Do not track input"
+msgstr ""
+
 msgid "Drop invalid packets"
 msgstr "Ignorer les paquets invalides"
 
@@ -169,22 +146,39 @@ msgstr ""
 msgid "Firewall - Zone Settings"
 msgstr "Pare-feu - Configuration des zones"
 
-msgid ""
-"For DNAT, match incoming traffic directed at the given destination ip "
-"address. For SNAT rewrite the source address to the given address."
-msgstr ""
-"Pour le DNAT, sélectionne le trafic entrant correspondant à l'adresse IP "
-"destinataire. Pour le SNAT, ré-écrit l'adresse source avec l'adresse donnée."
-
 msgid "Force connection tracking"
 msgstr "Forcer le suivi des connexions"
 
 msgid "Forward"
 msgstr "Transfert"
 
+msgid "Forward to %s in %s"
+msgstr ""
+
+msgid "Forward to %s, %s in %s"
+msgstr ""
+
+msgid "From %s in %s"
+msgstr ""
+
+msgid "From %s in %s with source %s"
+msgstr ""
+
+msgid "From %s in %s with source %s and %s"
+msgstr ""
+
 msgid "General Settings"
 msgstr "Paramètres généraux"
 
+msgid "IP"
+msgstr ""
+
+msgid "IP range"
+msgstr ""
+
+msgid "IPs"
+msgstr ""
+
 msgid "IPv4"
 msgstr ""
 
@@ -221,6 +215,12 @@ msgstr "Port interne (optionnel)"
 msgid "Limit log messages"
 msgstr "Limiter les messages de journalisation"
 
+msgid "MAC"
+msgstr ""
+
+msgid "MACs"
+msgstr ""
+
 msgid "MSS clamping"
 msgstr "Contrainte du MSS"
 
@@ -242,13 +242,6 @@ msgstr ""
 
 msgid ""
 "Match incoming traffic originating from the given source port or port range "
-"on the client host"
-msgstr ""
-"Prendre en compte le trafic entrant provenant du port source donné (ou la "
-"gamme de ports) sur l'hôte client"
-
-msgid ""
-"Match incoming traffic originating from the given source port or port range "
 "on the client host."
 msgstr ""
 
@@ -293,46 +286,14 @@ msgstr ""
 msgid "Output"
 msgstr "Sortie"
 
-msgid "Overview"
-msgstr "Vue d'ensemble"
-
 msgid "Port Forwards"
 msgstr ""
 
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-#  applications/luci-fw/luasrc/model/cbi/luci_fw/miniportfw.lua               #
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-#
-# msgid "Name"
-# msgstr ""
-#
-# msgid "(optional)"
-# msgstr ""
-#
-# msgid "Protocol"
-# msgstr ""
-#
-# msgid "External port"
-# msgstr ""
-#
-# msgid "Internal IP address"
-# msgstr ""
-#
-msgid "Port forwarding"
-msgstr "Redirection de port"
-
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
 msgstr ""
 
-msgid ""
-"Port forwarding allows to provide network services in the internal network "
-"to an external network."
-msgstr ""
-"La redirection de port vous permet d'exposer des services réseaux de votre "
-"réseau local au réseau externe."
-
 msgid "Protocol"
 msgstr "Protocole"
 
@@ -345,11 +306,11 @@ msgstr ""
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "Rediriger le trafic entrant correspondant vers l'hôte interne spécifié"
 
-msgid "Redirection type"
-msgstr "Type de redirection"
+msgid "Refuse forward"
+msgstr ""
 
-msgid "Redirections"
-msgstr "Redirections"
+msgid "Refuse input"
+msgstr ""
 
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
@@ -372,8 +333,11 @@ msgid ""
 "rewrite the IP address."
 msgstr ""
 
-msgid "Rules"
-msgstr "Règles"
+msgid "Rewrite to source %s"
+msgstr ""
+
+msgid "Rewrite to source %s, %s"
+msgstr ""
 
 msgid "SNAT"
 msgstr ""
@@ -488,34 +452,32 @@ msgstr ""
 "cette zone. Les <em>réseaux couverts</em> indiquent quels réseaux "
 "disponibles sont membre de cette zone."
 
-msgid "To source IP"
+msgid "To %s"
 msgstr ""
 
-msgid "To source port"
+msgid "To %s at %s"
 msgstr ""
 
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-#  applications/luci-fw/luasrc/model/cbi/luci_fw/redirect.lua                 #
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-#
-# msgid "Name"
-# msgstr ""
-#
-# msgid "Protocol"
-# msgstr ""
-#
-msgid "Traffic Redirection"
-msgstr "Redirection du trafic"
+msgid "To %s at %s on <var>this device</var>"
+msgstr ""
 
-msgid "Traffic Rules"
+msgid "To %s in %s"
 msgstr ""
 
-msgid ""
-"Traffic redirection allows you to change the destination address of "
-"forwarded packets."
+msgid "To %s on <var>this device</var>"
+msgstr ""
+
+msgid "To %s, %s in %s"
+msgstr ""
+
+msgid "To source IP"
+msgstr ""
+
+msgid "To source port"
+msgstr ""
+
+msgid "Traffic Rules"
 msgstr ""
-"La redirection de trafic vous permet de changer l'adresse de destination des "
-"paquets transférés."
 
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
@@ -547,15 +509,180 @@ msgstr "accepter"
 msgid "any"
 msgstr "tous"
 
+msgid "any host"
+msgstr ""
+
+msgid "any router IP"
+msgstr ""
+
+msgid "any zone"
+msgstr ""
+
+msgid "day"
+msgstr ""
+
 msgid "don't track"
 msgstr ""
 
 msgid "drop"
 msgstr "ignorer"
 
+msgid "hour"
+msgstr ""
+
+msgid "minute"
+msgstr ""
+
+msgid "not"
+msgstr ""
+
+msgid "port"
+msgstr ""
+
+msgid "ports"
+msgstr ""
+
 msgid "reject"
 msgstr "rejeter"
 
+msgid "second"
+msgstr ""
+
+msgid "type"
+msgstr ""
+
+msgid "types"
+msgstr ""
+
+#~ msgid "Advanced Options"
+#~ msgstr "Options avancées"
+
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#  applications/luci-fw/luasrc/model/cbi/luci_fw/trule.lua                    #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#
+# msgid "Name"
+# msgstr ""
+#
+# msgid "(optional)"
+# msgstr ""
+#
+# msgid "Protocol"
+# msgstr ""
+#
+# msgid "Source port"
+# msgstr ""
+#
+# msgid "Destination port"
+# msgstr ""
+#
+# msgid "Action"
+# msgstr ""
+#
+# msgid "drop"
+# msgstr ""
+#
+# msgid "accept"
+# msgstr ""
+#
+# msgid "reject"
+# msgstr ""
+#
+#~ msgid "Advanced Rules"
+#~ msgstr "Règles avancées"
+
+#~ msgid ""
+#~ "Advanced rules let you customize the firewall to your needs. Only new "
+#~ "connections will be matched. Packets belonging to already open "
+#~ "connections are automatically allowed to pass the firewall."
+#~ msgstr ""
+#~ "Les règles avancées vous laissent personnaliser le pare-feu selon vos "
+#~ "besoins. Seules les nouvelles connexions seront prises en compte. Les "
+#~ "paquets appartenant à des connexions déjà ouvertes sont automatiquement "
+#~ "admis à passer le pare-feu."
+
+#~ msgid "Custom Rules (/etc/firewall.user)"
+#~ msgstr "Règles spécifiques (/etc/firewall.user)"
+
+#~ msgid "Device"
+#~ msgstr "Équipement"
+
+#~ msgid ""
+#~ "For DNAT, match incoming traffic directed at the given destination ip "
+#~ "address. For SNAT rewrite the source address to the given address."
+#~ msgstr ""
+#~ "Pour le DNAT, sélectionne le trafic entrant correspondant à l'adresse IP "
+#~ "destinataire. Pour le SNAT, ré-écrit l'adresse source avec l'adresse "
+#~ "donnée."
+
+#~ msgid ""
+#~ "Match incoming traffic originating from the given source port or port "
+#~ "range on the client host"
+#~ msgstr ""
+#~ "Prendre en compte le trafic entrant provenant du port source donné (ou la "
+#~ "gamme de ports) sur l'hôte client"
+
+#~ msgid "Overview"
+#~ msgstr "Vue d'ensemble"
+
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#  applications/luci-fw/luasrc/model/cbi/luci_fw/miniportfw.lua               #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#
+# msgid "Name"
+# msgstr ""
+#
+# msgid "(optional)"
+# msgstr ""
+#
+# msgid "Protocol"
+# msgstr ""
+#
+# msgid "External port"
+# msgstr ""
+#
+# msgid "Internal IP address"
+# msgstr ""
+#
+#~ msgid "Port forwarding"
+#~ msgstr "Redirection de port"
+
+#~ msgid ""
+#~ "Port forwarding allows to provide network services in the internal "
+#~ "network to an external network."
+#~ msgstr ""
+#~ "La redirection de port vous permet d'exposer des services réseaux de "
+#~ "votre réseau local au réseau externe."
+
+#~ msgid "Redirection type"
+#~ msgstr "Type de redirection"
+
+#~ msgid "Redirections"
+#~ msgstr "Redirections"
+
+#~ msgid "Rules"
+#~ msgstr "Règles"
+
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#  applications/luci-fw/luasrc/model/cbi/luci_fw/redirect.lua                 #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#
+# msgid "Name"
+# msgstr ""
+#
+# msgid "Protocol"
+# msgstr ""
+#
+#~ msgid "Traffic Redirection"
+#~ msgstr "Redirection du trafic"
+
+#~ msgid ""
+#~ "Traffic redirection allows you to change the destination address of "
+#~ "forwarded packets."
+#~ msgstr ""
+#~ "La redirection de trafic vous permet de changer l'adresse de destination "
+#~ "des paquets transférés."
+
 #~ msgid "Network"
 #~ msgstr "Réseau"
 
diff --git a/po/he/firewall.po b/po/he/firewall.po
index c0830b0e6..fdc5a08b4 100644
--- a/po/he/firewall.po
+++ b/po/he/firewall.po
@@ -8,6 +8,9 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+msgid "%s%s with %s"
+msgstr ""
+
 msgid "(Unnamed Entry)"
 msgstr ""
 
@@ -23,28 +26,31 @@ msgstr ""
 msgid "-- custom --"
 msgstr ""
 
-msgid "Action"
+msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr ""
 
-msgid "Add"
+msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr ""
 
-msgid "Add and edit..."
+msgid "<var>%s</var> and limit to %s"
 msgstr ""
 
-msgid "Advanced Options"
+msgid "Accept forward"
 msgstr ""
 
-msgid "Advanced Rules"
+msgid "Accept input"
 msgstr ""
 
-msgid "Advanced Settings"
+msgid "Action"
 msgstr ""
 
-msgid ""
-"Advanced rules let you customize the firewall to your needs. Only new "
-"connections will be matched. Packets belonging to already open connections "
-"are automatically allowed to pass the firewall."
+msgid "Add"
+msgstr ""
+
+msgid "Add and edit..."
+msgstr ""
+
+msgid "Advanced Settings"
 msgstr ""
 
 msgid "Allow forward from <em>source zones</em>:"
@@ -62,9 +68,6 @@ msgstr ""
 msgid "Custom Rules"
 msgstr ""
 
-msgid "Custom Rules (/etc/firewall.user)"
-msgstr ""
-
 msgid ""
 "Custom rules allow you to execute arbritary iptables commands which are not "
 "otherwise covered by the firewall framework. The commands are executed after "
@@ -86,12 +89,21 @@ msgstr ""
 msgid "Destination zone"
 msgstr ""
 
-msgid "Device"
+msgid "Discard forward"
+msgstr ""
+
+msgid "Discard input"
 msgstr ""
 
 msgid "Do not rewrite"
 msgstr ""
 
+msgid "Do not track forward"
+msgstr ""
+
+msgid "Do not track input"
+msgstr ""
+
 msgid "Drop invalid packets"
 msgstr ""
 
@@ -125,20 +137,39 @@ msgstr ""
 msgid "Firewall - Zone Settings"
 msgstr ""
 
-msgid ""
-"For DNAT, match incoming traffic directed at the given destination ip "
-"address. For SNAT rewrite the source address to the given address."
-msgstr ""
-
 msgid "Force connection tracking"
 msgstr ""
 
 msgid "Forward"
 msgstr ""
 
+msgid "Forward to %s in %s"
+msgstr ""
+
+msgid "Forward to %s, %s in %s"
+msgstr ""
+
+msgid "From %s in %s"
+msgstr ""
+
+msgid "From %s in %s with source %s"
+msgstr ""
+
+msgid "From %s in %s with source %s and %s"
+msgstr ""
+
 msgid "General Settings"
 msgstr ""
 
+msgid "IP"
+msgstr ""
+
+msgid "IP range"
+msgstr ""
+
+msgid "IPs"
+msgstr ""
+
 msgid "IPv4"
 msgstr ""
 
@@ -175,6 +206,12 @@ msgstr ""
 msgid "Limit log messages"
 msgstr ""
 
+msgid "MAC"
+msgstr ""
+
+msgid "MACs"
+msgstr ""
+
 msgid "MSS clamping"
 msgstr ""
 
@@ -194,11 +231,6 @@ msgstr ""
 
 msgid ""
 "Match incoming traffic originating from the given source port or port range "
-"on the client host"
-msgstr ""
-
-msgid ""
-"Match incoming traffic originating from the given source port or port range "
 "on the client host."
 msgstr ""
 
@@ -243,25 +275,14 @@ msgstr ""
 msgid "Output"
 msgstr ""
 
-msgid "Overview"
-msgstr ""
-
 msgid "Port Forwards"
 msgstr ""
 
-msgid "Port forwarding"
-msgstr ""
-
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
 msgstr ""
 
-msgid ""
-"Port forwarding allows to provide network services in the internal network "
-"to an external network."
-msgstr ""
-
 msgid "Protocol"
 msgstr ""
 
@@ -272,10 +293,10 @@ msgstr ""
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr ""
 
-msgid "Redirection type"
+msgid "Refuse forward"
 msgstr ""
 
-msgid "Redirections"
+msgid "Refuse input"
 msgstr ""
 
 msgid "Restrict Masquerading to given destination subnets"
@@ -295,7 +316,10 @@ msgid ""
 "rewrite the IP address."
 msgstr ""
 
-msgid "Rules"
+msgid "Rewrite to source %s"
+msgstr ""
+
+msgid "Rewrite to source %s, %s"
 msgstr ""
 
 msgid "SNAT"
@@ -366,21 +390,31 @@ msgid ""
 "networks</em> specifies which available networks are member of this zone."
 msgstr ""
 
-msgid "To source IP"
+msgid "To %s"
 msgstr ""
 
-msgid "To source port"
+msgid "To %s at %s"
 msgstr ""
 
-msgid "Traffic Redirection"
+msgid "To %s at %s on <var>this device</var>"
 msgstr ""
 
-msgid "Traffic Rules"
+msgid "To %s in %s"
 msgstr ""
 
-msgid ""
-"Traffic redirection allows you to change the destination address of "
-"forwarded packets."
+msgid "To %s on <var>this device</var>"
+msgstr ""
+
+msgid "To %s, %s in %s"
+msgstr ""
+
+msgid "To source IP"
+msgstr ""
+
+msgid "To source port"
+msgstr ""
+
+msgid "Traffic Rules"
 msgstr ""
 
 msgid ""
@@ -412,11 +446,47 @@ msgstr ""
 msgid "any"
 msgstr ""
 
+msgid "any host"
+msgstr ""
+
+msgid "any router IP"
+msgstr ""
+
+msgid "any zone"
+msgstr ""
+
+msgid "day"
+msgstr ""
+
 msgid "don't track"
 msgstr ""
 
 msgid "drop"
 msgstr ""
 
+msgid "hour"
+msgstr ""
+
+msgid "minute"
+msgstr ""
+
+msgid "not"
+msgstr ""
+
+msgid "port"
+msgstr ""
+
+msgid "ports"
+msgstr ""
+
 msgid "reject"
 msgstr ""
+
+msgid "second"
+msgstr ""
+
+msgid "type"
+msgstr ""
+
+msgid "types"
+msgstr ""
diff --git a/po/it/firewall.po b/po/it/firewall.po
index d22d4af95..608616c88 100644
--- a/po/it/firewall.po
+++ b/po/it/firewall.po
@@ -13,6 +13,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.4\n"
 
+msgid "%s%s with %s"
+msgstr ""
+
 msgid "(Unnamed Entry)"
 msgstr ""
 
@@ -28,6 +31,21 @@ msgstr ""
 msgid "-- custom --"
 msgstr ""
 
+msgid "<var>%d</var> pkts. per <var>%s</var>"
+msgstr ""
+
+msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
+msgstr ""
+
+msgid "<var>%s</var> and limit to %s"
+msgstr ""
+
+msgid "Accept forward"
+msgstr ""
+
+msgid "Accept input"
+msgstr ""
+
 msgid "Action"
 msgstr "Azione"
 
@@ -37,25 +55,9 @@ msgstr ""
 msgid "Add and edit..."
 msgstr ""
 
-msgid "Advanced Options"
-msgstr "Opzioni Avanzate"
-
-msgid "Advanced Rules"
-msgstr "Regole Avanzate"
-
 msgid "Advanced Settings"
 msgstr "Opzioni Avanzate"
 
-msgid ""
-"Advanced rules let you customize the firewall to your needs. Only new "
-"connections will be matched. Packets belonging to already open connections "
-"are automatically allowed to pass the firewall."
-msgstr ""
-"Le regole avanzate consentono di personalizzare il firewall per le tue "
-"necessità. Solo le nuove connessioni saranno combinate. I pacchetti "
-"appartenenti alle connessioni già aperte sono automaticamente autorizzate ad "
-"oltrepassare il firewall."
-
 msgid "Allow forward from <em>source zones</em>:"
 msgstr ""
 
@@ -71,9 +73,6 @@ msgstr ""
 msgid "Custom Rules"
 msgstr "Regole Personalizzate"
 
-msgid "Custom Rules (/etc/firewall.user)"
-msgstr "Regole Personalizzate (/etc/firewall.user)"
-
 msgid ""
 "Custom rules allow you to execute arbritary iptables commands which are not "
 "otherwise covered by the firewall framework. The commands are executed after "
@@ -95,12 +94,21 @@ msgstr "Porta di destinazione"
 msgid "Destination zone"
 msgstr "Zona di destinazione"
 
-msgid "Device"
-msgstr "Dispositivo"
+msgid "Discard forward"
+msgstr ""
+
+msgid "Discard input"
+msgstr ""
 
 msgid "Do not rewrite"
 msgstr ""
 
+msgid "Do not track forward"
+msgstr ""
+
+msgid "Do not track input"
+msgstr ""
+
 msgid "Drop invalid packets"
 msgstr ""
 
@@ -134,20 +142,39 @@ msgstr ""
 msgid "Firewall - Zone Settings"
 msgstr "Firewall - Opzioni delle Zone"
 
-msgid ""
-"For DNAT, match incoming traffic directed at the given destination ip "
-"address. For SNAT rewrite the source address to the given address."
-msgstr ""
-
 msgid "Force connection tracking"
 msgstr ""
 
 msgid "Forward"
 msgstr ""
 
+msgid "Forward to %s in %s"
+msgstr ""
+
+msgid "Forward to %s, %s in %s"
+msgstr ""
+
+msgid "From %s in %s"
+msgstr ""
+
+msgid "From %s in %s with source %s"
+msgstr ""
+
+msgid "From %s in %s with source %s and %s"
+msgstr ""
+
 msgid "General Settings"
 msgstr "Opzioni Generali"
 
+msgid "IP"
+msgstr ""
+
+msgid "IP range"
+msgstr ""
+
+msgid "IPs"
+msgstr ""
+
 msgid "IPv4"
 msgstr ""
 
@@ -184,6 +211,12 @@ msgstr "Porta interna (opzionale)"
 msgid "Limit log messages"
 msgstr ""
 
+msgid "MAC"
+msgstr ""
+
+msgid "MACs"
+msgstr ""
+
 msgid "MSS clamping"
 msgstr ""
 
@@ -203,11 +236,6 @@ msgstr ""
 
 msgid ""
 "Match incoming traffic originating from the given source port or port range "
-"on the client host"
-msgstr ""
-
-msgid ""
-"Match incoming traffic originating from the given source port or port range "
 "on the client host."
 msgstr ""
 
@@ -252,25 +280,14 @@ msgstr ""
 msgid "Output"
 msgstr ""
 
-msgid "Overview"
-msgstr ""
-
 msgid "Port Forwards"
 msgstr ""
 
-msgid "Port forwarding"
-msgstr ""
-
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
 msgstr ""
 
-msgid ""
-"Port forwarding allows to provide network services in the internal network "
-"to an external network."
-msgstr ""
-
 msgid "Protocol"
 msgstr "Protocollo"
 
@@ -281,10 +298,10 @@ msgstr ""
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr ""
 
-msgid "Redirection type"
+msgid "Refuse forward"
 msgstr ""
 
-msgid "Redirections"
+msgid "Refuse input"
 msgstr ""
 
 msgid "Restrict Masquerading to given destination subnets"
@@ -304,8 +321,11 @@ msgid ""
 "rewrite the IP address."
 msgstr ""
 
-msgid "Rules"
-msgstr "Regole"
+msgid "Rewrite to source %s"
+msgstr ""
+
+msgid "Rewrite to source %s, %s"
+msgstr ""
 
 msgid "SNAT"
 msgstr ""
@@ -396,21 +416,31 @@ msgid ""
 "networks</em> specifies which available networks are member of this zone."
 msgstr ""
 
-msgid "To source IP"
+msgid "To %s"
 msgstr ""
 
-msgid "To source port"
+msgid "To %s at %s"
 msgstr ""
 
-msgid "Traffic Redirection"
+msgid "To %s at %s on <var>this device</var>"
 msgstr ""
 
-msgid "Traffic Rules"
+msgid "To %s in %s"
 msgstr ""
 
-msgid ""
-"Traffic redirection allows you to change the destination address of "
-"forwarded packets."
+msgid "To %s on <var>this device</var>"
+msgstr ""
+
+msgid "To %s, %s in %s"
+msgstr ""
+
+msgid "To source IP"
+msgstr ""
+
+msgid "To source port"
+msgstr ""
+
+msgid "Traffic Rules"
 msgstr ""
 
 msgid ""
@@ -442,11 +472,72 @@ msgstr "accetta"
 msgid "any"
 msgstr "qualsiasi"
 
+msgid "any host"
+msgstr ""
+
+msgid "any router IP"
+msgstr ""
+
+msgid "any zone"
+msgstr ""
+
+msgid "day"
+msgstr ""
+
 msgid "don't track"
 msgstr ""
 
 msgid "drop"
 msgstr ""
 
+msgid "hour"
+msgstr ""
+
+msgid "minute"
+msgstr ""
+
+msgid "not"
+msgstr ""
+
+msgid "port"
+msgstr ""
+
+msgid "ports"
+msgstr ""
+
 msgid "reject"
 msgstr "rifiuta"
+
+msgid "second"
+msgstr ""
+
+msgid "type"
+msgstr ""
+
+msgid "types"
+msgstr ""
+
+#~ msgid "Advanced Options"
+#~ msgstr "Opzioni Avanzate"
+
+#~ msgid "Advanced Rules"
+#~ msgstr "Regole Avanzate"
+
+#~ msgid ""
+#~ "Advanced rules let you customize the firewall to your needs. Only new "
+#~ "connections will be matched. Packets belonging to already open "
+#~ "connections are automatically allowed to pass the firewall."
+#~ msgstr ""
+#~ "Le regole avanzate consentono di personalizzare il firewall per le tue "
+#~ "necessità. Solo le nuove connessioni saranno combinate. I pacchetti "
+#~ "appartenenti alle connessioni già aperte sono automaticamente autorizzate "
+#~ "ad oltrepassare il firewall."
+
+#~ msgid "Custom Rules (/etc/firewall.user)"
+#~ msgstr "Regole Personalizzate (/etc/firewall.user)"
+
+#~ msgid "Device"
+#~ msgstr "Dispositivo"
+
+#~ msgid "Rules"
+#~ msgstr "Regole"
diff --git a/po/ja/firewall.po b/po/ja/firewall.po
index 9a77835f2..bcdeb1d83 100644
--- a/po/ja/firewall.po
+++ b/po/ja/firewall.po
@@ -13,6 +13,9 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Pootle 2.0.4\n"
 
+msgid "%s%s with %s"
+msgstr ""
+
 msgid "(Unnamed Entry)"
 msgstr ""
 
@@ -28,6 +31,21 @@ msgstr ""
 msgid "-- custom --"
 msgstr ""
 
+msgid "<var>%d</var> pkts. per <var>%s</var>"
+msgstr ""
+
+msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
+msgstr ""
+
+msgid "<var>%s</var> and limit to %s"
+msgstr ""
+
+msgid "Accept forward"
+msgstr ""
+
+msgid "Accept input"
+msgstr ""
+
 msgid "Action"
 msgstr "動作"
 
@@ -37,23 +55,9 @@ msgstr ""
 msgid "Add and edit..."
 msgstr ""
 
-msgid "Advanced Options"
-msgstr "詳細なオプション"
-
-msgid "Advanced Rules"
-msgstr "詳細なルール"
-
 msgid "Advanced Settings"
 msgstr "詳細設定"
 
-msgid ""
-"Advanced rules let you customize the firewall to your needs. Only new "
-"connections will be matched. Packets belonging to already open connections "
-"are automatically allowed to pass the firewall."
-msgstr ""
-"詳細なルール設定を行うことができます。ただし、すでに接続が行われているパケッ"
-"トに関しては、自動的にファイアウォールの通過を許可されます。"
-
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "<em>送信元ゾーン</em>からの転送を許可する:"
 
@@ -69,9 +73,6 @@ msgstr "対象ネットワーク"
 msgid "Custom Rules"
 msgstr "手動設定ルール"
 
-msgid "Custom Rules (/etc/firewall.user)"
-msgstr "手動設定ルール (/etc/firewall.user)"
-
 msgid ""
 "Custom rules allow you to execute arbritary iptables commands which are not "
 "otherwise covered by the firewall framework. The commands are executed after "
@@ -93,12 +94,21 @@ msgstr "宛先ポート"
 msgid "Destination zone"
 msgstr "宛先ゾーン"
 
-msgid "Device"
-msgstr "デバイス"
+msgid "Discard forward"
+msgstr ""
+
+msgid "Discard input"
+msgstr ""
 
 msgid "Do not rewrite"
 msgstr ""
 
+msgid "Do not track forward"
+msgstr ""
+
+msgid "Do not track input"
+msgstr ""
+
 msgid "Drop invalid packets"
 msgstr "無効なパケットを遮断する"
 
@@ -132,22 +142,39 @@ msgstr ""
 msgid "Firewall - Zone Settings"
 msgstr "ファイアウォール - ゾーン設定"
 
-msgid ""
-"For DNAT, match incoming traffic directed at the given destination ip "
-"address. For SNAT rewrite the source address to the given address."
-msgstr ""
-"DNATの場合、設定された宛先アドレスのトラフィックに対して合致を行います。SNAT"
-"の場合、送信元アドレスを設定されたアドレスで上書きします。"
-
 msgid "Force connection tracking"
 msgstr "強制的にコネクション追跡を行う"
 
 msgid "Forward"
 msgstr "転送"
 
+msgid "Forward to %s in %s"
+msgstr ""
+
+msgid "Forward to %s, %s in %s"
+msgstr ""
+
+msgid "From %s in %s"
+msgstr ""
+
+msgid "From %s in %s with source %s"
+msgstr ""
+
+msgid "From %s in %s with source %s and %s"
+msgstr ""
+
 msgid "General Settings"
 msgstr "一般設定"
 
+msgid "IP"
+msgstr ""
+
+msgid "IP range"
+msgstr ""
+
+msgid "IPs"
+msgstr ""
+
 msgid "IPv4"
 msgstr ""
 
@@ -184,6 +211,12 @@ msgstr "内部ポート（オプション）"
 msgid "Limit log messages"
 msgstr "ログを制限"
 
+msgid "MAC"
+msgstr ""
+
+msgid "MACs"
+msgstr ""
+
 msgid "MSS clamping"
 msgstr "MSSクランプ"
 
@@ -204,11 +237,6 @@ msgstr ""
 
 msgid ""
 "Match incoming traffic originating from the given source port or port range "
-"on the client host"
-msgstr ""
-
-msgid ""
-"Match incoming traffic originating from the given source port or port range "
 "on the client host."
 msgstr ""
 
@@ -253,27 +281,14 @@ msgstr ""
 msgid "Output"
 msgstr "送信"
 
-msgid "Overview"
-msgstr "概要"
-
 msgid "Port Forwards"
 msgstr ""
 
-msgid "Port forwarding"
-msgstr "ポートフォワーディング"
-
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
 msgstr ""
 
-msgid ""
-"Port forwarding allows to provide network services in the internal network "
-"to an external network."
-msgstr ""
-"ポートフォワーディングを使用することで、内部ネットワークのサービスを外部に提"
-"供することができます。"
-
 msgid "Protocol"
 msgstr "プロトコル"
 
@@ -285,11 +300,11 @@ msgstr ""
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "ルールに一致した受信トラフィックを、設定された内部ホストへ転送します"
 
-msgid "Redirection type"
-msgstr "転送タイプ"
+msgid "Refuse forward"
+msgstr ""
 
-msgid "Redirections"
-msgstr "転送"
+msgid "Refuse input"
+msgstr ""
 
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "設定された宛先サブネットへのマスカレードを制限する"
@@ -308,8 +323,11 @@ msgid ""
 "rewrite the IP address."
 msgstr ""
 
-msgid "Rules"
-msgstr "ルール"
+msgid "Rewrite to source %s"
+msgstr ""
+
+msgid "Rewrite to source %s, %s"
+msgstr ""
 
 msgid "SNAT"
 msgstr ""
@@ -422,24 +440,32 @@ msgstr ""
 "準のポリシーになります。<em>対象ネットワーク</em>は、どのネットワーク設定がこ"
 "のゾーンに属するかを設定します。"
 
-msgid "To source IP"
+msgid "To %s"
 msgstr ""
 
-msgid "To source port"
+msgid "To %s at %s"
 msgstr ""
 
-msgid "Traffic Redirection"
-msgstr "トラフィック転送"
+msgid "To %s at %s on <var>this device</var>"
+msgstr ""
 
-msgid "Traffic Rules"
+msgid "To %s in %s"
 msgstr ""
 
-msgid ""
-"Traffic redirection allows you to change the destination address of "
-"forwarded packets."
+msgid "To %s on <var>this device</var>"
+msgstr ""
+
+msgid "To %s, %s in %s"
+msgstr ""
+
+msgid "To source IP"
+msgstr ""
+
+msgid "To source port"
+msgstr ""
+
+msgid "Traffic Rules"
 msgstr ""
-"トラフィック転送機能を用いることで、転送したパケットの宛先アドレスを変更する"
-"ことが可能です。"
 
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
@@ -470,11 +496,106 @@ msgstr "許可"
 msgid "any"
 msgstr "全て"
 
+msgid "any host"
+msgstr ""
+
+msgid "any router IP"
+msgstr ""
+
+msgid "any zone"
+msgstr ""
+
+msgid "day"
+msgstr ""
+
 msgid "don't track"
 msgstr ""
 
 msgid "drop"
 msgstr "遮断"
 
+msgid "hour"
+msgstr ""
+
+msgid "minute"
+msgstr ""
+
+msgid "not"
+msgstr ""
+
+msgid "port"
+msgstr ""
+
+msgid "ports"
+msgstr ""
+
 msgid "reject"
 msgstr "拒否"
+
+msgid "second"
+msgstr ""
+
+msgid "type"
+msgstr ""
+
+msgid "types"
+msgstr ""
+
+#~ msgid "Advanced Options"
+#~ msgstr "詳細なオプション"
+
+#~ msgid "Advanced Rules"
+#~ msgstr "詳細なルール"
+
+#~ msgid ""
+#~ "Advanced rules let you customize the firewall to your needs. Only new "
+#~ "connections will be matched. Packets belonging to already open "
+#~ "connections are automatically allowed to pass the firewall."
+#~ msgstr ""
+#~ "詳細なルール設定を行うことができます。ただし、すでに接続が行われているパ"
+#~ "ケットに関しては、自動的にファイアウォールの通過を許可されます。"
+
+#~ msgid "Custom Rules (/etc/firewall.user)"
+#~ msgstr "手動設定ルール (/etc/firewall.user)"
+
+#~ msgid "Device"
+#~ msgstr "デバイス"
+
+#~ msgid ""
+#~ "For DNAT, match incoming traffic directed at the given destination ip "
+#~ "address. For SNAT rewrite the source address to the given address."
+#~ msgstr ""
+#~ "DNATの場合、設定された宛先アドレスのトラフィックに対して合致を行います。"
+#~ "SNATの場合、送信元アドレスを設定されたアドレスで上書きします。"
+
+#~ msgid "Overview"
+#~ msgstr "概要"
+
+#~ msgid "Port forwarding"
+#~ msgstr "ポートフォワーディング"
+
+#~ msgid ""
+#~ "Port forwarding allows to provide network services in the internal "
+#~ "network to an external network."
+#~ msgstr ""
+#~ "ポートフォワーディングを使用することで、内部ネットワークのサービスを外部に"
+#~ "提供することができます。"
+
+#~ msgid "Redirection type"
+#~ msgstr "転送タイプ"
+
+#~ msgid "Redirections"
+#~ msgstr "転送"
+
+#~ msgid "Rules"
+#~ msgstr "ルール"
+
+#~ msgid "Traffic Redirection"
+#~ msgstr "トラフィック転送"
+
+#~ msgid ""
+#~ "Traffic redirection allows you to change the destination address of "
+#~ "forwarded packets."
+#~ msgstr ""
+#~ "トラフィック転送機能を用いることで、転送したパケットの宛先アドレスを変更す"
+#~ "ることが可能です。"
diff --git a/po/ms/firewall.po b/po/ms/firewall.po
index 0fa917ea7..35b5ad95f 100644
--- a/po/ms/firewall.po
+++ b/po/ms/firewall.po
@@ -7,6 +7,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "%s%s with %s"
+msgstr ""
+
 msgid "(Unnamed Entry)"
 msgstr ""
 
@@ -22,28 +25,31 @@ msgstr ""
 msgid "-- custom --"
 msgstr ""
 
-msgid "Action"
+msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr ""
 
-msgid "Add"
+msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr ""
 
-msgid "Add and edit..."
+msgid "<var>%s</var> and limit to %s"
 msgstr ""
 
-msgid "Advanced Options"
+msgid "Accept forward"
 msgstr ""
 
-msgid "Advanced Rules"
+msgid "Accept input"
 msgstr ""
 
-msgid "Advanced Settings"
+msgid "Action"
 msgstr ""
 
-msgid ""
-"Advanced rules let you customize the firewall to your needs. Only new "
-"connections will be matched. Packets belonging to already open connections "
-"are automatically allowed to pass the firewall."
+msgid "Add"
+msgstr ""
+
+msgid "Add and edit..."
+msgstr ""
+
+msgid "Advanced Settings"
 msgstr ""
 
 msgid "Allow forward from <em>source zones</em>:"
@@ -61,9 +67,6 @@ msgstr ""
 msgid "Custom Rules"
 msgstr ""
 
-msgid "Custom Rules (/etc/firewall.user)"
-msgstr ""
-
 msgid ""
 "Custom rules allow you to execute arbritary iptables commands which are not "
 "otherwise covered by the firewall framework. The commands are executed after "
@@ -85,12 +88,21 @@ msgstr ""
 msgid "Destination zone"
 msgstr ""
 
-msgid "Device"
+msgid "Discard forward"
+msgstr ""
+
+msgid "Discard input"
 msgstr ""
 
 msgid "Do not rewrite"
 msgstr ""
 
+msgid "Do not track forward"
+msgstr ""
+
+msgid "Do not track input"
+msgstr ""
+
 msgid "Drop invalid packets"
 msgstr ""
 
@@ -124,20 +136,39 @@ msgstr ""
 msgid "Firewall - Zone Settings"
 msgstr ""
 
-msgid ""
-"For DNAT, match incoming traffic directed at the given destination ip "
-"address. For SNAT rewrite the source address to the given address."
-msgstr ""
-
 msgid "Force connection tracking"
 msgstr ""
 
 msgid "Forward"
 msgstr ""
 
+msgid "Forward to %s in %s"
+msgstr ""
+
+msgid "Forward to %s, %s in %s"
+msgstr ""
+
+msgid "From %s in %s"
+msgstr ""
+
+msgid "From %s in %s with source %s"
+msgstr ""
+
+msgid "From %s in %s with source %s and %s"
+msgstr ""
+
 msgid "General Settings"
 msgstr ""
 
+msgid "IP"
+msgstr ""
+
+msgid "IP range"
+msgstr ""
+
+msgid "IPs"
+msgstr ""
+
 msgid "IPv4"
 msgstr ""
 
@@ -174,6 +205,12 @@ msgstr ""
 msgid "Limit log messages"
 msgstr ""
 
+msgid "MAC"
+msgstr ""
+
+msgid "MACs"
+msgstr ""
+
 msgid "MSS clamping"
 msgstr ""
 
@@ -193,11 +230,6 @@ msgstr ""
 
 msgid ""
 "Match incoming traffic originating from the given source port or port range "
-"on the client host"
-msgstr ""
-
-msgid ""
-"Match incoming traffic originating from the given source port or port range "
 "on the client host."
 msgstr ""
 
@@ -242,25 +274,14 @@ msgstr ""
 msgid "Output"
 msgstr ""
 
-msgid "Overview"
-msgstr ""
-
 msgid "Port Forwards"
 msgstr ""
 
-msgid "Port forwarding"
-msgstr ""
-
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
 msgstr ""
 
-msgid ""
-"Port forwarding allows to provide network services in the internal network "
-"to an external network."
-msgstr ""
-
 msgid "Protocol"
 msgstr ""
 
@@ -271,10 +292,10 @@ msgstr ""
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr ""
 
-msgid "Redirection type"
+msgid "Refuse forward"
 msgstr ""
 
-msgid "Redirections"
+msgid "Refuse input"
 msgstr ""
 
 msgid "Restrict Masquerading to given destination subnets"
@@ -294,7 +315,10 @@ msgid ""
 "rewrite the IP address."
 msgstr ""
 
-msgid "Rules"
+msgid "Rewrite to source %s"
+msgstr ""
+
+msgid "Rewrite to source %s, %s"
 msgstr ""
 
 msgid "SNAT"
@@ -365,21 +389,31 @@ msgid ""
 "networks</em> specifies which available networks are member of this zone."
 msgstr ""
 
-msgid "To source IP"
+msgid "To %s"
 msgstr ""
 
-msgid "To source port"
+msgid "To %s at %s"
 msgstr ""
 
-msgid "Traffic Redirection"
+msgid "To %s at %s on <var>this device</var>"
 msgstr ""
 
-msgid "Traffic Rules"
+msgid "To %s in %s"
 msgstr ""
 
-msgid ""
-"Traffic redirection allows you to change the destination address of "
-"forwarded packets."
+msgid "To %s on <var>this device</var>"
+msgstr ""
+
+msgid "To %s, %s in %s"
+msgstr ""
+
+msgid "To source IP"
+msgstr ""
+
+msgid "To source port"
+msgstr ""
+
+msgid "Traffic Rules"
 msgstr ""
 
 msgid ""
@@ -411,11 +445,47 @@ msgstr ""
 msgid "any"
 msgstr ""
 
+msgid "any host"
+msgstr ""
+
+msgid "any router IP"
+msgstr ""
+
+msgid "any zone"
+msgstr ""
+
+msgid "day"
+msgstr ""
+
 msgid "don't track"
 msgstr ""
 
 msgid "drop"
 msgstr ""
 
+msgid "hour"
+msgstr ""
+
+msgid "minute"
+msgstr ""
+
+msgid "not"
+msgstr ""
+
+msgid "port"
+msgstr ""
+
+msgid "ports"
+msgstr ""
+
 msgid "reject"
 msgstr ""
+
+msgid "second"
+msgstr ""
+
+msgid "type"
+msgstr ""
+
+msgid "types"
+msgstr ""
diff --git a/po/no/firewall.po b/po/no/firewall.po
index bb46c0205..1eb6fad47 100644
--- a/po/no/firewall.po
+++ b/po/no/firewall.po
@@ -4,6 +4,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "%s%s with %s"
+msgstr ""
+
 msgid "(Unnamed Entry)"
 msgstr ""
 
@@ -19,6 +22,21 @@ msgstr ""
 msgid "-- custom --"
 msgstr ""
 
+msgid "<var>%d</var> pkts. per <var>%s</var>"
+msgstr ""
+
+msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
+msgstr ""
+
+msgid "<var>%s</var> and limit to %s"
+msgstr ""
+
+msgid "Accept forward"
+msgstr ""
+
+msgid "Accept input"
+msgstr ""
+
 msgid "Action"
 msgstr "Handling"
 
@@ -28,24 +46,9 @@ msgstr ""
 msgid "Add and edit..."
 msgstr ""
 
-msgid "Advanced Options"
-msgstr "Avanserte Valg"
-
-msgid "Advanced Rules"
-msgstr "Avanserte Regler"
-
 msgid "Advanced Settings"
 msgstr "Avanserte Innstillinger"
 
-msgid ""
-"Advanced rules let you customize the firewall to your needs. Only new "
-"connections will be matched. Packets belonging to already open connections "
-"are automatically allowed to pass the firewall."
-msgstr ""
-"Avanserte regler lar deg tilpasse brannmuren til dine behov. Kun nye "
-"tilkoblinger blir berørt. Pakker som tilhører eksisterende tilkoblinger "
-"slipper derfor igjennom brannmuren."
-
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Tillat videresending fra <em>kilde soner</em>:"
 
@@ -61,9 +64,6 @@ msgstr "Gjeldene nettverk"
 msgid "Custom Rules"
 msgstr "Egendefinerte Regler"
 
-msgid "Custom Rules (/etc/firewall.user)"
-msgstr "Egendefinerte Regler (/etc/firewall.user)"
-
 msgid ""
 "Custom rules allow you to execute arbritary iptables commands which are not "
 "otherwise covered by the firewall framework. The commands are executed after "
@@ -85,12 +85,21 @@ msgstr "Destinasjons port"
 msgid "Destination zone"
 msgstr "Destinasjons sone"
 
-msgid "Device"
-msgstr "Enhet"
+msgid "Discard forward"
+msgstr ""
+
+msgid "Discard input"
+msgstr ""
 
 msgid "Do not rewrite"
 msgstr ""
 
+msgid "Do not track forward"
+msgstr ""
+
+msgid "Do not track input"
+msgstr ""
+
 msgid "Drop invalid packets"
 msgstr "Forkast ugyldige pakker"
 
@@ -124,23 +133,39 @@ msgstr ""
 msgid "Firewall - Zone Settings"
 msgstr "Brannmur - Sone Innstillinger"
 
-msgid ""
-"For DNAT, match incoming traffic directed at the given destination ip "
-"address. For SNAT rewrite the source address to the given address."
-msgstr ""
-"DNAT: Matcher innkommende trafikk som er rettet mot destinasjons IP-adressen "
-"du angir her. SNAT: Omskriver kilde IP-adressen slik at den blir lik den IP-"
-"adressen du angir her."
-
 msgid "Force connection tracking"
 msgstr "Tving sporing av tilkobling"
 
 msgid "Forward"
 msgstr "Videresend"
 
+msgid "Forward to %s in %s"
+msgstr ""
+
+msgid "Forward to %s, %s in %s"
+msgstr ""
+
+msgid "From %s in %s"
+msgstr ""
+
+msgid "From %s in %s with source %s"
+msgstr ""
+
+msgid "From %s in %s with source %s and %s"
+msgstr ""
+
 msgid "General Settings"
 msgstr "Generelle Innstillinger"
 
+msgid "IP"
+msgstr ""
+
+msgid "IP range"
+msgstr ""
+
+msgid "IPs"
+msgstr ""
+
 msgid "IPv4"
 msgstr ""
 
@@ -177,6 +202,12 @@ msgstr "Intern port (valgfritt)"
 msgid "Limit log messages"
 msgstr "Begrens logging"
 
+msgid "MAC"
+msgstr ""
+
+msgid "MACs"
+msgstr ""
+
 msgid "MSS clamping"
 msgstr "MSS Kontroll (Clamping)"
 
@@ -196,11 +227,6 @@ msgstr "Match innkommende trafikk som er rettet mot dette port/portområde"
 
 msgid ""
 "Match incoming traffic originating from the given source port or port range "
-"on the client host"
-msgstr "Match innkommende trafikk som kommer fra dette port/portområde"
-
-msgid ""
-"Match incoming traffic originating from the given source port or port range "
 "on the client host."
 msgstr ""
 
@@ -245,27 +271,14 @@ msgstr ""
 msgid "Output"
 msgstr "Utdata"
 
-msgid "Overview"
-msgstr "Oversikt"
-
 msgid "Port Forwards"
 msgstr ""
 
-msgid "Port forwarding"
-msgstr "Port Videresending"
-
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
 msgstr ""
 
-msgid ""
-"Port forwarding allows to provide network services in the internal network "
-"to an external network."
-msgstr ""
-"<abbr title=\"Port Forwarding\">Port Videresending</abbr> tillater at "
-"tjenester fra det interne nettverket kan tilbys et eksternt nettverk."
-
 msgid "Protocol"
 msgstr "Protokoll"
 
@@ -277,11 +290,11 @@ msgstr ""
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "Videresender matchet innkommende trafikk til denne interne enhet"
 
-msgid "Redirection type"
-msgstr "Omadressering type"
+msgid "Refuse forward"
+msgstr ""
 
-msgid "Redirections"
-msgstr "Omadresseringer"
+msgid "Refuse input"
+msgstr ""
 
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "Begrens Masquerading til destinasjons subnett"
@@ -300,8 +313,11 @@ msgid ""
 "rewrite the IP address."
 msgstr ""
 
-msgid "Rules"
-msgstr "Regler"
+msgid "Rewrite to source %s"
+msgstr ""
+
+msgid "Rewrite to source %s, %s"
+msgstr ""
 
 msgid "SNAT"
 msgstr ""
@@ -385,24 +401,32 @@ msgstr ""
 "spesifiserer hvilken av de tilgjengelige nettverk som er medlem av denne "
 "sone."
 
-msgid "To source IP"
+msgid "To %s"
 msgstr ""
 
-msgid "To source port"
+msgid "To %s at %s"
 msgstr ""
 
-msgid "Traffic Redirection"
-msgstr "Trafikk Omadressering"
+msgid "To %s at %s on <var>this device</var>"
+msgstr ""
 
-msgid "Traffic Rules"
+msgid "To %s in %s"
 msgstr ""
 
-msgid ""
-"Traffic redirection allows you to change the destination address of "
-"forwarded packets."
+msgid "To %s on <var>this device</var>"
+msgstr ""
+
+msgid "To %s, %s in %s"
+msgstr ""
+
+msgid "To source IP"
+msgstr ""
+
+msgid "To source port"
+msgstr ""
+
+msgid "Traffic Rules"
 msgstr ""
-"<abbr title=\"Traffic Redirection\">Trafikk Omadressering</abbr> lar deg "
-"endre destinasjons adresse på videresendte pakker."
 
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
@@ -433,11 +457,113 @@ msgstr "godta"
 msgid "any"
 msgstr "alle"
 
+msgid "any host"
+msgstr ""
+
+msgid "any router IP"
+msgstr ""
+
+msgid "any zone"
+msgstr ""
+
+msgid "day"
+msgstr ""
+
 msgid "don't track"
 msgstr "ikke track"
 
 msgid "drop"
 msgstr "forkast"
 
+msgid "hour"
+msgstr ""
+
+msgid "minute"
+msgstr ""
+
+msgid "not"
+msgstr ""
+
+msgid "port"
+msgstr ""
+
+msgid "ports"
+msgstr ""
+
 msgid "reject"
 msgstr "avslå"
+
+msgid "second"
+msgstr ""
+
+msgid "type"
+msgstr ""
+
+msgid "types"
+msgstr ""
+
+#~ msgid "Advanced Options"
+#~ msgstr "Avanserte Valg"
+
+#~ msgid "Advanced Rules"
+#~ msgstr "Avanserte Regler"
+
+#~ msgid ""
+#~ "Advanced rules let you customize the firewall to your needs. Only new "
+#~ "connections will be matched. Packets belonging to already open "
+#~ "connections are automatically allowed to pass the firewall."
+#~ msgstr ""
+#~ "Avanserte regler lar deg tilpasse brannmuren til dine behov. Kun nye "
+#~ "tilkoblinger blir berørt. Pakker som tilhører eksisterende tilkoblinger "
+#~ "slipper derfor igjennom brannmuren."
+
+#~ msgid "Custom Rules (/etc/firewall.user)"
+#~ msgstr "Egendefinerte Regler (/etc/firewall.user)"
+
+#~ msgid "Device"
+#~ msgstr "Enhet"
+
+#~ msgid ""
+#~ "For DNAT, match incoming traffic directed at the given destination ip "
+#~ "address. For SNAT rewrite the source address to the given address."
+#~ msgstr ""
+#~ "DNAT: Matcher innkommende trafikk som er rettet mot destinasjons IP-"
+#~ "adressen du angir her. SNAT: Omskriver kilde IP-adressen slik at den blir "
+#~ "lik den IP-adressen du angir her."
+
+#~ msgid ""
+#~ "Match incoming traffic originating from the given source port or port "
+#~ "range on the client host"
+#~ msgstr "Match innkommende trafikk som kommer fra dette port/portområde"
+
+#~ msgid "Overview"
+#~ msgstr "Oversikt"
+
+#~ msgid "Port forwarding"
+#~ msgstr "Port Videresending"
+
+#~ msgid ""
+#~ "Port forwarding allows to provide network services in the internal "
+#~ "network to an external network."
+#~ msgstr ""
+#~ "<abbr title=\"Port Forwarding\">Port Videresending</abbr> tillater at "
+#~ "tjenester fra det interne nettverket kan tilbys et eksternt nettverk."
+
+#~ msgid "Redirection type"
+#~ msgstr "Omadressering type"
+
+#~ msgid "Redirections"
+#~ msgstr "Omadresseringer"
+
+#~ msgid "Rules"
+#~ msgstr "Regler"
+
+#~ msgid "Traffic Redirection"
+#~ msgstr "Trafikk Omadressering"
+
+#~ msgid ""
+#~ "Traffic redirection allows you to change the destination address of "
+#~ "forwarded packets."
+#~ msgstr ""
+#~ "<abbr title=\"Traffic Redirection\">Trafikk Omadressering</abbr> lar deg "
+#~ "endre destinasjons adresse på videresendte pakker."
diff --git a/po/pl/firewall.po b/po/pl/firewall.po
index 2a0667dba..20bd317cf 100644
--- a/po/pl/firewall.po
+++ b/po/pl/firewall.po
@@ -14,6 +14,9 @@ msgstr ""
 "|| n%100>=20) ? 1 : 2);\n"
 "X-Generator: Pootle 2.0.4\n"
 
+msgid "%s%s with %s"
+msgstr ""
+
 msgid "(Unnamed Entry)"
 msgstr ""
 
@@ -29,6 +32,21 @@ msgstr ""
 msgid "-- custom --"
 msgstr ""
 
+msgid "<var>%d</var> pkts. per <var>%s</var>"
+msgstr ""
+
+msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
+msgstr ""
+
+msgid "<var>%s</var> and limit to %s"
+msgstr ""
+
+msgid "Accept forward"
+msgstr ""
+
+msgid "Accept input"
+msgstr ""
+
 msgid "Action"
 msgstr "Działanie"
 
@@ -38,45 +56,9 @@ msgstr ""
 msgid "Add and edit..."
 msgstr ""
 
-msgid "Advanced Options"
-msgstr "Opcje zaawansowane"
-
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-# Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/trule.lua      #
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-# msgid "Name"
-# msgstr ""
-# msgid "(optional)"
-# msgstr ""
-# msgid "Protocol"
-# msgstr ""
-# msgid "Source port"
-# msgstr ""
-# msgid "Destination port"
-# msgstr ""
-# msgid "Action"
-# msgstr ""
-# msgid "drop"
-# msgstr ""
-# msgid "accept"
-# msgstr ""
-# msgid "reject"
-# msgstr ""
-msgid "Advanced Rules"
-msgstr "Reguły zaawansowane"
-
 msgid "Advanced Settings"
 msgstr "Ustawienia zaawansowane"
 
-msgid ""
-"Advanced rules let you customize the firewall to your needs. Only new "
-"connections will be matched. Packets belonging to already open connections "
-"are automatically allowed to pass the firewall."
-msgstr ""
-"Reguły zaawansowane pozwalają dostosować zaporę do Twoich potrzeb. Tylko "
-"nowe połączenia zostaną nimi objęte. Pakiety należące do połączeń już "
-"otwarte są automatycznie przepuszczane przez zaporę."
-
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Zezwól na przekazywanie z <em>source zones</em>:"
 
@@ -92,9 +74,6 @@ msgstr "Objęte sieci"
 msgid "Custom Rules"
 msgstr "Reguły własne"
 
-msgid "Custom Rules (/etc/firewall.user)"
-msgstr "Reguły własne (/etc/firewall.user)"
-
 msgid ""
 "Custom rules allow you to execute arbritary iptables commands which are not "
 "otherwise covered by the firewall framework. The commands are executed after "
@@ -116,12 +95,21 @@ msgstr "Port docelowy"
 msgid "Destination zone"
 msgstr "Strefa docelowa"
 
-msgid "Device"
-msgstr "Urządzenie"
+msgid "Discard forward"
+msgstr ""
+
+msgid "Discard input"
+msgstr ""
 
 msgid "Do not rewrite"
 msgstr ""
 
+msgid "Do not track forward"
+msgstr ""
+
+msgid "Do not track input"
+msgstr ""
+
 msgid "Drop invalid packets"
 msgstr "Porzuć wadliwe pakiety"
 
@@ -158,22 +146,39 @@ msgstr ""
 msgid "Firewall - Zone Settings"
 msgstr "Zapora - Ustawienia strefy"
 
-msgid ""
-"For DNAT, match incoming traffic directed at the given destination ip "
-"address. For SNAT rewrite the source address to the given address."
-msgstr ""
-"Dla DNAT, dopasuj ruch przychodzący kierowane na podany adres IP. Dla SNAT "
-"zmienić adres źródłowy na podany adres."
-
 msgid "Force connection tracking"
 msgstr "Wymuś śledzenie połączeń"
 
 msgid "Forward"
 msgstr "Przekazywanie"
 
+msgid "Forward to %s in %s"
+msgstr ""
+
+msgid "Forward to %s, %s in %s"
+msgstr ""
+
+msgid "From %s in %s"
+msgstr ""
+
+msgid "From %s in %s with source %s"
+msgstr ""
+
+msgid "From %s in %s with source %s and %s"
+msgstr ""
+
 msgid "General Settings"
 msgstr "Ustawienia ogólne"
 
+msgid "IP"
+msgstr ""
+
+msgid "IP range"
+msgstr ""
+
+msgid "IPs"
+msgstr ""
+
 msgid "IPv4"
 msgstr ""
 
@@ -210,6 +215,12 @@ msgstr "Wewnętrzny port (opcjonalnie)"
 msgid "Limit log messages"
 msgstr "Ograniczenie logowania"
 
+msgid "MAC"
+msgstr ""
+
+msgid "MACs"
+msgstr ""
+
 msgid "MSS clamping"
 msgstr "MSS clamping"
 
@@ -229,11 +240,6 @@ msgstr ""
 
 msgid ""
 "Match incoming traffic originating from the given source port or port range "
-"on the client host"
-msgstr ""
-
-msgid ""
-"Match incoming traffic originating from the given source port or port range "
 "on the client host."
 msgstr ""
 
@@ -278,44 +284,14 @@ msgstr ""
 msgid "Output"
 msgstr ""
 
-msgid "Overview"
-msgstr ""
-
 msgid "Port Forwards"
 msgstr ""
 
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-# Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/miniportfw.lua #
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-#
-# msgid "Name"
-# msgstr ""
-#
-# msgid "(optional)"
-# msgstr ""
-#
-# msgid "Protocol"
-# msgstr ""
-#
-# msgid "External port"
-# msgstr ""
-#
-# msgid "Internal IP address"
-# msgstr ""
-#
-msgid "Port forwarding"
-msgstr ""
-
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
 msgstr ""
 
-msgid ""
-"Port forwarding allows to provide network services in the internal network "
-"to an external network."
-msgstr ""
-
 msgid "Protocol"
 msgstr ""
 
@@ -326,10 +302,10 @@ msgstr ""
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr ""
 
-msgid "Redirection type"
+msgid "Refuse forward"
 msgstr ""
 
-msgid "Redirections"
+msgid "Refuse input"
 msgstr ""
 
 msgid "Restrict Masquerading to given destination subnets"
@@ -349,7 +325,10 @@ msgid ""
 "rewrite the IP address."
 msgstr ""
 
-msgid "Rules"
+msgid "Rewrite to source %s"
+msgstr ""
+
+msgid "Rewrite to source %s, %s"
 msgstr ""
 
 msgid "SNAT"
@@ -450,31 +429,31 @@ msgid ""
 "networks</em> specifies which available networks are member of this zone."
 msgstr ""
 
-msgid "To source IP"
+msgid "To %s"
 msgstr ""
 
-msgid "To source port"
+msgid "To %s at %s"
 msgstr ""
 
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-# Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/redirect.lua   #
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-#
-# msgid "Name"
-# msgstr ""
-#
-# msgid "Protocol"
-# msgstr ""
-#
-msgid "Traffic Redirection"
+msgid "To %s at %s on <var>this device</var>"
 msgstr ""
 
-msgid "Traffic Rules"
+msgid "To %s in %s"
 msgstr ""
 
-msgid ""
-"Traffic redirection allows you to change the destination address of "
-"forwarded packets."
+msgid "To %s on <var>this device</var>"
+msgstr ""
+
+msgid "To %s, %s in %s"
+msgstr ""
+
+msgid "To source IP"
+msgstr ""
+
+msgid "To source port"
+msgstr ""
+
+msgid "Traffic Rules"
 msgstr ""
 
 msgid ""
@@ -506,11 +485,96 @@ msgstr ""
 msgid "any"
 msgstr ""
 
+msgid "any host"
+msgstr ""
+
+msgid "any router IP"
+msgstr ""
+
+msgid "any zone"
+msgstr ""
+
+msgid "day"
+msgstr ""
+
 msgid "don't track"
 msgstr ""
 
 msgid "drop"
 msgstr ""
 
+msgid "hour"
+msgstr ""
+
+msgid "minute"
+msgstr ""
+
+msgid "not"
+msgstr ""
+
+msgid "port"
+msgstr ""
+
+msgid "ports"
+msgstr ""
+
 msgid "reject"
 msgstr ""
+
+msgid "second"
+msgstr ""
+
+msgid "type"
+msgstr ""
+
+msgid "types"
+msgstr ""
+
+#~ msgid "Advanced Options"
+#~ msgstr "Opcje zaawansowane"
+
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+# Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/trule.lua      #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+# msgid "Name"
+# msgstr ""
+# msgid "(optional)"
+# msgstr ""
+# msgid "Protocol"
+# msgstr ""
+# msgid "Source port"
+# msgstr ""
+# msgid "Destination port"
+# msgstr ""
+# msgid "Action"
+# msgstr ""
+# msgid "drop"
+# msgstr ""
+# msgid "accept"
+# msgstr ""
+# msgid "reject"
+# msgstr ""
+#~ msgid "Advanced Rules"
+#~ msgstr "Reguły zaawansowane"
+
+#~ msgid ""
+#~ "Advanced rules let you customize the firewall to your needs. Only new "
+#~ "connections will be matched. Packets belonging to already open "
+#~ "connections are automatically allowed to pass the firewall."
+#~ msgstr ""
+#~ "Reguły zaawansowane pozwalają dostosować zaporę do Twoich potrzeb. Tylko "
+#~ "nowe połączenia zostaną nimi objęte. Pakiety należące do połączeń już "
+#~ "otwarte są automatycznie przepuszczane przez zaporę."
+
+#~ msgid "Custom Rules (/etc/firewall.user)"
+#~ msgstr "Reguły własne (/etc/firewall.user)"
+
+#~ msgid "Device"
+#~ msgstr "Urządzenie"
+
+#~ msgid ""
+#~ "For DNAT, match incoming traffic directed at the given destination ip "
+#~ "address. For SNAT rewrite the source address to the given address."
+#~ msgstr ""
+#~ "Dla DNAT, dopasuj ruch przychodzący kierowane na podany adres IP. Dla "
+#~ "SNAT zmienić adres źródłowy na podany adres."
diff --git a/po/pt/firewall.po b/po/pt/firewall.po
index ae9237635..aa105fc64 100644
--- a/po/pt/firewall.po
+++ b/po/pt/firewall.po
@@ -11,6 +11,9 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
+msgid "%s%s with %s"
+msgstr ""
+
 msgid "(Unnamed Entry)"
 msgstr ""
 
@@ -26,33 +29,32 @@ msgstr ""
 msgid "-- custom --"
 msgstr ""
 
-msgid "Action"
-msgstr "Acção"
+msgid "<var>%d</var> pkts. per <var>%s</var>"
+msgstr ""
 
-msgid "Add"
+msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr ""
 
-msgid "Add and edit..."
+msgid "<var>%s</var> and limit to %s"
 msgstr ""
 
-msgid "Advanced Options"
+msgid "Accept forward"
 msgstr ""
 
-msgid "Advanced Rules"
-msgstr "Regras Avançadas"
+msgid "Accept input"
+msgstr ""
 
-msgid "Advanced Settings"
+msgid "Action"
+msgstr "Acção"
+
+msgid "Add"
 msgstr ""
 
-msgid ""
-"Advanced rules let you customize the firewall to your needs. Only new "
-"connections will be matched. Packets belonging to already open connections "
-"are automatically allowed to pass the firewall."
+msgid "Add and edit..."
+msgstr ""
+
+msgid "Advanced Settings"
 msgstr ""
-"As regras avançadas permitem a personalização da firewall de acordo com as "
-"necessidades. Apenas as novas ligações serão processadas. Pacotes que "
-"pertençam a ligações já abertas estão automaticamente autorizados a passar "
-"pela firewall."
 
 msgid "Allow forward from <em>source zones</em>:"
 msgstr ""
@@ -69,9 +71,6 @@ msgstr ""
 msgid "Custom Rules"
 msgstr ""
 
-msgid "Custom Rules (/etc/firewall.user)"
-msgstr ""
-
 msgid ""
 "Custom rules allow you to execute arbritary iptables commands which are not "
 "otherwise covered by the firewall framework. The commands are executed after "
@@ -94,12 +93,21 @@ msgstr "Porta de destino"
 msgid "Destination zone"
 msgstr "Destino"
 
-msgid "Device"
+msgid "Discard forward"
+msgstr ""
+
+msgid "Discard input"
 msgstr ""
 
 msgid "Do not rewrite"
 msgstr ""
 
+msgid "Do not track forward"
+msgstr ""
+
+msgid "Do not track input"
+msgstr ""
+
 msgid "Drop invalid packets"
 msgstr "Dropar pacotes inválidos"
 
@@ -134,20 +142,39 @@ msgstr ""
 msgid "Firewall - Zone Settings"
 msgstr ""
 
-msgid ""
-"For DNAT, match incoming traffic directed at the given destination ip "
-"address. For SNAT rewrite the source address to the given address."
-msgstr ""
-
 msgid "Force connection tracking"
 msgstr ""
 
 msgid "Forward"
 msgstr ""
 
+msgid "Forward to %s in %s"
+msgstr ""
+
+msgid "Forward to %s, %s in %s"
+msgstr ""
+
+msgid "From %s in %s"
+msgstr ""
+
+msgid "From %s in %s with source %s"
+msgstr ""
+
+msgid "From %s in %s with source %s and %s"
+msgstr ""
+
 msgid "General Settings"
 msgstr ""
 
+msgid "IP"
+msgstr ""
+
+msgid "IP range"
+msgstr ""
+
+msgid "IPs"
+msgstr ""
+
 msgid "IPv4"
 msgstr ""
 
@@ -186,6 +213,12 @@ msgstr "Porta interna (opcional)"
 msgid "Limit log messages"
 msgstr ""
 
+msgid "MAC"
+msgstr ""
+
+msgid "MACs"
+msgstr ""
+
 #, fuzzy
 msgid "MSS clamping"
 msgstr "MSS-Correction"
@@ -206,11 +239,6 @@ msgstr ""
 
 msgid ""
 "Match incoming traffic originating from the given source port or port range "
-"on the client host"
-msgstr ""
-
-msgid ""
-"Match incoming traffic originating from the given source port or port range "
 "on the client host."
 msgstr ""
 
@@ -255,27 +283,14 @@ msgstr ""
 msgid "Output"
 msgstr "Saída"
 
-msgid "Overview"
-msgstr ""
-
 msgid "Port Forwards"
 msgstr ""
 
-msgid "Port forwarding"
-msgstr "Redirecionamento de portas"
-
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
 msgstr ""
 
-msgid ""
-"Port forwarding allows to provide network services in the internal network "
-"to an external network."
-msgstr ""
-"O redirecionamento de portas permite disponibilizar serviços na rede interna "
-"para uma rede externa."
-
 msgid "Protocol"
 msgstr ""
 
@@ -286,10 +301,10 @@ msgstr ""
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr ""
 
-msgid "Redirection type"
+msgid "Refuse forward"
 msgstr ""
 
-msgid "Redirections"
+msgid "Refuse input"
 msgstr ""
 
 msgid "Restrict Masquerading to given destination subnets"
@@ -309,7 +324,10 @@ msgid ""
 "rewrite the IP address."
 msgstr ""
 
-msgid "Rules"
+msgid "Rewrite to source %s"
+msgstr ""
+
+msgid "Rewrite to source %s, %s"
 msgstr ""
 
 msgid "SNAT"
@@ -385,24 +403,32 @@ msgid ""
 "networks</em> specifies which available networks are member of this zone."
 msgstr ""
 
-msgid "To source IP"
+msgid "To %s"
 msgstr ""
 
-msgid "To source port"
+msgid "To %s at %s"
+msgstr ""
+
+msgid "To %s at %s on <var>this device</var>"
 msgstr ""
 
-msgid "Traffic Redirection"
-msgstr "Redirecionamento de Tráfego"
+msgid "To %s in %s"
+msgstr ""
 
-msgid "Traffic Rules"
+msgid "To %s on <var>this device</var>"
 msgstr ""
 
-msgid ""
-"Traffic redirection allows you to change the destination address of "
-"forwarded packets."
+msgid "To %s, %s in %s"
+msgstr ""
+
+msgid "To source IP"
+msgstr ""
+
+msgid "To source port"
+msgstr ""
+
+msgid "Traffic Rules"
 msgstr ""
-"Redirecionamento do tráfego permite a alteração do endereço de destino dos "
-"pacotes enviados."
 
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
@@ -433,15 +459,84 @@ msgstr "aceitar"
 msgid "any"
 msgstr ""
 
+msgid "any host"
+msgstr ""
+
+msgid "any router IP"
+msgstr ""
+
+msgid "any zone"
+msgstr ""
+
+msgid "day"
+msgstr ""
+
 msgid "don't track"
 msgstr ""
 
 msgid "drop"
 msgstr "dropar"
 
+msgid "hour"
+msgstr ""
+
+msgid "minute"
+msgstr ""
+
+msgid "not"
+msgstr ""
+
+msgid "port"
+msgstr ""
+
+msgid "ports"
+msgstr ""
+
 msgid "reject"
 msgstr "rejeitar"
 
+msgid "second"
+msgstr ""
+
+msgid "type"
+msgstr ""
+
+msgid "types"
+msgstr ""
+
+#~ msgid "Advanced Rules"
+#~ msgstr "Regras Avançadas"
+
+#~ msgid ""
+#~ "Advanced rules let you customize the firewall to your needs. Only new "
+#~ "connections will be matched. Packets belonging to already open "
+#~ "connections are automatically allowed to pass the firewall."
+#~ msgstr ""
+#~ "As regras avançadas permitem a personalização da firewall de acordo com "
+#~ "as necessidades. Apenas as novas ligações serão processadas. Pacotes que "
+#~ "pertençam a ligações já abertas estão automaticamente autorizados a "
+#~ "passar pela firewall."
+
+#~ msgid "Port forwarding"
+#~ msgstr "Redirecionamento de portas"
+
+#~ msgid ""
+#~ "Port forwarding allows to provide network services in the internal "
+#~ "network to an external network."
+#~ msgstr ""
+#~ "O redirecionamento de portas permite disponibilizar serviços na rede "
+#~ "interna para uma rede externa."
+
+#~ msgid "Traffic Redirection"
+#~ msgstr "Redirecionamento de Tráfego"
+
+#~ msgid ""
+#~ "Traffic redirection allows you to change the destination address of "
+#~ "forwarded packets."
+#~ msgstr ""
+#~ "Redirecionamento do tráfego permite a alteração do endereço de destino "
+#~ "dos pacotes enviados."
+
 #, fuzzy
 #~ msgid "Network"
 #~ msgstr "Redes"
diff --git a/po/pt_BR/firewall.po b/po/pt_BR/firewall.po
index 64409541a..ba6d5f809 100644
--- a/po/pt_BR/firewall.po
+++ b/po/pt_BR/firewall.po
@@ -13,6 +13,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Pootle 2.0.4\n"
 
+msgid "%s%s with %s"
+msgstr ""
+
 msgid "(Unnamed Entry)"
 msgstr ""
 
@@ -28,6 +31,21 @@ msgstr ""
 msgid "-- custom --"
 msgstr ""
 
+msgid "<var>%d</var> pkts. per <var>%s</var>"
+msgstr ""
+
+msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
+msgstr ""
+
+msgid "<var>%s</var> and limit to %s"
+msgstr ""
+
+msgid "Accept forward"
+msgstr ""
+
+msgid "Accept input"
+msgstr ""
+
 msgid "Action"
 msgstr "Ação"
 
@@ -37,25 +55,9 @@ msgstr ""
 msgid "Add and edit..."
 msgstr ""
 
-msgid "Advanced Options"
-msgstr "Opções Avançadas"
-
-msgid "Advanced Rules"
-msgstr "Regras Avançadas"
-
 msgid "Advanced Settings"
 msgstr "Configurações Avançadas"
 
-msgid ""
-"Advanced rules let you customize the firewall to your needs. Only new "
-"connections will be matched. Packets belonging to already open connections "
-"are automatically allowed to pass the firewall."
-msgstr ""
-"As regras avançadas permitem a personalização da firewall de acordo com as "
-"necessidades. Apenas as novas conexões serão processadas. Pacotes que "
-"pertençam a conexões já abertas estão automaticamente autorizados a passar "
-"pelo firewall."
-
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Permite o encaminhamento da <em>zona de origem</em>:"
 
@@ -71,9 +73,6 @@ msgstr "Redes cobertas"
 msgid "Custom Rules"
 msgstr "Regras Personalizadas"
 
-msgid "Custom Rules (/etc/firewall.user)"
-msgstr "Regras Personalizadas (/etc/firewall.user)"
-
 msgid ""
 "Custom rules allow you to execute arbritary iptables commands which are not "
 "otherwise covered by the firewall framework. The commands are executed after "
@@ -95,12 +94,21 @@ msgstr "Porta de destino"
 msgid "Destination zone"
 msgstr "Zona de destino"
 
-msgid "Device"
-msgstr "Dispositivo"
+msgid "Discard forward"
+msgstr ""
+
+msgid "Discard input"
+msgstr ""
 
 msgid "Do not rewrite"
 msgstr ""
 
+msgid "Do not track forward"
+msgstr ""
+
+msgid "Do not track input"
+msgstr ""
+
 msgid "Drop invalid packets"
 msgstr "Descartar pacotes inválidos"
 
@@ -134,22 +142,39 @@ msgstr ""
 msgid "Firewall - Zone Settings"
 msgstr "Firewall - Configurações de Zona"
 
-msgid ""
-"For DNAT, match incoming traffic directed at the given destination ip "
-"address. For SNAT rewrite the source address to the given address."
-msgstr ""
-"Para DNAT, casa com tráfego entrante direcionado para um dado endereço IP de "
-"destino. Para SNAT, reescreve o endereço de origem para um dado endereço."
-
 msgid "Force connection tracking"
 msgstr "Force o rastreamento da conexão"
 
 msgid "Forward"
 msgstr "Encaminhar"
 
+msgid "Forward to %s in %s"
+msgstr ""
+
+msgid "Forward to %s, %s in %s"
+msgstr ""
+
+msgid "From %s in %s"
+msgstr ""
+
+msgid "From %s in %s with source %s"
+msgstr ""
+
+msgid "From %s in %s with source %s and %s"
+msgstr ""
+
 msgid "General Settings"
 msgstr "Configurações Gerais"
 
+msgid "IP"
+msgstr ""
+
+msgid "IP range"
+msgstr ""
+
+msgid "IPs"
+msgstr ""
+
 msgid "IPv4"
 msgstr ""
 
@@ -186,6 +211,12 @@ msgstr "Porta interna (opcional)"
 msgid "Limit log messages"
 msgstr "Limita as mensagens de registro"
 
+msgid "MAC"
+msgstr ""
+
+msgid "MACs"
+msgstr ""
+
 msgid "MSS clamping"
 msgstr "Ajuste do MSS"
 
@@ -207,13 +238,6 @@ msgstr ""
 
 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 de origem "
-"específica no computador do cliente"
-
-msgid ""
-"Match incoming traffic originating from the given source port or port range "
 "on the client host."
 msgstr ""
 
@@ -258,27 +282,14 @@ msgstr ""
 msgid "Output"
 msgstr "Saída"
 
-msgid "Overview"
-msgstr "Visão geral"
-
 msgid "Port Forwards"
 msgstr ""
 
-msgid "Port forwarding"
-msgstr "Redirecionamento de portas"
-
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
 msgstr ""
 
-msgid ""
-"Port forwarding allows to provide network services in the internal network "
-"to an external network."
-msgstr ""
-"O redirecionamento de portas permite disponibilizar serviços da rede interna "
-"para uma rede externa."
-
 msgid "Protocol"
 msgstr "Protocolo"
 
@@ -290,11 +301,11 @@ msgstr ""
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "Redireciona tráfego entrante para o computador interno especificado"
 
-msgid "Redirection type"
-msgstr "Tipo de redirecionamento"
+msgid "Refuse forward"
+msgstr ""
 
-msgid "Redirections"
-msgstr "Redirecionamentos"
+msgid "Refuse input"
+msgstr ""
 
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "Restringe o mascaramento para uma subrede de destino específica"
@@ -313,8 +324,11 @@ msgid ""
 "rewrite the IP address."
 msgstr ""
 
-msgid "Rules"
-msgstr "Regras"
+msgid "Rewrite to source %s"
+msgstr ""
+
+msgid "Rewrite to source %s, %s"
+msgstr ""
 
 msgid "SNAT"
 msgstr ""
@@ -398,24 +412,32 @@ msgstr ""
 "<em>Redes Cobertas</em> especificam que redes disponíveis são membros desta "
 "zona."
 
-msgid "To source IP"
+msgid "To %s"
 msgstr ""
 
-msgid "To source port"
+msgid "To %s at %s"
 msgstr ""
 
-msgid "Traffic Redirection"
-msgstr "Redirecionamento de Tráfego"
+msgid "To %s at %s on <var>this device</var>"
+msgstr ""
 
-msgid "Traffic Rules"
+msgid "To %s in %s"
 msgstr ""
 
-msgid ""
-"Traffic redirection allows you to change the destination address of "
-"forwarded packets."
+msgid "To %s on <var>this device</var>"
+msgstr ""
+
+msgid "To %s, %s in %s"
+msgstr ""
+
+msgid "To source IP"
+msgstr ""
+
+msgid "To source port"
+msgstr ""
+
+msgid "Traffic Rules"
 msgstr ""
-"Redirecionamento do tráfego permite a alteração do endereço de destino dos "
-"pacotes encaminhados."
 
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
@@ -446,15 +468,120 @@ msgstr "aceitar"
 msgid "any"
 msgstr "qualquer"
 
+msgid "any host"
+msgstr ""
+
+msgid "any router IP"
+msgstr ""
+
+msgid "any zone"
+msgstr ""
+
+msgid "day"
+msgstr ""
+
 msgid "don't track"
 msgstr ""
 
 msgid "drop"
 msgstr "descartar"
 
+msgid "hour"
+msgstr ""
+
+msgid "minute"
+msgstr ""
+
+msgid "not"
+msgstr ""
+
+msgid "port"
+msgstr ""
+
+msgid "ports"
+msgstr ""
+
 msgid "reject"
 msgstr "rejeitar"
 
+msgid "second"
+msgstr ""
+
+msgid "type"
+msgstr ""
+
+msgid "types"
+msgstr ""
+
+#~ msgid "Advanced Options"
+#~ msgstr "Opções Avançadas"
+
+#~ msgid "Advanced Rules"
+#~ msgstr "Regras Avançadas"
+
+#~ msgid ""
+#~ "Advanced rules let you customize the firewall to your needs. Only new "
+#~ "connections will be matched. Packets belonging to already open "
+#~ "connections are automatically allowed to pass the firewall."
+#~ msgstr ""
+#~ "As regras avançadas permitem a personalização da firewall de acordo com "
+#~ "as necessidades. Apenas as novas conexões serão processadas. Pacotes que "
+#~ "pertençam a conexões já abertas estão automaticamente autorizados a "
+#~ "passar pelo firewall."
+
+#~ msgid "Custom Rules (/etc/firewall.user)"
+#~ msgstr "Regras Personalizadas (/etc/firewall.user)"
+
+#~ msgid "Device"
+#~ msgstr "Dispositivo"
+
+#~ msgid ""
+#~ "For DNAT, match incoming traffic directed at the given destination ip "
+#~ "address. For SNAT rewrite the source address to the given address."
+#~ msgstr ""
+#~ "Para DNAT, casa com tráfego entrante direcionado para um dado endereço IP "
+#~ "de destino. Para SNAT, reescreve o endereço de origem para um dado "
+#~ "endereço."
+
+#~ 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 de "
+#~ "origem específica no computador do cliente"
+
+#~ msgid "Overview"
+#~ msgstr "Visão geral"
+
+#~ msgid "Port forwarding"
+#~ msgstr "Redirecionamento de portas"
+
+#~ msgid ""
+#~ "Port forwarding allows to provide network services in the internal "
+#~ "network to an external network."
+#~ msgstr ""
+#~ "O redirecionamento de portas permite disponibilizar serviços da rede "
+#~ "interna para uma rede externa."
+
+#~ msgid "Redirection type"
+#~ msgstr "Tipo de redirecionamento"
+
+#~ msgid "Redirections"
+#~ msgstr "Redirecionamentos"
+
+#~ msgid "Rules"
+#~ msgstr "Regras"
+
+#~ msgid "Traffic Redirection"
+#~ msgstr "Redirecionamento de Tráfego"
+
+#~ msgid ""
+#~ "Traffic redirection allows you to change the destination address of "
+#~ "forwarded packets."
+#~ msgstr ""
+#~ "Redirecionamento do tráfego permite a alteração do endereço de destino "
+#~ "dos pacotes encaminhados."
+
 #, fuzzy
 #~ msgid "Network"
 #~ msgstr "Redes"
diff --git a/po/ro/firewall.po b/po/ro/firewall.po
index 83c32e681..fc431e13b 100644
--- a/po/ro/firewall.po
+++ b/po/ro/firewall.po
@@ -12,6 +12,9 @@ msgstr ""
 "20)) ? 1 : 2);;\n"
 "X-Generator: Pootle 2.0.4\n"
 
+msgid "%s%s with %s"
+msgstr ""
+
 msgid "(Unnamed Entry)"
 msgstr ""
 
@@ -27,6 +30,21 @@ msgstr ""
 msgid "-- custom --"
 msgstr ""
 
+msgid "<var>%d</var> pkts. per <var>%s</var>"
+msgstr ""
+
+msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
+msgstr ""
+
+msgid "<var>%s</var> and limit to %s"
+msgstr ""
+
+msgid "Accept forward"
+msgstr ""
+
+msgid "Accept input"
+msgstr ""
+
 msgid "Action"
 msgstr "Actiune"
 
@@ -36,24 +54,9 @@ msgstr ""
 msgid "Add and edit..."
 msgstr ""
 
-msgid "Advanced Options"
-msgstr "Optiuni avansate"
-
-msgid "Advanced Rules"
-msgstr "Reguli avansate"
-
 msgid "Advanced Settings"
 msgstr "Setari avansate"
 
-msgid ""
-"Advanced rules let you customize the firewall to your needs. Only new "
-"connections will be matched. Packets belonging to already open connections "
-"are automatically allowed to pass the firewall."
-msgstr ""
-"Regulile avansate iti permit particularizarea firewall-ului dupa nevoi. "
-"Numai conexiunile noi vor fi luate in calcul. Pachetele care apartin unor "
-"conexiuni deja stabilite trec deja prin firewall."
-
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Permite trecerea din <em>zonele sursa</em>."
 
@@ -69,9 +72,6 @@ msgstr "Retele acoperite"
 msgid "Custom Rules"
 msgstr "Reguli suplimentare"
 
-msgid "Custom Rules (/etc/firewall.user)"
-msgstr "Reguli suplimentare (/etc/firewall.user)"
-
 msgid ""
 "Custom rules allow you to execute arbritary iptables commands which are not "
 "otherwise covered by the firewall framework. The commands are executed after "
@@ -93,12 +93,21 @@ msgstr "Portul destinatie"
 msgid "Destination zone"
 msgstr "Zona destinatie"
 
-msgid "Device"
-msgstr "Dispozitiv"
+msgid "Discard forward"
+msgstr ""
+
+msgid "Discard input"
+msgstr ""
 
 msgid "Do not rewrite"
 msgstr ""
 
+msgid "Do not track forward"
+msgstr ""
+
+msgid "Do not track input"
+msgstr ""
+
 msgid "Drop invalid packets"
 msgstr "Descarca pachetele invalide"
 
@@ -132,22 +141,39 @@ msgstr ""
 msgid "Firewall - Zone Settings"
 msgstr "Setari zona la firewall"
 
-msgid ""
-"For DNAT, match incoming traffic directed at the given destination ip "
-"address. For SNAT rewrite the source address to the given address."
-msgstr ""
-"Pentru DNAT, leaga traficul venit redirectat catre destinatia IP. Pentru "
-"SNAT rescrie adresa sursa ca fiind adresa IP."
-
 msgid "Force connection tracking"
 msgstr "Forteaza urmarirea conexiunilor"
 
 msgid "Forward"
 msgstr "Forward"
 
+msgid "Forward to %s in %s"
+msgstr ""
+
+msgid "Forward to %s, %s in %s"
+msgstr ""
+
+msgid "From %s in %s"
+msgstr ""
+
+msgid "From %s in %s with source %s"
+msgstr ""
+
+msgid "From %s in %s with source %s and %s"
+msgstr ""
+
 msgid "General Settings"
 msgstr "Setari generale"
 
+msgid "IP"
+msgstr ""
+
+msgid "IP range"
+msgstr ""
+
+msgid "IPs"
+msgstr ""
+
 msgid "IPv4"
 msgstr ""
 
@@ -184,6 +210,12 @@ msgstr "Port intern (optional)"
 msgid "Limit log messages"
 msgstr "Limiteaza mesaje in log"
 
+msgid "MAC"
+msgstr ""
+
+msgid "MACs"
+msgstr ""
+
 msgid "MSS clamping"
 msgstr "Ajustare MSS"
 
@@ -203,11 +235,6 @@ msgstr ""
 
 msgid ""
 "Match incoming traffic originating from the given source port or port range "
-"on the client host"
-msgstr ""
-
-msgid ""
-"Match incoming traffic originating from the given source port or port range "
 "on the client host."
 msgstr ""
 
@@ -252,25 +279,14 @@ msgstr ""
 msgid "Output"
 msgstr "Output"
 
-msgid "Overview"
-msgstr "Sumar"
-
 msgid "Port Forwards"
 msgstr ""
 
-msgid "Port forwarding"
-msgstr "Forwardare catre port"
-
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
 msgstr ""
 
-msgid ""
-"Port forwarding allows to provide network services in the internal network "
-"to an external network."
-msgstr ""
-
 msgid "Protocol"
 msgstr "Protocol"
 
@@ -281,11 +297,11 @@ msgstr ""
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr ""
 
-msgid "Redirection type"
-msgstr "Tipul de redirectare"
+msgid "Refuse forward"
+msgstr ""
 
-msgid "Redirections"
-msgstr "Redirectari"
+msgid "Refuse input"
+msgstr ""
 
 msgid "Restrict Masquerading to given destination subnets"
 msgstr ""
@@ -304,8 +320,11 @@ msgid ""
 "rewrite the IP address."
 msgstr ""
 
-msgid "Rules"
-msgstr "Reguli"
+msgid "Rewrite to source %s"
+msgstr ""
+
+msgid "Rewrite to source %s, %s"
+msgstr ""
 
 msgid "SNAT"
 msgstr ""
@@ -375,21 +394,31 @@ msgid ""
 "networks</em> specifies which available networks are member of this zone."
 msgstr ""
 
-msgid "To source IP"
+msgid "To %s"
 msgstr ""
 
-msgid "To source port"
+msgid "To %s at %s"
 msgstr ""
 
-msgid "Traffic Redirection"
-msgstr "Redirectarea traficului"
+msgid "To %s at %s on <var>this device</var>"
+msgstr ""
 
-msgid "Traffic Rules"
+msgid "To %s in %s"
 msgstr ""
 
-msgid ""
-"Traffic redirection allows you to change the destination address of "
-"forwarded packets."
+msgid "To %s on <var>this device</var>"
+msgstr ""
+
+msgid "To %s, %s in %s"
+msgstr ""
+
+msgid "To source IP"
+msgstr ""
+
+msgid "To source port"
+msgstr ""
+
+msgid "Traffic Rules"
 msgstr ""
 
 msgid ""
@@ -421,11 +450,93 @@ msgstr "accept"
 msgid "any"
 msgstr "oricare"
 
+msgid "any host"
+msgstr ""
+
+msgid "any router IP"
+msgstr ""
+
+msgid "any zone"
+msgstr ""
+
+msgid "day"
+msgstr ""
+
 msgid "don't track"
 msgstr ""
 
 msgid "drop"
 msgstr ""
 
+msgid "hour"
+msgstr ""
+
+msgid "minute"
+msgstr ""
+
+msgid "not"
+msgstr ""
+
+msgid "port"
+msgstr ""
+
+msgid "ports"
+msgstr ""
+
 msgid "reject"
 msgstr ""
+
+msgid "second"
+msgstr ""
+
+msgid "type"
+msgstr ""
+
+msgid "types"
+msgstr ""
+
+#~ msgid "Advanced Options"
+#~ msgstr "Optiuni avansate"
+
+#~ msgid "Advanced Rules"
+#~ msgstr "Reguli avansate"
+
+#~ msgid ""
+#~ "Advanced rules let you customize the firewall to your needs. Only new "
+#~ "connections will be matched. Packets belonging to already open "
+#~ "connections are automatically allowed to pass the firewall."
+#~ msgstr ""
+#~ "Regulile avansate iti permit particularizarea firewall-ului dupa nevoi. "
+#~ "Numai conexiunile noi vor fi luate in calcul. Pachetele care apartin unor "
+#~ "conexiuni deja stabilite trec deja prin firewall."
+
+#~ msgid "Custom Rules (/etc/firewall.user)"
+#~ msgstr "Reguli suplimentare (/etc/firewall.user)"
+
+#~ msgid "Device"
+#~ msgstr "Dispozitiv"
+
+#~ msgid ""
+#~ "For DNAT, match incoming traffic directed at the given destination ip "
+#~ "address. For SNAT rewrite the source address to the given address."
+#~ msgstr ""
+#~ "Pentru DNAT, leaga traficul venit redirectat catre destinatia IP. Pentru "
+#~ "SNAT rescrie adresa sursa ca fiind adresa IP."
+
+#~ msgid "Overview"
+#~ msgstr "Sumar"
+
+#~ msgid "Port forwarding"
+#~ msgstr "Forwardare catre port"
+
+#~ msgid "Redirection type"
+#~ msgstr "Tipul de redirectare"
+
+#~ msgid "Redirections"
+#~ msgstr "Redirectari"
+
+#~ msgid "Rules"
+#~ msgstr "Reguli"
+
+#~ msgid "Traffic Redirection"
+#~ msgstr "Redirectarea traficului"
diff --git a/po/ru/firewall.po b/po/ru/firewall.po
index fd141a5f9..37399f7aa 100644
--- a/po/ru/firewall.po
+++ b/po/ru/firewall.po
@@ -14,6 +14,9 @@ msgstr ""
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Pootle 2.0.4\n"
 
+msgid "%s%s with %s"
+msgstr ""
+
 msgid "(Unnamed Entry)"
 msgstr ""
 
@@ -29,6 +32,21 @@ msgstr ""
 msgid "-- custom --"
 msgstr ""
 
+msgid "<var>%d</var> pkts. per <var>%s</var>"
+msgstr ""
+
+msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
+msgstr ""
+
+msgid "<var>%s</var> and limit to %s"
+msgstr ""
+
+msgid "Accept forward"
+msgstr ""
+
+msgid "Accept input"
+msgstr ""
+
 msgid "Action"
 msgstr "Действие"
 
@@ -38,25 +56,9 @@ msgstr ""
 msgid "Add and edit..."
 msgstr ""
 
-msgid "Advanced Options"
-msgstr "Расширенные опции"
-
-msgid "Advanced Rules"
-msgstr "Расширенные правила"
-
 msgid "Advanced Settings"
 msgstr "Расширенные настройки"
 
-msgid ""
-"Advanced rules let you customize the firewall to your needs. Only new "
-"connections will be matched. Packets belonging to already open connections "
-"are automatically allowed to pass the firewall."
-msgstr ""
-"Расширенные правила позволяют настроить сетевой экран в соответствии с "
-"вашими потребностями. Только новые соединения будут обработаны. Пакеты, "
-"принадлежащие уже существующим соединениям, будут автоматически пропущены "
-"через сетевой экран."
-
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Разрешить прохождение от <em>зон-источников</em>:"
 
@@ -72,9 +74,6 @@ msgstr "Использовать сети"
 msgid "Custom Rules"
 msgstr "Пользовательские правила"
 
-msgid "Custom Rules (/etc/firewall.user)"
-msgstr "Пользовательские правила (/etc/firewall.user)"
-
 msgid ""
 "Custom rules allow you to execute arbritary iptables commands which are not "
 "otherwise covered by the firewall framework. The commands are executed after "
@@ -96,12 +95,21 @@ msgstr "Порт назначения"
 msgid "Destination zone"
 msgstr "Зона назначения"
 
-msgid "Device"
-msgstr "Устройство"
+msgid "Discard forward"
+msgstr ""
+
+msgid "Discard input"
+msgstr ""
 
 msgid "Do not rewrite"
 msgstr ""
 
+msgid "Do not track forward"
+msgstr ""
+
+msgid "Do not track input"
+msgstr ""
+
 msgid "Drop invalid packets"
 msgstr "Не пропускать некорректные пакеты"
 
@@ -135,22 +143,39 @@ msgstr ""
 msgid "Firewall - Zone Settings"
 msgstr "Межсетевой экран - Настройка зон"
 
-msgid ""
-"For DNAT, match incoming traffic directed at the given destination ip "
-"address. For SNAT rewrite the source address to the given address."
-msgstr ""
-"Для DNAT соответствующий трафик перенаправляется на введенный адрес "
-"назначения. Для SNAT подменяется адрес источника на введенный."
-
 msgid "Force connection tracking"
 msgstr "Включить отслеживание соединений"
 
 msgid "Forward"
 msgstr "Перенаправление"
 
+msgid "Forward to %s in %s"
+msgstr ""
+
+msgid "Forward to %s, %s in %s"
+msgstr ""
+
+msgid "From %s in %s"
+msgstr ""
+
+msgid "From %s in %s with source %s"
+msgstr ""
+
+msgid "From %s in %s with source %s and %s"
+msgstr ""
+
 msgid "General Settings"
 msgstr "Общие настройки"
 
+msgid "IP"
+msgstr ""
+
+msgid "IP range"
+msgstr ""
+
+msgid "IPs"
+msgstr ""
+
 msgid "IPv4"
 msgstr ""
 
@@ -187,6 +212,12 @@ msgstr "Внутренний порт (необязательно)"
 msgid "Limit log messages"
 msgstr "Ограничить журнал сообщений"
 
+msgid "MAC"
+msgstr ""
+
+msgid "MACs"
+msgstr ""
+
 msgid "MSS clamping"
 msgstr "MSS clamping"
 
@@ -208,13 +239,6 @@ msgstr ""
 
 msgid ""
 "Match incoming traffic originating from the given source port or port range "
-"on the client host"
-msgstr ""
-"Выбирать исходящий трафик отправленный с порта или диапазона портов внешнего "
-"хоста"
-
-msgid ""
-"Match incoming traffic originating from the given source port or port range "
 "on the client host."
 msgstr ""
 
@@ -259,27 +283,14 @@ msgstr ""
 msgid "Output"
 msgstr "Исходящий"
 
-msgid "Overview"
-msgstr "Назад к обзору"
-
 msgid "Port Forwards"
 msgstr ""
 
-msgid "Port forwarding"
-msgstr "Перенаправление портов"
-
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
 msgstr ""
 
-msgid ""
-"Port forwarding allows to provide network services in the internal network "
-"to an external network."
-msgstr ""
-"Перенаправление портов позволяет открыть доступ к внутренним службам из "
-"внешней сети."
-
 msgid "Protocol"
 msgstr "Протокол"
 
@@ -290,11 +301,11 @@ msgstr "Перенаправить входящий трафик на указа
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "Перенаправить входящий трафик на указанный хост внутренней сети"
 
-msgid "Redirection type"
-msgstr "Тип перенаправления"
+msgid "Refuse forward"
+msgstr ""
 
-msgid "Redirections"
-msgstr "Перенаправления"
+msgid "Refuse input"
+msgstr ""
 
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "Использовать маскарадинг только для указанных подсетей-получателей"
@@ -313,8 +324,11 @@ msgid ""
 "rewrite the IP address."
 msgstr ""
 
-msgid "Rules"
-msgstr "Правила"
+msgid "Rewrite to source %s"
+msgstr ""
+
+msgid "Rewrite to source %s, %s"
+msgstr ""
 
 msgid "SNAT"
 msgstr ""
@@ -417,24 +431,32 @@ msgstr ""
 "Пункт <em>использовать сети</em> позволяет указать, какие сети являются "
 "частью данной зоны."
 
-msgid "To source IP"
+msgid "To %s"
 msgstr ""
 
-msgid "To source port"
+msgid "To %s at %s"
 msgstr ""
 
-msgid "Traffic Redirection"
-msgstr "Перенаправление трафика"
+msgid "To %s at %s on <var>this device</var>"
+msgstr ""
 
-msgid "Traffic Rules"
+msgid "To %s in %s"
 msgstr ""
 
-msgid ""
-"Traffic redirection allows you to change the destination address of "
-"forwarded packets."
+msgid "To %s on <var>this device</var>"
+msgstr ""
+
+msgid "To %s, %s in %s"
+msgstr ""
+
+msgid "To source IP"
+msgstr ""
+
+msgid "To source port"
+msgstr ""
+
+msgid "Traffic Rules"
 msgstr ""
-"Перенаправление трафика позволяет изменить адрес получателя для проходящих "
-"пакетов."
 
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
@@ -465,11 +487,115 @@ msgstr "принимать"
 msgid "any"
 msgstr "любой"
 
+msgid "any host"
+msgstr ""
+
+msgid "any router IP"
+msgstr ""
+
+msgid "any zone"
+msgstr ""
+
+msgid "day"
+msgstr ""
+
 msgid "don't track"
 msgstr ""
 
 msgid "drop"
 msgstr "не обрабатывать"
 
+msgid "hour"
+msgstr ""
+
+msgid "minute"
+msgstr ""
+
+msgid "not"
+msgstr ""
+
+msgid "port"
+msgstr ""
+
+msgid "ports"
+msgstr ""
+
 msgid "reject"
 msgstr "отвергать"
+
+msgid "second"
+msgstr ""
+
+msgid "type"
+msgstr ""
+
+msgid "types"
+msgstr ""
+
+#~ msgid "Advanced Options"
+#~ msgstr "Расширенные опции"
+
+#~ msgid "Advanced Rules"
+#~ msgstr "Расширенные правила"
+
+#~ msgid ""
+#~ "Advanced rules let you customize the firewall to your needs. Only new "
+#~ "connections will be matched. Packets belonging to already open "
+#~ "connections are automatically allowed to pass the firewall."
+#~ msgstr ""
+#~ "Расширенные правила позволяют настроить сетевой экран в соответствии с "
+#~ "вашими потребностями. Только новые соединения будут обработаны. Пакеты, "
+#~ "принадлежащие уже существующим соединениям, будут автоматически пропущены "
+#~ "через сетевой экран."
+
+#~ msgid "Custom Rules (/etc/firewall.user)"
+#~ msgstr "Пользовательские правила (/etc/firewall.user)"
+
+#~ msgid "Device"
+#~ msgstr "Устройство"
+
+#~ msgid ""
+#~ "For DNAT, match incoming traffic directed at the given destination ip "
+#~ "address. For SNAT rewrite the source address to the given address."
+#~ msgstr ""
+#~ "Для DNAT соответствующий трафик перенаправляется на введенный адрес "
+#~ "назначения. Для SNAT подменяется адрес источника на введенный."
+
+#~ msgid ""
+#~ "Match incoming traffic originating from the given source port or port "
+#~ "range on the client host"
+#~ msgstr ""
+#~ "Выбирать исходящий трафик отправленный с порта или диапазона портов "
+#~ "внешнего хоста"
+
+#~ msgid "Overview"
+#~ msgstr "Назад к обзору"
+
+#~ msgid "Port forwarding"
+#~ msgstr "Перенаправление портов"
+
+#~ msgid ""
+#~ "Port forwarding allows to provide network services in the internal "
+#~ "network to an external network."
+#~ msgstr ""
+#~ "Перенаправление портов позволяет открыть доступ к внутренним службам из "
+#~ "внешней сети."
+
+#~ msgid "Redirection type"
+#~ msgstr "Тип перенаправления"
+
+#~ msgid "Redirections"
+#~ msgstr "Перенаправления"
+
+#~ msgid "Rules"
+#~ msgstr "Правила"
+
+#~ msgid "Traffic Redirection"
+#~ msgstr "Перенаправление трафика"
+
+#~ msgid ""
+#~ "Traffic redirection allows you to change the destination address of "
+#~ "forwarded packets."
+#~ msgstr ""
+#~ "Перенаправление трафика позволяет изменить адрес получателя для "
+#~ "проходящих пакетов."
diff --git a/po/templates/firewall.pot b/po/templates/firewall.pot
index aa3ec9746..b2430efda 100644
--- a/po/templates/firewall.pot
+++ b/po/templates/firewall.pot
@@ -1,6 +1,9 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=UTF-8"
 
+msgid "%s%s with %s"
+msgstr ""
+
 msgid "(Unnamed Entry)"
 msgstr ""
 
@@ -16,28 +19,31 @@ msgstr ""
 msgid "-- custom --"
 msgstr ""
 
-msgid "Action"
+msgid "<var>%d</var> pkts. per <var>%s</var>"
 msgstr ""
 
-msgid "Add"
+msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr ""
 
-msgid "Add and edit..."
+msgid "<var>%s</var> and limit to %s"
 msgstr ""
 
-msgid "Advanced Options"
+msgid "Accept forward"
 msgstr ""
 
-msgid "Advanced Rules"
+msgid "Accept input"
 msgstr ""
 
-msgid "Advanced Settings"
+msgid "Action"
 msgstr ""
 
-msgid ""
-"Advanced rules let you customize the firewall to your needs. Only new "
-"connections will be matched. Packets belonging to already open connections "
-"are automatically allowed to pass the firewall."
+msgid "Add"
+msgstr ""
+
+msgid "Add and edit..."
+msgstr ""
+
+msgid "Advanced Settings"
 msgstr ""
 
 msgid "Allow forward from <em>source zones</em>:"
@@ -55,9 +61,6 @@ msgstr ""
 msgid "Custom Rules"
 msgstr ""
 
-msgid "Custom Rules (/etc/firewall.user)"
-msgstr ""
-
 msgid ""
 "Custom rules allow you to execute arbritary iptables commands which are not "
 "otherwise covered by the firewall framework. The commands are executed after "
@@ -79,12 +82,21 @@ msgstr ""
 msgid "Destination zone"
 msgstr ""
 
-msgid "Device"
+msgid "Discard forward"
+msgstr ""
+
+msgid "Discard input"
 msgstr ""
 
 msgid "Do not rewrite"
 msgstr ""
 
+msgid "Do not track forward"
+msgstr ""
+
+msgid "Do not track input"
+msgstr ""
+
 msgid "Drop invalid packets"
 msgstr ""
 
@@ -118,20 +130,39 @@ msgstr ""
 msgid "Firewall - Zone Settings"
 msgstr ""
 
-msgid ""
-"For DNAT, match incoming traffic directed at the given destination ip "
-"address. For SNAT rewrite the source address to the given address."
-msgstr ""
-
 msgid "Force connection tracking"
 msgstr ""
 
 msgid "Forward"
 msgstr ""
 
+msgid "Forward to %s in %s"
+msgstr ""
+
+msgid "Forward to %s, %s in %s"
+msgstr ""
+
+msgid "From %s in %s"
+msgstr ""
+
+msgid "From %s in %s with source %s"
+msgstr ""
+
+msgid "From %s in %s with source %s and %s"
+msgstr ""
+
 msgid "General Settings"
 msgstr ""
 
+msgid "IP"
+msgstr ""
+
+msgid "IP range"
+msgstr ""
+
+msgid "IPs"
+msgstr ""
+
 msgid "IPv4"
 msgstr ""
 
@@ -168,6 +199,12 @@ msgstr ""
 msgid "Limit log messages"
 msgstr ""
 
+msgid "MAC"
+msgstr ""
+
+msgid "MACs"
+msgstr ""
+
 msgid "MSS clamping"
 msgstr ""
 
@@ -187,11 +224,6 @@ msgstr ""
 
 msgid ""
 "Match incoming traffic originating from the given source port or port range "
-"on the client host"
-msgstr ""
-
-msgid ""
-"Match incoming traffic originating from the given source port or port range "
 "on the client host."
 msgstr ""
 
@@ -236,25 +268,14 @@ msgstr ""
 msgid "Output"
 msgstr ""
 
-msgid "Overview"
-msgstr ""
-
 msgid "Port Forwards"
 msgstr ""
 
-msgid "Port forwarding"
-msgstr ""
-
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
 msgstr ""
 
-msgid ""
-"Port forwarding allows to provide network services in the internal network "
-"to an external network."
-msgstr ""
-
 msgid "Protocol"
 msgstr ""
 
@@ -265,10 +286,10 @@ msgstr ""
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr ""
 
-msgid "Redirection type"
+msgid "Refuse forward"
 msgstr ""
 
-msgid "Redirections"
+msgid "Refuse input"
 msgstr ""
 
 msgid "Restrict Masquerading to given destination subnets"
@@ -288,7 +309,10 @@ msgid ""
 "rewrite the IP address."
 msgstr ""
 
-msgid "Rules"
+msgid "Rewrite to source %s"
+msgstr ""
+
+msgid "Rewrite to source %s, %s"
 msgstr ""
 
 msgid "SNAT"
@@ -359,21 +383,31 @@ msgid ""
 "networks</em> specifies which available networks are member of this zone."
 msgstr ""
 
-msgid "To source IP"
+msgid "To %s"
 msgstr ""
 
-msgid "To source port"
+msgid "To %s at %s"
 msgstr ""
 
-msgid "Traffic Redirection"
+msgid "To %s at %s on <var>this device</var>"
 msgstr ""
 
-msgid "Traffic Rules"
+msgid "To %s in %s"
 msgstr ""
 
-msgid ""
-"Traffic redirection allows you to change the destination address of "
-"forwarded packets."
+msgid "To %s on <var>this device</var>"
+msgstr ""
+
+msgid "To %s, %s in %s"
+msgstr ""
+
+msgid "To source IP"
+msgstr ""
+
+msgid "To source port"
+msgstr ""
+
+msgid "Traffic Rules"
 msgstr ""
 
 msgid ""
@@ -405,11 +439,47 @@ msgstr ""
 msgid "any"
 msgstr ""
 
+msgid "any host"
+msgstr ""
+
+msgid "any router IP"
+msgstr ""
+
+msgid "any zone"
+msgstr ""
+
+msgid "day"
+msgstr ""
+
 msgid "don't track"
 msgstr ""
 
 msgid "drop"
 msgstr ""
 
+msgid "hour"
+msgstr ""
+
+msgid "minute"
+msgstr ""
+
+msgid "not"
+msgstr ""
+
+msgid "port"
+msgstr ""
+
+msgid "ports"
+msgstr ""
+
 msgid "reject"
 msgstr ""
+
+msgid "second"
+msgstr ""
+
+msgid "type"
+msgstr ""
+
+msgid "types"
+msgstr ""
diff --git a/po/uk/firewall.po b/po/uk/firewall.po
index a511e12a2..0a16ae8e4 100644
--- a/po/uk/firewall.po
+++ b/po/uk/firewall.po
@@ -12,6 +12,9 @@ msgstr ""
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Pootle 2.0.4\n"
 
+msgid "%s%s with %s"
+msgstr ""
+
 msgid "(Unnamed Entry)"
 msgstr ""
 
@@ -27,6 +30,21 @@ msgstr ""
 msgid "-- custom --"
 msgstr ""
 
+msgid "<var>%d</var> pkts. per <var>%s</var>"
+msgstr ""
+
+msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
+msgstr ""
+
+msgid "<var>%s</var> and limit to %s"
+msgstr ""
+
+msgid "Accept forward"
+msgstr ""
+
+msgid "Accept input"
+msgstr ""
+
 msgid "Action"
 msgstr "Дія"
 
@@ -36,24 +54,9 @@ msgstr ""
 msgid "Add and edit..."
 msgstr ""
 
-msgid "Advanced Options"
-msgstr "Додаткові параметри"
-
-msgid "Advanced Rules"
-msgstr "Розширені правила"
-
 msgid "Advanced Settings"
 msgstr "Розширені налаштування"
 
-msgid ""
-"Advanced rules let you customize the firewall to your needs. Only new "
-"connections will be matched. Packets belonging to already open connections "
-"are automatically allowed to pass the firewall."
-msgstr ""
-"Розширені правила дозволяють налаштувати брандмауер для ваших потреб. Лише "
-"нові з'єднання будуть узгоджені. Пакети, що належать вже відкриті з'єднання "
-"автоматично пропускаються брандмауером."
-
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "Дозволити проходження від <em>зон джерел</em>:"
 
@@ -69,9 +72,6 @@ msgstr "Покриті мережі"
 msgid "Custom Rules"
 msgstr "Користувацькі правила"
 
-msgid "Custom Rules (/etc/firewall.user)"
-msgstr "Користувацькі правила (/etc/firewall.user)"
-
 msgid ""
 "Custom rules allow you to execute arbritary iptables commands which are not "
 "otherwise covered by the firewall framework. The commands are executed after "
@@ -93,12 +93,21 @@ msgstr "Порт призначення"
 msgid "Destination zone"
 msgstr "Зона призначення"
 
-msgid "Device"
-msgstr "Пристрій"
+msgid "Discard forward"
+msgstr ""
+
+msgid "Discard input"
+msgstr ""
 
 msgid "Do not rewrite"
 msgstr ""
 
+msgid "Do not track forward"
+msgstr ""
+
+msgid "Do not track input"
+msgstr ""
+
 msgid "Drop invalid packets"
 msgstr "Відкидати помилкові пакети"
 
@@ -132,22 +141,39 @@ msgstr ""
 msgid "Firewall - Zone Settings"
 msgstr "Брандмауер - Налаштування Зон"
 
-msgid ""
-"For DNAT, match incoming traffic directed at the given destination ip "
-"address. For SNAT rewrite the source address to the given address."
-msgstr ""
-"Для DNAT узгоджує вхідний трафік, спрямований до відповідної IP адреси "
-"призначення. Для SNAT заміняє адресу джерела на дану адресу"
-
 msgid "Force connection tracking"
 msgstr "Ввімкнути відстеження з'єднань"
 
 msgid "Forward"
 msgstr "Перенаправлення"
 
+msgid "Forward to %s in %s"
+msgstr ""
+
+msgid "Forward to %s, %s in %s"
+msgstr ""
+
+msgid "From %s in %s"
+msgstr ""
+
+msgid "From %s in %s with source %s"
+msgstr ""
+
+msgid "From %s in %s with source %s and %s"
+msgstr ""
+
 msgid "General Settings"
 msgstr "Загальні налаштування"
 
+msgid "IP"
+msgstr ""
+
+msgid "IP range"
+msgstr ""
+
+msgid "IPs"
+msgstr ""
+
 msgid "IPv4"
 msgstr ""
 
@@ -184,6 +210,12 @@ msgstr "Внутрішній порт (необов'язково)"
 msgid "Limit log messages"
 msgstr "Обмежити журнал повідомлень"
 
+msgid "MAC"
+msgstr ""
+
+msgid "MACs"
+msgstr ""
+
 msgid "MSS clamping"
 msgstr "MSS clamping"
 
@@ -203,11 +235,6 @@ msgstr ""
 
 msgid ""
 "Match incoming traffic originating from the given source port or port range "
-"on the client host"
-msgstr ""
-
-msgid ""
-"Match incoming traffic originating from the given source port or port range "
 "on the client host."
 msgstr ""
 
@@ -252,25 +279,14 @@ msgstr ""
 msgid "Output"
 msgstr ""
 
-msgid "Overview"
-msgstr ""
-
 msgid "Port Forwards"
 msgstr ""
 
-msgid "Port forwarding"
-msgstr ""
-
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
 msgstr ""
 
-msgid ""
-"Port forwarding allows to provide network services in the internal network "
-"to an external network."
-msgstr ""
-
 msgid "Protocol"
 msgstr ""
 
@@ -281,10 +297,10 @@ msgstr ""
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr ""
 
-msgid "Redirection type"
+msgid "Refuse forward"
 msgstr ""
 
-msgid "Redirections"
+msgid "Refuse input"
 msgstr ""
 
 msgid "Restrict Masquerading to given destination subnets"
@@ -304,7 +320,10 @@ msgid ""
 "rewrite the IP address."
 msgstr ""
 
-msgid "Rules"
+msgid "Rewrite to source %s"
+msgstr ""
+
+msgid "Rewrite to source %s, %s"
 msgstr ""
 
 msgid "SNAT"
@@ -375,21 +394,31 @@ msgid ""
 "networks</em> specifies which available networks are member of this zone."
 msgstr ""
 
-msgid "To source IP"
+msgid "To %s"
 msgstr ""
 
-msgid "To source port"
+msgid "To %s at %s"
 msgstr ""
 
-msgid "Traffic Redirection"
+msgid "To %s at %s on <var>this device</var>"
 msgstr ""
 
-msgid "Traffic Rules"
+msgid "To %s in %s"
 msgstr ""
 
-msgid ""
-"Traffic redirection allows you to change the destination address of "
-"forwarded packets."
+msgid "To %s on <var>this device</var>"
+msgstr ""
+
+msgid "To %s, %s in %s"
+msgstr ""
+
+msgid "To source IP"
+msgstr ""
+
+msgid "To source port"
+msgstr ""
+
+msgid "Traffic Rules"
 msgstr ""
 
 msgid ""
@@ -421,11 +450,75 @@ msgstr ""
 msgid "any"
 msgstr ""
 
+msgid "any host"
+msgstr ""
+
+msgid "any router IP"
+msgstr ""
+
+msgid "any zone"
+msgstr ""
+
+msgid "day"
+msgstr ""
+
 msgid "don't track"
 msgstr ""
 
 msgid "drop"
 msgstr ""
 
+msgid "hour"
+msgstr ""
+
+msgid "minute"
+msgstr ""
+
+msgid "not"
+msgstr ""
+
+msgid "port"
+msgstr ""
+
+msgid "ports"
+msgstr ""
+
 msgid "reject"
 msgstr ""
+
+msgid "second"
+msgstr ""
+
+msgid "type"
+msgstr ""
+
+msgid "types"
+msgstr ""
+
+#~ msgid "Advanced Options"
+#~ msgstr "Додаткові параметри"
+
+#~ msgid "Advanced Rules"
+#~ msgstr "Розширені правила"
+
+#~ msgid ""
+#~ "Advanced rules let you customize the firewall to your needs. Only new "
+#~ "connections will be matched. Packets belonging to already open "
+#~ "connections are automatically allowed to pass the firewall."
+#~ msgstr ""
+#~ "Розширені правила дозволяють налаштувати брандмауер для ваших потреб. "
+#~ "Лише нові з'єднання будуть узгоджені. Пакети, що належать вже відкриті "
+#~ "з'єднання автоматично пропускаються брандмауером."
+
+#~ msgid "Custom Rules (/etc/firewall.user)"
+#~ msgstr "Користувацькі правила (/etc/firewall.user)"
+
+#~ msgid "Device"
+#~ msgstr "Пристрій"
+
+#~ msgid ""
+#~ "For DNAT, match incoming traffic directed at the given destination ip "
+#~ "address. For SNAT rewrite the source address to the given address."
+#~ msgstr ""
+#~ "Для DNAT узгоджує вхідний трафік, спрямований до відповідної IP адреси "
+#~ "призначення. Для SNAT заміняє адресу джерела на дану адресу"
diff --git a/po/vi/firewall.po b/po/vi/firewall.po
index 3110bdf2e..dfee68669 100644
--- a/po/vi/firewall.po
+++ b/po/vi/firewall.po
@@ -13,6 +13,9 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
+msgid "%s%s with %s"
+msgstr ""
+
 msgid "(Unnamed Entry)"
 msgstr ""
 
@@ -28,32 +31,32 @@ msgstr ""
 msgid "-- custom --"
 msgstr ""
 
-msgid "Action"
-msgstr "Action"
+msgid "<var>%d</var> pkts. per <var>%s</var>"
+msgstr ""
 
-msgid "Add"
+msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
 msgstr ""
 
-msgid "Add and edit..."
+msgid "<var>%s</var> and limit to %s"
 msgstr ""
 
-msgid "Advanced Options"
+msgid "Accept forward"
 msgstr ""
 
-msgid "Advanced Rules"
-msgstr "Luật cấp cao"
+msgid "Accept input"
+msgstr ""
 
-msgid "Advanced Settings"
+msgid "Action"
+msgstr "Action"
+
+msgid "Add"
 msgstr ""
 
-msgid ""
-"Advanced rules let you customize the firewall to your needs. Only new "
-"connections will be matched. Packets belonging to already open connections "
-"are automatically allowed to pass the firewall."
+msgid "Add and edit..."
+msgstr ""
+
+msgid "Advanced Settings"
 msgstr ""
-"Luật cấp cao để bạn tùy chỉnh firewall mà bạn cần. Chỉ những kết nối mới sẽ "
-"được làm cho phù hợp. Các gói thuộc đã mở các kết nối sẽ tự động cho phép "
-"vượt qua firewall."
 
 msgid "Allow forward from <em>source zones</em>:"
 msgstr ""
@@ -70,9 +73,6 @@ msgstr ""
 msgid "Custom Rules"
 msgstr ""
 
-msgid "Custom Rules (/etc/firewall.user)"
-msgstr ""
-
 msgid ""
 "Custom rules allow you to execute arbritary iptables commands which are not "
 "otherwise covered by the firewall framework. The commands are executed after "
@@ -95,12 +95,21 @@ msgstr "Cổng điểm đến"
 msgid "Destination zone"
 msgstr "Điểm đến"
 
-msgid "Device"
+msgid "Discard forward"
+msgstr ""
+
+msgid "Discard input"
 msgstr ""
 
 msgid "Do not rewrite"
 msgstr ""
 
+msgid "Do not track forward"
+msgstr ""
+
+msgid "Do not track input"
+msgstr ""
+
 msgid "Drop invalid packets"
 msgstr "Bỏ qua nhưng gói không hợp lý"
 
@@ -135,20 +144,39 @@ msgstr ""
 msgid "Firewall - Zone Settings"
 msgstr ""
 
-msgid ""
-"For DNAT, match incoming traffic directed at the given destination ip "
-"address. For SNAT rewrite the source address to the given address."
-msgstr ""
-
 msgid "Force connection tracking"
 msgstr ""
 
 msgid "Forward"
 msgstr ""
 
+msgid "Forward to %s in %s"
+msgstr ""
+
+msgid "Forward to %s, %s in %s"
+msgstr ""
+
+msgid "From %s in %s"
+msgstr ""
+
+msgid "From %s in %s with source %s"
+msgstr ""
+
+msgid "From %s in %s with source %s and %s"
+msgstr ""
+
 msgid "General Settings"
 msgstr ""
 
+msgid "IP"
+msgstr ""
+
+msgid "IP range"
+msgstr ""
+
+msgid "IPs"
+msgstr ""
+
 msgid "IPv4"
 msgstr ""
 
@@ -187,6 +215,12 @@ msgstr "Internal port (tùy chọn)"
 msgid "Limit log messages"
 msgstr ""
 
+msgid "MAC"
+msgstr ""
+
+msgid "MACs"
+msgstr ""
+
 #, fuzzy
 msgid "MSS clamping"
 msgstr "MSS Clamping"
@@ -207,11 +241,6 @@ msgstr ""
 
 msgid ""
 "Match incoming traffic originating from the given source port or port range "
-"on the client host"
-msgstr ""
-
-msgid ""
-"Match incoming traffic originating from the given source port or port range "
 "on the client host."
 msgstr ""
 
@@ -256,27 +285,14 @@ msgstr ""
 msgid "Output"
 msgstr "Output"
 
-msgid "Overview"
-msgstr ""
-
 msgid "Port Forwards"
 msgstr ""
 
-msgid "Port forwarding"
-msgstr "Cổng chuyển tiếp"
-
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
 msgstr ""
 
-msgid ""
-"Port forwarding allows to provide network services in the internal network "
-"to an external network."
-msgstr ""
-"Cổng chuyển tiếp cho phép cung cấp những dịch vụ mạng trong vùng tới một "
-"ngoại mạng. "
-
 msgid "Protocol"
 msgstr ""
 
@@ -287,10 +303,10 @@ msgstr ""
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr ""
 
-msgid "Redirection type"
+msgid "Refuse forward"
 msgstr ""
 
-msgid "Redirections"
+msgid "Refuse input"
 msgstr ""
 
 msgid "Restrict Masquerading to given destination subnets"
@@ -310,7 +326,10 @@ msgid ""
 "rewrite the IP address."
 msgstr ""
 
-msgid "Rules"
+msgid "Rewrite to source %s"
+msgstr ""
+
+msgid "Rewrite to source %s, %s"
 msgstr ""
 
 msgid "SNAT"
@@ -386,24 +405,32 @@ msgid ""
 "networks</em> specifies which available networks are member of this zone."
 msgstr ""
 
-msgid "To source IP"
+msgid "To %s"
 msgstr ""
 
-msgid "To source port"
+msgid "To %s at %s"
+msgstr ""
+
+msgid "To %s at %s on <var>this device</var>"
 msgstr ""
 
-msgid "Traffic Redirection"
-msgstr "Sự chuyển hướng lưu thông"
+msgid "To %s in %s"
+msgstr ""
 
-msgid "Traffic Rules"
+msgid "To %s on <var>this device</var>"
 msgstr ""
 
-msgid ""
-"Traffic redirection allows you to change the destination address of "
-"forwarded packets."
+msgid "To %s, %s in %s"
+msgstr ""
+
+msgid "To source IP"
+msgstr ""
+
+msgid "To source port"
+msgstr ""
+
+msgid "Traffic Rules"
 msgstr ""
-"Sự chuyển hướng lưu thông cho phép bạn thay đổi địa chỉ điểm đến của gói "
-"chuyển tiếp. "
 
 msgid ""
 "Traffic rules define policies for packets traveling between different zones, "
@@ -434,15 +461,83 @@ msgstr "chấp nhận"
 msgid "any"
 msgstr ""
 
+msgid "any host"
+msgstr ""
+
+msgid "any router IP"
+msgstr ""
+
+msgid "any zone"
+msgstr ""
+
+msgid "day"
+msgstr ""
+
 msgid "don't track"
 msgstr ""
 
 msgid "drop"
 msgstr "drop"
 
+msgid "hour"
+msgstr ""
+
+msgid "minute"
+msgstr ""
+
+msgid "not"
+msgstr ""
+
+msgid "port"
+msgstr ""
+
+msgid "ports"
+msgstr ""
+
 msgid "reject"
 msgstr "Không chấp nhận"
 
+msgid "second"
+msgstr ""
+
+msgid "type"
+msgstr ""
+
+msgid "types"
+msgstr ""
+
+#~ msgid "Advanced Rules"
+#~ msgstr "Luật cấp cao"
+
+#~ msgid ""
+#~ "Advanced rules let you customize the firewall to your needs. Only new "
+#~ "connections will be matched. Packets belonging to already open "
+#~ "connections are automatically allowed to pass the firewall."
+#~ msgstr ""
+#~ "Luật cấp cao để bạn tùy chỉnh firewall mà bạn cần. Chỉ những kết nối mới "
+#~ "sẽ được làm cho phù hợp. Các gói thuộc đã mở các kết nối sẽ tự động cho "
+#~ "phép vượt qua firewall."
+
+#~ msgid "Port forwarding"
+#~ msgstr "Cổng chuyển tiếp"
+
+#~ msgid ""
+#~ "Port forwarding allows to provide network services in the internal "
+#~ "network to an external network."
+#~ msgstr ""
+#~ "Cổng chuyển tiếp cho phép cung cấp những dịch vụ mạng trong vùng tới một "
+#~ "ngoại mạng. "
+
+#~ msgid "Traffic Redirection"
+#~ msgstr "Sự chuyển hướng lưu thông"
+
+#~ msgid ""
+#~ "Traffic redirection allows you to change the destination address of "
+#~ "forwarded packets."
+#~ msgstr ""
+#~ "Sự chuyển hướng lưu thông cho phép bạn thay đổi địa chỉ điểm đến của gói "
+#~ "chuyển tiếp. "
+
 #, fuzzy
 #~ msgid "Network"
 #~ msgstr "Networks"
diff --git a/po/zh_CN/firewall.po b/po/zh_CN/firewall.po
index 2900d2293..36ee4e725 100644
--- a/po/zh_CN/firewall.po
+++ b/po/zh_CN/firewall.po
@@ -13,6 +13,9 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Pootle 2.0.4\n"
 
+msgid "%s%s with %s"
+msgstr ""
+
 msgid "(Unnamed Entry)"
 msgstr ""
 
@@ -28,6 +31,21 @@ msgstr ""
 msgid "-- custom --"
 msgstr ""
 
+msgid "<var>%d</var> pkts. per <var>%s</var>"
+msgstr ""
+
+msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
+msgstr ""
+
+msgid "<var>%s</var> and limit to %s"
+msgstr ""
+
+msgid "Accept forward"
+msgstr ""
+
+msgid "Accept input"
+msgstr ""
+
 msgid "Action"
 msgstr "动作"
 
@@ -37,23 +55,9 @@ msgstr ""
 msgid "Add and edit..."
 msgstr ""
 
-msgid "Advanced Options"
-msgstr "高级选项"
-
-msgid "Advanced Rules"
-msgstr "高级规则"
-
 msgid "Advanced Settings"
 msgstr "高级设置"
 
-msgid ""
-"Advanced rules let you customize the firewall to your needs. Only new "
-"connections will be matched. Packets belonging to already open connections "
-"are automatically allowed to pass the firewall."
-msgstr ""
-"高级规则允许按需定制防火墙。此规则只限制新建立的连接，对于已建立链路的数据包"
-"会自动允许通过。"
-
 msgid "Allow forward from <em>source zones</em>:"
 msgstr "允许从<em>source zones</em>转发"
 
@@ -69,9 +73,6 @@ msgstr "覆盖网络"
 msgid "Custom Rules"
 msgstr "自定义规则"
 
-msgid "Custom Rules (/etc/firewall.user)"
-msgstr "自定义规则(/etc/firewall.user)"
-
 msgid ""
 "Custom rules allow you to execute arbritary iptables commands which are not "
 "otherwise covered by the firewall framework. The commands are executed after "
@@ -93,12 +94,21 @@ msgstr "目标端口"
 msgid "Destination zone"
 msgstr "目标区域"
 
-msgid "Device"
-msgstr "设备"
+msgid "Discard forward"
+msgstr ""
+
+msgid "Discard input"
+msgstr ""
 
 msgid "Do not rewrite"
 msgstr ""
 
+msgid "Do not track forward"
+msgstr ""
+
+msgid "Do not track input"
+msgstr ""
+
 msgid "Drop invalid packets"
 msgstr "丢弃无效数据包"
 
@@ -132,20 +142,39 @@ msgstr ""
 msgid "Firewall - Zone Settings"
 msgstr "防火墙-区域设置"
 
-msgid ""
-"For DNAT, match incoming traffic directed at the given destination ip "
-"address. For SNAT rewrite the source address to the given address."
-msgstr "DNAT：将目标地址转换为指定的IP地址；SNAT：将源地址转换为指定的IP地址。"
-
 msgid "Force connection tracking"
 msgstr "强制连接追踪"
 
 msgid "Forward"
 msgstr "转发"
 
+msgid "Forward to %s in %s"
+msgstr ""
+
+msgid "Forward to %s, %s in %s"
+msgstr ""
+
+msgid "From %s in %s"
+msgstr ""
+
+msgid "From %s in %s with source %s"
+msgstr ""
+
+msgid "From %s in %s with source %s and %s"
+msgstr ""
+
 msgid "General Settings"
 msgstr "标准设置"
 
+msgid "IP"
+msgstr ""
+
+msgid "IP range"
+msgstr ""
+
+msgid "IPs"
+msgstr ""
+
 msgid "IPv4"
 msgstr ""
 
@@ -182,6 +211,12 @@ msgstr "内部端口（可选）"
 msgid "Limit log messages"
 msgstr "限制登陆信息"
 
+msgid "MAC"
+msgstr ""
+
+msgid "MACs"
+msgstr ""
+
 msgid "MSS clamping"
 msgstr "MSS钳制"
 
@@ -201,11 +236,6 @@ msgstr "在这个主机上，匹配输入的信息指向给定的端口或者范
 
 msgid ""
 "Match incoming traffic originating from the given source port or port range "
-"on the client host"
-msgstr "在客户端上，比较输入通道与给定的源端口是否一致。"
-
-msgid ""
-"Match incoming traffic originating from the given source port or port range "
 "on the client host."
 msgstr ""
 
@@ -250,25 +280,14 @@ msgstr ""
 msgid "Output"
 msgstr "出（路由器）"
 
-msgid "Overview"
-msgstr "概览"
-
 msgid "Port Forwards"
 msgstr ""
 
-msgid "Port forwarding"
-msgstr "端口转发"
-
 msgid ""
 "Port forwarding allows remote computers on the Internet to connect to a "
 "specific computer or service within the private LAN."
 msgstr ""
 
-msgid ""
-"Port forwarding allows to provide network services in the internal network "
-"to an external network."
-msgstr "端口转发-允许外部网络访问内部网络"
-
 msgid "Protocol"
 msgstr "协议"
 
@@ -279,11 +298,11 @@ msgstr "重定向匹配到的入站流量至内部主机的指定端口"
 msgid "Redirect matched incoming traffic to the specified internal host"
 msgstr "重定向匹配到的入站流量至选定的内部主机"
 
-msgid "Redirection type"
-msgstr "重定向类型"
+msgid "Refuse forward"
+msgstr ""
 
-msgid "Redirections"
-msgstr "重定向"
+msgid "Refuse input"
+msgstr ""
 
 msgid "Restrict Masquerading to given destination subnets"
 msgstr "限制访问指定的目标子网"
@@ -302,8 +321,11 @@ msgid ""
 "rewrite the IP address."
 msgstr ""
 
-msgid "Rules"
-msgstr "规则"
+msgid "Rewrite to source %s"
+msgstr ""
+
+msgid "Rewrite to source %s, %s"
+msgstr ""
 
 msgid "SNAT"
 msgstr ""
@@ -407,24 +429,34 @@ msgstr ""
 "（一个或多个）区域的不同子网之间的数据包转发而<em>Covered networks</em>是从属"
 "于这个区域的一个网络地址集合。"
 
+msgid "To %s"
+msgstr ""
+
+msgid "To %s at %s"
+msgstr ""
+
+msgid "To %s at %s on <var>this device</var>"
+msgstr ""
+
+msgid "To %s in %s"
+msgstr ""
+
+msgid "To %s on <var>this device</var>"
+msgstr ""
+
+msgid "To %s, %s in %s"
+msgstr ""
+
 msgid "To source IP"
 msgstr ""
 
 msgid "To source port"
 msgstr ""
 
-msgid "Traffic Redirection"
-msgstr "流量重定向"
-
 msgid "Traffic Rules"
 msgstr ""
 
 msgid ""
-"Traffic redirection allows you to change the destination address of "
-"forwarded packets."
-msgstr "流量重定向允许你修改数据包转发地址"
-
-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."
@@ -453,15 +485,110 @@ msgstr "接受"
 msgid "any"
 msgstr "任何"
 
+msgid "any host"
+msgstr ""
+
+msgid "any router IP"
+msgstr ""
+
+msgid "any zone"
+msgstr ""
+
+msgid "day"
+msgstr ""
+
 msgid "don't track"
 msgstr ""
 
 msgid "drop"
 msgstr "丢弃"
 
+msgid "hour"
+msgstr ""
+
+msgid "minute"
+msgstr ""
+
+msgid "not"
+msgstr ""
+
+msgid "port"
+msgstr ""
+
+msgid "ports"
+msgstr ""
+
 msgid "reject"
 msgstr "拒绝"
 
+msgid "second"
+msgstr ""
+
+msgid "type"
+msgstr ""
+
+msgid "types"
+msgstr ""
+
+#~ msgid "Advanced Options"
+#~ msgstr "高级选项"
+
+#~ msgid "Advanced Rules"
+#~ msgstr "高级规则"
+
+#~ msgid ""
+#~ "Advanced rules let you customize the firewall to your needs. Only new "
+#~ "connections will be matched. Packets belonging to already open "
+#~ "connections are automatically allowed to pass the firewall."
+#~ msgstr ""
+#~ "高级规则允许按需定制防火墙。此规则只限制新建立的连接，对于已建立链路的数据"
+#~ "包会自动允许通过。"
+
+#~ msgid "Custom Rules (/etc/firewall.user)"
+#~ msgstr "自定义规则(/etc/firewall.user)"
+
+#~ msgid "Device"
+#~ msgstr "设备"
+
+#~ msgid ""
+#~ "For DNAT, match incoming traffic directed at the given destination ip "
+#~ "address. For SNAT rewrite the source address to the given address."
+#~ msgstr ""
+#~ "DNAT：将目标地址转换为指定的IP地址；SNAT：将源地址转换为指定的IP地址。"
+
+#~ msgid ""
+#~ "Match incoming traffic originating from the given source port or port "
+#~ "range on the client host"
+#~ msgstr "在客户端上，比较输入通道与给定的源端口是否一致。"
+
+#~ msgid "Overview"
+#~ msgstr "概览"
+
+#~ msgid "Port forwarding"
+#~ msgstr "端口转发"
+
+#~ msgid ""
+#~ "Port forwarding allows to provide network services in the internal "
+#~ "network to an external network."
+#~ msgstr "端口转发-允许外部网络访问内部网络"
+
+#~ msgid "Redirection type"
+#~ msgstr "重定向类型"
+
+#~ msgid "Redirections"
+#~ msgstr "重定向"
+
+#~ msgid "Rules"
+#~ msgstr "规则"
+
+#~ msgid "Traffic Redirection"
+#~ msgstr "流量重定向"
+
+#~ msgid ""
+#~ "Traffic redirection allows you to change the destination address of "
+#~ "forwarded packets."
+#~ msgstr "流量重定向允许你修改数据包转发地址"
+
 #~ msgid "Zone"
 #~ msgstr "区"