all: change most translate statements to new format, some need manual cleanup

23 files changed, 306 insertions, 309 deletions

diff --git a/modules/admin-full/luasrc/model/cbi/admin_index/luci.lua b/modules/admin-full/luasrc/model/cbi/admin_index/luci.lua
index dc9eb1e9e9..75c42c0901 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_index/luci.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_index/luci.lua
@@ -12,8 +12,7 @@ You may obtain a copy of the License at
 $Id$
 ]]--
 require("luci.config")
-m = Map("luci", translate("webui"), translate("a_i_luci1",
- "Hier können Eigenschaften und die Funktionalität der Oberfläche angepasst werden."))
+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>."))
 
 local fs = require "nixio.fs"
 
@@ -24,9 +23,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."
@@ -37,19 +36,19 @@ 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)
 	end
 end
 
-u = m:section(NamedSection, "uci_oncommit", "event", translate("a_i_ucicommit"),
- translate("a_i_ucicommit1"))
+u = m:section(NamedSection, "uci_oncommit", "event", translate("Post-commit actions"),
+ translate("These commands will be executed automatically when a given <abbr title=\"Unified Configuration Interface\">UCI</abbr> configuration is committed allowing changes to be applied instantly."))
 u.dynamic = true
 
-f = m:section(NamedSection, "flash_keep", "extern", translate("a_i_keepflash"),
- translate("a_i_keepflash1"))
+f = m:section(NamedSection, "flash_keep", "extern", translate("Files to be kept when flashing a new firmware"),
+ translate("When flashing a new firmware with <abbr title=\"Lua Configuration Interface\">LuCI</abbr> these files will be added to the new firmware installation."))
 f.dynamic = true
 
 return m
diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua b/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua
index 872e6444d1..6f4aeb13ee 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua
@@ -21,7 +21,7 @@ s = m:section(TypedSection, "dhcp", "")
 s.addremove = true
 s.anonymous = true
 
-iface = s:option(ListValue, "interface", translate("interface"))
+iface = s:option(ListValue, "interface", translate("Interface"))
 luci.tools.webadmin.cbi_add_networks(iface)
 
 local uci = luci.model.uci.cursor()
@@ -39,9 +39,9 @@ uci:foreach("network", "alias",
 		s:depends("interface", section[".name"])
 	end)
 
-s:option(Value, "start", translate("start")).rmempty = true
+s:option(Value, "start", translate("Start")).rmempty = true
 
-s:option(Value, "limit", translate("limit")).rmempty = true
+s:option(Value, "limit", translate("Limit")).rmempty = true
 
 s:option(Value, "leasetime").rmempty = true
 
@@ -51,12 +51,12 @@ function dd.cfgvalue(self, section)
 	return Flag.cfgvalue(self, section) or "1"
 end
 
-s:option(Value, "name", translate("name")).optional = true
+s:option(Value, "name", translate("Name")).optional = true
 
 ignore = s:option(Flag, "ignore")
 ignore.optional = true
 
