diff options
Diffstat (limited to 'modules/admin-mini/luasrc')
| -rw-r--r-- | modules/admin-mini/luasrc/controller/mini/index.lua | 10 | ||||
| -rw-r--r-- | modules/admin-mini/luasrc/controller/mini/network.lua | 6 | ||||
| -rw-r--r-- | modules/admin-mini/luasrc/controller/mini/system.lua | 12 | ||||
| -rw-r--r-- | modules/admin-mini/luasrc/model/cbi/mini/dhcp.lua | 20 | ||||
| -rw-r--r-- | modules/admin-mini/luasrc/model/cbi/mini/luci.lua | 8 | ||||
| -rw-r--r-- | modules/admin-mini/luasrc/model/cbi/mini/network.lua | 56 | ||||
| -rw-r--r-- | modules/admin-mini/luasrc/model/cbi/mini/passwd.lua | 10 | ||||
| -rw-r--r-- | modules/admin-mini/luasrc/model/cbi/mini/system.lua | 18 | ||||
| -rw-r--r-- | modules/admin-mini/luasrc/model/cbi/mini/wifi.lua | 82 | ||||
| -rw-r--r-- | modules/admin-mini/luasrc/view/mini/applyreboot.htm | 6 | ||||
| -rw-r--r-- | modules/admin-mini/luasrc/view/mini/backup.htm | 14 | ||||
| -rw-r--r-- | modules/admin-mini/luasrc/view/mini/index.htm | 14 | ||||
| -rw-r--r-- | modules/admin-mini/luasrc/view/mini/reboot.htm | 12 | ||||
| -rw-r--r-- | modules/admin-mini/luasrc/view/mini/upgrade.htm | 3 |
14 files changed, 135 insertions, 136 deletions
diff --git a/modules/admin-mini/luasrc/controller/mini/index.lua b/modules/admin-mini/luasrc/controller/mini/index.lua index acff55aabb..f50858f4d7 100644 --- a/modules/admin-mini/luasrc/controller/mini/index.lua +++ b/modules/admin-mini/luasrc/controller/mini/index.lua @@ -27,16 +27,16 @@ function index() entry({"about"}, template("about")).i18n = "admin-core" - local page = entry({"mini"}, alias("mini", "index"), i18n("essentials", "Essentials"), 10) + local page = entry({"mini"}, alias("mini", "index"), i18n("Essentials"), 10) page.i18n = "admin-core" page.sysauth = "root" page.sysauth_authenticator = "htmlauth" page.index = true - entry({"mini", "index"}, alias("mini", "index", "index"), i18n("overview"), 10).index = true - entry({"mini", "index", "index"}, form("mini/index"), i18n("general"), 1).ignoreindex = true - entry({"mini", "index", "luci"}, cbi("mini/luci", {autoapply=true}), i18n("settings"), 10) - entry({"mini", "index", "logout"}, call("action_logout"), i18n("logout")) + entry({"mini", "index"}, alias("mini", "index", "index"), i18n("Overview"), 10).index = true + entry({"mini", "index", "index"}, form("mini/index"), i18n("General"), 1).ignoreindex = true + entry({"mini", "index", "luci"}, cbi("mini/luci", {autoapply=true}), i18n("Settings"), 10) + entry({"mini", "index", "logout"}, call("action_logout"), i18n("Logout")) end function action_logout() diff --git a/modules/admin-mini/luasrc/controller/mini/network.lua b/modules/admin-mini/luasrc/controller/mini/network.lua index ab933ccac3..25f29d9db8 100644 --- a/modules/admin-mini/luasrc/controller/mini/network.lua +++ b/modules/admin-mini/luasrc/controller/mini/network.lua @@ -19,8 +19,8 @@ function index() luci.i18n.loadc("admin-core") local i18n = luci.i18n.translate - entry({"mini", "network"}, alias("mini", "network", "index"), i18n("network"), 20).index = true - entry({"mini", "network", "index"}, cbi("mini/network", {autoapply=true}), i18n("general"), 1) - entry({"mini", "network", "wifi"}, cbi("mini/wifi", {autoapply=true}), i18n("wifi"), 10).i18n="wifi" + entry({"mini", "network"}, alias("mini", "network", "index"), i18n("Network"), 20).index = true + entry({"mini", "network", "index"}, cbi("mini/network", {autoapply=true}), i18n("General"), 1) + entry({"mini", "network", "wifi"}, cbi("mini/wifi", {autoapply=true}), i18n("Wifi"), 10).i18n="wifi" entry({"mini", "network", "dhcp"}, cbi("mini/dhcp", {autoapply=true}), "DHCP", 20) end
\ No newline at end of file diff --git a/modules/admin-mini/luasrc/controller/mini/system.lua b/modules/admin-mini/luasrc/controller/mini/system.lua index 075f51e914..f21a9ef96e 100644 --- a/modules/admin-mini/luasrc/controller/mini/system.lua +++ b/modules/admin-mini/luasrc/controller/mini/system.lua @@ -19,12 +19,12 @@ function index() luci.i18n.loadc("admin-core") local i18n = luci.i18n.translate - entry({"mini", "system"}, alias("mini", "system", "index"), i18n("system"), 40).index = true - entry({"mini", "system", "index"}, cbi("mini/system", {autoapply=true}), i18n("general"), 1) - entry({"mini", "system", "passwd"}, form("mini/passwd"), i18n("a_s_changepw"), 10) - entry({"mini", "system", "backup"}, call("action_backup"), i18n("a_s_backup"), 80) - entry({"mini", "system", "upgrade"}, call("action_upgrade"), i18n("admin_upgrade"), 90) - entry({"mini", "system", "reboot"}, call("action_reboot"), i18n("reboot"), 100) + entry({"mini", "system"}, alias("mini", "system", "index"), i18n("System"), 40).index = true + entry({"mini", "system", "index"}, cbi("mini/system", {autoapply=true}), i18n("General"), 1) + entry({"mini", "system", "passwd"}, form("mini/passwd"), i18n("Admin Password"), 10) + entry({"mini", "system", "backup"}, call("action_backup"), i18n("Backup / Restore"), 80) + entry({"mini", "system", "upgrade"}, call("action_upgrade"), i18n("Flash Firmware"), 90) + entry({"mini", "system", "reboot"}, call("action_reboot"), i18n("Reboot"), 100) end function action_backup() diff --git a/modules/admin-mini/luasrc/model/cbi/mini/dhcp.lua b/modules/admin-mini/luasrc/model/cbi/mini/dhcp.lua index 5817a93d77..8c405ca599 100644 --- a/modules/admin-mini/luasrc/model/cbi/mini/dhcp.lua +++ b/modules/admin-mini/luasrc/model/cbi/mini/dhcp.lua @@ -31,12 +31,12 @@ enable = s:option(ListValue, "ignore", translate("enable"), "") enable:value(0, translate("enable")) enable:value(1, translate("disable")) -start = s:option(Value, "start", translate("m_n_d_firstaddress")) +start = s:option(Value, "start", translate("First leased address")) start.rmempty = true start:depends("ignore", "0") -limit = s:option(Value, "limit", translate("m_n_d_numleases"), "") +limit = s:option(Value, "limit", translate("Number of leased addresses"), "") limit:depends("ignore", "0") function limit.cfgvalue(self, section) @@ -60,7 +60,7 @@ time.rmempty = true -m2 = Map("luci_ethers", translate("dhcp_leases")) +m2 = Map("luci_ethers", translate("Leases")) local leasefn, leasefp, leases uci:foreach("dhcp", "dnsmasq", @@ -77,25 +77,25 @@ if leasefp then end if leases then - v = m2:section(Table, leases, translate("dhcp_leases_active")) - ip = v:option(DummyValue, 3, translate("ipaddress")) + v = m2:section(Table, leases, translate("Active Leases")) + ip = v:option(DummyValue, 3, translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address")) - mac = v:option(DummyValue, 2, translate("macaddress")) + mac = v:option(DummyValue, 2, translate("<abbr title=\"Media Access Control\">MAC</abbr>-Address")) - ltime = v:option(DummyValue, 1, translate("dhcp_timeremain")) + ltime = v:option(DummyValue, 1, translate("Leasetime remaining")) function ltime.cfgvalue(self, ...) local value = DummyValue.cfgvalue(self, ...) return wa.date_format(os.difftime(tonumber(value), os.time())) end end -s = m2:section(TypedSection, "static_lease", translate("luci_ethers")) +s = m2:section(TypedSection, "static_lease", translate("Static Leases")) s.addremove = true s.anonymous = true s.template = "cbi/tblsection" -mac = s:option(Value, "macaddr", translate("macaddress")) -ip = s:option(Value, "ipaddr", translate("ipaddress")) +mac = s:option(Value, "macaddr", translate("<abbr title=\"Media Access Control\">MAC</abbr>-Address")) +ip = s:option(Value, "ipaddr", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address")) sys.net.arptable(function(entry) ip:value(entry["IP address"]) mac:value( diff --git a/modules/admin-mini/luasrc/model/cbi/mini/luci.lua b/modules/admin-mini/luasrc/model/cbi/mini/luci.lua index 28efad921a..58755fde74 100644 --- a/modules/admin-mini/luasrc/model/cbi/mini/luci.lua +++ b/modules/admin-mini/luasrc/model/cbi/mini/luci.lua @@ -16,7 +16,7 @@ $Id$ require "luci.config" local fs = require "nixio.fs" -m = Map("luci", translate("webui"), translate("a_i_luci1")) +m = Map("luci", translate("Web <abbr title=\"User Interface\">UI</abbr>"), translate("Here you can customize the settings and the functionality of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>.")) -- force reload of global luci config namespace to reflect the changes function m.commit_handler(self) @@ -25,9 +25,9 @@ function m.commit_handler(self) end -c = m:section(NamedSection, "main", "core", translate("general")) +c = m:section(NamedSection, "main", "core", translate("General")) -l = c:option(ListValue, "lang", translate("language")) +l = c:option(ListValue, "lang", translate("Language")) l:value("auto") local i18ndir = luci.i18n.i18ndir .. "default." @@ -38,7 +38,7 @@ for k, v in luci.util.kspairs(luci.config.languages) do end end -t = c:option(ListValue, "mediaurlbase", translate("design")) +t = c:option(ListValue, "mediaurlbase", translate("Design")) for k, v in pairs(luci.config.themes) do if k:sub(1, 1) ~= "." then t:value(v, k) diff --git a/modules/admin-mini/luasrc/model/cbi/mini/network.lua b/modules/admin-mini/luasrc/model/cbi/mini/network.lua index 14414e999e..43ad212cc3 100644 --- a/modules/admin-mini/luasrc/model/cbi/mini/network.lua +++ b/modules/admin-mini/luasrc/model/cbi/mini/network.lua @@ -31,14 +31,14 @@ for k, v in pairs(network) do end end -m = Map("network", translate("network")) -s = m:section(Table, ifaces, translate("status")) +m = Map("network", translate("Network")) +s = m:section(Table, ifaces, translate("Status")) s.parse = function() end -s:option(DummyValue, ".name", translate("network")) +s:option(DummyValue, ".name", translate("Network")) hwaddr = s:option(DummyValue, "_hwaddr", - translate("network_interface_hwaddr"), translate("network_interface_hwaddr_desc")) + translate("<abbr title=\"Media Access Control\">MAC</abbr>-Address"), translate("Hardware Address")) function hwaddr.cfgvalue(self, section) local ix = self.map:get(section, "ifname") or "" return fs.readfile("/sys/class/net/" .. ix .. "/address") @@ -47,13 +47,13 @@ function hwaddr.cfgvalue(self, section) end -s:option(DummyValue, "ipaddr", translate("ipaddress")) +s:option(DummyValue, "ipaddr", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address")) -s:option(DummyValue, "netmask", translate("netmask")) +s:option(DummyValue, "netmask", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask")) txrx = s:option(DummyValue, "_txrx", - translate("network_interface_txrx"), translate("network_interface_txrx_desc")) + translate("Traffic"), translate("transmitted / received")) function txrx.cfgvalue(self, section) local ix = self.map:get(section, "ifname") @@ -68,7 +68,7 @@ function txrx.cfgvalue(self, section) end errors = s:option(DummyValue, "_err", - translate("network_interface_err"), translate("network_interface_err_desc")) + translate("Errors"), translate("TX / RX")) function errors.cfgvalue(self, section) local ix = self.map:get(section, "ifname") @@ -84,28 +84,28 @@ end -s = m:section(NamedSection, "lan", "interface", translate("m_n_local")) +s = m:section(NamedSection, "lan", "interface", translate("Local Network")) s.addremove = false -s:option(Value, "ipaddr", translate("ipaddress")) +s:option(Value, "ipaddr", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address")) -nm = s:option(Value, "netmask", translate("netmask")) +nm = s:option(Value, "netmask", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask")) nm:value("255.255.255.0") nm:value("255.255.0.0") nm:value("255.0.0.0") -gw = s:option(Value, "gateway", translate("gateway") .. translate("cbi_optional")) +gw = s:option(Value, "gateway", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway") .. translate(" (optional)")) gw.rmempty = true -dns = s:option(Value, "dns", translate("dnsserver") .. translate("cbi_optional")) +dns = s:option(Value, "dns", translate("<abbr title=\"Domain Name System\">DNS</abbr>-Server") .. translate(" (optional)")) dns.rmempty = true -s = m:section(NamedSection, "wan", "interface", translate("m_n_inet")) +s = m:section(NamedSection, "wan", "interface", translate("Internet Connection")) s.addremove = false -p = s:option(ListValue, "proto", translate("protocol")) +p = s:option(ListValue, "proto", translate("Protocol")) p.override_values = true p:value("none", "disabled") -p:value("static", translate("manual", "manual")) -p:value("dhcp", translate("automatic", "automatic")) +p:value("static", translate("manual")) +p:value("dhcp", translate("automatic")) if has_pppoe then p:value("pppoe", "PPPoE") end if has_pptp then p:value("pptp", "PPTP") end @@ -120,29 +120,29 @@ function p.write(self, section, value) end if not ( has_pppoe and has_pptp ) then - p.description = translate("network_interface_prereq_mini") + p.description = translate("You need to install \"ppp-mod-pppoe\" for PPPoE or \"pptp\" for PPtP support") end -ip = s:option(Value, "ipaddr", translate("ipaddress")) +ip = s:option(Value, "ipaddr", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address")) ip:depends("proto", "static") -nm = s:option(Value, "netmask", translate("netmask")) +nm = s:option(Value, "netmask", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask")) nm:depends("proto", "static") -gw = s:option(Value, "gateway", translate("gateway")) +gw = s:option(Value, "gateway", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway")) gw:depends("proto", "static") gw.rmempty = true -dns = s:option(Value, "dns", translate("dnsserver")) +dns = s:option(Value, "dns", translate("<abbr title=\"Domain Name System\">DNS</abbr>-Server")) dns:depends("proto", "static") dns.rmempty = true -usr = s:option(Value, "username", translate("username")) +usr = s:option(Value, "username", translate("Username")) usr:depends("proto", "pppoe") usr:depends("proto", "pptp") -pwd = s:option(Value, "password", translate("password")) +pwd = s:option(Value, "password", translate("Password")) pwd.password = true pwd:depends("proto", "pppoe") pwd:depends("proto", "pptp") @@ -152,7 +152,7 @@ pwd:depends("proto", "pptp") -- This cures some cancer for providers with pre-war routers if fs.access("/etc/config/firewall") then mssfix = s:option(Flag, "_mssfix", - translate("m_n_mssfix"), translate("m_n_mssfix_desc")) + translate("Clamp Segment Size"), translate("Fixes problems with unreachable websites, submitting forms or other unexpected behaviour for some ISPs.")) mssfix.rmempty = false function mssfix.cfgvalue(self) @@ -175,19 +175,19 @@ if fs.access("/etc/config/firewall") then end end -kea = s:option(Flag, "keepalive", translate("m_n_keepalive")) +kea = s:option(Flag, "keepalive", translate("automatically reconnect")) kea:depends("proto", "pppoe") kea:depends("proto", "pptp") kea.rmempty = true kea.enabled = "10" -cod = s:option(Value, "demand", translate("m_n_dialondemand"), "s") +cod = s:option(Value, "demand", translate("disconnect when idle for"), "s") cod:depends("proto", "pppoe") cod:depends("proto", "pptp") cod.rmempty = true -srv = s:option(Value, "server", translate("m_n_pptp_server")) +srv = s:option(Value, "server", translate("<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server")) srv:depends("proto", "pptp") srv.rmempty = true diff --git a/modules/admin-mini/luasrc/model/cbi/mini/passwd.lua b/modules/admin-mini/luasrc/model/cbi/mini/passwd.lua index dff5aeb7b6..6f13bb0fc8 100644 --- a/modules/admin-mini/luasrc/model/cbi/mini/passwd.lua +++ b/modules/admin-mini/luasrc/model/cbi/mini/passwd.lua @@ -12,13 +12,13 @@ You may obtain a copy of the License at $Id$ ]]-- -f = SimpleForm("password", translate("a_s_changepw"), translate("a_s_changepw1")) +f = SimpleForm("password", translate("Admin Password"), translate("Change the password of the system administrator (User <code>root</code>)")) -pw1 = f:field(Value, "pw1", translate("password")) +pw1 = f:field(Value, "pw1", translate("Password")) pw1.password = true pw1.rmempty = false -pw2 = f:field(Value, "pw2", translate("confirmation")) +pw2 = f:field(Value, "pw2", translate("Confirmation")) pw2.password = true pw2.rmempty = false @@ -31,9 +31,9 @@ function f.handle(self, state, data) local stat = luci.sys.user.setpasswd("root", data.pw1) == 0 if stat then - f.message = translate("a_s_changepw_changed") + f.message = translate("Password successfully changed") else - f.errmessage = translate("unknownerror") + f.errmessage = translate("Unknown Error") end data.pw1 = nil diff --git a/modules/admin-mini/luasrc/model/cbi/mini/system.lua b/modules/admin-mini/luasrc/model/cbi/mini/system.lua index 90ee790831..ac11abe9c9 100644 --- a/modules/admin-mini/luasrc/model/cbi/mini/system.lua +++ b/modules/admin-mini/luasrc/model/cbi/mini/system.lua @@ -17,7 +17,7 @@ require("luci.sys.zoneinfo") require("luci.tools.webadmin") -m = Map("system", translate("system"), translate("a_s_desc")) +m = Map("system", translate("System"), translate("Here you can configure the basic aspects of your device like its hostname or the timezone.")) s = m:section(TypedSection, "system", "") s.anonymous = true @@ -27,14 +27,14 @@ s.addremove = false local system, model, memtotal, memcached, membuffers, memfree = luci.sys.sysinfo() local uptime = luci.sys.uptime() -s:option(DummyValue, "_system", translate("system")).value = system -s:option(DummyValue, "_cpu", translate("m_i_processor")).value = model +s:option(DummyValue, "_system", translate("System")).value = system +s:option(DummyValue, "_cpu", translate("Processor")).value = model local load1, load5, load15 = luci.sys.loadavg() -s:option(DummyValue, "_la", translate("load")).value = +s:option(DummyValue, "_la", translate("Load")).value = string.format("%.2f, %.2f, %.2f", load1, load5, load15) -s:option(DummyValue, "_memtotal", translate("m_i_memory")).value = +s:option(DummyValue, "_memtotal", translate("Memory")).value = string.format("%.2f MB (%.0f%% %s, %.0f%% %s, %.0f%% %s)", tonumber(memtotal) / 1024, 100 * memcached / memtotal, @@ -45,13 +45,13 @@ s:option(DummyValue, "_memtotal", translate("m_i_memory")).value = tostring(translate("mem_free", "")) ) -s:option(DummyValue, "_systime", translate("m_i_systemtime")).value = +s:option(DummyValue, "_systime", translate("Local Time")).value = os.date("%c") -s:option(DummyValue, "_uptime", translate("m_i_uptime")).value = +s:option(DummyValue, "_uptime", translate("Uptime")).value = luci.tools.webadmin.date_format(tonumber(uptime)) -hn = s:option(Value, "hostname", translate("hostname")) +hn = s:option(Value, "hostname", translate("Hostname")) function hn.write(self, section, value) Value.write(self, section, value) @@ -59,7 +59,7 @@ function hn.write(self, section, value) end -tz = s:option(ListValue, "zonename", translate("timezone")) +tz = s:option(ListValue, "zonename", translate("Timezone")) tz:value("UTC") for i, zone in ipairs(luci.sys.zoneinfo.TZ) do diff --git a/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua b/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua index 765011a1f6..a062dff5c6 100644 --- a/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua +++ b/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua @@ -45,14 +45,14 @@ wlcursor:foreach("wireless", "wifi-device", -- Main Map -- -m = Map("wireless", translate("wifi"), translate("a_w_devices1")) +m = Map("wireless", translate("Wifi"), translate("Here you can configure installed wifi devices.")) m:chain("network") -- Status Table -- -s = m:section(Table, ifaces, translate("networks")) +s = m:section(Table, ifaces, translate("Networks")) -link = s:option(DummyValue, "_link", translate("link")) +link = s:option(DummyValue, "_link", translate("Link")) function link.cfgvalue(self, section) local ifname = self.map:get(section, "ifname") return wifidata[ifname] and wifidata[ifname]["Link Quality"] or "-" @@ -67,27 +67,27 @@ function bssid.cfgvalue(self, section) or wifidata[ifname]["Access Point"])) or "-" end -channel = s:option(DummyValue, "channel", translate("channel")) +channel = s:option(DummyValue, "channel", translate("Channel")) function channel.cfgvalue(self, section) return wireless[self.map:get(section, "device")].channel end -protocol = s:option(DummyValue, "_mode", translate("protocol")) +protocol = s:option(DummyValue, "_mode", translate("Protocol")) function protocol.cfgvalue(self, section) local mode = wireless[self.map:get(section, "device")].mode return mode and "802." .. mode end -mode = s:option(DummyValue, "mode", translate("mode")) -encryption = s:option(DummyValue, "encryption", translate("iwscan_encr")) +mode = s:option(DummyValue, "mode", translate("Mode")) +encryption = s:option(DummyValue, "encryption", translate("<abbr title=\"Encrypted\">Encr.</abbr>")) -power = s:option(DummyValue, "_power", translate("power")) +power = s:option(DummyValue, "_power", translate("Power")) function power.cfgvalue(self, section) local ifname = self.map:get(section, "ifname") return wifidata[ifname] and wifidata[ifname]["Tx-Power"] or "-" end -scan = s:option(Button, "_scan", translate("scan")) +scan = s:option(Button, "_scan", translate("Scan")) scan.inputstyle = "find" function scan.cfgvalue(self, section) @@ -96,7 +96,7 @@ end -- WLAN-Scan-Table -- -t2 = m:section(Table, {}, translate("iwscan"), translate("iwscan1")) +t2 = m:section(Table, {}, translate("<abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan"), translate("Wifi networks in your local environment")) function scan.write(self, section) m.autoapply = false @@ -108,26 +108,26 @@ end t2._render = t2.render t2.render = function() end -t2:option(DummyValue, "Quality", translate("iwscan_link")) +t2:option(DummyValue, "Quality", translate("Link")) essid = t2:option(DummyValue, "ESSID", "ESSID") function essid.cfgvalue(self, section) return self.map:get(section, "ESSID") end t2:option(DummyValue, "Address", "BSSID") -t2:option(DummyValue, "Mode", translate("mode")) -chan = t2:option(DummyValue, "channel", translate("channel")) +t2:option(DummyValue, "Mode", translate("Mode")) +chan = t2:option(DummyValue, "channel", translate("Channel")) function chan.cfgvalue(self, section) return self.map:get(section, "Channel") or self.map:get(section, "Frequency") or "-" end -t2:option(DummyValue, "Encryption key", translate("iwscan_encr")) +t2:option(DummyValue, "Encryption key", translate("<abbr title=\"Encrypted\">Encr.</abbr>")) -t2:option(DummyValue, "Signal level", translate("iwscan_signal")) +t2:option(DummyValue, "Signal level", translate("Signal")) -t2:option(DummyValue, "Noise level", translate("iwscan_noise")) +t2:option(DummyValue, "Noise level", translate("Noise")) @@ -137,7 +137,7 @@ end -- Config Section -- -s = m:section(NamedSection, wifidevs[1], "wifi-device", translate("devices")) +s = m:section(NamedSection, wifidevs[1], "wifi-device", translate("Devices")) s.addremove = false en = s:option(Flag, "disabled", translate("enable")) @@ -153,7 +153,7 @@ end local hwtype = m:get(wifidevs[1], "type") if hwtype == "atheros" then - mode = s:option(ListValue, "hwmode", translate("mode")) + mode = s:option(ListValue, "hwmode", translate("Mode")) mode.override_values = true mode:value("", "auto") mode:value("11b", "802.11b") @@ -164,19 +164,19 @@ if hwtype == "atheros" then end -ch = s:option(Value, "channel", translate("a_w_channel")) +ch = s:option(Value, "channel", translate("Channel")) for i=1, 14 do ch:value(i, i .. " (2.4 GHz)") end -s = m:section(TypedSection, "wifi-iface", translate("m_n_local")) +s = m:section(TypedSection, "wifi-iface", translate("Local Network")) s.anonymous = true s.addremove = false -s:option(Value, "ssid", translate("a_w_netid")) +s:option(Value, "ssid", translate("Network Name (<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>)")) -bssid = s:option(Value, "bssid", translate("wifi_bssid")) +bssid = s:option(Value, "bssid", translate("<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>")) local devs = {} luci.model.uci.cursor():foreach("wireless", "wifi-device", @@ -185,16 +185,16 @@ luci.model.uci.cursor():foreach("wireless", "wifi-device", end) if #devs > 1 then - device = s:option(DummyValue, "device", translate("device")) + device = s:option(DummyValue, "device", translate("Device")) else s.defaults.device = devs[1] end -mode = s:option(ListValue, "mode", translate("mode")) +mode = s:option(ListValue, "mode", translate("Mode")) mode.override_values = true -mode:value("ap", translate("m_w_ap")) -mode:value("adhoc", translate("m_w_adhoc")) -mode:value("sta", translate("m_w_client")) +mode:value("ap", translate("Provide (Access Point)")) +mode:value("adhoc", translate("Independent (Ad-Hoc)")) +mode:value("sta", translate("Join (Client)")) function mode.write(self, section, value) if value == "sta" then @@ -215,7 +215,7 @@ function mode.write(self, section, value) return ListValue.write(self, section, value) end -encr = s:option(ListValue, "encryption", translate("encryption")) +encr = s:option(ListValue, "encryption", translate("Encryption")) encr.override_values = true encr:value("none", "No Encryption") encr:value("wep", "WEP") @@ -253,7 +253,7 @@ elseif hwtype == "broadcom" then encr:value("psk+psk2", "WPA-PSK/WPA2-PSK Mixed Mode") end -key = s:option(Value, "key", translate("key")) +key = s:option(Value, "key", translate("Key")) key:depends("encryption", "wep") key:depends("encryption", "psk") key:depends("encryption", "psk2") @@ -264,44 +264,44 @@ key:depends({mode="ap", encryption="wpa2"}) key.rmempty = true key.password = true -server = s:option(Value, "server", translate("a_w_radiussrv")) +server = s:option(Value, "server", translate("RadiusServer")) server:depends({mode="ap", encryption="wpa"}) server:depends({mode="ap", encryption="wpa2"}) server.rmempty = true -port = s:option(Value, "port", translate("a_w_radiusport")) +port = s:option(Value, "port", translate("Radius-Port")) port:depends({mode="ap", encryption="wpa"}) port:depends({mode="ap", encryption="wpa2"}) port.rmempty = true if hwtype == "atheros" or hwtype == "mac80211" then - nasid = s:option(Value, "nasid", translate("a_w_nasid")) + nasid = s:option(Value, "nasid", translate("NAS ID")) nasid:depends({mode="ap", encryption="wpa"}) nasid:depends({mode="ap", encryption="wpa2"}) nasid.rmempty = true - eaptype = s:option(ListValue, "eap_type", translate("a_w_eaptype")) + eaptype = s:option(ListValue, "eap_type", translate("EAP-Method")) eaptype:value("TLS") eaptype:value("TTLS") eaptype:value("PEAP") eaptype:depends({mode="sta", encryption="wpa"}) eaptype:depends({mode="sta", encryption="wpa2"}) - cacert = s:option(FileUpload, "ca_cert", translate("a_w_cacert")) + cacert = s:option(FileUpload, "ca_cert", translate("Path to CA-Certificate")) cacert:depends({mode="sta", encryption="wpa"}) cacert:depends({mode="sta", encryption="wpa2"}) - privkey = s:option(FileUpload, "priv_key", translate("a_w_tlsprivkey")) + privkey = s:option(FileUpload, "priv_key", translate("Path to Private Key")) privkey:depends({mode="sta", eap_type="TLS", encryption="wpa2"}) privkey:depends({mode="sta", eap_type="TLS", encryption="wpa"}) - privkeypwd = s:option(Value, "priv_key_pwd", translate("a_w_tlsprivkeypwd")) + privkeypwd = s:option(Value, "priv_key_pwd", translate("Password of Private Key")) privkeypwd:depends({mode="sta", eap_type="TLS", encryption="wpa2"}) privkeypwd:depends({mode="sta", eap_type="TLS", encryption="wpa"}) - auth = s:option(Value, "auth", translate("a_w_peapauth")) + auth = s:option(Value, "auth", translate("Authentication")) auth:value("PAP") auth:value("CHAP") auth:value("MSCHAP") @@ -312,13 +312,13 @@ if hwtype == "atheros" or hwtype == "mac80211" then auth:depends({mode="sta", eap_type="TTLS", encryption="wpa"}) - identity = s:option(Value, "identity", translate("a_w_peapidentity")) + identity = s:option(Value, "identity", translate("Identity")) identity:depends({mode="sta", eap_type="PEAP", encryption="wpa2"}) identity:depends({mode="sta", eap_type="PEAP", encryption="wpa"}) identity:depends({mode="sta", eap_type="TTLS", encryption="wpa2"}) identity:depends({mode="sta", eap_type="TTLS", encryption="wpa"}) - password = s:option(Value, "password", translate("a_w_peappassword")) + password = s:option(Value, "password", translate("Password")) password:depends({mode="sta", eap_type="PEAP", encryption="wpa2"}) password:depends({mode="sta", eap_type="PEAP", encryption="wpa"}) password:depends({mode="sta", eap_type="TTLS", encryption="wpa2"}) @@ -327,11 +327,11 @@ end if hwtype == "atheros" or hwtype == "broadcom" then - iso = s:option(Flag, "isolate", translate("a_w_apisolation"), translate("a_w_apisolation1")) + iso = s:option(Flag, "isolate", translate("AP-Isolation"), translate("Prevents Client to Client communication")) iso.rmempty = true iso:depends("mode", "ap") - hide = s:option(Flag, "hidden", translate("a_w_hideessid")) + hide = s:option(Flag, "hidden", translate("Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>")) hide.rmempty = true hide:depends("mode", "ap") end diff --git a/modules/admin-mini/luasrc/view/mini/applyreboot.htm b/modules/admin-mini/luasrc/view/mini/applyreboot.htm index 1a1a24bb0c..8ff7118c7e 100644 --- a/modules/admin-mini/luasrc/view/mini/applyreboot.htm +++ b/modules/admin-mini/luasrc/view/mini/applyreboot.htm @@ -13,9 +13,9 @@ $Id$ -%> <%+header%> -<h2><a id="content" name="content"><%:system%></a></h2> +<h2><a id="content" name="content"><%:System%></a></h2> <br /> -<p><% if msg then %><%=msg%><% else %><%:a_s_applyreboot1%><% end %></p> -<p><%:a_s_reboot_running%></p> +<p><% if msg then %><%=msg%><% else %><%:Changes applied.%><% end %></p> +<p><%:Please wait: Device rebooting...%></p> <script type="text/javascript">setTimeout("location='<%=controller%>'", 60000)</script> <%+footer%>
\ No newline at end of file diff --git a/modules/admin-mini/luasrc/view/mini/backup.htm b/modules/admin-mini/luasrc/view/mini/backup.htm index 2db044ddd3..a28d2b8066 100644 --- a/modules/admin-mini/luasrc/view/mini/backup.htm +++ b/modules/admin-mini/luasrc/view/mini/backup.htm @@ -13,15 +13,15 @@ $Id$ -%> <%+header%> -<h2><a id="content" name="content"><%:system%></a></h2> -<h3><%:a_s_backup%></h3> -<p><%:a_s_backup1%></p> +<h2><a id="content" name="content"><%:System%></a></h2> +<h3><%:Backup / Restore%></h3> +<p><%:Here you can backup and restore your router configuration and - if possible - reset the router to the default settings.%></p> <br /> <div> <ul> - <li><a href="<%=REQUEST_URI%>?backup=kthxbye"><%:a_s_backup_backup%></a></li> + <li><a href="<%=REQUEST_URI%>?backup=kthxbye"><%:Create backup%></a></li> <% if reset_avail then -%> - <li><a href="<%=REQUEST_URI%>?reset=yarly" onclick="return confirm('<%:a_s_backup_reset1%>')"><%:a_s_backup_reset%></a></li> + <li><a href="<%=REQUEST_URI%>?reset=yarly" onclick="return confirm('<%:Proceed reverting all settings and resetting to firmware defaults?%>')"><%:Reset router to defaults%></a></li> <% end -%> </ul> </div> @@ -29,12 +29,12 @@ $Id$ <br /> <form method="post" action="<%=REQUEST_URI%>" enctype="multipart/form-data"> - <div class="left"><%:a_s_backup_archive%>:</div> + <div class="left"><%:Backup Archive%>:</div> <div> <input type="file" size="30" name="archive" /> </div> <div> - <input type="submit" class="cbi-input-apply" value="<%:a_s_backup_restore%>" /> + <input type="submit" class="cbi-input-apply" value="<%:Restore backup%>" /> </div> </form> <%+footer%>
\ No newline at end of file diff --git a/modules/admin-mini/luasrc/view/mini/index.htm b/modules/admin-mini/luasrc/view/mini/index.htm index 622ab38e1c..87ecc09574 100644 --- a/modules/admin-mini/luasrc/view/mini/index.htm +++ b/modules/admin-mini/luasrc/view/mini/index.htm @@ -12,10 +12,10 @@ You may obtain a copy of the License at $Id$ -%> -<h2><a id="content" name="content"><%:a_i_i_hello%></a></h2> -<p><%:a_i_i_admin1%></p> -<p><%:a_i_i_admin2%><br /> -<%:a_i_i_admin3%></p> -<p><%:a_i_i_admin5%></p> -<p><%:a_i_i_admin6%></p> -<p><em><strong><a href="<%=controller%>/about"><%:a_i_i_team%></a></strong></em></p> +<h2><a id="content" name="content"><%:Hello!%></a></h2> +<p><%:This is the administration area of <abbr title="Lua Configuration Interface">LuCI</abbr>.%></p> +<p><%:<abbr title="Lua Configuration Interface">LuCI</abbr> is a free, flexible, and user friendly graphical interface for configuring OpenWrt Kamikaze.%><br /> +<%:On the following pages you can adjust all important settings of your router.%></p> +<p><%:As we always want to improve this interface we are looking forward to your feedback and suggestions.%></p> +<p><%:And now have fun with your router!%></p> +<p><em><strong><a href="<%=controller%>/about"><%:The <abbr title="Lua Configuration Interface">LuCI</abbr> Team%></a></strong></em></p> diff --git a/modules/admin-mini/luasrc/view/mini/reboot.htm b/modules/admin-mini/luasrc/view/mini/reboot.htm index 724e0179a2..9e57d89f9f 100644 --- a/modules/admin-mini/luasrc/view/mini/reboot.htm +++ b/modules/admin-mini/luasrc/view/mini/reboot.htm @@ -13,21 +13,21 @@ $Id$ -%> <%+header%> -<h2><a id="content" name="content"><%:system%></a></h2> -<h3><%:reboot%></h3> -<p><%:a_s_reboot1%></p> +<h2><a id="content" name="content"><%:System%></a></h2> +<h3><%:Reboot%></h3> +<p><%:Reboots the operating system of your device%></p> <%- local c = require("luci.model.uci").cursor():changes() if c and next(c) then -%> - <p class="warning"><%:a_s_reboot_u%></p> + <p class="warning"><%:Warning: There are unsaved changes that will be lost while rebooting!%></p> <%- end if not reboot then -%> -<p><a href="<%=REQUEST_URI%>?reboot=1"><%:a_s_reboot_do%></a></p> +<p><a href="<%=REQUEST_URI%>?reboot=1"><%:Perform reboot%></a></p> <%- else -%> -<p><%:a_s_reboot_running%></p> +<p><%:Please wait: Device rebooting...%></p> <script type="text/javascript">setTimeout("location='<%=controller%>'", 60000)</script> <%- end -%> <%+footer%>
\ No newline at end of file diff --git a/modules/admin-mini/luasrc/view/mini/upgrade.htm b/modules/admin-mini/luasrc/view/mini/upgrade.htm index 425113e62d..510a51b155 100644 --- a/modules/admin-mini/luasrc/view/mini/upgrade.htm +++ b/modules/admin-mini/luasrc/view/mini/upgrade.htm @@ -15,7 +15,7 @@ $Id$ <%+header%> -<h2><a id="content" name="content"><%:system%></a></h2> +<h2><a id="content" name="content"><%:System%></a></h2> <h3><%:admin_upgrade Flash Firmware%></h3> <% if step == 1 then %> @@ -73,7 +73,6 @@ $Id$ if flashsize > 0 then write(luci.i18n.translatef( - "admin_upgrade_spaceavail", " (%s available)", w.byte_format(flashsize) )) |