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

76 files changed, 781 insertions, 788 deletions

diff --git a/modules/admin-core/luasrc/view/about.htm b/modules/admin-core/luasrc/view/about.htm
index 529649cc2..f89cc755d 100644
--- a/modules/admin-core/luasrc/view/about.htm
+++ b/modules/admin-core/luasrc/view/about.htm
@@ -13,13 +13,13 @@ $Id$
 
 -%>
 <%+header%>
-<h2><a id="content" name="content"><%:about%> LuCI</a></h2>
-<p><%:c_lucidesc%></p>
+<h2><a id="content" name="content"><%:About%> LuCI</a></h2>
+<p><%:<abbr title="Lua Configuration Interface">LuCI</abbr> is a collection of free Lua software including an <abbr title="Model-View-Controller">MVC</abbr>-Webframework and webinterface for embedded devices. <abbr title="Lua Configuration Interface">LuCI</abbr> is licensed under the Apache-License.%></p>
 
-<p><strong><%:c_projecthome%>: </strong><a href="http://luci.freifunk-halle.net">luci.freifunk-halle.net</a></p>
+<p><strong><%:Project Homepage%>: </strong><a href="http://luci.freifunk-halle.net">luci.freifunk-halle.net</a></p>
 
 <br />
-<h2><%:c_leaddev%></h2>
+<h2><%:Lead Development%></h2>
 <ul style="font-weight: bold">
 	<li><a href="mailto:steven-at-midlink-dot-org">Steven "Cyrus" Barth</a> (OpenWrt, Freifunk Halle)</li>
 	<li><a href="mailto:xm-at-leipzig.freifunk-dot-net">Jo-Philipp "Jow" Wich</a> (Freifunk Leipzig)</li>
@@ -27,7 +27,7 @@ $Id$
 </ul>
 <br />
 
-<h2><%:c_contributors%></h2>
+<h2><%:Contributing Developers%></h2>
 <ul style="font-weight: bold">
 	<li><a href="mailto:mail-at-antonpopov-dot-de">Anton "xyron" Popov</a></li>
 	<li><a href="mailto:florian-at-openwrt-dot-org">Florian Fainelli</a> (OpenWrt)</li> 
@@ -36,7 +36,7 @@ $Id$
 </ul>
 <br />
 
-<h2><%:c_thanksto%></h2>
+<h2><%:Thanks To%></h2>
 <ul style="font-weight: bold">
 	<li><a href="mailto:info-at-computerhilfe-halle-dot-de">Mono</a> (Freifunk Halle)</li>
 	<li><a href="mailto:tetzlav-at-leipzig.freifunk-dot-net">tetzlav</a> (Freifunk Leipzig)</li>
diff --git a/modules/admin-core/luasrc/view/sysauth.htm b/modules/admin-core/luasrc/view/sysauth.htm
index 42f13fa1f..184de5baf 100644
--- a/modules/admin-core/luasrc/view/sysauth.htm
+++ b/modules/admin-core/luasrc/view/sysauth.htm
@@ -17,9 +17,9 @@ $Id$
 
 <form method="post" action="<%=luci.http.getenv("REQUEST_URI")%>">
 	<div class="cbi-map">
-		<h2><a id="content" name="content"><%:sysauth_head%></a></h2>
+		<h2><a id="content" name="content"><%:Authorization Required%></a></h2>
 		<div class="cbi-map-descr">
-			<%:sysauth_prompt%>
+			<%:Please enter your username and password.%>
 			<%- if fuser then %>
 			<div class="error"><%:sysauth_failed%></div>
 			<br />
@@ -27,13 +27,13 @@ $Id$
 		</div>
 		<fieldset class="cbi-section"><fieldset class="cbi-section-node">
 			<div class="cbi-value">
-				<label class="cbi-value-title"><%:username%></label>
+				<label class="cbi-value-title"><%:Username%></label>
 				<div class="cbi-value-field">
 					<input class="cbi-input-user" type="text" name="username" value="<%=duser%>" />
 				</div>
 			</div>
 			<div class="cbi-value">
-				<label class="cbi-value-title"><%:password%></label>
+				<label class="cbi-value-title"><%:Password%></label>
 				<div class="cbi-value-field">
 					<input class="cbi-input-password" type="password" name="password" />
 				</div>
@@ -42,8 +42,8 @@ $Id$
 	</div>
 
 	<div>
-		<input type="submit" value="<%:login%>" class="cbi-button cbi-button-apply" />
-		<input type="reset" value="<%:reset%>" class="cbi-button cbi-button-reset" />
+		<input type="submit" value="<%:Login%>" class="cbi-button cbi-button-apply" />
+		<input type="reset" value="<%:Reset%>" class="cbi-button cbi-button-reset" />
 	</div>
 </form>
 <%+footer%>
diff --git a/modules/admin-full/luasrc/controller/admin/index.lua b/modules/admin-full/luasrc/controller/admin/index.lua
index 580914aa8..9611f5ae7 100644
--- a/modules/admin-full/luasrc/controller/admin/index.lua
+++ b/modules/admin-full/luasrc/controller/admin/index.lua
@@ -27,7 +27,7 @@ function index()
 	
 	local page   = node("admin")
 	page.target  = alias("admin", "index")
-	page.title   = i18n("administration", "Administration")
+	page.title   = i18n("Administration")
 	page.order   = 10
 	page.i18n    = "admin-core"
 	page.sysauth = "root"
@@ -37,17 +37,17 @@ function index()
 	
 	local page  = node("admin", "index")
 	page.target = template("admin_index/index")
-	page.title  = i18n("overview", "Übersicht")
+	page.title  = i18n("Overview")
 	page.order  = 10
 	page.index = true
 
 	local page  = node("admin", "index", "luci")
 	page.target = cbi("admin_index/luci")
-	page.title  = i18n("a_i_ui", "Oberfläche")
+	page.title  = i18n("User Interface")
 	page.order  = 10
 
-	entry({"admin", "index", "components"}, call("redir_components"), i18n("luci_components", "LuCI Components"), 20)
-	entry({"admin", "index", "logout"}, call("action_logout"), i18n("logout"), 90)
+	entry({"admin", "index", "components"}, call("redir_components"), i18n("LuCI Components"), 20)
+	entry({"admin", "index", "logout"}, call("action_logout"), i18n("Logout"), 90)
 end
 
 function redir_components()
diff --git a/modules/admin-full/luasrc/controller/admin/network.lua b/modules/admin-full/luasrc/controller/admin/network.lua
index eb2e6a244..faf4f285b 100644
--- a/modules/admin-full/luasrc/controller/admin/network.lua
+++ b/modules/admin-full/luasrc/controller/admin/network.lua
@@ -20,16 +20,16 @@ function index()
 
 	local page  = node("admin", "network")
 	page.target = alias("admin", "network", "network")
-	page.title  = i18n("network")
+	page.title  = i18n("Network")
 	page.order  = 50
 	page.index  = true
 
 	local page  = node("admin", "network", "vlan")
 	page.target = cbi("admin_network/vlan")
-	page.title  = i18n("a_n_switch")
+	page.title  = i18n("Switch")
 	page.order  = 20
 
-	local page = entry({"admin", "network", "wireless"}, arcombine(template("admin_network/wifi_overview"), cbi("admin_network/wifi")), i18n("wifi"), 15)
+	local page = entry({"admin", "network", "wireless"}, arcombine(template("admin_network/wifi_overview"), cbi("admin_network/wifi")), i18n("Wifi"), 15)
 	page.i18n   = "wifi"
 	page.leaf = true
 	page.subindex = true
@@ -42,7 +42,7 @@ function index()
 	page.i18n = "wifi"
 	page.leaf = true
 
-	local page = entry({"admin", "network", "network"}, arcombine(cbi("admin_network/network"), cbi("admin_network/ifaces")), i18n("interfaces", "Schnittstellen"), 10)
+	local page = entry({"admin", "network", "network"}, arcombine(cbi("admin_network/network"), cbi("admin_network/ifaces")), i18n("Interfaces"), 10)
 	page.leaf   = true
 	page.subindex = true
 
@@ -69,17 +69,17 @@ function index()
 	entry(
 	 {"admin", "network", "dhcp", "leases"},
 	 cbi("admin_network/dhcpleases"),
-	 i18n("dhcp_leases")
+	 i18n("Leases")
 	)
 
 	local page  = node("admin", "network", "hosts")
 	page.target = cbi("admin_network/hosts")
-	page.title  = i18n("hostnames", "Hostnames")
+	page.title  = i18n("Hostnames")
 	page.order  = 40
 
 	local page  = node("admin", "network", "routes")
 	page.target = cbi("admin_network/routes")
-	page.title  = i18n("a_n_routes_static")
+	page.title  = i18n("Static Routes")
 	page.order  = 50
 
 end
diff --git a/modules/admin-full/luasrc/controller/admin/services.lua b/modules/admin-full/luasrc/controller/admin/services.lua
index 50c79f664..ee5e9b3d6 100644
--- a/modules/admin-full/luasrc/controller/admin/services.lua
+++ b/modules/admin-full/luasrc/controller/admin/services.lua
@@ -19,12 +19,12 @@ function index()
 	
 	local page  = node("admin", "services", "crontab")
 	page.target = form("admin_services/crontab")
-	page.title  = i18n("a_s_crontab")
+	page.title  = i18n("Scheduled Tasks")
 	page.order  = 50
 
 	local page  = node("admin", "services")
 	page.target = template("admin_services/index")
-	page.title  = i18n("services", "Dienste")  
+	page.title  = i18n("Services")  
 	page.order  = 40
 	page.index  = true
 	
diff --git a/modules/admin-full/luasrc/controller/admin/status.lua b/modules/admin-full/luasrc/controller/admin/status.lua
index 5d2df9c41..27f1f9437 100644
--- a/modules/admin-full/luasrc/controller/admin/status.lua
+++ b/modules/admin-full/luasrc/controller/admin/status.lua
@@ -17,13 +17,13 @@ function index()
 	luci.i18n.loadc("admin-core")
 	local i18n = luci.i18n.translate
 
-	entry({"admin", "status"}, template("admin_status/index"), i18n("status", "Status"), 20).index = true
-	entry({"admin", "status", "interfaces"}, template("admin_status/interfaces"), i18n("interfaces", "Interfaces"), 1)
-	entry({"admin", "status", "iptables"}, call("action_iptables"), i18n("a_s_ipt", "Firewall"), 2)
-	entry({"admin", "status", "conntrack"}, template("admin_status/conntrack"), i18n("a_n_conntrack"), 3)
-	entry({"admin", "status", "routes"}, template("admin_status/routes"), i18n("a_n_routes"), 4)
-	entry({"admin", "status", "syslog"}, call("action_syslog"), i18n("syslog", "System Log"), 5)
-	entry({"admin", "status", "dmesg"}, call("action_dmesg"), i18n("dmesg", "Kernel Log"), 6)
+	entry({"admin", "status"}, template("admin_status/index"), i18n("Status"), 20).index = true
+	entry({"admin", "status", "interfaces"}, template("admin_status/interfaces"), i18n("Interfaces"), 1)
+	entry({"admin", "status", "iptables"}, call("action_iptables"), i18n("Firewall"), 2)
+	entry({"admin", "status", "conntrack"}, template("admin_status/conntrack"), i18n("Active Connections"), 3)
+	entry({"admin", "status", "routes"}, template("admin_status/routes"), i18n("Routes"), 4)
+	entry({"admin", "status", "syslog"}, call("action_syslog"), i18n("System Log"), 5)
+	entry({"admin", "status", "dmesg"}, call("action_dmesg"), i18n("Kernel Log"), 6)
 
 end
 
diff --git a/modules/admin-full/luasrc/controller/admin/system.lua b/modules/admin-full/luasrc/controller/admin/system.lua
index c90ecc3ce..31f4361e4 100644
--- a/modules/admin-full/luasrc/controller/admin/system.lua
+++ b/modules/admin-full/luasrc/controller/admin/system.lua
@@ -18,22 +18,22 @@ function index()
 	luci.i18n.loadc("admin-core")
 	local i18n = luci.i18n.translate
 	
-	entry({"admin", "system"}, alias("admin", "system", "system"), i18n("system"), 30).index = true
-	entry({"admin", "system", "system"}, cbi("admin_system/system"), i18n("system"), 1)
-	entry({"admin", "system", "packages"}, call("action_packages"), i18n("a_s_packages"), 10)
+	entry({"admin", "system"}, alias("admin", "system", "system"), i18n("System"), 30).index = true
+	entry({"admin", "system", "system"}, cbi("admin_system/system"), i18n("System"), 1)
+	entry({"admin", "system", "packages"}, call("action_packages"), i18n("Software"), 10)
 	entry({"admin", "system", "packages", "ipkg"}, form("admin_system/ipkg"))
-	entry({"admin", "system", "passwd"}, form("admin_system/passwd"), i18n("a_s_changepw"), 20)
-	entry({"admin", "system", "sshkeys"}, form("admin_system/sshkeys"), i18n("a_s_sshkeys"), 30)
-	entry({"admin", "system", "processes"}, form("admin_system/processes"), i18n("process_head"), 45)
-	entry({"admin", "system", "fstab"}, cbi("admin_system/fstab"), i18n("a_s_fstab"), 50)
+	entry({"admin", "system", "passwd"}, form("admin_system/passwd"), i18n("Admin Password"), 20)
+	entry({"admin", "system", "sshkeys"}, form("admin_system/sshkeys"), i18n("<abbr title=\"Secure Shell\">SSH</abbr>-Keys"), 30)
+	entry({"admin", "system", "processes"}, form("admin_system/processes"), i18n("Processes"), 45)
+	entry({"admin", "system", "fstab"}, cbi("admin_system/fstab"), i18n("Mount Points"), 50)
 
 	if nixio.fs.access("/sys/class/leds") then
-		entry({"admin", "system", "leds"}, cbi("admin_system/leds"), i18n("leds", "LEDs"), 60)
+		entry({"admin", "system", "leds"}, cbi("admin_system/leds"), i18n("<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"), 60)
 	end
 
-	entry({"admin", "system", "backup"}, call("action_backup"), i18n("a_s_backup"), 70)
-	entry({"admin", "system", "upgrade"}, call("action_upgrade"), i18n("admin_upgrade"), 80)
-	entry({"admin", "system", "reboot"}, call("action_reboot"), i18n("reboot"), 90)
+	entry({"admin", "system", "backup"}, call("action_backup"), i18n("Backup / Restore"), 70)
+	entry({"admin", "system", "upgrade"}, call("action_upgrade"), i18n("Flash Firmware"), 80)
+	entry({"admin", "system", "reboot"}, call("action_reboot"), i18n("Reboot"), 90)
 end
 
 function action_packages()
diff --git a/modules/admin-full/luasrc/controller/admin/uci.lua b/modules/admin-full/luasrc/controller/admin/uci.lua
index d313128ad..09b773121 100644
--- a/modules/admin-full/luasrc/controller/admin/uci.lua
+++ b/modules/admin-full/luasrc/controller/admin/uci.lua
@@ -18,11 +18,11 @@ function index()
 	local redir = luci.http.formvalue("redir", true) or 
 	  luci.dispatcher.build_url(unpack(luci.dispatcher.context.request))
 	
-	entry({"admin", "uci"}, nil, i18n("config"))
-	entry({"admin", "uci", "changes"}, call("action_changes"), i18n("changes"), 40).query = {redir=redir}
-	entry({"admin", "uci", "revert"}, call("action_revert"), i18n("revert"), 30).query = {redir=redir}
-	entry({"admin", "uci", "apply"}, call("action_apply"), i18n("apply"), 20).query = {redir=redir}
-	entry({"admin", "uci", "saveapply"}, call("action_apply"), i18n("saveapply"), 10).query = {redir=redir}
+	entry({"admin", "uci"}, nil, i18n("Configuration"))
+	entry({"admin", "uci", "changes"}, call("action_changes"), i18n("Changes"), 40).query = {redir=redir}
+	entry({"admin", "uci", "revert"}, call("action_revert"), i18n("Revert"), 30).query = {redir=redir}
+	entry({"admin", "uci", "apply"}, call("action_apply"), i18n("Apply"), 20).query = {redir=redir}
+	entry({"admin", "uci", "saveapply"}, call("action_apply"), i18n("Save & Apply"), 10).query = {redir=redir}
 end
 
 function convert_changes(changes)
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 dc9eb1e9e..75c42c090 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 872e6444d..6f4aeb13e 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 31a27b3f6..2e0ebf892 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 dbf4aff90..58c10db41 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 93cdecac7..3dc0ac454 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 e8ace36a9..1985823c7 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 8fd536888..c117e93f7 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 7962d4da1..0f3c1cb91 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 5e3229b1b..f746ce076 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 639c3c190..bdb823518 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 ef46cb4a3..ae4246b85 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 05442dd55..2ae5939c9 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 04ec1e15c..70f1a0ed5 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 62babc549..6eaf9b341 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 64a080199..5cd1ae9db 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 35d8650bf..f0b15a4ca 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 aa4f12e55..e55c44c88 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 1b540b705..1db0f1174 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 71bd7d0bb..e4045d2f4 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 dff5aeb7b..6f13bb0fc 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 8ec027d11..c34c70ffa 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 b7ff48235..c18539c8e 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 c37e72629..99ab64df0 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
diff --git a/modules/admin-full/luasrc/view/admin_index/index.htm b/modules/admin-full/luasrc/view/admin_index/index.htm
index e6e963c0c..04e74683b 100644
--- a/modules/admin-full/luasrc/view/admin_index/index.htm
+++ b/modules/admin-full/luasrc/view/admin_index/index.htm
@@ -13,12 +13,12 @@ $Id$
 
 -%>
 <%+header%>
