all: translation fixes in templates

3 files changed, 37 insertions, 37 deletions

diff --git a/modules/admin-full/luasrc/view/admin_system/upgrade.htm b/modules/admin-full/luasrc/view/admin_system/upgrade.htm
index 510a51b15..ddf4fda45 100644
--- a/modules/admin-full/luasrc/view/admin_system/upgrade.htm
+++ b/modules/admin-full/luasrc/view/admin_system/upgrade.htm
@@ -16,58 +16,58 @@ $Id$
 <%+header%>
 
 <h2><a id="content" name="content"><%:System%></a></h2>
-<h3><%:admin_upgrade Flash Firmware%></h3>
+<h3><%:Flash Firmware%></h3>
 
 <% if step == 1 then %>
 	<% if supported then %>
 	<form method="post" action="<%=REQUEST_URI%>" enctype="multipart/form-data">
 	<p>
-		<%:admin_upgrade_desc Upload an OpenWrt image file to reflash the device.%>
+		<%:Upload an OpenWrt image file to reflash the device.%>
 		<% if bad_image then %>
 			<br /><br />
-			<div class="error"><%:admin_upgrade_badimage The uploaded image file does not
+			<div class="error"><%:The uploaded image file does not
 				contain a supported format. Make sure that you choose the generic
 				image format for your platform. %></div>
 		<% end %>
 	</p>
 	<div>
-		<%:admin_upgrade_fwimage Firmware image%>:<br />
+		<%:Firmware image%>:<br />
 		<input type="hidden" name="step" value="2" />
 		<input type="file" size="30" name="image" />
 		<br />
 		<br />
 		<% if keepavail then -%>
 		<input type="checkbox" name="keepcfg" value="1" checked="checked" />
-		<span class="bold"><%:admin_upgrade_keepcfg Keep configuration files%></span>
+		<span class="bold"><%:Keep configuration files%></span>
 		<% end -%>
 
 		<br />
-		<input class="cbi-button cbi-button-apply" type="submit" value="<%:admin_upgrade_upload Upload image%>" />
+		<input class="cbi-button cbi-button-apply" type="submit" value="<%:Upload image%>" />
 	</div>
 	</form>
 	<% else %>
-		<div class="error"><%:admin_upgrade_nosupport Sorry.
+		<div class="error"><%:Sorry.
 			OpenWrt does not support a system upgrade on this platform.<br />
 			You need to manually flash your device. %></div>
 	<% end %>
 <% elseif step == 2 then %>
 	<p>
-		<%:admin_upgrade_uploaded The flash image was uploaded.
+		<%_ The flash image was uploaded.
 			Below is the checksum and file size listed,
 			compare them with the original file to ensure data integrity.<br />
 			Click "Proceed" below to start the flash procedure. %>
 
 		<% if flashsize > 0 and filesize > flashsize then %>
 			<br /><br />
-			<div class="error"><%:admin_upgrade_toolarge It appears that you try to
+			<div class="error"><%:It appears that you try to
 				flash an image that does not fit into the flash memory, please verify
 				the image file! %></div>
 		<% end %>
 
 		<br />
 		<ul>
-			<li><%:admin_upgrade_checksum Checksum%>: <code><%=checksum%></code></li>
-			<li><%:admin_upgrade_filesize Size%>: <%
+			<li><%:Checksum%>: <code><%=checksum%></code></li>
+			<li><%:Size%>: <%
 				local w = require "luci.tools.webadmin"
 				write(w.byte_format(filesize))
 	
@@ -84,16 +84,16 @@ $Id$
 		<form style="display:inline">
 			<input type="hidden" name="step" value="3" />
 			<input type="hidden" name="keepcfg" value="<%=keepconfig and "1" or "0"%>" />
-			<input class="cbi-button cbi-button-apply" type="submit" value="<%:proceed Proceed%>" />	
+			<input class="cbi-button cbi-button-apply" type="submit" value="<%:Proceed%>" />	
 		</form>
 		<form style="display:inline">
 			<input type="hidden" name="step" value="1" />
 			<input type="hidden" name="keepcfg" value="<%=keepconfig and "1" or "0"%>" />
