From 7c765875884d6866c53b63757731b079bace2e9b Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sat, 31 Oct 2009 15:54:11 +0000 Subject: [PATCH] all: change most translate statements to new format, some need manual cleanup --- .../luasrc/controller/coovachilli.lua | 8 +- .../luci-ddns/luasrc/controller/ddns.lua | 4 +- .../luci-ddns/luasrc/model/cbi/ddns/ddns.lua | 18 +- .../luasrc/model/cbi/ddns/ddnsmini.lua | 10 +- .../luasrc/controller/luci_diag.lua | 2 +- .../luci-diag-core/luasrc/view/diag/index.htm | 6 +- .../luasrc/view/diag/network_config_index.htm | 6 +- .../controller/luci_diag/devinfo_common.lua | 40 +-- .../luci_diag/luci_diag_devinfo.lua | 22 +- .../luci_diag/netdiscover_common.lua | 6 +- .../controller/luci_diag/smap_common.lua | 6 +- .../model/cbi/luci_diag/mactodevinfo.lua | 18 +- .../cbi/luci_diag/netdiscover_devinfo.lua | 2 +- .../luci_diag/netdiscover_devinfo_config.lua | 8 +- .../netdiscover_devinfo_config_mini.lua | 8 +- .../luci_diag/netdiscover_devinfo_mini.lua | 2 +- .../model/cbi/luci_diag/smap_devinfo.lua | 2 +- .../cbi/luci_diag/smap_devinfo_config.lua | 10 +- .../luci_diag/smap_devinfo_config_mini.lua | 10 +- .../model/cbi/luci_diag/smap_devinfo_mini.lua | 2 +- .../luasrc/view/diag/smapsection.htm | 14 +- .../luasrc/controller/luci_fw/luci_fw.lua | 10 +- .../luasrc/model/cbi/luci_fw/miniportfw.lua | 6 +- .../luasrc/model/cbi/luci_fw/redirect.lua | 8 +- .../luasrc/model/cbi/luci_fw/rrule.lua | 22 +- .../luasrc/model/cbi/luci_fw/traffic.lua | 20 +- .../luasrc/model/cbi/luci_fw/trule.lua | 32 +-- .../luasrc/model/cbi/luci_fw/zones.lua | 20 +- .../luasrc/controller/hd_idle.lua | 2 +- .../luci-hd_idle/luasrc/model/cbi/hd_idle.lua | 14 +- .../luci-initmgr/luasrc/controller/init.lua | 2 +- .../luasrc/model/cbi/init/init.lua | 6 +- .../luasrc/controller/livestats.lua | 4 +- .../luasrc/view/livestats/loadavg.htm | 2 +- .../luasrc/view/livestats/traffic.htm | 4 +- .../luasrc/view/livestats/wireless.htm | 2 +- .../luasrc/controller/mmc_over_gpio.lua | 2 +- .../luasrc/model/cbi/mmc_over_gpio.lua | 12 +- .../luci-ntpc/luasrc/controller/ntpc.lua | 4 +- .../luci-ntpc/luasrc/model/cbi/ntpc/ntpc.lua | 18 +- .../luasrc/model/cbi/ntpc/ntpcmini.lua | 12 +- .../luci-olsr/luasrc/controller/olsr.lua | 4 +- .../luci-olsr/luasrc/model/cbi/olsr/olsrd.lua | 24 +- .../luasrc/model/cbi/olsr/olsrdhna.lua | 2 +- .../luasrc/model/cbi/olsr/olsrdplugins.lua | 4 +- .../luasrc/view/status-olsr/error_olsr.htm | 6 +- .../luci-olsr/luasrc/view/status-olsr/hna.htm | 8 +- .../luasrc/view/status-olsr/index.htm | 16 +- .../luci-olsr/luasrc/view/status-olsr/mid.htm | 8 +- .../luasrc/view/status-olsr/routes.htm | 12 +- .../luasrc/view/status-olsr/topology.htm | 8 +- .../luasrc/controller/openvpn.lua | 2 +- .../luci-openvpn/luasrc/model/cbi/openvpn.lua | 20 +- .../view/openvpn/cbi-select-input-add.htm | 4 +- .../luasrc/view/openvpn/pageswitch.htm | 2 +- .../luasrc/controller/ff_p2pblock.lua | 2 +- .../luasrc/model/cbi/luci_fw/p2pblock.lua | 18 +- .../luci-p910nd/luasrc/controller/p910nd.lua | 2 +- .../luci-p910nd/luasrc/model/cbi/p910nd.lua | 12 +- .../luci-polipo/luasrc/controller/polipo.lua | 2 +- .../luci-qos/luasrc/model/cbi/qos/qos.lua | 16 +- .../luci-qos/luasrc/model/cbi/qos/qosmini.lua | 22 +- .../luci-samba/luasrc/controller/samba.lua | 2 +- .../luci-samba/luasrc/model/cbi/samba.lua | 2 +- .../luasrc/view/admin_status/splash.htm | 6 +- .../luci_statistics/luci_statistics.lua | 2 +- .../luasrc/model/cbi/tinyproxy.lua | 10 +- .../luci-upnp/luasrc/model/cbi/upnp/upnp.lua | 2 +- .../luasrc/model/cbi/upnp/upnpmini.lua | 2 +- .../luci-ushare/luasrc/controller/ushare.lua | 2 +- .../luci-ushare/luasrc/model/cbi/ushare.lua | 20 +- .../luasrc/controller/uvc_streamer.lua | 2 +- .../luasrc/model/cbi/uvc_streamer.lua | 14 +- .../luasrc/controller/luci_voice.lua | 6 +- .../luasrc/view/luci_voice/diag_index.htm | 6 +- libs/cbi/luasrc/view/cbi/delegator.htm | 4 +- libs/cbi/luasrc/view/cbi/dynlist.htm | 6 +- .../cbi/luasrc/view/cbi/firewall_zonelist.htm | 4 +- libs/cbi/luasrc/view/cbi/footer.htm | 6 +- libs/cbi/luasrc/view/cbi/full_valueheader.htm | 2 +- libs/cbi/luasrc/view/cbi/header.htm | 2 +- libs/cbi/luasrc/view/cbi/map.htm | 2 +- libs/cbi/luasrc/view/cbi/network_netlist.htm | 4 +- libs/cbi/luasrc/view/cbi/nsection.htm | 4 +- libs/cbi/luasrc/view/cbi/tblsection.htm | 14 +- libs/cbi/luasrc/view/cbi/tsection.htm | 10 +- libs/cbi/luasrc/view/cbi/ucisection.htm | 4 +- libs/cbi/luasrc/view/cbi/upload.htm | 2 +- libs/core/luasrc/model/network.lua | 8 +- libs/core/luasrc/model/network/wireless.lua | 4 +- libs/core/luasrc/model/wireless.lua | 4 +- modules/admin-core/luasrc/view/about.htm | 12 +- modules/admin-core/luasrc/view/sysauth.htm | 12 +- .../luasrc/controller/admin/index.lua | 10 +- .../luasrc/controller/admin/network.lua | 14 +- .../luasrc/controller/admin/services.lua | 4 +- .../luasrc/controller/admin/status.lua | 14 +- .../luasrc/controller/admin/system.lua | 22 +- .../luasrc/controller/admin/uci.lua | 10 +- .../luasrc/model/cbi/admin_index/luci.lua | 17 +- .../luasrc/model/cbi/admin_network/dhcp.lua | 10 +- .../model/cbi/admin_network/dhcpleases.lua | 16 +- .../luasrc/model/cbi/admin_network/hosts.lua | 8 +- .../model/cbi/admin_network/iface_add.lua | 18 +- .../luasrc/model/cbi/admin_network/ifaces.lua | 126 +++++----- .../model/cbi/admin_network/network.lua | 6 +- .../luasrc/model/cbi/admin_network/routes.lua | 20 +- .../luasrc/model/cbi/admin_network/vlan.lua | 2 +- .../luasrc/model/cbi/admin_network/wifi.lua | 238 +++++++++--------- .../model/cbi/admin_network/wireless.lua | 38 +-- .../model/cbi/admin_services/crontab.lua | 2 +- .../model/cbi/admin_services/dnsmasq.lua | 2 +- .../model/cbi/admin_services/dropbear.lua | 6 +- .../luasrc/model/cbi/admin_services/httpd.lua | 10 +- .../model/cbi/admin_services/lucittpd.lua | 12 +- .../luasrc/model/cbi/admin_system/fstab.lua | 26 +- .../luasrc/model/cbi/admin_system/ipkg.lua | 2 +- .../luasrc/model/cbi/admin_system/leds.lua | 8 +- .../luasrc/model/cbi/admin_system/passwd.lua | 10 +- .../model/cbi/admin_system/processes.lua | 18 +- .../luasrc/model/cbi/admin_system/sshkeys.lua | 2 +- .../luasrc/model/cbi/admin_system/system.lua | 18 +- .../luasrc/view/admin_index/index.htm | 16 +- .../luasrc/view/admin_network/wifi_join.htm | 6 +- .../view/admin_network/wifi_join_settings.htm | 14 +- .../view/admin_network/wifi_overview.htm | 4 +- .../luasrc/view/admin_services/index.htm | 6 +- .../luasrc/view/admin_status/conntrack.htm | 20 +- .../luasrc/view/admin_status/dmesg.htm | 2 +- .../luasrc/view/admin_status/index.htm | 6 +- .../luasrc/view/admin_status/interfaces.htm | 116 ++++----- .../luasrc/view/admin_status/iptables.htm | 42 ++-- .../luasrc/view/admin_status/routes.htm | 24 +- .../luasrc/view/admin_status/syslog.htm | 2 +- .../luasrc/view/admin_system/applyreboot.htm | 6 +- .../luasrc/view/admin_system/backup.htm | 14 +- .../luasrc/view/admin_system/ipkg.htm | 4 +- .../luasrc/view/admin_system/packages.htm | 42 ++-- .../luasrc/view/admin_system/reboot.htm | 12 +- .../luasrc/view/admin_system/upgrade.htm | 3 +- .../luasrc/view/admin_uci/apply.htm | 4 +- .../luasrc/view/admin_uci/changes.htm | 10 +- .../luasrc/view/admin_uci/revert.htm | 4 +- .../luasrc/controller/mini/index.lua | 10 +- .../luasrc/controller/mini/network.lua | 6 +- .../luasrc/controller/mini/system.lua | 12 +- .../admin-mini/luasrc/model/cbi/mini/dhcp.lua | 20 +- .../admin-mini/luasrc/model/cbi/mini/luci.lua | 8 +- .../luasrc/model/cbi/mini/network.lua | 56 ++--- .../luasrc/model/cbi/mini/passwd.lua | 10 +- .../luasrc/model/cbi/mini/system.lua | 18 +- .../admin-mini/luasrc/model/cbi/mini/wifi.lua | 82 +++--- .../luasrc/view/mini/applyreboot.htm | 6 +- .../admin-mini/luasrc/view/mini/backup.htm | 14 +- modules/admin-mini/luasrc/view/mini/index.htm | 14 +- .../admin-mini/luasrc/view/mini/reboot.htm | 12 +- .../admin-mini/luasrc/view/mini/upgrade.htm | 3 +- .../luasrc/controller/freifunk/freifunk.lua | 6 +- .../controller/freifunk/remote_update.lua | 2 +- .../luasrc/model/cbi/freifunk/contact.lua | 16 +- .../model/cbi/freifunk/public_status.lua | 60 ++--- .../freifunk/luasrc/view/freifunk/contact.htm | 14 +- .../freifunk/luasrc/view/freifunk/index.htm | 12 +- .../luasrc/model/cbi/niu/network/assign1.lua | 14 +- .../luasrc/model/cbi/niu/network/etherwan.lua | 50 ++-- .../niu/luasrc/model/cbi/niu/network/lan1.lua | 34 +-- .../luasrc/model/cbi/niu/network/routes1.lua | 20 +- .../luasrc/view/themes/fledermaus/header.htm | 6 +- .../view/themes/freifunk-bno/header.htm | 6 +- .../view/themes/freifunk-hannover/header.htm | 8 +- .../luasrc/view/themes/freifunk/header.htm | 6 +- .../view/themes/openwrt-light/header.htm | 8 +- .../view/themes/openwrt.org-oxygen/header.htm | 8 +- .../luasrc/view/themes/openwrt.org/header.htm | 8 +- .../luasrc/view/themes/oxygen/header.htm | 4 +- 175 files changed, 1186 insertions(+), 1193 deletions(-) diff --git a/applications/luci-coovachilli/luasrc/controller/coovachilli.lua b/applications/luci-coovachilli/luasrc/controller/coovachilli.lua index ac1f5f93a..52e09f6f5 100644 --- a/applications/luci-coovachilli/luasrc/controller/coovachilli.lua +++ b/applications/luci-coovachilli/luasrc/controller/coovachilli.lua @@ -18,12 +18,12 @@ function index() require("luci.i18n") local i18n = luci.i18n.translate - local cc = entry( { "admin", "services", "coovachilli" }, cbi("coovachilli"), i18n("coovachilli", "CoovaChilli"), 90) + local cc = entry( { "admin", "services", "coovachilli" }, cbi("coovachilli"), i18n("CoovaChilli"), 90) cc.i18n = "coovachilli" cc.subindex = true - entry( { "admin", "services", "coovachilli", "network" }, cbi("coovachilli_network"), i18n("coovachilli_network", "Network Configuration"), 10) - entry( { "admin", "services", "coovachilli", "radius" }, cbi("coovachilli_radius"), i18n("coovachilli_radius", "Radius Configuration"), 20) - entry( { "admin", "services", "coovachilli", "auth" }, cbi("coovachilli_auth"), i18n("coovachilli_auth", "UAM and MAC Authentication"), 30) + entry( { "admin", "services", "coovachilli", "network" }, cbi("coovachilli_network"), i18n("Network Configuration"), 10) + entry( { "admin", "services", "coovachilli", "radius" }, cbi("coovachilli_radius"), i18n("RADIUS configuration"), 20) + entry( { "admin", "services", "coovachilli", "auth" }, cbi("coovachilli_auth"), i18n("UAM and MAC Authentication"), 30) end diff --git a/applications/luci-ddns/luasrc/controller/ddns.lua b/applications/luci-ddns/luasrc/controller/ddns.lua index 7a81d9adf..e425dbc5c 100644 --- a/applications/luci-ddns/luasrc/controller/ddns.lua +++ b/applications/luci-ddns/luasrc/controller/ddns.lua @@ -21,12 +21,12 @@ function index() return end - local page = entry({"admin", "services", "ddns"}, cbi("ddns/ddns"), luci.i18n.translate("ddns"), 60) + local page = entry({"admin", "services", "ddns"}, cbi("ddns/ddns"), luci.i18n.translate("Dynamic DNS"), 60) page.i18n = "ddns" page.dependent = true - local page = entry({"mini", "network", "ddns"}, cbi("ddns/ddnsmini", {autoapply=true}), luci.i18n.translate("ddns"), 60) + local page = entry({"mini", "network", "ddns"}, cbi("ddns/ddnsmini", {autoapply=true}), luci.i18n.translate("Dynamic DNS"), 60) page.i18n = "ddns" page.dependent = true end diff --git a/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua b/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua index 45a8a3965..23e63dd20 100644 --- a/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua +++ b/applications/luci-ddns/luasrc/model/cbi/ddns/ddns.lua @@ -13,14 +13,14 @@ You may obtain a copy of the License at $Id$ ]]-- require("luci.tools.webadmin") -m = Map("ddns", translate("ddns"), translate("ddns_desc")) +m = Map("ddns", translate("Dynamic DNS"), translate("Dynamic DNS allows that your router can be reached with a fixed hostname while having a dynamically changing IP-Address.")) s = m:section(TypedSection, "service", "") s.addremove = true s:option(Flag, "enabled", translate("enable")) -svc = s:option(ListValue, "service_name", translate("service")) +svc = s:option(ListValue, "service_name", translate("Service")) svc.rmempty = true svc:value("") svc:value("dyndns.org") @@ -29,23 +29,23 @@ svc:value("zoneedit.com") svc:value("no-ip.com") svc:value("freedns.afraid.org") -s:option(Value, "domain", translate("hostname")).rmempty = true -s:option(Value, "username", translate("username")).rmempty = true -pw = s:option(Value, "password", translate("password")) +s:option(Value, "domain", translate("Hostname")).rmempty = true +s:option(Value, "username", translate("Username")).rmempty = true +pw = s:option(Value, "password", translate("Password")) pw.rmempty = true pw.password = true src = s:option(ListValue, "ip_source") -src:value("network", translate("network")) -src:value("interface", translate("interface")) +src:value("network", translate("Network")) +src:value("interface", translate("Interface")) src:value("web", "URL") -iface = s:option(ListValue, "ip_network", translate("network")) +iface = s:option(ListValue, "ip_network", translate("Network")) iface:depends("ip_source", "network") iface.rmempty = true luci.tools.webadmin.cbi_add_networks(iface) -iface = s:option(ListValue, "ip_interface", translate("interface")) +iface = s:option(ListValue, "ip_interface", translate("Interface")) iface:depends("ip_source", "interface") iface.rmempty = true for k, v in pairs(luci.sys.net.devices()) do diff --git a/applications/luci-ddns/luasrc/model/cbi/ddns/ddnsmini.lua b/applications/luci-ddns/luasrc/model/cbi/ddns/ddnsmini.lua index 2a91eda82..8edf1433b 100644 --- a/applications/luci-ddns/luasrc/model/cbi/ddns/ddnsmini.lua +++ b/applications/luci-ddns/luasrc/model/cbi/ddns/ddnsmini.lua @@ -12,14 +12,14 @@ You may obtain a copy of the License at $Id$ ]]-- -m = Map("ddns", translate("ddns"), translate("ddns_desc")) +m = Map("ddns", translate("Dynamic DNS"), translate("Dynamic DNS allows that your router can be reached with a fixed hostname while having a dynamically changing IP-Address.")) s = m:section(TypedSection, "service", "") s.addremove = true s:option(Flag, "enabled", translate("enable")) -svc = s:option(ListValue, "service_name", translate("service")) +svc = s:option(ListValue, "service_name", translate("Service")) svc.rmempty = true svc:value("dyndns.org") svc:value("changeip.com") @@ -27,9 +27,9 @@ svc:value("zoneedit.com") svc:value("no-ip.com") svc:value("freedns.afraid.org") -s:option(Value, "domain", translate("hostname")).rmempty = true -s:option(Value, "username", translate("username")).rmempty = true -pw = s:option(Value, "password", translate("password")) +s:option(Value, "domain", translate("Hostname")).rmempty = true +s:option(Value, "username", translate("Username")).rmempty = true +pw = s:option(Value, "password", translate("Password")) pw.rmempty = true pw.password = true diff --git a/applications/luci-diag-core/luasrc/controller/luci_diag.lua b/applications/luci-diag-core/luasrc/controller/luci_diag.lua index 396d4cffe..23b8d0009 100644 --- a/applications/luci-diag-core/luasrc/controller/luci_diag.lua +++ b/applications/luci-diag-core/luasrc/controller/luci_diag.lua @@ -19,7 +19,7 @@ function index() require("luci.i18n") luci.i18n.loadc("diag_core") - local e = entry({"admin", "network", "diag_config"}, template("diag/network_config_index") , luci.i18n.translate("l_d_diag_config"), 120) + local e = entry({"admin", "network", "diag_config"}, template("diag/network_config_index") , luci.i18n.translate("Configure Diagnostics"), 120) e.index = true e.i18n = "diag_core" e.dependent = true diff --git a/applications/luci-diag-core/luasrc/view/diag/index.htm b/applications/luci-diag-core/luasrc/view/diag/index.htm index 5a9a8abc5..6b1efa1a8 100644 --- a/applications/luci-diag-core/luasrc/view/diag/index.htm +++ b/applications/luci-diag-core/luasrc/view/diag/index.htm @@ -12,7 +12,7 @@ $Id$ -%> <%+header%> -