-<h2><a id="content" name="content"><%:a_i_i_hello%></a></h2>
-<p><%:a_i_i_admin1%></p>
-<p><%:a_i_i_admin2%><br />
-<%:a_i_i_admin3%></p>
-<p><%:a_i_i_admin4%></p>
-<p><%:a_i_i_admin5%></p>
-<p><%:a_i_i_admin6%></p>
-<p><em><strong><a href="<%=controller%>/about"><%:a_i_i_team%></a></strong></em></p> 
+<h2><a id="content" name="content"><%:Hello!%></a></h2>
+<p><%:This is the administration area of <abbr title="Lua Configuration Interface">LuCI</abbr>.%></p>
+<p><%:<abbr title="Lua Configuration Interface">LuCI</abbr> is a free, flexible, and user friendly graphical interface for configuring OpenWrt Kamikaze.%><br />
+<%:On the following pages you can adjust all important settings of your router.%></p>
+<p><%:Notice: In <abbr title="Lua Configuration Interface">LuCI</abbr> changes have to be confirmed by clicking Changes - Save & Apply before being applied.%></p>
+<p><%:As we always want to improve this interface we are looking forward to your feedback and suggestions.%></p>
+<p><%:And now have fun with your router!%></p>
+<p><em><strong><a href="<%=controller%>/about"><%:The <abbr title="Lua Configuration Interface">LuCI</abbr> Team%></a></strong></em></p> 
 <%+footer%>
\ No newline at end of file
diff --git a/modules/admin-full/luasrc/view/admin_network/wifi_join.htm b/modules/admin-full/luasrc/view/admin_network/wifi_join.htm
index ec776f697..43ba40bf1 100644
--- a/modules/admin-full/luasrc/view/admin_network/wifi_join.htm
+++ b/modules/admin-full/luasrc/view/admin_network/wifi_join.htm
@@ -71,7 +71,7 @@ $Id$
 
 <%+header%>
 
-<h2><a id="content" name="content"><%:a_s_iw_scan Wireless Scan%></a></h2>
+<h2><a id="content" name="content"><%:Wireless Scan%></a></h2>
 
 <div class="cbi-map">
 	<fieldset class="cbi-section">
@@ -118,11 +118,11 @@ $Id$
 </div>
 <div class="cbi-page-actions right">
 	<form class="inline" action="<%=luci.dispatcher.build_url("admin/network/wireless")%>" method="get">
-		<input class="cbi-button-reset" type="submit" value="<%:a_s_iw_back_overview Back to overview%>" />
+		<input class="cbi-button-reset" type="submit" value="<%:Back to overview%>" />
 	</form>
 	<form class="inline" action="<%=REQUEST_URI%>" method="get">
 		<input type="hidden" name="device" value="<%=utl.pcdata(dev)%>" />
-		<input class="cbi-input-find" type="submit" value="<%:a_s_iw_scan_repeat Repeat scan%>" />
+		<input class="cbi-input-find" type="submit" value="<%:Repeat scan%>" />
 	</form>
 </div>
 
diff --git a/modules/admin-full/luasrc/view/admin_network/wifi_join_settings.htm b/modules/admin-full/luasrc/view/admin_network/wifi_join_settings.htm
index 1be6c2266..c3c8e10aa 100644
--- a/modules/admin-full/luasrc/view/admin_network/wifi_join_settings.htm
+++ b/modules/admin-full/luasrc/view/admin_network/wifi_join_settings.htm
@@ -31,12 +31,10 @@ $Id$
 	local requirement
 
 	if iwinfo.type(dev) == "broadcom" and not nixio.fs.access("/usr/sbin/nas") then
