applications/luci-multiwan: convert translations to trunk format

3 files changed, 74 insertions, 69 deletions

diff --git a/applications/luci-multiwan/luasrc/model/cbi/multiwan/multiwan.lua b/applications/luci-multiwan/luasrc/model/cbi/multiwan/multiwan.lua
index a1696b57f..30b5375c9 100644
--- a/applications/luci-multiwan/luasrc/model/cbi/multiwan/multiwan.lua
+++ b/applications/luci-multiwan/luasrc/model/cbi/multiwan/multiwan.lua
@@ -1,8 +1,10 @@
 require("luci.tools.webadmin")
-m = Map("multiwan")
+
+m = Map("multiwan", translate("Multi-WAN"),
+	translate("Multi-WAN allows for the use of multiple uplinks for load balancing and failover."))
 
 s = m:section(NamedSection, "config", "multiwan", "")
-e = s:option(Flag, "enabled", translate("enable"))
+e = s:option(Flag, "enabled", translate("Enable"))
 e.rmempty = false
 
 function e.write(self, section, value)
@@ -17,22 +19,24 @@ function e.cfgvalue(self, section)
         return (os.execute("/etc/init.d/multiwan enabled") == 0) and "1" or "0"
 end
 
-default_route = s:option(ListValue, "default_route", translate("default_route"))
+default_route = s:option(ListValue, "default_route", translate("Default Route"))
 luci.tools.webadmin.cbi_add_networks(default_route)
-default_route:value("balancer", translate("balancer"))
+default_route:value("balancer", translate("Load Balancer"))
 default_route.default = "balancer"
 default_route.optional = false
 default_route.rmempty = false
 
-resolv_conf = s:option(Value, "resolv_conf", translate("resolv_conf"), translate("resolv_conf_desc"))
+resolv_conf = s:option(Value, "resolv_conf", translate("DNS configuration file"),
+	translate("(dnsmasq uses /tmp/resolv.conf.auto)"))
 resolv_conf.default = "/tmp/resolv.conf.auto"
 resolv_conf.optional = false
 resolv_conf.rmempty = false
 
-s = m:section(TypedSection, "interface", translate("interfaces"), translate("interfaces_desc"))
+s = m:section(TypedSection, "interface", translate("WAN Uplinks Configuration"),
+	translate("Health Monitor detects and corrects network changes and failed connections."))
 s.addremove = true
 
-weight = s:option(ListValue, "weight", translate("weight"))
+weight = s:option(ListValue, "weight", translate("Load Balancer Distribution"))
 weight:value("10", "10")
 weight:value("9", "9")
 weight:value("8", "8")
@@ -43,13 +47,13 @@ weight:value("4", "4")
 weight:value("3", "3")
 weight:value("2", "2")
 weight:value("1", "1")
-weight:value("disable", translate("none"))
+weight:value("disable", translate("None"))
 weight.default = "5"
 weight.optional = false
 weight.rmempty = false
 
-interval = s:option(ListValue, "health_interval", translate("health_interval"))
-interval:value("disable", translate("disable"))
+interval = s:option(ListValue, "health_interval", translate("Health Monitor Frequency"))
+interval:value("disable", translate("Disable"))
 interval:value("5", "5 sec.")
 interval:value("10", "10 sec.")
 interval:value("20", "20 sec.")
@@ -60,15 +64,15 @@ interval.default = "10"
 interval.optional = false
 interval.rmempty = false
 
-icmp_hosts = s:option(Value, "icmp_hosts", translate("icmp_hosts"))
-icmp_hosts:value("disable", translate("disable"))
+icmp_hosts = s:option(Value, "icmp_hosts", translate("Health Monitor ICMP Host(s)"))
+icmp_hosts:value("disable", translate("Disable"))
 icmp_hosts:value("dns", "DNS Server(s)")
 icmp_hosts:value("gateway", "WAN Gateway")
 icmp_hosts.default = "dns"
 icmp_hosts.optional = false
 icmp_hosts.rmempty = false
 
-timeout = s:option(ListValue, "timeout", translate("timeout"))
+timeout = s:option(ListValue, "timeout", translate("Health Monitor ICMP Timeout"))
 timeout:value("1", "1 sec.")
 timeout:value("2", "2 sec.")
 timeout:value("3", "3 sec.")
@@ -79,7 +83,7 @@ timeout.default = "3"
 timeout.optional = false
 timeout.rmempty = false
 
-fail = s:option(ListValue, "health_fail_retries", translate("health_fail_retries"))
+fail = s:option(ListValue, "health_fail_retries", translate("Attempts Before WAN Failover"))
 fail:value("1", "1")
 fail:value("3", "3")
 fail:value("5", "5")