<%:l_d_c_i_diag%>

-

<%:l_d_c_i_diag1%>

-

<%:l_d_c_i_diag2%>

+

<%:Diagnostics%>

+

<%:The entries in the menu allow you to perform diagnostic tests on your system to aid in troubleshooting.%>

+

<%:The diagnostics available under this menu depend on what modules you have installed on your device.%>

<%+footer%> diff --git a/applications/luci-diag-core/luasrc/view/diag/network_config_index.htm b/applications/luci-diag-core/luasrc/view/diag/network_config_index.htm index b1e75594e..67980a6e7 100644 --- a/applications/luci-diag-core/luasrc/view/diag/network_config_index.htm +++ b/applications/luci-diag-core/luasrc/view/diag/network_config_index.htm @@ -12,7 +12,7 @@ $Id$ -%> <%+header%> -

<%:l_d_c_nci_diag%>

-

<%:l_d_c_nci_diag1%>

-

<%:l_d_c_nci_diag2%>

+

<%:Diagnostics%>

+

<%:With this menu you can configure network diagnostics, such as network device scans and ping tests.%>

+

<%:The diagnostics available under this menu depend on what modules you have installed on your device.%>

<%+footer%> 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 58009c596..ba6bdcd9c 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 0d8da66b6..e40a3e82c 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 71dc34081..0cd981e05 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 e5cf14d9f..3d02d689a 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 548ddbe2f..baf02c89c 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 9dbf24ddf..963318b47 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 7b5f0d408..e982bcef6 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 9f0686404..a99ddf9b8 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 341e2194c..271c114d2 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 8e9c922df..ff808d9ef 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 a50847521..20b6987f2 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 fae9e6fc4..aff4a98ae 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 6af14b2e6..5b7bb0f0a 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 1fbbfdcaa..58b6fa3f3 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 -%> - <%- if k.titleref then -%><%- end -%> + <%- if k.titleref then -%><%- end -%> <%-=k.title-%> <%- if k.titleref then -%><%- end -%> @@ -92,9 +92,9 @@ end <%- elseif type(self.extedit) == "function" then -%> <%=self:extedit(section)%> <%- end -%> - " title="<%:edit%>"><%:edit%> + " title="<%:Edit%>"><%:Edit%> <%- end; if self.addremove then %> - + <%- end -%> <%- end -%> @@ -103,7 +103,7 @@ end <%- if isempty then -%> -
<%:sectempty%> +
<%: %> <%- end -%> @@ -120,13 +120,13 @@ end <% if self.template_addremove then include(self.template_addremove) else -%>
<% if self.anonymous then %> - + <% else %> <% if self.invalid_cts then -%>
<% end %> - + <% if self.invalid_cts then -%> -
<%:cbi_invalid%>
+
<%:Invalid%>
<%- end %> <% end %> diff --git a/applications/luci-fw/luasrc/controller/luci_fw/luci_fw.lua b/applications/luci-fw/luasrc/controller/luci_fw/luci_fw.lua index 2be03d688..766821af0 100644 --- a/applications/luci-fw/luasrc/controller/luci_fw/luci_fw.lua +++ b/applications/luci-fw/luasrc/controller/luci_fw/luci_fw.lua @@ -4,10 +4,10 @@ function index() require("luci.i18n").loadc("luci-fw") local i18n = luci.i18n.translate - entry({"admin", "network", "firewall"}, alias("admin", "network", "firewall", "zones"), i18n("fw_fw"), 60).i18n = "luci-fw" - entry({"admin", "network", "firewall", "zones"}, cbi("luci_fw/zones"), i18n("fw_zones"), 10) - entry({"admin", "network", "firewall", "redirect"}, arcombine(cbi("luci_fw/redirect"), cbi("luci_fw/rrule")), i18n("fw_redirect"), 30).leaf = true - entry({"admin", "network", "firewall", "rule"}, arcombine(cbi("luci_fw/traffic"), cbi("luci_fw/trule")), i18n("fw_traffic"), 20).leaf = true + entry({"admin", "network", "firewall"}, alias("admin", "network", "firewall", "zones"), i18n("Firewall"), 60).i18n = "luci-fw" + entry({"admin", "network", "firewall", "zones"}, cbi("luci_fw/zones"), i18n("Zones"), 10) + entry({"admin", "network", "firewall", "redirect"}, arcombine(cbi("luci_fw/redirect"), cbi("luci_fw/rrule")), i18n("Traffic Redirection"), 30).leaf = true + entry({"admin", "network", "firewall", "rule"}, arcombine(cbi("luci_fw/traffic"), cbi("luci_fw/trule")), i18n("Traffic Control"), 20).leaf = true - entry({"mini", "network", "portfw"}, cbi("luci_fw/miniportfw", {autoapply=true}), i18n("fw_portfw", "Portweiterleitung"), 70).i18n = "luci-fw" + entry({"mini", "network", "portfw"}, cbi("luci_fw/miniportfw", {autoapply=true}), i18n("Port forwarding"), 70).i18n = "luci-fw" end \ No newline at end of file diff --git a/applications/luci-fw/luasrc/model/cbi/luci_fw/miniportfw.lua b/applications/luci-fw/luasrc/model/cbi/luci_fw/miniportfw.lua index b192b610c..ed849f4cc 100644 --- a/applications/luci-fw/luasrc/model/cbi/luci_fw/miniportfw.lua +++ b/applications/luci-fw/luasrc/model/cbi/luci_fw/miniportfw.lua @@ -12,7 +12,7 @@ You may obtain a copy of the License at $Id$ ]]-- require("luci.sys") -m = Map("firewall", translate("fw_portfw"), translate("fw_portfw1")) +m = Map("firewall", translate("Port forwarding"), translate("Port forwarding allows to provide network services in the internal network to an external network.")) s = m:section(TypedSection, "redirect", "") @@ -23,10 +23,10 @@ s.template = "cbi/tblsection" s.addremove = true s.anonymous = true -name = s:option(Value, "_name", translate("name"), translate("cbi_optional")) +name = s:option(Value, "_name", translate("Name"), translate(" (optional)")) name.size = 10 -proto = s:option(ListValue, "proto", translate("protocol")) +proto = s:option(ListValue, "proto", translate("Protocol")) proto:value("tcp", "TCP") proto:value("udp", "UDP") proto:value("tcpudp", "TCP+UDP") diff --git a/applications/luci-fw/luasrc/model/cbi/luci_fw/redirect.lua b/applications/luci-fw/luasrc/model/cbi/luci_fw/redirect.lua index 3aa1066f5..52a3c39d6 100644 --- a/applications/luci-fw/luasrc/model/cbi/luci_fw/redirect.lua +++ b/applications/luci-fw/luasrc/model/cbi/luci_fw/redirect.lua @@ -12,7 +12,7 @@ You may obtain a copy of the License at $Id$ ]]-- require("luci.sys") -m = Map("firewall", translate("fw_redirect"), translate("fw_redirect_desc")) +m = Map("firewall", translate("Traffic Redirection"), translate("Traffic redirection allows you to change the destination address of forwarded packets.")) s = m:section(TypedSection, "redirect", "") @@ -21,17 +21,17 @@ s.addremove = true s.anonymous = true s.extedit = luci.dispatcher.build_url("admin", "network", "firewall", "redirect", "%s") -name = s:option(Value, "_name", translate("name"), translate("cbi_optional")) +name = s:option(Value, "_name", translate("Name"), translate(" (optional)")) name.size = 10 -iface = s:option(ListValue, "src", translate("fw_zone")) +iface = s:option(ListValue, "src", translate("Zone")) iface.default = "wan" luci.model.uci.cursor():foreach("firewall", "zone", function (section) iface:value(section.name) end) -proto = s:option(ListValue, "proto", translate("protocol")) +proto = s:option(ListValue, "proto", translate("Protocol")) proto:value("tcp", "TCP") proto:value("udp", "UDP") proto:value("tcpudp", "TCP+UDP") diff --git a/applications/luci-fw/luasrc/model/cbi/luci_fw/rrule.lua b/applications/luci-fw/luasrc/model/cbi/luci_fw/rrule.lua index 25be2e9ef..2800cec72 100644 --- a/applications/luci-fw/luasrc/model/cbi/luci_fw/rrule.lua +++ b/applications/luci-fw/luasrc/model/cbi/luci_fw/rrule.lua @@ -14,56 +14,56 @@ $Id$ require("luci.sys") arg[1] = arg[1] or "" -m = Map("firewall", translate("fw_redirect"), translate("fw_redirect_desc")) +m = Map("firewall", translate("Traffic Redirection"), translate("Traffic redirection allows you to change the destination address of forwarded packets.")) s = m:section(NamedSection, arg[1], "redirect", "") s.anonymous = true s.addremove = false -back = s:option(DummyValue, "_overview", translate("overview")) +back = s:option(DummyValue, "_overview", translate("Overview")) back.value = "" back.titleref = luci.dispatcher.build_url("admin", "network", "firewall", "redirect") -name = s:option(Value, "_name", translate("name")) +name = s:option(Value, "_name", translate("Name")) name.rmempty = true name.size = 10 -iface = s:option(ListValue, "src", translate("fw_zone")) +iface = s:option(ListValue, "src", translate("Zone")) iface.default = "wan" luci.model.uci.cursor():foreach("firewall", "zone", function (section) iface:value(section.name) end) -s:option(Value, "src_ip", translate("firewall_redirect_srcip")).optional = true -s:option(Value, "src_mac", translate("firewall_redirect_srcmac")).optional = true +s:option(Value, "src_ip", translate("Source address")).optional = true +s:option(Value, "src_mac", translate("Source MAC")).optional = true -sport = s:option(Value, "src_port", translate("firewall_rule_srcport")) +sport = s:option(Value, "src_port", translate("Source port")) sport.optional = true sport:depends("proto", "tcp") sport:depends("proto", "udp") sport:depends("proto", "tcpudp") -proto = s:option(ListValue, "proto", translate("protocol")) +proto = s:option(ListValue, "proto", translate("Protocol")) proto.optional = true proto:value("") proto:value("tcp", "TCP") proto:value("udp", "UDP") proto:value("tcpudp", "TCP+UDP") -dport = s:option(Value, "src_dport", translate("firewall_redirect_srcdport")) +dport = s:option(Value, "src_dport", translate("External port")) dport.size = 5 dport:depends("proto", "tcp") dport:depends("proto", "udp") dport:depends("proto", "tcpudp") -to = s:option(Value, "dest_ip", translate("firewall_redirect_destip")) +to = s:option(Value, "dest_ip", translate("Internal address")) for i, dataset in ipairs(luci.sys.net.arptable()) do to:value(dataset["IP address"]) end -toport = s:option(Value, "dest_port", translate("firewall_redirect_destport")) +toport = s:option(Value, "dest_port", translate("Internal port (optional)")) toport.optional = true toport.size = 5 diff --git a/applications/luci-fw/luasrc/model/cbi/luci_fw/traffic.lua b/applications/luci-fw/luasrc/model/cbi/luci_fw/traffic.lua index c3efdd855..f4c5630a3 100644 --- a/applications/luci-fw/luasrc/model/cbi/luci_fw/traffic.lua +++ b/applications/luci-fw/luasrc/model/cbi/luci_fw/traffic.lua @@ -13,15 +13,15 @@ You may obtain a copy of the License at $Id$ ]]-- -m = Map("firewall", translate("fw_traffic")) -s = m:section(TypedSection, "forwarding", translate("fw_forwarding"), translate("fw_forwarding1")) +m = Map("firewall", translate("Traffic Control")) +s = m:section(TypedSection, "forwarding", translate("Zone-to-Zone traffic"), translate("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.")) s.template = "cbi/tblsection" s.addremove = true s.anonymous = true -iface = s:option(ListValue, "src", translate("fw_src")) -oface = s:option(ListValue, "dest", translate("fw_dest")) -s:option(Flag, "mtu_fix", translate("fw_mtufix")) +iface = s:option(ListValue, "src", translate("Source")) +oface = s:option(ListValue, "dest", translate("Destination")) +s:option(Flag, "mtu_fix", translate("MSS Clamping")) luci.model.uci.cursor():foreach("firewall", "zone", function (section) @@ -54,10 +54,10 @@ function s.parse(self, ...) end end -s:option(DummyValue, "_name", translate("name")) -s:option(DummyValue, "proto", translate("protocol")) +s:option(DummyValue, "_name", translate("Name")) +s:option(DummyValue, "proto", translate("Protocol")) -src = s:option(DummyValue, "src", translate("fw_src")) +src = s:option(DummyValue, "src", translate("Source")) function src.cfgvalue(self, s) return "%s:%s:%s" % { self.map:get(s, "src") or "*", @@ -66,10 +66,10 @@ function src.cfgvalue(self, s) } end -dest = s:option(DummyValue, "dest", translate("fw_dest")) +dest = s:option(DummyValue, "dest", translate("Destination")) function dest.cfgvalue(self, s) return "%s:%s:%s" % { - self.map:get(s, "dest") or translate("device", "device"), + self.map:get(s, "dest") or translate("Device"), self.map:get(s, "dest_ip") or "0.0.0.0/0", self.map:get(s, "dest_port") or "*" } diff --git a/applications/luci-fw/luasrc/model/cbi/luci_fw/trule.lua b/applications/luci-fw/luasrc/model/cbi/luci_fw/trule.lua index c7aab0f5b..be2e685eb 100644 --- a/applications/luci-fw/luasrc/model/cbi/luci_fw/trule.lua +++ b/applications/luci-fw/luasrc/model/cbi/luci_fw/trule.lua @@ -12,25 +12,25 @@ You may obtain a copy of the License at $Id$ ]]-- arg[1] = arg[1] or "" -m = Map("firewall", translate("firewall_rule"), translate("firewall_rule_desc")) +m = Map("firewall", translate("Advanced Rules"), translate("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.")) s = m:section(NamedSection, arg[1], "rule", "") s.anonymous = true s.addremove = false -back = s:option(DummyValue, "_overview", translate("overview")) +back = s:option(DummyValue, "_overview", translate("Overview")) back.value = "" back.titleref = luci.dispatcher.build_url("admin", "network", "firewall", "rule") -name = s:option(Value, "_name", translate("name")..translate("cbi_optional")) +name = s:option(Value, "_name", translate("Name")..translate(" (optional)")) name.rmempty = true -iface = s:option(ListValue, "src", translate("fw_src")) +iface = s:option(ListValue, "src", translate("Source")) iface.rmempty = true -oface = s:option(ListValue, "dest", translate("fw_dest")) -oface:value("", translate("device", "device")) +oface = s:option(ListValue, "dest", translate("Destination")) +oface:value("", translate("Device")) oface.rmempty = true luci.model.uci.cursor():foreach("firewall", "zone", @@ -39,7 +39,7 @@ luci.model.uci.cursor():foreach("firewall", "zone", oface:value(section.name) end) -proto = s:option(Value, "proto", translate("protocol")) +proto = s:option(Value, "proto", translate("Protocol")) proto.optional = true proto:value("") proto:value("tcpudp", "TCP+UDP") @@ -47,26 +47,26 @@ proto:value("tcp", "TCP") proto:value("udp", "UDP") proto:value("icmp", "ICMP") -s:option(Value, "src_ip", translate("firewall_rule_srcip")).optional = true -s:option(Value, "dest_ip", translate("firewall_rule_destip")).optional = true -s:option(Value, "src_mac", translate("firewall_rule_srcmac")).optional = true +s:option(Value, "src_ip", translate("Source address")).optional = true +s:option(Value, "dest_ip", translate("Destination address")).optional = true +s:option(Value, "src_mac", translate("Source MAC-Address")).optional = true -sport = s:option(Value, "src_port", translate("firewall_rule_srcport")) +sport = s:option(Value, "src_port", translate("Source port")) sport:depends("proto", "tcp") sport:depends("proto", "udp") sport:depends("proto", "tcpudp") -dport = s:option(Value, "dest_port", translate("firewall_rule_destport")) +dport = s:option(Value, "dest_port", translate("Destination port")) dport:depends("proto", "tcp") dport:depends("proto", "udp") dport:depends("proto", "tcpudp") -jump = s:option(ListValue, "target", translate("firewall_rule_target")) +jump = s:option(ListValue, "target", translate("Action")) jump.rmempty = true jump.default = "ACCEPT" -jump:value("DROP", translate("fw_drop")) -jump:value("ACCEPT", translate("fw_accept")) -jump:value("REJECT", translate("fw_reject")) +jump:value("DROP", translate("drop")) +jump:value("ACCEPT", translate("accept")) +jump:value("REJECT", translate("reject")) return m diff --git a/applications/luci-fw/luasrc/model/cbi/luci_fw/zones.lua b/applications/luci-fw/luasrc/model/cbi/luci_fw/zones.lua index 81a0f65cf..d9f5ce6d8 100644 --- a/applications/luci-fw/luasrc/model/cbi/luci_fw/zones.lua +++ b/applications/luci-fw/luasrc/model/cbi/luci_fw/zones.lua @@ -12,14 +12,14 @@ You may obtain a copy of the License at $Id$ ]]-- require("luci.tools.webadmin") -m = Map("firewall", translate("fw_fw"), translate("fw_fw1")) +m = Map("firewall", translate("Firewall"), translate("The firewall creates zones over your network interfaces to control network traffic flow.")) s = m:section(TypedSection, "defaults") s.anonymous = true s:option(Flag, "syn_flood") -local di = s:option(Flag, "drop_invalid", translate("fw_dropinvalid")) +local di = s:option(Flag, "drop_invalid", translate("Drop invalid packets")) di.rmempty = false function di.cfgvalue(...) return AbstractValue.cfgvalue(...) or "1" @@ -31,18 +31,18 @@ p[2] = s:option(ListValue, "output") p[3] = s:option(ListValue, "forward") for i, v in ipairs(p) do - v:value("REJECT", translate("fw_reject")) - v:value("DROP", translate("fw_drop")) - v:value("ACCEPT", translate("fw_accept")) + v:value("REJECT", translate("reject")) + v:value("DROP", translate("drop")) + v:value("ACCEPT", translate("accept")) end -s = m:section(TypedSection, "zone", translate("fw_zones")) +s = m:section(TypedSection, "zone", translate("Zones")) s.template = "cbi/tblsection" s.anonymous = true s.addremove = true -name = s:option(Value, "name", translate("name")) +name = s:option(Value, "name", translate("Name")) name.size = 8 p = {} @@ -51,9 +51,9 @@ p[2] = s:option(ListValue, "output") p[3] = s:option(ListValue, "forward") for i, v in ipairs(p) do - v:value("REJECT", translate("fw_reject")) - v:value("DROP", translate("fw_drop")) - v:value("ACCEPT", translate("fw_accept")) + v:value("REJECT", translate("reject")) + v:value("DROP", translate("drop")) + v:value("ACCEPT", translate("accept")) end s:option(Flag, "masq") diff --git a/applications/luci-hd_idle/luasrc/controller/hd_idle.lua b/applications/luci-hd_idle/luasrc/controller/hd_idle.lua index 57ff10d7c..9d5e5b3b3 100644 --- a/applications/luci-hd_idle/luasrc/controller/hd_idle.lua +++ b/applications/luci-hd_idle/luasrc/controller/hd_idle.lua @@ -22,7 +22,7 @@ function index() return end - local page = entry({"admin", "services", "hd_idle"}, cbi("hd_idle"), luci.i18n.translate("hd_idle", "hd-idle"), 60) + local page = entry({"admin", "services", "hd_idle"}, cbi("hd_idle"), luci.i18n.translate("hd-idle"), 60) page.i18n = "hd_idle" page.dependent = true end diff --git a/applications/luci-hd_idle/luasrc/model/cbi/hd_idle.lua b/applications/luci-hd_idle/luasrc/model/cbi/hd_idle.lua index 929b7ed07..82b9eaa74 100644 --- a/applications/luci-hd_idle/luasrc/model/cbi/hd_idle.lua +++ b/applications/luci-hd_idle/luasrc/model/cbi/hd_idle.lua @@ -15,27 +15,27 @@ $Id$ require("nixio.fs") -m = Map("hd-idle", translate("hd_idle"), translate("hd_idle_desc")) +m = Map("hd-idle", translate("hd-idle"), translate("hd-idle is a utility program for spinning-down external disks after a period of idle time.")) -s = m:section(TypedSection, "hd-idle", translate("settings")) +s = m:section(TypedSection, "hd-idle", translate("Settings")) s.anonymous = true -s:option(Flag, "enabled", translate("enable", "Enable")) +s:option(Flag, "enabled", translate("enable")) -disk = s:option(Value, "disk", translate("disk")) +disk = s:option(Value, "disk", translate("Disk")) disk.rmempty = true for dev in nixio.fs.glob("/dev/[sh]d[a-z]") do disk:value(nixio.fs.basename(dev)) end -s:option(Value, "idle_time_interval", translate("idle_time_interval")).default = 10 +s:option(Value, "idle_time_interval", translate("Idle-Time")).default = 10 s.rmempty = true -unit = s:option(ListValue, "idle_time_unit", translate("idle_time_unit")) +unit = s:option(ListValue, "idle_time_unit", translate("Idle-Time unit")) unit.default = "minutes" unit:value("minutes", "min") unit:value("hours", "h") unit.rmempty = true -s:option(Flag, "enable_debug", translate("enable_debug")) +s:option(Flag, "enable_debug", translate("Enable debug")) return m diff --git a/applications/luci-initmgr/luasrc/controller/init.lua b/applications/luci-initmgr/luasrc/controller/init.lua index c7ef43f83..3ff9ed0c0 100644 --- a/applications/luci-initmgr/luasrc/controller/init.lua +++ b/applications/luci-initmgr/luasrc/controller/init.lua @@ -24,6 +24,6 @@ function index() entry( {"admin", "system", "init"}, form("init/init"), - luci.i18n.translate("initmgr", "Init Scripts") + luci.i18n.translate("Initscripts") ).i18n = "initmgr" end diff --git a/applications/luci-initmgr/luasrc/model/cbi/init/init.lua b/applications/luci-initmgr/luasrc/model/cbi/init/init.lua index 1fdc32bca..668ebad15 100644 --- a/applications/luci-initmgr/luasrc/model/cbi/init/init.lua +++ b/applications/luci-initmgr/luasrc/model/cbi/init/init.lua @@ -30,13 +30,13 @@ for _, name in ipairs(luci.sys.init.names()) do end -m = SimpleForm("initmgr", translate("initmgr"), translate("initmgr_desc")) +m = SimpleForm("initmgr", translate("Initscripts"), translate("You can enable or disable installed init scripts here. Changes will applied after a device reboot.
Warning: If you disable essential init scripts like \"network\", your device might become inaccesable!")) m.reset = false s = m:section(Table, inits) -i = s:option(DummyValue, "index", translate("initmgr_index")) -n = s:option(DummyValue, "name", translate("initmgr_name")) +i = s:option(DummyValue, "index", translate("Start priority")) +n = s:option(DummyValue, "name", translate("Initscript")) e = s:option(Flag, "enabled", translate("initmgr_enabled")) diff --git a/applications/luci-livestats/luasrc/controller/livestats.lua b/applications/luci-livestats/luasrc/controller/livestats.lua index 521b32bac..39b74dc18 100644 --- a/applications/luci-livestats/luasrc/controller/livestats.lua +++ b/applications/luci-livestats/luasrc/controller/livestats.lua @@ -19,11 +19,11 @@ function index() require("luci.i18n") luci.i18n.loadc("livestats") - entry( {"admin", "status", "wifistat"}, template("livestats/wireless"), luci.i18n.translate("livestats_stat_wireless"), 90 ).i18n = "livestats" + entry( {"admin", "status", "wifistat"}, template("livestats/wireless"), luci.i18n.translate("Realtime Wireless Status"), 90 ).i18n = "livestats" entry( {"admin", "status", "trafstat"}, template("livestats/traffic"), luci.i18n.translate("livestats_stat_traffic"), 91 ).i18n = "livestats" entry( {"admin", "status", "loadavg"}, template("livestats/loadavg"), luci.i18n.translate("livestats_stat_loadavg"), 92 ).i18n = "livestats" - entry( {"mini", "network", "wifistat"}, template("livestats/wireless"), luci.i18n.translate("livestats_stat_wireless"), 90 ).i18n = "livestats" + entry( {"mini", "network", "wifistat"}, template("livestats/wireless"), luci.i18n.translate("Realtime Wireless Status"), 90 ).i18n = "livestats" entry( {"mini", "network", "trafstat"}, template("livestats/traffic"), luci.i18n.translate("livestats_stat_traffic"), 91 ).i18n = "livestats" entry( {"mini", "system", "loadavg"}, template("livestats/loadavg"), luci.i18n.translate("livestats_stat_loadavg"), 92 ).i18n = "livestats" end diff --git a/applications/luci-livestats/luasrc/view/livestats/loadavg.htm b/applications/luci-livestats/luasrc/view/livestats/loadavg.htm index 49f800ead..e225f301e 100644 --- a/applications/luci-livestats/luasrc/view/livestats/loadavg.htm +++ b/applications/luci-livestats/luasrc/view/livestats/loadavg.htm @@ -18,7 +18,7 @@ [ 0, "1 min", 1, "5 min", 2, "15 min" ], // Graph layout options - { title: '<%:livestats_loadavg%>', strokeWidth: 2.5, shouldFill: false, strokeColor: null, + { title: '<%:load average%>', strokeWidth: 2.5, shouldFill: false, strokeColor: null, padding: { left: 70, right: 10, top: 10, bottom: 20 }, instances: [ false ], yAxis: [ 0, 2 ], drawBackground: false }, null, diff --git a/applications/luci-livestats/luasrc/view/livestats/traffic.htm b/applications/luci-livestats/luasrc/view/livestats/traffic.htm index f0c194dac..b2d0b24b7 100644 --- a/applications/luci-livestats/luasrc/view/livestats/traffic.htm +++ b/applications/luci-livestats/luasrc/view/livestats/traffic.htm @@ -32,14 +32,14 @@ 2000, // Data sources - [ "0", "<%:livestats_incoming%> (kiB/s)", "8", "<%:livestats_outgoing%> (kiB/s)" ], + [ "0", "<%:incoming%> (kiB/s)", "8", "<%:outgoing%> (kiB/s)" ], // Graph layout options { shouldFill: false, drawBackground: false, strokeColor: null, - title: '<%:livestats_traffic%> %s', + title: '<%:traffic on%> %s', strokeWidth: 2.5, height: 140, padding: { left: 70, right: 10, top: 10, bottom: 20 }, instances: [ <%=table.concat(interfaces, ", ") %> ], diff --git a/applications/luci-livestats/luasrc/view/livestats/wireless.htm b/applications/luci-livestats/luasrc/view/livestats/wireless.htm index ca384b2f7..0d23da42b 100644 --- a/applications/luci-livestats/luasrc/view/livestats/wireless.htm +++ b/applications/luci-livestats/luasrc/view/livestats/wireless.htm @@ -22,7 +22,7 @@ // Graph layout options { drawBackground: false, yAxis: [ 0, 50 ], - title: '<%:livestats_wifi%> %s', + title: '<%:signal-to-noise ratio for%> %s', padding: { left: 40, right: 10, top: 10, bottom: 20 }, instanceNames: { <%- for k,v in pairs(luci.sys.wifi.getiwconfig()) do %> diff --git a/applications/luci-mmc_over_gpio/luasrc/controller/mmc_over_gpio.lua b/applications/luci-mmc_over_gpio/luasrc/controller/mmc_over_gpio.lua index 57fe5ee38..9ee2a9dec 100644 --- a/applications/luci-mmc_over_gpio/luasrc/controller/mmc_over_gpio.lua +++ b/applications/luci-mmc_over_gpio/luasrc/controller/mmc_over_gpio.lua @@ -22,7 +22,7 @@ function index() return end - local page = entry({"admin", "system", "mmc_over_gpio"}, cbi("mmc_over_gpio"), luci.i18n.translate("mmc_over_gpio", "mmc_over_gpio"), 60) + local page = entry({"admin", "system", "mmc_over_gpio"}, cbi("mmc_over_gpio"), luci.i18n.translate("MMC/SD driver configuration"), 60) page.i18n = "mmc_over_gpio" page.dependent = true end diff --git a/applications/luci-mmc_over_gpio/luasrc/model/cbi/mmc_over_gpio.lua b/applications/luci-mmc_over_gpio/luasrc/model/cbi/mmc_over_gpio.lua index a18e2c4f6..04d356c19 100644 --- a/applications/luci-mmc_over_gpio/luasrc/model/cbi/mmc_over_gpio.lua +++ b/applications/luci-mmc_over_gpio/luasrc/model/cbi/mmc_over_gpio.lua @@ -13,16 +13,16 @@ $Id$ ]]-- -m = Map("mmc_over_gpio", translate("mmc_over_gpio"), - translate("mmc_over_gpio_desc")) +m = Map("mmc_over_gpio", translate("MMC/SD driver configuration"), + translate("MMC/SD driver configuration")) -s = m:section(TypedSection, "mmc_over_gpio", translate("settings")) +s = m:section(TypedSection, "mmc_over_gpio", translate("Settings")) s.addremove = true s.anonymous = true -s:option(Flag, "enabled", translate("enabled", "Enable")) +s:option(Flag, "enabled", translate("Enable")) -s:option(Value, "name", translate("name")) +s:option(Value, "name", translate("Name")) pin = s:option(Value, "DI_pin", translate("DI_pin")) for i = 0,7 do pin:value(i) end @@ -36,6 +36,6 @@ for i = 0,7 do pin:value(i) end pin = s:option(Value, "CS_pin", translate("CS_pin")) for i = 0,7 do pin:value(i) end -s:option(Value, "mode", translate("mode")) +s:option(Value, "mode", translate("Mode")) return m diff --git a/applications/luci-ntpc/luasrc/controller/ntpc.lua b/applications/luci-ntpc/luasrc/controller/ntpc.lua index 0d656a48f..b6af6f950 100644 --- a/applications/luci-ntpc/luasrc/controller/ntpc.lua +++ b/applications/luci-ntpc/luasrc/controller/ntpc.lua @@ -21,12 +21,12 @@ function index() return end - local page = entry({"admin", "system", "ntpc"}, cbi("ntpc/ntpc"), luci.i18n.translate("ntpc"), 50) + local page = entry({"admin", "system", "ntpc"}, cbi("ntpc/ntpc"), luci.i18n.translate("Time Synchronisation"), 50) page.i18n = "ntpc" page.dependent = true - local page = entry({"mini", "system", "ntpc"}, cbi("ntpc/ntpcmini", {autoapply=true}), luci.i18n.translate("ntpc"), 50) + local page = entry({"mini", "system", "ntpc"}, cbi("ntpc/ntpcmini", {autoapply=true}), luci.i18n.translate("Time Synchronisation"), 50) page.i18n = "ntpc" page.dependent = true end \ No newline at end of file diff --git a/applications/luci-ntpc/luasrc/model/cbi/ntpc/ntpc.lua b/applications/luci-ntpc/luasrc/model/cbi/ntpc/ntpc.lua index 06609e3a0..642082fba 100644 --- a/applications/luci-ntpc/luasrc/model/cbi/ntpc/ntpc.lua +++ b/applications/luci-ntpc/luasrc/model/cbi/ntpc/ntpc.lua @@ -12,28 +12,28 @@ You may obtain a copy of the License at $Id$ ]]-- -m = Map("ntpclient", translate("ntpc"), translate("ntpc_desc")) +m = Map("ntpclient", translate("Time Synchronisation"), translate("Synchronizes the system time")) -s = m:section(TypedSection, "ntpclient", translate("general")) +s = m:section(TypedSection, "ntpclient", translate("General")) s.anonymous = true s:option(DummyValue, "_time", translate("ntpc_current")).value = os.date("%c") -s:option(Value, "interval", translate("ntpc_interval")).rmempty = true -s:option(Value, "count", translate("ntpc_count"), translate("ntpc_count_desc")).rmempty = true +s:option(Value, "interval", translate("Update Interval (in s)")).rmempty = true +s:option(Value, "count", translate("Count of Time Measurements"), translate("empty = infinite")).rmempty = true -s2 = m:section(TypedSection, "ntpdrift", translate("ntpc_drift")) +s2 = m:section(TypedSection, "ntpdrift", translate("Clock Adjustment")) s2.anonymous = true -s2:option(Value, "freq", translate("ntpc_drift_freq")).rmempty = true +s2:option(Value, "freq", translate("Offset Frequency")).rmempty = true -s3 = m:section(TypedSection, "ntpserver", translate("ntpc_timeserver")) +s3 = m:section(TypedSection, "ntpserver", translate("Time Server")) s3.anonymous = true s3.addremove = true s3.template = "cbi/tblsection" -s3:option(Value, "hostname", translate("hostname")) -s3:option(Value, "port", translate("port")).rmempty = true +s3:option(Value, "hostname", translate("Hostname")) +s3:option(Value, "port", translate("Port")).rmempty = true return m \ No newline at end of file diff --git a/applications/luci-ntpc/luasrc/model/cbi/ntpc/ntpcmini.lua b/applications/luci-ntpc/luasrc/model/cbi/ntpc/ntpcmini.lua index 3493e0317..bd04cc6a4 100644 --- a/applications/luci-ntpc/luasrc/model/cbi/ntpc/ntpcmini.lua +++ b/applications/luci-ntpc/luasrc/model/cbi/ntpc/ntpcmini.lua @@ -13,22 +13,22 @@ You may obtain a copy of the License at $Id$ ]]-- require("luci.tools.webadmin") -m = Map("ntpclient", translate("ntpc"), translate("ntpc_desc")) +m = Map("ntpclient", translate("Time Synchronisation"), translate("Synchronizes the system time")) -s = m:section(TypedSection, "ntpclient", translate("general")) +s = m:section(TypedSection, "ntpclient", translate("General")) s.anonymous = true s:option(DummyValue, "_time", translate("ntpc_current")).value = os.date("%c") -s:option(Value, "interval", translate("ntpc_interval")).rmempty = true +s:option(Value, "interval", translate("Update Interval (in s)")).rmempty = true -s3 = m:section(TypedSection, "ntpserver", translate("ntpc_timeserver")) +s3 = m:section(TypedSection, "ntpserver", translate("Time Server")) s3.anonymous = true s3.addremove = true s3.template = "cbi/tblsection" -s3:option(Value, "hostname", translate("hostname")) -s3:option(Value, "port", translate("port")).rmempty = true +s3:option(Value, "hostname", translate("Hostname")) +s3:option(Value, "port", translate("Port")).rmempty = true return m \ No newline at end of file diff --git a/applications/luci-olsr/luasrc/controller/olsr.lua b/applications/luci-olsr/luasrc/controller/olsr.lua index 837873adf..e2dc4fe44 100644 --- a/applications/luci-olsr/luasrc/controller/olsr.lua +++ b/applications/luci-olsr/luasrc/controller/olsr.lua @@ -16,12 +16,12 @@ function index() local page = node("admin", "status", "olsr", "routes") page.target = call("action_routes") - page.title = i18n("olsr_routes", "Routen") + page.title = i18n("Routen") page.order = 10 local page = node("admin", "status", "olsr", "topology") page.target = call("action_topology") - page.title = i18n("olsr_topology", "Topologie") + page.title = i18n("Topologie") page.order = 20 local page = node("admin", "status", "olsr", "hna") diff --git a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua index 74e2ba0d5..d5b771096 100644 --- a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua +++ b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua @@ -14,7 +14,7 @@ $Id$ require("luci.tools.webadmin") -m = Map("olsrd", translate("olsrd", "OLSR Daemon")) +m = Map("olsrd", translate("OLSR Daemon")) s = m:section(TypedSection, "olsrd", translate("olsrd_general")) s.dynamic = true @@ -38,26 +38,26 @@ noint.optional = true s:option(Value, "Pollrate").optional = true tcr = s:option(ListValue, "TcRedundancy") -tcr:value("0", translate("olsrd_olsrd_tcredundancy_0")) -tcr:value("1", translate("olsrd_olsrd_tcredundancy_1")) -tcr:value("2", translate("olsrd_olsrd_tcredundancy_2")) +tcr:value("0", translate("MPR selectors")) +tcr:value("1", translate("MPR selectors and MPR")) +tcr:value("2", translate("all neighbours")) tcr.optional = true s:option(Value, "MprCoverage").optional = true lql = s:option(ListValue, "LinkQualityLevel") lql:value("0", translate("disable")) -lql:value("1", translate("olsrd_olsrd_linkqualitylevel_1")) -lql:value("2", translate("olsrd_olsrd_linkqualitylevel_2")) +lql:value("1", translate("MPR selection")) +lql:value("2", translate("MPR selection and routing")) lql.optional = true s:option(Value, "LinkQualityAging").optional = true lqa = s:option(ListValue, "LinkQualityAlgorithm") lqa.optional = true -lqa:value("etx_fpm", translate("olsrd_etx_fpm")) -lqa:value("etx_float", translate("olsrd_etx_float")) -lqa:value("etx_ff", translate("olsrd_etx_ff")) +lqa:value("etx_fpm", translate("fixed point math")) +lqa:value("etx_float", translate("floating point")) +lqa:value("etx_ff", translate("Freifunk")) lqa.optional = true lqfish = s:option(Flag, "LinkQualityFishEye") @@ -92,7 +92,7 @@ willingness.optional = true -i = m:section(TypedSection, "Interface", translate("interfaces")) +i = m:section(TypedSection, "Interface", translate("Interfaces")) i.anonymous = true i.addremove = true i.dynamic = true @@ -105,13 +105,13 @@ function ign.cfgvalue(self, section) return Flag.cfgvalue(self, section) or "0" end -network = i:option(ListValue, "interface", translate("network")) +network = i:option(ListValue, "interface", translate("Network")) luci.tools.webadmin.cbi_add_networks(network) i:option(Value, "Ip4Broadcast").optional = true ip6t = i:option(ListValue, "Ip6AddrType") -ip6t:value("", translate("cbi_select")) +ip6t:value("", translate("-- Please choose --")) ip6t:value("auto") ip6t:value("site-local") ip6t:value("unique-local") diff --git a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdhna.lua b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdhna.lua index ea2f88d79..c9217f68e 100644 --- a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdhna.lua +++ b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdhna.lua @@ -12,7 +12,7 @@ You may obtain a copy of the License at $Id$ ]]-- -mh = Map("olsrd", translate("olsrd_hna", "OLSR - HNA-Ankündigungen")) +mh = Map("olsrd", translate("OLSR - HNA-Announcements")) hna4 = mh:section(TypedSection, "Hna4") diff --git a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua index f81a4a4b4..a387c4c06 100644 --- a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua +++ b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua @@ -17,7 +17,7 @@ local ip = require "luci.ip" local fs = require "nixio.fs" if arg[1] then - mp = Map("olsrd", translate("olsrd_plugins", "OLSR - Plugins")) + mp = Map("olsrd", translate("OLSR - Plugins")) p = mp:section(TypedSection, "LoadPlugin") p:depends("library", arg[1]) @@ -31,7 +31,7 @@ if arg[1] then return Flag.cfgvalue(self, section) or "0" end - lib = p:option(DummyValue, "library", translate("library")) + lib = p:option(DummyValue, "library", translate("Library")) lib.default = arg[1] local function Range(x,y) diff --git a/applications/luci-olsr/luasrc/view/status-olsr/error_olsr.htm b/applications/luci-olsr/luasrc/view/status-olsr/error_olsr.htm index c23f52b4f..97142a689 100644 --- a/applications/luci-olsr/luasrc/view/status-olsr/error_olsr.htm +++ b/applications/luci-olsr/luasrc/view/status-olsr/error_olsr.htm @@ -13,7 +13,7 @@ $Id$ -%> <%+header%> -

