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

10 files changed, 46 insertions, 46 deletions

diff --git a/applications/luci-olsr/luasrc/controller/olsr.lua b/applications/luci-olsr/luasrc/controller/olsr.lua
index 837873adf..e2dc4fe44 100644
--- a/applications/luci-olsr/luasrc/controller/olsr.lua
+++ b/applications/luci-olsr/luasrc/controller/olsr.lua
@@ -16,12 +16,12 @@ function index()
 
 	local page  = node("admin", "status", "olsr", "routes")
 	page.target = call("action_routes")
-	page.title  = i18n("olsr_routes", "Routen")
+	page.title  = i18n("Routen")
 	page.order  = 10
 
 	local page  = node("admin", "status", "olsr", "topology")
 	page.target = call("action_topology")
-	page.title  = i18n("olsr_topology", "Topologie")
+	page.title  = i18n("Topologie")
 	page.order  = 20
 
 	local page  = node("admin", "status", "olsr", "hna")
diff --git a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
index 74e2ba0d5..d5b771096 100644
--- a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
+++ b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
@@ -14,7 +14,7 @@ $Id$
 
 require("luci.tools.webadmin")
 
-m = Map("olsrd", translate("olsrd", "OLSR Daemon"))
+m = Map("olsrd", translate("OLSR Daemon"))
 
 s = m:section(TypedSection, "olsrd", translate("olsrd_general"))
 s.dynamic = true
@@ -38,26 +38,26 @@ noint.optional = true
 s:option(Value, "Pollrate").optional = true
 
 tcr = s:option(ListValue, "TcRedundancy")
-tcr:value("0", translate("olsrd_olsrd_tcredundancy_0"))
-tcr:value("1", translate("olsrd_olsrd_tcredundancy_1"))
-tcr:value("2", translate("olsrd_olsrd_tcredundancy_2"))
+tcr:value("0", translate("MPR selectors"))
+tcr:value("1", translate("MPR selectors and MPR"))
+tcr:value("2", translate("all neighbours"))
 tcr.optional = true
 
 s:option(Value, "MprCoverage").optional = true
 
 lql = s:option(ListValue, "LinkQualityLevel")
 lql:value("0", translate("disable"))
-lql:value("1", translate("olsrd_olsrd_linkqualitylevel_1"))
-lql:value("2", translate("olsrd_olsrd_linkqualitylevel_2"))
+lql:value("1", translate("MPR selection"))
+lql:value("2", translate("MPR selection and routing"))
 lql.optional = true
 
 s:option(Value, "LinkQualityAging").optional = true
 
 lqa = s:option(ListValue, "LinkQualityAlgorithm")
 lqa.optional = true
-lqa:value("etx_fpm", translate("olsrd_etx_fpm"))
-lqa:value("etx_float", translate("olsrd_etx_float"))
-lqa:value("etx_ff", translate("olsrd_etx_ff"))
+lqa:value("etx_fpm", translate("fixed point math"))
+lqa:value("etx_float", translate("floating point"))
+lqa:value("etx_ff", translate("Freifunk"))
 lqa.optional = true
 
 lqfish = s:option(Flag, "LinkQualityFishEye")
@@ -92,7 +92,7 @@ willingness.optional = true
 
 
 
-i = m:section(TypedSection, "Interface", translate("interfaces"))
+i = m:section(TypedSection, "Interface", translate("Interfaces"))
 i.anonymous = true
 i.addremove = true
 i.dynamic = true
@@ -105,13 +105,13 @@ function ign.cfgvalue(self, section)
 	return Flag.cfgvalue(self, section) or "0"
 end
 
-network = i:option(ListValue, "interface", translate("network"))
+network = i:option(ListValue, "interface", translate("Network"))
 luci.tools.webadmin.cbi_add_networks(network)
 
 i:option(Value, "Ip4Broadcast").optional = true
 
 ip6t = i:option(ListValue, "Ip6AddrType")
-ip6t:value("", translate("cbi_select"))
+ip6t:value("", translate("-- Please choose --"))
 ip6t:value("auto")
 ip6t:value("site-local")
 ip6t:value("unique-local")
diff --git a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdhna.lua b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdhna.lua
index ea2f88d79..c9217f68e 100644
--- a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdhna.lua
+++ b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdhna.lua
@@ -12,7 +12,7 @@ You may obtain a copy of the License at
 $Id$
 ]]--
 
