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

3 files changed, 17 insertions, 17 deletions

diff --git a/applications/luci-ntpc/luasrc/controller/ntpc.lua b/applications/luci-ntpc/luasrc/controller/ntpc.lua
index 0d656a48f..b6af6f950 100644
--- a/applications/luci-ntpc/luasrc/controller/ntpc.lua
+++ b/applications/luci-ntpc/luasrc/controller/ntpc.lua
@@ -21,12 +21,12 @@ function index()
 		return
 	end
 	
-	local page = entry({"admin", "system", "ntpc"}, cbi("ntpc/ntpc"), luci.i18n.translate("ntpc"), 50)
+	local page = entry({"admin", "system", "ntpc"}, cbi("ntpc/ntpc"), luci.i18n.translate("Time Synchronisation"), 50)
 	page.i18n = "ntpc"
 	page.dependent = true
 	
 	
-	local page = entry({"mini", "system", "ntpc"}, cbi("ntpc/ntpcmini", {autoapply=true}), luci.i18n.translate("ntpc"), 50)
+	local page = entry({"mini", "system", "ntpc"}, cbi("ntpc/ntpcmini", {autoapply=true}), luci.i18n.translate("Time Synchronisation"), 50)
 	page.i18n = "ntpc"
 	page.dependent = true
 end
\ No newline at end of file
diff --git a/applications/luci-ntpc/luasrc/model/cbi/ntpc/ntpc.lua b/applications/luci-ntpc/luasrc/model/cbi/ntpc/ntpc.lua
index 06609e3a0..642082fba 100644
--- a/applications/luci-ntpc/luasrc/model/cbi/ntpc/ntpc.lua
+++ b/applications/luci-ntpc/luasrc/model/cbi/ntpc/ntpc.lua
@@ -12,28 +12,28 @@ You may obtain a copy of the License at
 
 $Id$
 ]]--
-m = Map("ntpclient", translate("ntpc"), translate("ntpc_desc"))
+m = Map("ntpclient", translate("Time Synchronisation"), translate("Synchronizes the system time"))
 
-s = m:section(TypedSection, "ntpclient", translate("general"))
+s = m:section(TypedSection, "ntpclient", translate("General"))
 s.anonymous = true
 
 s:option(DummyValue, "_time", translate("ntpc_current")).value = os.date("%c")
 
-s:option(Value, "interval", translate("ntpc_interval")).rmempty = true
-s:option(Value, "count", translate("ntpc_count"), translate("ntpc_count_desc")).rmempty = true
+s:option(Value, "interval", translate("Update Interval (in s)")).rmempty = true
+s:option(Value, "count", translate("Count of Time Measurements"), translate("empty = infinite")).rmempty = true
 
 
-s2 = m:section(TypedSection, "ntpdrift", translate("ntpc_drift"))
+s2 = m:section(TypedSection, "ntpdrift", translate("Clock Adjustment"))
 s2.anonymous = true
-s2:option(Value, "freq", translate("ntpc_drift_freq")).rmempty = true
+s2:option(Value, "freq", translate("Offset Frequency")).rmempty = true
 
 
-s3 = m:section(TypedSection, "ntpserver", translate("ntpc_timeserver"))
+s3 = m:section(TypedSection, "ntpserver", translate("Time Server"))
 s3.anonymous = true
 s3.addremove = true
 s3.template = "cbi/tblsection"
 
-s3:option(Value, "hostname", translate("hostname"))
-s3:option(Value, "port", translate("port")).rmempty = true
+s3:option(Value, "hostname", translate("Hostname"))
+s3:option(Value, "port", translate("Port")).rmempty = true
 
 return m
\ No newline at end of file
diff --git a/applications/luci-ntpc/luasrc/model/cbi/ntpc/ntpcmini.lua b/applications/luci-ntpc/luasrc/model/cbi/ntpc/ntpcmini.lua
index 3493e0317..bd04cc6a4 100644
--- a/applications/luci-ntpc/luasrc/model/cbi/ntpc/ntpcmini.lua
+++ b/applications/luci-ntpc/luasrc/model/cbi/ntpc/ntpcmini.lua
@@ -13,22 +13,22 @@ You may obtain a copy of the License at
 $Id$
 ]]--
 require("luci.tools.webadmin")
-m = Map("ntpclient", translate("ntpc"), translate("ntpc_desc"))
+m = Map("ntpclient", translate("Time Synchronisation"), translate("Synchronizes the system time"))
 
-s = m:section(TypedSection, "ntpclient", translate("general"))
+s = m:section(TypedSection, "ntpclient", translate("General"))
 s.anonymous = true
 
 s:option(DummyValue, "_time", translate("ntpc_current")).value = os.date("%c")
 
-s:option(Value, "interval", translate("ntpc_interval")).rmempty = true
+s:option(Value, "interval", translate("Update Interval (in s)")).rmempty = true
 
 
-s3 = m:section(TypedSection, "ntpserver", translate("ntpc_timeserver"))
+s3 = m:section(TypedSection, "ntpserver", translate("Time Server"))
 s3.anonymous = true
 s3.addremove = true
 s3.template = "cbi/tblsection"
 
-s3:option(Value, "hostname", translate("hostname"))
-s3:option(Value, "port", translate("port")).rmempty = true
+s3:option(Value, "hostname", translate("Hostname"))
+s3:option(Value, "port", translate("Port")).rmempty = true
 
 return m
\ No newline at end of file