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

6 files changed, 37 insertions, 37 deletions

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)