diff --git a/po/ca/firewall.po b/po/ca/firewall.po
index 4f00bcd1a9..b6650d460e 100644
--- a/po/ca/firewall.po
+++ b/po/ca/firewall.po
@@ -13,129 +13,21 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-msgid "Firewall"
-msgstr "Tallafocs"
-
-msgid ""
-"The firewall creates zones over your network interfaces to control network "
-"traffic flow."
-msgstr ""
-"El tallafocs crea zones a les teves interfícies de xarxa per controlar el "
-"flux de tràfic de xarxa."
-
-#, fuzzy
-msgid "Enable SYN-flood protection"
-msgstr "Protecció SYN-flood"
-
-msgid "Drop invalid packets"
-msgstr "Descarta els paquets invàlids"
-
-msgid "Input"
-msgstr "Entrada"
-
-msgid "Output"
-msgstr "Sortida"
-
-msgid "Forward"
-msgstr ""
-
-msgid "reject"
-msgstr "rebutja"
-
-msgid "drop"
-msgstr "descarta"
-
-msgid "accept"
-msgstr "accepta"
-
-msgid "Zones"
-msgstr "Zones"
-
-msgid "Name"
-msgstr ""
-
-msgid "Masquerading"
-msgstr ""
-
-#, fuzzy
-msgid "MSS clamping"
-msgstr "Clamping MSS"
-
-#, fuzzy
-msgid "Network"
-msgstr "Xarxes"
-
-msgid "Traffic Control"
-msgstr "Control de tràfic"
-
-msgid "Zone-to-Zone traffic"
-msgstr "Tràfic zona a zona"
-
-#, fuzzy
-msgid ""
-"Here you can specify which network traffic is allowed to flow between "
-"network zones. Only new connections will be matched.  Packets belonging to "
-"already open connections are automatically allowed to pass the firewall. If "
-"you experience occasional connection problems try enabling MSS Clamping "
-"otherwise disable it for performance reasons."
-msgstr ""
-"Ací pots especificar quin tràfic de xarxes es permet entre les zones de "
-"xarxa. Només s'hi correspondren les connexions noves. Als paquets que "
-"pertanyen una connexió oberta se'ls permet passar el tallafocs "
-"automàticament. Si experimentes problemes de connexió ocasionals, intenta "
-"activar el Clamping MSS, si no desactiva'l per raons de rendiment."
-
-msgid "Source"
-msgstr "Origen"
-
-msgid "Destination"
-msgstr "Destí"
-
-msgid "Rules"
-msgstr ""
-
-msgid "Protocol"
-msgstr ""
-
-msgid "Device"
+msgid "(optional)"
 msgstr ""
 
 msgid "Action"
 msgstr "Acció"
 
-msgid "Traffic Redirection"
-msgstr "Readreçament de tràfic"
-
-msgid ""
-"Traffic redirection allows you to change the destination address of "
-"forwarded packets."
+msgid "Advanced Options"
 msgstr ""
-"El readreçament de tràfic et permet canviar l'adreça destí dels paquets "
-"reenviats."
-
-msgid "(optional)"
-msgstr ""
-
-msgid "Zone"
-msgstr "Zona"
-
-msgid "Source port"
-msgstr "Port d'origen"
-
-#, fuzzy
-msgid "Destination IP"
-msgstr "Destí"
-
-#, fuzzy
-msgid "IP address"
-msgstr "Adreça IP"
-
-msgid "Destination port"
-msgstr "Port de destí"
 
 msgid "Advanced Rules"
 msgstr "Regles avançades"
 
+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 "
@@ -146,60 +38,138 @@ msgstr ""
 "pertanyen una connexió oberta se'ls permet passar el tallafocs "
 "automàticament."
 
-msgid "Overview"
+msgid "Allow forward from <em>source zones</em>:"
 msgstr ""
 
-#, fuzzy
-msgid "Source zone"
-msgstr "Port d'origen"
+msgid "Allow forward to <em>destination zones</em>:"
+msgstr ""
+
+msgid "Any"
+msgstr ""
+
+msgid "Covered networks"
+msgstr ""
+
+msgid "Custom Rules"
+msgstr ""
+
+msgid "Custom Rules (/etc/firewall.user)"
+msgstr ""
+
+msgid "Destination"
+msgstr "Destí"
+
+msgid "Destination address"
+msgstr "Adreça destí"
+
+msgid "Destination port"
+msgstr "Port de destí"
 
 #, fuzzy
 msgid "Destination zone"
 msgstr "Destí"
 
-msgid "any"
+msgid "Device"
+msgstr ""
+
+msgid "Drop invalid packets"
+msgstr "Descarta els paquets invàlids"
+
+msgid "Enable NAT Loopback"
 msgstr ""
 
 #, fuzzy
-msgid "Source address"
-msgstr "Adreça MAC d'origen"
+msgid "Enable SYN-flood protection"
+msgstr "Protecció SYN-flood"
 
-msgid "Destination address"
-msgstr "Adreça destí"
-
-#, fuzzy
-msgid "Source MAC-address"
-msgstr "Adreça MAC d'origen"
-
-#, fuzzy
-msgid "Source IP address"
-msgstr "Adreça MAC d'origen"
-
-msgid ""
-"Match incoming traffic originating from the given source port or port range "
-"on the client host"
+msgid "Enable logging on this zone"
 msgstr ""
 
 msgid "External port"
 msgstr "Port extern"
 
+msgid "Family"
+msgstr ""
+
+msgid "Firewall"
+msgstr "Tallafocs"
+
+msgid "Firewall - Zone Settings"
+msgstr ""
+
 msgid ""
-"Match incoming traffic directed at the given destination port or port range "
-"on this host"
+"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 "General Settings"
+msgstr ""
+
+msgid "IPv4 and IPv6"
+msgstr ""
+
+msgid "IPv4 only"
+msgstr ""
+
+msgid "IPv6 only"
+msgstr ""
+
+msgid "Input"
+msgstr "Entrada"
+
+msgid "Intended destination address"
+msgstr ""
+
+msgid "Inter-Zone Forwarding"
 msgstr ""
 
 #, fuzzy
 msgid "Internal IP address"
 msgstr "Adreça interna"
 
-msgid "Redirect matched incoming traffic to the specified internal host"
-msgstr ""
+#, fuzzy
+msgid "Internal port"
+msgstr "Port extern"
 
 msgid "Internal port (optional)"
 msgstr "Port intern (opcional)"
 
+msgid "Limit log messages"
+msgstr ""
+
+#, fuzzy
+msgid "MSS clamping"
+msgstr "Clamping MSS"
+
+msgid "Masquerading"
+msgstr ""
+
+msgid "Match ICMP type"
+msgstr ""
+
 msgid ""
-"Redirect matched incoming traffic to the given port on the internal host"
+"Match incoming traffic directed at the given destination port or port range "
+"on this host"
+msgstr ""
+
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Output"
+msgstr "Sortida"
+
+msgid "Overview"
 msgstr ""
 
 msgid "Port forwarding"
@@ -212,9 +182,151 @@ msgstr ""
 "El readreçament de ports permet proveir serveis de la xarxa interna a una "
 "xarxa externa."
 
+msgid "Protocol"
+msgstr ""
+
+msgid ""
+"Redirect matched incoming traffic to the given port on the internal host"
+msgstr ""
+
+msgid "Redirect matched incoming traffic to the specified internal host"
+msgstr ""
+
+msgid "Redirection type"
+msgstr ""
+
+msgid "Redirections"
+msgstr ""
+
+msgid "Restrict Masquerading to given destination subnets"
+msgstr ""
+
+msgid "Restrict Masquerading to given source subnets"
+msgstr ""
+
+msgid "Restrict to address family"
+msgstr ""
+
+msgid "Rules"
+msgstr ""
+
+msgid "Source"
+msgstr "Origen"
+
 #, fuzzy
-msgid "Internal port"
-msgstr "Port extern"
+msgid "Source IP address"
+msgstr "Adreça MAC d'origen"
+
+msgid "Source MAC address"
+msgstr ""
+
+#, fuzzy
+msgid "Source address"
+msgstr "Adreça MAC d'origen"
+
+msgid "Source port"
+msgstr "Port d'origen"
+
+#, fuzzy
+msgid "Source zone"
+msgstr "Port d'origen"
+
+msgid ""
+"The firewall creates zones over your network interfaces to control network "
+"traffic flow."
+msgstr ""
+"El tallafocs crea zones a les teves interfícies de xarxa per controlar el "
+"flux de tràfic de xarxa."
+
+msgid ""
+"The options below control the forwarding policies between this zone (%s) and "
+"other zones. <em>Destination zones</em> cover forwarded traffic "
+"<strong>originating from %q</strong>. <em>Source zones</em> match forwarded "
+"traffic from other zones <strong>targeted at %q</strong>. The forwarding "
+"rule is <em>unidirectional</em>, e.g. a forward from lan to wan does "
+"<em>not</em> imply a permission to forward from wan to lan as well."
+msgstr ""
+
+msgid ""
+"This section defines common properties of %q. The <em>input</em> and "
+"<em>output</em> options set the default policies for traffic entering and "
+"leaving this zone while the <em>forward</em> option describes the policy for "
+"forwarded traffic between different networks within the zone. <em>Covered "
+"networks</em> specifies which available networks are member of this zone."
+msgstr ""
+
+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."
+
+msgid "Via"
+msgstr ""
+
+msgid "Zone %q"
+msgstr ""
+
+msgid "Zone ⇒ Forwardings"
+msgstr ""
+
+msgid "Zones"
+msgstr "Zones"
+
+msgid "accept"
+msgstr "accepta"
+
+msgid "any"
+msgstr ""
+
+msgid "drop"
+msgstr "descarta"
+
+msgid "reject"
+msgstr "rebutja"
+
+#, fuzzy
+#~ msgid "Network"
+#~ msgstr "Xarxes"
+
+#~ msgid "Traffic Control"
+#~ msgstr "Control de tràfic"
+
+#~ msgid "Zone-to-Zone traffic"
+#~ msgstr "Tràfic zona a zona"
+
+#, fuzzy
+#~ msgid ""
+#~ "Here you can specify which network traffic is allowed to flow between "
+#~ "network zones. Only new connections will be matched.  Packets belonging "
+#~ "to already open connections are automatically allowed to pass the "
+#~ "firewall. If you experience occasional connection problems try enabling "
+#~ "MSS Clamping otherwise disable it for performance reasons."
+#~ msgstr ""
+#~ "Ací pots especificar quin tràfic de xarxes es permet entre les zones de "
+#~ "xarxa. Només s'hi correspondren les connexions noves. Als paquets que "
+#~ "pertanyen una connexió oberta se'ls permet passar el tallafocs "
+#~ "automàticament. Si experimentes problemes de connexió ocasionals, intenta "
+#~ "activar el Clamping MSS, si no desactiva'l per raons de rendiment."
+
+#~ msgid "Zone"
+#~ msgstr "Zona"
+
+#, fuzzy
+#~ msgid "Destination IP"
+#~ msgstr "Destí"
+
+#, fuzzy
+#~ msgid "IP address"
+#~ msgstr "Adreça IP"
+
+#, fuzzy
+#~ msgid "Source MAC-address"
+#~ msgstr "Adreça MAC d'origen"
 
 #~ msgid "Custom forwarding"
 #~ msgstr "Reenviament personalitzat"
diff --git a/po/de/firewall.po b/po/de/firewall.po
index db19e0c859..4f5fba524b 100644
--- a/po/de/firewall.po
+++ b/po/de/firewall.po
@@ -12,128 +12,21 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-msgid "Firewall"
-msgstr "Firewall"
-
-msgid ""
-"The firewall creates zones over your network interfaces to control network "
-"traffic flow."
-msgstr ""
-"Die Firewall erstellt Netzwerkzonen über bestimmte Netzwerkschnittstellen um "
-"den Netzverkehr zu trennen."
-
-#, fuzzy
-msgid "Enable SYN-flood protection"
-msgstr "Schutz vor SYN-flood-Attacken"
-
-msgid "Drop invalid packets"
-msgstr "Ungültige Pakete verwerfen"
-
-msgid "Input"
-msgstr "Eingang"
-
-msgid "Output"
-msgstr "Ausgang"
-
-msgid "Forward"
-msgstr ""
-
-msgid "reject"
-msgstr "zurückweisen"
-
-msgid "drop"
-msgstr "verwerfen"
-
-msgid "accept"
-msgstr "annehmen"
-
-msgid "Zones"
-msgstr "Zonen"
-
-msgid "Name"
-msgstr ""
-
-msgid "Masquerading"
-msgstr ""
-
-#, fuzzy
-msgid "MSS clamping"
-msgstr "MSS Clamping"
-
-#, fuzzy
-msgid "Network"
-msgstr "Netzwerke"
-
-msgid "Traffic Control"
-msgstr "Verkehrskontrolle"
-
-msgid "Zone-to-Zone traffic"
-msgstr "Zone-zu-Zone Verkehr"
-
-#, fuzzy
-msgid ""
-"Here you can specify which network traffic is allowed to flow between "
-"network zones. Only new connections will be matched.  Packets belonging to "
-"already open connections are automatically allowed to pass the firewall. If "
-"you experience occasional connection problems try enabling MSS Clamping "
-"otherwise disable it for performance reasons."
-msgstr ""
-"An dieser Stelle kann festgelegt zwischen welchen Zonen Netzverkehr hin und "
-"her fließen kann. Es werden nur neue Verbindungen betrachtet. Pakete, die zu "
-"bereits bestehenden Verbindungen gehören werden automatisch akzeptiert. Bei "
-"gelegentlich auftretenden Verbindungsproblemen kann MSS Clamping helfen, "
-"ansonsten sollte dies aus Performancegründen deaktiviert bleiben."
-
-msgid "Source"
-msgstr "Quelle"
-
-msgid "Destination"
-msgstr "Ziel"
-
-msgid "Rules"
-msgstr ""
-
-msgid "Protocol"
-msgstr ""
-
-msgid "Device"
+msgid "(optional)"
 msgstr ""
 
 msgid "Action"
 msgstr "Aktion"
 
-msgid "Traffic Redirection"
-msgstr "Umleitungen"
-
-msgid ""
-"Traffic redirection allows you to change the destination address of "
-"forwarded packets."
+msgid "Advanced Options"
 msgstr ""
-"Umleitungen erlauben es das Ziel von weitergeleiteten Paketen zu verändern."
-
-msgid "(optional)"
-msgstr ""
-
-msgid "Zone"
-msgstr "Zone"
-
-msgid "Source port"
-msgstr "Quellport"
-
-#, fuzzy
-msgid "Destination IP"
-msgstr "Ziel"
-
-#, fuzzy
-msgid "IP address"
-msgstr "IP-Adresse"
-
-msgid "Destination port"
-msgstr "Zielport"
 
 msgid "Advanced Rules"
 msgstr "Erweiterte Regeln"
 
+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 "
@@ -143,60 +36,138 @@ msgstr ""
 "angepasst werden. Es werden nur neue Verbindungen betrachtet. Pakete, die zu "
 "bereits bestehenden Verbindungen gehören werden automatisch akzeptiert."
 
-msgid "Overview"
+msgid "Allow forward from <em>source zones</em>:"
 msgstr ""
 
-#, fuzzy
-msgid "Source zone"
-msgstr "Quellport"
+msgid "Allow forward to <em>destination zones</em>:"
+msgstr ""
+
+msgid "Any"
+msgstr ""
+
+msgid "Covered networks"
+msgstr ""
+
+msgid "Custom Rules"
+msgstr ""
+
+msgid "Custom Rules (/etc/firewall.user)"
+msgstr ""
+
+msgid "Destination"
+msgstr "Ziel"
+
+msgid "Destination address"
+msgstr "Zieladresse"
+
+msgid "Destination port"
+msgstr "Zielport"
 
 #, fuzzy
 msgid "Destination zone"
 msgstr "Ziel"
 
-msgid "any"
+msgid "Device"
+msgstr ""
+
+msgid "Drop invalid packets"
+msgstr "Ungültige Pakete verwerfen"
+
+msgid "Enable NAT Loopback"
 msgstr ""
 
 #, fuzzy
-msgid "Source address"
-msgstr "Quell-MAC-Adresse"
+msgid "Enable SYN-flood protection"
+msgstr "Schutz vor SYN-flood-Attacken"
 
-msgid "Destination address"
-msgstr "Zieladresse"
-
-#, fuzzy
-msgid "Source MAC-address"
-msgstr "Quell-MAC-Adresse"
-
-#, fuzzy
-msgid "Source IP address"
-msgstr "Quell-MAC-Adresse"
-
-msgid ""
-"Match incoming traffic originating from the given source port or port range "
-"on the client host"
+msgid "Enable logging on this zone"
 msgstr ""
 
 msgid "External port"
 msgstr "Externer Port"
 
+msgid "Family"
+msgstr ""
+
+msgid "Firewall"
+msgstr "Firewall"
+
+msgid "Firewall - Zone Settings"
+msgstr ""
+
 msgid ""
-"Match incoming traffic directed at the given destination port or port range "
-"on this host"
+"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 "General Settings"
+msgstr ""
+
+msgid "IPv4 and IPv6"
+msgstr ""
+
+msgid "IPv4 only"
+msgstr ""
+
+msgid "IPv6 only"
+msgstr ""
+
+msgid "Input"
+msgstr "Eingang"
+
+msgid "Intended destination address"
+msgstr ""
+
+msgid "Inter-Zone Forwarding"
 msgstr ""
 
 #, fuzzy
 msgid "Internal IP address"
 msgstr "Interne Adresse"
 
-msgid "Redirect matched incoming traffic to the specified internal host"
-msgstr ""
+#, fuzzy
+msgid "Internal port"
+msgstr "Externer Port"
 
 msgid "Internal port (optional)"
 msgstr "Interner Port (optional)"
 
+msgid "Limit log messages"
+msgstr ""
+
+#, fuzzy
+msgid "MSS clamping"
+msgstr "MSS Clamping"
+
+msgid "Masquerading"
+msgstr ""
+
+msgid "Match ICMP type"
+msgstr ""
+
 msgid ""
-"Redirect matched incoming traffic to the given port on the internal host"
+"Match incoming traffic directed at the given destination port or port range "
+"on this host"
+msgstr ""
+
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Output"
+msgstr "Ausgang"
+
+msgid "Overview"
 msgstr ""
 
 msgid "Port forwarding"
@@ -209,9 +180,151 @@ msgstr ""
 "Portweiterleitungen ermöglichen es interne Netzwerkdienste aus einem "
 "externen Netzwerk heraus erreichbar zu machen."
 
+msgid "Protocol"
+msgstr ""
+
+msgid ""
+"Redirect matched incoming traffic to the given port on the internal host"
+msgstr ""
+
+msgid "Redirect matched incoming traffic to the specified internal host"
+msgstr ""
+
+msgid "Redirection type"
+msgstr ""
+
+msgid "Redirections"
+msgstr ""
+
+msgid "Restrict Masquerading to given destination subnets"
+msgstr ""
+
+msgid "Restrict Masquerading to given source subnets"
+msgstr ""
+
+msgid "Restrict to address family"
+msgstr ""
+
+msgid "Rules"
+msgstr ""
+
+msgid "Source"
+msgstr "Quelle"
+
 #, fuzzy
