all: change most translate statements to new format, some need manual cleanup
[project/luci.git] / modules / admin-full / luasrc / model / cbi / admin_network / wifi.lua
index 639c3c1900ab9ab5350378f17821ba9372f8b136..bdb8235184da3dc951bb6a01916421aa35a4d373 100644 (file)
@@ -20,7 +20,7 @@ local fs = require "nixio.fs"
 arg[1] = arg[1] or ""
 arg[2] = arg[2] or ""
 
-m = Map("wireless", translate("networks"), translate("a_w_networks1"))
+m = Map("wireless", translate("Networks"), translate("You can run several wifi networks with one device. Be aware that there are certain hardware and driverspecific restrictions. Normally you can operate 1 Ad-Hoc or up to 3 Master-Mode and 1 Client-Mode network simultaneously."))
 m:chain("network")
 
 local ifsection
@@ -50,15 +50,15 @@ m.uci:foreach("wireless", "wifi-iface",
                end
        end)
 
-s = m:section(NamedSection, arg[1], "wifi-device", translate("device") .. " " .. arg[1])
+s = m:section(NamedSection, arg[1], "wifi-device", translate("Device") .. " " .. arg[1])
 s.addremove = false
 
-s:tab("general", translate("a_w_general", "General Setup"))
-s:tab("macfilter", translate("a_w_macfilter", "MAC-Filter"))
-s:tab("advanced", translate("a_w_advanced", "Advanced Settings"))
+s:tab("general", translate("General Setup"))
+s:tab("macfilter", translate("MAC-Filter"))
+s:tab("advanced", translate("Advanced Settings"))
 
 --[[
-back = s:option(DummyValue, "_overview", translate("overview"))
+back = s:option(DummyValue, "_overview", translate("Overview"))
 back.value = ""
 back.titleref = luci.dispatcher.build_url("admin", "network", "wireless")
 ]]
@@ -72,14 +72,14 @@ function en.cfgvalue(self, section)
        return Flag.cfgvalue(self, section) or "0"
 end
 
-s:taboption("general", DummyValue, "type", translate("type"))
+s:taboption("general", DummyValue, "type", translate("Type"))
 
 local hwtype = m:get(arg[1], "type")
 -- NanoFoo
 local nsantenna = m:get(arg[1], "antenna")
 
-ch = s:taboption("general", Value, "channel", translate("a_w_channel"))
-ch:value("auto", translate("wifi_auto"))
+ch = s:taboption("general", Value, "channel", translate("Channel"))
+ch:value("auto", translate("auto"))
 for c, f in luci.util.kspairs(luci.sys.wifi.channels()) do
        ch:value(c, "%i (%.3f GHz)" %{ c, f })
 end
@@ -90,7 +90,7 @@ end
 if hwtype == "mac80211" then
        tp = s:taboption("general",
                (tx_powers and #tx_powers > 0) and ListValue or Value,
-               "txpower", translate("a_w_txpwr"), "dBm")
+               "txpower", translate("Transmit Power"), "dBm")
 
        tp.rmempty = true
        for _, p in ipairs(iw and iw.txpwrlist or {}) do
@@ -104,57 +104,57 @@ end
 if hwtype == "atheros" then
        tp = s:taboption("general",
                (#tx_powers > 0) and ListValue or Value,
-               "txpower", translate("a_w_txpwr"), "dBm")
+               "txpower", translate("Transmit Power"), "dBm")
 
        tp.rmempty = true
        for _, p in ipairs(iw.txpwrlist) do
                tp:value(p.dbm, "%i dBm (%i mW)" %{ p.dbm, p.mw })
        end
 
-       mode = s:taboption("advanced", ListValue, "hwmode", translate("mode"))
-       mode:value("", translate("wifi_auto"))
+       mode = s:taboption("advanced", ListValue, "hwmode", translate("Mode"))
+       mode:value("", translate("auto"))
        mode:value("11b", "802.11b")
        mode:value("11g", "802.11g")
        mode:value("11a", "802.11a")
        mode:value("11bg", "802.11b+g")
        mode:value("11gst", "802.11g + Turbo")
        mode:value("11ast", "802.11a + Turbo")
-       mode:value("fh", translate("wifi_fh"))
+       mode:value("fh", translate("Frequency Hopping"))
 
-       s:taboption("advanced", Flag, "diversity", translate("wifi_diversity")).rmempty = false
+       s:taboption("advanced", Flag, "diversity", translate("Diversity")).rmempty = false
 
        if not nsantenna then
