all: change most translate statements to new format, some need manual cleanup

9 files changed, 31 insertions, 31 deletions

diff --git a/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/mactodevinfo.lua b/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/mactodevinfo.lua
index 548ddbe2fa..baf02c89cf 100644
--- a/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/mactodevinfo.lua
+++ b/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/mactodevinfo.lua
@@ -12,25 +12,25 @@ You may obtain a copy of the License at
 $Id$
 ]]--
 
-m = Map("mactodevinfo", luci.i18n.translate("l_d_d_m_mac_to_devinfo_override"), translate("l_d_d_m_mac_to_devinfo_override_descr"))
+m = Map("mactodevinfo", luci.i18n.translate("MAC Device Info Overrides"), translate("Override the information returned by the MAC to Device Info Script (mac-to-devinfo) for a specified range of MAC Addresses"))
 
-s = m:section(TypedSection, "mactodevinfo", translate("l_d_d_m_mac_to_devinfo_section"), translate("l_d_d_m_mac_to_devinfo_section_descr"))
+s = m:section(TypedSection, "mactodevinfo", translate("MAC Device Override"), translate("MAC range and information used to override system and IEEE databases"))
 s.addremove = true
 s.anonymous = true
 
-v = s:option(Value, "name", translate("l_d_d_m_name"))
+v = s:option(Value, "name", translate("Name"))
 v.optional = true
-v = s:option(Value, "maclow", translate("l_d_d_m_maclow"))
+v = s:option(Value, "maclow", translate("Beginning of MAC address range"))
 v.optional = false
-v = s:option(Value, "machigh", translate("l_d_d_m_machigh"))
+v = s:option(Value, "machigh", translate("End of MAC address range"))
 v.optional = false
-v = s:option(Value, "vendor", translate("l_d_d_m_vendor"))
+v = s:option(Value, "vendor", translate("Vendor"))
 v.optional = false
-v = s:option(Value, "devtype", translate("l_d_d_m_mactodevinfo_devtype"))
+v = s:option(Value, "devtype", translate("Device Type"))
 v.optional = false
-v = s:option(Value, "model", translate("l_d_d_m_model"))
+v = s:option(Value, "model", translate("Model"))
 v.optional = false
-v = s:option(Value, "ouiowneroverride", translate("l_d_d_m_ouiowneroverride"))
+v = s:option(Value, "ouiowneroverride", translate("OUI Owner"))
 v.optional = true
 
 return m
diff --git a/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo.lua b/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo.lua
index 9dbf24ddfc..963318b476 100644
--- a/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo.lua
+++ b/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo.lua
@@ -21,7 +21,7 @@ require("luci.controller.luci_diag.devinfo_common")
 
 local debug = false
 
-m = SimpleForm("luci_devinfo", translate("l_d_d_nd_netdiscover_to_devinfo"), translate("l_d_d_nd_netdiscover_to_devinfo_descr"))
+m = SimpleForm("luci_devinfo", translate("Network Device Scan"), translate("l_d_d_nd_netdiscover_to_devinfo_descr"))
 m.reset = false
 m.submit = false
 
diff --git a/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_config.lua b/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_config.lua
index 7b5f0d4081..e982bcef6c 100644
--- a/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_config.lua
+++ b/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_config.lua
@@ -14,14 +14,14 @@ $Id$
 
 require("luci.controller.luci_diag.devinfo_common")
 
-m = Map("luci_devinfo", translate("l_d_d_ndc_netdiscover_to_devinfo_config"), translate("l_d_d_ndc_netdiscover_to_devinfo_config_descr"))
+m = Map("luci_devinfo", translate("Network Device Scanning Configuration"), translate("Configure scanning for devices on specified networks. Decreasing \'Timeout\', \'Repeat Count\', and/or \'Sleep Between Requests\' may speed up scans, but also may fail to find some devices."))
 
