all: translation fixes in templates

9 files changed, 34 insertions, 34 deletions

diff --git a/applications/luci-openvpn/luasrc/view/openvpn/pageswitch.htm b/applications/luci-openvpn/luasrc/view/openvpn/pageswitch.htm
index 0d036a9ab..9276fe3cd 100644
--- a/applications/luci-openvpn/luasrc/view/openvpn/pageswitch.htm
+++ b/applications/luci-openvpn/luasrc/view/openvpn/pageswitch.htm
@@ -15,23 +15,23 @@ $Id$
 
 <fieldset class="cbi-section">
 	<legend>
-		<a href="<%=luci.dispatcher.build_url("admin", "services", "openvpn")%>"><%:openvpn_overview Overview%></a> &raquo;
+		<a href="<%=luci.dispatcher.build_url("admin", "services", "openvpn")%>"><%:Overview%></a> &raquo;
 		<%=luci.i18n.translatef("Instance \"%s\"", self.instance)%>
 	</legend>
 
 	<% if self.mode == "basic" then %>
-		<a href="<%=luci.dispatcher.build_url("admin", "services", "openvpn", "advanced", self.instance)%>"><%:openvpn_switch_advanced Switch to advanced configuration &raquo;%></a>
+		<a href="<%=luci.dispatcher.build_url("admin", "services", "openvpn", "advanced", self.instance)%>"><%:Switch to advanced configuration »%></a>
 	<% else %>
-		<a href="<%=luci.dispatcher.build_url("admin", "services", "openvpn", "basic", self.instance)%>"><%:openvpn_switch_basic &laquo; Switch to basic configuration%></a>
+		<a href="<%=luci.dispatcher.build_url("admin", "services", "openvpn", "basic", self.instance)%>"><%:« Switch to basic configuration%></a>
 		<hr style="margin:0.5em 0" />
-		<%:openvpn_confcategory Configuration category%>:
+		<%:Configuration category%>:
 		<% for i, c in ipairs(self.categories) do %>
 			<% if c == self.category then %>
-				<strong><%=translate("openvpn_%s" % c, c)%></strong>
+				<strong><%=translate(c)%></strong>
 			<% else %>
 				<a href="<%=luci.dispatcher.build_url(
 					"admin", "services", "openvpn", "advanced", self.instance, c
-				)%>"><%=translate("openvpn_%s" % c, c)%></a>
+				)%>"><%=translate(c)%></a>
 			<% end %>
 			<% if next(self.categories, i) then %>|<% end %>
 		<% end %>
diff --git a/applications/luci-splash/luasrc/view/admin_status/splash.htm b/applications/luci-splash/luasrc/view/admin_status/splash.htm
index 11af7f5ec..70e6c06cf 100644
--- a/applications/luci-splash/luasrc/view/admin_status/splash.htm
+++ b/applications/luci-splash/luasrc/view/admin_status/splash.htm
@@ -128,19 +128,19 @@ end
 <%+header%>
 
 <div id="cbi-splash-leases" class="cbi-map">
-	<h2><a id="content" name="content"><%:ff_splash Client-Splash%></a></h2>
+	<h2><a id="content" name="content"><%:Client-Splash%></a></h2>
 	<fieldset id="cbi-table-table" class="cbi-section">
-		<legend><%:ff_splash_clients Active Clients%></legend>
+		<legend><%:Active Clients%></legend>
 		<div class="cbi-section-node">
 			<% if is_admin then %><form action="<%=REQUEST_URI%>" method="post"><% end %>
 			<table class="cbi-section-table">
 				<tr class="cbi-section-table-titles">
-					<th class="cbi-section-table-cell"><%:ff_splash_hostname Hostname%></th>
-					<th class="cbi-section-table-cell"><%:ff_splash_ip IP Address%></th>
-					<th class="cbi-section-table-cell"><%:ff_splash_mac MAC Address%></th>
-					<th class="cbi-section-table-cell"><%:ff_splash_timeleft Time remaining%></th>
-					<th class="cbi-section-table-cell"><%:ff_splash_traffic Traffic in/out%></th>
-					<th class="cbi-section-table-cell"><%:ff_splash_policy Policy%></th>
+					<th class="cbi-section-table-cell"><%:Hostname%></th>
+					<th class="cbi-section-table-cell"><%:IP Address%></th>
+					<th class="cbi-section-table-cell"><%:MAC Address%></th>
+					<th class="cbi-section-table-cell"><%:Time remaining%></th>
+					<th class="cbi-section-table-cell"><%:Traffic in/out%></th>
+					<th class="cbi-section-table-cell"><%:Policy%></th>
 				</tr>
 
 				<%-