<%:olsrd%>

-

<%:olsrd_error%>

-

<%:olsrd_error_desc%>

+

<%:OLSR Daemon%>

+

<%:Unable to connect to the OLSR daemon!%>

+

<%:Make sure that OLSRd is running, the "txtinfo" plugin is loaded, configured on port 2006 and accepts connections from "127.0.0.1".%>

<%+footer%> diff --git a/applications/luci-olsr/luasrc/view/status-olsr/hna.htm b/applications/luci-olsr/luasrc/view/status-olsr/hna.htm index e0ec8846a..0e153bbbc 100644 --- a/applications/luci-olsr/luasrc/view/status-olsr/hna.htm +++ b/applications/luci-olsr/luasrc/view/status-olsr/hna.htm @@ -13,13 +13,13 @@ $Id$ -%> <%+header%> -

<%:olsrd_hna2%>

-

<%:olsrd_hna_desc%>

+

<%:Active host net announcements%>

+

<%:Overview of currently active OLSR host net announcements%>


- - + + <% for k, route in ipairs(routes) do %> diff --git a/applications/luci-olsr/luasrc/view/status-olsr/index.htm b/applications/luci-olsr/luasrc/view/status-olsr/index.htm index 3dc56f992..97962eec9 100644 --- a/applications/luci-olsr/luasrc/view/status-olsr/index.htm +++ b/applications/luci-olsr/luasrc/view/status-olsr/index.htm @@ -13,13 +13,13 @@ $Id$ -%> <%+header%> -

