diff options
Diffstat (limited to 'modules/admin-mini')
| -rw-r--r-- | modules/admin-mini/luasrc/model/cbi/mini/system.lua | 6 | ||||
| -rw-r--r-- | modules/admin-mini/luasrc/model/cbi/mini/wifi.lua | 17 |
2 files changed, 16 insertions, 7 deletions
diff --git a/modules/admin-mini/luasrc/model/cbi/mini/system.lua b/modules/admin-mini/luasrc/model/cbi/mini/system.lua index ac11abe9c9..f2ab5e529c 100644 --- a/modules/admin-mini/luasrc/model/cbi/mini/system.lua +++ b/modules/admin-mini/luasrc/model/cbi/mini/system.lua @@ -38,11 +38,11 @@ s:option(DummyValue, "_memtotal", translate("Memory")).value = string.format("%.2f MB (%.0f%% %s, %.0f%% %s, %.0f%% %s)", tonumber(memtotal) / 1024, 100 * memcached / memtotal, - tostring(translate("mem_cached", "")), + tostring(translate("cached")), 100 * membuffers / memtotal, - tostring(translate("mem_buffered", "")), + tostring(translate("buffered")), 100 * memfree / memtotal, - tostring(translate("mem_free", "")) + tostring(translate("free")) ) s:option(DummyValue, "_systime", translate("Local Time")).value = diff --git a/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua b/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua index a062dff5c6..762412e034 100644 --- a/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua +++ b/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua @@ -236,16 +236,25 @@ if hwtype == "atheros" or hwtype == "mac80211" then encr:value("psk-mixed", "WPA-PSK/WPA2-PSK Mixed Mode", {mode="ap"}, {mode="adhoc"}) encr:value("wpa", "WPA-Radius", {mode="ap"}) encr:value("wpa2", "WPA2-Radius", {mode="ap"}) - encr.description = translate("wifi_wpareq") + encr.description = translate( + "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP " .. + "and ad-hoc mode) to be installed." + ) elseif not hostapd and supplicant then encr:value("psk", "WPA-PSK", {mode="sta"}) encr:value("psk2", "WPA2-PSK", {mode="sta"}) encr:value("psk-mixed", "WPA-PSK/WPA2-PSK Mixed Mode", {mode="sta"}) encr:value("wpa", "WPA-EAP", {mode="sta"}) encr:value("wpa2", "WPA2-EAP", {mode="sta"}) - encr.description = translate("wifi_wpareq") + encr.description = translate( + "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP " .. + "and ad-hoc mode) to be installed." + ) else - encr.description = translate("wifi_wpareq") + encr.description = translate( + "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP " .. + "and ad-hoc mode) to be installed." + ) end elseif hwtype == "broadcom" then encr:value("psk", "WPA-PSK") @@ -264,7 +273,7 @@ key:depends({mode="ap", encryption="wpa2"}) key.rmempty = true key.password = true -server = s:option(Value, "server", translate("RadiusServer")) +server = s:option(Value, "server", translate("Radius-Server")) server:depends({mode="ap", encryption="wpa"}) server:depends({mode="ap", encryption="wpa2"}) server.rmempty = true |