-s:option(Value, "netmask", translate("netmask")).optional = true
+s:option(Value, "netmask", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask")).optional = true
 
 s:option(Flag, "force").optional = true
 
diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/dhcpleases.lua b/modules/admin-full/luasrc/model/cbi/admin_network/dhcpleases.lua
index 31a27b3f66..2e0ebf892f 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/dhcpleases.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/dhcpleases.lua
@@ -17,7 +17,7 @@ local sys = require "luci.sys"
 local wa  = require "luci.tools.webadmin"
 local fs  = require "nixio.fs"
 
-m2 = Map("luci_ethers", translate("dhcp_leases"))
+m2 = Map("luci_ethers", translate("Leases"))
 
 local leasefn, leasefp, leases
 uci:foreach("dhcp", "dnsmasq",
@@ -34,25 +34,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-full/luasrc/model/cbi/admin_network/hosts.lua b/modules/admin-full/luasrc/model/cbi/admin_network/hosts.lua
index dbf4aff90b..58c10db41e 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/hosts.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/hosts.lua
@@ -14,15 +14,15 @@ $Id$
 
 require("luci.sys")
 require("luci.util")
-m = Map("luci_hosts", translate("hostnames"))
+m = Map("luci_hosts", translate("Hostnames"))
 
-s = m:section(TypedSection, "host", translate("hostnames_entries"))
+s = m:section(TypedSection, "host", translate("Host entries"))
 s.addremove = true
 s.anonymous = true
 s.template = "cbi/tblsection"
 
-hn = s:option(Value, "hostname", translate("hostnames_hostname"))
-ip = s:option(Value, "ipaddr", translate("hostnames_address"))
+hn = s:option(Value, "hostname", translate("Hostname"))
+ip = s:option(Value, "ipaddr", translate("IP address"))
 for i, dataset in ipairs(luci.sys.net.arptable()) do
 	ip:value(
 		dataset["IP address"],
diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/iface_add.lua b/modules/admin-full/luasrc/model/cbi/admin_network/iface_add.lua
index 93cdecac78..3dc0ac4543 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/iface_add.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/iface_add.lua
@@ -16,9 +16,8 @@ local nw  = require "luci.model.network"
 local fw  = require "luci.model.firewall"
 local uci = require "luci.model.uci".cursor()
 
-m = SimpleForm("network", translate("a_n_create", "Create Or Attach Network"),
-	translate("a_n_c_desc",
-		"If the interface is attached to an existing network it will be <em>bridged</em> " ..
+m = SimpleForm("network", translate("Create Or Attach Network"),
+	translate("If the interface is attached to an existing network it will be <em>bridged</em> " ..
 		"to the existing interfaces and is covered by the firewall zone of the choosen network.<br />" ..
 		"Uncheck the attach option to define a new standalone network for this interface."
 	))
@@ -26,13 +25,12 @@ m = SimpleForm("network", translate("a_n_create", "Create Or Attach Network"),
 nw.init(uci)
 fw.init(uci)
 
-attachnet = m:field(Flag, "_attach", translate("a_n_c_attach", "Attach to existing network"))
+attachnet = m:field(Flag, "_attach", translate("Attach to existing network"))
 attachnet.rmempty = false
 attachnet.default = "1"
 
-newnet = m:field(Value, "_netname_new", translate("a_n_c_netname", "Name of the new network"),
-	translate("a_n_c_netname_desc",
-		"The allowed characters are: <code>A-Z</code>, <code>a-z</code>, " ..
+newnet = m:field(Value, "_netname_new", translate("Name of the new network"),
+	translate("The allowed characters are: <code>A-Z</code>, <code>a-z</code>, " ..
 		"<code>0-9</code> and <code>_</code>"
 	))
 
@@ -40,7 +38,7 @@ newnet:depends("_attach", "")
 newnet.default = "net_" .. arg[1]:gsub("[^%w_]+", "_")
 
 addnet = m:field(Value, "_netname_attach",
-	translate("a_n_c_network", "Network to attach interface to"))
+	translate("Network to attach interface to"))
 
 addnet.template = "cbi/network_netlist"
 addnet.widget = "radio"
@@ -48,8 +46,8 @@ addnet.nocreate = true
 addnet:depends("_attach", "1")
 
 fwzone = m:field(Value, "_fwzone",
-	translate("network_interface_fwzone"),
-	translate("network_interface_fwzone_desc"))
+	translate("Create / Assign firewall-zone"),
+	translate("Choose the firewall zone you want to assign to this interface. Select <em>unspecified</em> to remove the interface from the associated zone or fill out the <em>create</em> field to define a new zone and attach the interface to it."))
 
 fwzone.template = "cbi/firewall_zonelist"
 addnet.widget = "radio"
diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua b/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
index e8ace36a9b..1985823c74 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
@@ -26,7 +26,7 @@ local has_pppoe = fs.glob("/usr/lib/pppd/*/rp-pppoe.so")()
 local has_pppoa = fs.glob("/usr/lib/pppd/*/pppoatm.so")()
 local has_ipv6  = fs.access("/proc/net/ipv6_route")
 
-m = Map("network", translate("interfaces"), translate("a_n_ifaces1"))
+m = Map("network", translate("Interfaces"), translate("On this page you can configure the network interfaces. You can bridge several interfaces by ticking the \"bridge interfaces\" field and enter the names of several network interfaces separated by spaces. You can also use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation <samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: <samp>eth0.1</samp>)."))
 m:chain("firewall")
 m:chain("wireless")
 
@@ -36,19 +36,19 @@ fw.init(m.uci)
 s = m:section(NamedSection, arg[1], "interface")
 s.addremove = false
 
-s:tab("general", translate("a_n_general", "General Setup"))
-if has_ipv6 then s:tab("ipv6", translate("a_n_ipv6", "IPv6 Setup")) end
-if has_pppd then s:tab("ppp", translate("a_n_ppp", "PPP Settings")) end
-s:tab("physical", translate("a_n_physical", "Physical Settings"))
-s:tab("firewall", translate("a_n_firewall", "Firewall Settings"))
+s:tab("general", translate("General Setup"))
+if has_ipv6 then s:tab("ipv6", translate("IPv6 Setup")) end
+if has_pppd then s:tab("ppp", translate("PPP Settings")) end
+s:tab("physical", translate("Physical Settings"))
+s:tab("firewall", translate("Firewall Settings"))
 
 --[[
-back = s:taboption("general", DummyValue, "_overview", translate("overview"))
+back = s:taboption("general", DummyValue, "_overview", translate("Overview"))
 back.value = ""
 back.titleref = luci.dispatcher.build_url("admin", "network", "network")
 ]]
 
-p = s:taboption("general", ListValue, "proto", translate("protocol"))
+p = s:taboption("general", ListValue, "proto", translate("Protocol"))
 p.override_scheme = true
 p.default = "static"
 p:value("static", translate("static"))
@@ -61,19 +61,19 @@ if has_pptp  then p:value("pptp",  "PPTP")    end
 p:value("none", translate("none"))
 
 if not ( has_pppd and has_pppoe and has_pppoa and has_3g and has_pptp ) then
-	p.description = translate("network_interface_prereq")
+	p.description = translate("You need to install \"comgt\" for UMTS/GPRS, \"ppp-mod-pppoe\" for PPPoE, \"ppp-mod-pppoa\" for PPPoA or \"pptp\" for PPtP support")
 end
 
-br = s:taboption("physical", Flag, "type", translate("a_n_i_bridge"), translate("a_n_i_bridge1"))
+br = s:taboption("physical", Flag, "type", translate("Bridge interfaces"), translate("creates a bridge over specified interface(s)"))
 br.enabled = "bridge"
 br.rmempty = true
 
-stp = s:taboption("physical", Flag, "stp", translate("a_n_i_stp"),
-	translate("a_n_i_stp1", "Enables the Spanning Tree Protocol on this bridge"))
+stp = s:taboption("physical", Flag, "stp", translate("Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"),
+	translate("Enables the Spanning Tree Protocol on this bridge"))
 stp:depends("type", "1")
 stp.rmempty = true
 
-ifname_single = s:taboption("physical", Value, "ifname_single", translate("interface"))
+ifname_single = s:taboption("physical", Value, "ifname_single", translate("Interface"))
 ifname_single.template = "cbi/network_ifacelist"
 ifname_single.widget = "radio"
 ifname_single.nobridges = true
@@ -97,7 +97,7 @@ function ifname_single.write(self, s, val)
 end
 
 
-ifname_multi = s:taboption("physical", MultiValue, "ifname_multi", translate("interface"))
+ifname_multi = s:taboption("physical", MultiValue, "ifname_multi", translate("Interface"))
 ifname_multi.template = "cbi/network_ifacelist"
 ifname_multi.nobridges = true
 ifname_multi.network = arg[1]
@@ -118,8 +118,8 @@ end
 local fwd_to, fwd_from
 
 fwzone = s:taboption("firewall", Value, "_fwzone",
-	translate("network_interface_fwzone"),
-	translate("network_interface_fwzone_desc"))
+	translate("Create / Assign firewall-zone"),
+	translate("Choose the firewall zone you want to assign to this interface. Select <em>unspecified</em> to remove the interface from the associated zone or fill out the <em>create</em> field to define a new zone and attach the interface to it."))
 
 fwzone.template = "cbi/firewall_zonelist"
 fwzone.network = arg[1]
@@ -150,66 +150,66 @@ function fwzone.write(self, section, value)
 end
 
 
-ipaddr = s:taboption("general", Value, "ipaddr", translate("ipaddress"))
+ipaddr = s:taboption("general", Value, "ipaddr", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"))
 ipaddr.rmempty = true
 ipaddr:depends("proto", "static")
 
-nm = s:taboption("general", Value, "netmask", translate("netmask"))
+nm = s:taboption("general", Value, "netmask", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"))
 nm.rmempty = true
 nm:depends("proto", "static")
 nm:value("255.255.255.0")
 nm:value("255.255.0.0")
 nm:value("255.0.0.0")
 
-gw = s:taboption("general", Value, "gateway", translate("gateway"))
+gw = s:taboption("general", Value, "gateway", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"))
 gw:depends("proto", "static")
 gw.rmempty = true
 
-bcast = s:taboption("general", Value, "bcast", translate("broadcast"))
+bcast = s:taboption("general", Value, "bcast", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"))
 bcast:depends("proto", "static")
 
 if has_ipv6 then
-	ip6addr = s:taboption("ipv6", Value, "ip6addr", translate("ip6address"), translate("cidr6"))
+	ip6addr = s:taboption("ipv6", Value, "ip6addr", translate("<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address"), translate("<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/prefix"))
 	ip6addr:depends("proto", "static")
 
-	ip6gw = s:taboption("ipv6", Value, "ip6gw", translate("gateway6"))
+	ip6gw = s:taboption("ipv6", Value, "ip6gw", translate("<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"))
 	ip6gw:depends("proto", "static")
 end
 
-dns = s:taboption("general", Value, "dns", translate("dnsserver"))
+dns = s:taboption("general", Value, "dns", translate("<abbr title=\"Domain Name System\">DNS</abbr>-Server"))
 dns:depends("peerdns", "")
 
 mtu = s:taboption("physical", Value, "mtu", "MTU")
 mtu.isinteger = true
 
-mac = s:taboption("physical", Value, "macaddr", translate("macaddress"))
+mac = s:taboption("physical", Value, "macaddr", translate("<abbr title=\"Media Access Control\">MAC</abbr>-Address"))
 
 
-srv = s:taboption("general", Value, "server", translate("network_interface_server"))
+srv = s:taboption("general", Value, "server", translate("<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"))
 srv:depends("proto", "pptp")
 srv.rmempty = true
 
 if has_3g then
-	service = s:taboption("general", ListValue, "service", translate("network_interface_service"))
-	service:value("", translate("cbi_select"))
+	service = s:taboption("general", ListValue, "service", translate("Service type"))
+	service:value("", translate("-- Please choose --"))
 	service:value("umts", "UMTS/GPRS")
 	service:value("cdma", "CDMA")
 	service:value("evdo", "EV-DO")
 	service:depends("proto", "3g")
 	service.rmempty = true
 
-	apn = s:taboption("general", Value, "apn", translate("network_interface_apn"))
+	apn = s:taboption("general", Value, "apn", translate("Access point (APN)"))
 	apn:depends("proto", "3g")
 
 	pincode = s:taboption("general", Value, "pincode",
-	 translate("network_interface_pincode"),
-	 translate("network_interface_pincode_desc")
+	 translate("PIN code"),
+	 translate("Make sure that you provide the correct pin code here or you might lock your sim card!")
 	)
 	pincode:depends("proto", "3g")
 end
 
 if has_pppd or has_pppoe or has_pppoa or has_3g or has_pptp then
-	user = s:taboption("general", Value, "username", translate("username"))
+	user = s:taboption("general", Value, "username", translate("Username"))
 	user.rmempty = true
 	user:depends("proto", "pptp")
 	user:depends("proto", "pppoe")
@@ -217,7 +217,7 @@ if has_pppd or has_pppoe or has_pppoa or has_3g or has_pptp then
 	user:depends("proto", "ppp")
 	user:depends("proto", "3g")
 
-	pass = s:taboption("general", Value, "password", translate("password"))
+	pass = s:taboption("general", Value, "password", translate("Password"))
 	pass.rmempty = true
 	pass.password = true
 	pass:depends("proto", "pptp")
@@ -227,8 +227,8 @@ if has_pppd or has_pppoe or has_pppoa or has_3g or has_pptp then
 	pass:depends("proto", "3g")
 
 	ka = s:taboption("ppp", Value, "keepalive",
-	 translate("network_interface_keepalive"),
-	 translate("network_interface_keepalive_desc")
+	 translate("Keep-Alive"),
+	 translate("Number of failed connection tests to initiate automatic reconnect")
 	)
 	ka:depends("proto", "pptp")
 	ka:depends("proto", "pppoe")
@@ -237,8 +237,8 @@ if has_pppd or has_pppoe or has_pppoa or has_3g or has_pptp then
 	ka:depends("proto", "3g")
 
 	demand = s:taboption("ppp", Value, "demand",
-	 translate("network_interface_demand"),
-	 translate("network_interface_demand_desc")
+	 translate("Automatic Disconnect"),
+	 translate("Time (in seconds) after which an unused connection will be closed")
 	)
 	demand:depends("proto", "pptp")
 	demand:depends("proto", "pppoe")
@@ -248,9 +248,9 @@ if has_pppd or has_pppoe or has_pppoa or has_3g or has_pptp then
 end
 
 if has_pppoa then
-	encaps = s:taboption("ppp", ListValue, "encaps", translate("network_interface_encaps"))
+	encaps = s:taboption("ppp", ListValue, "encaps", translate("PPPoA Encapsulation"))
 	encaps:depends("proto", "pppoa")
-	encaps:value("", translate("cbi_select"))
+	encaps:value("", translate("-- Please choose --"))
 	encaps:value("vc", "VC")
 	encaps:value("llc", "LLC")
 
@@ -263,15 +263,15 @@ end
 
 if has_pptp or has_pppd or has_pppoe or has_pppoa or has_3g then
 	device = s:taboption("general", Value, "device",
-	 translate("network_interface_device"),
-	 translate("network_interface_device_desc")
+	 translate("Modem device"),
+	 translate("The device node of your modem, e.g. /dev/ttyUSB0")
 	)
 	device:depends("proto", "ppp")
 	device:depends("proto", "3g")
 
 	defaultroute = s:taboption("ppp", Flag, "defaultroute",
-	 translate("network_interface_defaultroute"),
-	 translate("network_interface_defaultroute_desc")
+	 translate("Replace default route"),
+	 translate("Let pppd replace the current default route to use the PPP interface after successful connect")
 	)
 	defaultroute:depends("proto", "ppp")
 	defaultroute:depends("proto", "pppoa")
@@ -284,8 +284,8 @@ if has_pptp or has_pppd or has_pppoe or has_pppoa or has_3g then
 	end
 
 	peerdns = s:taboption("ppp", Flag, "peerdns",
-	 translate("network_interface_peerdns"),
-	 translate("network_interface_peerdns_desc")
+	 translate("Use peer DNS"),
+	 translate("Configure the local DNS server to use the name servers adverticed by the PPP peer")
 	)
 	peerdns:depends("proto", "ppp")
 	peerdns:depends("proto", "pppoa")
@@ -298,7 +298,7 @@ if has_pptp or has_pppd or has_pppoe or has_pppoa or has_3g then
 	end
 
 	if has_ipv6 then
-		ipv6 = s:taboption("ppp", Flag, "ipv6", translate("network_interface_ipv6") )
+		ipv6 = s:taboption("ppp", Flag, "ipv6", translate("Enable IPv6 on PPP link") )
 		ipv6:depends("proto", "ppp")
 		ipv6:depends("proto", "pppoa")
 		ipv6:depends("proto", "pppoe")
@@ -307,8 +307,8 @@ if has_pptp or has_pppd or has_pppoe or has_pppoa or has_3g then
 	end
 
 	connect = s:taboption("ppp", Value, "connect",
-	 translate("network_interface_connect"),
-	 translate("network_interface_connect_desc")
+	 translate("Connect script"),
+	 translate("Let pppd run this script after establishing the PPP link")
 	)
 	connect:depends("proto", "ppp")
 	connect:depends("proto", "pppoe")
@@ -317,8 +317,8 @@ if has_pptp or has_pppd or has_pppoe or has_pppoa or has_3g then
 	connect:depends("proto", "3g")
 
 	disconnect = s:taboption("ppp", Value, "disconnect",
-	 translate("network_interface_disconnect"),
-	 translate("network_interface_disconnect_desc")
+	 translate("Disconnect script"),
+	 translate("Let pppd run this script before tearing down the PPP link")
 	)
 	disconnect:depends("proto", "ppp")
 	disconnect:depends("proto", "pppoe")
@@ -327,8 +327,8 @@ if has_pptp or has_pppd or has_pppoe or has_pppoa or has_3g then
 	disconnect:depends("proto", "3g")
 
 	pppd_options = s:taboption("ppp", Value, "pppd_options",
-	 translate("network_interface_pppd_options"),
-	 translate("network_interface_pppd_options_desc")
+	 translate("Additional pppd options"),
+	 translate("Specify additional command line arguments for pppd here")
 	)
 	pppd_options:depends("proto", "ppp")
 	pppd_options:depends("proto", "pppoa")
@@ -337,38 +337,38 @@ if has_pptp or has_pppd or has_pppoe or has_pppoa or has_3g then
 	pppd_options:depends("proto", "3g")
 
 	maxwait = s:taboption("ppp", Value, "maxwait",
-	 translate("network_interface_maxwait"),
-	 translate("network_interface_maxwait_desc")
+	 translate("Setup wait time"),
+	 translate("Seconds to wait for the modem to become ready before attempting to connect")
 	)
 	maxwait:depends("proto", "3g")
 end
 
-s2 = m:section(TypedSection, "alias", translate("aliases"))
+s2 = m:section(TypedSection, "alias", translate("Aliases"))
 s2.addremove = true
 
 s2:depends("interface", arg[1])
 s2.defaults.interface = arg[1]
 
-s2:tab("general", translate("a_n_general", "General Setup"))
+s2:tab("general", translate("General Setup"))
 
 s2.defaults.proto = "static"
 
-s2:taboption("general", Value, "ipaddr", translate("ipaddress")).rmempty = true
+s2:taboption("general", Value, "ipaddr", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address")).rmempty = true
 
-nm = s2:taboption("general", Value, "netmask", translate("netmask"))
+nm = s2:taboption("general", Value, "netmask", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"))
 nm.rmempty = true
 nm:value("255.255.255.0")
 nm:value("255.255.0.0")
 nm:value("255.0.0.0")
 
-s2:taboption("general", Value, "gateway", translate("gateway")).rmempty = true
-s2:taboption("general", Value, "bcast", translate("broadcast"))
-s2:taboption("general", Value, "dns", translate("dnsserver"))
+s2:taboption("general", Value, "gateway", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway")).rmempty = true
+s2:taboption("general", Value, "bcast", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"))
+s2:taboption("general", Value, "dns", translate("<abbr title=\"Domain Name System\">DNS</abbr>-Server"))
 
 if has_ipv6 then
-	s2:tab("ipv6", translate("a_n_ipv6", "IPv6 Setup"))
-	s2:taboption("ipv6", Value, "ip6addr", translate("ip6address"), translate("cidr6"))
-	s2:taboption("ipv6", Value, "ip6gw", translate("gateway6"))
+	s2:tab("ipv6", translate("IPv6 Setup"))
+	s2:taboption("ipv6", Value, "ip6addr", translate("<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address"), translate("<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/prefix"))
+	s2:taboption("ipv6", Value, "ip6gw", translate("<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"))
 end
 
 return m
diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/network.lua b/modules/admin-full/luasrc/model/cbi/admin_network/network.lua
index 8fd5368884..c117e93f74 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/network.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/network.lua
@@ -18,7 +18,7 @@ local wa  = require "luci.tools.webadmin"
 local fs  = require "nixio.fs"
 
 local netstate = luci.model.uci.cursor_state():get_all("network")
-m = Map("network", translate("interfaces"))
+m = Map("network", translate("Interfaces"))
 
 local created
 local netstat = sys.net.deviceinfo()
@@ -65,7 +65,7 @@ function up.write(self, section, value)
 	os.execute(call .. " " .. section .. " >/dev/null 2>&1")
 end
 
-ifname = s:option(DummyValue, "ifname", translate("device"))
+ifname = s:option(DummyValue, "ifname", translate("Device"))
 function ifname.cfgvalue(self, section)
 	return netstate[section] and netstate[section].ifname
 end
@@ -91,7 +91,7 @@ function hwaddr.cfgvalue(self, section)
 end
 
 
-ipaddr = s:option(DummyValue, "ipaddr", translate("addresses"))
+ipaddr = s:option(DummyValue, "ipaddr", translate("Addresses"))
 function ipaddr.cfgvalue(self, section)
 	return table.concat(wa.network_get_addresses(section), ", ")
 end
diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/routes.lua b/modules/admin-full/luasrc/model/cbi/admin_network/routes.lua
index 7962d4da1c..0f3c1cb913 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/routes.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/routes.lua
@@ -13,36 +13,36 @@ $Id$
 ]]--
 
 require("luci.tools.webadmin")
-m = Map("network", translate("a_n_routes"), translate("a_n_routes1"))
+m = Map("network", translate("Routes"), translate("a_n_routes1"))
 
 local routes6 = luci.sys.net.routes6()
 local bit = require "bit"
 
-s = m:section(TypedSection, "route", translate("a_n_routes_static4"))
+s = m:section(TypedSection, "route", translate("Static IPv4 Routes"))
 s.addremove = true
 s.anonymous = true
 
 s.template  = "cbi/tblsection"
 
-iface = s:option(ListValue, "interface", translate("interface"))
+iface = s:option(ListValue, "interface", translate("Interface"))
 luci.tools.webadmin.cbi_add_networks(iface)
 
-s:option(Value, "target", translate("target"), translate("a_n_r_target1"))
-s:option(Value, "netmask", translate("netmask"), translate("a_n_r_netmask1")).rmemepty = true
-s:option(Value, "gateway", translate("gateway"))
+s:option(Value, "target", translate("Target"), translate("Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"))
+s:option(Value, "netmask", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"), translate("if target is a network")).rmemepty = true
+s:option(Value, "gateway", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"))
 
 if routes6 then
-	s = m:section(TypedSection, "route6", translate("a_n_routes_static6"))
+	s = m:section(TypedSection, "route6", translate("Static IPv6 Routes"))
 	s.addremove = true
 	s.anonymous = true
 
 	s.template  = "cbi/tblsection"
 
-	iface = s:option(ListValue, "interface", translate("interface"))
+	iface = s:option(ListValue, "interface", translate("Interface"))
 	luci.tools.webadmin.cbi_add_networks(iface)
 
-	s:option(Value, "target", translate("target"), translate("a_n_r_target6"))
-	s:option(Value, "gateway", translate("gateway6")).rmempty = true
+	s:option(Value, "target", translate("Target"), translate("<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network (CIDR)"))
+	s:option(Value, "gateway", translate("<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway")).rmempty = true
 end
 
 
diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/vlan.lua b/modules/admin-full/luasrc/model/cbi/admin_network/vlan.lua
index 5e3229b1b4..f746ce0769 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/vlan.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/vlan.lua
@@ -11,7 +11,7 @@ You may obtain a copy of the License at
 
 $Id$
 ]]--
-m = Map("network", translate("a_n_switch"), translate("a_n_switch1"))
+m = Map("network", translate("Switch"), translate("The network ports on your router can be combined to several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s in which computers can communicate directly with each other. <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s are often used to separate different network segments. Often there is by default one Uplink port for a connection to the next greater network like the internet and other ports for a local network."))
 
 s = m:section(TypedSection, "switch", "")
 
diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
index 639c3c1900..bdb8235184 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
@@ -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"})
diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/wireless.lua b/modules/admin-full/luasrc/model/cbi/admin_network/wireless.lua
index ef46cb4a3f..ae4246b859 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/wireless.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/wireless.lua
@@ -26,16 +26,16 @@ for k, v in pairs(wireless) do
 end
 
 
-m = SimpleForm("wireless", translate("wifi"))
+m = SimpleForm("wireless", translate("Wifi"))
 
-s = m:section(Table, ifaces, translate("networks"))
+s = m:section(Table, ifaces, translate("Networks"))
 
 function s.extedit(self, section) 
 	local device = self.map:get(section, "device") or ""
 	return  luci.dispatcher.build_url(unpack(luci.dispatcher.context.requested.path)) .. "/" .. device
 end
 
-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 "-"
@@ -50,34 +50,34 @@ 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)
 	return self.map:get(section, "ifname") or false
 end
 
-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)
 	t2.render = t2._render
@@ -88,31 +88,31 @@ 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 luci.util.pcdata(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"))
 
 
-s2 = m:section(SimpleSection, translate("a_w_create"))
-create = s2:option(ListValue, "create", translate("device"))
-create:value("", translate("cbi_select"))
+s2 = m:section(SimpleSection, translate("Create Network"))
+create = s2:option(ListValue, "create", translate("Device"))
+create:value("", translate("-- Please choose --"))
 for k, v in pairs(wireless) do
 	if v[".type"] == "wifi-device" then
 		create:value(k)
diff --git a/modules/admin-full/luasrc/model/cbi/admin_services/crontab.lua b/modules/admin-full/luasrc/model/cbi/admin_services/crontab.lua
index 05442dd55f..2ae5939c98 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_services/crontab.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_services/crontab.lua
@@ -16,7 +16,7 @@ $Id$
 local fs = require "nixio.fs"
 local cronfile = "/etc/crontabs/root" 
 
-f = SimpleForm("crontab", translate("a_s_crontab"), translate("a_s_crontab1"))
+f = SimpleForm("crontab", translate("Scheduled Tasks"), translate("This is the system crontab in which scheduled tasks can be defined."))
 
 t = f:field(TextValue, "crons")
 t.rmempty = true
diff --git a/modules/admin-full/luasrc/model/cbi/admin_services/dnsmasq.lua b/modules/admin-full/luasrc/model/cbi/admin_services/dnsmasq.lua
index 04ec1e15c4..70f1a0ed5d 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_services/dnsmasq.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_services/dnsmasq.lua
@@ -13,7 +13,7 @@ $Id$
 ]]--
 m = Map("dhcp", "Dnsmasq")
 
-s = m:section(TypedSection, "dnsmasq", translate("settings"))
+s = m:section(TypedSection, "dnsmasq", translate("Settings"))
 s.anonymous = true
 
 s:option(Flag, "domainneeded")
diff --git a/modules/admin-full/luasrc/model/cbi/admin_services/dropbear.lua b/modules/admin-full/luasrc/model/cbi/admin_services/dropbear.lua
index 62babc5499..6eaf9b3418 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_services/dropbear.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_services/dropbear.lua
@@ -11,15 +11,15 @@ You may obtain a copy of the License at
 
 $Id$
 ]]--
-m = Map("dropbear", "Dropbear SSHd", translate("a_srv_dropbear1"))
+m = Map("dropbear", "Dropbear SSHd", translate("Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"))
 
 s = m:section(TypedSection, "dropbear", "")
 s.anonymous = true
 
-port = s:option(Value, "Port", translate("port"))
+port = s:option(Value, "Port", translate("Port"))
 port.isinteger = true
 
-pwauth = s:option(Flag, "PasswordAuth", translate("a_srv_d_pwauth"), translate("a_srv_d_pwauth1"))
+pwauth = s:option(Flag, "PasswordAuth", translate("Password authentication"), translate("Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"))
 pwauth.enabled = 'on'
 pwauth.disabled = 'off'
 pwauth.rmempty = false
diff --git a/modules/admin-full/luasrc/model/cbi/admin_services/httpd.lua b/modules/admin-full/luasrc/model/cbi/admin_services/httpd.lua
index 64a0801993..5cd1ae9db8 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_services/httpd.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_services/httpd.lua
@@ -11,21 +11,21 @@ You may obtain a copy of the License at
 
 $Id$
 ]]--
-m = Map("httpd", "Busybox HTTPd", translate("a_srv_http1"))
+m = Map("httpd", "Busybox HTTPd", translate("A small webserver which can be used to serve <abbr title=\"Lua Configuration Interface\">LuCI</abbr>."))
 
 s = m:section(TypedSection, "httpd", "")
 s.anonymous = true
 s.addremove = true
 
-port = s:option(Value, "port", translate("port"))
+port = s:option(Value, "port", translate("Port"))
 port.isinteger = true
 
-s:option(Value, "home", translate("a_srv_http_root"))
+s:option(Value, "home", translate("Document root"))
 
-config = s:option(Value, "c_file", translate("configfile"), translate("a_srv_http_config1"))
+config = s:option(Value, "c_file", translate("Configuration file"), translate("defaults to <code>/etc/httpd.conf</code>"))
 config.rmempty = true
 
-realm = s:option(Value, "realm", translate("a_srv_http_authrealm"), translate("a_srv_http_authrealm1"))
+realm = s:option(Value, "realm", translate("Authentication Realm"), translate("The realm which will be displayed at the authentication prompt for protected pages."))
 realm.rmempty = true
 
 return m
diff --git a/modules/admin-full/luasrc/model/cbi/admin_services/lucittpd.lua b/modules/admin-full/luasrc/model/cbi/admin_services/lucittpd.lua
index 35d8650bfa..f0b15a4ca9 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_services/lucittpd.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_services/lucittpd.lua
@@ -12,14 +12,14 @@ You may obtain a copy of the License at
 
 $Id$
 ]]--
-m = Map("lucittpd", "LuCIttpd", translate("a_srv_lucittpd"))
+m = Map("lucittpd", "LuCIttpd", translate("A lightweight HTTP/1.1 webserver written in C and Lua designed to serve LuCI"))
 
 s = m:section(NamedSection, "lucittpd", "lucittpd", "")
 
-s:option(Value, "port", translate("port"))
-s:option(Value, "root", translate("a_srv_http_root"))
-s:option(Value, "path", translate("a_srv_http_path"))
-s:option(Flag, "keepalive", translate("a_srv_http_keepalive"))
-s:option(Value, "timeout", translate("a_srv_http_timeout"))
+s:option(Value, "port", translate("Port"))
+s:option(Value, "root", translate("Document root"))
+s:option(Value, "path", translate("Plugin path"))
+s:option(Flag, "keepalive", translate("Enable Keep-Alive"))
+s:option(Value, "timeout", translate("Connection timeout"))
 
 return m
diff --git a/modules/admin-full/luasrc/model/cbi/admin_system/fstab.lua b/modules/admin-full/luasrc/model/cbi/admin_system/fstab.lua
index aa4f12e554..e55c44c885 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_system/fstab.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_system/fstab.lua
@@ -29,17 +29,17 @@ for i, dev in ipairs(devices) do
 end
 
 
-m = Map("fstab", translate("a_s_fstab"))
+m = Map("fstab", translate("Mount Points"))
 
 local mounts = luci.sys.mounts()
 
-v = m:section(Table, mounts, translate("a_s_fstab_active"))
+v = m:section(Table, mounts, translate("Mounted file systems"))
 
-fs = v:option(DummyValue, "fs", translate("filesystem"))
+fs = v:option(DummyValue, "fs", translate("Filesystem"))
 
-mp = v:option(DummyValue, "mountpoint", translate("a_s_fstab_mountpoint"))
+mp = v:option(DummyValue, "mountpoint", translate("Mount Point"))
 
-avail = v:option(DummyValue, "avail", translate("a_s_fstab_avail"))
+avail = v:option(DummyValue, "avail", translate("Available"))
 function avail.cfgvalue(self, section)
 	return luci.tools.webadmin.byte_format(
 		( tonumber(mounts[section].available) or 0 ) * 1024
@@ -48,7 +48,7 @@ function avail.cfgvalue(self, section)
 	)
 end
 
-used = v:option(DummyValue, "used", translate("a_s_fstab_used"))
+used = v:option(DummyValue, "used", translate("Used"))
 function used.cfgvalue(self, section)
 	return ( mounts[section].percent or "0%" ) .. " (" ..
 	luci.tools.webadmin.byte_format(
@@ -58,29 +58,29 @@ end
 
 
 
-mount = m:section(TypedSection, "mount", translate("a_s_fstab_mountpoints"), translate("a_s_fstab_mountpoints1"))
+mount = m:section(TypedSection, "mount", translate("Mount Points"), translate("Mount Points define at which point a memory device will be attached to the filesystem"))
 mount.anonymous = true
 mount.addremove = true
 mount.template = "cbi/tblsection"
 
 mount:option(Flag, "enabled", translate("enable")).rmempty = false
-dev = mount:option(Value, "device", translate("device"), translate("a_s_fstab_device1"))
+dev = mount:option(Value, "device", translate("Device"), translate("The device file of the memory or partition (<abbr title=\"for example\">e.g.</abbr> <code>/dev/sda1</code>)"))
 for i, d in ipairs(devices) do
 	dev:value(d, size[d] and "%s (%s MB)" % {d, size[d]})
 end
 
-mount:option(Value, "target", translate("a_s_fstab_mountpoint"))
-mount:option(Value, "fstype", translate("filesystem"), translate("a_s_fstab_fs1"))
-mount:option(Value, "options", translate("options"), translatef("manpage", "siehe '%s' manpage", "mount"))
+mount:option(Value, "target", translate("Mount Point"))
+mount:option(Value, "fstype", translate("Filesystem"), translate("The filesystem that was used to format the memory (<abbr title=\"for example\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></samp>)"))
+mount:option(Value, "options", translate("Options"), translatef("see \'%s\' manpage"%s' manpage", "mount"))
 
 
-swap = m:section(TypedSection, "swap", "SWAP", translate("a_s_fstab_swap1"))
+swap = m:section(TypedSection, "swap", "SWAP", translate("If your physical memory is insufficient unused data can be temporarily swapped to a swap-device resulting in a higher amount of usable <abbr title=\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very slow process as the swap-device cannot be accessed with the high datarates of the <abbr title=\"Random Access Memory\">RAM</abbr>."))
 swap.anonymous = true
 swap.addremove = true
 swap.template = "cbi/tblsection"
 
 swap:option(Flag, "enabled", translate("enable")).rmempty = false
-dev = swap:option(Value, "device", translate("device"), translate("a_s_fstab_device1"))
+dev = swap:option(Value, "device", translate("Device"), translate("The device file of the memory or partition (<abbr title=\"for example\">e.g.</abbr> <code>/dev/sda1</code>)"))
 for i, d in ipairs(devices) do
 	dev:value(d, size[d] and "%s (%s MB)" % {d, size[d]})
 end
diff --git a/modules/admin-full/luasrc/model/cbi/admin_system/ipkg.lua b/modules/admin-full/luasrc/model/cbi/admin_system/ipkg.lua
index 1b540b7051..1db0f11748 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_system/ipkg.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_system/ipkg.lua
@@ -14,7 +14,7 @@ $Id$
 ]]--
 local ipkgfile = "/etc/opkg.conf" 
 
-f = SimpleForm("ipkgconf", translate("a_s_p_ipkg"))
+f = SimpleForm("ipkgconf", translate("OPKG-Configuration"))
 
 t = f:field(TextValue, "lines")
 t.rows = 10
diff --git a/modules/admin-full/luasrc/model/cbi/admin_system/leds.lua b/modules/admin-full/luasrc/model/cbi/admin_system/leds.lua
index 71bd7d0bb1..e4045d2f40 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_system/leds.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_system/leds.lua
@@ -11,7 +11,7 @@ You may obtain a copy of the License at
 
 $Id$
 ]]--
-m = Map("system", translate("leds"), translate("leds_desc"))
+m = Map("system", translate("<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"), translate("Customizes the behaviour of the device <abbr title=\"Light Emitting Diode\">LED</abbr>s if possible."))
 
 local sysfs_path = "/sys/class/leds/"
 local leds = {}
@@ -78,8 +78,8 @@ end
 mode = s:option(MultiValue, "mode")
 mode.rmempty = true
 mode:depends("trigger", "netdev")
-mode:value("link", translate("system_led_mode_link"))
-mode:value("tx", translate("system_led_mode_tx"))
-mode:value("rx", translate("system_led_mode_rx"))
+mode:value("link", translate("Link On"))
+mode:value("tx", translate("Transmit"))
+mode:value("rx", translate("Receive"))
 
 return m
diff --git a/modules/admin-full/luasrc/model/cbi/admin_system/passwd.lua b/modules/admin-full/luasrc/model/cbi/admin_system/passwd.lua
index dff5aeb7b6..6f13bb0fc8 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_system/passwd.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_system/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-full/luasrc/model/cbi/admin_system/processes.lua b/modules/admin-full/luasrc/model/cbi/admin_system/processes.lua
index 8ec027d115..c34c70ffae 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_system/processes.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_system/processes.lua
@@ -12,30 +12,30 @@ You may obtain a copy of the License at
 
 $Id$
 ]]--