@@ -90,7 +94,7 @@ fail.default = "3"
 fail.optional = false
 fail.rmempty = false
 
-recovery = s:option(ListValue, "health_recovery_retries", translate("health_recovery_retries"))
+recovery = s:option(ListValue, "health_recovery_retries", translate("Attempts Before WAN Recovery"))
 recovery:value("1", "1")
 recovery:value("3", "3")
 recovery:value("5", "5")
@@ -101,43 +105,44 @@ recovery.default = "5"
 recovery.optional = false
 recovery.rmempty = false
 
-failover_to = s:option(ListValue, "failover_to", translate("failover_to"))
-failover_to:value("disable", translate("none"))
+failover_to = s:option(ListValue, "failover_to", translate("Failover Traffic Destination"))
+failover_to:value("disable", translate("None"))
 luci.tools.webadmin.cbi_add_networks(failover_to)
-failover_to:value("balancer", translate("balancer"))
+failover_to:value("balancer", translate("Load Balancer"))
 failover_to.default = "balancer"
 failover_to.optional = false
 failover_to.rmempty = false
 
-s = m:section(TypedSection, "mwanfw", translate("mwanfw"), translate("mwanfw_desc"))
+s = m:section(TypedSection, "mwanfw", translate("Multi-WAN Traffic Rules"),
+	translate("Configure rules for directing outbound traffic through specified WAN Uplinks."))
 s.template = "cbi/tblsection"
 s.anonymous = true
 s.addremove = true
 
-src = s:option(Value, "src", translate("src"))
+src = s:option(Value, "src", translate("Source Address"))
 src.rmempty = true
 src:value("", translate("all"))
 luci.tools.webadmin.cbi_add_knownips(src)
 
-dst = s:option(Value, "dst", translate("dst"))
+dst = s:option(Value, "dst", translate("Destination Address"))
 dst.rmempty = true
 dst:value("", translate("all"))
 luci.tools.webadmin.cbi_add_knownips(dst)
 
-proto = s:option(ListValue, "proto", translate("protocol"))
+proto = s:option(ListValue, "proto", translate("Protocol"))
 proto:value("", translate("all"))
 proto:value("tcp", "TCP")
 proto:value("udp", "UDP")
 proto:value("icmp", "ICMP")
 proto.rmempty = true
 
-ports = s:option(Value, "ports", translate("ports"))
+ports = s:option(Value, "ports", translate("Ports"))
 ports.rmempty = true
 ports:value("", translate("all", translate("all")))
 
-wanrule = s:option(ListValue, "wanrule", translate("wanrule"))
+wanrule = s:option(ListValue, "wanrule", translate("WAN Uplink"))
 luci.tools.webadmin.cbi_add_networks(wanrule)
-wanrule:value("balancer", translate("balancer"))
+wanrule:value("balancer", translate("Load Balancer"))
 wanrule.default = "balancer"
 wanrule.optional = false
 wanrule.rmempty = false
diff --git a/po/en/multiwan.po b/po/en/multiwan.po
index 54919b51e..eb99b193c 100644
--- a/po/en/multiwan.po
+++ b/po/en/multiwan.po
@@ -6,111 +6,111 @@ msgstr "Content-Type: text/plain; charset=UTF-8"
 
 #: /tmp/i18n/luasrc/i18n/multiwan.en.lua:1
 #. Multi-WAN
-msgid "multiwan"
+msgid "Multi-WAN"
 msgstr "Multi-WAN"
 
 #: /tmp/i18n/luasrc/i18n/multiwan.en.lua:2
 #. Multi-WAN allows for the use of multiple uplinks for load balancing and failover.
-msgid "multiwan_desc"
+msgid "Multi-WAN allows for the use of multiple uplinks for load balancing and failover."
 msgstr "Multi-WAN allows for the use of multiple uplinks for load balancing and failover."
 
 #: /tmp/i18n/luasrc/i18n/multiwan.en.lua:3
 #. Default Route
-msgid "default_route"
+msgid "Default Route"
 msgstr "Default Route"
 
 #: /tmp/i18n/luasrc/i18n/multiwan.en.lua:4
 #. DNS configuration file
-msgid "resolv_conf"
+msgid "DNS configuration file"
 msgstr "DNS configuration file"
 
 #: /tmp/i18n/luasrc/i18n/multiwan.en.lua:5
 #. (dnsmasq uses /tmp/resolv.conf.auto)
-msgid "resolv_conf_desc"
+msgid "(dnsmasq uses /tmp/resolv.conf.auto)"
 msgstr "(dnsmasq uses /tmp/resolv.conf.auto)"
 
 #: /tmp/i18n/luasrc/i18n/multiwan.en.lua:6
 #. WAN Uplinks Configuration