-s = m:section(SimpleSection, "", translate("l_d_d_ndc_use_config"))
-b = s:option(DummyValue, "_scans", translate("l_d_d_ndc_do_scans"))
+s = m:section(SimpleSection, "", translate("Use Configuration"))
+b = s:option(DummyValue, "_scans", translate("Perform Scans (this can take a few minutes)"))
 b.value = ""
 b.titleref = luci.dispatcher.build_url("admin", "status", "netdiscover_devinfo")
 
-scannet = m:section(TypedSection, "netdiscover_scannet", translate("l_d_d_ndc_netdiscover_scannet"), translate("l_d_d_ndc_netdiscover_scannet_descr"))
+scannet = m:section(TypedSection, "netdiscover_scannet", translate("Scanning Configuration"), translate("Networks to scan for devices"))
 scannet.addremove = true
 scannet.anonymous = false
 
diff --git a/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_config_mini.lua b/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_config_mini.lua
index 9f0686404c..a99ddf9b82 100644
--- a/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_config_mini.lua
+++ b/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_config_mini.lua
@@ -14,14 +14,14 @@ $Id$
 
 require("luci.controller.luci_diag.devinfo_common")
 
-m = Map("luci_devinfo", translate("l_d_d_ndc_netdiscover_to_devinfo_config_mini"), translate("l_d_d_ndc_mini_netdiscover_to_devinfo_config_descr"))
+m = Map("luci_devinfo", translate("Network Device Scanning Configuration"), translate("Configure scanning for devices on specified networks. Decreasing \'Timeout\', \'Repeat Count\', and/or \'Sleep Between Requests\' may speed up scans, but also may fail to find some devices."))
 
-s = m:section(SimpleSection, "", translate("l_d_d_ndc_mini_use_config"))
-b = s:option(DummyValue, "_scans", translate("l_d_d_ndc_mini_do_scans"))
+s = m:section(SimpleSection, "", translate("Use Configuration"))
+b = s:option(DummyValue, "_scans", translate("Perform Scans (this can take a few minutes)"))
 b.value = ""
 b.titleref = luci.dispatcher.build_url("mini", "diag", "netdiscover_devinfo")
 
-scannet = m:section(TypedSection, "netdiscover_scannet", translate("l_d_d_ndc_mini_netdiscover_scannet"), translate("l_d_d_ndc_mini_netdiscover_scannet_descr"))
+scannet = m:section(TypedSection, "netdiscover_scannet", translate("Scanning Configuration"), translate("Networks to scan for devices"))
 scannet.addremove = true
 scannet.anonymous = false
 
diff --git a/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_mini.lua b/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_mini.lua
index 341e2194c1..271c114d2b 100644
--- a/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_mini.lua
+++ b/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_mini.lua
@@ -21,7 +21,7 @@ require("luci.controller.luci_diag.devinfo_common")
 
 local debug = false
 
-m = SimpleForm("luci_devinfo", translate("l_d_d_nd_mini_netdiscover_to_devinfo"), translate("l_d_d_nd_mini_netdiscover_to_devinfo_descr"))
+m = SimpleForm("luci_devinfo", translate("Network Device Scan"), translate("Scan for devices on specified networks."))
 m.reset = false
 m.submit = false
 
diff --git a/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo.lua b/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo.lua
index 8e9c922df0..ff808d9ef7 100644
--- a/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo.lua
+++ b/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo.lua
@@ -21,7 +21,7 @@ require("luci.controller.luci_diag.devinfo_common")
 
 local debug = false
 
-m = SimpleForm("luci-smap-to-devinfo", translate("l_d_d_sd_smap_to_devinfo"), translate("l_d_d_sd_smap_to_devinfo_descr"))
+m = SimpleForm("luci-smap-to-devinfo", translate("SIP Device Information"), translate("Scan for supported SIP devices on specified networks."))
 m.reset = false
 m.submit = false
 
diff --git a/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_config.lua b/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_config.lua
index a50847521e..20b6987f2d 100644
--- a/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_config.lua
+++ b/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_config.lua
@@ -14,19 +14,19 @@ $Id$
 
 require("luci.controller.luci_diag.devinfo_common")
 
