1 files changed, 59 insertions, 107 deletions
diff --git a/po/templates/luci-fw.pot b/po/templates/luci-fw.pot
index 1ec1c7904..5e6a37a1f 100644
--- a/po/templates/luci-fw.pot
+++ b/po/templates/luci-fw.pot
@@ -5,277 +5,229 @@ msgstr "Content-Type: text/plain; charset=UTF-8"
 
 #. Port forwarding
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:1
-msgid "fw_portfw"
+msgid "Port forwarding"
 msgstr ""
 
 #. Traffic Redirection
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:2
-msgid "fw_redirect"
+msgid "Traffic Redirection"
 msgstr ""
 
 #. Traffic redirection allows you to change the destination address of forwarded packets.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:3
-msgid "fw_redirect_desc"
+msgid ""
+"Traffic redirection allows you to change the destination address of "
+"forwarded packets."
 msgstr ""
 
 #. Zone-to-Zone traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:4
-msgid "fw_forwarding"
+msgid "Zone-to-Zone traffic"
 msgstr ""
 
 #. Firewall
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:5
-msgid "fw_fw"
+msgid "Firewall"
 msgstr ""
 
 #. Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:6
-msgid "fw_zone"
+msgid "Zone"
 msgstr ""
 
 #. Zones
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:7
-msgid "fw_zones"
+msgid "Zones"
 msgstr ""
 
 #. Custom forwarding
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:8
-msgid "fw_custfwd"
+msgid "Custom forwarding"
 msgstr ""
 
 #. The firewall creates zones over your network interfaces to control network traffic flow.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:9
-msgid "fw_fw1"
+msgid ""
+"The firewall creates zones over your network interfaces to control network "
+"traffic flow."
 msgstr ""
 
 #. Advanced Rules
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:10
-msgid "firewall_rule"
+msgid "Advanced Rules"
 msgstr ""
 
 #. Advanced rules let you customize the firewall to your needs. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:11
-msgid "firewall_rule_desc"
+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 ""
 
 #. Input Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:12
-msgid "firewall_rule_src"
+msgid "Input Zone"
 msgstr ""
 
 #. Output Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:13
-msgid "firewall_rule_dest"
-msgstr ""
-
-#. Source address
-#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:14
-msgid "firewall_rule_srcip"
+msgid "Output Zone"
 msgstr ""
 
 #. Destination address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:15
-msgid "firewall_rule_destip"
+msgid "Destination address"
 msgstr ""
 
 #. Source MAC-Address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:16
-msgid "firewall_rule_srcmac"
+msgid "Source MAC-Address"
 msgstr ""
 
 #. Source port
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:17
-msgid "firewall_rule_srcport"
+msgid "Source port"
 msgstr ""
 
 #. Destination port
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:18
-msgid "firewall_rule_destport"
+msgid "Destination port"
 msgstr ""
 
 #. Action
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:19
-msgid "firewall_rule_target"
+msgid "Action"
 msgstr ""
 
 #. accept
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:20
-msgid "fw_accept"
+msgid "accept"
 msgstr ""
 
 #. reject
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:21
-msgid "fw_reject"
+msgid "reject"
 msgstr ""
 
 #. drop
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:22
-msgid "fw_drop"
+msgid "drop"
 msgstr ""
 
 #. Source
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:23
-msgid "fw_src"
+msgid "Source"
 msgstr ""
 
 #. Destination
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:24
-msgid "fw_dest"
+msgid "Destination"
 msgstr ""
 
 #. Traffic Control
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:25
-msgid "fw_traffic"
+msgid "Traffic Control"
 msgstr ""
 
 #. MSS Clamping
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:26
-msgid "fw_mtufix"
+msgid "MSS Clamping"
 msgstr ""
 
 #. Drop invalid packets
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:27
-msgid "fw_dropinvalid"
+msgid "Drop invalid packets"
 msgstr ""
 
 #. Port forwarding allows to provide network services in the internal network to an external network.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:28
-msgid "fw_portfw1"
+msgid ""
+"Port forwarding allows to provide network services in the internal network "
+"to an external network."
 msgstr ""
 
 #. External Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:29
-msgid "firewall_redirect_src_desc"
+msgid "External Zone"
 msgstr ""
 
 #. External port
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:30
-msgid "firewall_redirect_srcdport"
-msgstr ""
-
-#. port or range as first-last
-#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:31
-msgid "firewall_redirect_srcdport_desc"
-msgstr ""
-
-#. Source address
-#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:32
-msgid "firewall_redirect_srcip"
+msgid "External port"
 msgstr ""
 
 #. Source MAC
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:33
-msgid "firewall_redirect_srcmac"
+msgid "Source MAC"
 msgstr ""
 
 #. Internal address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:34
-msgid "firewall_redirect_destip"
+msgid "Internal address"
 msgstr ""
 
 #. IP-Address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:35
-msgid "firewall_redirect_destip_desc"
+msgid "IP-Address"
 msgstr ""
 
 #. Internal port (optional)
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:36
-msgid "firewall_redirect_destport"
-msgstr ""
-
-#. port or range as first-last
-#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:37
-msgid "firewall_redirect_destport_desc"
+msgid "Internal port (optional)"
 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.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:38
-msgid "fw_forwarding1"
+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 ""
 
 #. Input
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:39
-msgid "firewall_forwarding_src"
+msgid "Input"
 msgstr ""
 
 #. Output
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:40
-msgid "firewall_forwarding_dest"
+msgid "Output"
 msgstr ""
 
 #. Defaults
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:41
-msgid "firewall_defaults"
+msgid "Defaults"
 msgstr ""
 
 #. These are the default settings that are used if no other rules match.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:42
-msgid "firewall_defaults_desc"
+msgid "These are the default settings that are used if no other rules match."
 msgstr ""
 
 #. SYN-flood protection
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:43
-msgid "firewall_defaults_synflood"
-msgstr ""
-
-#. Incoming Traffic
-#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:44
-msgid "firewall_defaults_input"
-msgstr ""
-
-#. Outgoing Traffic
-#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:45
-msgid "firewall_defaults_output"
-msgstr ""
-
-#. Forwarded Traffic
-#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:46
-msgid "firewall_defaults_forward"
+msgid "SYN-flood protection"
 msgstr ""
 
 #. Zones part the network interfaces into certain isolated areas to separate network traffic. One or more networks can belong to a zone. The MASQ-flag enables NAT masquerading for all outgoing traffic on this zone.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:47
-msgid "firewall_zone_desc"
-msgstr ""
-
-#. Incoming Traffic
-#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:48
-msgid "firewall_zone_input"
-msgstr ""
-
-#. Default Policy
-#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:49
-msgid "firewall_zone_input_desc"
-msgstr ""
-
-#. Outgoing Traffic
-#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:50
-msgid "firewall_zone_output"
-msgstr ""
-
-#. Default Policy
-#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:51
-msgid "firewall_zone_output_desc"
-msgstr ""
-
-#. Forwarded Traffic
-#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:52
-msgid "firewall_zone_forward"
-msgstr ""
-
-#. Default Policy
-#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:53
-msgid "firewall_zone_forward_desc"
+msgid ""
+"Zones part the network interfaces into certain isolated areas to separate "
+"network traffic. One or more networks can belong to a zone. The MASQ-flag "
+"enables NAT masquerading for all outgoing traffic on this zone."
 msgstr ""
 
 #. MASQ
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:54
-msgid "firewall_zone_masq"
+msgid "MASQ"
 msgstr ""
 
 #. Networks
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:55
-msgid "firewall_zone_network"
+msgid "Networks"
 msgstr ""
 
 #. contained networks