-msgid "Internal port"
-msgstr "Externer Port"
+msgid "Source IP address"
+msgstr "Quell-MAC-Adresse"
+
+msgid "Source MAC address"
+msgstr ""
+
+#, fuzzy
+msgid "Source address"
+msgstr "Quell-MAC-Adresse"
+
+msgid "Source port"
+msgstr "Quellport"
+
+#, fuzzy
+msgid "Source zone"
+msgstr "Quellport"
+
+msgid ""
+"The firewall creates zones over your network interfaces to control network "
+"traffic flow."
+msgstr ""
+"Die Firewall erstellt Netzwerkzonen über bestimmte Netzwerkschnittstellen um "
+"den Netzverkehr zu trennen."
+
+msgid ""
+"The options below control the forwarding policies between this zone (%s) and "
+"other zones. <em>Destination zones</em> cover forwarded traffic "
+"<strong>originating from %q</strong>. <em>Source zones</em> match forwarded "
+"traffic from other zones <strong>targeted at %q</strong>. The forwarding "
+"rule is <em>unidirectional</em>, e.g. a forward from lan to wan does "
+"<em>not</em> imply a permission to forward from wan to lan as well."
+msgstr ""
+
+msgid ""
+"This section defines common properties of %q. The <em>input</em> and "
+"<em>output</em> options set the default policies for traffic entering and "
+"leaving this zone while the <em>forward</em> option describes the policy for "
+"forwarded traffic between different networks within the zone. <em>Covered "
+"networks</em> specifies which available networks are member of this zone."
+msgstr ""
+
+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."
+
+msgid "Via"
+msgstr ""
+
+msgid "Zone %q"
+msgstr ""
+
+msgid "Zone ⇒ Forwardings"
+msgstr ""
+
+msgid "Zones"
+msgstr "Zonen"
+
+msgid "accept"
+msgstr "annehmen"
+
+msgid "any"
+msgstr ""
+
+msgid "drop"
+msgstr "verwerfen"
+
+msgid "reject"
+msgstr "zurückweisen"
+
+#, fuzzy
+#~ msgid "Network"
+#~ msgstr "Netzwerke"
+
+#~ msgid "Traffic Control"
+#~ msgstr "Verkehrskontrolle"
+
+#~ msgid "Zone-to-Zone traffic"
+#~ msgstr "Zone-zu-Zone Verkehr"
+
+#, fuzzy
+#~ msgid ""
+#~ "Here you can specify which network traffic is allowed to flow between "
+#~ "network zones. Only new connections will be matched.  Packets belonging "
+#~ "to already open connections are automatically allowed to pass the "
+#~ "firewall. If you experience occasional connection problems try enabling "
+#~ "MSS Clamping otherwise disable it for performance reasons."
+#~ msgstr ""
+#~ "An dieser Stelle kann festgelegt zwischen welchen Zonen Netzverkehr hin "
+#~ "und her fließen kann. Es werden nur neue Verbindungen betrachtet. Pakete, "
+#~ "die zu bereits bestehenden Verbindungen gehören werden automatisch "
+#~ "akzeptiert. Bei gelegentlich auftretenden Verbindungsproblemen kann MSS "
+#~ "Clamping helfen, ansonsten sollte dies aus Performancegründen deaktiviert "
+#~ "bleiben."
+
+#~ msgid "Zone"
+#~ msgstr "Zone"
+
+#, fuzzy
+#~ msgid "Destination IP"
+#~ msgstr "Ziel"
+
+#, fuzzy
+#~ msgid "IP address"
+#~ msgstr "IP-Adresse"
+
+#, fuzzy
+#~ msgid "Source MAC-address"
+#~ msgstr "Quell-MAC-Adresse"
 
 #~ msgid "Custom forwarding"
 #~ msgstr "Erweiterte Weiterleitung"
diff --git a/po/el/firewall.po b/po/el/firewall.po
index e4d38dcd1e..82272a7c2e 100644
--- a/po/el/firewall.po
+++ b/po/el/firewall.po
@@ -11,130 +11,21 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-msgid "Firewall"
-msgstr "Τείχος προστασίας"
-
-msgid ""
-"The firewall creates zones over your network interfaces to control network "
-"traffic flow."
-msgstr ""
-"Το τείχος προστασίας δημιουργεί ζώνες πάνω στις διεπαφές δικτύου για να "
-"ελέγχει την δικτυακή κίνηση."
-
-#, fuzzy
-msgid "Enable SYN-flood protection"
-msgstr "Προστασία SYN-flood"
-
-msgid "Drop invalid packets"
-msgstr "Αγνόηση μη-έγκυρων πακετών"
-
-msgid "Input"
-msgstr "Είσοδος"
-
-msgid "Output"
-msgstr "Έξοδος"
-
-msgid "Forward"
-msgstr ""
-
-msgid "reject"
-msgstr "απόρριψη"
-
-msgid "drop"
-msgstr "αγνόηση"
-
-msgid "accept"
-msgstr "αποδοχή"
-
-msgid "Zones"
-msgstr "Ζώνες"
-
-msgid "Name"
-msgstr ""
-
-msgid "Masquerading"
-msgstr ""
-
-#, fuzzy
-msgid "MSS clamping"
-msgstr "Περιορισμός MSS"
-
-#, fuzzy
-msgid "Network"
-msgstr "Δίκτυα"
-
-msgid "Traffic Control"
-msgstr "Έλεγχος Κίνησης"
-
-msgid "Zone-to-Zone traffic"
-msgstr "Κίνηση Ζώνης-προς-Ζώνη"
-
-#, fuzzy
-msgid ""
-"Here you can specify which network traffic is allowed to flow between "
-"network zones. Only new connections will be matched.  Packets belonging to "
-"already open connections are automatically allowed to pass the firewall. If "
-"you experience occasional connection problems try enabling MSS Clamping "
-"otherwise disable it for performance reasons."
-msgstr ""
-"Εδώ μπορείτε να ορίσετε τι δικτυακή κίνηση επιτρέπεται μεταξύ δικτυακών "
-"ζωνών. Θα εφαρμόζεται μόνο σε νέες συνδέσεις. Πακέτα που ανήκουν σε ήδη "
-"ανοιχτές συνδέσεις θα περνάνε αυτόματα το τείχος προστασίας. Αν "
-"αντιμετωπίζεται σποραδικά προβλήματα με τη σύνδεσή σας, δοκιμάστε να "
-"ενεργοποιήσετε τον Περιορισμό MSS, αλλιώς απενεργοποιήστε το για μεγαλύτερη "
-"απόδοση."
-
-msgid "Source"
-msgstr "Πηγή"
-
-msgid "Destination"
-msgstr "Προορισμός"
-
-msgid "Rules"
-msgstr ""
-
-msgid "Protocol"
-msgstr ""
-
-msgid "Device"
+msgid "(optional)"
 msgstr ""
 
 msgid "Action"
 msgstr "Ενέργεια"
 
-msgid "Traffic Redirection"
-msgstr "Ανακατεύθυνση Κίνησης"
-
-msgid ""
-"Traffic redirection allows you to change the destination address of "
-"forwarded packets."
+msgid "Advanced Options"
 msgstr ""
-"Η ανακατεύθυνση κίνησης σας επιτρέπει να αλλάξετε την διεύθυνση προορισμού "
-"των προωθημένων πακέτων."
-
-msgid "(optional)"
-msgstr ""
-
-msgid "Zone"
-msgstr "Ζώνη"
-
-msgid "Source port"
-msgstr "Θύρα πηγής"
-
-#, fuzzy
-msgid "Destination IP"
-msgstr "Προορισμός"
-
-#, fuzzy
-msgid "IP address"
-msgstr "Διεύθυνση IP"
-
-msgid "Destination port"
-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 "
@@ -145,60 +36,138 @@ msgstr ""
 "Πακέτα που ανήκουν σε ήδη ανοιχτές συνδέσεις, θα περνάνε αυτόματα το τείχος "
 "προστασίας."
 
-msgid "Overview"
+msgid "Allow forward from <em>source zones</em>:"
 msgstr ""
 
-#, fuzzy
-msgid "Source zone"
-msgstr "Θύρα πηγής"
+msgid "Allow forward to <em>destination zones</em>:"
+msgstr ""
+
+msgid "Any"
+msgstr ""
+
+msgid "Covered networks"
+msgstr ""
+
+msgid "Custom Rules"
+msgstr ""
+
+msgid "Custom Rules (/etc/firewall.user)"
+msgstr ""
+
+msgid "Destination"
+msgstr "Προορισμός"
+
+msgid "Destination address"
+msgstr "Διεύθυνση προορισμού"
+
+msgid "Destination port"
+msgstr "Θύρα προορισμού"
 
 #, fuzzy
 msgid "Destination zone"
 msgstr "Προορισμός"
 
-msgid "any"
+msgid "Device"
+msgstr ""
+
+msgid "Drop invalid packets"
+msgstr "Αγνόηση μη-έγκυρων πακετών"
+
+msgid "Enable NAT Loopback"
 msgstr ""
 
 #, fuzzy
-msgid "Source address"
-msgstr "Διεύθυνση MAC πηγής"
+msgid "Enable SYN-flood protection"
+msgstr "Προστασία SYN-flood"
 
-msgid "Destination address"
-msgstr "Διεύθυνση προορισμού"
-
-#, fuzzy
-msgid "Source MAC-address"
-msgstr "Διεύθυνση MAC πηγής"
-
-#, fuzzy
-msgid "Source IP address"
-msgstr "Διεύθυνση MAC πηγής"
-
-msgid ""
-"Match incoming traffic originating from the given source port or port range "
-"on the client host"
+msgid "Enable logging on this zone"
 msgstr ""
 
 msgid "External port"
 msgstr "Εξωτερική θύρα"
 
+msgid "Family"
+msgstr ""
+
+msgid "Firewall"
+msgstr "Τείχος προστασίας"
+
+msgid "Firewall - Zone Settings"
+msgstr ""
+
 msgid ""
-"Match incoming traffic directed at the given destination port or port range "
-"on this host"
+"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 "General Settings"
+msgstr ""
+
+msgid "IPv4 and IPv6"
+msgstr ""
+
+msgid "IPv4 only"
+msgstr ""
+
+msgid "IPv6 only"
+msgstr ""
+
+msgid "Input"
+msgstr "Είσοδος"
+
+msgid "Intended destination address"
+msgstr ""
+
+msgid "Inter-Zone Forwarding"
 msgstr ""
 
 #, fuzzy
 msgid "Internal IP address"
 msgstr "Εσωτερική διεύθυνση"
 
-msgid "Redirect matched incoming traffic to the specified internal host"
-msgstr ""
+#, fuzzy
+msgid "Internal port"
+msgstr "Εξωτερική θύρα"
 
 msgid "Internal port (optional)"
 msgstr "Εσωτερική θύρα (προαιρετικό)"
 
+msgid "Limit log messages"
+msgstr ""
+
+#, fuzzy
+msgid "MSS clamping"
+msgstr "Περιορισμός MSS"
+
+msgid "Masquerading"
+msgstr ""
+
+msgid "Match ICMP type"
+msgstr ""
+
 msgid ""
-"Redirect matched incoming traffic to the given port on the internal host"
+"Match incoming traffic directed at the given destination port or port range "
+"on this host"
+msgstr ""
+
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Output"
+msgstr "Έξοδος"
+
+msgid "Overview"
 msgstr ""
 
 msgid "Port forwarding"
@@ -211,9 +180,152 @@ msgstr ""
 "Η προώθηση θυρών επιτρέπει σε υπηρεσίες δικτύου που λειτουργούν μέσα σε ένα "
 "εσωτερικό δίκτυο, να γίνονται διαθέσιμες και σε ένα εξωτερικό."
 
+msgid "Protocol"
+msgstr ""
+
+msgid ""
+"Redirect matched incoming traffic to the given port on the internal host"
+msgstr ""
+
+msgid "Redirect matched incoming traffic to the specified internal host"
+msgstr ""
+
+msgid "Redirection type"
+msgstr ""
+
+msgid "Redirections"
+msgstr ""
+
+msgid "Restrict Masquerading to given destination subnets"
+msgstr ""
+
+msgid "Restrict Masquerading to given source subnets"
+msgstr ""
+
+msgid "Restrict to address family"
+msgstr ""
+
+msgid "Rules"
+msgstr ""
+
+msgid "Source"
+msgstr "Πηγή"
+
 #, fuzzy
-msgid "Internal port"
-msgstr "Εξωτερική θύρα"
+msgid "Source IP address"
+msgstr "Διεύθυνση MAC πηγής"
+
+msgid "Source MAC address"
+msgstr ""
+
+#, fuzzy
+msgid "Source address"
+msgstr "Διεύθυνση MAC πηγής"
+
+msgid "Source port"
+msgstr "Θύρα πηγής"
+
+#, fuzzy
+msgid "Source zone"
+msgstr "Θύρα πηγής"
+
+msgid ""
+"The firewall creates zones over your network interfaces to control network "
+"traffic flow."
+msgstr ""
+"Το τείχος προστασίας δημιουργεί ζώνες πάνω στις διεπαφές δικτύου για να "
+"ελέγχει την δικτυακή κίνηση."
+
+msgid ""
+"The options below control the forwarding policies between this zone (%s) and "
+"other zones. <em>Destination zones</em> cover forwarded traffic "
+"<strong>originating from %q</strong>. <em>Source zones</em> match forwarded "
+"traffic from other zones <strong>targeted at %q</strong>. The forwarding "
+"rule is <em>unidirectional</em>, e.g. a forward from lan to wan does "
+"<em>not</em> imply a permission to forward from wan to lan as well."
+msgstr ""
+
+msgid ""
+"This section defines common properties of %q. The <em>input</em> and "
+"<em>output</em> options set the default policies for traffic entering and "
+"leaving this zone while the <em>forward</em> option describes the policy for "
+"forwarded traffic between different networks within the zone. <em>Covered "
+"networks</em> specifies which available networks are member of this zone."
+msgstr ""
+
+msgid "Traffic Redirection"
+msgstr "Ανακατεύθυνση Κίνησης"
+
+msgid ""
+"Traffic redirection allows you to change the destination address of "
+"forwarded packets."
+msgstr ""
+"Η ανακατεύθυνση κίνησης σας επιτρέπει να αλλάξετε την διεύθυνση προορισμού "
+"των προωθημένων πακέτων."
+
+msgid "Via"
+msgstr ""
+
+msgid "Zone %q"
+msgstr ""
+
+msgid "Zone ⇒ Forwardings"
+msgstr ""
+
+msgid "Zones"
+msgstr "Ζώνες"
+
+msgid "accept"
+msgstr "αποδοχή"
+
+msgid "any"
+msgstr ""
+
+msgid "drop"
+msgstr "αγνόηση"
+
+msgid "reject"
+msgstr "απόρριψη"
+
+#, fuzzy
+#~ msgid "Network"
+#~ msgstr "Δίκτυα"
+
+#~ msgid "Traffic Control"
+#~ msgstr "Έλεγχος Κίνησης"
+
+#~ msgid "Zone-to-Zone traffic"
+#~ msgstr "Κίνηση Ζώνης-προς-Ζώνη"
+
+#, fuzzy
+#~ msgid ""
+#~ "Here you can specify which network traffic is allowed to flow between "
+#~ "network zones. Only new connections will be matched.  Packets belonging "
+#~ "to already open connections are automatically allowed to pass the "
+#~ "firewall. If you experience occasional connection problems try enabling "
+#~ "MSS Clamping otherwise disable it for performance reasons."
+#~ msgstr ""
+#~ "Εδώ μπορείτε να ορίσετε τι δικτυακή κίνηση επιτρέπεται μεταξύ δικτυακών "
+#~ "ζωνών. Θα εφαρμόζεται μόνο σε νέες συνδέσεις. Πακέτα που ανήκουν σε ήδη "
+#~ "ανοιχτές συνδέσεις θα περνάνε αυτόματα το τείχος προστασίας. Αν "
+#~ "αντιμετωπίζεται σποραδικά προβλήματα με τη σύνδεσή σας, δοκιμάστε να "
+#~ "ενεργοποιήσετε τον Περιορισμό MSS, αλλιώς απενεργοποιήστε το για "
+#~ "μεγαλύτερη απόδοση."
+
+#~ msgid "Zone"
+#~ msgstr "Ζώνη"
+
+#, fuzzy
+#~ msgid "Destination IP"
+#~ msgstr "Προορισμός"
+
+#, fuzzy
+#~ msgid "IP address"
+#~ msgstr "Διεύθυνση IP"
+
+#, fuzzy
+#~ msgid "Source MAC-address"
+#~ msgstr "Διεύθυνση MAC πηγής"
 
 #~ msgid "Custom forwarding"
 #~ msgstr "Προσαρμοσμένη προώθηση"
diff --git a/po/en/firewall.po b/po/en/firewall.po
index 27edcdd599..41d74b2cee 100644
--- a/po/en/firewall.po
+++ b/po/en/firewall.po
@@ -11,140 +11,14 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-# Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/zones.lua      #
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-#
-msgid "Firewall"
-msgstr "Firewall"
-
-msgid ""
-"The firewall creates zones over your network interfaces to control network "
-"traffic flow."
-msgstr ""
-"The firewall creates zones over your network interfaces to control network "
-"traffic flow."
-
-msgid "Enable SYN-flood protection"
-msgstr "Enable SYN-flood protection"
-
-msgid "Drop invalid packets"
-msgstr "Drop invalid packets"
-
-msgid "Input"
-msgstr "Input"
-
-msgid "Output"
-msgstr "Output"
-
-msgid "Forward"
-msgstr "Forward"
-
-msgid "reject"
-msgstr "reject"
-
-msgid "drop"
-msgstr "drop"
-
-msgid "accept"
-msgstr "accept"
-
-msgid "Zones"
-msgstr "Zones"
-
-msgid "Name"
-msgstr "Name"
-
-msgid "Masquerading"
-msgstr "Masquerading"
-
-msgid "MSS clamping"
-msgstr "MSS clamping"
-
-msgid "Network"
-msgstr "Network"
-
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-# Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/traffic.lua    #
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-#
-# msgid "Name"
-# msgstr ""
-#
-msgid "Traffic Control"
-msgstr "Traffic Control"
-
-msgid "Zone-to-Zone traffic"
-msgstr "Zone-to-Zone traffic"
-
-msgid ""
-"Here you can specify which network traffic is allowed to flow between "
-"network zones. Only new connections will be matched.  Packets belonging to "
-"already open connections are automatically allowed to pass the firewall. If "
-"you experience occasional connection problems try enabling MSS Clamping "
-"otherwise disable it for performance reasons."
-msgstr ""
-"Here you can specify which network traffic is allowed to flow between "
-"network zones. Only new connections will be matched.  Packets belonging to "
-"already open connections are automatically allowed to pass the firewall. If "
-"you experience occasional connection problems try enabling MSS Clamping "
-"otherwise disable it for performance reasons."
-
-msgid "Source"
-msgstr "Source"
-
-msgid "Destination"
-msgstr "Destination"
-
-msgid "Rules"
-msgstr "Rules"
-
-msgid "Protocol"
-msgstr "Protocol"
-
-msgid "Device"
-msgstr "Device"
+msgid "(optional)"
+msgstr "(optional)"
 
 msgid "Action"
 msgstr "Action"
 
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-# 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."
+msgid "Advanced Options"
 msgstr ""
-"Traffic redirection allows you to change the destination address of "
-"forwarded packets."
-
-msgid "(optional)"
-msgstr "(optional)"
-
-msgid "Zone"
-msgstr "Zone"
-
-msgid "Source port"
-msgstr "Source port"
-
-msgid "Destination IP"
-msgstr "Destination IP"
-
-msgid "IP address"
-msgstr "IP address"
-
-msgid "Destination port"
-msgstr "Destination port"
 
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 # Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/trule.lua      #
@@ -180,6 +54,9 @@ msgstr "Destination port"
 msgid "Advanced Rules"
 msgstr "Advanced Rules"
 