-		requirement = luci.i18n.translatef("a_s_iw_require_nas",
-			"You need to install the <a href='%s'>Broadcom <em>nas</em> supplicant</a> to use WPA!"
+		requirement = luci.i18n.translatef("You need to install the <a href='%s'>Broadcom <em>nas</em> supplicant</a> to use WPA!"
 			% luci.dispatcher.build_url("admin/system/packages?url=nas&amp;submit=1"))
 	elseif not nixio.fs.access("/usr/sbin/wpa_supplicant") then
-		requirement = luci.i18n.translatef("a_s_iw_require_wpasupplicant",
-			"You need to install <a href='%s'><em>wpa-supplicant</em></a> to use WPA!"
+		requirement = luci.i18n.translatef("You need to install <a href='%s'><em>wpa-supplicant</em></a> to use WPA!"
 			% luci.dispatcher.build_url("admin/system/packages?url=wpa-supplicant&amp;submit=1"))
 	end
 
@@ -44,12 +42,12 @@ $Id$
 
 <%+header%>
 
-<h2><a id="content" name="content"><%:a_s_iw_join Join Network%></a></h2>
+<h2><a id="content" name="content"><%:Join Network%></a></h2>
 
 <form method="post" action="<%=REQUEST_URI%>">
 	<div class="cbi-map">
 		<div class="cbi-map-descr">
-			<%=luci.i18n.translatef("a_s_iw_join_desc", "You are about to join the wireless network <em><strong>%s</strong></em>. " ..
+			<%=luci.i18n.translatef("You are about to join the wireless network <em><strong>%s</strong></em>. " ..
 				"In order to complete the process, you need to provide some additional details.",
 				utl.pcdata(luci.http.formvalue("join") or "(hidden)")
 			)%>
@@ -120,8 +118,8 @@ $Id$
 		</fieldset>
 	</div>
 	<div class="cbi-page-actions">
-		<input class="cbi-button-apply" type="submit" value="<%:a_s_iw_join_confirm Join network%>" />
-		<input class="cbi-button-reset" type="submit" name="cancel" value="<%:a_s_iw_back_scan Back to scan results%>" />
+		<input class="cbi-button-apply" type="submit" value="<%:Join network%>" />
+		<input class="cbi-button-reset" type="submit" name="cancel" value="<%:Back to scan results%>" />
 	</div>
 </form>
 
diff --git a/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm b/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm
index 93ce748f1..795edc4f3 100644
--- a/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm
+++ b/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm
@@ -99,7 +99,7 @@ $Id$
 
 <%+header%>
 
-<h2><a id="content" name="content"><%:a_s_iw_overview Wireless Overview%></a></h2>
+<h2><a id="content" name="content"><%:Wireless Overview%></a></h2>
 
 <div class="cbi-map">
 
@@ -162,7 +162,7 @@ $Id$
 
 
 
-	<h2><a id="content" name="content"><%:a_s_iw_overview2 Associated Stations%></a></h2>
+	<h2><a id="content" name="content"><%:Associated Stations%></a></h2>
 
 	<fieldset class="cbi-section">
 		<table class="cbi-section-table" style="margin:10px; width:50%">
diff --git a/modules/admin-full/luasrc/view/admin_services/index.htm b/modules/admin-full/luasrc/view/admin_services/index.htm
index 973e24457..53b67c3c2 100644
--- a/modules/admin-full/luasrc/view/admin_services/index.htm
+++ b/modules/admin-full/luasrc/view/admin_services/index.htm
@@ -13,7 +13,7 @@ $Id$
 
 -%>
 <%+header%>
-<h2><a id="content" name="content"><%:services%></a></h2>
-<p><%:a_srv_services1%></p>
-<p><%:a_srv_services2%></p>
+<h2><a id="content" name="content"><%:Services%></a></h2>
+<p><%:Services and daemons perform certain tasks on your device.%></p>
+<p><%:Most of them are network servers, that offer a certain service for your device or network like shell access, serving webpages like <abbr title="Lua Configuration Interface">LuCI</abbr>, doing mesh routing, sending e-mails, ...%></p>
 <%+footer%>
\ No newline at end of file
diff --git a/modules/admin-full/luasrc/view/admin_status/conntrack.htm b/modules/admin-full/luasrc/view/admin_status/conntrack.htm
index d0a86b610..06827500f 100644
--- a/modules/admin-full/luasrc/view/admin_status/conntrack.htm
+++ b/modules/admin-full/luasrc/view/admin_status/conntrack.htm
@@ -21,17 +21,17 @@ $Id$
 <%+header%>
 
 <div class="cbi-map" id="cbi-conntrack">
-	<h2><a id="content" name="content"><%:a_n_conntrack%></a></h2>
-	<div class="cbi-map-descr"><%:a_n_conntrack_desc%></div>
+	<h2><a id="content" name="content"><%:Active Connections%></a></h2>
+	<div class="cbi-map-descr"><%:This page gives an overview over currently active network connections.%></div>
 
 	<fieldset class="cbi-section" id="cbi-table-table">
 		<legend>ARP</legend>
 		<div class="cbi-section-node">
 			<table class="cbi-section-table">
 				<tr class="cbi-section-table-titles">
-					<th class="cbi-section-table-cell"><%:ipaddress%></th>
-					<th class="cbi-section-table-cell"><%:macaddress%></th>
-					<th class="cbi-section-table-cell"><%:interface%></th>
+					<th class="cbi-section-table-cell"><%:<abbr title="Internet Protocol Version 4">IPv4</abbr>-Address%></th>
+					<th class="cbi-section-table-cell"><%:<abbr title="Media Access Control">MAC</abbr>-Address%></th>
+					<th class="cbi-section-table-cell"><%:Interface%></th>
 				</tr>
 
 				<% luci.sys.net.arptable(function(e) %>
@@ -47,14 +47,14 @@ $Id$
 	<br />
 
 	<fieldset class="cbi-section" id="cbi-table-table">
-		<legend><%:a_n_conntrack%></legend>
+		<legend><%:Active Connections%></legend>
 		<div class="cbi-section-node">
 			<table class="cbi-section-table">
 				<tr class="cbi-section-table-titles">
-					<th class="cbi-section-table-cell"><%:network%></th>
-					<th class="cbi-section-table-cell"><%:protocol%></th>
-					<th class="cbi-section-table-cell"><%:source%></th>
-					<th class="cbi-section-table-cell"><%:destination%></th>
+					<th class="cbi-section-table-cell"><%:Network%></th>
+					<th class="cbi-section-table-cell"><%:Protocol%></th>
+					<th class="cbi-section-table-cell"><%:Source%></th>
+					<th class="cbi-section-table-cell"><%:Destination%></th>
 				</tr>
 
 				<% style = true; luci.sys.net.conntrack(function(c) %>
diff --git a/modules/admin-full/luasrc/view/admin_status/dmesg.htm b/modules/admin-full/luasrc/view/admin_status/dmesg.htm
index 4fa867397..7757460a0 100644
--- a/modules/admin-full/luasrc/view/admin_status/dmesg.htm
+++ b/modules/admin-full/luasrc/view/admin_status/dmesg.htm
@@ -13,7 +13,7 @@ $Id: syslog.htm 3622 2008-10-23 16:05:55Z jow $
 
 -%>
 <%+header%>
-<h2><a id="content" name="content"><%:dmesg%></a></h2>
+<h2><a id="content" name="content"><%:Kernel Log%></a></h2>
 <div id="content_syslog">
 <textarea readonly="readonly" wrap="off" rows="<%=dmesg:cmatch("\n")+2%>" id="syslog"><%=dmesg:pcdata()%></textarea>
 </div>
diff --git a/modules/admin-full/luasrc/view/admin_status/index.htm b/modules/admin-full/luasrc/view/admin_status/index.htm
index e4c1cc410..b26d17a9c 100644
--- a/modules/admin-full/luasrc/view/admin_status/index.htm
+++ b/modules/admin-full/luasrc/view/admin_status/index.htm
@@ -13,7 +13,7 @@ $Id$
 
 -%>
 <%+header%>
-<h2><a id="content" name="content"><%:status%></a></h2>
-<p><%:a_st_i_status1%></p>
-<p><%:a_st_i_status2%></p> 
+<h2><a id="content" name="content"><%:Status%></a></h2>
+<p><%:Here you can find information about the current system status like <abbr title="Central Processing Unit">CPU</abbr> clock frequency, memory usage or network interface data.%></p>
+<p><%:Also kernel or service logfiles can be viewed here to get an overview over their current state.%></p> 
 <%+footer%>
\ No newline at end of file
diff --git a/modules/admin-full/luasrc/view/admin_status/interfaces.htm b/modules/admin-full/luasrc/view/admin_status/interfaces.htm
index 720ce9c3d..0ee2cf659 100644
--- a/modules/admin-full/luasrc/view/admin_status/interfaces.htm
+++ b/modules/admin-full/luasrc/view/admin_status/interfaces.htm
@@ -129,13 +129,13 @@ $Id$
 
 	function get_iwmode(w)
 		local m = {
-			ap     = translate("a_s_if_iwmode_ap", "Master"),
-			sta    = translate("a_s_if_iwmode_sta", "Client"),
-			wds    = translate("a_s_if_iwmode_wds", "WDS"),
-			stawds = translate("a_s_if_iwmode_stawds", "Client + WDS"),
-			apwds  = translate("a_s_if_iwmode_apwds", "Master + WDS"),
-			adhoc  = translate("a_s_if_iwmode_adhoc", "Ad-Hoc"),
-			ahdemo = translate("a_s_if_iwmode_ahdemo", "Pseudo Ad-Hoc")
+			ap     = translate("Master"),
+			sta    = translate("Client"),
+			wds    = translate("WDS"),
+			stawds = translate("Client + WDS"),
+			apwds  = translate("Master + WDS"),
+			adhoc  = translate("Ad-Hoc"),
+			ahdemo = translate("Pseudo Ad-Hoc")
 		}
 
 		return m[w.mode] or w.mode
@@ -169,7 +169,7 @@ $Id$
 
 <%+header%>
 
-<h2><a id="content" name="content"><%:a_s_if_status Interface Status%></a></h2>
+<h2><a id="content" name="content"><%:Interface Status%></a></h2>
 
 <form method="post" action="<%=REQUEST_URI%>">
 	<div class="cbi-map">
@@ -180,52 +180,52 @@ $Id$
 
 				if dev and devinfo and devinfo[dev] then
 			%>
-				<h3><%:a_s_if_interface Interface%> <%=i['.name']%></h3>
+				<h3><%:Interface%> <%=i['.name']%></h3>
 				<p style="font-size:90%;padding-left:1em">
 
-				<strong><%:a_s_if_device Device%>:</strong>
-				<%=dev%> (<%:a_s_if_mac MAC%> <%=get_mac(dev)%>)<br />
+				<strong><%:Device%>:</strong>
+				<%=dev%> (<%:MAC%> <%=get_mac(dev)%>)<br />
 
-				<strong><%:a_s_if_type Type%>:</strong>
+				<strong><%:Type%>:</strong>
 				<% if is_wifi(dev) then iw = get_iwinfo(dev) -%>
-					<%:a_s_if_wifidev Wireless Adapter%> (<%=iw.type%>)<br />
+					<%:Wireless Adapter%> (<%=iw.type%>)<br />
 					<% if iw then %>
-						&nbsp; &#x2514; <strong><%:a_s_if_iwmode Mode%>:</strong> <%=get_iwmode(iw)%><br />
-						&nbsp; &#x2514; <strong><%:a_s_if_iwssid SSID%>:</strong> <%=iw.ssid%><br />
-						&nbsp; &#x2514; <strong><%:a_s_if_iwchannel Channel%>:</strong> <%=iw.channel%>
+						&nbsp; &#x2514; <strong><%:Mode%>:</strong> <%=get_iwmode(iw)%><br />
+						&nbsp; &#x2514; <strong><%:SSID%>:</strong> <%=iw.ssid%><br />
+						&nbsp; &#x2514; <strong><%:Channel%>:</strong> <%=iw.channel%>
 					<% end %>
 				<% else -%>
 					<% if vlan then %>
-						<%:a_s_if_ethswitch Ethernet Switch%> (<%=get_switch_driver(dev)%>)<br />
-						&nbsp; &#x2514; <strong><%:a_s_if_vlan VLAN%>:</strong> <%=get_vlan(dev)%> (<%:a_s_if_vlanports Ports%> <%=table.concat(get_vlan_ports(dev), ", ")%>)
+						<%:Ethernet Switch%> (<%=get_switch_driver(dev)%>)<br />
+						&nbsp; &#x2514; <strong><%:VLAN%>:</strong> <%=get_vlan(dev)%> (<%:Ports%> <%=table.concat(get_vlan_ports(dev), ", ")%>)
 					<% else %>
-						<%:a_s_if_ethdev Ethernet Adapter%>
+						<%:Ethernet Adapter%>
 					<% end %>
 				<% end -%><br />
 
-				<strong><%:a_s_if_transfer Transfer%></strong><br />
-				&nbsp; &#x2514; <strong><%:a_s_if_transfer_rx RX%>:</strong> <%=devinfo[dev][2]%> <%:a_s_if_pkts Pkts.%> (<%=wba.byte_format(tonumber(devinfo[dev][1]))%>)<br />
-				&nbsp; &#x2514; <strong><%:a_s_if_transfer_tx TX%>:</strong> <%=devinfo[dev][10]%> <%:a_s_if_pkts Pkts.%> (<%=wba.byte_format(tonumber(devinfo[dev][9]))%>)<br />
+				<strong><%:Transfer%></strong><br />
+				&nbsp; &#x2514; <strong><%:RX%>:</strong> <%=devinfo[dev][2]%> <%:Pkts.%> (<%=wba.byte_format(tonumber(devinfo[dev][1]))%>)<br />
+				&nbsp; &#x2514; <strong><%:TX%>:</strong> <%=devinfo[dev][10]%> <%:Pkts.%> (<%=wba.byte_format(tonumber(devinfo[dev][9]))%>)<br />
 
 				<%- if ( i.ipaddr and #i.ipaddr > 0 ) or ( i.ip6addr and #i.ip6addr > 0 ) then -%>
-					<strong><%:a_s_if_ipconfig IP Configuration%></strong><br />
-					&nbsp; &#x2514; <strong><%:a_s_if_ipconfig_primary Primary%>:</strong>
+					<strong><%:IP Configuration%></strong><br />
+					&nbsp; &#x2514; <strong><%:Primary%>:</strong>
 					<% if i.ipaddr and #i.ipaddr > 0 then %>
 						<%=i.ipaddr%>/<%=i.netmask%>
 						<% if i.proto == "dhcp" then -%>
-							(<%:a_s_if_ipconfig_dhcp DHCP assigned%>)
+							(<%:DHCP assigned%>)
 						<%- end %>
 					<% else %>
-						<em><%:a_s_if_ipconfig_none Not configured%></em>
+						<em><%:Not configured%></em>
 					<% end %><br />
 
 					<% for i, a in ipairs(get_aliases(i)) do %>
-						&nbsp; &#x2514; <strong><%:a_s_if_ipconfig_alias Alias%> #<%=i%>:</strong>
-						<%=a.ipaddr%>/<%=a.netmask%> (<%:a_s_if_device Device%> <%=dev%>:<%=i%>) <br />
+						&nbsp; &#x2514; <strong><%:Alias%> #<%=i%>:</strong>
+						<%=a.ipaddr%>/<%=a.netmask%> (<%:Device%> <%=dev%>:<%=i%>) <br />
 					<% end %>
 
 					<% if i.ip6addr and #i.ip6addr > 0 then %>
-						&nbsp; &#x2514; <strong><%:a_s_if_ipconfig_ipv6 IPv6%>:</strong> <%=i.ip6addr%><br />
+						&nbsp; &#x2514; <strong><%:IPv6%>:</strong> <%=i.ip6addr%><br />
 					<% end %>
 				<%- end -%>
 				<br /></p>
@@ -238,41 +238,41 @@ $Id$
 
 				if br and devinfo and devinfo[dev] then
 			%>
-				<h3><%:a_s_if_bridge Bridge%> <%=br.name%></h3>
+				<h3><%:Bridge%> <%=br.name%></h3>
 				<p style="font-size:90%;padding-left:1em">
 
-				<strong><%:a_s_if_device Device%>:</strong>
-				<%=dev%> (<%:a_s_if_mac MAC%> <%=get_mac(dev)%>)<br />
+				<strong><%:Device%>:</strong>
+				<%=dev%> (<%:MAC%> <%=get_mac(dev)%>)<br />
 
-				<strong><%:a_s_if_type Type%>:</strong>
-				<%:a_s_if_ethbridge Ethernet Bridge%><br />
+				<strong><%:Type%>:</strong>
+				<%:Ethernet Bridge%><br />
 
-				&nbsp; &#x2514; <strong><%:a_s_if_bridge_id ID%>:</strong> <%=br.id%><br />
-				&nbsp; &#x2514; <strong><%:a_s_if_bridge_stp STP%>:</strong> <%=br.stp and "enabled" or "disabled"%><br />
+				&nbsp; &#x2514; <strong><%:ID%>:</strong> <%=br.id%><br />
+				&nbsp; &#x2514; <strong><%:STP%>:</strong> <%=br.stp and "enabled" or "disabled"%><br />
 
-				<strong><%:a_s_if_transfer Transfer%></strong><br />
-				&nbsp; &#x2514; <strong><%:a_s_if_transfer_rx RX%>:</strong> <%=devinfo[dev][2]%> Pkts. (<%=wba.byte_format(tonumber(devinfo[dev][1]))%>)<br />
-				&nbsp; &#x2514; <strong><%:a_s_if_transfer_tx TX%>:</strong> <%=devinfo[dev][10]%> Pkts. (<%=wba.byte_format(tonumber(devinfo[dev][9]))%>)<br />
+				<strong><%:Transfer%></strong><br />
+				&nbsp; &#x2514; <strong><%:RX%>:</strong> <%=devinfo[dev][2]%> Pkts. (<%=wba.byte_format(tonumber(devinfo[dev][1]))%>)<br />
+				&nbsp; &#x2514; <strong><%:TX%>:</strong> <%=devinfo[dev][10]%> Pkts. (<%=wba.byte_format(tonumber(devinfo[dev][9]))%>)<br />
 
 				<%- if ( b.ipaddr and #b.ipaddr > 0 ) or ( b.ip6addr and #b.ip6addr > 0 ) then -%>
-					<strong><%:a_s_if_ipconfig IP Configuration%></strong><br />
-					&nbsp; &#x2514; <strong><%:a_s_if_ipconfig_primary Primary%>:</strong>
+					<strong><%:IP Configuration%></strong><br />
+					&nbsp; &#x2514; <strong><%:Primary%>:</strong>
 					<% if b.ipaddr and #b.ipaddr > 0 then %>
 						<%=b.ipaddr%>/<%=b.netmask%>
 						<% if b.proto == "dhcp" then -%>
-							(<%:a_s_if_ipconfig_dhcp DHCP assigned%>)
+							(<%:DHCP assigned%>)
 						<%- end %>
 					<% else %>
-						<em><%:a_s_if_ipconfig_none Not configured%></em>
+						<em><%:Not configured%></em>
 					<% end %><br />
 
 					<% for i, a in ipairs(get_aliases(b)) do %>
-						&nbsp; &#x2514; <strong><%:a_s_if_ipconfig_alias Alias%> #<%=i%>:</strong>
-						<%=a.ipaddr%>/<%=a.netmask%> (<%:a_s_if_device Device%> <%=dev%>:<%=i%>) <br />
+						&nbsp; &#x2514; <strong><%:Alias%> #<%=i%>:</strong>
+						<%=a.ipaddr%>/<%=a.netmask%> (<%:Device%> <%=dev%>:<%=i%>) <br />
 					<% end %>
 
 					<% if b.ip6addr and #b.ip6addr > 0 then %>
-						&nbsp; &#x2514; <strong><%:a_s_if_ipconfig_ipv6 IPv6%>:</strong> <%=b.ip6addr%><br />
+						&nbsp; &#x2514; <strong><%:IPv6%>:</strong> <%=b.ip6addr%><br />
 					<% end %>
 				<%- end -%>
 
@@ -280,26 +280,26 @@ $Id$
 					dev     = i
 					vlan    = get_vlan(dev)
 				%>
-					<strong><%:a_s_if_bridge_port Bridge Port%> <%=n%></strong><br />
+					<strong><%:Bridge Port%> <%=n%></strong><br />
 
-					&nbsp; &#x2514; <strong><%:a_s_if_device Device%>:</strong>
-					<%=dev%> (<%:a_s_if_mac MAC%> <%=get_mac(dev)%>)<br />
+					&nbsp; &#x2514; <strong><%:Device%>:</strong>
+					<%=dev%> (<%:MAC%> <%=get_mac(dev)%>)<br />
 
-					&nbsp; &#x2514; <strong><%:a_s_if_type Type%>:</strong>
+					&nbsp; &#x2514; <strong><%:Type%>:</strong>
 					<% if is_wifi(dev) then iw = get_iwinfo(dev) -%>
-						<%:a_s_if_wifidev Wireless Adapter%> (<%=iw.type%>)<br />
+						<%:Wireless Adapter%> (<%=iw.type%>)<br />
 						<% if iw then %>
-							&nbsp; &nbsp; &nbsp; &#x2514; <strong><%:a_s_if_iwmode Mode%>:</strong> <%=get_iwmode(iw)%><br />
-							&nbsp; &nbsp; &nbsp; &#x2514; <strong><%:a_s_if_iwssid SSID%>:</strong> <%=iw.ssid%><br />
-							&nbsp; &nbsp; &nbsp; &#x2514; <strong><%:a_s_if_iwchannel Channel%>:</strong> <%=iw.channel%>
+							&nbsp; &nbsp; &nbsp; &#x2514; <strong><%:Mode%>:</strong> <%=get_iwmode(iw)%><br />
+							&nbsp; &nbsp; &nbsp; &#x2514; <strong><%:SSID%>:</strong> <%=iw.ssid%><br />
+							&nbsp; &nbsp; &nbsp; &#x2514; <strong><%:Channel%>:</strong> <%=iw.channel%>
 						<% end %>
 					<% else -%>
 						<% if vlan then %>
-							<%:a_s_if_ethswitch Ethernet Switch%> (<%=get_switch_driver(dev)%>)<br />
-							&nbsp; &nbsp; &nbsp; &#x2514; <strong><%:a_s_if_vlan VLAN%>:</strong>
-							<%=get_vlan(dev)%> (<%:a_s_if_vlan_ports Ports%> <%=table.concat(get_vlan_ports(dev), ", ")%>)
+							<%:Ethernet Switch%> (<%=get_switch_driver(dev)%>)<br />
+							&nbsp; &nbsp; &nbsp; &#x2514; <strong><%:VLAN%>:</strong>
+							<%=get_vlan(dev)%> (<%:Ports%> <%=table.concat(get_vlan_ports(dev), ", ")%>)
 						<% else %>
-							<%:a_s_if_ethdev Ethernet Adapter%>
+							<%:Ethernet Adapter%>
 						<% end %>
 					<% end -%><br />
 				<% end %>
diff --git a/modules/admin-full/luasrc/view/admin_status/iptables.htm b/modules/admin-full/luasrc/view/admin_status/iptables.htm
index b8f664c86..a81797dee 100644
--- a/modules/admin-full/luasrc/view/admin_status/iptables.htm
+++ b/modules/admin-full/luasrc/view/admin_status/iptables.htm
@@ -49,20 +49,20 @@ $Id$
 
 <%+header%>
 
-<h2><a id="content" name="content"><%:a_s_ipt_status Firewall Status%></a></h2>
+<h2><a id="content" name="content"><%:Firewall Status%></a></h2>
 
 <form method="post" action="<%=REQUEST_URI%>">
 	<div class="cbi-map">
 		<fieldset class="cbi-section">
-			<h3><%:a_s_ipt_actions Actions%></h3>
+			<h3><%:Actions%></h3>
 			<ul>
-				<li><a href="<%=REQUEST_URI%>?zero=1"><%:a_s_ipt_reset Reset Counters%></a></li>
-				<li><a href="<%=REQUEST_URI%>?restart=1"><%:a_s_ipt_restart Restart Firewall%></a></li>
+				<li><a href="<%=REQUEST_URI%>?zero=1"><%:Reset Counters%></a></li>
+				<li><a href="<%=REQUEST_URI%>?restart=1"><%:Restart Firewall%></a></li>
 			</ul>
 			<br /><br />
 
 			<% for _, tbl in ipairs({"Filter", "NAT", "Mangle"}) do chaincnt = 0 %>
-				<h3><%:a_s_ipt_table Table%>: <%=tbl%></h3>
+				<h3><%:Table%>: <%=tbl%></h3>
 				<table class="cbi-section-table" style="font-size:90%">
 					<% for _, chain in ipairs(ipt:chains(tbl)) do
 						rowcnt    = 0
@@ -72,26 +72,26 @@ $Id$
 						<tr class="cbi-section-table-titles cbi-rowstyle-<%=rowstyle()%>">
 							<th class="cbi-section-table-cell" style="text-align:left" colspan="11">
 								<br /><a name="rule_<%=tbl:lower()%>_<%=chain%>"></a>
-								<%:a_s_ipt_chain Chain%> <em><%=chain%></em>
+								<%:Chain%> <em><%=chain%></em>
 								(<%- if chaininfo.policy then -%>
-									<%:a_s_ipt_policy Policy%>: <em><%=chaininfo.policy%></em>, <%:a_s_ipt_packets Packets%>: <%=chaininfo.packets%>, <%:a_s_ipt_bytes Traffic%>: <%=wba.byte_format(chaininfo.bytes)-%>
+									<%:Policy%>: <em><%=chaininfo.policy%></em>, <%:Packets%>: <%=chaininfo.packets%>, <%:Traffic%>: <%=wba.byte_format(chaininfo.bytes)-%>
 								<%- else -%>
-									<%:a_s_ipt_references References%>: <%=chaininfo.references-%>
+									<%:References%>: <%=chaininfo.references-%>
 								<%- end -%>)
 							</th>
 						</tr>
 						<tr class="cbi-section-table-descr">
-							<th class="cbi-section-table-cell"><%:a_s_ipt_rulenum Rule #%></th>
-							<th class="cbi-section-table-cell"><%:a_s_ipt_packets Pkts.%></th>
-							<th class="cbi-section-table-cell"><%:a_s_ipt_bytes Traffic%></th>
-							<th class="cbi-section-table-cell"><%:a_s_ipt_target Target%></th>
-							<th class="cbi-section-table-cell"><%:a_s_ipt_proto Prot.%></th>
-							<th class="cbi-section-table-cell"><%:a_s_ipt_flags Flags%></th>
-							<th class="cbi-section-table-cell"><%:a_s_ipt_inputif In%></th>
-							<th class="cbi-section-table-cell"><%:a_s_ipt_outputif Out%></th>
-							<th class="cbi-section-table-cell"><%:a_s_ipt_source Source%></th>
-							<th class="cbi-section-table-cell"><%:a_s_ipt_destination Destination%></th>
-							<th class="cbi-section-table-cell" style="width:30%"><%:a_s_ipt_options Options%></th>
+							<th class="cbi-section-table-cell"><%:Rule #%></th>
+							<th class="cbi-section-table-cell"><%:Pkts.%></th>
+							<th class="cbi-section-table-cell"><%:Traffic%></th>
+							<th class="cbi-section-table-cell"><%:Target%></th>
+							<th class="cbi-section-table-cell"><%:Prot.%></th>
+							<th class="cbi-section-table-cell"><%:Flags%></th>
+							<th class="cbi-section-table-cell"><%:In%></th>
+							<th class="cbi-section-table-cell"><%:Out%></th>
+							<th class="cbi-section-table-cell"><%:Source%></th>
+							<th class="cbi-section-table-cell"><%:Destination%></th>
+							<th class="cbi-section-table-cell" style="width:30%"><%:Options%></th>
 						</tr>
 
 						<% for _, rule in ipairs(ipt:find({table=tbl, chain=chain})) do %>
@@ -112,14 +112,14 @@ $Id$
 
 						<% if rowcnt == 1 then %>
 							<tr class="cbi-section-table-titles cbi-rowstyle-<%=rowstyle()%>">
-								<td colspan="11"><em><%:a_s_ipt_norules No rules in this chain%></em></td>
+								<td colspan="11"><em><%:No rules in this chain%></em></td>
 							</tr>
 						<% end %>
 					<% end %>
 
 					<% if chaincnt == 0 then %>
 						<tr class="cbi-section-table-titles cbi-rowstyle-<%=rowstyle()%>">
-							<td colspan="11"><em><%:a_s_ipt_nochains No chains in this table%></em></td>
+							<td colspan="11"><em><%:No chains in this table%></em></td>
 						</tr>
 					<% end %>
 				</table>
diff --git a/modules/admin-full/luasrc/view/admin_status/routes.htm b/modules/admin-full/luasrc/view/admin_status/routes.htm
index cd62b80e5..905150135 100644
--- a/modules/admin-full/luasrc/view/admin_status/routes.htm
+++ b/modules/admin-full/luasrc/view/admin_status/routes.htm
@@ -25,20 +25,20 @@ $Id$
 <%+header%>
 
 <div class="cbi-map" id="cbi-network">
-	<h2><a id="content" name="content"><%:a_n_routes%></a></h2>
+	<h2><a id="content" name="content"><%:Routes%></a></h2>
 	<div class="cbi-map-descr"><%:a_n_routes1%></div>
 
 	<fieldset class="cbi-section" id="cbi-table-table">
-		<legend><%:a_n_routes_kernel4%></legend>
+		<legend><%:Active <abbr title="Internet Protocol Version 4">IPv4</abbr>-Routes%></legend>
 
 		<div class="cbi-section-node">
 			<table class="cbi-section-table">
 				<tr class="cbi-section-table-titles">
-					<th class="cbi-section-table-cell"><%:network%></th>
-					<th class="cbi-section-table-cell"><%:target%></th>
-					<th class="cbi-section-table-cell"><%:netmask%></th>
-					<th class="cbi-section-table-cell"><%:gateway%></th>
-					<th class="cbi-section-table-cell"><%:metric%></th>
+					<th class="cbi-section-table-cell"><%:Network%></th>
+					<th class="cbi-section-table-cell"><%:Target%></th>
+					<th class="cbi-section-table-cell"><%:<abbr title="Internet Protocol Version 4">IPv4</abbr>-Netmask%></th>
+					<th class="cbi-section-table-cell"><%:<abbr title="Internet Protocol Version 4">IPv4</abbr>-Gateway%></th>
+					<th class="cbi-section-table-cell"><%:Metric%></th>
 				</tr>
 				<% luci.sys.net.routes(function(rt) %>
 				<tr class="cbi-section-table-row cbi-rowstyle-<%=(style and 1 or 2)%>">
@@ -56,15 +56,15 @@ $Id$
 
 	<% if nixio.fs.access("/proc/net/ipv6_route") then style = true %>
 	<fieldset class="cbi-section" id="cbi-table-table">
-		<legend><%:a_n_routes_kernel6%></legend>
+		<legend><%:Active <abbr title="Internet Protocol Version 6">IPv6</abbr>-Routes%></legend>
 
 		<div class="cbi-section-node">
 			<table class="cbi-section-table">
 				<tr class="cbi-section-table-titles">
-					<th class="cbi-section-table-cell"><%:network%></th>
-					<th class="cbi-section-table-cell"><%:target%></th>
-					<th class="cbi-section-table-cell"><%:gateway6%></th>
-					<th class="cbi-section-table-cell"><%:metric%></th>
+					<th class="cbi-section-table-cell"><%:Network%></th>
+					<th class="cbi-section-table-cell"><%:Target%></th>
+					<th class="cbi-section-table-cell"><%:<abbr title="Internet Protocol Version 6">IPv6</abbr>-Gateway%></th>
+					<th class="cbi-section-table-cell"><%:Metric%></th>
 				</tr>
 				<% luci.sys.net.routes6(function(rt) %>
 				<tr class="cbi-section-table-row cbi-rowstyle-<%=(style and 1 or 2)%>">
diff --git a/modules/admin-full/luasrc/view/admin_status/syslog.htm b/modules/admin-full/luasrc/view/admin_status/syslog.htm
index 2e172cfbf..06aeeb01a 100644
--- a/modules/admin-full/luasrc/view/admin_status/syslog.htm
+++ b/modules/admin-full/luasrc/view/admin_status/syslog.htm
@@ -13,7 +13,7 @@ $Id$
 
 -%>
 <%+header%>
-<h2><a id="content" name="content"><%:syslog%></a></h2>
+<h2><a id="content" name="content"><%:System Log%></a></h2>
 <div id="content_syslog">
 <textarea readonly="readonly" wrap="off" rows="<%=syslog:cmatch("\n")+2%>" id="syslog"><%=syslog:pcdata()%></textarea>
 </div>
diff --git a/modules/admin-full/luasrc/view/admin_system/applyreboot.htm b/modules/admin-full/luasrc/view/admin_system/applyreboot.htm
index 1a1a24bb0..8ff7118c7 100644
--- a/modules/admin-full/luasrc/view/admin_system/applyreboot.htm
+++ b/modules/admin-full/luasrc/view/admin_system/applyreboot.htm
@@ -13,9 +13,9 @@ $Id$
 
 -%>
 <%+header%>
-<h2><a id="content" name="content"><%:system%></a></h2>
+<h2><a id="content" name="content"><%:System%></a></h2>
 <br />
-<p><% if msg then %><%=msg%><% else %><%:a_s_applyreboot1%><% end %></p>
-<p><%:a_s_reboot_running%></p>
+<p><% if msg then %><%=msg%><% else %><%:Changes applied.%><% end %></p>
+<p><%:Please wait: Device rebooting...%></p>
 <script type="text/javascript">setTimeout("location='<%=controller%>'", 60000)</script>
 <%+footer%>
\ No newline at end of file
diff --git a/modules/admin-full/luasrc/view/admin_system/backup.htm b/modules/admin-full/luasrc/view/admin_system/backup.htm
index 2db044ddd..a28d2b806 100644
--- a/modules/admin-full/luasrc/view/admin_system/backup.htm
+++ b/modules/admin-full/luasrc/view/admin_system/backup.htm
@@ -13,15 +13,15 @@ $Id$
 
 -%>
 <%+header%>
-<h2><a id="content" name="content"><%:system%></a></h2>
-<h3><%:a_s_backup%></h3>
-<p><%:a_s_backup1%></p>
+<h2><a id="content" name="content"><%:System%></a></h2>
+<h3><%:Backup / Restore%></h3>
+<p><%:Here you can backup and restore your router configuration and - if possible - reset the router to the default settings.%></p>
 <br />
 <div>
 	<ul>
-	<li><a href="<%=REQUEST_URI%>?backup=kthxbye"><%:a_s_backup_backup%></a></li>
+	<li><a href="<%=REQUEST_URI%>?backup=kthxbye"><%:Create backup%></a></li>
 	<% if reset_avail then -%>
-	<li><a href="<%=REQUEST_URI%>?reset=yarly" onclick="return confirm('<%:a_s_backup_reset1%>')"><%:a_s_backup_reset%></a></li>
+	<li><a href="<%=REQUEST_URI%>?reset=yarly" onclick="return confirm('<%:Proceed reverting all settings and resetting to firmware defaults?%>')"><%:Reset router to defaults%></a></li>
 	<% end -%>
 	</ul>
 </div>
@@ -29,12 +29,12 @@ $Id$
 <br />
 
 <form method="post" action="<%=REQUEST_URI%>" enctype="multipart/form-data">
-	<div class="left"><%:a_s_backup_archive%>:</div>
+	<div class="left"><%:Backup Archive%>:</div>
 	<div>
 		<input type="file" size="30" name="archive" />
 	</div>
 	<div>
-		<input type="submit" class="cbi-input-apply" value="<%:a_s_backup_restore%>" />
+		<input type="submit" class="cbi-input-apply" value="<%:Restore backup%>" />
 	</div>
 </form>
 <%+footer%>
\ No newline at end of file
diff --git a/modules/admin-full/luasrc/view/admin_system/ipkg.htm b/modules/admin-full/luasrc/view/admin_system/ipkg.htm
index 7f6c0fb89..c14e4546f 100644
--- a/modules/admin-full/luasrc/view/admin_system/ipkg.htm
+++ b/modules/admin-full/luasrc/view/admin_system/ipkg.htm
@@ -13,6 +13,6 @@ $Id$
 
 -%>
 <ul>
-<li><strong><%:a_s_p_ipkg_pkglists%>:</strong> <code>src <em>Name</em> <em>URL</em></code></li>
-<li><strong><%:a_s_p_ipkg_targets%>:</strong> <code>dest <em>Name</em> <em>Pfad</em></code></li>
+<li><strong><%:Package lists%>:</strong> <code>src <em>Name</em> <em>URL</em></code></li>
+<li><strong><%:Installation targets%>:</strong> <code>dest <em>Name</em> <em>Pfad</em></code></li>
 </ul>
diff --git a/modules/admin-full/luasrc/view/admin_system/packages.htm b/modules/admin-full/luasrc/view/admin_system/packages.htm
index 5cd9f635a..b4ece0532 100644
--- a/modules/admin-full/luasrc/view/admin_system/packages.htm
+++ b/modules/admin-full/luasrc/view/admin_system/packages.htm
@@ -25,29 +25,29 @@ function opkg_error(code)
 	code = bit.rshift(tonumber(code), 8)
 	return translate(
 		'a_s_packages_code%i' % code,
-		'%s %i' % { translate('code'), code }
+		'%s %i' % { translate('Code'), code }
 	)
 end
 -%>
 <%+header%>
-<h2><a id="content" name="content"><%:system%></a></h2>
-<h3><%:a_s_packages%></h3>
+<h2><a id="content" name="content"><%:System%></a></h2>
+<h3><%:Software%></h3>
 
 <br />
 
 <% if install or remove or update or upgrade then %>
-<div class="code"><strong><%:status%>:</strong><br />
+<div class="code"><strong><%:Status%>:</strong><br />
 <% if update then %>
-	<%:a_s_packages_update%>: <% if update == 0 then %><span class="ok"><%:ok%></span><% else %><span class="error"><%:error%> (<%=opkg_error(update)%>)</span><% end %><br />
+	<%:Package lists updated%>: <% if update == 0 then %><span class="ok"><%:OK%></span><% else %><span class="error"><%:Error%> (<%=opkg_error(update)%>)</span><% end %><br />
 <% end %>
 <% if upgrade then%>
-	<%:a_s_packages_upgrade%>: <% if upgrade == 0 then %><span class="ok"><%:ok%></span><% else %><span class="error"><%:error%> (<%=opkg_error(upgrade)%>)</span><% end %><br />
+	<%:Upgrade installed packages%>: <% if upgrade == 0 then %><span class="ok"><%:OK%></span><% else %><span class="error"><%:Error%> (<%=opkg_error(upgrade)%>)</span><% end %><br />
 <% end %>
 <% if install then for k,v in pairs(install) do %>
-	<%:a_s_packages_install%> '<%=k%>': <% if v == 0 then %><span class="ok"><%:ok%></span><% else %><span class="error"><%:error%> (<%=opkg_error(v)%>)</span><% end %><br />
+	<%:Install%> '<%=k%>': <% if v == 0 then %><span class="ok"><%:OK%></span><% else %><span class="error"><%:Error%> (<%=opkg_error(v)%>)</span><% end %><br />
 <% end end %>
 <% if remove then for k,v in pairs(remove) do %>
-	<%:a_s_packages_remove%> '<%=k%>': <% if v == 0 then %><span class="ok"><%:ok%></span><% else %><span class="error"><%:error%> (<%=opkg_error(v)%>)</span><% end %><br />
+	<%:Remove%> '<%=k%>': <% if v == 0 then %><span class="ok"><%:OK%></span><% else %><span class="error"><%:Error%> (<%=opkg_error(v)%>)</span><% end %><br />
 <% end end %>
 </div>
 <br />
@@ -57,41 +57,41 @@ end
 	<div class="cbi-map">
 		<fieldset class="cbi-section">
 			<ul>
-				<li><a href="<%=REQUEST_URI%>/ipkg"><%:a_s_packages_ipkg%></a></li>
-				<li><a href="<%=REQUEST_URI%>?update=1"><%:a_s_packages_updatelist%></a></li>
+				<li><a href="<%=REQUEST_URI%>/ipkg"><%:Edit package lists and installation targets%></a></li>
+				<li><a href="<%=REQUEST_URI%>?update=1"><%:Update package lists%></a></li>
 			</ul>
 			<br />
 			<fieldset class="cbi-section-node">
 			<div class="cbi-value">
-				<label class="cbi-value-title"><%:a_s_packages_installurl%>:</label>
+				<label class="cbi-value-title"><%:Download and install package%>:</label>
 				<div class="cbi-value-field">
 					<input type="text" name="url" size="30" value="" />
-					<input class="cbi-input-save" type="submit" name="submit" value="<%:ok%>" />
+					<input class="cbi-input-save" type="submit" name="submit" value="<%:OK%>" />
 				</div>
 			</div>
 
 			<div class="cbi-value">
-				<label class="cbi-value-title"><%:filter%>:</label>
+				<label class="cbi-value-title"><%:Filter%>:</label>
 				<div class="cbi-value-field">
 					<input type="text" name="query" size="20" value="<%=query%>" />
-					<input type="submit" class="cbi-input-find" name="search" value="<%:a_s_packages_search%>" />
+					<input type="submit" class="cbi-input-find" name="search" value="<%:Find package%>" />
 				</div>
 			</div>
 
 			<table class="cbi-section-table">
 				<tr class="cbi-section-table-titles">
-					<th class="cbi-section-table-cell"><%:a_s_packages_name%></th>
-					<th class="cbi-section-table-cell"><%:version%></th>
-					<th class="cbi-section-table-cell"><%:install%></th>
-					<th class="cbi-section-table-cell"><%:delete%></th>
-					<th class="cbi-section-table-cell"><%:descr%></th>
+					<th class="cbi-section-table-cell"><%:Package name%></th>
+					<th class="cbi-section-table-cell"><%:Version%></th>
+					<th class="cbi-section-table-cell"><%:Install%></th>
+					<th class="cbi-section-table-cell"><%:Delete%></th>
+					<th class="cbi-section-table-cell"><%:Description%></th>
 				</tr>
 				<% for k, pkg in pairs(pkgs) do %>
 				<tr class="cbi-section-table-row cbi-rowstyle-<%=rowstyle()%>">
 					<td><%=luci.util.pcdata(pkg.Package)%></td>
 					<td><%=luci.util.pcdata(pkg.Version)%></td>
 					<td><% if not pkg.Status or not pkg.Status.installed then %><input type="checkbox" name="install.<%=pkg.Package%>" value="1" /><% else %><%:installed%><% end %></td>
-					<td><% if pkg.Status and pkg.Status.installed then %><input type="checkbox" name="remove.<%=pkg.Package%>" value="1" /><% else %><%:notinstalled%><% end %></td>
+					<td><% if pkg.Status and pkg.Status.installed then %><input type="checkbox" name="remove.<%=pkg.Package%>" value="1" /><% else %><%:not installed%><% end %></td>
 					<td><%=luci.util.pcdata(pkg.Description)%></td>
 				</tr>
 				<% end %>
@@ -100,7 +100,7 @@ end
 			<br />
 
 			<div style="text-align: right">
-				<input type="submit" class="cbi-input-apply" name="submit" value="<%:a_s_packages_do%>" />
+				<input type="submit" class="cbi-input-apply" name="submit" value="<%:Perform Actions%>" />
 			</div>
 		</fieldset></fieldset>
 	</div>
diff --git a/modules/admin-full/luasrc/view/admin_system/reboot.htm b/modules/admin-full/luasrc/view/admin_system/reboot.htm
index f1656fbb8..5f2912d92 100644
--- a/modules/admin-full/luasrc/view/admin_system/reboot.htm
+++ b/modules/admin-full/luasrc/view/admin_system/reboot.htm
@@ -13,21 +13,21 @@ $Id$
 
 -%>
 <%+header%>
-<h2><a id="content" name="content"><%:system%></a></h2>
-<h3><%:reboot%></h3>
-<p><%:a_s_reboot1%></p>
+<h2><a id="content" name="content"><%:System%></a></h2>
+<h3><%:Reboot%></h3>
+<p><%:Reboots the operating system of your device%></p>
 <%-
 local c = require("luci.model.uci").cursor():changes()
 if c and next(c) then
 -%>
-	<p class="warning"><%:a_s_reboot_u%></p> 
+	<p class="warning"><%:Warning: There are unsaved changes that will be lost while rebooting!%></p> 
 <%-
 end
 if not reboot then 
 -%>
-<p><a href="<%=controller%>/admin/system/reboot?reboot=1"><%:a_s_reboot_do%></a></p>
+<p><a href="<%=controller%>/admin/system/reboot?reboot=1"><%:Perform reboot%></a></p>
 <%- else -%>
-<p><%:a_s_reboot_running%></p>
+<p><%:Please wait: Device rebooting...%></p>
 <script type="text/javascript">setTimeout("location='<%=controller%>/admin'", 60000)</script>
 <%- end -%>
 <%+footer%>
\ No newline at end of file
diff --git a/modules/admin-full/luasrc/view/admin_system/upgrade.htm b/modules/admin-full/luasrc/view/admin_system/upgrade.htm
index 425113e62..510a51b15 100644
--- a/modules/admin-full/luasrc/view/admin_system/upgrade.htm
+++ b/modules/admin-full/luasrc/view/admin_system/upgrade.htm
@@ -15,7 +15,7 @@ $Id$
 
 <%+header%>
 
-<h2><a id="content" name="content"><%:system%></a></h2>
+<h2><a id="content" name="content"><%:System%></a></h2>
 <h3><%:admin_upgrade Flash Firmware%></h3>
 
 <% if step == 1 then %>
@@ -73,7 +73,6 @@ $Id$
 	
 				if flashsize > 0 then
 					write(luci.i18n.translatef(
-						"admin_upgrade_spaceavail",
 						" (%s available)",
 						w.byte_format(flashsize)
 					))
diff --git a/modules/admin-full/luasrc/view/admin_uci/apply.htm b/modules/admin-full/luasrc/view/admin_uci/apply.htm
index ac18746b6..e9de29a91 100644
--- a/modules/admin-full/luasrc/view/admin_uci/apply.htm
+++ b/modules/admin-full/luasrc/view/admin_uci/apply.htm
@@ -14,8 +14,8 @@ $Id$
 -%>
 <%+header%>
 
-<h2><a id="content" name="content"><%:config%></a></h2>
-<p><strong><%:uci_applied%>:</strong></p>
+<h2><a id="content" name="content"><%:Configuration%></a></h2>
+<p><strong><%:The following changes have been applied%>:</strong></p>
 
 <div class="cbi-section">
 	<code><%=(changes or "-")%></code>
diff --git a/modules/admin-full/luasrc/view/admin_uci/changes.htm b/modules/admin-full/luasrc/view/admin_uci/changes.htm
index a9db8b49b..6dd3e5990 100644
--- a/modules/admin-full/luasrc/view/admin_uci/changes.htm
+++ b/modules/admin-full/luasrc/view/admin_uci/changes.htm
@@ -15,8 +15,8 @@ $Id$
 
 <%+header%>
 
-<h2><a id="content" name="content"><%:config%></a></h2>
-<p><strong><%:changes%>:</strong></p>
+<h2><a id="content" name="content"><%:Configuration%></a></h2>
+<p><strong><%:Changes%>:</strong></p>
 
 <div class="cbi-section">
 	<code><%=changes%></code>
@@ -31,13 +31,13 @@ $Id$
 
 	<div style="text-align:right">
 		<form class="inline" method="get" action="<%=controller%>/admin/uci/apply">
-			<input class="cbi-button cbi-button-apply" type="submit" value="<%:apply%>" />
+			<input class="cbi-button cbi-button-apply" type="submit" value="<%:Apply%>" />
 		</form>
 		<form class="inline" method="get" action="<%=controller%>/admin/uci/saveapply">
-			<input class="cbi-button cbi-button-save" type="submit" value="<%:saveapply%>" />
+			<input class="cbi-button cbi-button-save" type="submit" value="<%:Save & Apply%>" />
 		</form>
 		<form class="inline" method="get" action="<%=controller%>/admin/uci/revert">
-			<input class="cbi-button cbi-button-reset" type="submit" value="<%:revert%>" />
+			<input class="cbi-button cbi-button-reset" type="submit" value="<%:Revert%>" />
 		</form>
 	</div>
 </div>
diff --git a/modules/admin-full/luasrc/view/admin_uci/revert.htm b/modules/admin-full/luasrc/view/admin_uci/revert.htm
index 9c98d452e..863cfda86 100644
--- a/modules/admin-full/luasrc/view/admin_uci/revert.htm
+++ b/modules/admin-full/luasrc/view/admin_uci/revert.htm
@@ -15,8 +15,8 @@ $Id$
 
 <%+header%>
 
-<h2><a id="content" name="content"><%:config%></a></h2>
-<p><strong><%:uci_reverted%>:</strong></p>
+<h2><a id="content" name="content"><%:Configuration%></a></h2>
+<p><strong><%:The following changes have been reverted%>:</strong></p>
 
 <div class="cbi-section">
 	<code><%=(changes or "-")%></code>
diff --git a/modules/admin-mini/luasrc/controller/mini/index.lua b/modules/admin-mini/luasrc/controller/mini/index.lua
index acff55aab..f50858f4d 100644
--- a/modules/admin-mini/luasrc/controller/mini/index.lua
+++ b/modules/admin-mini/luasrc/controller/mini/index.lua
@@ -27,16 +27,16 @@ function index()
 	
 	entry({"about"}, template("about")).i18n = "admin-core"
 	
-	local page   = entry({"mini"}, alias("mini", "index"), i18n("essentials", "Essentials"), 10)
+	local page   = entry({"mini"}, alias("mini", "index"), i18n("Essentials"), 10)
 	page.i18n    = "admin-core"
 	page.sysauth = "root"
 	page.sysauth_authenticator = "htmlauth"
 	page.index = true
 	
-	entry({"mini", "index"}, alias("mini", "index", "index"), i18n("overview"), 10).index = true
-	entry({"mini", "index", "index"}, form("mini/index"), i18n("general"), 1).ignoreindex = true
-	entry({"mini", "index", "luci"}, cbi("mini/luci", {autoapply=true}), i18n("settings"), 10)
-	entry({"mini", "index", "logout"}, call("action_logout"), i18n("logout"))
+	entry({"mini", "index"}, alias("mini", "index", "index"), i18n("Overview"), 10).index = true
+	entry({"mini", "index", "index"}, form("mini/index"), i18n("General"), 1).ignoreindex = true
+	entry({"mini", "index", "luci"}, cbi("mini/luci", {autoapply=true}), i18n("Settings"), 10)
+	entry({"mini", "index", "logout"}, call("action_logout"), i18n("Logout"))
 end
 
 function action_logout()
diff --git a/modules/admin-mini/luasrc/controller/mini/network.lua b/modules/admin-mini/luasrc/controller/mini/network.lua
index ab933ccac..25f29d9db 100644
--- a/modules/admin-mini/luasrc/controller/mini/network.lua
+++ b/modules/admin-mini/luasrc/controller/mini/network.lua
@@ -19,8 +19,8 @@ function index()
 	luci.i18n.loadc("admin-core")
 	local i18n = luci.i18n.translate
 
-	entry({"mini", "network"}, alias("mini", "network", "index"), i18n("network"), 20).index = true
-	entry({"mini", "network", "index"}, cbi("mini/network", {autoapply=true}), i18n("general"), 1)
-	entry({"mini", "network", "wifi"}, cbi("mini/wifi", {autoapply=true}), i18n("wifi"), 10).i18n="wifi"
+	entry({"mini", "network"}, alias("mini", "network", "index"), i18n("Network"), 20).index = true
+	entry({"mini", "network", "index"}, cbi("mini/network", {autoapply=true}), i18n("General"), 1)
+	entry({"mini", "network", "wifi"}, cbi("mini/wifi", {autoapply=true}), i18n("Wifi"), 10).i18n="wifi"
 	entry({"mini", "network", "dhcp"}, cbi("mini/dhcp", {autoapply=true}), "DHCP", 20)
 end
\ No newline at end of file
diff --git a/modules/admin-mini/luasrc/controller/mini/system.lua b/modules/admin-mini/luasrc/controller/mini/system.lua
index 075f51e91..f21a9ef96 100644
--- a/modules/admin-mini/luasrc/controller/mini/system.lua
+++ b/modules/admin-mini/luasrc/controller/mini/system.lua
@@ -19,12 +19,12 @@ function index()
 	luci.i18n.loadc("admin-core")
 	local i18n = luci.i18n.translate
 
-	entry({"mini", "system"}, alias("mini", "system", "index"), i18n("system"), 40).index = true
-	entry({"mini", "system", "index"}, cbi("mini/system", {autoapply=true}), i18n("general"), 1)
-	entry({"mini", "system", "passwd"}, form("mini/passwd"), i18n("a_s_changepw"), 10)
-	entry({"mini", "system", "backup"}, call("action_backup"), i18n("a_s_backup"), 80)
-	entry({"mini", "system", "upgrade"}, call("action_upgrade"), i18n("admin_upgrade"), 90)
-	entry({"mini", "system", "reboot"}, call("action_reboot"), i18n("reboot"), 100)
+	entry({"mini", "system"}, alias("mini", "system", "index"), i18n("System"), 40).index = true
+	entry({"mini", "system", "index"}, cbi("mini/system", {autoapply=true}), i18n("General"), 1)
+	entry({"mini", "system", "passwd"}, form("mini/passwd"), i18n("Admin Password"), 10)
+	entry({"mini", "system", "backup"}, call("action_backup"), i18n("Backup / Restore"), 80)
+	entry({"mini", "system", "upgrade"}, call("action_upgrade"), i18n("Flash Firmware"), 90)
+	entry({"mini", "system", "reboot"}, call("action_reboot"), i18n("Reboot"), 100)
 end
 
 function action_backup()
diff --git a/modules/admin-mini/luasrc/model/cbi/mini/dhcp.lua b/modules/admin-mini/luasrc/model/cbi/mini/dhcp.lua
index 5817a93d7..8c405ca59 100644
--- a/modules/admin-mini/luasrc/model/cbi/mini/dhcp.lua
+++ b/modules/admin-mini/luasrc/model/cbi/mini/dhcp.lua
@@ -31,12 +31,12 @@ enable = s:option(ListValue, "ignore", translate("enable"), "")
 enable:value(0, translate("enable"))
 enable:value(1, translate("disable"))
 
-start = s:option(Value, "start", translate("m_n_d_firstaddress"))
+start = s:option(Value, "start", translate("First leased address"))
 start.rmempty = true
 start:depends("ignore", "0")
 
 
-limit = s:option(Value, "limit", translate("m_n_d_numleases"), "")
+limit = s:option(Value, "limit", translate("Number of leased addresses"), "")
 limit:depends("ignore", "0")
 
 function limit.cfgvalue(self, section)
@@ -60,7 +60,7 @@ time.rmempty = true
 
 
 
-m2 = Map("luci_ethers", translate("dhcp_leases"))
+m2 = Map("luci_ethers", translate("Leases"))
 
 local leasefn, leasefp, leases
 uci:foreach("dhcp", "dnsmasq",
@@ -77,25 +77,25 @@ if leasefp then
 end
 
 if leases then
-	v = m2:section(Table, leases, translate("dhcp_leases_active"))
-	ip = v:option(DummyValue, 3, translate("ipaddress"))
+	v = m2:section(Table, leases, translate("Active Leases"))
+	ip = v:option(DummyValue, 3, translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"))
 	
-	mac  = v:option(DummyValue, 2, translate("macaddress"))
+	mac  = v:option(DummyValue, 2, translate("<abbr title=\"Media Access Control\">MAC</abbr>-Address"))
 	
-	ltime = v:option(DummyValue, 1, translate("dhcp_timeremain"))
+	ltime = v:option(DummyValue, 1, translate("Leasetime remaining"))
 	function ltime.cfgvalue(self, ...)
 		local value = DummyValue.cfgvalue(self, ...)
 		return wa.date_format(os.difftime(tonumber(value), os.time()))
 	end
 end
 
-s = m2:section(TypedSection, "static_lease", translate("luci_ethers"))
+s = m2:section(TypedSection, "static_lease", translate("Static Leases"))
 s.addremove = true
 s.anonymous = true
 s.template = "cbi/tblsection"
 
-mac = s:option(Value, "macaddr", translate("macaddress"))
-ip = s:option(Value, "ipaddr", translate("ipaddress"))
+mac = s:option(Value, "macaddr", translate("<abbr title=\"Media Access Control\">MAC</abbr>-Address"))
+ip = s:option(Value, "ipaddr", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"))
 sys.net.arptable(function(entry)
 	ip:value(entry["IP address"])
 	mac:value(
diff --git a/modules/admin-mini/luasrc/model/cbi/mini/luci.lua b/modules/admin-mini/luasrc/model/cbi/mini/luci.lua
index 28efad921..58755fde7 100644
--- a/modules/admin-mini/luasrc/model/cbi/mini/luci.lua
+++ b/modules/admin-mini/luasrc/model/cbi/mini/luci.lua
@@ -16,7 +16,7 @@ $Id$
 require "luci.config"
 local fs = require "nixio.fs"
 
-m = Map("luci", translate("webui"), translate("a_i_luci1"))
+m = Map("luci", translate("Web <abbr title=\"User Interface\">UI</abbr>"), translate("Here you can customize the settings and the functionality of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>."))
 
 -- force reload of global luci config namespace to reflect the changes
 function m.commit_handler(self)
@@ -25,9 +25,9 @@ function m.commit_handler(self)
 end
 
 
-c = m:section(NamedSection, "main", "core", translate("general"))
+c = m:section(NamedSection, "main", "core", translate("General"))
 
-l = c:option(ListValue, "lang", translate("language"))
+l = c:option(ListValue, "lang", translate("Language"))
 l:value("auto")
 
 local i18ndir = luci.i18n.i18ndir .. "default."
@@ -38,7 +38,7 @@ for k, v in luci.util.kspairs(luci.config.languages) do
 	end
 end
 
-t = c:option(ListValue, "mediaurlbase", translate("design"))
+t = c:option(ListValue, "mediaurlbase", translate("Design"))
 for k, v in pairs(luci.config.themes) do
 	if k:sub(1, 1) ~= "." then
 		t:value(v, k)
diff --git a/modules/admin-mini/luasrc/model/cbi/mini/network.lua b/modules/admin-mini/luasrc/model/cbi/mini/network.lua
index 14414e999..43ad212cc 100644
--- a/modules/admin-mini/luasrc/model/cbi/mini/network.lua
+++ b/modules/admin-mini/luasrc/model/cbi/mini/network.lua
@@ -31,14 +31,14 @@ for k, v in pairs(network) do
 	end
 end
 
-m = Map("network", translate("network"))
-s = m:section(Table, ifaces, translate("status"))
+m = Map("network", translate("Network"))
+s = m:section(Table, ifaces, translate("Status"))
 s.parse = function() end
 
-s:option(DummyValue, ".name", translate("network"))
+s:option(DummyValue, ".name", translate("Network"))
 
 hwaddr = s:option(DummyValue, "_hwaddr",
- translate("network_interface_hwaddr"), translate("network_interface_hwaddr_desc"))
+ translate("<abbr title=\"Media Access Control\">MAC</abbr>-Address"), translate("Hardware Address"))
 function hwaddr.cfgvalue(self, section)
 	local ix = self.map:get(section, "ifname") or ""
 	return fs.readfile("/sys/class/net/" .. ix .. "/address")
@@ -47,13 +47,13 @@ function hwaddr.cfgvalue(self, section)
 end
 
 
-s:option(DummyValue, "ipaddr", translate("ipaddress"))
+s:option(DummyValue, "ipaddr", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"))
 
-s:option(DummyValue, "netmask", translate("netmask"))
+s:option(DummyValue, "netmask", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"))
 
 
 txrx = s:option(DummyValue, "_txrx",
- translate("network_interface_txrx"), translate("network_interface_txrx_desc"))
+ translate("Traffic"), translate("transmitted / received"))
 
 function txrx.cfgvalue(self, section)
 	local ix = self.map:get(section, "ifname")
@@ -68,7 +68,7 @@ function txrx.cfgvalue(self, section)
 end
 
 errors = s:option(DummyValue, "_err",
- translate("network_interface_err"), translate("network_interface_err_desc"))
+ translate("Errors"), translate("TX / RX"))
 
 function errors.cfgvalue(self, section)
 	local ix = self.map:get(section, "ifname")
@@ -84,28 +84,28 @@ end
 
 
 
-s = m:section(NamedSection, "lan", "interface", translate("m_n_local"))
+s = m:section(NamedSection, "lan", "interface", translate("Local Network"))
 s.addremove = false
-s:option(Value, "ipaddr", translate("ipaddress"))
+s:option(Value, "ipaddr", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"))
 
-nm = s:option(Value, "netmask", translate("netmask"))
+nm = s:option(Value, "netmask", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"))
 nm:value("255.255.255.0")
 nm:value("255.255.0.0")
 nm:value("255.0.0.0")
 
-gw = s:option(Value, "gateway", translate("gateway") .. translate("cbi_optional"))
+gw = s:option(Value, "gateway", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway") .. translate(" (optional)"))
 gw.rmempty = true
-dns = s:option(Value, "dns", translate("dnsserver") .. translate("cbi_optional"))
+dns = s:option(Value, "dns", translate("<abbr title=\"Domain Name System\">DNS</abbr>-Server") .. translate(" (optional)"))
 dns.rmempty = true
 
 
-s = m:section(NamedSection, "wan", "interface", translate("m_n_inet"))
+s = m:section(NamedSection, "wan", "interface", translate("Internet Connection"))
 s.addremove = false
-p = s:option(ListValue, "proto", translate("protocol"))
+p = s:option(ListValue, "proto", translate("Protocol"))
 p.override_values = true
 p:value("none", "disabled")
-p:value("static", translate("manual", "manual"))
-p:value("dhcp", translate("automatic", "automatic"))
+p:value("static", translate("manual"))
+p:value("dhcp", translate("automatic"))
 if has_pppoe then p:value("pppoe", "PPPoE") end
 if has_pptp  then p:value("pptp",  "PPTP")  end
 
@@ -120,29 +120,29 @@ function p.write(self, section, value)
 end
 
 if not ( has_pppoe and has_pptp ) then
-	p.description = translate("network_interface_prereq_mini")
+	p.description = translate("You need to install \"ppp-mod-pppoe\" for PPPoE or \"pptp\" for PPtP support")
 end
 
 
-ip = s:option(Value, "ipaddr", translate("ipaddress"))
+ip = s:option(Value, "ipaddr", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"))
 ip:depends("proto", "static")
 
-nm = s:option(Value, "netmask", translate("netmask"))
+nm = s:option(Value, "netmask", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"))
 nm:depends("proto", "static")
 
-gw = s:option(Value, "gateway", translate("gateway"))
+gw = s:option(Value, "gateway", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"))
 gw:depends("proto", "static")
 gw.rmempty = true
 
-dns = s:option(Value, "dns", translate("dnsserver"))
+dns = s:option(Value, "dns", translate("<abbr title=\"Domain Name System\">DNS</abbr>-Server"))
 dns:depends("proto", "static")
 dns.rmempty = true
 
-usr = s:option(Value, "username", translate("username"))
+usr = s:option(Value, "username", translate("Username"))
 usr:depends("proto", "pppoe")
 usr:depends("proto", "pptp")
 
-pwd = s:option(Value, "password", translate("password"))
+pwd = s:option(Value, "password", translate("Password"))
 pwd.password = true
 pwd:depends("proto", "pppoe")
 pwd:depends("proto", "pptp")
@@ -152,7 +152,7 @@ pwd:depends("proto", "pptp")
 -- This cures some cancer for providers with pre-war routers
 if fs.access("/etc/config/firewall") then
 	mssfix = s:option(Flag, "_mssfix",
-		translate("m_n_mssfix"), translate("m_n_mssfix_desc"))
+		translate("Clamp Segment Size"), translate("Fixes problems with unreachable websites, submitting forms or other unexpected behaviour for some ISPs."))
 	mssfix.rmempty = false
 
 	function mssfix.cfgvalue(self)
@@ -175,19 +175,19 @@ if fs.access("/etc/config/firewall") then
 	end
 end
 
-kea = s:option(Flag, "keepalive", translate("m_n_keepalive"))
+kea = s:option(Flag, "keepalive", translate("automatically reconnect"))
 kea:depends("proto", "pppoe")
 kea:depends("proto", "pptp")
 kea.rmempty = true
 kea.enabled = "10"
 
 
-cod = s:option(Value, "demand", translate("m_n_dialondemand"), "s")
+cod = s:option(Value, "demand", translate("disconnect when idle for"), "s")
 cod:depends("proto", "pppoe")
 cod:depends("proto", "pptp")
 cod.rmempty = true
 
-srv = s:option(Value, "server", translate("m_n_pptp_server"))
+srv = s:option(Value, "server", translate("<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"))
 srv:depends("proto", "pptp")
 srv.rmempty = true
 
diff --git a/modules/admin-mini/luasrc/model/cbi/mini/passwd.lua b/modules/admin-mini/luasrc/model/cbi/mini/passwd.lua
index dff5aeb7b..6f13bb0fc 100644
--- a/modules/admin-mini/luasrc/model/cbi/mini/passwd.lua
+++ b/modules/admin-mini/luasrc/model/cbi/mini/passwd.lua
@@ -12,13 +12,13 @@ You may obtain a copy of the License at
 
 $Id$
 ]]--
-f = SimpleForm("password", translate("a_s_changepw"), translate("a_s_changepw1"))
+f = SimpleForm("password", translate("Admin Password"), translate("Change the password of the system administrator (User <code>root</code>)"))
 
-pw1 = f:field(Value, "pw1", translate("password"))
+pw1 = f:field(Value, "pw1", translate("Password"))
 pw1.password = true
 pw1.rmempty = false
 
-pw2 = f:field(Value, "pw2", translate("confirmation"))
+pw2 = f:field(Value, "pw2", translate("Confirmation"))
 pw2.password = true
 pw2.rmempty = false
 
@@ -31,9 +31,9 @@ function f.handle(self, state, data)
 		local stat = luci.sys.user.setpasswd("root", data.pw1) == 0
 		
 		if stat then
-			f.message = translate("a_s_changepw_changed")
+			f.message = translate("Password successfully changed")
 		else
-			f.errmessage = translate("unknownerror")
+			f.errmessage = translate("Unknown Error")
 		end
 		
 		data.pw1 = nil
diff --git a/modules/admin-mini/luasrc/model/cbi/mini/system.lua b/modules/admin-mini/luasrc/model/cbi/mini/system.lua
index 90ee79083..ac11abe9c 100644
--- a/modules/admin-mini/luasrc/model/cbi/mini/system.lua
+++ b/modules/admin-mini/luasrc/model/cbi/mini/system.lua
@@ -17,7 +17,7 @@ require("luci.sys.zoneinfo")
 require("luci.tools.webadmin")
 
 
-m = Map("system", translate("system"), translate("a_s_desc"))
+m = Map("system", translate("System"), translate("Here you can configure the basic aspects of your device like its hostname or the timezone."))
 
 s = m:section(TypedSection, "system", "")
 s.anonymous = true
@@ -27,14 +27,14 @@ s.addremove = false
 local system, model, memtotal, memcached, membuffers, memfree = luci.sys.sysinfo()
 local uptime = luci.sys.uptime()
 
-s:option(DummyValue, "_system", translate("system")).value = system
-s:option(DummyValue, "_cpu", translate("m_i_processor")).value = model
+s:option(DummyValue, "_system", translate("System")).value = system
+s:option(DummyValue, "_cpu", translate("Processor")).value = model
 
 local load1, load5, load15 = luci.sys.loadavg()
-s:option(DummyValue, "_la", translate("load")).value =
+s:option(DummyValue, "_la", translate("Load")).value =
  string.format("%.2f, %.2f, %.2f", load1, load5, load15)
 
-s:option(DummyValue, "_memtotal", translate("m_i_memory")).value =
+s:option(DummyValue, "_memtotal", translate("Memory")).value =
  string.format("%.2f MB (%.0f%% %s, %.0f%% %s, %.0f%% %s)",
   tonumber(memtotal) / 1024,
   100 * memcached / memtotal,
@@ -45,13 +45,13 @@ s:option(DummyValue, "_memtotal", translate("m_i_memory")).value =
   tostring(translate("mem_free", ""))
 )
 
-s:option(DummyValue, "_systime", translate("m_i_systemtime")).value =
+s:option(DummyValue, "_systime", translate("Local Time")).value =
  os.date("%c")
 
-s:option(DummyValue, "_uptime", translate("m_i_uptime")).value =
+s:option(DummyValue, "_uptime", translate("Uptime")).value =
  luci.tools.webadmin.date_format(tonumber(uptime))
 
-hn = s:option(Value, "hostname", translate("hostname"))
+hn = s:option(Value, "hostname", translate("Hostname"))
 
 function hn.write(self, section, value)
 	Value.write(self, section, value)
@@ -59,7 +59,7 @@ function hn.write(self, section, value)
 end
 
 
-tz = s:option(ListValue, "zonename", translate("timezone"))
+tz = s:option(ListValue, "zonename", translate("Timezone"))
 tz:value("UTC")
 
 for i, zone in ipairs(luci.sys.zoneinfo.TZ) do
diff --git a/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua b/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
index 765011a1f..a062dff5c 100644
--- a/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
+++ b/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
@@ -45,14 +45,14 @@ wlcursor:foreach("wireless", "wifi-device",
 
 -- Main Map --
 
-m = Map("wireless", translate("wifi"), translate("a_w_devices1"))
+m = Map("wireless", translate("Wifi"), translate("Here you can configure installed wifi devices."))
 m:chain("network")
 
 
 -- Status Table --
-s = m:section(Table, ifaces, translate("networks"))
+s = m:section(Table, ifaces, translate("Networks"))
 
-link = s:option(DummyValue, "_link", translate("link"))
+link = s:option(DummyValue, "_link", translate("Link"))
 function link.cfgvalue(self, section)
 	local ifname = self.map:get(section, "ifname")
 	return wifidata[ifname] and wifidata[ifname]["Link Quality"] or "-"
@@ -67,27 +67,27 @@ function bssid.cfgvalue(self, section)
 	 or wifidata[ifname]["Access Point"])) or "-"
 end
 
-channel = s:option(DummyValue, "channel", translate("channel"))
+channel = s:option(DummyValue, "channel", translate("Channel"))
 function channel.cfgvalue(self, section)
 	return wireless[self.map:get(section, "device")].channel
 end
 
-protocol = s:option(DummyValue, "_mode", translate("protocol"))
+protocol = s:option(DummyValue, "_mode", translate("Protocol"))
 function protocol.cfgvalue(self, section)
 	local mode = wireless[self.map:get(section, "device")].mode
 	return mode and "802." .. mode
 end
 
-mode = s:option(DummyValue, "mode", translate("mode"))
-encryption = s:option(DummyValue, "encryption", translate("iwscan_encr"))
+mode = s:option(DummyValue, "mode", translate("Mode"))
+encryption = s:option(DummyValue, "encryption", translate("<abbr title=\"Encrypted\">Encr.</abbr>"))
 
-power = s:option(DummyValue, "_power", translate("power"))
+power = s:option(DummyValue, "_power", translate("Power"))
 function power.cfgvalue(self, section)
 	local ifname = self.map:get(section, "ifname")
 	return wifidata[ifname] and wifidata[ifname]["Tx-Power"] or "-"
 end
 
-scan = s:option(Button, "_scan", translate("scan"))
+scan = s:option(Button, "_scan", translate("Scan"))
 scan.inputstyle = "find"
 
 function scan.cfgvalue(self, section)
@@ -96,7 +96,7 @@ end
 
 -- WLAN-Scan-Table --
 
-t2 = m:section(Table, {}, translate("iwscan"), translate("iwscan1"))
+t2 = m:section(Table, {}, translate("<abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan"), translate("Wifi networks in your local environment"))
 
 function scan.write(self, section)
 	m.autoapply = false
@@ -108,26 +108,26 @@ end
 t2._render = t2.render
 t2.render = function() end
 
-t2:option(DummyValue, "Quality", translate("iwscan_link"))
+t2:option(DummyValue, "Quality", translate("Link"))
 essid = t2:option(DummyValue, "ESSID", "ESSID")
 function essid.cfgvalue(self, section)
 	return self.map:get(section, "ESSID")
 end
 
 t2:option(DummyValue, "Address", "BSSID")
-t2:option(DummyValue, "Mode", translate("mode"))
-chan = t2:option(DummyValue, "channel", translate("channel"))
+t2:option(DummyValue, "Mode", translate("Mode"))
+chan = t2:option(DummyValue, "channel", translate("Channel"))
 function chan.cfgvalue(self, section)
 	return self.map:get(section, "Channel")
 	    or self.map:get(section, "Frequency")
 	    or "-"
 end
 
-t2:option(DummyValue, "Encryption key", translate("iwscan_encr"))
+t2:option(DummyValue, "Encryption key", translate("<abbr title=\"Encrypted\">Encr.</abbr>"))
 
-t2:option(DummyValue, "Signal level", translate("iwscan_signal"))
+t2:option(DummyValue, "Signal level", translate("Signal"))
 
-t2:option(DummyValue, "Noise level", translate("iwscan_noise"))
+t2:option(DummyValue, "Noise level", translate("Noise"))
 
 
 
@@ -137,7 +137,7 @@ end
 
 -- Config Section --
 
-s = m:section(NamedSection, wifidevs[1], "wifi-device", translate("devices"))
+s = m:section(NamedSection, wifidevs[1], "wifi-device", translate("Devices"))
 s.addremove = false
 
 en = s:option(Flag, "disabled", translate("enable"))
@@ -153,7 +153,7 @@ end
 local hwtype = m:get(wifidevs[1], "type")
 
 if hwtype == "atheros" then
-	mode = s:option(ListValue, "hwmode", translate("mode"))
+	mode = s:option(ListValue, "hwmode", translate("Mode"))
 	mode.override_values = true
 	mode:value("", "auto")
 	mode:value("11b", "802.11b")
@@ -164,19 +164,19 @@ if hwtype == "atheros" then
 end
 
 
-ch = s:option(Value, "channel", translate("a_w_channel"))
+ch = s:option(Value, "channel", translate("Channel"))
 for i=1, 14 do
 	ch:value(i, i .. " (2.4 GHz)")
 end
 
 
-s = m:section(TypedSection, "wifi-iface", translate("m_n_local"))
+s = m:section(TypedSection, "wifi-iface", translate("Local Network"))
 s.anonymous = true
 s.addremove = false
 
-s:option(Value, "ssid", translate("a_w_netid"))
+s:option(Value, "ssid", translate("Network Name (<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>)"))
 
-bssid = s:option(Value, "bssid", translate("wifi_bssid"))
+bssid = s:option(Value, "bssid", translate("<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"))
 
 local devs = {}
 luci.model.uci.cursor():foreach("wireless", "wifi-device",
@@ -185,16 +185,16 @@ luci.model.uci.cursor():foreach("wireless", "wifi-device",
 	end)
 
 if #devs > 1 then
-	device = s:option(DummyValue, "device", translate("device"))
+	device = s:option(DummyValue, "device", translate("Device"))
 else
 	s.defaults.device = devs[1]
 end
 
-mode = s:option(ListValue, "mode", translate("mode"))
+mode = s:option(ListValue, "mode", translate("Mode"))
 mode.override_values = true
-mode:value("ap", translate("m_w_ap"))
-mode:value("adhoc", translate("m_w_adhoc"))
-mode:value("sta", translate("m_w_client"))
+mode:value("ap", translate("Provide (Access Point)"))
+mode:value("adhoc", translate("Independent (Ad-Hoc)"))
+mode:value("sta", translate("Join (Client)"))
 
 function mode.write(self, section, value)
 	if value == "sta" then
@@ -215,7 +215,7 @@ function mode.write(self, section, value)
 	return ListValue.write(self, section, value)
 end
 
-encr = s:option(ListValue, "encryption", translate("encryption"))
+encr = s:option(ListValue, "encryption", translate("Encryption"))
 encr.override_values = true
 encr:value("none", "No Encryption")
 encr:value("wep", "WEP")
@@ -253,7 +253,7 @@ elseif hwtype == "broadcom" then
 	encr:value("psk+psk2", "WPA-PSK/WPA2-PSK Mixed Mode")
 end
 
-key = s:option(Value, "key", translate("key"))
+key = s:option(Value, "key", translate("Key"))
 key:depends("encryption", "wep")
 key:depends("encryption", "psk")
 key:depends("encryption", "psk2")
@@ -264,44 +264,44 @@ key:depends({mode="ap", encryption="wpa2"})
 key.rmempty = true
 key.password = true
 
-server = s:option(Value, "server", translate("a_w_radiussrv"))
+server = s:option(Value, "server", translate("RadiusServer"))
 server:depends({mode="ap", encryption="wpa"})
 server:depends({mode="ap", encryption="wpa2"})
 server.rmempty = true
 
-port = s:option(Value, "port", translate("a_w_radiusport"))
+port = s:option(Value, "port", translate("Radius-Port"))
 port:depends({mode="ap", encryption="wpa"})
 port:depends({mode="ap", encryption="wpa2"})
 port.rmempty = true
 
 
 if hwtype == "atheros" or hwtype == "mac80211" then
-	nasid = s:option(Value, "nasid", translate("a_w_nasid"))
+	nasid = s:option(Value, "nasid", translate("NAS ID"))
 	nasid:depends({mode="ap", encryption="wpa"})
 	nasid:depends({mode="ap", encryption="wpa2"})
 	nasid.rmempty = true
 
-	eaptype = s:option(ListValue, "eap_type", translate("a_w_eaptype"))
+	eaptype = s:option(ListValue, "eap_type", translate("EAP-Method"))
 	eaptype:value("TLS")
 	eaptype:value("TTLS")
 	eaptype:value("PEAP")
 	eaptype:depends({mode="sta", encryption="wpa"})
 	eaptype:depends({mode="sta", encryption="wpa2"})
 
-	cacert = s:option(FileUpload, "ca_cert", translate("a_w_cacert"))
+	cacert = s:option(FileUpload, "ca_cert", translate("Path to CA-Certificate"))
 	cacert:depends({mode="sta", encryption="wpa"})
 	cacert:depends({mode="sta", encryption="wpa2"})
 
-	privkey = s:option(FileUpload, "priv_key", translate("a_w_tlsprivkey"))
+	privkey = s:option(FileUpload, "priv_key", translate("Path to Private Key"))
 	privkey:depends({mode="sta", eap_type="TLS", encryption="wpa2"})
 	privkey:depends({mode="sta", eap_type="TLS", encryption="wpa"})
 
-	privkeypwd = s:option(Value, "priv_key_pwd", translate("a_w_tlsprivkeypwd"))
+	privkeypwd = s:option(Value, "priv_key_pwd", translate("Password of Private Key"))
 	privkeypwd:depends({mode="sta", eap_type="TLS", encryption="wpa2"})
 	privkeypwd:depends({mode="sta", eap_type="TLS", encryption="wpa"})
 
 
-	auth = s:option(Value, "auth", translate("a_w_peapauth"))
+	auth = s:option(Value, "auth", translate("Authentication"))
 	auth:value("PAP")
 	auth:value("CHAP")
 	auth:value("MSCHAP")
@@ -312,13 +312,13 @@ if hwtype == "atheros" or hwtype == "mac80211" then
 	auth:depends({mode="sta", eap_type="TTLS", encryption="wpa"})
 
 
-	identity = s:option(Value, "identity", translate("a_w_peapidentity"))
+	identity = s:option(Value, "identity", translate("Identity"))
 	identity:depends({mode="sta", eap_type="PEAP", encryption="wpa2"})
 	identity:depends({mode="sta", eap_type="PEAP", encryption="wpa"})
 	identity:depends({mode="sta", eap_type="TTLS", encryption="wpa2"})
 	identity:depends({mode="sta", eap_type="TTLS", encryption="wpa"})
 
-	password = s:option(Value, "password", translate("a_w_peappassword"))
+	password = s:option(Value, "password", translate("Password"))
 	password:depends({mode="sta", eap_type="PEAP", encryption="wpa2"})
 	password:depends({mode="sta", eap_type="PEAP", encryption="wpa"})
 	password:depends({mode="sta", eap_type="TTLS", encryption="wpa2"})
@@ -327,11 +327,11 @@ end
 
 
 if hwtype == "atheros" or hwtype == "broadcom" then
-	iso = s:option(Flag, "isolate", translate("a_w_apisolation"), translate("a_w_apisolation1"))
+	iso = s:option(Flag, "isolate", translate("AP-Isolation"), translate("Prevents Client to Client communication"))
 	iso.rmempty = true
 	iso:depends("mode", "ap")
 
-	hide = s:option(Flag, "hidden", translate("a_w_hideessid"))
+	hide = s:option(Flag, "hidden", translate("Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"))
 	hide.rmempty = true
 	hide:depends("mode", "ap")
 end
diff --git a/modules/admin-mini/luasrc/view/mini/applyreboot.htm b/modules/admin-mini/luasrc/view/mini/applyreboot.htm
index 1a1a24bb0..8ff7118c7 100644
--- a/modules/admin-mini/luasrc/view/mini/applyreboot.htm
+++ b/modules/admin-mini/luasrc/view/mini/applyreboot.htm
@@ -13,9 +13,9 @@ $Id$
 
 -%>
 <%+header%>
-<h2><a id="content" name="content"><%:system%></a></h2>
+<h2><a id="content" name="content"><%:System%></a></h2>
 <br />
-<p><% if msg then %><%=msg%><% else %><%:a_s_applyreboot1%><% end %></p>
-<p><%:a_s_reboot_running%></p>
+<p><% if msg then %><%=msg%><% else %><%:Changes applied.%><% end %></p>
+<p><%:Please wait: Device rebooting...%></p>
 <script type="text/javascript">setTimeout("location='<%=controller%>'", 60000)</script>
 <%+footer%>
\ No newline at end of file
diff --git a/modules/admin-mini/luasrc/view/mini/backup.htm b/modules/admin-mini/luasrc/view/mini/backup.htm
index 2db044ddd..a28d2b806 100644
--- a/modules/admin-mini/luasrc/view/mini/backup.htm
+++ b/modules/admin-mini/luasrc/view/mini/backup.htm
@@ -13,15 +13,15 @@ $Id$
 
 -%>
 <%+header%>
-<h2><a id="content" name="content"><%:system%></a></h2>
-<h3><%:a_s_backup%></h3>
-<p><%:a_s_backup1%></p>
+<h2><a id="content" name="content"><%:System%></a></h2>
+<h3><%:Backup / Restore%></h3>
+<p><%:Here you can backup and restore your router configuration and - if possible - reset the router to the default settings.%></p>
 <br />
 <div>
 	<ul>
-	<li><a href="<%=REQUEST_URI%>?backup=kthxbye"><%:a_s_backup_backup%></a></li>
+	<li><a href="<%=REQUEST_URI%>?backup=kthxbye"><%:Create backup%></a></li>
 	<% if reset_avail then -%>
-	<li><a href="<%=REQUEST_URI%>?reset=yarly" onclick="return confirm('<%:a_s_backup_reset1%>')"><%:a_s_backup_reset%></a></li>
+	<li><a href="<%=REQUEST_URI%>?reset=yarly" onclick="return confirm('<%:Proceed reverting all settings and resetting to firmware defaults?%>')"><%:Reset router to defaults%></a></li>
 	<% end -%>
 	</ul>
 </div>
@@ -29,12 +29,12 @@ $Id$
 <br />
 
 <form method="post" action="<%=REQUEST_URI%>" enctype="multipart/form-data">
-	<div class="left"><%:a_s_backup_archive%>:</div>
+	<div class="left"><%:Backup Archive%>:</div>
 	<div>
 		<input type="file" size="30" name="archive" />
 	</div>
 	<div>
-		<input type="submit" class="cbi-input-apply" value="<%:a_s_backup_restore%>" />
+		<input type="submit" class="cbi-input-apply" value="<%:Restore backup%>" />
 	</div>
 </form>
 <%+footer%>
\ No newline at end of file
diff --git a/modules/admin-mini/luasrc/view/mini/index.htm b/modules/admin-mini/luasrc/view/mini/index.htm
index 622ab38e1..87ecc0957 100644
--- a/modules/admin-mini/luasrc/view/mini/index.htm
+++ b/modules/admin-mini/luasrc/view/mini/index.htm
@@ -12,10 +12,10 @@ You may obtain a copy of the License at
 $Id$
 
 -%>
-<h2><a id="content" name="content"><%:a_i_i_hello%></a></h2>
-<p><%:a_i_i_admin1%></p>
-<p><%:a_i_i_admin2%><br />
-<%:a_i_i_admin3%></p>
-<p><%:a_i_i_admin5%></p>
-<p><%:a_i_i_admin6%></p>
-<p><em><strong><a href="<%=controller%>/about"><%:a_i_i_team%></a></strong></em></p>
+<h2><a id="content" name="content"><%:Hello!%></a></h2>
+<p><%:This is the administration area of <abbr title="Lua Configuration Interface">LuCI</abbr>.%></p>
+<p><%:<abbr title="Lua Configuration Interface">LuCI</abbr> is a free, flexible, and user friendly graphical interface for configuring OpenWrt Kamikaze.%><br />
+<%:On the following pages you can adjust all important settings of your router.%></p>
+<p><%:As we always want to improve this interface we are looking forward to your feedback and suggestions.%></p>
+<p><%:And now have fun with your router!%></p>
+<p><em><strong><a href="<%=controller%>/about"><%:The <abbr title="Lua Configuration Interface">LuCI</abbr> Team%></a></strong></em></p>
diff --git a/modules/admin-mini/luasrc/view/mini/reboot.htm b/modules/admin-mini/luasrc/view/mini/reboot.htm
index 724e0179a..9e57d89f9 100644
--- a/modules/admin-mini/luasrc/view/mini/reboot.htm
+++ b/modules/admin-mini/luasrc/view/mini/reboot.htm
@@ -13,21 +13,21 @@ $Id$
 
 -%>
 <%+header%>
-<h2><a id="content" name="content"><%:system%></a></h2>
-<h3><%:reboot%></h3>
-<p><%:a_s_reboot1%></p>
+<h2><a id="content" name="content"><%:System%></a></h2>
+<h3><%:Reboot%></h3>
+<p><%:Reboots the operating system of your device%></p>
 <%-
 local c = require("luci.model.uci").cursor():changes()
 if c and next(c) then
 -%>
-	<p class="warning"><%:a_s_reboot_u%></p> 
+	<p class="warning"><%:Warning: There are unsaved changes that will be lost while rebooting!%></p> 
 <%-
 end
 if not reboot then 
 -%>
-<p><a href="<%=REQUEST_URI%>?reboot=1"><%:a_s_reboot_do%></a></p>
+<p><a href="<%=REQUEST_URI%>?reboot=1"><%:Perform reboot%></a></p>
 <%- else -%>
-<p><%:a_s_reboot_running%></p>
+<p><%:Please wait: Device rebooting...%></p>
 <script type="text/javascript">setTimeout("location='<%=controller%>'", 60000)</script>
 <%- end -%>
 <%+footer%>
\ No newline at end of file
diff --git a/modules/admin-mini/luasrc/view/mini/upgrade.htm b/modules/admin-mini/luasrc/view/mini/upgrade.htm
index 425113e62..510a51b15 100644
--- a/modules/admin-mini/luasrc/view/mini/upgrade.htm
+++ b/modules/admin-mini/luasrc/view/mini/upgrade.htm
@@ -15,7 +15,7 @@ $Id$
 
 <%+header%>
 
-<h2><a id="content" name="content"><%:system%></a></h2>
+<h2><a id="content" name="content"><%:System%></a></h2>
 <h3><%:admin_upgrade Flash Firmware%></h3>
 
 <% if step == 1 then %>
@@ -73,7 +73,6 @@ $Id$
 	
 				if flashsize > 0 then
 					write(luci.i18n.translatef(
-						"admin_upgrade_spaceavail",
 						" (%s available)",
 						w.byte_format(flashsize)
 					))
diff --git a/modules/freifunk/luasrc/controller/freifunk/freifunk.lua b/modules/freifunk/luasrc/controller/freifunk/freifunk.lua
index 5efd50f81..52b37dc6a 100644
--- a/modules/freifunk/luasrc/controller/freifunk/freifunk.lua
+++ b/modules/freifunk/luasrc/controller/freifunk/freifunk.lua
@@ -45,7 +45,7 @@ function index()
 
 	local page  = node("freifunk", "status", "status")
 	page.target = form("freifunk/public_status")
-	page.title  = i18n("overview")
+	page.title  = i18n("Overview")
 	page.order  = 20
 	page.i18n   = "admin-core"
 	page.setuser  = false
@@ -57,7 +57,7 @@ function index()
 	assign({"freifunk", "olsr"}, {"admin", "status", "olsr"}, "OLSR", 30)
 
 	if nixio.fs.access("/etc/config/luci_statistics") then
-		assign({"freifunk", "graph"}, {"admin", "statistics", "graph"}, i18n("stat_statistics", "Statistiken"), 40)
+		assign({"freifunk", "graph"}, {"admin", "statistics", "graph"}, i18n("Statistics"), 40)
 	end
 
 	assign({"mini", "freifunk"}, {"admin", "freifunk"}, "Freifunk", 15)
@@ -72,7 +72,7 @@ function index()
 	page.title  = "Kontakt"
 	page.order  = 40
 
-	entry({"freifunk", "map"}, template("freifunk-map/frame"), i18n("freifunk_map", "Karte"), 50)
+	entry({"freifunk", "map"}, template("freifunk-map/frame"), i18n("Karte"), 50)
 	entry({"freifunk", "map", "content"}, template("freifunk-map/map"), nil, 51)
 end
 
diff --git a/modules/freifunk/luasrc/controller/freifunk/remote_update.lua b/modules/freifunk/luasrc/controller/freifunk/remote_update.lua
index badfbf2da..b894af7eb 100644
--- a/modules/freifunk/luasrc/controller/freifunk/remote_update.lua
+++ b/modules/freifunk/luasrc/controller/freifunk/remote_update.lua
@@ -20,7 +20,7 @@ function index()
 	local i18n = luci.i18n.translate
 
 	entry({"admin", "system", "remote_update"}, call("act_remote_update"),
-		i18n("ff_remote_update", "Freifunk Remote Update"), 90)
+		i18n("Freifunk Remote Update"), 90)
 end
 
 function act_remote_update()
diff --git a/modules/freifunk/luasrc/model/cbi/freifunk/contact.lua b/modules/freifunk/luasrc/model/cbi/freifunk/contact.lua
index 2bb34a14a..41e709d95 100644
--- a/modules/freifunk/luasrc/model/cbi/freifunk/contact.lua
+++ b/modules/freifunk/luasrc/model/cbi/freifunk/contact.lua
@@ -18,17 +18,17 @@ m = Map("freifunk", translate("contact"), translate("contact1"))
 
 c = m:section(NamedSection, "contact", "public", "")
 
-c:option(Value, "nickname", translate("ff_nickname"))
-c:option(Value, "name", translate("ff_name"))
-c:option(Value, "mail", translate("ff_mail"), translate("ff_mail1"))
-c:option(Value, "phone", translate("ff_phone"))
-c:option(Value, "location", translate("ff_location"))
-c:option(Value, "note", translate("ff_note"))
+c:option(Value, "nickname", translate("Nickname"))
+c:option(Value, "name", translate("Realname"))
+c:option(Value, "mail", translate("E-Mail"), translate("You really should provide your address here!"))
+c:option(Value, "phone", translate("Phone"))
+c:option(Value, "location", translate("Location"))
+c:option(Value, "note", translate("Notice"))
 
 m2 = Map("system", translate("geo"))
 
 s = m2:section(TypedSection, "system", "")
-s:option(Value, "latitude", translate("latitude", "Breite")).rmempty = true
-s:option(Value, "longitude", translate("longitude", "Länge")).rmempty = true
+s:option(Value, "latitude", translate("Breite")).rmempty = true
+s:option(Value, "longitude", translate("Länge")).rmempty = true
 
 return m, m2
diff --git a/modules/freifunk/luasrc/model/cbi/freifunk/public_status.lua b/modules/freifunk/luasrc/model/cbi/freifunk/public_status.lua
index 2363c8c7f..7cf17dabb 100644
--- a/modules/freifunk/luasrc/model/cbi/freifunk/public_status.lua
+++ b/modules/freifunk/luasrc/model/cbi/freifunk/public_status.lua
@@ -16,14 +16,14 @@ f.reset = false
 local system, model, memtotal, memcached, membuffers, memfree = luci.sys.sysinfo()
 local uptime = luci.sys.uptime()
 
-f:field(DummyValue, "_system", translate("system")).value = system
-f:field(DummyValue, "_cpu", translate("m_i_processor")).value = model
+f:field(DummyValue, "_system", translate("System")).value = system
+f:field(DummyValue, "_cpu", translate("Processor")).value = model
 
 local load1, load5, load15 = luci.sys.loadavg()
-f:field(DummyValue, "_la", translate("load")).value =
+f:field(DummyValue, "_la", translate("Load")).value =
 string.format("%.2f, %.2f, %.2f", load1, load5, load15)
 
-f:field(DummyValue, "_memtotal", translate("m_i_memory")).value =
+f:field(DummyValue, "_memtotal", translate("Memory")).value =
 string.format("%.2f MB (%.0f%% %s, %.0f%% %s, %.0f%% %s)",
 	tonumber(memtotal) / 1024,
 	100 * memcached / memtotal,
@@ -34,10 +34,10 @@ string.format("%.2f MB (%.0f%% %s, %.0f%% %s, %.0f%% %s)",
 	tostring(translate("mem_free", ""))
 )
 
-f:field(DummyValue, "_systime", translate("m_i_systemtime")).value =
+f:field(DummyValue, "_systime", translate("Local Time")).value =
 os.date("%c")
 
-f:field(DummyValue, "_uptime", translate("m_i_uptime")).value =
+f:field(DummyValue, "_uptime", translate("Uptime")).value =
 luci.tools.webadmin.date_format(tonumber(uptime))
 
 
@@ -61,9 +61,9 @@ m = SimpleForm("wireless", "Freifunk WLAN")
 m.submit = false
 m.reset = false
 
-s = m:section(Table, ifaces, translate("networks"))
+s = m:section(Table, ifaces, translate("Networks"))
 
-link = s:option(DummyValue, "_link", translate("link"))
+link = s:option(DummyValue, "_link", translate("Link"))
 function link.cfgvalue(self, section)
 	local ifname = self.map:get(section, "ifname")
 	return wifidata[ifname] and wifidata[ifname]["Link Quality"] or "-"
@@ -78,34 +78,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
@@ -116,26 +116,26 @@ end
 t2._render = t2.render
 t2.render = function() end
 
-t2:option(DummyValue, "Quality", translate("iwscan_link"))
+t2:option(DummyValue, "Quality", translate("Link"))
 essid = t2:option(DummyValue, "ESSID", "ESSID")
 function essid.cfgvalue(self, section)
 	return 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"))
 
 
 -- Routes --
@@ -152,28 +152,28 @@ end
 
 v = r:section(Table, routes)
 
-net = v:option(DummyValue, "iface", translate("network"))
+net = v:option(DummyValue, "iface", translate("Network"))
 function net.cfgvalue(self, section)
 	return luci.tools.webadmin.iface_get_network(routes[section].device)
 	or routes[section].device
 end
 
-target  = v:option(DummyValue, "target", translate("target"))
+target  = v:option(DummyValue, "target", translate("Target"))
 function target.cfgvalue(self, section)
 	return routes[section].dest:network():string()
 end
 
-netmask = v:option(DummyValue, "netmask", translate("netmask"))
+netmask = v:option(DummyValue, "netmask", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"))
 function netmask.cfgvalue(self, section)
 	return routes[section].dest:mask():string()
 end
 
-gateway = v:option(DummyValue, "gateway", translate("gateway"))
+gateway = v:option(DummyValue, "gateway", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"))
 function gateway.cfgvalue(self, section)
 	return routes[section].gateway:string()
 end
 
-metric = v:option(DummyValue, "metric", translate("metric"))
+metric = v:option(DummyValue, "metric", translate("Metric"))
 function metric.cfgvalue(self, section)
 	return routes[section].metric
 end
@@ -189,23 +189,23 @@ end
 if #routes6 > 0 then
 	v6 = r:section(Table, routes6)
 
-	net = v6:option(DummyValue, "iface", translate("network"))
+	net = v6:option(DummyValue, "iface", translate("Network"))
 	function net.cfgvalue(self, section)
 		return luci.tools.webadmin.iface_get_network(routes6[section].device)
 		or routes6[section].device
 	end
 
-	target  = v6:option(DummyValue, "target", translate("target"))
+	target  = v6:option(DummyValue, "target", translate("Target"))
 	function target.cfgvalue(self, section)
 		return routes6[section].dest:string()
 	end
 
-	gateway = v6:option(DummyValue, "gateway6", translate("gateway6"))
+	gateway = v6:option(DummyValue, "gateway6", translate("<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"))
 	function gateway.cfgvalue(self, section)
 		return routes6[section].source:string()
 	end
 
-	metric = v6:option(DummyValue, "metric", translate("metric"))
+	metric = v6:option(DummyValue, "metric", translate("Metric"))
 	function metric.cfgvalue(self, section)
 		local metr = routes6[section].metric
 		local lower = bit.band(metr, 0xffff)
diff --git a/modules/freifunk/luasrc/view/freifunk/contact.htm b/modules/freifunk/luasrc/view/freifunk/contact.htm
index 06177c205..59d508c6f 100644
--- a/modules/freifunk/luasrc/view/freifunk/contact.htm
+++ b/modules/freifunk/luasrc/view/freifunk/contact.htm
@@ -16,12 +16,12 @@ $Id$
 <% local contact = luci.model.uci.cursor():get_all("freifunk", "contact") %>
 <h2><a id="content" name="content"><%:contact%></a></h2>
 <table cellspacing="0" cellpadding="6">
-	<tr><th><%:ff_nickname%>:</th><td><%=contact.nickname%></td></tr>
-	<tr><th><%:ff_name%>:</th><td><%=contact.name%></td></tr>
-	<tr><th><%:ff_mail%>:</th><td><%=contact.mail%></td></tr>
-	<tr><th><%:ff_phone%>:</th><td><%=contact.phone%></td></tr>
-	<tr><th><%:ff_location%>:</th><td><%=contact.location%></td></tr>
-	<tr><th><%:ff_geocoord%>:</th><td><%=contact.geo%></td></tr>
-	<tr><th><%:ff_note%>:</th><td><%=contact.note%></td></tr>
+	<tr><th><%:Nickname%>:</th><td><%=contact.nickname%></td></tr>
+	<tr><th><%:Realname%>:</th><td><%=contact.name%></td></tr>
+	<tr><th><%:E-Mail%>:</th><td><%=contact.mail%></td></tr>
+	<tr><th><%:Phone%>:</th><td><%=contact.phone%></td></tr>
+	<tr><th><%:Location%>:</th><td><%=contact.location%></td></tr>
+	<tr><th><%:Coordinates%>:</th><td><%=contact.geo%></td></tr>
+	<tr><th><%:Notice%>:</th><td><%=contact.note%></td></tr>
 </table>
 <%+footer%>
diff --git a/modules/freifunk/luasrc/view/freifunk/index.htm b/modules/freifunk/luasrc/view/freifunk/index.htm
index 0b4d69771..736cf29da 100644
--- a/modules/freifunk/luasrc/view/freifunk/index.htm
+++ b/modules/freifunk/luasrc/view/freifunk/index.htm
@@ -14,11 +14,11 @@ $Id$
 -%>
 <%+header%>
 <% local ff = luci.model.uci.cursor():get_all("freifunk") %>
-<h2><a id="content" name="content"><%:ff_hellonet%> <%=ff.community.name or 'Freifunk Deutschland'%>!</a></h2>
-<p><%:ff_public1%><br />
-<%:ff_public2%> <%=luci.sys.hostname()%>. <%:ff_public3%>
+<h2><a id="content" name="content"><%:Hello and welcome in the network of%> <%=ff.community.name or 'Freifunk Deutschland'%>!</a></h2>
+<p><%:We are an initiative to establish a free, independent and open wireless mesh network.%><br />
+<%:This is the access point%> <%=luci.sys.hostname()%>. <%:It is operated by%>
 <a href="<%=luci.dispatcher.build_url("freifunk", "index", "contact")%>"> <%=ff.contact.nickname%></a>.</p>
-<p><%:ff_public4%> <a href="http://freifunk.net">Freifunk.net</a>.<br />
-<%:ff_public5%> <a href="<%=ff.community.homepage or 'http//freifunk.net'%>"><%=ff.community.name or 'Freifunk'%></a>.</p>
-<p><strong><%:ff_note%></strong>: <%:ff_public6%></p>
+<p><%:You can find further information about the global Freifunk initiative at%> <a href="http://freifunk.net">Freifunk.net</a>.<br />
+<%:If you are interested in our project then contact the local community%> <a href="<%=ff.community.homepage or 'http//freifunk.net'%>"><%=ff.community.name or 'Freifunk'%></a>.</p>
+<p><strong><%:Notice%></strong>: <%:Internet access depends on technical and organisational conditions and may or may not work for you.%></p>
 <%+footer%>
diff --git a/modules/niu/luasrc/model/cbi/niu/network/assign1.lua b/modules/niu/luasrc/model/cbi/niu/network/assign1.lua
index 704e9ae66..e226e2376 100644
--- a/modules/niu/luasrc/model/cbi/niu/network/assign1.lua
+++ b/modules/niu/luasrc/model/cbi/niu/network/assign1.lua
@@ -34,12 +34,12 @@ 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()))
@@ -51,9 +51,9 @@ s.addremove = true
 s.anonymous = true
 s.template = "cbi/tblsection"
 
-hn = s:option(Value, "name", translate("hostnames_hostname"))
-mac = s:option(Value, "mac", translate("macaddress"))
-ip = s:option(Value, "ip", translate("ipaddress"))
+hn = s:option(Value, "name", translate("Hostname"))
+mac = s:option(Value, "mac", translate("<abbr title=\"Media Access Control\">MAC</abbr>-Address"))
+ip = s:option(Value, "ip", 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/niu/luasrc/model/cbi/niu/network/etherwan.lua b/modules/niu/luasrc/model/cbi/niu/network/etherwan.lua
index 53be7eb65..e3da1c0aa 100644
--- a/modules/niu/luasrc/model/cbi/niu/network/etherwan.lua
+++ b/modules/niu/luasrc/model/cbi/niu/network/etherwan.lua
@@ -29,10 +29,10 @@ nw.init(m.uci)
 s = m:section(NamedSection, "wan", "interface")
 s.addremove = false
 
-s:tab("general", translate("niu_general", "General Settings"))
-s:tab("expert", translate("niu_expert", "Expert Settings"))
+s:tab("general", translate("General Settings"))
+s:tab("expert", translate("Expert Settings"))
 
-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"))
@@ -44,53 +44,53 @@ p:value("none", translate("none"))
 
 
 
-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("expert", Value, "bcast", translate("broadcast"))
+bcast = s:taboption("expert", Value, "bcast", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"))
 bcast:depends("proto", "static")
 
 if has_ipv6 then
-	ip6addr = s:taboption("expert", Value, "ip6addr", translate("ip6address"), translate("cidr6"))
+	ip6addr = s:taboption("expert", 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("expert", Value, "ip6gw", translate("gateway6"))
+	ip6gw = s:taboption("expert", Value, "ip6gw", translate("<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"))
 	ip6gw:depends("proto", "static")
 end
 
-dns = s:taboption("expert", Value, "dns", translate("dnsserver"))
+dns = s:taboption("expert", Value, "dns", translate("<abbr title=\"Domain Name System\">DNS</abbr>-Server"))
 dns:depends("peerdns", "")
 
 mtu = s:taboption("expert", Value, "mtu", "MTU")
 mtu.isinteger = true
 
-mac = s:taboption("expert", Value, "macaddr", translate("macaddress"))
+mac = s:taboption("expert", 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_pppd or has_pppoe or has_pppoa 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")
 	user:depends("proto", "pppoa")
 
-	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")
@@ -98,8 +98,8 @@ if has_pppd or has_pppoe or has_pppoa or has_pptp then
 	pass:depends("proto", "pppoa")
 
 	ka = s:taboption("expert", 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.default = "5"
 	ka:depends("proto", "pptp")
@@ -107,8 +107,8 @@ if has_pppd or has_pppoe or has_pppoa or has_pptp then
 	ka:depends("proto", "pppoa")
 
 	demand = s:taboption("expert", 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")
@@ -116,9 +116,9 @@ if has_pppd or has_pppoe or has_pppoa or has_pptp then
 end
 
 if has_pppoa then
-	encaps = s:taboption("expert", ListValue, "encaps", translate("network_interface_encaps"))
+	encaps = s:taboption("expert", 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")
 
@@ -132,8 +132,8 @@ end
 if has_pptp or has_pppd or has_pppoe or has_pppoa or has_3g then
 --[[
 	defaultroute = s:taboption("expert", 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", "pppoa")
 	defaultroute:depends("proto", "pppoe")
@@ -144,8 +144,8 @@ if has_pptp or has_pppd or has_pppoe or has_pppoa or has_3g then
 	end
 ]]
 	peerdns = s:taboption("expert", 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", "pppoa")
 	peerdns:depends("proto", "pppoe")
@@ -154,7 +154,7 @@ if has_pptp or has_pppd or has_pppoe or has_pppoa or has_3g then
 	peerdns.default = "1"
 
 	if has_ipv6 then
-		ipv6 = s:taboption("expert", Flag, "ipv6", translate("network_interface_ipv6") )
+		ipv6 = s:taboption("expert", Flag, "ipv6", translate("Enable IPv6 on PPP link") )
 		ipv6:depends("proto", "pppoa")
 		ipv6:depends("proto", "pppoe")
 		ipv6:depends("proto", "pptp")
diff --git a/modules/niu/luasrc/model/cbi/niu/network/lan1.lua b/modules/niu/luasrc/model/cbi/niu/network/lan1.lua
index 33bb48c23..19f8230b9 100644
--- a/modules/niu/luasrc/model/cbi/niu/network/lan1.lua
+++ b/modules/niu/luasrc/model/cbi/niu/network/lan1.lua
@@ -24,42 +24,42 @@ nw.init(m.uci)
 s = m:section(NamedSection, "lan", "interface")
 s.addremove = false
 
-s:tab("general", translate("niu_general", "General Settings"))
+s:tab("general", translate("General Settings"))
 
-ipaddr = s:taboption("general", Value, "ipaddr", translate("ipaddress"))
+ipaddr = s:taboption("general", Value, "ipaddr", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"))
 
-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:value("255.255.255.0")
 nm:value("255.255.0.0")
 nm:value("255.0.0.0")
 
 
 
-s:tab("expert", translate("niu_expert", "Expert Settings"))
+s:tab("expert", translate("Expert Settings"))
 
-mac = s:taboption("expert", Value, "macaddr", translate("macaddress"))
+mac = s:taboption("expert", Value, "macaddr", translate("<abbr title=\"Media Access Control\">MAC</abbr>-Address"))
 
 mtu = s:taboption("expert", Value, "mtu", "MTU")
 mtu.isinteger = true
 
-dns = s:taboption("expert", Value, "dns", translate("dnsserver"))
+dns = s:taboption("expert", Value, "dns", translate("<abbr title=\"Domain Name System\">DNS</abbr>-Server"))
 dns:depends("peerdns", "")
 
 
-gw = s:taboption("expert", Value, "gateway", translate("gateway"))
-bcast = s:taboption("expert", Value, "bcast", translate("broadcast"))
+gw = s:taboption("expert", Value, "gateway", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"))
+bcast = s:taboption("expert", Value, "bcast", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"))
 
 
 if has_ipv6 then
-	ip6addr = s:taboption("expert", Value, "ip6addr", translate("ip6address"), translate("cidr6"))
-	ip6gw = s:taboption("expert", Value, "ip6gw", translate("gateway6"))
+	ip6addr = s:taboption("expert", Value, "ip6addr", translate("<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address"), translate("<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/prefix"))
+	ip6gw = s:taboption("expert", Value, "ip6gw", translate("<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"))
 end
 
 
-stp = s:taboption("expert", Flag, "stp", translate("a_n_i_stp"),
-	translate("a_n_i_stp1", "Enables the Spanning Tree Protocol on this bridge"))
+stp = s:taboption("expert", Flag, "stp", translate("Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"),
+	translate("Enables the Spanning Tree Protocol on this bridge"))
 
-ifname_multi = s:taboption("expert", MultiValue, "ifname_multi", translate("interface"))
+ifname_multi = s:taboption("expert", MultiValue, "ifname_multi", translate("Interface"))
 ifname_multi.template = "cbi/network_ifacelist"
 ifname_multi.nobridges = true
 ifname_multi.widget = "checkbox"
@@ -87,7 +87,7 @@ s.anonymous = true
 s.addremove = false
 s.dynamic = false
 
-s:tab("general", translate("niu_general", "General Settings"))
+s:tab("general", translate("General Settings"))
 
 s:depends("interface", "lan")
 
@@ -96,9 +96,9 @@ enable:value(0, translate("enable"))
 enable:value(1, translate("disable"))
 
 
-s:tab("expert", translate("niu_expert", "Expert Settings"))
-start = s:taboption("expert", Value, "start", translate("m_n_d_firstaddress"))
-limit = s:taboption("expert", Value, "limit", translate("m_n_d_numleases"), "")
+s:tab("expert", translate("Expert Settings"))
+start = s:taboption("expert", Value, "start", translate("First leased address"))
+limit = s:taboption("expert", Value, "limit", translate("Number of leased addresses"), "")
 time = s:taboption("expert", Value, "leasetime")
 
 
diff --git a/modules/niu/luasrc/model/cbi/niu/network/routes1.lua b/modules/niu/luasrc/model/cbi/niu/network/routes1.lua
index 3e8e29715..a1d150807 100644
--- a/modules/niu/luasrc/model/cbi/niu/network/routes1.lua
+++ b/modules/niu/luasrc/model/cbi/niu/network/routes1.lua
@@ -12,34 +12,34 @@ You may obtain a copy of the License at
 $Id$
 ]]--
 
-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"
 
-iface1 = s:option(ListValue, "interface", translate("interface"))
+iface1 = s:option(ListValue, "interface", translate("Interface"))
 
-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"
 
-	iface2 = s:option(ListValue, "interface", translate("interface"))
+	iface2 = s:option(ListValue, "interface", translate("Interface"))
 
-	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
 
 m.uci:foreach("network", "interface", function(s)