-               ant1 = s:taboption("advanced", ListValue, "txantenna", translate("wifi_txantenna"))
+               ant1 = s:taboption("advanced", ListValue, "txantenna", translate("Transmitter Antenna"))
                ant1.widget = "radio"
                ant1.orientation = "horizontal"
                ant1:depends("diversity", "")
-               ant1:value("0", translate("wifi_auto"))
-               ant1:value("1", translate("wifi_ant1", "Antenna 1"))
-               ant1:value("2", translate("wifi_ant2", "Antenna 2"))
+               ant1:value("0", translate("auto"))
+               ant1:value("1", translate("Antenna 1"))
+               ant1:value("2", translate("Antenna 2"))
 
-               ant2 = s:taboption("advanced", ListValue, "rxantenna", translate("wifi_rxantenna"))
+               ant2 = s:taboption("advanced", ListValue, "rxantenna", translate("Receiver Antenna"))
                ant2.widget = "radio"
                ant2.orientation = "horizontal"
                ant2:depends("diversity", "")
-               ant2:value("0", translate("wifi_auto"))
-               ant2:value("1", translate("wifi_ant1", "Antenna 1"))
-               ant2:value("2", translate("wifi_ant2", "Antenna 2"))
+               ant2:value("0", translate("auto"))
+               ant2:value("1", translate("Antenna 1"))
+               ant2:value("2", translate("Antenna 2"))
 
        else -- NanoFoo
-               local ant = s:taboption("advanced", ListValue, "antenna", translate("wifi_txantenna"))
+               local ant = s:taboption("advanced", ListValue, "antenna", translate("Transmitter Antenna"))
                ant:value("auto")
                ant:value("vertical")
                ant:value("horizontal")
                ant:value("external")
        end
 
-       s:taboption("advanced", Value, "distance", translate("wifi_distance"),
-               translate("wifi_distance_desc"))
-       s:taboption("advanced", Value, "regdomain", translate("wifi_regdomain"))
-       s:taboption("advanced", Value, "country", translate("wifi_country"))
-       s:taboption("advanced", Flag, "outdoor", translate("wifi_outdoor"))
+       s:taboption("advanced", Value, "distance", translate("Distance Optimization"),
+               translate("Distance to farthest network member in meters."))
+       s:taboption("advanced", Value, "regdomain", translate("Regulatory Domain"))
+       s:taboption("advanced", Value, "country", translate("Country Code"))
+       s:taboption("advanced", Flag, "outdoor", translate("Outdoor Channels"))
 
-       --s:option(Flag, "nosbeacon", translate("wifi_nosbeacon"))
+       --s:option(Flag, "nosbeacon", translate("Disable HW-Beacon timer"))
 end
 
 
@@ -164,54 +164,54 @@ end
 if hwtype == "broadcom" then
        tp = s:taboption("general",
                (#tx_powers > 0) and ListValue or Value,
-               "txpower", translate("a_w_txpwr"), "dBm")
+               "txpower", translate("Transmit Power"), "dBm")
 
        tp.rmempty = true
        for _, p in ipairs(iw.txpwrlist) do
                tp:value(p.dbm, "%i dBm (%i mW)" %{ p.dbm, p.mw })
        end     
 
-       mp = s:taboption("macfilter", ListValue, "macfilter", translate("wifi_macpolicy"))
+       mp = s:taboption("macfilter", ListValue, "macfilter", translate("MAC-Address Filter"))
        mp:value("", translate("disable"))
-       mp:value("allow", translate("wifi_whitelist"))
-       mp:value("deny", translate("wifi_blacklist"))
-       ml = s:taboption("macfilter", DynamicList, "maclist", translate("wifi_maclist"))
+       mp:value("allow", translate("Allow listed only"))
+       mp:value("deny", translate("Allow all except listed"))
+       ml = s:taboption("macfilter", DynamicList, "maclist", translate("MAC-List"))
        ml:depends({macfilter="allow"})
        ml:depends({macfilter="deny"})
 
-       ant1 = s:taboption("advanced", ListValue, "txantenna", translate("wifi_txantenna"))
+       ant1 = s:taboption("advanced", ListValue, "txantenna", translate("Transmitter Antenna"))
        ant1.widget = "radio"
        ant1:depends("diversity", "")