+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 "
@@ -189,26 +66,203 @@ msgstr ""
 "connections will be matched. Packets belonging to already open connections "
 "are automatically allowed to pass the firewall."
 
-msgid "Overview"
-msgstr "Overview"
+msgid "Allow forward from <em>source zones</em>:"
+msgstr ""
 
-msgid "Source zone"
-msgstr "Source zone"
+msgid "Allow forward to <em>destination zones</em>:"
+msgstr ""
 
-msgid "Destination zone"
-msgstr "Destination zone"
+msgid "Any"
+msgstr ""
 
-msgid "any"
-msgstr "any"
+msgid "Covered networks"
+msgstr ""
 
-msgid "Source address"
-msgstr "Source address"
+msgid "Custom Rules"
+msgstr ""
+
+msgid "Custom Rules (/etc/firewall.user)"
+msgstr ""
+
+msgid "Destination"
+msgstr "Destination"
 
 msgid "Destination address"
 msgstr "Destination address"
 
-msgid "Source MAC-address"
-msgstr "Source MAC-address"
+msgid "Destination port"
+msgstr "Destination port"
+
+msgid "Destination zone"
+msgstr "Destination zone"
+
+msgid "Device"
+msgstr "Device"
+
+msgid "Drop invalid packets"
+msgstr "Drop invalid packets"
+
+msgid "Enable NAT Loopback"
+msgstr ""
+
+msgid "Enable SYN-flood protection"
+msgstr "Enable SYN-flood protection"
+
+msgid "Enable logging on this zone"
+msgstr ""
+
+msgid "External port"
+msgstr "External port"
+
+msgid "Family"
+msgstr ""
+
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+# Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/zones.lua      #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#
+msgid "Firewall"
+msgstr "Firewall"
+
+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 "General Settings"
+msgstr ""
+
+msgid "IPv4 and IPv6"
+msgstr ""
+
+msgid "IPv4 only"
+msgstr ""
+
+msgid "IPv6 only"
+msgstr ""
+
+msgid "Input"
+msgstr "Input"
+
+msgid "Intended destination address"
+msgstr ""
+
+msgid "Inter-Zone Forwarding"
+msgstr ""
+
+msgid "Internal IP address"
+msgstr "Internal IP address"
+
+msgid "Internal port"
+msgstr "Internal port"
+
+msgid "Internal port (optional)"
+msgstr "Internal port (optional)"
+
+msgid "Limit log messages"
+msgstr ""
+
+msgid "MSS clamping"
+msgstr "MSS clamping"
+
+msgid "Masquerading"
+msgstr "Masquerading"
+
+msgid "Match ICMP type"
+msgstr ""
+
+msgid ""
+"Match incoming traffic directed at the given destination port or port range "
+"on this host"
+msgstr ""
+"Match incoming traffic directed at the given destination port or port range "
+"on this host"
+
+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 "Name"
+msgstr "Name"
+
+msgid "Output"
+msgstr "Output"
+
+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 "Protocol"
+msgstr "Protocol"
+
+msgid ""
+"Redirect matched incoming traffic to the given port on the internal host"
+msgstr ""
+"Redirect matched incoming traffic to the given port on the internal host"
+
+msgid "Redirect matched incoming traffic to the specified internal host"
+msgstr "Redirect matched incoming traffic to the specified internal host"
+
+msgid "Redirection type"
+msgstr ""
+
+msgid "Redirections"
+msgstr ""
+
+msgid "Restrict Masquerading to given destination subnets"
+msgstr ""
+
+msgid "Restrict Masquerading to given source subnets"
+msgstr ""
+
+msgid "Restrict to address family"
+msgstr ""
+
+msgid "Rules"
+msgstr "Rules"
+
+msgid "Source"
+msgstr "Source"
 
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 # Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/rrule.lua      #
@@ -243,65 +297,123 @@ msgstr "Source MAC-address"
 msgid "Source IP address"
 msgstr "Source IP address"
 
-msgid ""
-"Match incoming traffic originating from the given source port or port range "
-"on the client host"
+msgid "Source MAC address"
 msgstr ""
-"Match incoming traffic originating from the given source port or port range "
-"on the client host"
 
-msgid "External port"
-msgstr "External port"
+msgid "Source address"
+msgstr "Source address"
+
+msgid "Source port"
+msgstr "Source port"
+
+msgid "Source zone"
+msgstr "Source zone"
 
 msgid ""
-"Match incoming traffic directed at the given destination port or port range "
-"on this host"
+"The firewall creates zones over your network interfaces to control network "
+"traffic flow."
 msgstr ""
-"Match incoming traffic directed at the given destination port or port range "
-"on this host"
-
-msgid "Internal IP address"
-msgstr "Internal IP address"
-
-msgid "Redirect matched incoming traffic to the specified internal host"
-msgstr "Redirect matched incoming traffic to the specified internal host"
-
-msgid "Internal port (optional)"
-msgstr "Internal port (optional)"
+"The firewall creates zones over your network interfaces to control network "
+"traffic flow."
 
 msgid ""
-"Redirect matched incoming traffic to the given port on the internal host"
+"The options below control the forwarding policies between this zone (%s) and "
+"other zones. <em>Destination zones</em> cover forwarded traffic "
+"<strong>originating from %q</strong>. <em>Source zones</em> match forwarded "
+"traffic from other zones <strong>targeted at %q</strong>. The forwarding "
+"rule is <em>unidirectional</em>, e.g. a forward from lan to wan does "
+"<em>not</em> imply a permission to forward from wan to lan as well."
+msgstr ""
+
+msgid ""
+"This section defines common properties of %q. The <em>input</em> and "
+"<em>output</em> options set the default policies for traffic entering and "
+"leaving this zone while the <em>forward</em> option describes the policy for "
+"forwarded traffic between different networks within the zone. <em>Covered "
+"networks</em> specifies which available networks are member of this zone."
 msgstr ""
-"Redirect matched incoming traffic to the given port on the internal host"
 
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-# Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/miniportfw.lua #
+# Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/redirect.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 "Traffic Redirection"
+msgstr "Traffic Redirection"
 
 msgid ""
-"Port forwarding allows to provide network services in the internal network "
-"to an external network."
+"Traffic redirection allows you to change the destination address of "
+"forwarded packets."
 msgstr ""
-"Port forwarding allows to provide network services in the internal network "
-"to an external network."
+"Traffic redirection allows you to change the destination address of "
+"forwarded packets."
 
-msgid "Internal port"
-msgstr "Internal port"
+msgid "Via"
+msgstr ""
+
+msgid "Zone %q"
+msgstr ""
+
+msgid "Zone ⇒ Forwardings"
+msgstr ""
+
+msgid "Zones"
+msgstr "Zones"
+
+msgid "accept"
+msgstr "accept"
+
+msgid "any"
+msgstr "any"
+
+msgid "drop"
+msgstr "drop"
+
+msgid "reject"
+msgstr "reject"
+
+#~ msgid "Network"
+#~ msgstr "Network"
+
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+# Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/traffic.lua    #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#
+# msgid "Name"
+# msgstr ""
+#
+#~ msgid "Traffic Control"
+#~ msgstr "Traffic Control"
+
+#~ msgid "Zone-to-Zone traffic"
+#~ msgstr "Zone-to-Zone traffic"
+
+#~ msgid ""
+#~ "Here you can specify which network traffic is allowed to flow between "
+#~ "network zones. Only new connections will be matched.  Packets belonging "
+#~ "to already open connections are automatically allowed to pass the "
+#~ "firewall. If you experience occasional connection problems try enabling "
+#~ "MSS Clamping otherwise disable it for performance reasons."
+#~ msgstr ""
+#~ "Here you can specify which network traffic is allowed to flow between "
+#~ "network zones. Only new connections will be matched.  Packets belonging "
+#~ "to already open connections are automatically allowed to pass the "
+#~ "firewall. If you experience occasional connection problems try enabling "
+#~ "MSS Clamping otherwise disable it for performance reasons."
+
+#~ msgid "Zone"
+#~ msgstr "Zone"
+
+#~ msgid "Destination IP"
+#~ msgstr "Destination IP"
+
+#~ msgid "IP address"
+#~ msgstr "IP address"
+
+#~ msgid "Source MAC-address"
+#~ msgstr "Source MAC-address"
diff --git a/po/es/firewall.po b/po/es/firewall.po
index 4a223906e8..653a6387f4 100644
--- a/po/es/firewall.po
+++ b/po/es/firewall.po
@@ -11,130 +11,21 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-msgid "Firewall"
-msgstr "Corta fuego"
-
-msgid ""
-"The firewall creates zones over your network interfaces to control network "
-"traffic flow."
-msgstr ""
-"El corta fuego crea zonas sobre sus interfaces de red para controlar el "
-"flujo del tráfico."
-
-#, fuzzy
-msgid "Enable SYN-flood protection"
-msgstr "Protección por exceso de SYN"
-
-msgid "Drop invalid packets"
-msgstr "Rechazar paquetes inválidos"
-
-msgid "Input"
-msgstr "Entrada"
-
-msgid "Output"
-msgstr "Salida"
-
-msgid "Forward"
-msgstr ""
-
-msgid "reject"
-msgstr "desechar"
-
-msgid "drop"
-msgstr "rechazar"
-
-msgid "accept"
-msgstr "aceptar"
-
-msgid "Zones"
-msgstr "Zonas"
-
-msgid "Name"
-msgstr ""
-
-msgid "Masquerading"
-msgstr ""
-
-#, fuzzy
-msgid "MSS clamping"
-msgstr "MSS Clamping"
-
-#, fuzzy
-msgid "Network"
-msgstr "Redes"
-
-msgid "Traffic Control"
-msgstr "Control de tráfico"
-
-msgid "Zone-to-Zone traffic"
-msgstr "Tráfico Zona-a-Zona"
-
-#, fuzzy
-msgid ""
-"Here you can specify which network traffic is allowed to flow between "
-"network zones. Only new connections will be matched.  Packets belonging to "
-"already open connections are automatically allowed to pass the firewall. If "
-"you experience occasional connection problems try enabling MSS Clamping "
-"otherwise disable it for performance reasons."
-msgstr ""
-"Aquí puede especificar qué tráfico de red is permitido, discho tráfico "
-"fluirá entre las zonas de red definidas. Sólamente las nuevas conexiones "
-"serán aplicadas por las reglas. Los paquetes pertenecientes a conexiones ya "
-"abierta se les permitirá el paso sobre el corta fuego. Si experimenta "
-"ocacionalmente problemas de conexión, intente activar MSS Clamping de otra "
-"forma, deshabilitelo para mejorar considerablemente la performance."
-
-msgid "Source"
-msgstr "Origen"
-
-msgid "Destination"
-msgstr "Destino"
-
-msgid "Rules"
-msgstr ""
-
-msgid "Protocol"
-msgstr ""
-
-msgid "Device"
+msgid "(optional)"
 msgstr ""
 
 msgid "Action"
 msgstr "Acción"
 
-msgid "Traffic Redirection"
-msgstr "Redirección de tráfico"
-
-msgid ""
-"Traffic redirection allows you to change the destination address of "
-"forwarded packets."
+msgid "Advanced Options"
 msgstr ""
-"La redirección de tráfico permite cambiar la dirección de destino de los "
-"paquetes reenviados."
-
-msgid "(optional)"
-msgstr ""
-
-msgid "Zone"
-msgstr "Zona"
-
-msgid "Source port"
-msgstr "Puerto de origen"
-
-#, fuzzy
-msgid "Destination IP"
-msgstr "Destino"
-
-#, fuzzy
-msgid "IP address"
-msgstr "Dirección IP"
-
-msgid "Destination port"
-msgstr "Puerto de destino"
 
 msgid "Advanced Rules"
 msgstr "Reglas avanzadas"
 
+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 "
@@ -145,60 +36,138 @@ msgstr ""
 "Los paquetes pertenecientes a conexiones ya abierta, se les permite el libre "
 "paso por el corta fuego."
 
-msgid "Overview"
+msgid "Allow forward from <em>source zones</em>:"
 msgstr ""
 
-#, fuzzy
-msgid "Source zone"
-msgstr "Puerto de origen"
+msgid "Allow forward to <em>destination zones</em>:"
+msgstr ""
+
+msgid "Any"
+msgstr ""
+
+msgid "Covered networks"
+msgstr ""
+
+msgid "Custom Rules"
+msgstr ""
+
+msgid "Custom Rules (/etc/firewall.user)"
+msgstr ""
+
+msgid "Destination"
+msgstr "Destino"
+
+msgid "Destination address"
+msgstr "Dirección de destino"
+
+msgid "Destination port"
+msgstr "Puerto de destino"
 
 #, fuzzy
 msgid "Destination zone"
 msgstr "Destino"
 
-msgid "any"
+msgid "Device"
+msgstr ""
+
+msgid "Drop invalid packets"
+msgstr "Rechazar paquetes inválidos"
+
+msgid "Enable NAT Loopback"
 msgstr ""
 
 #, fuzzy
-msgid "Source address"
-msgstr "Dirección MAC de origen"
+msgid "Enable SYN-flood protection"
+msgstr "Protección por exceso de SYN"
 
-msgid "Destination address"
-msgstr "Dirección de destino"
-
-#, fuzzy
-msgid "Source MAC-address"
-msgstr "Dirección MAC de origen"
-
-#, fuzzy
-msgid "Source IP address"
-msgstr "Dirección MAC de origen"
-
-msgid ""
-"Match incoming traffic originating from the given source port or port range "
-"on the client host"
+msgid "Enable logging on this zone"
 msgstr ""
 
 msgid "External port"
 msgstr "Puerto externo"
 
+msgid "Family"
+msgstr ""
+
+msgid "Firewall"
+msgstr "Corta fuego"
+
+msgid "Firewall - Zone Settings"
+msgstr ""
+
 msgid ""
-"Match incoming traffic directed at the given destination port or port range "
-"on this host"
+"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 "General Settings"
+msgstr ""
+
+msgid "IPv4 and IPv6"
+msgstr ""
+
+msgid "IPv4 only"
+msgstr ""
+
+msgid "IPv6 only"
+msgstr ""
+
+msgid "Input"
+msgstr "Entrada"
+
+msgid "Intended destination address"
+msgstr ""
+
+msgid "Inter-Zone Forwarding"
 msgstr ""
 
 #, fuzzy
 msgid "Internal IP address"
 msgstr "Dirección interna"
 
-msgid "Redirect matched incoming traffic to the specified internal host"
-msgstr ""
+#, fuzzy
+msgid "Internal port"
+msgstr "Puerto externo"
 
 msgid "Internal port (optional)"
 msgstr "Puerto interno (opcional)"
 
+msgid "Limit log messages"
+msgstr ""
+
+#, fuzzy
+msgid "MSS clamping"
+msgstr "MSS Clamping"
+
+msgid "Masquerading"
+msgstr ""
+
+msgid "Match ICMP type"
+msgstr ""
+
 msgid ""
-"Redirect matched incoming traffic to the given port on the internal host"
+"Match incoming traffic directed at the given destination port or port range "
+"on this host"
+msgstr ""
+
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Output"
+msgstr "Salida"
+
+msgid "Overview"
 msgstr ""
 
 msgid "Port forwarding"
@@ -211,9 +180,152 @@ 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 ""
+
+msgid ""
+"Redirect matched incoming traffic to the given port on the internal host"
+msgstr ""
+
+msgid "Redirect matched incoming traffic to the specified internal host"
+msgstr ""
+
+msgid "Redirection type"
+msgstr ""
+
+msgid "Redirections"
+msgstr ""
+
+msgid "Restrict Masquerading to given destination subnets"
+msgstr ""
+
+msgid "Restrict Masquerading to given source subnets"
+msgstr ""
+
+msgid "Restrict to address family"
+msgstr ""
+
+msgid "Rules"
+msgstr ""
+
+msgid "Source"
+msgstr "Origen"
+
 #, fuzzy
-msgid "Internal port"
-msgstr "Puerto externo"
+msgid "Source IP address"
+msgstr "Dirección MAC de origen"
+
+msgid "Source MAC address"
+msgstr ""
+
+#, fuzzy
+msgid "Source address"
+msgstr "Dirección MAC de origen"
+
+msgid "Source port"
+msgstr "Puerto de origen"
+
+#, fuzzy
+msgid "Source zone"
+msgstr "Puerto de origen"
+
+msgid ""
+"The firewall creates zones over your network interfaces to control network "
+"traffic flow."
+msgstr ""
+"El corta fuego crea zonas sobre sus interfaces de red para controlar el "
+"flujo del tráfico."
+
+msgid ""
+"The options below control the forwarding policies between this zone (%s) and "
+"other zones. <em>Destination zones</em> cover forwarded traffic "
+"<strong>originating from %q</strong>. <em>Source zones</em> match forwarded "
+"traffic from other zones <strong>targeted at %q</strong>. The forwarding "
+"rule is <em>unidirectional</em>, e.g. a forward from lan to wan does "
+"<em>not</em> imply a permission to forward from wan to lan as well."
+msgstr ""
+
+msgid ""
+"This section defines common properties of %q. The <em>input</em> and "
+"<em>output</em> options set the default policies for traffic entering and "
+"leaving this zone while the <em>forward</em> option describes the policy for "
+"forwarded traffic between different networks within the zone. <em>Covered "
+"networks</em> specifies which available networks are member of this zone."
+msgstr ""
+
+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."
+
+msgid "Via"
+msgstr ""
+
+msgid "Zone %q"
+msgstr ""
+
+msgid "Zone ⇒ Forwardings"
+msgstr ""
+
+msgid "Zones"
+msgstr "Zonas"
+
+msgid "accept"
+msgstr "aceptar"
+
+msgid "any"
+msgstr ""
+
+msgid "drop"
+msgstr "rechazar"
+
+msgid "reject"
+msgstr "desechar"
+
+#, fuzzy
+#~ msgid "Network"
+#~ msgstr "Redes"
+
+#~ msgid "Traffic Control"
+#~ msgstr "Control de tráfico"
+
+#~ msgid "Zone-to-Zone traffic"
+#~ msgstr "Tráfico Zona-a-Zona"
+
+#, fuzzy
+#~ msgid ""
+#~ "Here you can specify which network traffic is allowed to flow between "
+#~ "network zones. Only new connections will be matched.  Packets belonging "
+#~ "to already open connections are automatically allowed to pass the "
+#~ "firewall. If you experience occasional connection problems try enabling "
+#~ "MSS Clamping otherwise disable it for performance reasons."
+#~ msgstr ""
+#~ "Aquí puede especificar qué tráfico de red is permitido, discho tráfico "
+#~ "fluirá entre las zonas de red definidas. Sólamente las nuevas conexiones "
+#~ "serán aplicadas por las reglas. Los paquetes pertenecientes a conexiones "
+#~ "ya abierta se les permitirá el paso sobre el corta fuego. Si experimenta "
+#~ "ocacionalmente problemas de conexión, intente activar MSS Clamping de "
+#~ "otra forma, deshabilitelo para mejorar considerablemente la performance."
+
+#~ msgid "Zone"
+#~ msgstr "Zona"
+
+#, fuzzy
+#~ msgid "Destination IP"
+#~ msgstr "Destino"
+
+#, fuzzy
+#~ msgid "IP address"
+#~ msgstr "Dirección IP"
+
+#, fuzzy
+#~ msgid "Source MAC-address"
+#~ msgstr "Dirección MAC de origen"
 
 #~ msgid "Custom forwarding"
 #~ msgstr "Renvío personalizado"