-m = Map("luci_devinfo", translate("l_d_d_sdc_smap_to_devinfo_config"), translate("l_d_d_sdc_smap_to_devinfo_config_descr"))
+m = Map("luci_devinfo", translate("SIP Device Scanning Configuration"), translate("Configure scanning for supported SIP devices on specified networks. Decreasing \'Timeout\', \'Repeat Count\', and/or \'Sleep Between Requests\' may speed up scans, but also may fail to find some devices."))
 
-s = m:section(SimpleSection, "", translate("l_d_d_sdc_use_config"))
-b = s:option(DummyValue, "_scans", translate("l_d_d_sdc_do_scans"))
+s = m:section(SimpleSection, "", translate("Use Configuration"))
+b = s:option(DummyValue, "_scans", translate("Perform Scans (this can take a few minutes)"))
 b.value = ""
 b.titleref = luci.dispatcher.build_url("admin", "status", "smap_devinfo")
 
-scannet = m:section(TypedSection, "smap_scannet", translate("l_d_d_sdc_smap_scannet"), translate("smap_scannet_descr"))
+scannet = m:section(TypedSection, "smap_scannet", translate("Scanning Configuration"), translate("Networks to scan for supported devices"))
 scannet.addremove = true
 scannet.anonymous = false
 
 local ports
-ports = scannet:option(Value, "ports", translate("l_d_d_sdc_ports"))
+ports = scannet:option(Value, "ports", translate("Ports"))
 ports.optional = true
 ports.rmempty = true
 
diff --git a/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_config_mini.lua b/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_config_mini.lua
index fae9e6fc45..aff4a98aed 100644
--- a/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_config_mini.lua
+++ b/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_config_mini.lua
@@ -14,19 +14,19 @@ $Id$
 
 require("luci.controller.luci_diag.devinfo_common")
 
-m = Map("luci_devinfo", translate("l_d_d_sdc_mini_smap_to_devinfo_config"), translate("l_d_d_sdc_mini_smap_to_devinfo_config_descr"))
+m = Map("luci_devinfo", translate("Phone Scanning Configuration"), translate("Configure scanning for supported SIP devices on specified networks. Decreasing \'Timeout\', \'Repeat Count\', and/or \'Sleep Between Requests\' may speed up scans, but also may fail to find some devices."))
 
-s = m:section(SimpleSection, "", translate("l_d_d_sdc_mini_use_config"))
-b = s:option(DummyValue, "_scans", translate("l_d_d_sdc_mini_do_scans"))
+s = m:section(SimpleSection, "", translate("Use Configuration"))
+b = s:option(DummyValue, "_scans", translate("Perform Scans (this can take a few minutes)"))
 b.value = ""
 b.titleref = luci.dispatcher.build_url("mini", "diag", "phone_scan")
 
-scannet = m:section(TypedSection, "smap_scannet", translate("l_d_d_sdc_mini_smap_scannet"), translate("l_d_d_sdc_mini_smap_scannet_descr"))
+scannet = m:section(TypedSection, "smap_scannet", translate("Scanning Configuration"), translate("Networks to scan for supported devices"))
 scannet.addremove = true
 scannet.anonymous = false
 
 local ports
-ports = scannet:option(Value, "ports", translate("l_d_d_sdc_mini_ports"))
+ports = scannet:option(Value, "ports", translate("Ports"))
 ports.optional = true
 ports.rmempty = true
 
diff --git a/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_mini.lua b/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_mini.lua
index 6af14b2e65..5b7bb0f0a4 100644
--- a/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_mini.lua
+++ b/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_mini.lua
@@ -21,7 +21,7 @@ require("luci.controller.luci_diag.devinfo_common")
 
 local debug = false
 
-m = SimpleForm("luci-smap-to-devinfo", translate("l_d_d_sd_mini_smap_to_devinfo"), translate("l_d_d_sd_mini_smap_to_devinfo_descr"))
+m = SimpleForm("luci-smap-to-devinfo", translate("Phone Information"), translate("Scan for supported SIP devices on specified networks."))
 m.reset = false
 m.submit = false