@@ -169,14 +169,14 @@ end
 						<td class="cbi-section-table-cell">
 							<% if is_admin then %>
 							<select name="policy.<%=c.mac:lower()%>" style="width:200px">
-								<option value="whitelist"<%=c.policy=="whitelist" and ' selected="selected"'%>><%:ff_splash_whitelisted whitelisted%></option>
-								<option value="normal"<%=c.policy=="normal" and not c.kicked and ' selected="selected"'%>><%:ff_splash_splashed splashed%></option>
-								<option value="blacklist"<%=c.policy=="blacklist" and ' selected="selected"'%>><%:ff_splash_blacklisted blacklisted%></option>
+								<option value="whitelist"<%=c.policy=="whitelist" and ' selected="selected"'%>><%:whitelisted%></option>
+								<option value="normal"<%=c.policy=="normal" and not c.kicked and ' selected="selected"'%>><%:splashed%></option>
+								<option value="blacklist"<%=c.policy=="blacklist" and ' selected="selected"'%>><%:blacklisted%></option>
 								<% if c.policy == "normal" then -%>
-									<option value="kicked"><%:ff_splash_tempblock temporarily blocked%></option>
+									<option value="kicked"><%:temporarily blocked%></option>
 								<%- end %>
 							</select>
-							<input type="submit" class="cbi-button cbi-button-save" name="save.<%=c.mac:lower()%>" value="<%:save Save%>" />
+							<input type="submit" class="cbi-button cbi-button-save" name="save.<%=c.mac:lower()%>" value="<%:Save%>" />
 							<% else %>
 							<%=c.policy%>
 							<% end %>
@@ -190,7 +190,7 @@ end
 				-%>
 					<tr class="cbi-section-table-row">
 						<td colspan="7" class="cbi-section-table-cell">
-							<br /><em><%:ff_splash_noclients No clients connected%></em><br />
+							<br /><em><%:No clients connected%></em><br />
 						</td>
 					</tr>
 				<%- end -%>
diff --git a/applications/luci-splash/luasrc/view/splash/splash.htm b/applications/luci-splash/luasrc/view/splash/splash.htm
index 3fcf02bac..b65927505 100644
--- a/applications/luci-splash/luasrc/view/splash/splash.htm
+++ b/applications/luci-splash/luasrc/view/splash/splash.htm
@@ -42,6 +42,6 @@ Wenn Du unsere Idee gut findest, kannst Du uns unterstützen:
 </p>
 
 <p>
-Mit einem Klick auf <em><%:accept Accept%></em> kannst du für <%=c.leasetime%> Stunden
+Mit einem Klick auf <em><%:Accept%></em> kannst du für <%=c.leasetime%> Stunden
 über unser Netz das Internet verwenden. Dann wirst du erneut aufgefordet, diese Bedingungen zu akzeptieren.
 </p>
diff --git a/applications/luci-splash/luasrc/view/splash_splash/splash.htm b/applications/luci-splash/luasrc/view/splash_splash/splash.htm
index 413efbe2e..01dfd05c1 100644
--- a/applications/luci-splash/luasrc/view/splash_splash/splash.htm
+++ b/applications/luci-splash/luasrc/view/splash_splash/splash.htm
@@ -15,7 +15,7 @@ $Id$
 <%+header%>
 <%+splash/splash%>
 <form method="get" action="<%=controller%>/splash/activate">
-	<input type="submit" value="<%:decline Decline%>" />
-	<input type="submit" name="accept" value="<%:accept Accept%>" />
+	<input type="submit" value="<%:Decline%>" />
+	<input type="submit" name="accept" value="<%:Accept%>" />
 </form>
 <%+footer%>
diff --git a/applications/luci-statistics/luasrc/view/admin_statistics/index.htm b/applications/luci-statistics/luasrc/view/admin_statistics/index.htm
index ebc6faba5..25157da40 100644
--- a/applications/luci-statistics/luasrc/view/admin_statistics/index.htm
+++ b/applications/luci-statistics/luasrc/view/admin_statistics/index.htm
@@ -14,7 +14,7 @@ $Id$
 -%>
 <%+header%>
 
-<h2><a id="content" name="content"><%:stat_statistics Statistics%></a></h2>
+<h2><a id="content" name="content"><%:Statistics%></a></h2>
 
 <p><%_The statistics package is based on <a href="http://collectd.org/index.shtml">Collectd</a>
 and uses <a href="http://oss.oetiker.ch/rrdtool/">RRD Tool</a> to render diagram images from collected data.%></p>