diff --git a/po/fr/firewall.po b/po/fr/firewall.po
index 548feeb09b..3e672e97cb 100644
--- a/po/fr/firewall.po
+++ b/po/fr/firewall.po
@@ -12,141 +12,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-#  applications/luci-fw/luasrc/model/cbi/luci_fw/zones.lua                    #
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-#
-msgid "Firewall"
-msgstr "Pare-feu"
-
-msgid ""
-"The firewall creates zones over your network interfaces to control network "
-"traffic flow."
-msgstr ""
-"Le pare-feu crée des zones sur les interfaces réseau pour contrôler le flux "
-"du trafic réseau."
-
-msgid "Enable SYN-flood protection"
-msgstr "Activer la protection contre le SYN-flood"
-
-msgid "Drop invalid packets"
-msgstr "Ignorer les paquets invalides"
-
-msgid "Input"
-msgstr "Entrée"
-
-msgid "Output"
-msgstr "Sortie"
-
-msgid "Forward"
-msgstr "Transfert"
-
-msgid "reject"
-msgstr "rejeter"
-
-msgid "drop"
-msgstr "ignorer"
-
-msgid "accept"
-msgstr "accepter"
-
-msgid "Zones"
-msgstr "Zones"
-
-msgid "Name"
-msgstr "Nom"
-
-msgid "Masquerading"
-msgstr ""
-
-msgid "MSS clamping"
-msgstr ""
-
-msgid "Network"
-msgstr "Réseau"
-
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-#  applications/luci-fw/luasrc/model/cbi/luci_fw/traffic.lua                  #
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-#
-# msgid "Name"
-# msgstr ""
-#
-msgid "Traffic Control"
-msgstr "Contrôle de trafic"
-
-msgid "Zone-to-Zone traffic"
-msgstr "Trafic zone-à-zone"
-
-msgid ""
-"Here you can specify which network traffic is allowed to flow between "
-"network zones. Only new connections will be matched.  Packets belonging to "
-"already open connections are automatically allowed to pass the firewall. If "
-"you experience occasional connection problems try enabling MSS Clamping "
-"otherwise disable it for performance reasons."
-msgstr ""
-"Ici, vous pouvez spécifier quel trafic réseau est autorisé à transiter entre "
-"les zones réseau. Seules les nouvelles connexions seront prises en compte. "
-"Les paquets appartenant à des connexions déjà ouvertes sont automatiquement "
-"admis à passer le pare-feu. Si vous subissez des problèmes de connexion "
-"occasionnels, essayer d'activer le MSS clamping; sinon laissez-le désactivé "
-"pour des raisons de performance."
-
-msgid "Source"
-msgstr "Source"
-
-msgid "Destination"
-msgstr "Destination"
-
-msgid "Rules"
-msgstr "Règles"
-
-msgid "Protocol"
-msgstr "Protocole"
-
-msgid "Device"
-msgstr "Équipement"
+msgid "(optional)"
+msgstr "(optionnel)"
 
 msgid "Action"
 msgstr "Action"
 
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-#  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."
+msgid "Advanced Options"
 msgstr ""
-"La redirection de trafic vous permet de changer l'adresse de destination des "
-"paquets transférés."
-
-msgid "(optional)"
-msgstr "(optionnel)"
-
-msgid "Zone"
-msgstr "Zone"
-
-msgid "Source port"
-msgstr "Port source"
-
-msgid "Destination IP"
-msgstr "IP de destination"
-
-msgid "IP address"
-msgstr "Adresse IP"
-
-msgid "Destination port"
-msgstr "Port de destination"
 
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 #  applications/luci-fw/luasrc/model/cbi/luci_fw/trule.lua                    #
@@ -182,6 +55,9 @@ msgstr "Port de destination"
 msgid "Advanced Rules"
 msgstr "Règles avancées"
 
+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 "
@@ -192,27 +68,204 @@ msgstr ""
 "paquets appartenant à des connexions déjà ouvertes sont automatiquement "
 "admis à passer le pare-feu."
 
-msgid "Overview"
-msgstr "Vue d'ensemble"
+msgid "Allow forward from <em>source zones</em>:"
+msgstr ""
 
-msgid "Source zone"
-msgstr "Zone source"
+msgid "Allow forward to <em>destination zones</em>:"
+msgstr ""
 
-msgid "Destination zone"
-msgstr "Zone de destination"
+msgid "Any"
+msgstr ""
 
-#, fuzzy
-msgid "any"
-msgstr "tous"
+msgid "Covered networks"
+msgstr ""
 
-msgid "Source address"
-msgstr "Adresse source"
+msgid "Custom Rules"
+msgstr ""
+
+msgid "Custom Rules (/etc/firewall.user)"
+msgstr ""
+
+msgid "Destination"
+msgstr "Destination"
 
 msgid "Destination address"
 msgstr "Adresse de destination"
 
-msgid "Source MAC-address"
-msgstr "Adresse MAC source"
+msgid "Destination port"
+msgstr "Port de destination"
+
+msgid "Destination zone"
+msgstr "Zone de destination"
+
+msgid "Device"
+msgstr "Équipement"
+
+msgid "Drop invalid packets"
+msgstr "Ignorer les paquets invalides"
+
+msgid "Enable NAT Loopback"
+msgstr ""
+
+msgid "Enable SYN-flood protection"
+msgstr "Activer la protection contre le SYN-flood"
+
+msgid "Enable logging on this zone"
+msgstr ""
+
+msgid "External port"
+msgstr "Port externe"
+
+msgid "Family"
+msgstr ""
+
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#  applications/luci-fw/luasrc/model/cbi/luci_fw/zones.lua                    #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#
+msgid "Firewall"
+msgstr "Pare-feu"
+
+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 "Transfert"
+
+msgid "General Settings"
+msgstr ""
+
+msgid "IPv4 and IPv6"
+msgstr ""
+
+msgid "IPv4 only"
+msgstr ""
+
+msgid "IPv6 only"
+msgstr ""
+
+msgid "Input"
+msgstr "Entrée"
+
+msgid "Intended destination address"
+msgstr ""
+
+msgid "Inter-Zone Forwarding"
+msgstr ""
+
+msgid "Internal IP address"
+msgstr "Adresse IP interne"
+
+msgid "Internal port"
+msgstr "Port interne"
+
+msgid "Internal port (optional)"
+msgstr "Port interne (optionnel)"
+
+msgid "Limit log messages"
+msgstr ""
+
+msgid "MSS clamping"
+msgstr ""
+
+msgid "Masquerading"
+msgstr ""
+
+msgid "Match ICMP type"
+msgstr ""
+
+msgid ""
+"Match incoming traffic directed at the given destination port or port range "
+"on this host"
+msgstr ""
+"Prendre en compte le trafic dirigé vers le port de destination donné (ou la "
+"gamme de ports) sur cet hôte"
+
+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 "Name"
+msgstr "Nom"
+
+msgid "Output"
+msgstr "Sortie"
+
+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 "Protocol"
+msgstr "Protocole"
+
+msgid ""
+"Redirect matched incoming traffic to the given port on the internal host"
+msgstr ""
+"Rediriger le trafic entrant correspondant vers le port donné sur l'hôte "
+"interne"
+
+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 ""
+
+msgid "Redirections"
+msgstr ""
+
+msgid "Restrict Masquerading to given destination subnets"
+msgstr ""
+
+msgid "Restrict Masquerading to given source subnets"
+msgstr ""
+
+msgid "Restrict to address family"
+msgstr ""
+
+msgid "Rules"
+msgstr "Règles"
+
+msgid "Source"
+msgstr "Source"
 
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 #  applications/luci-fw/luasrc/model/cbi/luci_fw/rrule.lua                    #
@@ -247,66 +300,125 @@ msgstr "Adresse MAC source"
 msgid "Source IP address"
 msgstr "Adresse IP source"
 
-msgid ""
-"Match incoming traffic originating from the given source port or port range "
-"on the client host"
+msgid "Source MAC address"
 msgstr ""
-"Prendre en compte le trafic entrant provenant du port source donné (ou la "
-"gamme de ports) sur l'hôte client"
 
-msgid "External port"
-msgstr "Port externe"
+msgid "Source address"
+msgstr "Adresse source"
+
+msgid "Source port"
+msgstr "Port source"
+
+msgid "Source zone"
+msgstr "Zone source"
 
 msgid ""
-"Match incoming traffic directed at the given destination port or port range "
-"on this host"
+"The firewall creates zones over your network interfaces to control network "
+"traffic flow."
 msgstr ""
-"Prendre en compte le trafic dirigé vers le port de destination donné (ou la "
-"gamme de ports) sur cet hôte"
-
-msgid "Internal IP address"
-msgstr "Adresse IP interne"
-
-msgid "Redirect matched incoming traffic to the specified internal host"
-msgstr "Rediriger le trafic entrant correspondant vers l'hôte interne spécifié"
-
-msgid "Internal port (optional)"
-msgstr "Port interne (optionnel)"
+"Le pare-feu crée des zones sur les interfaces réseau pour contrôler le flux "
+"du trafic réseau."
 
 msgid ""
-"Redirect matched incoming traffic to the given port on the internal host"
+"The options below control the forwarding policies between this zone (%s) and "
+"other zones. <em>Destination zones</em> cover forwarded traffic "
+"<strong>originating from %q</strong>. <em>Source zones</em> match forwarded "
+"traffic from other zones <strong>targeted at %q</strong>. The forwarding "
+"rule is <em>unidirectional</em>, e.g. a forward from lan to wan does "
+"<em>not</em> imply a permission to forward from wan to lan as well."
+msgstr ""
+
+msgid ""
+"This section defines common properties of %q. The <em>input</em> and "
+"<em>output</em> options set the default policies for traffic entering and "
+"leaving this zone while the <em>forward</em> option describes the policy for "
+"forwarded traffic between different networks within the zone. <em>Covered "
+"networks</em> specifies which available networks are member of this zone."
 msgstr ""
-"Rediriger le trafic entrant correspondant vers le port donné sur l'hôte "
-"interne"
 
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-#  applications/luci-fw/luasrc/model/cbi/luci_fw/miniportfw.lua               #
+#  applications/luci-fw/luasrc/model/cbi/luci_fw/redirect.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 "Traffic Redirection"
+msgstr "Redirection du trafic"
 
 msgid ""
-"Port forwarding allows to provide network services in the internal network "
-"to an external network."
+"Traffic redirection allows you to change the destination address of "
+"forwarded packets."
 msgstr ""
-"La redirection de port vous permet d'exposer des services réseaux de votre "
-"réseau local au réseau externe."
+"La redirection de trafic vous permet de changer l'adresse de destination des "
+"paquets transférés."
 
-msgid "Internal port"
-msgstr "Port interne"
+msgid "Via"
+msgstr ""
+
+msgid "Zone %q"
+msgstr ""
+
+msgid "Zone ⇒ Forwardings"
+msgstr ""
+
+msgid "Zones"
+msgstr "Zones"
+
+msgid "accept"
+msgstr "accepter"
+
+#, fuzzy
+msgid "any"
+msgstr "tous"
+
+msgid "drop"
+msgstr "ignorer"
+
+msgid "reject"
+msgstr "rejeter"
+
+#~ msgid "Network"
+#~ msgstr "Réseau"
+
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#  applications/luci-fw/luasrc/model/cbi/luci_fw/traffic.lua                  #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#
+# msgid "Name"
+# msgstr ""
+#
+#~ msgid "Traffic Control"
+#~ msgstr "Contrôle de trafic"
+
+#~ msgid "Zone-to-Zone traffic"
+#~ msgstr "Trafic zone-à-zone"
+
+#~ msgid ""
+#~ "Here you can specify which network traffic is allowed to flow between "
+#~ "network zones. Only new connections will be matched.  Packets belonging "
+#~ "to already open connections are automatically allowed to pass the "
+#~ "firewall. If you experience occasional connection problems try enabling "
+#~ "MSS Clamping otherwise disable it for performance reasons."
+#~ msgstr ""
+#~ "Ici, vous pouvez spécifier quel trafic réseau est autorisé à transiter "
+#~ "entre les zones réseau. Seules les nouvelles connexions seront prises en "
+#~ "compte. Les paquets appartenant à des connexions déjà ouvertes sont "
+#~ "automatiquement admis à passer le pare-feu. Si vous subissez des "
+#~ "problèmes de connexion occasionnels, essayer d'activer le MSS clamping; "
+#~ "sinon laissez-le désactivé pour des raisons de performance."
+
+#~ msgid "Zone"
+#~ msgstr "Zone"
+
+#~ msgid "Destination IP"
+#~ msgstr "IP de destination"
+
+#~ msgid "IP address"
+#~ msgstr "Adresse IP"
+
+#~ msgid "Source MAC-address"
+#~ msgstr "Adresse MAC source"
diff --git a/po/it/firewall.po b/po/it/firewall.po
index d0d83b7ea0..b7231a37e9 100644
--- a/po/it/firewall.po
+++ b/po/it/firewall.po
@@ -12,139 +12,193 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-msgid "Firewall"
-msgstr ""
-
-msgid ""
-"The firewall creates zones over your network interfaces to control network "
-"traffic flow."
-msgstr ""
-
-msgid "Enable SYN-flood protection"
-msgstr ""
-
-msgid "Drop invalid packets"
-msgstr ""
-
-msgid "Input"
-msgstr ""
-
-msgid "Output"
-msgstr ""
-
-msgid "Forward"
-msgstr ""
-
-msgid "reject"
-msgstr ""
-
-msgid "drop"
-msgstr ""
-
-msgid "accept"
-msgstr ""
-
-msgid "Zones"
-msgstr ""
-
-msgid "Name"
-msgstr ""
-
-msgid "Masquerading"
-msgstr ""
-
-msgid "MSS clamping"
-msgstr ""
-
-msgid "Network"
-msgstr ""
-
-msgid "Traffic Control"
-msgstr ""
-
-msgid "Zone-to-Zone traffic"
-msgstr ""
-
-msgid ""
-"Here you can specify which network traffic is allowed to flow between "
-"network zones. Only new connections will be matched.  Packets belonging to "
-"already open connections are automatically allowed to pass the firewall. If "
-"you experience occasional connection problems try enabling MSS Clamping "
-"otherwise disable it for performance reasons."
-msgstr ""
-
-msgid "Source"
-msgstr ""
-
-msgid "Destination"
-msgstr ""
-
-msgid "Rules"
-msgstr ""
-
-msgid "Protocol"
-msgstr ""
-
-msgid "Device"
+msgid "(optional)"
 msgstr ""
 
 msgid "Action"
 msgstr ""
 
-msgid "Traffic Redirection"
-msgstr ""
-
-msgid ""
-"Traffic redirection allows you to change the destination address of "
-"forwarded packets."
-msgstr ""
-
-msgid "(optional)"
-msgstr ""
-
-msgid "Zone"
-msgstr ""
-
-msgid "Source port"
-msgstr ""
-
-msgid "Destination IP"
-msgstr ""
-
-msgid "IP address"
-msgstr ""
-
-msgid "Destination port"
+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 "Overview"
+msgid "Allow forward from <em>source zones</em>:"
 msgstr ""
 
-msgid "Source zone"
+msgid "Allow forward to <em>destination zones</em>:"
 msgstr ""
 
-msgid "Destination zone"
+msgid "Any"
 msgstr ""
 
-msgid "any"
+msgid "Covered networks"
 msgstr ""
 
-msgid "Source address"
+msgid "Custom Rules"
+msgstr ""
+
+msgid "Custom Rules (/etc/firewall.user)"
+msgstr ""
+
+msgid "Destination"
 msgstr ""
 
 msgid "Destination address"
 msgstr ""
 
-msgid "Source MAC-address"
+msgid "Destination port"
+msgstr ""
+
+msgid "Destination zone"
+msgstr ""
+
+msgid "Device"
+msgstr ""
+
+msgid "Drop invalid packets"
+msgstr ""
+
+msgid "Enable NAT Loopback"
+msgstr ""
+
+msgid "Enable SYN-flood protection"
+msgstr ""
+
+msgid "Enable logging on this zone"
+msgstr ""
+
+msgid "External port"
+msgstr ""
+
+msgid "Family"
+msgstr ""
+
+msgid "Firewall"
+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 "General Settings"
+msgstr ""
+
+msgid "IPv4 and IPv6"
+msgstr ""
+
+msgid "IPv4 only"
+msgstr ""
+
+msgid "IPv6 only"
+msgstr ""
+
+msgid "Input"
+msgstr ""
+
+msgid "Intended destination address"
+msgstr ""
+
+msgid "Inter-Zone Forwarding"
+msgstr ""
+
+msgid "Internal IP address"
+msgstr ""
+
+msgid "Internal port"
+msgstr ""
+
+msgid "Internal port (optional)"
+msgstr ""
+
+msgid "Limit log messages"
+msgstr ""
+
+msgid "MSS clamping"
+msgstr ""
+
+msgid "Masquerading"
+msgstr ""
+
+msgid "Match ICMP type"
+msgstr ""
+
+msgid ""
+"Match incoming traffic directed at the given destination port or port range "
+"on this host"
+msgstr ""
+
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Output"
+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 "Protocol"
+msgstr ""
+
+msgid ""
+"Redirect matched incoming traffic to the given port on the internal host"
+msgstr ""
+
+msgid "Redirect matched incoming traffic to the specified internal host"
+msgstr ""
+
+msgid "Redirection type"
+msgstr ""
+
+msgid "Redirections"
+msgstr ""
+
+msgid "Restrict Masquerading to given destination subnets"
+msgstr ""
+
+msgid "Restrict Masquerading to given source subnets"
+msgstr ""
+
+msgid "Restrict to address family"
+msgstr ""
+
+msgid "Rules"
+msgstr ""
+
+msgid "Source"
 msgstr ""
 
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
@@ -180,39 +234,68 @@ msgstr ""
 msgid "Source IP address"
 msgstr ""
 
-msgid ""
-"Match incoming traffic originating from the given source port or port range "
-"on the client host"
+msgid "Source MAC address"
 msgstr ""
 
-msgid "External port"
+msgid "Source address"
+msgstr ""
+
+msgid "Source port"
+msgstr ""
+
+msgid "Source zone"
 msgstr ""
 
 msgid ""
-"Match incoming traffic directed at the given destination port or port range "
-"on this host"
-msgstr ""
-
-msgid "Internal IP address"
-msgstr ""
-
-msgid "Redirect matched incoming traffic to the specified internal host"
-msgstr ""
-
-msgid "Internal port (optional)"
+"The firewall creates zones over your network interfaces to control network "
+"traffic flow."
 msgstr ""
 
 msgid ""
-"Redirect matched incoming traffic to the given port on the internal host"
-msgstr ""
-
-msgid "Port forwarding"
+"The options below control the forwarding policies between this zone (%s) and "
+"other zones. <em>Destination zones</em> cover forwarded traffic "
+"<strong>originating from %q</strong>. <em>Source zones</em> match forwarded "
+"traffic from other zones <strong>targeted at %q</strong>. The forwarding "
+"rule is <em>unidirectional</em>, e.g. a forward from lan to wan does "
+"<em>not</em> imply a permission to forward from wan to lan as well."
 msgstr ""
 
 msgid ""
-"Port forwarding allows to provide network services in the internal network "
-"to an external network."
+"This section defines common properties of %q. The <em>input</em> and "
+"<em>output</em> options set the default policies for traffic entering and "
+"leaving this zone while the <em>forward</em> option describes the policy for "
+"forwarded traffic between different networks within the zone. <em>Covered "
+"networks</em> specifies which available networks are member of this zone."
 msgstr ""
 