-       ant1:value("3", translate("wifi_auto"))
-       ant1:value("0", translate("wifi_ant1", "Antenna 1"))
-       ant1:value("1", translate("wifi_ant2", "Antenna 2"))
+       ant1:value("3", translate("auto"))
+       ant1:value("0", translate("Antenna 1"))
+       ant1:value("1", translate("Antenna 2"))
 
-       ant2 = s:taboption("advanced", ListValue, "rxantenna", translate("wifi_rxantenna"))
+       ant2 = s:taboption("advanced", ListValue, "rxantenna", translate("Receiver Antenna"))
        ant2.widget = "radio"
        ant2:depends("diversity", "")
-       ant2:value("3", translate("wifi_auto"))
-       ant2:value("0", translate("wifi_ant1", "Antenna 1"))
-       ant2:value("1", translate("wifi_ant2", "Antenna 2"))
+       ant2:value("3", translate("auto"))
+       ant2:value("0", translate("Antenna 1"))
+       ant2:value("1", translate("Antenna 2"))
 
-       s:taboption("advanced", Flag, "frameburst", translate("wifi_bursting"))
+       s:taboption("advanced", Flag, "frameburst", translate("Frame Bursting"))
 
-       s:taboption("advanced", Value, "distance", translate("wifi_distance"))
+       s:taboption("advanced", Value, "distance", translate("Distance Optimization"))
        --s:option(Value, "slottime", translate("wifi_slottime"))
 
-       s:taboption("advanced", Value, "country", translate("wifi_country"))
-       s:taboption("advanced", Value, "maxassoc", translate("wifi_maxassoc"))
+       s:taboption("advanced", Value, "country", translate("Country Code"))
+       s:taboption("advanced", Value, "maxassoc", translate("Connection Limit"))
 end
 
 
 --------------------- HostAP Device ---------------------
 
 if hwtype == "prism2" then
-       s:taboption("advanced", Value, "txpower", translate("a_w_txpwr"), "att units").rmempty = true
+       s:taboption("advanced", Value, "txpower", translate("Transmit Power"), "att units").rmempty = true
 
-       s:taboption("advanced", Flag, "diversity", translate("wifi_diversity")).rmempty = false
+       s:taboption("advanced", Flag, "diversity", translate("Diversity")).rmempty = false
 
-       s:taboption("advanced", Value, "txantenna", translate("wifi_txantenna"))
-       s:taboption("advanced", Value, "rxantenna", translate("wifi_rxantenna"))
+       s:taboption("advanced", Value, "txantenna", translate("Transmitter Antenna"))
+       s:taboption("advanced", Value, "rxantenna", translate("Receiver Antenna"))
 end
 
 
@@ -226,22 +226,22 @@ if wnet then
        s.anonymous = true
        s.defaults.device = arg[1]
 
-       s:tab("general", translate("a_w_general", "General Setup"))
-       s:tab("encryption", translate("a_w_security", "Wireless Security"))
-       s:tab("macfilter", translate("a_w_macfilter", "MAC-Filter"))
-       s:tab("advanced", translate("a_w_advanced", "Advanced Settings"))
+       s:tab("general", translate("General Setup"))
+       s:tab("encryption", translate("Wireless Security"))
+       s:tab("macfilter", translate("MAC-Filter"))
+       s:tab("advanced", translate("Advanced Settings"))
 
-       s:taboption("general", Value, "ssid", translate("wifi_essid"))
+       s:taboption("general", Value, "ssid", translate("<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"))
 
-       mode = s:taboption("general", ListValue, "mode", translate("mode"))
+       mode = s:taboption("general", ListValue, "mode", translate("Mode"))
        mode.override_values = true
-       mode:value("ap", translate("a_w_ap"))
-       mode:value("sta", translate("a_w_client"))
-       mode:value("adhoc", translate("a_w_adhoc"))
+       mode:value("ap", translate("Access Point"))
+       mode:value("sta", translate("Client"))
+       mode:value("adhoc", translate("Ad-Hoc"))
 
-       bssid = s:taboption("general", Value, "bssid", translate("wifi_bssid"))
+       bssid = s:taboption("general", Value, "bssid", translate("<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"))
 
-       network = s:taboption("general", Value, "network", translate("network"), translate("a_w_network1"))
+       network = s:taboption("general", Value, "network", translate("Network"), translate("Add the Wifi network to physical network"))
        network.rmempty = true
        network.template = "cbi/network_netlist"
        network.widget = "radio"
