diff options
Diffstat (limited to 'applications/luci-diag-devinfo/luasrc')
14 files changed, 75 insertions, 75 deletions
diff --git a/applications/luci-diag-devinfo/luasrc/controller/luci_diag/devinfo_common.lua b/applications/luci-diag-devinfo/luasrc/controller/luci_diag/devinfo_common.lua index 58009c5969..ba6bdcd9c1 100644 --- a/applications/luci-diag-devinfo/luasrc/controller/luci_diag/devinfo_common.lua +++ b/applications/luci-diag-devinfo/luasrc/controller/luci_diag/devinfo_common.lua @@ -90,11 +90,11 @@ function parse_output(devmap, outnets, haslink, type, mini, debug) row["mac"] = "" end if (type == "smap") then - row["vendor"] = luci.i18n.translate("l_d_d_dc_nosipdev") + row["vendor"] = luci.i18n.translate("No SIP devices") else - row["vendor"] = luci.i18n.translate("l_d_d_dc_nodev") + row["vendor"] = luci.i18n.translate("No devices detected") end - row["type"] = luci.i18n.translate("l_d_d_dc_checkothernet") + row["type"] = luci.i18n.translate("check other networks") if (not mini) then row["model"] = "" end @@ -109,40 +109,40 @@ function parse_output(devmap, outnets, haslink, type, mini, debug) local s if (type == "smap") then if (mini) then - s = devmap:section(luci.cbi.Table, netdevs, luci.i18n.translate("l_d_d_dc_sipdev_found_mini") .. " " .. curnet) + s = devmap:section(luci.cbi.Table, netdevs, luci.i18n.translate("SIP devices discovered for") .. " " .. curnet) else local interfacestring = "" if ( interface ~= "" ) then interfacestring = ", " .. interface end - s = devmap:section(luci.cbi.Table, netdevs, luci.i18n.translate("l_d_d_dc_sipdev_found_admin") .. " " .. curnet .. " (" .. subnet .. ":" .. ports .. interfacestring .. ")") + s = devmap:section(luci.cbi.Table, netdevs, luci.i18n.translate("SIP devices discovered for") .. " " .. curnet .. " (" .. subnet .. ":" .. ports .. interfacestring .. ")") end s.template = "diag/smapsection" else if (mini) then - s = devmap:section(luci.cbi.Table, netdevs, luci.i18n.translate("l_dd_dc_netdev_found_mini") .. " " .. curnet) + s = devmap:section(luci.cbi.Table, netdevs, luci.i18n.translate("Devices discovered for") .. " " .. curnet) else local interfacestring = "" if ( interface ~= "" ) then interfacestring = ", " .. interface end - s = devmap:section(luci.cbi.Table, netdevs, luci.i18n.translate("l_d_d_dc_netdev_found_admin", "Devices discovered for") .. " " .. curnet .. " (" .. subnet .. interfacestring .. ")") + s = devmap:section(luci.cbi.Table, netdevs, luci.i18n.translate("Devices discovered for") .. " " .. curnet .. " (" .. subnet .. interfacestring .. ")") end end - s:option(DummyValue, "ip", translate("l_d_d_dc_mac_ip")) + s:option(DummyValue, "ip", translate("IP Address")) if (not mini) then - s:option(DummyValue, "mac", translate("l_d_d_dc_mac_address")) + s:option(DummyValue, "mac", translate("MAC Address")) end - s:option(DummyValue, "vendor", translate("l_d_d_dc_mac_vendor")) - s:option(DummyValue, "type", translate("l_d_d_dc_mac_device_type")) + s:option(DummyValue, "vendor", translate("Vendor")) + s:option(DummyValue, "type", translate("Device Type")) if (not mini) then - s:option(DummyValue, "model", translate("l_d_d_dc_mac_model")) + s:option(DummyValue, "model", translate("Model")) end if (haslink) then - s:option(DummyValue, "config_page", translate("l_d_d_dc_config_page")) + s:option(DummyValue, "config_page", translate("Link to Device")) end if (debug) then - s:option(DummyValue, "raw", translate("l_d_d_dc_raw")) + s:option(DummyValue, "raw", translate("Raw")) end curnet = next(outnets, curnet) end @@ -170,24 +170,24 @@ end function config_devinfo_scan(map, scannet) local o - o = scannet:option(luci.cbi.Flag, "enable", translate("l_d_d_dc_enable")) + o = scannet:option(luci.cbi.Flag, "enable", translate("Enable")) o.optional = false o.rmempty = false - o = scannet:option(luci.cbi.Value, "interface", translate("l_d_d_dc_interface")) + o = scannet:option(luci.cbi.Value, "interface", translate("Interface")) o.optional = false luci.controller.luci_diag.devinfo_common.cbi_add_networks(o) local scansubnet - scansubnet = scannet:option(luci.cbi.Value, "subnet", translate("l_d_d_dc_subnet")) + scansubnet = scannet:option(luci.cbi.Value, "subnet", translate("Subnet")) scansubnet.optional = false - o = scannet:option(luci.cbi.Value, "timeout", translate("l_d_d_dc_timeout"), translate("l_d_d_dc_timeout_descr")) + o = scannet:option(luci.cbi.Value, "timeout", translate("Timeout"), translate("Time to wait for responses in seconds (default 10)")) o.optional = true - o = scannet:option(luci.cbi.Value, "repeat_count", translate("l_d_d_dc_repeat_count"), translate("l_d_d_dc_repeat_count_descr")) + o = scannet:option(luci.cbi.Value, "repeat_count", translate("Repeat Count"), translate("Number of times to send requests (default 1)")) o.optional = true - o = scannet:option(luci.cbi.Value, "sleepreq", translate("l_d_d_dc_sleep"), translate("l_d_d_dc_sleep_desc")) + o = scannet:option(luci.cbi.Value, "sleepreq", translate("Sleep Between Requests"), translate("Milliseconds to sleep between requests (default 100)")) o.optional = true end
\ No newline at end of file diff --git a/applications/luci-diag-devinfo/luasrc/controller/luci_diag/luci_diag_devinfo.lua b/applications/luci-diag-devinfo/luasrc/controller/luci_diag/luci_diag_devinfo.lua index 0d8da66b6c..e40a3e82cc 100644 --- a/applications/luci-diag-devinfo/luasrc/controller/luci_diag/luci_diag_devinfo.lua +++ b/applications/luci-diag-devinfo/luasrc/controller/luci_diag/luci_diag_devinfo.lua @@ -18,51 +18,51 @@ function index() require("luci.i18n") luci.i18n.loadc("diag_devinfo") - local e = entry({"admin", "voice", "diag", "phones"}, arcombine(cbi("luci_diag/smap_devinfo"), cbi("luci_diag/smap_devinfo_config")), luci.i18n.translate("l_d_d_ldd_diag_smap_devinfo"), 10) + local e = entry({"admin", "voice", "diag", "phones"}, arcombine(cbi("luci_diag/smap_devinfo"), cbi("luci_diag/smap_devinfo_config")), luci.i18n.translate("Phones"), 10) e.leaf = true e.subindex = true e.i18n = "diag_devinfo" e.dependent = true - e = entry({"admin", "voice", "diag", "phones", "config"}, cbi("luci_diag/smap_devinfo_config"), luci.i18n.translate("l_d_d_ldd_config"), 10) + e = entry({"admin", "voice", "diag", "phones", "config"}, cbi("luci_diag/smap_devinfo_config"), luci.i18n.translate("Configure"), 10) e.i18n = "diag_devinfo" - e = entry({"admin", "status", "smap_devinfo"}, cbi("luci_diag/smap_devinfo"), luci.i18n.translate("l_d_d_ldd_smap_devinfo_config"), 120) + e = entry({"admin", "status", "smap_devinfo"}, cbi("luci_diag/smap_devinfo"), luci.i18n.translate("SIP Devices on Network"), 120) e.leaf = true e.i18n = "diag_devinfo" e.dependent = true - e = entry({"admin", "network", "diag_config", "netdiscover_devinfo_config"}, cbi("luci_diag/netdiscover_devinfo_config"), luci.i18n.translate("l_d_d_ldd_netdiscover_devinfo_scan"), 100) + e = entry({"admin", "network", "diag_config", "netdiscover_devinfo_config"}, cbi("luci_diag/netdiscover_devinfo_config"), luci.i18n.translate("Network Device Scan"), 100) e.leaf = true e.i18n = "diag_devinfo" e.dependent = true - e = entry({"admin", "network", "diag_config", "smap_devinfo_config"}, cbi("luci_diag/smap_devinfo_config"), luci.i18n.translate("l_d_d_ldd_smap_devinfo_scan_config")) + e = entry({"admin", "network", "diag_config", "smap_devinfo_config"}, cbi("luci_diag/smap_devinfo_config"), luci.i18n.translate("SIP Device Scan")) e.leaf = true e.i18n = "diag_devinfo" e.dependent = true - e = entry({"admin", "status", "netdiscover_devinfo"}, cbi("luci_diag/netdiscover_devinfo"), luci.i18n.translate("l_d_d_ldd_netdiscover_devinfo"), 90) + e = entry({"admin", "status", "netdiscover_devinfo"}, cbi("luci_diag/netdiscover_devinfo"), luci.i18n.translate("Devices on Network"), 90) e.i18n = "diag_devinfo" e.dependent = true - e = entry({"admin", "network", "mactodevinfo"}, cbi("luci_diag/mactodevinfo"), luci.i18n.translate("l_d_d_ldd_mac_to_devinfo_overrides"), 190) + e = entry({"admin", "network", "mactodevinfo"}, cbi("luci_diag/mactodevinfo"), luci.i18n.translate("MAC Device Info Overrides"), 190) e.i18n = "diag_devinfo" e.dependent = true - e = entry({"mini", "diag", "phone_scan"}, cbi("luci_diag/smap_devinfo_mini"), luci.i18n.translate("l_d_d_ldd_diag_smap_devinfo_scan_mini"), 100) + e = entry({"mini", "diag", "phone_scan"}, cbi("luci_diag/smap_devinfo_mini"), luci.i18n.translate("Phone Scan"), 100) e.i18n = "diag_devinfo" e.dependent = true - e = entry({"mini", "voice", "phones", "phone_scan_config"}, cbi("luci_diag/smap_devinfo_config_mini"), luci.i18n.translate("l_d_d_ldd_smap_devinfo_config_scan_miini"), 90) + e = entry({"mini", "voice", "phones", "phone_scan_config"}, cbi("luci_diag/smap_devinfo_config_mini"), luci.i18n.translate("Config Phone Scan"), 90) e.i18n = "diag_devinfo" e.dependent = true - e = entry({"mini", "diag", "netdiscover_devinfo"}, cbi("luci_diag/netdiscover_devinfo_mini"), luci.i18n.translate("l_d_d_ldd_diag_netdiscover_devinfo_scan_mini"), 10) + e = entry({"mini", "diag", "netdiscover_devinfo"}, cbi("luci_diag/netdiscover_devinfo_mini"), luci.i18n.translate("Network Device Scan"), 10) e.i18n = "diag_devinfo" e.dependent = true - e = entry({"mini", "network", "netdiscover_devinfo_config"}, cbi("luci_diag/netdiscover_devinfo_config_mini"), luci.i18n.translate("l_d_d_ldd_netdiscover_devinfo_scan_config_mini")) + e = entry({"mini", "network", "netdiscover_devinfo_config"}, cbi("luci_diag/netdiscover_devinfo_config_mini"), luci.i18n.translate("Device Scan Config")) e.i18n = "diag_devinfo" e.dependent = true diff --git a/applications/luci-diag-devinfo/luasrc/controller/luci_diag/netdiscover_common.lua b/applications/luci-diag-devinfo/luasrc/controller/luci_diag/netdiscover_common.lua index 71dc34081c..0cd981e053 100644 --- a/applications/luci-diag-devinfo/luasrc/controller/luci_diag/netdiscover_common.lua +++ b/applications/luci-diag-devinfo/luasrc/controller/luci_diag/netdiscover_common.lua @@ -81,15 +81,15 @@ end function action_links(netdiscovermap, mini) luci.i18n.loadc("diag_devinfo") - s = netdiscovermap:section(SimpleSection, "", translate("l_d_d_nc_netdiscover_actions")) - b = s:option(DummyValue, "_config", translate("l_d_d_nc_config_scan")) + s = netdiscovermap:section(SimpleSection, "", translate("Actions")) + b = s:option(DummyValue, "_config", translate("Configure Scans")) b.value = "" if (mini) then b.titleref = luci.dispatcher.build_url("mini", "network", "netdiscover_devinfo_config") else b.titleref = luci.dispatcher.build_url("admin", "network", "diag_config", "netdiscover_devinfo_config") end - b = s:option(DummyValue, "_scans", translate("l_d_d_nc_redo_scans")) + b = s:option(DummyValue, "_scans", translate("Repeat Scans (this can take a few minutes)")) b.value = "" if (mini) then b.titleref = luci.dispatcher.build_url("mini", "diag", "netdiscover_devinfo") diff --git a/applications/luci-diag-devinfo/luasrc/controller/luci_diag/smap_common.lua b/applications/luci-diag-devinfo/luasrc/controller/luci_diag/smap_common.lua index e5cf14d9f2..3d02d689a4 100644 --- a/applications/luci-diag-devinfo/luasrc/controller/luci_diag/smap_common.lua +++ b/applications/luci-diag-devinfo/luasrc/controller/luci_diag/smap_common.lua @@ -91,15 +91,15 @@ end function action_links(smapmap, mini) luci.i18n.loadc("diag_devinfo") - s = smapmap:section(SimpleSection, "", translate("l_d_d_sc_smap_actions")) - b = s:option(DummyValue, "_config", translate("l_d_d_sc_config_scan")) + s = smapmap:section(SimpleSection, "", translate("Actions")) + b = s:option(DummyValue, "_config", translate("Configure Scans")) b.value = "" if (mini) then b.titleref = luci.dispatcher.build_url("mini", "voice", "phones", "phone_scan_config") else b.titleref = luci.dispatcher.build_url("admin", "network", "diag_config", "smap_devinfo_config") end - b = s:option(DummyValue, "_scans", translate("l_d_d_sc_redo_scans")) + b = s:option(DummyValue, "_scans", translate("Repeat Scans (this can take a few minutes)")) b.value = "" if (mini) then b.titleref = luci.dispatcher.build_url("mini", "diag", "phone_scan") 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 diff --git a/applications/luci-diag-devinfo/luasrc/view/diag/smapsection.htm b/applications/luci-diag-devinfo/luasrc/view/diag/smapsection.htm index 1fbbfdcaa1..58b6fa3f3f 100644 --- a/applications/luci-diag-devinfo/luasrc/view/diag/smapsection.htm +++ b/applications/luci-diag-devinfo/luasrc/view/diag/smapsection.htm @@ -38,7 +38,7 @@ end <%- end -%> <%- for i, k in pairs(self.children) do if not k.optional then -%> <th class="cbi-section-table-cell"> - <%- if k.titleref then -%><a title="<%=self.titledesc or translate('cbi_gorel')%>" class="cbi-title-ref" href="<%=k.titleref%>"><%- end -%> + <%- if k.titleref then -%><a title="<%=self.titledesc or translate(' ')%>" class="cbi-title-ref" href="<%=k.titleref%>"><%- end -%> <%-=k.title-%> <%- if k.titleref then -%></a><%- end -%> </th> @@ -92,9 +92,9 @@ end <%- elseif type(self.extedit) == "function" then -%> <%=self:extedit(section)%> <%- end -%> - " title="<%:edit%>"><img style="border: none" src="<%=resource%>/cbi/edit.gif" alt="<%:edit%>" /></a> + " title="<%:Edit%>"><img style="border: none" src="<%=resource%>/cbi/edit.gif" alt="<%:Edit%>" /></a> <%- end; if self.addremove then %> - <input type="image" value="<%:cbi_del%>" name="cbi.rts.<%=self.config%>.<%=k%>" alt="<%:cbi_del%>" title="<%:cbi_del%>" src="<%=resource%>/cbi/remove.gif" /> + <input type="image" value="<%:Delete%>" name="cbi.rts.<%=self.config%>.<%=k%>" alt="<%:Delete%>" title="<%:Delete%>" src="<%=resource%>/cbi/remove.gif" /> <%- end -%> </td> <%- end -%> @@ -103,7 +103,7 @@ end <%- if isempty then -%> <tr class="cbi-section-table-row"> - <td colspan="<%=count%>"><em><br /><%:sectempty%></em></td> + <td colspan="<%=count%>"><em><br /><%: %></em></td> </tr> <%- end -%> </table> @@ -120,13 +120,13 @@ end <% if self.template_addremove then include(self.template_addremove) else -%> <div class="cbi-section-create cbi-smapsection-create"> <% if self.anonymous then %> - <input class="cbi-button cbi-button-add" type="submit" value="<%:cbi_add%>" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>" title="<%:cbi_add%>" /> + <input class="cbi-button cbi-button-add" type="submit" value="<%:Add%>" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>" title="<%:Add%>" /> <% else %> <% if self.invalid_cts then -%><div class="cbi-section-error"><% end %> <input type="text" class="cbi-section-create-name" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>" /> - <input class="cbi-button cbi-button-add" type="submit" value="<%:cbi_add%>" title="<%:cbi_add%>" /> + <input class="cbi-button cbi-button-add" type="submit" value="<%:Add%>" title="<%:Add%>" /> <% if self.invalid_cts then -%> - <br /><%:cbi_invalid%></div> + <br /><%:Invalid%></div> <%- end %> <% end %> </div> |