-msgid "Internal port"
+msgid "Traffic Redirection"
+msgstr ""
+
+msgid ""
+"Traffic redirection allows you to change the destination address of "
+"forwarded packets."
+msgstr ""
+
+msgid "Via"
+msgstr ""
+
+msgid "Zone %q"
+msgstr ""
+
+msgid "Zone ⇒ Forwardings"
+msgstr ""
+
+msgid "Zones"
+msgstr ""
+
+msgid "accept"
+msgstr ""
+
+msgid "any"
+msgstr ""
+
+msgid "drop"
+msgstr ""
+
+msgid "reject"
 msgstr ""
diff --git a/po/ja/firewall.po b/po/ja/firewall.po
index d0d83b7ea0..b7231a37e9 100644
--- a/po/ja/firewall.po
+++ b/po/ja/firewall.po
@@ -12,139 +12,193 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-msgid "Firewall"
-msgstr ""
-
-msgid ""
-"The firewall creates zones over your network interfaces to control network "
-"traffic flow."
-msgstr ""
-
-msgid "Enable SYN-flood protection"
-msgstr ""
-
-msgid "Drop invalid packets"
-msgstr ""
-
-msgid "Input"
-msgstr ""
-
-msgid "Output"
-msgstr ""
-
-msgid "Forward"
-msgstr ""
-
-msgid "reject"
-msgstr ""
-
-msgid "drop"
-msgstr ""
-
-msgid "accept"
-msgstr ""
-
-msgid "Zones"
-msgstr ""
-
-msgid "Name"
-msgstr ""
-
-msgid "Masquerading"
-msgstr ""
-
-msgid "MSS clamping"
-msgstr ""
-
-msgid "Network"
-msgstr ""
-
-msgid "Traffic Control"
-msgstr ""
-
-msgid "Zone-to-Zone traffic"
-msgstr ""
-
-msgid ""
-"Here you can specify which network traffic is allowed to flow between "
-"network zones. Only new connections will be matched.  Packets belonging to "
-"already open connections are automatically allowed to pass the firewall. If "
-"you experience occasional connection problems try enabling MSS Clamping "
-"otherwise disable it for performance reasons."
-msgstr ""
-
-msgid "Source"
-msgstr ""
-
-msgid "Destination"
-msgstr ""
-
-msgid "Rules"
-msgstr ""
-
-msgid "Protocol"
-msgstr ""
-
-msgid "Device"
+msgid "(optional)"
 msgstr ""
 
 msgid "Action"
 msgstr ""
 
-msgid "Traffic Redirection"
-msgstr ""
-
-msgid ""
-"Traffic redirection allows you to change the destination address of "
-"forwarded packets."
-msgstr ""
-
-msgid "(optional)"
-msgstr ""
-
-msgid "Zone"
-msgstr ""
-
-msgid "Source port"
-msgstr ""
-
-msgid "Destination IP"
-msgstr ""
-
-msgid "IP address"
-msgstr ""
-
-msgid "Destination port"
+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 "Overview"
+msgid "Allow forward from <em>source zones</em>:"
 msgstr ""
 
-msgid "Source zone"
+msgid "Allow forward to <em>destination zones</em>:"
 msgstr ""
 
-msgid "Destination zone"
+msgid "Any"
 msgstr ""
 
-msgid "any"
+msgid "Covered networks"
 msgstr ""
 
-msgid "Source address"
+msgid "Custom Rules"
+msgstr ""
+
+msgid "Custom Rules (/etc/firewall.user)"
+msgstr ""
+
+msgid "Destination"
 msgstr ""
 
 msgid "Destination address"
 msgstr ""
 
-msgid "Source MAC-address"
+msgid "Destination port"
+msgstr ""
+
+msgid "Destination zone"
+msgstr ""
+
+msgid "Device"
+msgstr ""
+
+msgid "Drop invalid packets"
+msgstr ""
+
+msgid "Enable NAT Loopback"
+msgstr ""
+
+msgid "Enable SYN-flood protection"
+msgstr ""
+
+msgid "Enable logging on this zone"
+msgstr ""
+
+msgid "External port"
+msgstr ""
+
+msgid "Family"
+msgstr ""
+
+msgid "Firewall"
+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 "General Settings"
+msgstr ""
+
+msgid "IPv4 and IPv6"
+msgstr ""
+
+msgid "IPv4 only"
+msgstr ""
+
+msgid "IPv6 only"
+msgstr ""
+
+msgid "Input"
+msgstr ""
+
+msgid "Intended destination address"
+msgstr ""
+
+msgid "Inter-Zone Forwarding"
+msgstr ""
+
+msgid "Internal IP address"
+msgstr ""
+
+msgid "Internal port"
+msgstr ""
+
+msgid "Internal port (optional)"
+msgstr ""
+
+msgid "Limit log messages"
+msgstr ""
+
+msgid "MSS clamping"
+msgstr ""
+
+msgid "Masquerading"
+msgstr ""
+
+msgid "Match ICMP type"
+msgstr ""
+
+msgid ""
+"Match incoming traffic directed at the given destination port or port range "
+"on this host"
+msgstr ""
+
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Output"
+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 "Protocol"
+msgstr ""
+
+msgid ""
+"Redirect matched incoming traffic to the given port on the internal host"
+msgstr ""
+
+msgid "Redirect matched incoming traffic to the specified internal host"
+msgstr ""
+
+msgid "Redirection type"
+msgstr ""
+
+msgid "Redirections"
+msgstr ""
+
+msgid "Restrict Masquerading to given destination subnets"
+msgstr ""
+
+msgid "Restrict Masquerading to given source subnets"
+msgstr ""
+
+msgid "Restrict to address family"
+msgstr ""
+
+msgid "Rules"
+msgstr ""
+
+msgid "Source"
 msgstr ""
 
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
@@ -180,39 +234,68 @@ msgstr ""
 msgid "Source IP address"
 msgstr ""
 
-msgid ""
-"Match incoming traffic originating from the given source port or port range "
-"on the client host"
+msgid "Source MAC address"
 msgstr ""
 
-msgid "External port"
+msgid "Source address"
+msgstr ""
+
+msgid "Source port"
+msgstr ""
+
+msgid "Source zone"
 msgstr ""
 
 msgid ""
-"Match incoming traffic directed at the given destination port or port range "
-"on this host"
-msgstr ""
-
-msgid "Internal IP address"
-msgstr ""
-
-msgid "Redirect matched incoming traffic to the specified internal host"
-msgstr ""
-
-msgid "Internal port (optional)"
+"The firewall creates zones over your network interfaces to control network "
+"traffic flow."
 msgstr ""
 
 msgid ""
-"Redirect matched incoming traffic to the given port on the internal host"
-msgstr ""
-
-msgid "Port forwarding"
+"The options below control the forwarding policies between this zone (%s) and "
+"other zones. <em>Destination zones</em> cover forwarded traffic "
+"<strong>originating from %q</strong>. <em>Source zones</em> match forwarded "
+"traffic from other zones <strong>targeted at %q</strong>. The forwarding "
+"rule is <em>unidirectional</em>, e.g. a forward from lan to wan does "
+"<em>not</em> imply a permission to forward from wan to lan as well."
 msgstr ""
 
 msgid ""
-"Port forwarding allows to provide network services in the internal network "
-"to an external network."
+"This section defines common properties of %q. The <em>input</em> and "
+"<em>output</em> options set the default policies for traffic entering and "
+"leaving this zone while the <em>forward</em> option describes the policy for "
+"forwarded traffic between different networks within the zone. <em>Covered "
+"networks</em> specifies which available networks are member of this zone."
 msgstr ""
 
-msgid "Internal port"
+msgid "Traffic Redirection"
+msgstr ""
+
+msgid ""
+"Traffic redirection allows you to change the destination address of "
+"forwarded packets."
+msgstr ""
+
+msgid "Via"
+msgstr ""
+
+msgid "Zone %q"
+msgstr ""
+
+msgid "Zone ⇒ Forwardings"
+msgstr ""
+
+msgid "Zones"
+msgstr ""
+
+msgid "accept"
+msgstr ""
+
+msgid "any"
+msgstr ""
+
+msgid "drop"
+msgstr ""
+
+msgid "reject"
 msgstr ""
diff --git a/po/no/firewall.po b/po/no/firewall.po
index 3bea9015a1..65aed482b5 100644
--- a/po/no/firewall.po
+++ b/po/no/firewall.po
@@ -11,139 +11,13 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-# Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/zones.lua      #
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-#
-msgid "Firewall"
-msgstr "Brannmur"
-
-msgid ""
-"The firewall creates zones over your network interfaces to control network "
-"traffic flow."
-msgstr ""
-"Brannmuren skaper soner over nettverkets grensesnitt for å styre "
-"nettverkstrafikken. Opplever du tilfeldige nettverks problemer kan du prøve "
-"å aktivere MMS Kontroll, om ikke er det best å deaktivere MMS Kontrollen for "
-"best ytelse."
-
-msgid "Enable SYN-flood protection"
-msgstr "Aktiver SYN-flood beskyttelse"
-
-msgid "Drop invalid packets"
-msgstr "Forkast ugyldige pakker"
-
-msgid "Input"
-msgstr "Inndata"
-
-msgid "Output"
-msgstr "Utdata"
-
-msgid "Forward"
-msgstr "Videresend"
-
-msgid "reject"
-msgstr "avslå"
-
-msgid "drop"
-msgstr "forkast"
-
-msgid "accept"
-msgstr "godta"
-
-msgid "Zones"
-msgstr "Soner"
-
-msgid "Name"
-msgstr "Navn"
-
-msgid "Masquerading"
-msgstr "Masquerading"
-
-msgid "MSS clamping"
-msgstr "MSS Kontroll (Clamping)"
-
-msgid "Network"
-msgstr "Nettverk"
-
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-# Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/traffic.lua    #
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-#
-# msgid "Name"
-# msgstr ""
-#
-msgid "Traffic Control"
-msgstr "Trafikk Kontroll"
-
-msgid "Zone-to-Zone traffic"
-msgstr "Sone-til-Sone trafikk"
-
-msgid ""
-"Here you can specify which network traffic is allowed to flow between "
-"network zones. Only new connections will be matched.  Packets belonging to "
-"already open connections are automatically allowed to pass the firewall. If "
-"you experience occasional connection problems try enabling MSS Clamping "
-"otherwise disable it for performance reasons."
-msgstr ""
-"Her kan du angi hvilken nettverkstrafikk som har lov til å passere mellom "
-"nettverkssoner. Bare nye tilkoblinger blir berørt da pakker som tilhører "
-"eksisterende koblinger automatisk får lov å passere brannmuren.<br /> "
-
-msgid "Source"
-msgstr "Kilde"
-
-msgid "Destination"
-msgstr "Destinasjon"
-
-msgid "Rules"
-msgstr "Regler"
-
-msgid "Protocol"
-msgstr "Protokoll"
-
-msgid "Device"
-msgstr "Enhet"
+msgid "(optional)"
+msgstr "(valgfri)"
 
 msgid "Action"
 msgstr "Handling"
 
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-# Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/redirect.lua   #
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-#
-# msgid "Name"
-# msgstr ""
-#
-# msgid "Protocol"
-# msgstr ""
-#
-msgid "Traffic Redirection"
-msgstr "Trafikk Omdirigering"
-
-msgid ""
-"Traffic redirection allows you to change the destination address of "
-"forwarded packets."
-msgstr ""
-"<abbr title=\"Traffic Redirection\">Trafikk Omdirigering</abbr> lar deg "
-"endre destinasjons adresse på videresendte pakker."
-
-msgid "(optional)"
-msgstr "(valgfri)"
-
-msgid "Zone"
-msgstr "Sone"
-
-msgid "Source port"
-msgstr "Kilde port"
-
-msgid "Destination IP"
-msgstr "Destinasjon IP"
-
-msgid "IP address"
-msgstr "IP adresse"
-
-msgid "Destination port"
+msgid "Advanced Options"
 msgstr ""
 
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
@@ -180,6 +54,9 @@ msgstr ""
 msgid "Advanced Rules"
 msgstr "Avanserte Regler"
 
+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 "
@@ -189,26 +66,204 @@ msgstr ""
 "tilkoblinger blir berørt. Pakker som hører til åpne tilkoblinger får "
 "automatisk tillatelse til å passere brannmuren."
 
-msgid "Overview"
-msgstr "Oversikt"
+msgid "Allow forward from <em>source zones</em>:"
+msgstr ""
 
-msgid "Source zone"
-msgstr "Kilde Sone"
+msgid "Allow forward to <em>destination zones</em>:"
+msgstr ""
 
-msgid "Destination zone"
-msgstr "Destinasjon Sone"
+msgid "Any"
+msgstr "Alle"
 
-msgid "any"
-msgstr "alle"
+msgid "Covered networks"
+msgstr ""
 
-msgid "Source address"
-msgstr "Kilde adresse"
+msgid "Custom Rules"
+msgstr ""
+
+msgid "Custom Rules (/etc/firewall.user)"
+msgstr ""
+
+msgid "Destination"
+msgstr "Destinasjon"
 
 msgid "Destination address"
 msgstr "Destinasjon adresse"
 
-msgid "Source MAC-address"
-msgstr "Kilde MAC-adresse"
+msgid "Destination port"
+msgstr ""
+
+msgid "Destination zone"
+msgstr "Destinasjon Sone"
+
+msgid "Device"
+msgstr "Enhet"
+
+msgid "Drop invalid packets"
+msgstr "Forkast ugyldige pakker"
+
+msgid "Enable NAT Loopback"
+msgstr ""
+
+msgid "Enable SYN-flood protection"
+msgstr "Aktiver SYN-flood beskyttelse"
+
+msgid "Enable logging on this zone"
+msgstr ""
+
+msgid "External port"
+msgstr "Ekstern port"
+
+msgid "Family"
+msgstr ""
+
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+# Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/zones.lua      #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#
+msgid "Firewall"
+msgstr "Brannmur"
+
+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 "Videresend"
+
+msgid "General Settings"
+msgstr ""
+
+msgid "IPv4 and IPv6"
+msgstr ""
+
+msgid "IPv4 only"
+msgstr ""
+
+msgid "IPv6 only"
+msgstr ""
+
+msgid "Input"
+msgstr "Inndata"
+
+msgid "Intended destination address"
+msgstr ""
+
+msgid "Inter-Zone Forwarding"
+msgstr ""
+
+msgid "Internal IP address"
+msgstr "Intern IP adresse"
+
+msgid "Internal port"
+msgstr "Intern port"
+
+msgid "Internal port (optional)"
+msgstr "Intern port (valfritt)"
+
+msgid "Limit log messages"
+msgstr ""
+
+msgid "MSS clamping"
+msgstr "MSS Kontroll (Clamping)"
+
+msgid "Masquerading"
+msgstr "Masquerading"
+
+msgid "Match ICMP type"
+msgstr ""
+
+msgid ""
+"Match incoming traffic directed at the given destination port or port range "
+"on this host"
+msgstr ""
+"Match innkommende trafikk rettet mot den gitte destinasjons port/portområdet "
+"på denne verten"
+
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host"
+msgstr ""
+"Match innkommende trafikk som kommer fra den gitte kilde port/portområdet "
+"fra klienten"
+
+msgid "Name"
+msgstr "Navn"
+
+msgid "Output"
+msgstr "Utdata"
+
+msgid "Overview"
+msgstr "Oversikt"
+
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+# 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 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 "
+"nettverkstjenester fra det interne nettverket tilbys et eksternt nettverk."
+
+msgid "Protocol"
+msgstr "Protokoll"
+
+msgid ""
+"Redirect matched incoming traffic to the given port on the internal host"
+msgstr ""
+"Omadresser matchet innkommende trafikk til den gitte porten på den interne "
+"vert"
+
+msgid "Redirect matched incoming traffic to the specified internal host"
+msgstr "Omadresser matchet innkommende trafikk til den angitte interne verten"
+
+msgid "Redirection type"
+msgstr ""
+
+msgid "Redirections"
+msgstr ""
+
+msgid "Restrict Masquerading to given destination subnets"
+msgstr ""
+
+msgid "Restrict Masquerading to given source subnets"
+msgstr ""
+
+msgid "Restrict to address family"
+msgstr ""
+
+msgid "Rules"
+msgstr "Regler"
+
+msgid "Source"
+msgstr "Kilde"
 
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 # Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/rrule.lua      #
@@ -243,72 +298,126 @@ msgstr "Kilde MAC-adresse"
 msgid "Source IP address"
 msgstr "Kilde IP adresse"
 
-msgid ""
-"Match incoming traffic originating from the given source port or port range "
-"on the client host"
+msgid "Source MAC address"
 msgstr ""
-"Match innkommende trafikk som kommer fra den gitte kilde port/portområdet "
-"fra klienten"
 
-msgid "External port"
-msgstr "Ekstern port"
+msgid "Source address"
+msgstr "Kilde adresse"
+
+msgid "Source port"
+msgstr "Kilde port"
+
+msgid "Source zone"
+msgstr "Kilde Sone"
 
 msgid ""
-"Match incoming traffic directed at the given destination port or port range "
-"on this host"
+"The firewall creates zones over your network interfaces to control network "
+"traffic flow."
 msgstr ""
-"Match innkommende trafikk rettet mot den gitte destinasjons port/portområdet "
-"på denne verten"
-
-msgid "Internal IP address"
-msgstr "Intern IP adresse"
-
-msgid "Redirect matched incoming traffic to the specified internal host"
-msgstr "Omadresser matchet innkommende trafikk til den angitte interne verten"
-
-msgid "Internal port (optional)"
-msgstr "Intern port (valfritt)"
+"Brannmuren skaper soner over nettverkets grensesnitt for å styre "
+"nettverkstrafikken. Opplever du tilfeldige nettverks problemer kan du prøve "
+"å aktivere MMS Kontroll, om ikke er det best å deaktivere MMS Kontrollen for "
+"best ytelse."
 
 msgid ""
-"Redirect matched incoming traffic to the given port on the internal host"
+"The options below control the forwarding policies between this zone (%s) and "
+"other zones. <em>Destination zones</em> cover forwarded traffic "
+"<strong>originating from %q</strong>. <em>Source zones</em> match forwarded "
+"traffic from other zones <strong>targeted at %q</strong>. The forwarding "
+"rule is <em>unidirectional</em>, e.g. a forward from lan to wan does "
+"<em>not</em> imply a permission to forward from wan to lan as well."
+msgstr ""
+
+msgid ""
+"This section defines common properties of %q. The <em>input</em> and "
+"<em>output</em> options set the default policies for traffic entering and "
+"leaving this zone while the <em>forward</em> option describes the policy for "
+"forwarded traffic between different networks within the zone. <em>Covered "
+"networks</em> specifies which available networks are member of this zone."
 msgstr ""
-"Omadresser matchet innkommende trafikk til den gitte porten på den interne "
-"vert"
 
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-# Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/miniportfw.lua #
+# Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/redirect.lua   #
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 #
 # msgid "Name"
 # msgstr ""
 #
-# msgid "(optional)"
-# msgstr ""
-#
 # msgid "Protocol"
 # msgstr ""
 #
-# msgid "External port"
-# msgstr ""
-#
-# msgid "Internal IP address"
-# msgstr ""
-#
-msgid "Port forwarding"
-msgstr "Port Videresending"
+msgid "Traffic Redirection"
+msgstr "Trafikk Omdirigering"
 
 msgid ""
-"Port forwarding allows to provide network services in the internal network "
-"to an external network."
+"Traffic redirection allows you to change the destination address of "
+"forwarded packets."
 msgstr ""
-"<abbr title=\"Port Forwarding\">Port Videresending</abbr> tillater at "
-"nettverkstjenester fra det interne nettverket tilbys et eksternt nettverk."
+"<abbr title=\"Traffic Redirection\">Trafikk Omdirigering</abbr> lar deg "
+"endre destinasjons adresse på videresendte pakker."
 