@@ -275,12 +275,12 @@ if wnet then
                        mode:value("mesh", "802.11s")
                end
 
-               mode:value("ahdemo", translate("a_w_ahdemo"))
-               mode:value("monitor", translate("a_w_monitor"))
+               mode:value("ahdemo", translate("Pseudo Ad-Hoc (ahdemo)"))
+               mode:value("monitor", translate("Monitor"))
                bssid:depends({mode="adhoc"})
 
-               s:taboption("advanced", Value, "frag", translate("wifi_frag"))
-               s:taboption("advanced", Value, "rts", translate("wifi_rts"))
+               s:taboption("advanced", Value, "frag", translate("Fragmentation Threshold"))
+               s:taboption("advanced", Value, "rts", translate("RTS/CTS Threshold"))
        end
 
 
@@ -288,10 +288,10 @@ if wnet then
        -------------------- Madwifi Interface ----------------------
 
        if hwtype == "atheros" then
-               mode:value("ahdemo", translate("a_w_ahdemo"))
-               mode:value("monitor", translate("a_w_monitor"))
-               mode:value("ap-wds", "%s (%s)" % {translate("a_w_ap"), translate("a_w_wds")})
-               mode:value("sta-wds", "%s (%s)" % {translate("a_w_client"), translate("a_w_wds")})
+               mode:value("ahdemo", translate("Pseudo Ad-Hoc (ahdemo)"))
+               mode:value("monitor", translate("Monitor"))
+               mode:value("ap-wds", "%s (%s)" % {translate("Access Point"), translate("WDS")})
+               mode:value("sta-wds", "%s (%s)" % {translate("Client"), translate("WDS")})
 
                function mode.write(self, section, value)
                        if value == "ap-wds" then
@@ -322,11 +322,11 @@ if wnet then
                bssid:depends({mode="adhoc"})
                bssid:depends({mode="ahdemo"})
 
-               wdssep = s:taboption("advanced", Flag, "wdssep", translate("wifi_wdssep"))
+               wdssep = s:taboption("advanced", Flag, "wdssep", translate("Separate WDS"))
                wdssep:depends({mode="ap-wds"})
 
                s:taboption("advanced", Flag, "doth", "802.11h")
-               hidden = s:taboption("general", Flag, "hidden", translate("wifi_hidden"))
+               hidden = s:taboption("general", Flag, "hidden", translate("Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"))
                hidden:depends({mode="ap"})
                hidden:depends({mode="adhoc"})
                hidden:depends({mode="ap-wds"})
@@ -334,40 +334,40 @@ if wnet then
                isolate = s:taboption("advanced", Flag, "isolate", translate("wifi_isolate"),
                 translate("wifi_isolate_desc"))
                isolate:depends({mode="ap"})
-               s:taboption("advanced", Flag, "bgscan", translate("wifi_bgscan"))
+               s:taboption("advanced", Flag, "bgscan", translate("Background Scan"))
 
-               mp = s:taboption("macfilter", ListValue, "macpolicy", translate("wifi_macpolicy"))
+               mp = s:taboption("macfilter", ListValue, "macpolicy", translate("MAC-Address Filter"))
                mp:value("", translate("disable"))
-               mp:value("deny", translate("wifi_whitelist"))
-               mp:value("allow", translate("wifi_blacklist"))
-               ml = s:taboption("macfilter", DynamicList, "maclist", translate("wifi_maclist"))
+               mp:value("deny", translate("Allow listed only"))
+               mp:value("allow", translate("Allow all except listed"))
+               ml = s:taboption("macfilter", DynamicList, "maclist", translate("MAC-List"))
                ml:depends({macpolicy="allow"})
                ml:depends({macpolicy="deny"})
 
-               s:taboption("advanced", Value, "rate", translate("wifi_rate"))
-               s:taboption("advanced", Value, "mcast_rate", translate("wifi_mcast_rate"))
-               s:taboption("advanced", Value, "frag", translate("wifi_frag"))
-               s:taboption("advanced", Value, "rts", translate("wifi_rts"))
-               s:taboption("advanced", Value, "minrate", translate("wifi_minrate"))
-               s:taboption("advanced", Value, "maxrate", translate("wifi_maxrate"))
-               s:taboption("advanced", Flag, "compression", translate("wifi_compression"))
+               s:taboption("advanced", Value, "rate", translate("Transmission Rate"))
+               s:taboption("advanced", Value, "mcast_rate", translate("Multicast Rate"))
+               s:taboption("advanced", Value, "frag", translate("Fragmentation Threshold"))
+               s:taboption("advanced", Value, "rts", translate("RTS/CTS Threshold"))
+               s:taboption("advanced", Value, "minrate", translate("Minimum Rate"))
+               s:taboption("advanced", Value, "maxrate", translate("Maximum Rate"))
+               s:taboption("advanced", Flag, "compression", translate("Compression"))
 