-msgid "interfaces"
+msgid "WAN Uplinks Configuration"
 msgstr "WAN Uplinks Configuration"
 
 #: /tmp/i18n/luasrc/i18n/multiwan.en.lua:7
 #. Health Monitor detects and corrects network changes and failed connections.
-msgid "interfaces_desc"
+msgid "Health Monitor detects and corrects network changes and failed connections."
 msgstr "Health Monitor detects and corrects network changes and failed connections."
 
 #: /tmp/i18n/luasrc/i18n/multiwan.en.lua:8
 #. Load Balancer Distribution
-msgid "weight"
+msgid "Load Balancer Distribution"
 msgstr "Load Balancer Distribution"
 
 #: /tmp/i18n/luasrc/i18n/multiwan.en.lua:9
 #. None
-msgid "none"
+msgid "None"
 msgstr "None"
 
 #: /tmp/i18n/luasrc/i18n/multiwan.en.lua:10
 #. Health Monitor Frequency
-msgid "health_interval"
+msgid "Health Monitor Frequency"
 msgstr "Health Monitor Frequency"
 
 #: /tmp/i18n/luasrc/i18n/multiwan.en.lua:11
 #. Health Monitor ICMP Host(s)
-msgid "icmp_hosts"
+msgid "Health Monitor ICMP Host(s)"
 msgstr "Health Monitor ICMP Host(s)"
 
 #: /tmp/i18n/luasrc/i18n/multiwan.en.lua:12
 #. Health Monitor ICMP Timeout
-msgid "timeout"
+msgid "Health Monitor ICMP Timeout"
 msgstr "Health Monitor ICMP Timeout"
 
 #: /tmp/i18n/luasrc/i18n/multiwan.en.lua:13
 #. Attempts Before WAN Failover
-msgid "health_fail_retries"
+msgid "Attempts Before WAN Failover"
 msgstr "Attempts Before WAN Failover"
 
 #: /tmp/i18n/luasrc/i18n/multiwan.en.lua:14
 #. Attempts Before WAN Recovery
-msgid "health_recovery_retries"
+msgid "Attempts Before WAN Recovery"
 msgstr "Attempts Before WAN Recovery"
 
 #: /tmp/i18n/luasrc/i18n/multiwan.en.lua:15
 #. Failover Traffic Destination
-msgid "failover_to"
+msgid "Failover Traffic Destination"
 msgstr "Failover Traffic Destination"
 
 #: /tmp/i18n/luasrc/i18n/multiwan.en.lua:16
 #. Multi-WAN Traffic Rules
-msgid "mwanfw"
+msgid "Multi-WAN Traffic Rules"
 msgstr "Multi-WAN Traffic Rules"
 
 #: /tmp/i18n/luasrc/i18n/multiwan.en.lua:17
 #. Configure rules for directing outbound traffic through specified WAN Uplinks.
-msgid "mwanfw_desc"
+msgid "Configure rules for directing outbound traffic through specified WAN Uplinks."
 msgstr "Configure rules for directing outbound traffic through specified WAN Uplinks."
 
 #: /tmp/i18n/luasrc/i18n/multiwan.en.lua:18
 #. Source Address
-msgid "src"
+msgid "Source Address"
 msgstr "Source Address"
 
 #: /tmp/i18n/luasrc/i18n/multiwan.en.lua:19
 #. Destination Address
-msgid "dst"
+msgid "Destination Address"
 msgstr "Destination Address"
 
 #: /tmp/i18n/luasrc/i18n/multiwan.en.lua:20
 #. WAN Uplink
-msgid "wanrule"
+msgid "WAN Uplink"
 msgstr "WAN Uplink"
 
 #: /tmp/i18n/luasrc/i18n/multiwan.en.lua:21
 #. Load Balancer
-msgid "balancer"
+msgid "Load Balancer"
 msgstr "Load Balancer"
 
 #: /tmp/i18n/luasrc/i18n/multiwan.en.lua:22
 #. Disable
-msgid "disable"
+msgid "Disable"
 msgstr "Disable"
 
diff --git a/po/templates/multiwan.pot b/po/templates/multiwan.pot
index 1ed3c7b85..3c5e30023 100644
--- a/po/templates/multiwan.pot
+++ b/po/templates/multiwan.pot
@@ -6,111 +6,111 @@ msgstr "Content-Type: text/plain; charset=UTF-8"
 
 #: /tmp/i18n/luasrc/i18n/multiwan.en.lua:1
 #. Multi-WAN