<%:olsrd_links%>

-

<%:olsrd_links_desc%>

+

<%:OLSR connections%>

+

<%:Overview of currently established OLSR connections%>


<%:olsrd_network%><%:olsrd_gateway%><%:Announced network%><%:OLSR gateway%>
- - + + @@ -48,10 +48,10 @@ $Id$ <% end %>
<%:olsrd_neighbour_ip%><%:olsrd_local_ip%><%:Neighbour IP%><%:Local interface IP%> LQ NLQ ETX

-

<%:legend%>:

+

<%:Legend%>:

<%+footer%> diff --git a/applications/luci-olsr/luasrc/view/status-olsr/mid.htm b/applications/luci-olsr/luasrc/view/status-olsr/mid.htm index 2c3b70366..c934fc9d7 100644 --- a/applications/luci-olsr/luasrc/view/status-olsr/mid.htm +++ b/applications/luci-olsr/luasrc/view/status-olsr/mid.htm @@ -13,13 +13,13 @@ $Id$ -%> <%+header%> -

<%:olsrd_mid%>

-

<%:olsrd_mid_desc%>

+

<%:Active MID announcements%>

+

<%:Overview of known multiple interface announcements%>


- - + + <% for k, mid in ipairs(mids) do %> diff --git a/applications/luci-olsr/luasrc/view/status-olsr/routes.htm b/applications/luci-olsr/luasrc/view/status-olsr/routes.htm index 1f4296441..52bf101cc 100644 --- a/applications/luci-olsr/luasrc/view/status-olsr/routes.htm +++ b/applications/luci-olsr/luasrc/view/status-olsr/routes.htm @@ -13,15 +13,15 @@ $Id$ -%> <%+header%> -