-               s:taboption("advanced", Flag, "bursting", translate("wifi_bursting"))
-               s:taboption("advanced", Flag, "turbo", translate("wifi_turbo"))
-               s:taboption("advanced", Flag, "ff", translate("wifi_ff"))
+               s:taboption("advanced", Flag, "bursting", translate("Frame Bursting"))
+               s:taboption("advanced", Flag, "turbo", translate("Turbo Mode"))
+               s:taboption("advanced", Flag, "ff", translate("Fast Frames"))
 
-               s:taboption("advanced", Flag, "wmm", translate("wifi_wmm"))
-               s:taboption("advanced", Flag, "xr", translate("wifi_xr"))
-               s:taboption("advanced", Flag, "ar", translate("wifi_ar"))
+               s:taboption("advanced", Flag, "wmm", translate("WMM Mode"))
+               s:taboption("advanced", Flag, "xr", translate("XR Support"))
+               s:taboption("advanced", Flag, "ar", translate("AR Support"))
 
-               local swm = s:taboption("advanced", Flag, "sw_merge", translate("wifi_nosbeacon"))
+               local swm = s:taboption("advanced", Flag, "sw_merge", translate("Disable HW-Beacon timer"))
                swm:depends({mode="adhoc"})
 
-               local nos = s:taboption("advanced", Flag, "nosbeacon", translate("wifi_nosbeacon"))
+               local nos = s:taboption("advanced", Flag, "nosbeacon", translate("Disable HW-Beacon timer"))
                nos:depends({mode="sta"})
                nos:depends({mode="sta-wds"})
 
-               local probereq = s:taboption("advanced", Flag, "probereq", translate("wifi_noprobereq"))
+               local probereq = s:taboption("advanced", Flag, "probereq", translate("Do not send probe responses"))
                probereq.enabled  = "0"
                probereq.disabled = "1"
        end
@@ -376,10 +376,10 @@ if wnet then
        -------------------- Broadcom Interface ----------------------
 
        if hwtype == "broadcom" then
-               mode:value("wds", translate("a_w_wds"))
-               mode:value("monitor", translate("a_w_monitor"))
+               mode:value("wds", translate("WDS"))
+               mode:value("monitor", translate("Monitor"))
 
-               hidden = s:taboption("general", Flag, "hidden", translate("wifi_hidden"))
+               hidden = s:taboption("general", Flag, "hidden", translate("Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"))
                hidden:depends({mode="ap"})
                hidden:depends({mode="adhoc"})
                hidden:depends({mode="wds"})
@@ -389,7 +389,7 @@ if wnet then
                isolate:depends({mode="ap"})
 
                s:taboption("advanced", Flag, "doth", "802.11h")
-               s:taboption("advanced", Flag, "wmm", translate("wifi_wmm"))
+               s:taboption("advanced", Flag, "wmm", translate("WMM Mode"))
 
                bssid:depends({mode="wds"})
                bssid:depends({mode="adhoc"})
@@ -399,33 +399,33 @@ if wnet then
        ----------------------- HostAP Interface ---------------------
 
        if hwtype == "prism2" then
-               mode:value("wds", translate("a_w_wds"))
-               mode:value("monitor", translate("a_w_monitor"))
+               mode:value("wds", translate("WDS"))
+               mode:value("monitor", translate("Monitor"))
 
-               hidden = s:taboption("general", Flag, "hidden", translate("wifi_hidden"))
+               hidden = s:taboption("general", Flag, "hidden", translate("Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"))
                hidden:depends({mode="ap"})
                hidden:depends({mode="adhoc"})
                hidden:depends({mode="wds"})
 
                bssid:depends({mode="sta"})
 
-               mp = s:taboption("macfilter", ListValue, "macpolicy", translate("wifi_macpolicy"))
+               mp = s:taboption("macfilter", ListValue, "macpolicy", translate("MAC-Address Filter"))
                mp:value("", translate("disable"))