-mh = Map("olsrd", translate("olsrd_hna", "OLSR - HNA-Ankündigungen"))
+mh = Map("olsrd", translate("OLSR - HNA-Announcements"))
 
 
 hna4 = mh:section(TypedSection, "Hna4")
diff --git a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua
index f81a4a4b4..a387c4c06 100644
--- a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua
+++ b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua
@@ -17,7 +17,7 @@ local ip = require "luci.ip"
 local fs = require "nixio.fs"
 
 if arg[1] then
-	mp = Map("olsrd", translate("olsrd_plugins", "OLSR - Plugins"))
+	mp = Map("olsrd", translate("OLSR - Plugins"))
 
 	p = mp:section(TypedSection, "LoadPlugin")
 	p:depends("library", arg[1])
@@ -31,7 +31,7 @@ if arg[1] then
 		return Flag.cfgvalue(self, section) or "0"
 	end
 
-	lib = p:option(DummyValue, "library", translate("library"))
+	lib = p:option(DummyValue, "library", translate("Library"))
 	lib.default = arg[1]
 
 	local function Range(x,y)
diff --git a/applications/luci-olsr/luasrc/view/status-olsr/error_olsr.htm b/applications/luci-olsr/luasrc/view/status-olsr/error_olsr.htm
index c23f52b4f..97142a689 100644
--- a/applications/luci-olsr/luasrc/view/status-olsr/error_olsr.htm
+++ b/applications/luci-olsr/luasrc/view/status-olsr/error_olsr.htm
@@ -13,7 +13,7 @@ $Id$
 
 -%>
 <%+header%>
-<h2><a id="content" name="content"><%:olsrd%></a></h2>
-<p class="error"><%:olsrd_error%></p>
-<p><%:olsrd_error_desc%></p>
+<h2><a id="content" name="content"><%:OLSR Daemon%></a></h2>
+<p class="error"><%:Unable to connect to the OLSR daemon!%></p>
+<p><%:Make sure that OLSRd is running, the "txtinfo" plugin is loaded, configured on port 2006 and accepts connections from "127.0.0.1".%></p>
 <%+footer%>
diff --git a/applications/luci-olsr/luasrc/view/status-olsr/hna.htm b/applications/luci-olsr/luasrc/view/status-olsr/hna.htm
index e0ec8846a..0e153bbbc 100644
--- a/applications/luci-olsr/luasrc/view/status-olsr/hna.htm
+++ b/applications/luci-olsr/luasrc/view/status-olsr/hna.htm
@@ -13,13 +13,13 @@ $Id$
 
 -%>
 <%+header%>
-<h2><a id="content" name="content"><%:olsrd_hna2%></a></h2>
-<p><%:olsrd_hna_desc%></p>
+<h2><a id="content" name="content"><%:Active host net announcements%></a></h2>
+<p><%:Overview of currently active OLSR host net announcements%></p>
 <br />
 <table class="smalltext" cellspacing="0" cellpadding="6">
 <tr>
-<th><%:olsrd_network%></th>
-<th><%:olsrd_gateway%></th>
+<th><%:Announced network%></th>
+<th><%:OLSR gateway%></th>
 </tr>
 <% for k, route in ipairs(routes) do %>
 <tr>
diff --git a/applications/luci-olsr/luasrc/view/status-olsr/index.htm b/applications/luci-olsr/luasrc/view/status-olsr/index.htm
index 3dc56f992..97962eec9 100644
--- a/applications/luci-olsr/luasrc/view/status-olsr/index.htm
+++ b/applications/luci-olsr/luasrc/view/status-olsr/index.htm
@@ -13,13 +13,13 @@ $Id$
 
 -%>
 <%+header%>
-<h2><a id="content" name="content"><%:olsrd_links%></a></h2>
-<p><%:olsrd_links_desc%></p>
+<h2><a id="content" name="content"><%:OLSR connections%></a></h2>
+<p><%:Overview of currently established OLSR connections%></p>
 <br />
 <table class="smalltext" cellspacing="0" cellpadding="6">
 <tr>
-<th><%:olsrd_neighbour_ip%></th>
-<th><%:olsrd_local_ip%></th>
+<th><%:Neighbour IP%></th>
+<th><%:Local interface IP%></th>
 <th>LQ</th>
 <th>NLQ</th>
 <th>ETX</th>