-f = SimpleForm("processes", translate("process_head"), translate("process_descr"))
+f = SimpleForm("processes", translate("Processes"), translate("This list gives an overview over currently running system processes and their status."))
 f.reset = false
 f.submit = false
 
 t = f:section(Table, luci.sys.process.list())
-t:option(DummyValue, "PID", translate("process_pid"))
-t:option(DummyValue, "USER", translate("process_owner"))
-t:option(DummyValue, "COMMAND", translate("process_command"))
-t:option(DummyValue, "%CPU", translate("process_cpu"))
-t:option(DummyValue, "%MEM", translate("process_mem"))
+t:option(DummyValue, "PID", translate("PID"))
+t:option(DummyValue, "USER", translate("Owner"))
+t:option(DummyValue, "COMMAND", translate("Command"))
+t:option(DummyValue, "%CPU", translate("CPU usage (%)"))
+t:option(DummyValue, "%MEM", translate("Memory usage (%)"))
 
-hup = t:option(Button, "_hup", translate("process_hup"))
+hup = t:option(Button, "_hup", translate("Hang Up"))
 hup.inputstyle = "reload"
 function hup.write(self, section)
 	null, self.tag_error[section] = luci.sys.process.signal(section, 1)
 end
 
-term = t:option(Button, "_term", translate("process_term"))
+term = t:option(Button, "_term", translate("Terminate"))
 term.inputstyle = "remove"
 function term.write(self, section)
 	null, self.tag_error[section] = luci.sys.process.signal(section, 15)
 end
 