-msgid "Internal port"
-msgstr "Intern port"
+msgid "Via"
+msgstr ""
+
+msgid "Zone %q"
+msgstr ""
+
+msgid "Zone ⇒ Forwardings"
+msgstr ""
+
+msgid "Zones"
+msgstr "Soner"
+
+msgid "accept"
+msgstr "godta"
+
+msgid "any"
+msgstr "alle"
+
+msgid "drop"
+msgstr "forkast"
+
+msgid "reject"
+msgstr "avslå"
+
+#~ msgid "Network"
+#~ msgstr "Nettverk"
+
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+# Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/traffic.lua    #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#
+# msgid "Name"
+# msgstr ""
+#
+#~ msgid "Traffic Control"
+#~ msgstr "Trafikk Kontroll"
+
+#~ msgid "Zone-to-Zone traffic"
+#~ msgstr "Sone-til-Sone trafikk"
+
+#~ msgid ""
+#~ "Here you can specify which network traffic is allowed to flow between "
+#~ "network zones. Only new connections will be matched.  Packets belonging "
+#~ "to already open connections are automatically allowed to pass the "
+#~ "firewall. If you experience occasional connection problems try enabling "
+#~ "MSS Clamping otherwise disable it for performance reasons."
+#~ msgstr ""
+#~ "Her kan du angi hvilken nettverkstrafikk som har lov til å passere mellom "
+#~ "nettverkssoner. Bare nye tilkoblinger blir berørt da pakker som tilhører "
+#~ "eksisterende koblinger automatisk får lov å passere brannmuren.<br /> "
+
+#~ msgid "Zone"
+#~ msgstr "Sone"
+
+#~ msgid "Destination IP"
+#~ msgstr "Destinasjon IP"
+
+#~ msgid "IP address"
+#~ msgstr "IP adresse"
+
+#~ msgid "Source MAC-address"
+#~ msgstr "Kilde MAC-adresse"
 
 #~ msgid "Destinasjon port"
 #~ msgstr "Destination port"
-
-#~ msgid "Any"
-#~ msgstr "Alle"
diff --git a/po/pl/firewall.po b/po/pl/firewall.po
index e0e10be74b..d1063a93db 100644
--- a/po/pl/firewall.po
+++ b/po/pl/firewall.po
@@ -12,130 +12,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-# Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/zones.lua      #
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-#
-msgid "Firewall"
-msgstr ""
-
-msgid ""
-"The firewall creates zones over your network interfaces to control network "
-"traffic flow."
-msgstr ""
-
-msgid "Enable SYN-flood protection"
-msgstr ""
-
-msgid "Drop invalid packets"
-msgstr ""
-
-msgid "Input"
-msgstr ""
-
-msgid "Output"
-msgstr ""
-
-msgid "Forward"
-msgstr ""
-
-msgid "reject"
-msgstr ""
-
-msgid "drop"
-msgstr ""
-
-msgid "accept"
-msgstr ""
-
-msgid "Zones"
-msgstr ""
-
-msgid "Name"
-msgstr ""
-
-msgid "Masquerading"
-msgstr ""
-
-msgid "MSS clamping"
-msgstr ""
-
-msgid "Network"
-msgstr ""
-
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-# Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/traffic.lua    #
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-#
-# msgid "Name"
-# msgstr ""
-#
-msgid "Traffic Control"
-msgstr ""
-
-msgid "Zone-to-Zone traffic"
-msgstr ""
-
-msgid ""
-"Here you can specify which network traffic is allowed to flow between "
-"network zones. Only new connections will be matched.  Packets belonging to "
-"already open connections are automatically allowed to pass the firewall. If "
-"you experience occasional connection problems try enabling MSS Clamping "
-"otherwise disable it for performance reasons."
-msgstr ""
-
-msgid "Source"
-msgstr ""
-
-msgid "Destination"
-msgstr ""
-
-msgid "Rules"
-msgstr ""
-
-msgid "Protocol"
-msgstr ""
-
-msgid "Device"
+msgid "(optional)"
 msgstr ""
 
 msgid "Action"
 msgstr ""
 
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-# Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/redirect.lua   #
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-#
-# msgid "Name"
-# msgstr ""
-#
-# msgid "Protocol"
-# msgstr ""
-#
-msgid "Traffic Redirection"
-msgstr ""
-
-msgid ""
-"Traffic redirection allows you to change the destination address of "
-"forwarded packets."
-msgstr ""
-
-msgid "(optional)"
-msgstr ""
-
-msgid "Zone"
-msgstr ""
-
-msgid "Source port"
-msgstr ""
-
-msgid "Destination IP"
-msgstr ""
-
-msgid "IP address"
-msgstr ""
-
-msgid "Destination port"
+msgid "Advanced Options"
 msgstr ""
 
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
@@ -172,31 +55,204 @@ 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 "Overview"
+msgid "Allow forward from <em>source zones</em>:"
 msgstr ""
 
-msgid "Source zone"
+msgid "Allow forward to <em>destination zones</em>:"
 msgstr ""
 
-msgid "Destination zone"
+msgid "Any"
 msgstr ""
 
-msgid "any"
+msgid "Covered networks"
 msgstr ""
 
-msgid "Source address"
+msgid "Custom Rules"
+msgstr ""
+
+msgid "Custom Rules (/etc/firewall.user)"
+msgstr ""
+
+msgid "Destination"
 msgstr ""
 
 msgid "Destination address"
 msgstr ""
 
-msgid "Source MAC-address"
+msgid "Destination port"
+msgstr ""
+
+msgid "Destination zone"
+msgstr ""
+
+msgid "Device"
+msgstr ""
+
+msgid "Drop invalid packets"
+msgstr ""
+
+msgid "Enable NAT Loopback"
+msgstr ""
+
+msgid "Enable SYN-flood protection"
+msgstr ""
+
+msgid "Enable logging on this zone"
+msgstr ""
+
+msgid "External port"
+msgstr ""
+
+msgid "Family"
+msgstr ""
+
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+# Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/zones.lua      #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#
+msgid "Firewall"
+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 "General Settings"
+msgstr ""
+
+msgid "IPv4 and IPv6"
+msgstr ""
+
+msgid "IPv4 only"
+msgstr ""
+
+msgid "IPv6 only"
+msgstr ""
+
+msgid "Input"
+msgstr ""
+
+msgid "Intended destination address"
+msgstr ""
+
+msgid "Inter-Zone Forwarding"
+msgstr ""
+
+msgid "Internal IP address"
+msgstr ""
+
+msgid "Internal port"
+msgstr ""
+
+msgid "Internal port (optional)"
+msgstr ""
+
+msgid "Limit log messages"
+msgstr ""
+
+msgid "MSS clamping"
+msgstr ""
+
+msgid "Masquerading"
+msgstr ""
+
+msgid "Match ICMP type"
+msgstr ""
+
+msgid ""
+"Match incoming traffic directed at the given destination port or port range "
+"on this host"
+msgstr ""
+
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Output"
+msgstr ""
+
+msgid "Overview"
+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 to provide network services in the internal network "
+"to an external network."
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid ""
+"Redirect matched incoming traffic to the given port on the internal host"
+msgstr ""
+
+msgid "Redirect matched incoming traffic to the specified internal host"
+msgstr ""
+
+msgid "Redirection type"
+msgstr ""
+
+msgid "Redirections"
+msgstr ""
+
+msgid "Restrict Masquerading to given destination subnets"
+msgstr ""
+
+msgid "Restrict Masquerading to given source subnets"
+msgstr ""
+
+msgid "Restrict to address family"
+msgstr ""
+
+msgid "Rules"
+msgstr ""
+
+msgid "Source"
 msgstr ""
 
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
@@ -232,58 +288,78 @@ msgstr ""
 msgid "Source IP address"
 msgstr ""
 
-msgid ""
-"Match incoming traffic originating from the given source port or port range "
-"on the client host"
+msgid "Source MAC address"
 msgstr ""
 
-msgid "External port"
+msgid "Source address"
+msgstr ""
+
+msgid "Source port"
+msgstr ""
+
+msgid "Source zone"
 msgstr ""
 
 msgid ""
-"Match incoming traffic directed at the given destination port or port range "
-"on this host"
-msgstr ""
-
-msgid "Internal IP address"
-msgstr ""
-
-msgid "Redirect matched incoming traffic to the specified internal host"
-msgstr ""
-
-msgid "Internal port (optional)"
+"The firewall creates zones over your network interfaces to control network "
+"traffic flow."
 msgstr ""
 
 msgid ""
-"Redirect matched incoming traffic to the given port on the internal host"
+"The options below control the forwarding policies between this zone (%s) and "
+"other zones. <em>Destination zones</em> cover forwarded traffic "
+"<strong>originating from %q</strong>. <em>Source zones</em> match forwarded "
+"traffic from other zones <strong>targeted at %q</strong>. The forwarding "
+"rule is <em>unidirectional</em>, e.g. a forward from lan to wan does "
+"<em>not</em> imply a permission to forward from wan to lan as well."
+msgstr ""
+
+msgid ""
+"This section defines common properties of %q. The <em>input</em> and "
+"<em>output</em> options set the default policies for traffic entering and "
+"leaving this zone while the <em>forward</em> option describes the policy for "
+"forwarded traffic between different networks within the zone. <em>Covered "
+"networks</em> specifies which available networks are member of this zone."
 msgstr ""
 
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-# Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/miniportfw.lua #
+# Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/redirect.lua   #
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 #
 # msgid "Name"
 # msgstr ""
 #
-# msgid "(optional)"
-# msgstr ""
-#
 # msgid "Protocol"
 # msgstr ""
 #
-# msgid "External port"
-# msgstr ""
-#
-# msgid "Internal IP address"
-# msgstr ""
-#
-msgid "Port forwarding"
+msgid "Traffic Redirection"
 msgstr ""
 
 msgid ""
-"Port forwarding allows to provide network services in the internal network "
-"to an external network."
+"Traffic redirection allows you to change the destination address of "
+"forwarded packets."
 msgstr ""
 
-msgid "Internal port"
+msgid "Via"
+msgstr ""
+
+msgid "Zone %q"
+msgstr ""
+
+msgid "Zone ⇒ Forwardings"
+msgstr ""
+
+msgid "Zones"
+msgstr ""
+
+msgid "accept"
+msgstr ""
+
+msgid "any"
+msgstr ""
+
+msgid "drop"
+msgstr ""
+
+msgid "reject"
 msgstr ""
diff --git a/po/pt/firewall.po b/po/pt/firewall.po
index 21a29ecf77..9ea6973cbf 100644
--- a/po/pt/firewall.po
+++ b/po/pt/firewall.po
@@ -11,128 +11,21 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-msgid "Firewall"
-msgstr "Firewall"
-
-msgid ""
-"The firewall creates zones over your network interfaces to control network "
-"traffic flow."
-msgstr ""
-"O firewall cria zonas sobre as interfaces de rede para controlar o fluxo do "
-"tráfego."
-
-#, fuzzy
-msgid "Enable SYN-flood protection"
-msgstr "Proteção SYN-flood"
-
-msgid "Drop invalid packets"
-msgstr "Dropar pacotes inválidos"
-
-msgid "Input"
-msgstr "Entrada"
-
-msgid "Output"
-msgstr "Saída"
-
-msgid "Forward"
-msgstr ""
-
-msgid "reject"
-msgstr "rejeitar"
-
-msgid "drop"
-msgstr "dropar"
-
-msgid "accept"
-msgstr "aceitar"
-
-msgid "Zones"
-msgstr "Zonas"
-
-msgid "Name"
-msgstr ""
-
-msgid "Masquerading"
-msgstr ""
-
-#, fuzzy
-msgid "MSS clamping"
-msgstr "MSS-Correction"
-
-#, fuzzy
-msgid "Network"
-msgstr "Redes"
-
-msgid "Traffic Control"
-msgstr "Controle de Tráfego"
-
-msgid "Zone-to-Zone traffic"
-msgstr "Tráfego de Zona-para-Zona"
-
-#, fuzzy
-msgid ""
-"Here you can specify which network traffic is allowed to flow between "
-"network zones. Only new connections will be matched.  Packets belonging to "
-"already open connections are automatically allowed to pass the firewall. If "
-"you experience occasional connection problems try enabling MSS Clamping "
-"otherwise disable it for performance reasons."
-msgstr ""
-"Aqui você pode especificar qual tráfego de rede será permitido para o fluxo "
-"entre zonas das redes. Somente novas conexões serão processadas. Pacotes "
-"pertencentes à conexões já abertas estão automaticamente permitidos para "
-"passar pelo firewall."
-
-msgid "Source"
-msgstr "Origem"
-
-msgid "Destination"
-msgstr "Destino"
-
-msgid "Rules"
-msgstr ""
-
-msgid "Protocol"
-msgstr ""
-
-msgid "Device"
+msgid "(optional)"
 msgstr ""
 
 msgid "Action"
 msgstr "Acção"
 
-msgid "Traffic Redirection"
-msgstr "Redirecionamento de Tráfego"
-
-msgid ""
-"Traffic redirection allows you to change the destination address of "
-"forwarded packets."
+msgid "Advanced Options"
 msgstr ""
-"Redirecionamento do tráfego permite a alteração do endereço de destino dos "
-"pacotes enviados."
-
-msgid "(optional)"
-msgstr ""
-
-msgid "Zone"
-msgstr "Zona"
-
-msgid "Source port"
-msgstr "Porta de origem"
-
-#, fuzzy
-msgid "Destination IP"
-msgstr "Destino"
-
-#, fuzzy
-msgid "IP address"
-msgstr "Endereço IP"
-
-msgid "Destination port"
-msgstr "Porta de destino"
 
 msgid "Advanced Rules"
 msgstr "Regras Avançadas"
 
+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 "
@@ -143,60 +36,138 @@ msgstr ""
 "pertençam a ligações já abertas estão automaticamente autorizados a passar "
 "pela firewall."
 
-msgid "Overview"
+msgid "Allow forward from <em>source zones</em>:"
 msgstr ""
 
-#, fuzzy
-msgid "Source zone"
-msgstr "Porta de origem"
+msgid "Allow forward to <em>destination zones</em>:"
+msgstr ""
+
+msgid "Any"
+msgstr ""
+
+msgid "Covered networks"
+msgstr ""
+
+msgid "Custom Rules"
+msgstr ""
+
+msgid "Custom Rules (/etc/firewall.user)"
+msgstr ""
+
+msgid "Destination"
+msgstr "Destino"
+
+msgid "Destination address"
+msgstr "Endereço de destino"
+
+msgid "Destination port"
+msgstr "Porta de destino"
 
 #, fuzzy
 msgid "Destination zone"
 msgstr "Destino"
 
-msgid "any"
+msgid "Device"
+msgstr ""
+
+msgid "Drop invalid packets"
+msgstr "Dropar pacotes inválidos"
+
+msgid "Enable NAT Loopback"
 msgstr ""
 
 #, fuzzy
-msgid "Source address"
-msgstr "Endereço MAC de origem"
+msgid "Enable SYN-flood protection"
+msgstr "Proteção SYN-flood"
 
-msgid "Destination address"
-msgstr "Endereço de destino"
-
-#, fuzzy
-msgid "Source MAC-address"
-msgstr "Endereço MAC de origem"
-
-#, fuzzy
-msgid "Source IP address"
-msgstr "Endereço MAC de origem"
-
-msgid ""
-"Match incoming traffic originating from the given source port or port range "
-"on the client host"
+msgid "Enable logging on this zone"
 msgstr ""
 
 msgid "External port"
 msgstr "Porta Externa"
 
+msgid "Family"
+msgstr ""
+
+msgid "Firewall"
+msgstr "Firewall"
+
+msgid "Firewall - Zone Settings"
+msgstr ""
+
 msgid ""
-"Match incoming traffic directed at the given destination port or port range "
-"on this host"
+"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 "General Settings"
+msgstr ""
+
+msgid "IPv4 and IPv6"
+msgstr ""
+
+msgid "IPv4 only"
+msgstr ""
+
+msgid "IPv6 only"
+msgstr ""
+
+msgid "Input"
+msgstr "Entrada"
+
+msgid "Intended destination address"
+msgstr ""
+
+msgid "Inter-Zone Forwarding"
 msgstr ""
 
 #, fuzzy
 msgid "Internal IP address"
 msgstr "Endereço interno"
 
-msgid "Redirect matched incoming traffic to the specified internal host"
-msgstr ""
+#, fuzzy
+msgid "Internal port"
+msgstr "Porta Externa"
 
 msgid "Internal port (optional)"
 msgstr "Porta interna (opcional)"
 
+msgid "Limit log messages"
+msgstr ""
+
+#, fuzzy
+msgid "MSS clamping"
+msgstr "MSS-Correction"
+
+msgid "Masquerading"
+msgstr ""
+
+msgid "Match ICMP type"
+msgstr ""
+
 msgid ""
-"Redirect matched incoming traffic to the given port on the internal host"
+"Match incoming traffic directed at the given destination port or port range "
+"on this host"
+msgstr ""
+
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Output"
+msgstr "Saída"
+
+msgid "Overview"
 msgstr ""
 
 msgid "Port forwarding"
@@ -209,9 +180,150 @@ msgstr ""
 "O redirecionamento de portas permite disponibilizar serviços na rede interna "
 "para uma rede externa."
 
+msgid "Protocol"
+msgstr ""
+
+msgid ""
+"Redirect matched incoming traffic to the given port on the internal host"
+msgstr ""
+
+msgid "Redirect matched incoming traffic to the specified internal host"
+msgstr ""
+
+msgid "Redirection type"
+msgstr ""
+
+msgid "Redirections"
+msgstr ""
+
+msgid "Restrict Masquerading to given destination subnets"
+msgstr ""
+
+msgid "Restrict Masquerading to given source subnets"
+msgstr ""
+
+msgid "Restrict to address family"
+msgstr ""
+
+msgid "Rules"
+msgstr ""
+
+msgid "Source"
+msgstr "Origem"
+
 #, fuzzy