-               mp:value("deny", translate("wifi_whitelist"))
-               mp:value("allow", translate("wifi_blacklist"))
-               ml = s:taboption("macfilter", DynamicList, "maclist", translate("wifi_maclist"))
+               mp:value("deny", translate("Allow listed only"))
+               mp:value("allow", translate("Allow all except listed"))
+               ml = s:taboption("macfilter", DynamicList, "maclist", translate("MAC-List"))
                ml:depends({macpolicy="allow"})
                ml:depends({macpolicy="deny"})
 
-               s:taboption("advanced", Value, "rate", translate("wifi_rate"))
-               s:taboption("advanced", Value, "frag", translate("wifi_frag"))
-               s:taboption("advanced", Value, "rts", translate("wifi_rts"))
+               s:taboption("advanced", Value, "rate", translate("Transmission Rate"))
+               s:taboption("advanced", Value, "frag", translate("Fragmentation Threshold"))
+               s:taboption("advanced", Value, "rts", translate("RTS/CTS Threshold"))
        end
 
 
        ------------------- WiFI-Encryption -------------------
 
-       encr = s:taboption("encryption", ListValue, "encryption", translate("encryption"))
+       encr = s:taboption("encryption", ListValue, "encryption", translate("Encryption"))
        encr.override_values = true
        encr:depends({mode="ap"})
        encr:depends({mode="sta"})
@@ -477,17 +477,17 @@ if wnet then
        encr:depends("mode", "sta-wds")
        encr:depends("mode", "wds")
 
-       server = s:taboption("encryption", Value, "server", translate("a_w_radiussrv"))
+       server = s:taboption("encryption", Value, "server", translate("RadiusServer"))
        server:depends({mode="ap", encryption="wpa"})
        server:depends({mode="ap", encryption="wpa2"})
        server.rmempty = true
 
-       port = s:taboption("encryption", Value, "port", translate("a_w_radiusport"))
+       port = s:taboption("encryption", Value, "port", translate("Radius-Port"))
        port:depends({mode="ap", encryption="wpa"})
        port:depends({mode="ap", encryption="wpa2"})
        port.rmempty = true
 
-       key = s:taboption("encryption", Value, "key", translate("key"))
+       key = s:taboption("encryption", Value, "key", translate("Key"))
        key:depends("encryption", "wep")
        key:depends("encryption", "psk")
        key:depends("encryption", "psk2")
@@ -499,32 +499,32 @@ if wnet then
        key.password = true
 
        if hwtype == "atheros" or hwtype == "mac80211" or hwtype == "prism2" then
-               nasid = s:taboption("encryption", Value, "nasid", translate("a_w_nasid"))
+               nasid = s:taboption("encryption", Value, "nasid", translate("NAS ID"))
                nasid:depends({mode="ap", encryption="wpa"})
                nasid:depends({mode="ap", encryption="wpa2"})
                nasid.rmempty = true
 
-               eaptype = s:taboption("encryption", ListValue, "eap_type", translate("a_w_eaptype"))
+               eaptype = s:taboption("encryption", 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:taboption("encryption", FileUpload, "ca_cert", translate("a_w_cacert"))
+               cacert = s:taboption("encryption", FileUpload, "ca_cert", translate("Path to CA-Certificate"))
                cacert:depends({mode="sta", encryption="wpa"})
                cacert:depends({mode="sta", encryption="wpa2"})
 
-               privkey = s:taboption("encryption", FileUpload, "priv_key", translate("a_w_tlsprivkey"))
+               privkey = s:taboption("encryption", 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:taboption("encryption", Value, "priv_key_pwd", translate("a_w_tlsprivkeypwd"))
+               privkeypwd = s:taboption("encryption", 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:taboption("encryption", Value, "auth", translate("a_w_peapauth"))
+               auth = s:taboption("encryption", Value, "auth", translate("Authentication"))
                auth:value("PAP")
                auth:value("CHAP")
                auth:value("MSCHAP")
@@ -535,13 +535,13 @@ if wnet then
                auth:depends({mode="sta", eap_type="TTLS", encryption="wpa"})
 
 
-               identity = s:taboption("encryption", Value, "identity", translate("a_w_peapidentity"))
+               identity = s:taboption("encryption", 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:taboption("encryption", Value, "password", translate("a_w_peappassword"))
+               password = s:taboption("encryption", 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"})