diff --git a/applications/luci-statistics/luasrc/view/admin_statistics/networkplugins.htm b/applications/luci-statistics/luasrc/view/admin_statistics/networkplugins.htm
index 13e52257e..eacb3c3b7 100644
--- a/applications/luci-statistics/luasrc/view/admin_statistics/networkplugins.htm
+++ b/applications/luci-statistics/luasrc/view/admin_statistics/networkplugins.htm
@@ -14,12 +14,12 @@ $Id$
 -%>
 <%+header%>
 
-<h2><a id="content" name="content"><%:stat_networkplugins Network plugins%></a></h2>
+<h2><a id="content" name="content"><%:Network plugins%></a></h2>
 
-<p><%:stat_networkplugins_desc Network plugins are used to collect information
+<p><%:Network plugins are used to collect information
 about open tcp connections, interface traffic, iptables rules etc.%></p>
 
-<p><%:stat_networkplugins_installed Installed network plugins:%>
+<p><%:Installed network plugins:%>
 	<ul>
 		<% for plugin, desc in pairs(plugins) do %>
 			<% if nixio.fs.access("/usr/lib/collectd/" .. plugin .. ".so") then %>
diff --git a/applications/luci-statistics/luasrc/view/admin_statistics/outputplugins.htm b/applications/luci-statistics/luasrc/view/admin_statistics/outputplugins.htm
index ef9ae23b5..05f7ca952 100644
--- a/applications/luci-statistics/luasrc/view/admin_statistics/outputplugins.htm
+++ b/applications/luci-statistics/luasrc/view/admin_statistics/outputplugins.htm
@@ -14,13 +14,13 @@ $Id$
 -%>
 <%+header%>
 
-<h2><a id="content" name="content"><%:stat_outputplugins Output plugins%></a></h2>
+<h2><a id="content" name="content"><%:Output plugins%></a></h2>
 
-<p><%:stat_outputplugins_desc Output plugins provide different possibilities to store collected data.
+<p><%:Output plugins provide different possibilities to store collected data.
 It is possible to enable multiple plugin at one, for example to store collected data in rrd databases
 and to transmit the data over the network to other collectd instances.%></p>
 
-<p><%:stat_outputplugins_installed Installed output plugins:%>
+<p><%:Installed output plugins:%>
 	<ul>
 		<% for plugin, desc in pairs(plugins) do %>
 			<% if nixio.fs.access("/usr/lib/collectd/" .. plugin .. ".so") then %>
diff --git a/applications/luci-statistics/luasrc/view/admin_statistics/systemplugins.htm b/applications/luci-statistics/luasrc/view/admin_statistics/systemplugins.htm
index 0e801c791..431b4b285 100644
--- a/applications/luci-statistics/luasrc/view/admin_statistics/systemplugins.htm
+++ b/applications/luci-statistics/luasrc/view/admin_statistics/systemplugins.htm
@@ -14,9 +14,9 @@ $Id$
 -%>
 <%+header%>
 
-<h2><a id="content" name="content"><%:stat_systemplugins System plugins%></a></h2>
+<h2><a id="content" name="content"><%:System plugins%></a></h2>
 
-<p><%:stat_systemplugins_desc System plugins collecting values about system state and ressource usage on the device.:%>
+<p><%:System plugins collecting values about system state and ressource usage on the device.:%>
 	<ul>
 		<% for plugin, desc in pairs(plugins) do %>
 			<% if nixio.fs.access("/usr/lib/collectd/" .. plugin .. ".so") then %>
diff --git a/applications/luci-statistics/luasrc/view/public_statistics/graph.htm b/applications/luci-statistics/luasrc/view/public_statistics/graph.htm
index bf304c7b4..71be2aa2f 100644
--- a/applications/luci-statistics/luasrc/view/public_statistics/graph.htm
+++ b/applications/luci-statistics/luasrc/view/public_statistics/graph.htm
@@ -14,7 +14,7 @@ $Id$
 -%>
 <%+header%>
 
-<h2><a id="content" name="content"><%:stat_statistics Statistics%></a></h2>
+<h2><a id="content" name="content"><%:Statistics%></a></h2>
 
 <form action="" method="get">
 	<select name="timespan">
@@ -22,7 +22,7 @@ $Id$
 			<option<% if span == current_timespan then %> selected="selected"<% end %>><%=span%></option>
 		<% end %>
 	</select>
-	<input type="submit" name="submit" value="<%:stat_showtimespan Display timespan &raquo;%>" />
+	<input type="submit" name="submit" value="<%:Display timespan &raquo;%>" />
 </form>
 
 <br />