@@ -48,10 +48,10 @@ $Id$
 <% end %>
 </table>
 <br />
-<h3><%:legend%>:</h3>
+<h3><%:Legend%>:</h3>
 <ul>
-<li><strong>LQ: </strong><%:olsrd_links_lq_desc%></li>
-<li><strong>NLQ: </strong><%:olsrd_links_nlq_desc%></li>
-<li><strong>ETX: </strong><%:olsrd_links_etx_desc%></li>
+<li><strong>LQ: </strong><%:Success rate of sent packages%></li>
+<li><strong>NLQ: </strong><%:Success rate of received packages%></li>
+<li><strong>ETX: </strong><%:Expected retransmission count%></li>
 </ul>
 <%+footer%>
diff --git a/applications/luci-olsr/luasrc/view/status-olsr/mid.htm b/applications/luci-olsr/luasrc/view/status-olsr/mid.htm
index 2c3b70366..c934fc9d7 100644
--- a/applications/luci-olsr/luasrc/view/status-olsr/mid.htm
+++ b/applications/luci-olsr/luasrc/view/status-olsr/mid.htm
@@ -13,13 +13,13 @@ $Id$
 
 -%>
 <%+header%>
-<h2><a id="content" name="content"><%:olsrd_mid%></a></h2>
-<p><%:olsrd_mid_desc%></p>
+<h2><a id="content" name="content"><%:Active MID announcements%></a></h2>
+<p><%:Overview of known multiple interface announcements%></p>
 <br />
 <table class="smalltext" cellspacing="0" cellpadding="6">
 <tr>
-<th><%:olsrd_node%></th>
-<th><%:olsrd_mid_aliases%></th>
+<th><%:OLSR node%></th>
+<th><%:Secondary OLSR interfaces%></th>
 </tr>
 <% for k, mid in ipairs(mids) do %>
 <tr>
diff --git a/applications/luci-olsr/luasrc/view/status-olsr/routes.htm b/applications/luci-olsr/luasrc/view/status-olsr/routes.htm
index 1f4296441..52bf101cc 100644
--- a/applications/luci-olsr/luasrc/view/status-olsr/routes.htm
+++ b/applications/luci-olsr/luasrc/view/status-olsr/routes.htm
@@ -13,15 +13,15 @@ $Id$
 
 -%>
 <%+header%>
-<h2><a id="content" name="content"><%:olsrd_routes%></a></h2>
-<p><%:olsrd_routes_desc%></p>
+<h2><a id="content" name="content"><%:Known OLSR routes%></a></h2>
+<p><%:Overview of currently known routes to other OLSR nodes%></p>
 <br />
 <table class="smalltext" cellspacing="0" cellpadding="6">
 <tr>
-<th><%:olsrd_network%></th>
-<th><%:olsrd_gateway%></th>
-<th><%:interface%></th>
-<th><%:metric%></th>
+<th><%:Announced network%></th>
+<th><%:OLSR gateway%></th>
+<th><%:Interface%></th>
+<th><%:Metric%></th>
 <th>ETX</th>
 </tr>
 <% for k, route in ipairs(routes) do
diff --git a/applications/luci-olsr/luasrc/view/status-olsr/topology.htm b/applications/luci-olsr/luasrc/view/status-olsr/topology.htm
index d919aa904..110faeafc 100644
--- a/applications/luci-olsr/luasrc/view/status-olsr/topology.htm
+++ b/applications/luci-olsr/luasrc/view/status-olsr/topology.htm
@@ -13,13 +13,13 @@ $Id$
 
 -%>
 <%+header%>
-<h2><a id="content" name="content"><%:olsrd_topology%></a></h2>
-<p><%:olsrd_topology_desc%></p>
+<h2><a id="content" name="content"><%:Active OLSR nodes%></a></h2>
+<p><%:Overview of currently known OLSR nodes%></p>
 <br />
 <table class="smalltext" cellspacing="0" cellpadding="6">
 <tr>
-<th><%:olsrd_node%></th>
-<th><%:olsrd_topology_lasthop%></th>
+<th><%:OLSR node%></th>
+<th><%:Last hop%></th>
 <th>LQ</th>
 <th>ILQ</th>
 <th>ETX</th>