-msgid "Internal port"
-msgstr "Porta Externa"
+msgid "Source IP address"
+msgstr "Endereço MAC de origem"
+
+msgid "Source MAC address"
+msgstr ""
+
+#, fuzzy
+msgid "Source address"
+msgstr "Endereço MAC de origem"
+
+msgid "Source port"
+msgstr "Porta de origem"
+
+#, fuzzy
+msgid "Source zone"
+msgstr "Porta de origem"
+
+msgid ""
+"The firewall creates zones over your network interfaces to control network "
+"traffic flow."
+msgstr ""
+"O firewall cria zonas sobre as interfaces de rede para controlar o fluxo do "
+"tráfego."
+
+msgid ""
+"The options below control the forwarding policies between this zone (%s) and "
+"other zones. <em>Destination zones</em> cover forwarded traffic "
+"<strong>originating from %q</strong>. <em>Source zones</em> match forwarded "
+"traffic from other zones <strong>targeted at %q</strong>. The forwarding "
+"rule is <em>unidirectional</em>, e.g. a forward from lan to wan does "
+"<em>not</em> imply a permission to forward from wan to lan as well."
+msgstr ""
+
+msgid ""
+"This section defines common properties of %q. The <em>input</em> and "
+"<em>output</em> options set the default policies for traffic entering and "
+"leaving this zone while the <em>forward</em> option describes the policy for "
+"forwarded traffic between different networks within the zone. <em>Covered "
+"networks</em> specifies which available networks are member of this zone."
+msgstr ""
+
+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."
+
+msgid "Via"
+msgstr ""
+
+msgid "Zone %q"
+msgstr ""
+
+msgid "Zone ⇒ Forwardings"
+msgstr ""
+
+msgid "Zones"
+msgstr "Zonas"
+
+msgid "accept"
+msgstr "aceitar"
+
+msgid "any"
+msgstr ""
+
+msgid "drop"
+msgstr "dropar"
+
+msgid "reject"
+msgstr "rejeitar"
+
+#, fuzzy
+#~ msgid "Network"
+#~ msgstr "Redes"
+
+#~ msgid "Traffic Control"
+#~ msgstr "Controle de Tráfego"
+
+#~ msgid "Zone-to-Zone traffic"
+#~ msgstr "Tráfego de Zona-para-Zona"
+
+#, fuzzy
+#~ msgid ""
+#~ "Here you can specify which network traffic is allowed to flow between "
+#~ "network zones. Only new connections will be matched.  Packets belonging "
+#~ "to already open connections are automatically allowed to pass the "
+#~ "firewall. If you experience occasional connection problems try enabling "
+#~ "MSS Clamping otherwise disable it for performance reasons."
+#~ msgstr ""
+#~ "Aqui você pode especificar qual tráfego de rede será permitido para o "
+#~ "fluxo entre zonas das redes. Somente novas conexões serão processadas. "
+#~ "Pacotes pertencentes à conexões já abertas estão automaticamente "
+#~ "permitidos para passar pelo firewall."
+
+#~ msgid "Zone"
+#~ msgstr "Zona"
+
+#, fuzzy
+#~ msgid "Destination IP"
+#~ msgstr "Destino"
+
+#, fuzzy
+#~ msgid "IP address"
+#~ msgstr "Endereço IP"
+
+#, fuzzy
+#~ msgid "Source MAC-address"
+#~ msgstr "Endereço MAC de origem"
 
 #~ msgid "Custom forwarding"
 #~ msgstr "Redirecionamento personalizado"
diff --git a/po/pt_BR/firewall.po b/po/pt_BR/firewall.po
index 21a29ecf77..9ea6973cbf 100644
--- a/po/pt_BR/firewall.po
+++ b/po/pt_BR/firewall.po
@@ -11,128 +11,21 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-msgid "Firewall"
-msgstr "Firewall"
-
-msgid ""
-"The firewall creates zones over your network interfaces to control network "
-"traffic flow."
-msgstr ""
-"O firewall cria zonas sobre as interfaces de rede para controlar o fluxo do "
-"tráfego."
-
-#, fuzzy
-msgid "Enable SYN-flood protection"
-msgstr "Proteção SYN-flood"
-
-msgid "Drop invalid packets"
-msgstr "Dropar pacotes inválidos"
-
-msgid "Input"
-msgstr "Entrada"
-
-msgid "Output"
-msgstr "Saída"
-
-msgid "Forward"
-msgstr ""
-
-msgid "reject"
-msgstr "rejeitar"
-
-msgid "drop"
-msgstr "dropar"
-
-msgid "accept"
-msgstr "aceitar"
-
-msgid "Zones"
-msgstr "Zonas"
-
-msgid "Name"
-msgstr ""
-
-msgid "Masquerading"
-msgstr ""
-
-#, fuzzy
-msgid "MSS clamping"
-msgstr "MSS-Correction"
-
-#, fuzzy
-msgid "Network"
-msgstr "Redes"
-
-msgid "Traffic Control"
-msgstr "Controle de Tráfego"
-
-msgid "Zone-to-Zone traffic"
-msgstr "Tráfego de Zona-para-Zona"
-
-#, fuzzy
-msgid ""
-"Here you can specify which network traffic is allowed to flow between "
-"network zones. Only new connections will be matched.  Packets belonging to "
-"already open connections are automatically allowed to pass the firewall. If "
-"you experience occasional connection problems try enabling MSS Clamping "
-"otherwise disable it for performance reasons."
-msgstr ""
-"Aqui você pode especificar qual tráfego de rede será permitido para o fluxo "
-"entre zonas das redes. Somente novas conexões serão processadas. Pacotes "
-"pertencentes à conexões já abertas estão automaticamente permitidos para "
-"passar pelo firewall."
-
-msgid "Source"
-msgstr "Origem"
-
-msgid "Destination"
-msgstr "Destino"
-
-msgid "Rules"
-msgstr ""
-
-msgid "Protocol"
-msgstr ""
-
-msgid "Device"
+msgid "(optional)"
 msgstr ""
 
 msgid "Action"
 msgstr "Acção"
 
-msgid "Traffic Redirection"
-msgstr "Redirecionamento de Tráfego"
-
-msgid ""
-"Traffic redirection allows you to change the destination address of "
-"forwarded packets."
+msgid "Advanced Options"
 msgstr ""
-"Redirecionamento do tráfego permite a alteração do endereço de destino dos "
-"pacotes enviados."
-
-msgid "(optional)"
-msgstr ""
-
-msgid "Zone"
-msgstr "Zona"
-
-msgid "Source port"
-msgstr "Porta de origem"
-
-#, fuzzy
-msgid "Destination IP"
-msgstr "Destino"
-
-#, fuzzy
-msgid "IP address"
-msgstr "Endereço IP"
-
-msgid "Destination port"
-msgstr "Porta de destino"
 
 msgid "Advanced Rules"
 msgstr "Regras Avançadas"
 
+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 "
@@ -143,60 +36,138 @@ msgstr ""
 "pertençam a ligações já abertas estão automaticamente autorizados a passar "
 "pela firewall."
 
-msgid "Overview"
+msgid "Allow forward from <em>source zones</em>:"
 msgstr ""
 
-#, fuzzy
-msgid "Source zone"
-msgstr "Porta de origem"
+msgid "Allow forward to <em>destination zones</em>:"
+msgstr ""
+
+msgid "Any"
+msgstr ""
+
+msgid "Covered networks"
+msgstr ""
+
+msgid "Custom Rules"
+msgstr ""
+
+msgid "Custom Rules (/etc/firewall.user)"
+msgstr ""
+
+msgid "Destination"
+msgstr "Destino"
+
+msgid "Destination address"
+msgstr "Endereço de destino"
+
+msgid "Destination port"
+msgstr "Porta de destino"
 
 #, fuzzy
 msgid "Destination zone"
 msgstr "Destino"
 
-msgid "any"
+msgid "Device"
+msgstr ""
+
+msgid "Drop invalid packets"
+msgstr "Dropar pacotes inválidos"
+
+msgid "Enable NAT Loopback"
 msgstr ""
 
 #, fuzzy
-msgid "Source address"
-msgstr "Endereço MAC de origem"
+msgid "Enable SYN-flood protection"
+msgstr "Proteção SYN-flood"
 
-msgid "Destination address"
-msgstr "Endereço de destino"
-
-#, fuzzy
-msgid "Source MAC-address"
-msgstr "Endereço MAC de origem"
-
-#, fuzzy
-msgid "Source IP address"
-msgstr "Endereço MAC de origem"
-
-msgid ""
-"Match incoming traffic originating from the given source port or port range "
-"on the client host"
+msgid "Enable logging on this zone"
 msgstr ""
 
 msgid "External port"
 msgstr "Porta Externa"
 
+msgid "Family"
+msgstr ""
+
+msgid "Firewall"
+msgstr "Firewall"
+
+msgid "Firewall - Zone Settings"
+msgstr ""
+
 msgid ""
-"Match incoming traffic directed at the given destination port or port range "
-"on this host"
+"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 "General Settings"
+msgstr ""
+
+msgid "IPv4 and IPv6"
+msgstr ""
+
+msgid "IPv4 only"
+msgstr ""
+
+msgid "IPv6 only"
+msgstr ""
+
+msgid "Input"
+msgstr "Entrada"
+
+msgid "Intended destination address"
+msgstr ""
+
+msgid "Inter-Zone Forwarding"
 msgstr ""
 
 #, fuzzy
 msgid "Internal IP address"
 msgstr "Endereço interno"
 
-msgid "Redirect matched incoming traffic to the specified internal host"
-msgstr ""
+#, fuzzy
+msgid "Internal port"
+msgstr "Porta Externa"
 
 msgid "Internal port (optional)"
 msgstr "Porta interna (opcional)"
 
+msgid "Limit log messages"
+msgstr ""
+
+#, fuzzy
+msgid "MSS clamping"
+msgstr "MSS-Correction"
+
+msgid "Masquerading"
+msgstr ""
+
+msgid "Match ICMP type"
+msgstr ""
+
 msgid ""
-"Redirect matched incoming traffic to the given port on the internal host"
+"Match incoming traffic directed at the given destination port or port range "
+"on this host"
+msgstr ""
+
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Output"
+msgstr "Saída"
+
+msgid "Overview"
 msgstr ""
 
 msgid "Port forwarding"
@@ -209,9 +180,150 @@ msgstr ""
 "O redirecionamento de portas permite disponibilizar serviços na rede interna "
 "para uma rede externa."
 
+msgid "Protocol"
+msgstr ""
+
+msgid ""
+"Redirect matched incoming traffic to the given port on the internal host"
+msgstr ""
+
+msgid "Redirect matched incoming traffic to the specified internal host"
+msgstr ""
+
+msgid "Redirection type"
+msgstr ""
+
+msgid "Redirections"
+msgstr ""
+
+msgid "Restrict Masquerading to given destination subnets"
+msgstr ""
+
+msgid "Restrict Masquerading to given source subnets"
+msgstr ""
+
+msgid "Restrict to address family"
+msgstr ""
+
+msgid "Rules"
+msgstr ""
+
+msgid "Source"
+msgstr "Origem"
+
 #, fuzzy
-msgid "Internal port"
-msgstr "Porta Externa"
+msgid "Source IP address"
+msgstr "Endereço MAC de origem"
+
+msgid "Source MAC address"
+msgstr ""
+
+#, fuzzy
+msgid "Source address"
+msgstr "Endereço MAC de origem"
+
+msgid "Source port"
+msgstr "Porta de origem"
+
+#, fuzzy
+msgid "Source zone"
+msgstr "Porta de origem"
+
+msgid ""
+"The firewall creates zones over your network interfaces to control network "
+"traffic flow."
+msgstr ""
+"O firewall cria zonas sobre as interfaces de rede para controlar o fluxo do "
+"tráfego."
+
+msgid ""
+"The options below control the forwarding policies between this zone (%s) and "
+"other zones. <em>Destination zones</em> cover forwarded traffic "
+"<strong>originating from %q</strong>. <em>Source zones</em> match forwarded "
+"traffic from other zones <strong>targeted at %q</strong>. The forwarding "
+"rule is <em>unidirectional</em>, e.g. a forward from lan to wan does "
+"<em>not</em> imply a permission to forward from wan to lan as well."
+msgstr ""
+
+msgid ""
+"This section defines common properties of %q. The <em>input</em> and "
+"<em>output</em> options set the default policies for traffic entering and "
+"leaving this zone while the <em>forward</em> option describes the policy for "
+"forwarded traffic between different networks within the zone. <em>Covered "
+"networks</em> specifies which available networks are member of this zone."
+msgstr ""
+
+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."
+
+msgid "Via"
+msgstr ""
+
+msgid "Zone %q"
+msgstr ""
+
+msgid "Zone ⇒ Forwardings"
+msgstr ""
+
+msgid "Zones"
+msgstr "Zonas"
+
+msgid "accept"
+msgstr "aceitar"
+
+msgid "any"
+msgstr ""
+
+msgid "drop"
+msgstr "dropar"
+
+msgid "reject"
+msgstr "rejeitar"
+
+#, fuzzy
+#~ msgid "Network"
+#~ msgstr "Redes"
+
+#~ msgid "Traffic Control"
+#~ msgstr "Controle de Tráfego"
+
+#~ msgid "Zone-to-Zone traffic"
+#~ msgstr "Tráfego de Zona-para-Zona"
+
+#, fuzzy
+#~ msgid ""
+#~ "Here you can specify which network traffic is allowed to flow between "
+#~ "network zones. Only new connections will be matched.  Packets belonging "
+#~ "to already open connections are automatically allowed to pass the "
+#~ "firewall. If you experience occasional connection problems try enabling "
+#~ "MSS Clamping otherwise disable it for performance reasons."
+#~ msgstr ""
+#~ "Aqui você pode especificar qual tráfego de rede será permitido para o "
+#~ "fluxo entre zonas das redes. Somente novas conexões serão processadas. "
+#~ "Pacotes pertencentes à conexões já abertas estão automaticamente "
+#~ "permitidos para passar pelo firewall."
+
+#~ msgid "Zone"
+#~ msgstr "Zona"
+
+#, fuzzy
+#~ msgid "Destination IP"
+#~ msgstr "Destino"
+
+#, fuzzy
+#~ msgid "IP address"
+#~ msgstr "Endereço IP"
+
+#, fuzzy
+#~ msgid "Source MAC-address"
+#~ msgstr "Endereço MAC de origem"
 
 #~ msgid "Custom forwarding"
 #~ msgstr "Redirecionamento personalizado"
diff --git a/po/ru/firewall.po b/po/ru/firewall.po
index d0d83b7ea0..b7231a37e9 100644
--- a/po/ru/firewall.po
+++ b/po/ru/firewall.po
@@ -12,139 +12,193 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-msgid "Firewall"
-msgstr ""
-
-msgid ""
-"The firewall creates zones over your network interfaces to control network "
-"traffic flow."
-msgstr ""
-
-msgid "Enable SYN-flood protection"
-msgstr ""
-
-msgid "Drop invalid packets"
-msgstr ""
-
-msgid "Input"
-msgstr ""
-
-msgid "Output"
-msgstr ""
-
-msgid "Forward"
-msgstr ""
-
-msgid "reject"
-msgstr ""
-
-msgid "drop"
-msgstr ""
-
-msgid "accept"
-msgstr ""
-
-msgid "Zones"
-msgstr ""
-
-msgid "Name"
-msgstr ""
-
-msgid "Masquerading"
-msgstr ""
-
-msgid "MSS clamping"
-msgstr ""
-
-msgid "Network"
-msgstr ""
-
-msgid "Traffic Control"
-msgstr ""
-
-msgid "Zone-to-Zone traffic"
-msgstr ""
-
-msgid ""
-"Here you can specify which network traffic is allowed to flow between "
-"network zones. Only new connections will be matched.  Packets belonging to "
-"already open connections are automatically allowed to pass the firewall. If "
-"you experience occasional connection problems try enabling MSS Clamping "
-"otherwise disable it for performance reasons."
-msgstr ""
-
-msgid "Source"
-msgstr ""
-
-msgid "Destination"
-msgstr ""
-
-msgid "Rules"
-msgstr ""
-
-msgid "Protocol"
-msgstr ""
-
-msgid "Device"
+msgid "(optional)"
 msgstr ""
 
 msgid "Action"
 msgstr ""
 
-msgid "Traffic Redirection"
-msgstr ""
-
-msgid ""
-"Traffic redirection allows you to change the destination address of "
-"forwarded packets."
-msgstr ""
-
-msgid "(optional)"
-msgstr ""
-
-msgid "Zone"
-msgstr ""
-
-msgid "Source port"
-msgstr ""
-
-msgid "Destination IP"
-msgstr ""
-
-msgid "IP address"
-msgstr ""
-
-msgid "Destination port"
+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 "Overview"
+msgid "Allow forward from <em>source zones</em>:"
 msgstr ""
 
-msgid "Source zone"
+msgid "Allow forward to <em>destination zones</em>:"
 msgstr ""
 
-msgid "Destination zone"
+msgid "Any"
 msgstr ""
 
-msgid "any"
+msgid "Covered networks"
 msgstr ""
 
-msgid "Source address"
+msgid "Custom Rules"
+msgstr ""
+
+msgid "Custom Rules (/etc/firewall.user)"
+msgstr ""
+
+msgid "Destination"
 msgstr ""
 
 msgid "Destination address"
 msgstr ""
 
-msgid "Source MAC-address"
+msgid "Destination port"
+msgstr ""
+
+msgid "Destination zone"
+msgstr ""
+
+msgid "Device"
+msgstr ""
+
+msgid "Drop invalid packets"
+msgstr ""
+
+msgid "Enable NAT Loopback"
+msgstr ""
+
+msgid "Enable SYN-flood protection"
+msgstr ""
+
+msgid "Enable logging on this zone"
+msgstr ""
+
+msgid "External port"
+msgstr ""
+
+msgid "Family"
+msgstr ""
+
+msgid "Firewall"
+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 "General Settings"
+msgstr ""
+
+msgid "IPv4 and IPv6"
+msgstr ""
+
+msgid "IPv4 only"
+msgstr ""
+
+msgid "IPv6 only"
+msgstr ""
+
+msgid "Input"
+msgstr ""
+
+msgid "Intended destination address"
+msgstr ""
+
+msgid "Inter-Zone Forwarding"
+msgstr ""
+
+msgid "Internal IP address"
+msgstr ""
+
+msgid "Internal port"
+msgstr ""
+
+msgid "Internal port (optional)"
+msgstr ""
+
+msgid "Limit log messages"
+msgstr ""
+
+msgid "MSS clamping"
+msgstr ""
+
+msgid "Masquerading"
+msgstr ""
+
+msgid "Match ICMP type"
+msgstr ""
+
+msgid ""
+"Match incoming traffic directed at the given destination port or port range "
+"on this host"
+msgstr ""
+
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Output"
+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 "Protocol"
+msgstr ""
+
+msgid ""
+"Redirect matched incoming traffic to the given port on the internal host"
+msgstr ""
+
+msgid "Redirect matched incoming traffic to the specified internal host"
+msgstr ""
+
+msgid "Redirection type"
+msgstr ""
+
+msgid "Redirections"
+msgstr ""
+
+msgid "Restrict Masquerading to given destination subnets"
+msgstr ""
+
+msgid "Restrict Masquerading to given source subnets"
+msgstr ""
+
+msgid "Restrict to address family"
+msgstr ""
+
+msgid "Rules"
+msgstr ""
+
+msgid "Source"
 msgstr ""
 
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
@@ -180,39 +234,68 @@ msgstr ""
 msgid "Source IP address"
 msgstr ""
 
-msgid ""
-"Match incoming traffic originating from the given source port or port range "
-"on the client host"
+msgid "Source MAC address"
 msgstr ""
 
-msgid "External port"
+msgid "Source address"
+msgstr ""
+
+msgid "Source port"
+msgstr ""
+
+msgid "Source zone"
 msgstr ""
 
 msgid ""
-"Match incoming traffic directed at the given destination port or port range "
-"on this host"
-msgstr ""
-
-msgid "Internal IP address"
-msgstr ""
-
-msgid "Redirect matched incoming traffic to the specified internal host"
-msgstr ""
-
-msgid "Internal port (optional)"
+"The firewall creates zones over your network interfaces to control network "
+"traffic flow."
 msgstr ""
 
 msgid ""
-"Redirect matched incoming traffic to the given port on the internal host"
-msgstr ""
-
-msgid "Port forwarding"
+"The options below control the forwarding policies between this zone (%s) and "
+"other zones. <em>Destination zones</em> cover forwarded traffic "
+"<strong>originating from %q</strong>. <em>Source zones</em> match forwarded "
+"traffic from other zones <strong>targeted at %q</strong>. The forwarding "
+"rule is <em>unidirectional</em>, e.g. a forward from lan to wan does "
+"<em>not</em> imply a permission to forward from wan to lan as well."
 msgstr ""
 
 msgid ""
-"Port forwarding allows to provide network services in the internal network "
-"to an external network."
+"This section defines common properties of %q. The <em>input</em> and "
+"<em>output</em> options set the default policies for traffic entering and "
+"leaving this zone while the <em>forward</em> option describes the policy for "
+"forwarded traffic between different networks within the zone. <em>Covered "
+"networks</em> specifies which available networks are member of this zone."
 msgstr ""
 
