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

6 files changed, 29 insertions, 29 deletions

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 c23f52b4f8..97142a689a 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 e0ec8846a1..0e153bbbc3 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 3dc56f992f..97962eec95 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 2c3b70366b..c934fc9d7f 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 1f42964416..52bf101ccf 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 d919aa904a..110faeafc5 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>