<%:olsrd_routes%>

-

<%:olsrd_routes_desc%>

+

<%:Known OLSR routes%>

+

<%:Overview of currently known routes to other OLSR nodes%>


<%:olsrd_node%><%:olsrd_mid_aliases%><%:OLSR node%><%:Secondary OLSR interfaces%>
- - - - + + + + <% for k, route in ipairs(routes) do diff --git a/applications/luci-olsr/luasrc/view/status-olsr/topology.htm b/applications/luci-olsr/luasrc/view/status-olsr/topology.htm index d919aa904..110faeafc 100644 --- a/applications/luci-olsr/luasrc/view/status-olsr/topology.htm +++ b/applications/luci-olsr/luasrc/view/status-olsr/topology.htm @@ -13,13 +13,13 @@ $Id$ -%> <%+header%> -

<%:olsrd_topology%>

-

<%:olsrd_topology_desc%>

+

<%:Active OLSR nodes%>

+

<%:Overview of currently known OLSR nodes%>


<%:olsrd_network%><%:olsrd_gateway%><%:interface%><%:metric%><%:Announced network%><%:OLSR gateway%><%:Interface%><%:Metric%> ETX
- - + + diff --git a/applications/luci-openvpn/luasrc/controller/openvpn.lua b/applications/luci-openvpn/luasrc/controller/openvpn.lua index e86d9a6dd..ddfa99091 100644 --- a/applications/luci-openvpn/luasrc/controller/openvpn.lua +++ b/applications/luci-openvpn/luasrc/controller/openvpn.lua @@ -18,7 +18,7 @@ function index() require("luci.i18n") luci.i18n.loadc("openvpn") - entry( {"admin", "services", "openvpn"}, cbi("openvpn"), luci.i18n.translate("openvpn", "OpenVPN") ).i18n = "openvpn" + entry( {"admin", "services", "openvpn"}, cbi("openvpn"), luci.i18n.translate("OpenVPN") ).i18n = "openvpn" entry( {"admin", "services", "openvpn", "basic"}, cbi("openvpn-basic"), nil ).leaf = true entry( {"admin", "services", "openvpn", "advanced"}, cbi("openvpn-advanced"), nil ).leaf = true end diff --git a/applications/luci-openvpn/luasrc/model/cbi/openvpn.lua b/applications/luci-openvpn/luasrc/model/cbi/openvpn.lua index 400633acc..f36f5db29 100644 --- a/applications/luci-openvpn/luasrc/model/cbi/openvpn.lua +++ b/applications/luci-openvpn/luasrc/model/cbi/openvpn.lua @@ -16,8 +16,8 @@ local fs = require "nixio.fs" local sys = require "luci.sys" local uci = require "luci.model.uci".cursor() -local m = Map("openvpn", translate("openvpn")) -local s = m:section( TypedSection, "openvpn", translate("openvpn_overview"), translate("openvpn_overview_desc") ) +local m = Map("openvpn", translate("OpenVPN")) +local s = m:section( TypedSection, "openvpn", translate("OpenVPN instances"), translate("Below is a list of configured OpenVPN instances and their current state") ) s.template = "cbi/tblsection" s.template_addremove = "openvpn/cbi-select-input-add" s.addremove = true @@ -70,20 +70,20 @@ function s.create(self, name) end -s:option( Flag, "enable", translate("openvpn_enable") ) +s:option( Flag, "enable", translate("Enabled") ) -local active = s:option( DummyValue, "_active", translate("openvpn_active") ) +local active = s:option( DummyValue, "_active", translate("Started") ) function active.cfgvalue(self, section) local pid = fs.readfile("/var/run/openvpn-%s.pid" % section) if pid and #pid > 0 and tonumber(pid) ~= nil then return (sys.process.signal(pid, 0)) - and translatef("openvpn_active_yes", "yes (%i)", pid) - or translate("openvpn_active_no") + and translatef("yes (%i)", pid) + or translate("no") end - return translate("openvpn_active_no") + return translate("no") end -local updown = s:option( Button, "_updown", translate("openvpn_updown", "Start/Stop") ) +local updown = s:option( Button, "_updown", translate("Start/Stop") ) updown._state = false function updown.cbid(self, section) local pid = fs.readfile("/var/run/openvpn-%s.pid" % section) @@ -103,13 +103,13 @@ function updown.write(self, section, value) end end -local port = s:option( DummyValue, "port", translate("openvpn_port") ) +local port = s:option( DummyValue, "port", translate("Port") ) function port.cfgvalue(self, section) local val = AbstractValue.cfgvalue(self, section) return val or "1194" end -local proto = s:option( DummyValue, "proto", translate("openvpn_proto") ) +local proto = s:option( DummyValue, "proto", translate("Protocol") ) function proto.cfgvalue(self, section) local val = AbstractValue.cfgvalue(self, section) return val or "udp" diff --git a/applications/luci-openvpn/luasrc/view/openvpn/cbi-select-input-add.htm b/applications/luci-openvpn/luasrc/view/openvpn/cbi-select-input-add.htm index 0744cf88b..cedac51e4 100644 --- a/applications/luci-openvpn/luasrc/view/openvpn/cbi-select-input-add.htm +++ b/applications/luci-openvpn/luasrc/view/openvpn/cbi-select-input-add.htm @@ -6,6 +6,6 @@ <% end -%> - - <% if self.invalid_cts then %>
<%:cbi_invalid%><% end %> + + <% if self.invalid_cts then %>
<%:Invalid%><% end %> diff --git a/applications/luci-openvpn/luasrc/view/openvpn/pageswitch.htm b/applications/luci-openvpn/luasrc/view/openvpn/pageswitch.htm index 3203f0c74..0d036a9ab 100644 --- a/applications/luci-openvpn/luasrc/view/openvpn/pageswitch.htm +++ b/applications/luci-openvpn/luasrc/view/openvpn/pageswitch.htm @@ -16,7 +16,7 @@ $Id$
"><%:openvpn_overview Overview%> » - <%=luci.i18n.translatef("openvpn_instance", "%s", self.instance)%> + <%=luci.i18n.translatef("Instance \"%s\"", self.instance)%> <% if self.mode == "basic" then %> diff --git a/applications/luci-p2pblock/luasrc/controller/ff_p2pblock.lua b/applications/luci-p2pblock/luasrc/controller/ff_p2pblock.lua index 9184d9991..d8dbc330d 100644 --- a/applications/luci-p2pblock/luasrc/controller/ff_p2pblock.lua +++ b/applications/luci-p2pblock/luasrc/controller/ff_p2pblock.lua @@ -17,5 +17,5 @@ module("luci.controller.ff_p2pblock", package.seeall) function index() require("luci.i18n").loadc("freifunk") entry({"admin", "network", "firewall", "p2pblock"}, cbi("luci_fw/p2pblock"), - luci.i18n.translate("ff_p2pblock", "P2P-Block"), 40) + luci.i18n.translate("P2P-Block"), 40) end diff --git a/applications/luci-p2pblock/luasrc/model/cbi/luci_fw/p2pblock.lua b/applications/luci-p2pblock/luasrc/model/cbi/luci_fw/p2pblock.lua index 21b693d9f..35f76cd2b 100644 --- a/applications/luci-p2pblock/luasrc/model/cbi/luci_fw/p2pblock.lua +++ b/applications/luci-p2pblock/luasrc/model/cbi/luci_fw/p2pblock.lua @@ -14,14 +14,14 @@ $Id$ local sys = require "luci.sys" -m = Map("freifunk_p2pblock", translate("ff_p2pblock", "P2P-Block"), - translate("ff_p2pblock_desc", "P2P-Block is a greylisting mechanism to block various peer-to-peer protocols for non-whitelisted clients.")) +m = Map("freifunk_p2pblock", translate("P2P-Block"), + translate("P2P-Block is a greylisting mechanism to block various peer-to-peer protocols for non-whitelisted clients.")) s = m:section(NamedSection, "p2pblock", "settings", "Settings") s.anonymous = true s.addremove = false -en = s:option(Flag, "_enabled", translate("ff_p2pblock_enabled", "Enable P2P-Block")) +en = s:option(Flag, "_enabled", translate("Enable P2P-Block")) en.rmempty = false function en.cfgvalue() @@ -36,14 +36,14 @@ function en.write(self, section, val) end end -s:option(Value, "portrange", translate("ff_p2pblock_portrange", "Portrange")) +s:option(Value, "portrange", translate("Portrange")) -s:option(Value, "blocktime", translate("ff_p2pblock_blocktime", "Block Time"), - translate("ff_p2pblock_blocktime_desc", "seconds")) +s:option(Value, "blocktime", translate("Block Time"), + translate("seconds")) -s:option(DynamicList, "whitelist", translate("ff_p2pblock_whitelist", "Whitelisted IPs")) +s:option(DynamicList, "whitelist", translate("Whitelisted IPs")) -l7 = s:option(MultiValue, "layer7", translate("ff_p2pblock_layer7", "Layer7-Protokolle")) +l7 = s:option(MultiValue, "layer7", translate("Layer7-Protocols")) l7.widget = "checkbox" l7:value("aim", "AIM Chat") l7:value("bittorrent", "Bittorrent") @@ -62,7 +62,7 @@ l7:value("smtp", "SMTP Protocol") l7:value("ssl", "SSL Protocol") l7:value("vnc", "VNC Protocol") -ipp2p = s:option(MultiValue, "ipp2p", translate("ff_p2pblock_ipp2p", "IP-P2P")) +ipp2p = s:option(MultiValue, "ipp2p", translate("IP-P2P")) ipp2p.widget = "checkbox" ipp2p:value("edk", "eDonkey, eMule, Kademlia") ipp2p:value("kazaa", "KaZaA, FastTrack") diff --git a/applications/luci-p910nd/luasrc/controller/p910nd.lua b/applications/luci-p910nd/luasrc/controller/p910nd.lua index 13167013c..c2fe3fa51 100644 --- a/applications/luci-p910nd/luasrc/controller/p910nd.lua +++ b/applications/luci-p910nd/luasrc/controller/p910nd.lua @@ -22,7 +22,7 @@ function index() return end - local page = entry({"admin", "services", "p910nd"}, cbi("p910nd"), luci.i18n.translate("p910nd", "Printer server"), 60) + local page = entry({"admin", "services", "p910nd"}, cbi("p910nd"), luci.i18n.translate("p910nd - Printer server"), 60) page.i18n = "p910nd" page.dependent = true end diff --git a/applications/luci-p910nd/luasrc/model/cbi/p910nd.lua b/applications/luci-p910nd/luasrc/model/cbi/p910nd.lua index b0ffa4eda..68f75bfc4 100644 --- a/applications/luci-p910nd/luasrc/model/cbi/p910nd.lua +++ b/applications/luci-p910nd/luasrc/model/cbi/p910nd.lua @@ -15,19 +15,19 @@ $Id$ local uci = luci.model.uci.cursor_state() -m = Map("p910nd", translate("p910nd", "p910nd"), - translatef("p910nd_desc")) +m = Map("p910nd", translate("p910nd - Printer server"), + translatef("First you have to install the packages to get support for USB (kmod-usb-printer) or parallel port (kmod-lp).")) -s = m:section(TypedSection, "p910nd", translate("settings", "settings")) +s = m:section(TypedSection, "p910nd", translate("Settings")) s.addremove = true s.anonymous = true s:option(Flag, "enabled", translate("enable")) -s:option(Value, "device", translate("device", "Device")).rmempty = true +s:option(Value, "device", translate("Device")).rmempty = true -s:option(Value, "port", translate("port"), translate("port_help")).rmempty = true +s:option(Value, "port", translate("Port"), translate("port_help")).rmempty = true -s:option(Flag, "bidirectional", translate("bidirectional")) +s:option(Flag, "bidirectional", translate("Bidirectional mode")) return m diff --git a/applications/luci-polipo/luasrc/controller/polipo.lua b/applications/luci-polipo/luasrc/controller/polipo.lua index 3d9f7d1ff..aa8c9bf8a 100644 --- a/applications/luci-polipo/luasrc/controller/polipo.lua +++ b/applications/luci-polipo/luasrc/controller/polipo.lua @@ -22,7 +22,7 @@ function index() luci.i18n.loadc("polipo") local i18n = luci.i18n.translate - local p = entry({"admin", "services", "polipo"}, cbi("polipo"), i18n("polipo", "Polipo")) + local p = entry({"admin", "services", "polipo"}, cbi("polipo"), i18n("Polipo")) p.dependent = true p.i18n = "polipo" end diff --git a/applications/luci-qos/luasrc/model/cbi/qos/qos.lua b/applications/luci-qos/luasrc/model/cbi/qos/qos.lua index ec450cf6e..bf4ff780e 100644 --- a/applications/luci-qos/luasrc/model/cbi/qos/qos.lua +++ b/applications/luci-qos/luasrc/model/cbi/qos/qos.lua @@ -17,7 +17,7 @@ local fs = require "nixio.fs" m = Map("qos") -s = m:section(TypedSection, "interface", translate("interfaces")) +s = m:section(TypedSection, "interface", translate("Interfaces")) s.addremove = true s:option(Flag, "enabled", translate("enable")) @@ -40,10 +40,10 @@ s.anonymous = true s.addremove = true t = s:option(ListValue, "target") -t:value("Priority", translate("qos_priority")) -t:value("Express", translate("qos_express")) -t:value("Normal", translate("qos_normal")) -t:value("Bulk", translate("qos_bulk")) +t:value("Priority", translate("priority")) +t:value("Express", translate("express")) +t:value("Normal", translate("normal")) +t:value("Bulk", translate("low")) t.default = "Normal" srch = s:option(Value, "srchost") @@ -56,7 +56,7 @@ dsth.rmempty = true dsth:value("", translate("all")) wa.cbi_add_knownips(dsth) -l7 = s:option(ListValue, "layer7", translate("service")) +l7 = s:option(ListValue, "layer7", translate("Service")) l7.rmempty = true l7:value("", translate("all")) local pats = fs.dir("/etc/l7-protocols") @@ -68,14 +68,14 @@ if pats then end end -p = s:option(Value, "proto", translate("protocol")) +p = s:option(Value, "proto", translate("Protocol")) p:value("", translate("all")) p:value("tcp", "TCP") p:value("udp", "UDP") p:value("icmp", "ICMP") p.rmempty = true -ports = s:option(Value, "ports", translate("ports")) +ports = s:option(Value, "ports", translate("Ports")) ports.rmempty = true ports:value("", translate("allf", translate("all"))) diff --git a/applications/luci-qos/luasrc/model/cbi/qos/qosmini.lua b/applications/luci-qos/luasrc/model/cbi/qos/qosmini.lua index cb7968264..503ad10a2 100644 --- a/applications/luci-qos/luasrc/model/cbi/qos/qosmini.lua +++ b/applications/luci-qos/luasrc/model/cbi/qos/qosmini.lua @@ -18,11 +18,11 @@ local fs = require "nixio.fs" m = Map("qos") -s = m:section(NamedSection, "wan", "interface", translate("m_n_inet")) +s = m:section(NamedSection, "wan", "interface", translate("Internet Connection")) -s:option(Flag, "enabled", translate("qos")) -s:option(Value, "download", translate("qos_interface_download"), "kb/s") -s:option(Value, "upload", translate("qos_interface_upload"), "kb/s") +s:option(Flag, "enabled", translate("Quality of Service")) +s:option(Value, "download", translate("Downlink"), "kb/s") +s:option(Value, "upload", translate("Uplink"), "kb/s") s = m:section(TypedSection, "classify") s.template = "cbi/tblsection" @@ -31,10 +31,10 @@ s.anonymous = true s.addremove = true t = s:option(ListValue, "target") -t:value("Priority", translate("qos_priority")) -t:value("Express", translate("qos_express")) -t:value("Normal", translate("qos_normal")) -t:value("Bulk", translate("qos_bulk")) +t:value("Priority", translate("priority")) +t:value("Express", translate("express")) +t:value("Normal", translate("normal")) +t:value("Bulk", translate("low")) t.default = "Normal" srch = s:option(Value, "srchost") @@ -47,7 +47,7 @@ dsth.rmempty = true dsth:value("", translate("all")) wa.cbi_add_knownips(dsth) -l7 = s:option(ListValue, "layer7", translate("service")) +l7 = s:option(ListValue, "layer7", translate("Service")) l7.rmempty = true l7:value("", translate("all")) local pats = fs.dir("/etc/l7-protocols") @@ -59,14 +59,14 @@ if pats then end end -p = s:option(ListValue, "proto", translate("protocol")) +p = s:option(ListValue, "proto", translate("Protocol")) p:value("", translate("all")) p:value("tcp", "TCP") p:value("udp", "UDP") p:value("icmp", "ICMP") p.rmempty = true -ports = s:option(Value, "ports", translate("ports")) +ports = s:option(Value, "ports", translate("Ports")) ports.rmempty = true ports:value("", translate("allf", translate("all"))) diff --git a/applications/luci-samba/luasrc/controller/samba.lua b/applications/luci-samba/luasrc/controller/samba.lua index c2d5d849a..a6d0918b7 100644 --- a/applications/luci-samba/luasrc/controller/samba.lua +++ b/applications/luci-samba/luasrc/controller/samba.lua @@ -21,7 +21,7 @@ function index() require("luci.i18n") luci.i18n.loadc("samba") - local page = entry({"admin", "services", "samba"}, cbi("samba"), luci.i18n.translate("samba")) + local page = entry({"admin", "services", "samba"}, cbi("samba"), luci.i18n.translate("Network Shares")) page.i18n = "samba" page.dependent = true end \ No newline at end of file diff --git a/applications/luci-samba/luasrc/model/cbi/samba.lua b/applications/luci-samba/luasrc/model/cbi/samba.lua index f8959eb95..dda4976f9 100644 --- a/applications/luci-samba/luasrc/model/cbi/samba.lua +++ b/applications/luci-samba/luasrc/model/cbi/samba.lua @@ -29,7 +29,7 @@ s.anonymous = true s.addremove = true s.template = "cbi/tblsection" -s:option(Value, "name", translate("name")) +s:option(Value, "name", translate("Name")) s:option(Value, "path").titleref = luci.dispatcher.build_url("admin", "system", "fstab") s:option(Value, "users").rmempty = true diff --git a/applications/luci-splash/luasrc/view/admin_status/splash.htm b/applications/luci-splash/luasrc/view/admin_status/splash.htm index 4151c66c3..11af7f5ec 100644 --- a/applications/luci-splash/luasrc/view/admin_status/splash.htm +++ b/applications/luci-splash/luasrc/view/admin_status/splash.htm @@ -158,12 +158,12 @@ end count = count + 1 -%>
- - + + @@ -90,9 +90,9 @@ end <%- elseif type(self.extedit) == "function" then -%> <%=self:extedit(section)%> <%- end -%> - " title="<%:edit%>"><%:edit%> + " title="<%:Edit%>"><%:Edit%> <%- end; if self.addremove then %> - + <%- end -%> <%- end -%> @@ -101,7 +101,7 @@ end <%- if isempty then -%> - + <%- end -%>
<%:olsrd_node%><%:olsrd_topology_lasthop%><%:OLSR node%><%:Last hop%> LQ ILQ ETX
<%=c.hostname or "" .. translate("ff_splash_unknown", "unknown") .. ""%><%=c.ip or "" .. translate("ff_splash_unknown", "unknown") .. ""%><%=c.hostname or "" .. translate("unknown") .. ""%><%=c.ip or "" .. translate("unknown") .. ""%> <%=showmac(c.mac)%> <%= (c.limit >= os.time()) and wat.date_format(c.limit-os.time()) or - (c.policy ~= "normal") and "-" or "" .. translate("ff_splash_expired", "expired") .. "" + (c.policy ~= "normal") and "-" or "" .. translate("expired") .. "" %> <%=wat.byte_format(c.bytes_in)%> / <%=wat.byte_format(c.bytes_out)%> diff --git a/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua b/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua index 7ffdd091e..b40603dbe 100644 --- a/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua +++ b/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua @@ -50,7 +50,7 @@ function index() } -- create toplevel menu nodes - local st = entry({"admin", "statistics"}, call("statistics_index"), _i18n("statistics"), 80) + local st = entry({"admin", "statistics"}, call("statistics_index"), _i18n("Statistics"), 80) st.i18n = "statistics" st.index = true diff --git a/applications/luci-tinyproxy/luasrc/model/cbi/tinyproxy.lua b/applications/luci-tinyproxy/luasrc/model/cbi/tinyproxy.lua index a18eb50da..5a537a4f6 100644 --- a/applications/luci-tinyproxy/luasrc/model/cbi/tinyproxy.lua +++ b/applications/luci-tinyproxy/luasrc/model/cbi/tinyproxy.lua @@ -12,14 +12,14 @@ You may obtain a copy of the License at $Id$ ]]-- -m = Map("tinyproxy", translate("tinyproxy"), translate("tinyproxy_desc")) +m = Map("tinyproxy", translate("Tinyproxy"), translate("Tinyproxy is a small and fast non-caching HTTP(S)-Proxy")) -s = m:section(TypedSection, "tinyproxy", translate("general")) +s = m:section(TypedSection, "tinyproxy", translate("General")) s.anonymous = true s:option(Flag, "enable", translate("enable")) -s:option(Value, "Port", translate("port")) +s:option(Value, "Port", translate("Port")) s:option(Value, "Listen").optional = true s:option(Value, "Bind").optional = true s:option(Value, "Timeout").optional = true @@ -68,8 +68,8 @@ s.anonymous = true s.addremove = true t = s:option(ListValue, "type") -t:value("proxy", translate("tinyproxy_type_proxy")) -t:value("reject", translate("tinyproxy_type_reject")) +t:value("proxy", translate("Via proxy")) +t:value("reject", translate("Reject access")) ta = s:option(Value, "target") ta.rmempty = true diff --git a/applications/luci-upnp/luasrc/model/cbi/upnp/upnp.lua b/applications/luci-upnp/luasrc/model/cbi/upnp/upnp.lua index 97fe88e6c..fa0e96553 100644 --- a/applications/luci-upnp/luasrc/model/cbi/upnp/upnp.lua +++ b/applications/luci-upnp/luasrc/model/cbi/upnp/upnp.lua @@ -12,7 +12,7 @@ You may obtain a copy of the License at $Id$ ]]-- -m = Map("upnpd", translate("upnpd"), translate("upnpd_desc")) +m = Map("upnpd", translate("Universal Plug & Play"), translate("UPNP allows clients in the local network to automatically configure the router.")) s = m:section(NamedSection, "config", "upnpd", "") e = s:option(Flag, "enabled", translate("enable")) diff --git a/applications/luci-upnp/luasrc/model/cbi/upnp/upnpmini.lua b/applications/luci-upnp/luasrc/model/cbi/upnp/upnpmini.lua index 3e19b9573..64769aae1 100644 --- a/applications/luci-upnp/luasrc/model/cbi/upnp/upnpmini.lua +++ b/applications/luci-upnp/luasrc/model/cbi/upnp/upnpmini.lua @@ -12,7 +12,7 @@ You may obtain a copy of the License at $Id$ ]]-- -m = Map("upnpd", translate("upnpd"), translate("upnpd_desc")) +m = Map("upnpd", translate("Universal Plug & Play"), translate("UPNP allows clients in the local network to automatically configure the router.")) s = m:section(NamedSection, "config", "upnpd", "") e = s:option(Flag, "enabled", translate("enable")) diff --git a/applications/luci-ushare/luasrc/controller/ushare.lua b/applications/luci-ushare/luasrc/controller/ushare.lua index b9c16a4c1..a17c9a41e 100644 --- a/applications/luci-ushare/luasrc/controller/ushare.lua +++ b/applications/luci-ushare/luasrc/controller/ushare.lua @@ -22,7 +22,7 @@ function index() return end - local page = entry({"admin", "services", "ushare"}, cbi("ushare"), luci.i18n.translate("ushare", "uShare"), 60) + local page = entry({"admin", "services", "ushare"}, cbi("ushare"), luci.i18n.translate("uShare"), 60) page.i18n = "uvc_streamer" page.dependent = true end diff --git a/applications/luci-ushare/luasrc/model/cbi/ushare.lua b/applications/luci-ushare/luasrc/model/cbi/ushare.lua index d90d2640f..0e5b6cff6 100644 --- a/applications/luci-ushare/luasrc/model/cbi/ushare.lua +++ b/applications/luci-ushare/luasrc/model/cbi/ushare.lua @@ -13,30 +13,30 @@ $Id$ ]]-- -m = Map("ushare", translate("ushare"), +m = Map("ushare", translate("uShare"), translate("ushare_desc")) -s = m:section(TypedSection, "ushare", translate("settings")) +s = m:section(TypedSection, "ushare", translate("Settings")) s.addremove = false s.anonymous = true -s:option(Flag, "enabled", translate("enabled", "Enable")) +s:option(Flag, "enabled", translate("Enable")) -s:option(Value, "username", translate("username")) +s:option(Value, "username", translate("Username")) -s:option(Value, "servername", translate("servername")) +s:option(Value, "servername", translate("Servername")) -dif = s:option( Value, "interface", translate("interface")) +dif = s:option( Value, "interface", translate("Interface")) for _, nif in ipairs(luci.sys.net.devices()) do if nif ~= "lo" then dif:value(nif) end end -s:option(Value, "content_directories", translate("content_directories")) +s:option(Value, "content_directories", translate("Content directories")) -s:option(Flag, "disable_webif", translate("disable_webif")) +s:option(Flag, "disable_webif", translate("Disable webinterface")) -s:option(Flag, "disable_telnet", translate("disable_telnet")) +s:option(Flag, "disable_telnet", translate("Disable telnet console")) -s:option(Value, "options", translate("options")) +s:option(Value, "options", translate("Options")) return m diff --git a/applications/luci-uvc_streamer/luasrc/controller/uvc_streamer.lua b/applications/luci-uvc_streamer/luasrc/controller/uvc_streamer.lua index 8363454ef..7b995c26b 100644 --- a/applications/luci-uvc_streamer/luasrc/controller/uvc_streamer.lua +++ b/applications/luci-uvc_streamer/luasrc/controller/uvc_streamer.lua @@ -22,7 +22,7 @@ function index() return end - local page = entry({"admin", "services", "uvc_streamer"}, cbi("uvc_streamer"), luci.i18n.translate("uvc_streamer", "UVC Streaming"), 60) + local page = entry({"admin", "services", "uvc_streamer"}, cbi("uvc_streamer"), luci.i18n.translate("Webcam streaming"), 60) page.i18n = "uvc_streamer" page.dependent = true end diff --git a/applications/luci-uvc_streamer/luasrc/model/cbi/uvc_streamer.lua b/applications/luci-uvc_streamer/luasrc/model/cbi/uvc_streamer.lua index e4de64568..469ea6f00 100644 --- a/applications/luci-uvc_streamer/luasrc/model/cbi/uvc_streamer.lua +++ b/applications/luci-uvc_streamer/luasrc/model/cbi/uvc_streamer.lua @@ -24,24 +24,24 @@ uci:foreach( "uvc-streamer", "uvc-streamer", addr = addr or "192.168.1.1" port = port or 8080 -m = Map("uvc-streamer", translate("uvc_streamer"), +m = Map("uvc-streamer", translate("Webcam streaming"), translatef("uvc_streamer_desc", nil, addr, port, addr, port)) -s = m:section(TypedSection, "uvc-streamer", translate("settings")) +s = m:section(TypedSection, "uvc-streamer", translate("Settings")) s.addremove = false s.anonymous = true -s:option(Flag, "enabled", translate("enabled", "Enable")) +s:option(Flag, "enabled", translate("Enable")) -s:option(Value, "device", translate("device")).rmempty = true +s:option(Value, "device", translate("Device")).rmempty = true -nm = s:option(Value, "resolution", translate("resolution")) +nm = s:option(Value, "resolution", translate("Resolution")) nm:value("640x480") nm:value("320x240") nm:value("160x120") -s:option(Value, "framespersecond", translate("framespersecond")).rmempty = true +s:option(Value, "framespersecond", translate("Frames per second")).rmempty = true -s:option(Value, "port", translate("port", "Port")).rmempty = true +s:option(Value, "port", translate("Port")).rmempty = true return m diff --git a/applications/luci-voice-core/luasrc/controller/luci_voice.lua b/applications/luci-voice-core/luasrc/controller/luci_voice.lua index 4d8873e9f..70617af6d 100644 --- a/applications/luci-voice-core/luasrc/controller/luci_voice.lua +++ b/applications/luci-voice-core/luasrc/controller/luci_voice.lua @@ -18,15 +18,15 @@ function index() require("luci.i18n") luci.i18n.loadc("voice_core") - local e = entry({"admin", "voice"}, template("luci_voice/index") , luci.i18n.translate("l_v_adminvoice", "Voice"), 90) + local e = entry({"admin", "voice"}, template("luci_voice/index") , luci.i18n.translate("Voice"), 90) e.index = true e.i18n = "voice_core" - e = entry({"mini", "voice"}, template("luci_voice/index"), luci.i18n.translate("l_v_minivoice", "Voice"), 90) + e = entry({"mini", "voice"}, template("luci_voice/index"), luci.i18n.translate("Voice"), 90) e.index = true e.i18n = "voice_core" - e = entry({"mini", "voice", "phones"}, template("luci_voice/phone_index"), luci.i18n.translate("l_v_miniphones"), 90) + e = entry({"mini", "voice", "phones"}, template("luci_voice/phone_index"), luci.i18n.translate("Phones"), 90) e.index = true e.i18n = "voice_core" diff --git a/applications/luci-voice-diag/luasrc/view/luci_voice/diag_index.htm b/applications/luci-voice-diag/luasrc/view/luci_voice/diag_index.htm index 010eaf769..387d2ab62 100644 --- a/applications/luci-voice-diag/luasrc/view/luci_voice/diag_index.htm +++ b/applications/luci-voice-diag/luasrc/view/luci_voice/diag_index.htm @@ -12,7 +12,7 @@ $Id$ -%> <%+header%> -

<%:l_v_d_di_voicediag%>

-

<%:l_v_d_di_voicediag1%>

-

<%:l_v_d_di_voicediag2%>

+

<%:Diagnostics%>

+

<%:Under this menu are options that allow you to configure and perform tests on the voice operations of your system. These are known as diagnostics.%>

+

<%:The diagnostics available on your device depend on the modules that you have installed.%>

<%+footer%> diff --git a/libs/cbi/luasrc/view/cbi/delegator.htm b/libs/cbi/luasrc/view/cbi/delegator.htm index f2c87b460..9b4d4e6bf 100644 --- a/libs/cbi/luasrc/view/cbi/delegator.htm +++ b/libs/cbi/luasrc/view/cbi/delegator.htm @@ -21,10 +21,10 @@ $Id$ <% end %> <% if self.allow_reset then %> - + <% end %> <% if self.allow_cancel then %> - + <% end %> <% if self.allow_finish and not self:get_next(self.current) then %> diff --git a/libs/cbi/luasrc/view/cbi/dynlist.htm b/libs/cbi/luasrc/view/cbi/dynlist.htm index cbde2efb3..aa794c65f 100644 --- a/libs/cbi/luasrc/view/cbi/dynlist.htm +++ b/libs/cbi/luasrc/view/cbi/dynlist.htm @@ -20,9 +20,9 @@ $Id$ %> /> <% if i <= #vals then %> - " alt="<%:cbi_del%>" title="<%:cbi_del%>" src="<%=resource%>/cbi/remove.gif" /> + " alt="<%:Delete%>" title="<%:Delete%>" src="<%=resource%>/cbi/remove.gif" /> <% else %> - " alt="<%:cbi_add%>" title="<%:cbi_add%>" src="<%=resource%>/cbi/add.gif" /> + " alt="<%:Add%>" title="<%:Add%>" src="<%=resource%>/cbi/add.gif" /> <% end %> <% if #self.keylist > 0 then -%> <% end -%> <% if i <= #vals then %>
diff --git a/libs/cbi/luasrc/view/cbi/firewall_zonelist.htm b/libs/cbi/luasrc/view/cbi/firewall_zonelist.htm index 94186954d..863452fbb 100644 --- a/libs/cbi/luasrc/view/cbi/firewall_zonelist.htm +++ b/libs/cbi/luasrc/view/cbi/firewall_zonelist.htm @@ -68,7 +68,7 @@ $Id$ <% end end %> <% end end %> - <% if empty then %><%:a_s_ipt_zone_empty (no interfaces attached)%><% end %> + <% if empty then %><%:(no interfaces attached)%><% end %> <% end end %> @@ -77,7 +77,7 @@ $Id$
  • />  
    - ><%:a_s_ipt_zone_unspec_create unspecified -or- create:%>  + ><%:unspecified -or- create:%>  onfocus="document.getElementById('<%=cbid%>_new').checked=true" />
    • diff --git a/libs/cbi/luasrc/view/cbi/footer.htm b/libs/cbi/luasrc/view/cbi/footer.htm index b6e893d1a..1796cd5dc 100644 --- a/libs/cbi/luasrc/view/cbi/footer.htm +++ b/libs/cbi/luasrc/view/cbi/footer.htm @@ -18,10 +18,10 @@ $Id$ <% end %> <% if not autoapply then%> - + <% end %> - - + + <%- end -%> diff --git a/libs/cbi/luasrc/view/cbi/full_valueheader.htm b/libs/cbi/luasrc/view/cbi/full_valueheader.htm index cbeda755b..f757d7feb 100644 --- a/libs/cbi/luasrc/view/cbi/full_valueheader.htm +++ b/libs/cbi/luasrc/view/cbi/full_valueheader.htm @@ -16,7 +16,7 @@ $Id$
    "> <%- if self.title and #self.title > 0 then -%> diff --git a/libs/cbi/luasrc/view/cbi/header.htm b/libs/cbi/luasrc/view/cbi/header.htm index 90b6f659a..c831b0df1 100644 --- a/libs/cbi/luasrc/view/cbi/header.htm +++ b/libs/cbi/luasrc/view/cbi/header.htm @@ -18,5 +18,5 @@ $Id$
    - +
    diff --git a/libs/cbi/luasrc/view/cbi/map.htm b/libs/cbi/luasrc/view/cbi/map.htm index 0b5ac5881..861656894 100644 --- a/libs/cbi/luasrc/view/cbi/map.htm +++ b/libs/cbi/luasrc/view/cbi/map.htm @@ -18,7 +18,7 @@ $Id$
    <%=self.description%>
    <%- if self._apply then -%>
    - <%:cbi_applying%> + <%:Applying changes%>
      <%- local fp = self._apply() self._apply = nil diff --git a/libs/cbi/luasrc/view/cbi/network_netlist.htm b/libs/cbi/luasrc/view/cbi/network_netlist.htm index 3622b6fd7..c47b3a70e 100644 --- a/libs/cbi/luasrc/view/cbi/network_netlist.htm +++ b/libs/cbi/luasrc/view/cbi/network_netlist.htm @@ -41,7 +41,7 @@ $Id$ %> style="width:16px; height:16px; vertical-align:middle" src="<%=resource%>/icons/<%=iface:type()%><%=iface:is_up() and "" or "_disabled"%>.png" /> <% end end %> - <% if empty then %><%:a_s_ipt_zone_empty (no interfaces attached)%><% end %> + <% if empty then %><%:(no interfaces attached)%><% end %> @@ -51,7 +51,7 @@ $Id$
    • />  
      - ><%:a_s_ipt_zone_unspec_create unspecified -or- create:%>  + ><%:unspecified -or- create:%>  onfocus="document.getElementById('<%=cbid%>_new').checked=true" />
      • diff --git a/libs/cbi/luasrc/view/cbi/nsection.htm b/libs/cbi/luasrc/view/cbi/nsection.htm index d096ac3a0..1d231c542 100644 --- a/libs/cbi/luasrc/view/cbi/nsection.htm +++ b/libs/cbi/luasrc/view/cbi/nsection.htm @@ -23,7 +23,7 @@ $Id$ <%- end %> <% if self.addremove then -%>
      - +
      <%- end %> <%+cbi/tabmenu%> @@ -39,7 +39,7 @@ $Id$ <%=self.title%> <%- end %>
      <%=self.description%>
      - +
    <%- end %> <% end %> diff --git a/libs/cbi/luasrc/view/cbi/tblsection.htm b/libs/cbi/luasrc/view/cbi/tblsection.htm index 99b5b97b5..3231f22aa 100644 --- a/libs/cbi/luasrc/view/cbi/tblsection.htm +++ b/libs/cbi/luasrc/view/cbi/tblsection.htm @@ -39,7 +39,7 @@ end <%- end -%> <%- for i, k in pairs(self.children) do if not k.optional then -%>
    		- <%- if k.titleref then -%><%- end -%> + <%- if k.titleref then -%><%- end -%> <%-=k.title-%> <%- if k.titleref then -%><%- end -%>

    <%:cbi_sectempty%>
    <%:This section contains no values yet%>
    @@ -118,13 +118,13 @@ end <% if self.template_addremove then include(self.template_addremove) else -%>
    <% if self.anonymous then %> - + <% else %> <% if self.invalid_cts then -%>
    <% end %> - + <% if self.invalid_cts then -%> -
    <%:cbi_invalid%>
    +
    <%:Invalid%>
    <%- end %> <% end %> diff --git a/libs/cbi/luasrc/view/cbi/tsection.htm b/libs/cbi/luasrc/view/cbi/tsection.htm index 7fdd7f4ff..0fa285c16 100644 --- a/libs/cbi/luasrc/view/cbi/tsection.htm +++ b/libs/cbi/luasrc/view/cbi/tsection.htm @@ -21,7 +21,7 @@ $Id$ <% local isempty = true for i, k in ipairs(self:cfgsections()) do -%> <% if self.addremove then -%>
    - +
    <%- end %> @@ -40,20 +40,20 @@ $Id$ <%- end %> <% if isempty then -%> - <%:cbi_sectempty%>

     + <%:This section contains no values yet%>

     <%- end %> <% if self.addremove then -%> <% if self.template_addremove then include(self.template_addremove) else -%>
    <% if self.anonymous then -%> - + <%- else -%> <% if self.invalid_cts then -%>
    <% end %> - + <% if self.invalid_cts then -%> -
    <%:cbi_invalid%>
    +
    <%:Invalid%>
    <%- end %> <%- end %> diff --git a/libs/cbi/luasrc/view/cbi/ucisection.htm b/libs/cbi/luasrc/view/cbi/ucisection.htm index a8b313d36..aef770e17 100644 --- a/libs/cbi/luasrc/view/cbi/ucisection.htm +++ b/libs/cbi/luasrc/view/cbi/ucisection.htm @@ -55,7 +55,7 @@ $Id$ <% end %> <% else %> + <% end %> diff --git a/libs/cbi/luasrc/view/cbi/upload.htm b/libs/cbi/luasrc/view/cbi/upload.htm index 355f37357..dc7b16fee 100644 --- a/libs/cbi/luasrc/view/cbi/upload.htm +++ b/libs/cbi/luasrc/view/cbi/upload.htm @@ -22,7 +22,7 @@ $Id$ <% if s then %> <%:cbi_upload Uploaded File%> (<%=t.byte_format(s.size)%>) /> - " alt="<%:cbi_replace%>" title="<%:cbi_replace%>" src="<%=resource%>/cbi/reload.gif" /> + " alt="<%:Replace entry%>" title="<%:Replace entry%>" src="<%=resource%>/cbi/reload.gif" /> <% else %> /> <% end %> diff --git a/libs/core/luasrc/model/network.lua b/libs/core/luasrc/model/network.lua index e1e9f4558..8459463f1 100644 --- a/libs/core/luasrc/model/network.lua +++ b/libs/core/luasrc/model/network.lua @@ -396,13 +396,13 @@ end function interface.get_type_i18n(self) local x = self:type() if x == "wifi" then - return i18n.translate("a_s_if_wifidev", "Wireless Adapter") + return i18n.translate("Wireless Adapter") elseif x == "bridge" then - return i18n.translate("a_s_if_bridge", "Bridge") + return i18n.translate("Bridge") elseif x == "switch" then - return i18n.translate("a_s_if_ethswitch", "Ethernet Switch") + return i18n.translate("Ethernet Switch") else - return i18n.translate("a_s_if_ethdev", "Ethernet Adapter") + return i18n.translate("Ethernet Adapter") end end diff --git a/libs/core/luasrc/model/network/wireless.lua b/libs/core/luasrc/model/network/wireless.lua index 109367fd4..122532523 100644 --- a/libs/core/luasrc/model/network/wireless.lua +++ b/libs/core/luasrc/model/network/wireless.lua @@ -77,12 +77,12 @@ end function get_i18n(self, iface) if iface.dev and iface.dev.wifi then return "%s: %s %q" %{ - i18n.translate("a_s_if_wifinet", "Wireless Network"), + i18n.translate("Wireless Network"), i18n.translate("a_s_if_iwmode_" .. (iface.dev.wifi.mode or "ap"), iface.dev.wifi.mode or "AP"), iface.dev.wifi.ssid or iface.dev.wifi.bssid or "(hidden)" } else - return "%s: %q" %{ i18n.translate("a_s_if_wifinet", "Wireless Network"), iface:name() } + return "%s: %q" %{ i18n.translate("Wireless Network"), iface:name() } end end diff --git a/libs/core/luasrc/model/wireless.lua b/libs/core/luasrc/model/wireless.lua index ea6706076..2a463dbad 100644 --- a/libs/core/luasrc/model/wireless.lua +++ b/libs/core/luasrc/model/wireless.lua @@ -100,12 +100,12 @@ end function get_i18n(self, iface) if iface.wdev and iface.winfo then return "%s: %s %q (%s)" %{ - i18n.translate("a_s_if_wifinet", "Wireless Network"), + i18n.translate("Wireless Network"), i18n.translate("a_s_if_iwmode_" .. iface:active_mode(), iface.winfo.mode(iface.wdev)), iface:active_ssid() or "(hidden)", iface.wdev } else - return "%s: %q" %{ i18n.translate("a_s_if_wifinet", "Wireless Network"), iface:name() } + return "%s: %q" %{ i18n.translate("Wireless Network"), iface:name() } end end diff --git a/modules/admin-core/luasrc/view/about.htm b/modules/admin-core/luasrc/view/about.htm index 529649cc2..f89cc755d 100644 --- a/modules/admin-core/luasrc/view/about.htm +++ b/modules/admin-core/luasrc/view/about.htm @@ -13,13 +13,13 @@ $Id$ -%> <%+header%> -

    <%:about%> LuCI

    -

    <%:c_lucidesc%>

    +

    <%:About%> LuCI

    +

    <%:LuCI is a collection of free Lua software including an MVC-Webframework and webinterface for embedded devices. LuCI is licensed under the Apache-License.%>

    -

    <%:c_projecthome%>: luci.freifunk-halle.net

    +

    <%:Project Homepage%>: luci.freifunk-halle.net


    -

    <%:c_leaddev%>

    +

    <%:Lead Development%>


    -

    <%:c_contributors%>

    +

    <%:Contributing Developers%>


    -

    <%:c_thanksto%>

    +

    <%:Thanks To%>