-			<input class="cbi-button cbi-button-reset" type="submit" value="<%:cancel Cancel%>" />
+			<input class="cbi-button cbi-button-reset" type="submit" value="<%:Cancel%>" />
 		</form>
 	</div>
 <% elseif step == 3 then %>
-	<p><%:admin_upgrade_running The system is flashing now.<br />
+	<p><%_ The system is flashing now.<br />
 		DO NOT POWER OFF THE DEVICE!<br />
 		Wait a few minutes until you try to reconnect.
 		It might be necessary to renew the address of your computer to reach the device
diff --git a/modules/admin-mini/luasrc/view/mini/upgrade.htm b/modules/admin-mini/luasrc/view/mini/upgrade.htm
index 510a51b15..1083a1618 100644
--- a/modules/admin-mini/luasrc/view/mini/upgrade.htm
+++ b/modules/admin-mini/luasrc/view/mini/upgrade.htm
@@ -16,58 +16,58 @@ $Id$
 <%+header%>
 
 <h2><a id="content" name="content"><%:System%></a></h2>
-<h3><%:admin_upgrade Flash Firmware%></h3>
+<h3><%:Flash Firmware%></h3>
 
 <% if step == 1 then %>
 	<% if supported then %>
 	<form method="post" action="<%=REQUEST_URI%>" enctype="multipart/form-data">
 	<p>
-		<%:admin_upgrade_desc Upload an OpenWrt image file to reflash the device.%>
+		<%:Upload an OpenWrt image file to reflash the device.%>
 		<% if bad_image then %>
 			<br /><br />
-			<div class="error"><%:admin_upgrade_badimage The uploaded image file does not
+			<div class="error"><%:The uploaded image file does not
 				contain a supported format. Make sure that you choose the generic
 				image format for your platform. %></div>
 		<% end %>
 	</p>
 	<div>
-		<%:admin_upgrade_fwimage Firmware image%>:<br />
+		<%:Firmware image%>:<br />
 		<input type="hidden" name="step" value="2" />
 		<input type="file" size="30" name="image" />
 		<br />
 		<br />
 		<% if keepavail then -%>
 		<input type="checkbox" name="keepcfg" value="1" checked="checked" />
-		<span class="bold"><%:admin_upgrade_keepcfg Keep configuration files%></span>
+		<span class="bold"><%:Keep configuration files%></span>
 		<% end -%>
 
 		<br />
-		<input class="cbi-button cbi-button-apply" type="submit" value="<%:admin_upgrade_upload Upload image%>" />
+		<input class="cbi-button cbi-button-apply" type="submit" value="<%:Upload image%>" />
 	</div>
 	</form>
 	<% else %>
-		<div class="error"><%:admin_upgrade_nosupport Sorry.
+		<div class="error"><%_ Sorry.
 			OpenWrt does not support a system upgrade on this platform.<br />
 			You need to manually flash your device. %></div>
 	<% end %>
 <% elseif step == 2 then %>
 	<p>
-		<%:admin_upgrade_uploaded The flash image was uploaded.
+		<%_ The flash image was uploaded.
 			Below is the checksum and file size listed,
 			compare them with the original file to ensure data integrity.<br />
 			Click "Proceed" below to start the flash procedure. %>
 
 		<% if flashsize > 0 and filesize > flashsize then %>
 			<br /><br />
-			<div class="error"><%:admin_upgrade_toolarge It appears that you try to
+			<div class="error"><%:It appears that you try to
 				flash an image that does not fit into the flash memory, please verify
 				the image file! %></div>
 		<% end %>
 
 		<br />
 		<ul>
-			<li><%:admin_upgrade_checksum Checksum%>: <code><%=checksum%></code></li>
-			<li><%:admin_upgrade_filesize Size%>: <%
+			<li><%:Checksum%>: <code><%=checksum%></code></li>
+			<li><%:Size%>: <%
 				local w = require "luci.tools.webadmin"
 				write(w.byte_format(filesize))
 	
@@ -84,16 +84,16 @@ $Id$
 		<form style="display:inline">
 			<input type="hidden" name="step" value="3" />
 			<input type="hidden" name="keepcfg" value="<%=keepconfig and "1" or "0"%>" />