-msgid "multiwan"
+msgid "Multi-WAN"
 msgstr ""
 
 #: /tmp/i18n/luasrc/i18n/multiwan.en.lua:2
 #. Multi-WAN allows for the use of multiple uplinks for load balancing and failover.
-msgid "multiwan_desc"
+msgid "Multi-WAN allows for the use of multiple uplinks for load balancing and failover."
 msgstr ""
 
 #: /tmp/i18n/luasrc/i18n/multiwan.en.lua:3
 #. Default Route
-msgid "default_route"
+msgid "Default Route"
 msgstr ""
 
 #: /tmp/i18n/luasrc/i18n/multiwan.en.lua:4
 #. DNS configuration file
-msgid "resolv_conf"
+msgid "DNS configuration file"
 msgstr ""
 
 #: /tmp/i18n/luasrc/i18n/multiwan.en.lua:5
 #. (dnsmasq uses /tmp/resolv.conf.auto)
-msgid "resolv_conf_desc"
+msgid "(dnsmasq uses /tmp/resolv.conf.auto)"
 msgstr ""
 
 #: /tmp/i18n/luasrc/i18n/multiwan.en.lua:6
 #. WAN Uplinks Configuration
-msgid "interfaces"
+msgid "WAN Uplinks Configuration"
 msgstr ""
 
 #: /tmp/i18n/luasrc/i18n/multiwan.en.lua:7
 #. Health Monitor detects and corrects network changes and failed connections.
-msgid "interfaces_desc"
+msgid "Health Monitor detects and corrects network changes and failed connections."
 msgstr ""
 
 #: /tmp/i18n/luasrc/i18n/multiwan.en.lua:8
 #. Load Balancer Distribution
-msgid "weight"
+msgid "Load Balancer Distribution"
 msgstr ""
 
 #: /tmp/i18n/luasrc/i18n/multiwan.en.lua:9
 #. None
-msgid "none"
+msgid "None"
 msgstr ""
 
 #: /tmp/i18n/luasrc/i18n/multiwan.en.lua:10
 #. Health Monitor Frequency
-msgid "health_interval"
+msgid "Health Monitor Frequency"
 msgstr ""
 
 #: /tmp/i18n/luasrc/i18n/multiwan.en.lua:11
 #. Health Monitor ICMP Host(s)
-msgid "icmp_hosts"
+msgid "Health Monitor ICMP Host(s)"
 msgstr ""
 
 #: /tmp/i18n/luasrc/i18n/multiwan.en.lua:12
 #. Health Monitor ICMP Timeout
-msgid "timeout"
+msgid "Health Monitor ICMP Timeout"
 msgstr ""
 
 #: /tmp/i18n/luasrc/i18n/multiwan.en.lua:13
 #. Attempts Before WAN Failover
-msgid "health_fail_retries"
+msgid "Attempts Before WAN Failover"
 msgstr ""
 
 #: /tmp/i18n/luasrc/i18n/multiwan.en.lua:14
 #. Attempts Before WAN Recovery
-msgid "health_recovery_retries"
+msgid "Attempts Before WAN Recovery"
 msgstr ""
 
 #: /tmp/i18n/luasrc/i18n/multiwan.en.lua:15
 #. Failover Traffic Destination
-msgid "failover_to"
+msgid "Failover Traffic Destination"
 msgstr ""
 
 #: /tmp/i18n/luasrc/i18n/multiwan.en.lua:16
 #. Multi-WAN Traffic Rules
-msgid "mwanfw"
+msgid "Multi-WAN Traffic Rules"
 msgstr ""
 
 #: /tmp/i18n/luasrc/i18n/multiwan.en.lua:17
 #. Configure rules for directing outbound traffic through specified WAN Uplinks.
-msgid "mwanfw_desc"
+msgid "Configure rules for directing outbound traffic through specified WAN Uplinks."
 msgstr ""
 
 #: /tmp/i18n/luasrc/i18n/multiwan.en.lua:18
 #. Source Address
-msgid "src"
+msgid "Source Address"
 msgstr ""
 
 #: /tmp/i18n/luasrc/i18n/multiwan.en.lua:19
 #. Destination Address
-msgid "dst"
+msgid "Destination Address"
 msgstr ""
 
 #: /tmp/i18n/luasrc/i18n/multiwan.en.lua:20
 #. WAN Uplink
-msgid "wanrule"
+msgid "WAN Uplink"
 msgstr ""
 
 #: /tmp/i18n/luasrc/i18n/multiwan.en.lua:21
 #. Load Balancer
-msgid "balancer"
+msgid "Load Balancer"
 msgstr ""
 
 #: /tmp/i18n/luasrc/i18n/multiwan.en.lua:22
 #. Disable
-msgid "disable"
+msgid "Disable"
 msgstr ""