-msgid "Internal port"
+msgid "Traffic Redirection"
+msgstr ""
+
+msgid ""
+"Traffic redirection allows you to change the destination address of "
+"forwarded packets."
+msgstr ""
+
+msgid "Via"
+msgstr ""
+
+msgid "Zone %q"
+msgstr ""
+
+msgid "Zone ⇒ Forwardings"
+msgstr ""
+
+msgid "Zones"
+msgstr ""
+
+msgid "accept"
+msgstr ""
+
+msgid "any"
+msgstr ""
+
+msgid "drop"
+msgstr ""
+
+msgid "reject"
 msgstr ""
diff --git a/po/vi/firewall.po b/po/vi/firewall.po
index 8528fb929b..c6405bd4c0 100644
--- a/po/vi/firewall.po
+++ b/po/vi/firewall.po
@@ -13,128 +13,21 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-msgid "Firewall"
-msgstr "Firewall"
-
-msgid ""
-"The firewall creates zones over your network interfaces to control network "
-"traffic flow."
-msgstr ""
-"The firewall tạo zones trên giao diện mạng lưới để điều triển sự dòng lưu "
-"thông của mạng."
-
-#, fuzzy
-msgid "Enable SYN-flood protection"
-msgstr "SYN-flood bảo vệ "
-
-msgid "Drop invalid packets"
-msgstr "Bỏ qua nhưng gói không hợp lý"
-
-msgid "Input"
-msgstr "Input"
-
-msgid "Output"
-msgstr "Output"
-
-msgid "Forward"
-msgstr ""
-
-msgid "reject"
-msgstr "Không chấp nhận"
-
-msgid "drop"
-msgstr "drop"
-
-msgid "accept"
-msgstr "chấp nhận"
-
-msgid "Zones"
-msgstr "Zones"
-
-msgid "Name"
-msgstr ""
-
-msgid "Masquerading"
-msgstr ""
-
-#, fuzzy
-msgid "MSS clamping"
-msgstr "MSS Clamping"
-
-#, fuzzy
-msgid "Network"
-msgstr "Networks"
-
-msgid "Traffic Control"
-msgstr "Điều khiển lưu thông"
-
-msgid "Zone-to-Zone traffic"
-msgstr "Lưu thông Zone- to - Zone"
-
-#, fuzzy
-msgid ""
-"Here you can specify which network traffic is allowed to flow between "
-"network zones. Only new connections will be matched.  Packets belonging to "
-"already open connections are automatically allowed to pass the firewall. If "
-"you experience occasional connection problems try enabling MSS Clamping "
-"otherwise disable it for performance reasons."
-msgstr ""
-"Tại đây bạn có thể xác định được mạng lưới giao thông được phép lưu lượng "
-"qua network zone. Chỉ có kết nối mới sẽ là phù hợp. Các gói thuộc kết nối đã "
-"mở được tự động được cho phép để vượt qua firewall. Nếu bạn gặp vấn đề kết "
-"nối thử kích hoạt MSS Clamping hoặc vô hiệu hóa nó vì lý do thực thi."
-
-msgid "Source"
-msgstr "Nguồn"
-
-msgid "Destination"
-msgstr "Điểm đến"
-
-msgid "Rules"
-msgstr ""
-
-msgid "Protocol"
-msgstr ""
-
-msgid "Device"
+msgid "(optional)"
 msgstr ""
 
 msgid "Action"
 msgstr "Action"
 
-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."
+msgid "Advanced Options"
 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 "(optional)"
-msgstr ""
-
-msgid "Zone"
-msgstr "Zone"
-
-msgid "Source port"
-msgstr "Cổng nguồn"
-
-#, fuzzy
-msgid "Destination IP"
-msgstr "Điểm đến"
-
-#, fuzzy
-msgid "IP address"
-msgstr "Địa chỉ IP"
-
-msgid "Destination port"
-msgstr "Cổng điểm đến"
 
 msgid "Advanced Rules"
 msgstr "Luật cấp cao"
 
+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 "
@@ -144,60 +37,138 @@ msgstr ""
 "đượ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 "Overview"
+msgid "Allow forward from <em>source zones</em>:"
 msgstr ""
 
-#, fuzzy
-msgid "Source zone"
-msgstr "Cổng nguồn"
+msgid "Allow forward to <em>destination zones</em>:"
+msgstr ""
+
+msgid "Any"
+msgstr ""
+
+msgid "Covered networks"
+msgstr ""
+
+msgid "Custom Rules"
+msgstr ""
+
+msgid "Custom Rules (/etc/firewall.user)"
+msgstr ""
+
+msgid "Destination"
+msgstr "Điểm đến"
+
+msgid "Destination address"
+msgstr "Địa chỉ điểm đến"
+
+msgid "Destination port"
+msgstr "Cổng điểm đến"
 
 #, fuzzy
 msgid "Destination zone"
 msgstr "Điểm đến"
 
-msgid "any"
+msgid "Device"
+msgstr ""
+
+msgid "Drop invalid packets"
+msgstr "Bỏ qua nhưng gói không hợp lý"
+
+msgid "Enable NAT Loopback"
 msgstr ""
 
 #, fuzzy
-msgid "Source address"
-msgstr "Đỉa chỉ MAC nguồn"
+msgid "Enable SYN-flood protection"
+msgstr "SYN-flood bảo vệ "
 
-msgid "Destination address"
-msgstr "Địa chỉ điểm đến"
-
-#, fuzzy
-msgid "Source MAC-address"
-msgstr "Đỉa chỉ MAC nguồn"
-
-#, fuzzy
-msgid "Source IP address"
-msgstr "Đỉa chỉ MAC nguồn"
-
-msgid ""
-"Match incoming traffic originating from the given source port or port range "
-"on the client host"
+msgid "Enable logging on this zone"
 msgstr ""
 
 msgid "External port"
 msgstr "External port"
 
+msgid "Family"
+msgstr ""
+
+msgid "Firewall"
+msgstr "Firewall"
+
+msgid "Firewall - Zone Settings"
+msgstr ""
+
 msgid ""
-"Match incoming traffic directed at the given destination port or port range "
-"on this host"
+"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 "General Settings"
+msgstr ""
+
+msgid "IPv4 and IPv6"
+msgstr ""
+
+msgid "IPv4 only"
+msgstr ""
+
+msgid "IPv6 only"
+msgstr ""
+
+msgid "Input"
+msgstr "Input"
+
+msgid "Intended destination address"
+msgstr ""
+
+msgid "Inter-Zone Forwarding"
 msgstr ""
 
 #, fuzzy
 msgid "Internal IP address"
 msgstr "Internal address"
 
-msgid "Redirect matched incoming traffic to the specified internal host"
-msgstr ""
+#, fuzzy
+msgid "Internal port"
+msgstr "External port"
 
 msgid "Internal port (optional)"
 msgstr "Internal port (tùy chọn)"
 
+msgid "Limit log messages"
+msgstr ""
+
+#, fuzzy
+msgid "MSS clamping"
+msgstr "MSS Clamping"
+
+msgid "Masquerading"
+msgstr ""
+
+msgid "Match ICMP type"
+msgstr ""
+
 msgid ""
-"Redirect matched incoming traffic to the given port on the internal host"
+"Match incoming traffic directed at the given destination port or port range "
+"on this host"
+msgstr ""
+
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Output"
+msgstr "Output"
+
+msgid "Overview"
 msgstr ""
 
 msgid "Port forwarding"
@@ -210,9 +181,150 @@ 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 ""
+
+msgid ""
+"Redirect matched incoming traffic to the given port on the internal host"
+msgstr ""
+
+msgid "Redirect matched incoming traffic to the specified internal host"
+msgstr ""
+
+msgid "Redirection type"
+msgstr ""
+
+msgid "Redirections"
+msgstr ""
+
+msgid "Restrict Masquerading to given destination subnets"
+msgstr ""
+
+msgid "Restrict Masquerading to given source subnets"
+msgstr ""
+
+msgid "Restrict to address family"
+msgstr ""
+
+msgid "Rules"
+msgstr ""
+
+msgid "Source"
+msgstr "Nguồn"
+
 #, fuzzy
-msgid "Internal port"
-msgstr "External port"
+msgid "Source IP address"
+msgstr "Đỉa chỉ MAC nguồn"
+
+msgid "Source MAC address"
+msgstr ""
+
+#, fuzzy
+msgid "Source address"
+msgstr "Đỉa chỉ MAC nguồn"
+
+msgid "Source port"
+msgstr "Cổng nguồn"
+
+#, fuzzy
+msgid "Source zone"
+msgstr "Cổng nguồn"
+
+msgid ""
+"The firewall creates zones over your network interfaces to control network "
+"traffic flow."
+msgstr ""
+"The firewall tạo zones trên giao diện mạng lưới để điều triển sự dòng lưu "
+"thông của mạng."
+
+msgid ""
+"The options below control the forwarding policies between this zone (%s) and "
+"other zones. <em>Destination zones</em> cover forwarded traffic "
+"<strong>originating from %q</strong>. <em>Source zones</em> match forwarded "
+"traffic from other zones <strong>targeted at %q</strong>. The forwarding "
+"rule is <em>unidirectional</em>, e.g. a forward from lan to wan does "
+"<em>not</em> imply a permission to forward from wan to lan as well."
+msgstr ""
+
+msgid ""
+"This section defines common properties of %q. The <em>input</em> and "
+"<em>output</em> options set the default policies for traffic entering and "
+"leaving this zone while the <em>forward</em> option describes the policy for "
+"forwarded traffic between different networks within the zone. <em>Covered "
+"networks</em> specifies which available networks are member of this zone."
+msgstr ""
+
+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. "
+
+msgid "Via"
+msgstr ""
+
+msgid "Zone %q"
+msgstr ""
+
+msgid "Zone ⇒ Forwardings"
+msgstr ""
+
+msgid "Zones"
+msgstr "Zones"
+
+msgid "accept"
+msgstr "chấp nhận"
+
+msgid "any"
+msgstr ""
+
+msgid "drop"
+msgstr "drop"
+
+msgid "reject"
+msgstr "Không chấp nhận"
+
+#, fuzzy
+#~ msgid "Network"
+#~ msgstr "Networks"
+
+#~ msgid "Traffic Control"
+#~ msgstr "Điều khiển lưu thông"
+
+#~ msgid "Zone-to-Zone traffic"
+#~ msgstr "Lưu thông Zone- to - Zone"
+
+#, fuzzy
+#~ msgid ""
+#~ "Here you can specify which network traffic is allowed to flow between "
+#~ "network zones. Only new connections will be matched.  Packets belonging "
+#~ "to already open connections are automatically allowed to pass the "
+#~ "firewall. If you experience occasional connection problems try enabling "
+#~ "MSS Clamping otherwise disable it for performance reasons."
+#~ msgstr ""
+#~ "Tại đây bạn có thể xác định được mạng lưới giao thông được phép lưu lượng "
+#~ "qua network zone. Chỉ có kết nối mới sẽ là phù hợp. Các gói thuộc kết nối "
+#~ "đã mở được tự động được cho phép để vượt qua firewall. Nếu bạn gặp vấn đề "
+#~ "kết nối thử kích hoạt MSS Clamping hoặc vô hiệu hóa nó vì lý do thực thi."
+
+#~ msgid "Zone"
+#~ msgstr "Zone"
+
+#, fuzzy
+#~ msgid "Destination IP"
+#~ msgstr "Điểm đến"
+
+#, fuzzy
+#~ msgid "IP address"
+#~ msgstr "Địa chỉ IP"
+
+#, fuzzy
+#~ msgid "Source MAC-address"
+#~ msgstr "Đỉa chỉ MAC nguồn"
 
 #~ msgid "Custom forwarding"
 #~ msgstr "Tùy chỉnh chuyển tiếp"
diff --git a/po/zh_CN/firewall.po b/po/zh_CN/firewall.po
index b549defe31..91e1e602f8 100644
--- a/po/zh_CN/firewall.po
+++ b/po/zh_CN/firewall.po
@@ -11,139 +11,193 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-msgid "Firewall"
-msgstr "防火墙"
-
-msgid ""
-"The firewall creates zones over your network interfaces to control network "
-"traffic flow."
-msgstr ""
-
-msgid "Enable SYN-flood protection"
-msgstr ""
-
-msgid "Drop invalid packets"
-msgstr ""
-
-msgid "Input"
-msgstr ""
-
-msgid "Output"
-msgstr ""
-
-msgid "Forward"
-msgstr ""
-
-msgid "reject"
-msgstr ""
-
-msgid "drop"
-msgstr ""
-
-msgid "accept"
-msgstr ""
-
-msgid "Zones"
-msgstr "区"
-
-msgid "Name"
-msgstr ""
-
-msgid "Masquerading"
-msgstr ""
-
-msgid "MSS clamping"
-msgstr ""
-
-msgid "Network"
-msgstr ""
-
-msgid "Traffic Control"
-msgstr ""
-
-msgid "Zone-to-Zone traffic"
-msgstr ""
-
-msgid ""
-"Here you can specify which network traffic is allowed to flow between "
-"network zones. Only new connections will be matched.  Packets belonging to "
-"already open connections are automatically allowed to pass the firewall. If "
-"you experience occasional connection problems try enabling MSS Clamping "
-"otherwise disable it for performance reasons."
-msgstr ""
-
-msgid "Source"
-msgstr ""
-
-msgid "Destination"
-msgstr ""
-
-msgid "Rules"
-msgstr ""
-
-msgid "Protocol"
-msgstr ""
-
-msgid "Device"
+msgid "(optional)"
 msgstr ""
 
 msgid "Action"
 msgstr ""
 
-msgid "Traffic Redirection"
-msgstr ""
-
-msgid ""
-"Traffic redirection allows you to change the destination address of "
-"forwarded packets."
-msgstr ""
-
-msgid "(optional)"
-msgstr ""
-
-msgid "Zone"
-msgstr "区"
-
-msgid "Source port"
-msgstr ""
-
-msgid "Destination IP"
-msgstr ""
-
-msgid "IP address"
-msgstr ""
-
-msgid "Destination port"
+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 "Overview"
+msgid "Allow forward from <em>source zones</em>:"
 msgstr ""
 
-msgid "Source zone"
+msgid "Allow forward to <em>destination zones</em>:"
 msgstr ""
 
-msgid "Destination zone"
+msgid "Any"
 msgstr ""
 
-msgid "any"
+msgid "Covered networks"
 msgstr ""
 
-msgid "Source address"
+msgid "Custom Rules"
+msgstr ""
+
+msgid "Custom Rules (/etc/firewall.user)"
+msgstr ""
+
+msgid "Destination"
 msgstr ""
 
 msgid "Destination address"
 msgstr ""
 
-msgid "Source MAC-address"
+msgid "Destination port"
+msgstr ""
+
+msgid "Destination zone"
+msgstr ""
+
+msgid "Device"
+msgstr ""
+
+msgid "Drop invalid packets"
+msgstr ""
+
+msgid "Enable NAT Loopback"
+msgstr ""
+
+msgid "Enable SYN-flood protection"
+msgstr ""
+
+msgid "Enable logging on this zone"
+msgstr ""
+
+msgid "External port"
+msgstr ""
+
+msgid "Family"
+msgstr ""
+
+msgid "Firewall"
+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 "General Settings"
+msgstr ""
+
+msgid "IPv4 and IPv6"
+msgstr ""
+
+msgid "IPv4 only"
+msgstr ""
+
+msgid "IPv6 only"
+msgstr ""
+
+msgid "Input"
+msgstr ""
+
+msgid "Intended destination address"
+msgstr ""
+
+msgid "Inter-Zone Forwarding"
+msgstr ""
+
+msgid "Internal IP address"
+msgstr ""
+
+msgid "Internal port"
+msgstr ""
+
+msgid "Internal port (optional)"
+msgstr ""
+
+msgid "Limit log messages"
+msgstr ""
+
+msgid "MSS clamping"
+msgstr ""
+
+msgid "Masquerading"
+msgstr ""
+
+msgid "Match ICMP type"
+msgstr ""
+
+msgid ""
+"Match incoming traffic directed at the given destination port or port range "
+"on this host"
+msgstr ""
+
+msgid ""
+"Match incoming traffic originating from the given source port or port range "
+"on the client host"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Output"
+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 "Protocol"
+msgstr ""
+
+msgid ""
+"Redirect matched incoming traffic to the given port on the internal host"
+msgstr ""
+
+msgid "Redirect matched incoming traffic to the specified internal host"
+msgstr ""
+
+msgid "Redirection type"
+msgstr ""
+
+msgid "Redirections"
+msgstr ""
+
+msgid "Restrict Masquerading to given destination subnets"
+msgstr ""
+
+msgid "Restrict Masquerading to given source subnets"
+msgstr ""
+
+msgid "Restrict to address family"
+msgstr ""
+
+msgid "Rules"
+msgstr ""
+
+msgid "Source"
 msgstr ""
 
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
@@ -179,42 +233,74 @@ msgstr ""
 msgid "Source IP address"
 msgstr ""
 
-msgid ""
-"Match incoming traffic originating from the given source port or port range "
-"on the client host"
+msgid "Source MAC address"
 msgstr ""
 
-msgid "External port"
+msgid "Source address"
+msgstr ""
+
+msgid "Source port"
+msgstr ""
+
+msgid "Source zone"
 msgstr ""
 
 msgid ""
-"Match incoming traffic directed at the given destination port or port range "
-"on this host"
-msgstr ""
-
-msgid "Internal IP address"
-msgstr ""
-
-msgid "Redirect matched incoming traffic to the specified internal host"
-msgstr ""
-
-msgid "Internal port (optional)"
+"The firewall creates zones over your network interfaces to control network "
+"traffic flow."
 msgstr ""
 
 msgid ""
-"Redirect matched incoming traffic to the given port on the internal host"
-msgstr ""
-
-msgid "Port forwarding"
+"The options below control the forwarding policies between this zone (%s) and "
+"other zones. <em>Destination zones</em> cover forwarded traffic "
+"<strong>originating from %q</strong>. <em>Source zones</em> match forwarded "
+"traffic from other zones <strong>targeted at %q</strong>. The forwarding "
+"rule is <em>unidirectional</em>, e.g. a forward from lan to wan does "
+"<em>not</em> imply a permission to forward from wan to lan as well."
 msgstr ""
 
 msgid ""
-"Port forwarding allows to provide network services in the internal network "
-"to an external network."
+"This section defines common properties of %q. The <em>input</em> and "
+"<em>output</em> options set the default policies for traffic entering and "
+"leaving this zone while the <em>forward</em> option describes the policy for "
+"forwarded traffic between different networks within the zone. <em>Covered "
+"networks</em> specifies which available networks are member of this zone."
 msgstr ""
 
-msgid "Internal port"
+msgid "Traffic Redirection"
 msgstr ""
 
+msgid ""
+"Traffic redirection allows you to change the destination address of "
+"forwarded packets."
+msgstr ""
+
+msgid "Via"
+msgstr ""
+
+msgid "Zone %q"
+msgstr ""
+
+msgid "Zone ⇒ Forwardings"
+msgstr ""
+
+msgid "Zones"
+msgstr "区"
+
+msgid "accept"
+msgstr ""
+
+msgid "any"
+msgstr ""
+
+msgid "drop"
+msgstr ""
+
+msgid "reject"
+msgstr ""
+
+#~ msgid "Zone"
+#~ msgstr "区"
+
 #~ msgid "MASQ"
 #~ msgstr "MASQ"