-			<input class="cbi-button cbi-button-apply" type="submit" value="<%:proceed Proceed%>" />	
+			<input class="cbi-button cbi-button-apply" type="submit" value="<%:Proceed%>" />	
 		</form>
 		<form style="display:inline">
 			<input type="hidden" name="step" value="1" />
 			<input type="hidden" name="keepcfg" value="<%=keepconfig and "1" or "0"%>" />
-			<input class="cbi-button cbi-button-reset" type="submit" value="<%:cancel Cancel%>" />
+			<input class="cbi-button cbi-button-reset" type="submit" value="<%:Cancel%>" />
 		</form>
 	</div>
 <% elseif step == 3 then %>
-	<p><%:admin_upgrade_running The system is flashing now.<br />
+	<p><%_ The system is flashing now.<br />
 		DO NOT POWER OFF THE DEVICE!<br />
 		Wait a few minutes until you try to reconnect.
 		It might be necessary to renew the address of your computer to reach the device
diff --git a/modules/freifunk/luasrc/view/freifunk/remote_update.htm b/modules/freifunk/luasrc/view/freifunk/remote_update.htm
index 47ac7a356..092ec4714 100644
--- a/modules/freifunk/luasrc/view/freifunk/remote_update.htm
+++ b/modules/freifunk/luasrc/view/freifunk/remote_update.htm
@@ -14,31 +14,31 @@ $Id: contact.htm 3529 2008-10-07 13:10:24Z jow $
 -%>
 <%+header%>
 
-<h2><%:ff_remote_update Freifunk Remote Update%></h2>
+<h2><%:Freifunk Remote Update%></h2>
 
-<p><%:ff_remote_update_desc Check for new firmware versions and perform automatic updates.%></p>
+<p><%:Check for new firmware versions and perform automatic updates.%></p>
 
 <% if update then %>
 
 	<% if update.info then %>
-		<strong><%:ff_remote_update_available Update available!%></strong>
+		<strong><%:Update available!%></strong>
 		<br /><br />
 		<pre><%=update.info%></pre><br />
 	<% else %>
-		<strong><%:ff_remote_update_uptodate The installed firmware is the most recent version.%></strong>
+		<strong><%:The installed firmware is the most recent version.%></strong>
 		<br /><br />
 	<% end %>
 
 	<p>
 		<form method="post" action="" class="inline">
 			<input type="hidden" name="flash" value="1" />
-			<input type="submit" class="cbi-button cbi-button-apply" value="<%:ff_remote_update_install Start Upgrade%>" />
+			<input type="submit" class="cbi-button cbi-button-apply" value="<%:Start Upgrade%>" />
 		</form>	
 	</p>
 
 <% elseif confirm then %>
 
-	<strong><%:ff_remote_update_settings Update Settings%></strong>
+	<strong><%:Update Settings%></strong>
 	<br /><br />
 
 	<p><form method="post" action="" class="inline">
@@ -46,12 +46,12 @@ $Id: contact.htm 3529 2008-10-07 13:10:24Z jow $
 		<input type="hidden" name="confirm" value="1" />
 
 		<input type="checkbox" class="cbi-input-checkbox" name="keepcfg" value="1" checked="checked" id="cb_keepcfg" />
-		<label for="cb_keepcfg"><%:ff_remote_update_keepcfg Keep configuration%></label><br />
+		<label for="cb_keepcfg"><%:Keep configuration%></label><br />
 
 		<input type="checkbox" class="cbi-input-checkbox" name="verify" value="1" checked="checked" id="cb_verify" />
-		<label for="cb_verify"><%:ff_remote_update_verify Verify downloaded images%></label><br /><br />
+		<label for="cb_verify"><%:Verify downloaded images%></label><br /><br />
 
-		<input type="submit" class="cbi-button cbi-button-apply" value="<%:ff_remote_update_confirm Confirm Upgrade%>" />
+		<input type="submit" class="cbi-button cbi-button-apply" value="<%:Confirm Upgrade%>" />
 	</form></p>
 
 <% end %>