-kill = t:option(Button, "_kill", translate("process_kill"))
+kill = t:option(Button, "_kill", translate("Kill"))
 kill.inputstyle = "reset"
 function kill.write(self, section)
 	null, self.tag_error[section] = luci.sys.process.signal(section, 9)
diff --git a/modules/admin-full/luasrc/model/cbi/admin_system/sshkeys.lua b/modules/admin-full/luasrc/model/cbi/admin_system/sshkeys.lua
index b7ff482353..c18539c8e8 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_system/sshkeys.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_system/sshkeys.lua
@@ -14,7 +14,7 @@ $Id$
 ]]--
 local keyfile = "/etc/dropbear/authorized_keys" 
 
-f = SimpleForm("sshkeys", translate("a_s_sshkeys"), translate("a_s_sshkeys1"))
+f = SimpleForm("sshkeys", translate("<abbr title=\"Secure Shell\">SSH</abbr>-Keys"), translate("Here you can paste public <abbr title=\"Secure Shell\">SSH</abbr>-Keys (one per line) for <abbr title=\"Secure Shell\">SSH</abbr> public-key authentication."))
 
 t = f:field(TextValue, "keys")
 t.rmempty = true
diff --git a/modules/admin-full/luasrc/model/cbi/admin_system/system.lua b/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
index c37e726293..99ab64df02 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
@@ -16,7 +16,7 @@ require("luci.sys")
 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
@@ -25,14 +25,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,
@@ -43,13 +43,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)
@@ -57,7 +57,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