luci-0.11: merge outstanding trunk changes

[project/luci.git] / applications / luci-diag-devinfo / luasrc / controller / luci_diag / netdiscover_common.lua

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 71dc34081c1021ae1025141011ec11a2f6d0881f..592ca1eaa9352c28516ff9a7dd419919a59fc7f2 100644 (file)
--- a/applications/luci-diag-devinfo/luasrc/controller/luci_diag/netdiscover_common.lua
+++ b/applications/luci-diag-devinfo/luasrc/controller/luci_diag/netdiscover_common.lua
@@ -23,6 +23,9 @@ local translate = luci.i18n.translate
 local DummyValue = luci.cbi.DummyValue
 local SimpleSection = luci.cbi.SimpleSection
 
+function index()
+       return -- no-op
+end
         
 function get_params()
 
@@ -80,20 +83,19 @@ function command_function(outnets, i)
 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")
    else
       b.titleref = luci.dispatcher.build_url("admin", "status", "netdiscover_devinfo")
    end
-end
\ No newline at end of file
+end