diff --git a/package/gluon-luci-admin/files/usr/lib/lua/luci/controller/admin/index.lua b/package/gluon-luci-admin/files/usr/lib/lua/luci/controller/admin/index.lua
index fb5000af958b858e037611200c4cb31df1a42a39..a39fc73ad4a78d23928e065c4352f9514ceb77b3 100644
--- a/package/gluon-luci-admin/files/usr/lib/lua/luci/controller/admin/index.lua
+++ b/package/gluon-luci-admin/files/usr/lib/lua/luci/controller/admin/index.lua
@@ -30,7 +30,7 @@ function index()
root.index = true
end
- local page = entry({"admin"}, alias("admin", "index"), _("Expertmode"), 10)
+ local page = entry({"admin"}, alias("admin", "index"), "Expertmode", 10)
page.sysauth = "root"
if configmode then
-- force root to be logged in when running in configmode
@@ -40,10 +40,10 @@ function index()
end
page.index = true
- entry({"admin", "index"}, form("admin/index"), _("Overview"), 1).ignoreindex = true
+ entry({"admin", "index"}, form("admin/index"), "Overview", 1).ignoreindex = true
if not configmode then
- entry({"admin", "logout"}, call("action_logout"), _("Logout"))
+ entry({"admin", "logout"}, call("action_logout"), "Logout")
end
end
diff --git a/package/gluon-luci-admin/files/usr/lib/lua/luci/controller/admin/system.lua b/package/gluon-luci-admin/files/usr/lib/lua/luci/controller/admin/system.lua
index 457f1dde5d0c13374581a07d10a709a2f9612815..1ca546a30dfcd95fc756d9201de269afb2d51e88 100644
--- a/package/gluon-luci-admin/files/usr/lib/lua/luci/controller/admin/system.lua
+++ b/package/gluon-luci-admin/files/usr/lib/lua/luci/controller/admin/system.lua
@@ -16,10 +16,10 @@ $Id$
module("luci.controller.admin.system", package.seeall)
function index()
- entry({"admin", "passwd"}, cbi("admin/passwd"), _("Admin Password"), 10)
- entry({"admin", "backup"}, call("action_backup"), _("Backup / Restore"), 80)
- entry({"admin", "upgrade"}, call("action_upgrade"), _("Flash Firmware"), 90)
- entry({"admin", "reboot"}, call("action_reboot"), _("Reboot"), 100)
+ entry({"admin", "passwd"}, cbi("admin/passwd"), "Admin Password", 10)
+ entry({"admin", "backup"}, call("action_backup"), "Backup / Restore", 80)
+ entry({"admin", "upgrade"}, call("action_upgrade"), "Flash Firmware", 90)
+ entry({"admin", "reboot"}, call("action_reboot"), "Reboot", 100)
end
function action_backup()
diff --git a/package/gluon-luci-admin/files/usr/lib/lua/luci/model/cbi/admin/passwd.lua b/package/gluon-luci-admin/files/usr/lib/lua/luci/model/cbi/admin/passwd.lua
index 9f1ba8737a6f5b7cee0ccbfbe0854983429455e9..5658ce9fd8dae386f3afc84d5da0631b314d522a 100644
--- a/package/gluon-luci-admin/files/usr/lib/lua/luci/model/cbi/admin/passwd.lua
+++ b/package/gluon-luci-admin/files/usr/lib/lua/luci/model/cbi/admin/passwd.lua
@@ -20,16 +20,16 @@ local m, s, pw1, pw2
m = Map("system", "Passwort & SSH Keys")
-s = m:section(TypedSection, translate("Router Password"),
- translate("Changes the administrator password for accessing the device"))
+s = m:section(TypedSection, "Router Password",
+ "Changes the administrator password for accessing the device")
s.addremove = false
s.anonymous = true
-pw1 = s:option(Value, "pw1", translate("Password"))
+pw1 = s:option(Value, "pw1", "Password")
pw1.password = true
-pw2 = s:option(Value, "pw2", translate("Confirmation"))
+pw2 = s:option(Value, "pw2", "Confirmation")
pw2.password = true
function s.cfgsections()
@@ -43,19 +43,19 @@ function m.on_commit(map)
if v1 and v2 and #v1 > 0 and #v2 > 0 then
if v1 == v2 then
if luci.sys.user.setpasswd(luci.dispatcher.context.authuser, v1) == 0 then
- m.message = translate("Password successfully changed!")
+ m.message = "Password successfully changed!"
else
- m.message = translate("Unknown Error, password not changed!")
+ m.message = "Unknown Error, password not changed!"
end
else
- m.message = translate("Given password confirmation did not match, password not changed!")
+ m.message = "Given password confirmation did not match, password not changed!"
end
end
end
if fs.access("/etc/config/dropbear") then
s = m:section(TypedSection, "_keys", "SSH Keys",
- translate("Here you can paste public SSH-Keys (one per line) for SSH public-key authentication."))
+ "Here you can paste public SSH-Keys (one per line) for SSH public-key authentication.")
s.addremove = false
s.anonymous = true
diff --git a/package/gluon-luci-admin/files/usr/lib/lua/luci/view/admin/applyreboot.htm b/package/gluon-luci-admin/files/usr/lib/lua/luci/view/admin/applyreboot.htm
index 8ff7118c7e29493212e11606fcc50666adaf5c57..46fa4b6dbf8b4af206a0951c55f10428303282b6 100644
--- a/package/gluon-luci-admin/files/usr/lib/lua/luci/view/admin/applyreboot.htm
+++ b/package/gluon-luci-admin/files/usr/lib/lua/luci/view/admin/applyreboot.htm
@@ -13,9 +13,9 @@ $Id$
-%>
<%+header%>
-<h2><a id="content" name="content"><%:System%></a></h2>
+<h2><a id="content" name="content">System</a></h2>
<br />
-<p><% if msg then %><%=msg%><% else %><%:Changes applied.%><% end %></p>
-<p><%:Please wait: Device rebooting...%></p>
+<p><% if msg then %><%=msg%><% else %>Changes applied.<% end %></p>
+<p>Please wait: Device rebooting...</p>
<script type="text/javascript">setTimeout("location='<%=controller%>'", 60000)</script>
-<%+footer%>
\ No newline at end of file
+<%+footer%>
diff --git a/package/gluon-luci-admin/files/usr/lib/lua/luci/view/admin/backup.htm b/package/gluon-luci-admin/files/usr/lib/lua/luci/view/admin/backup.htm
index 167419da2bb6760bb05e670dd9a1efbd827b2d04..5299b0134da47de61762ac56ad5bec44c06c1715 100644
--- a/package/gluon-luci-admin/files/usr/lib/lua/luci/view/admin/backup.htm
+++ b/package/gluon-luci-admin/files/usr/lib/lua/luci/view/admin/backup.htm
@@ -13,14 +13,14 @@ $Id$
-%>
<%+header%>
-<h2><a id="content" name="content"><%:Backup / Restore%></a></h2>
-<p><%:Here you can backup and restore your configuration and - if possible - reset this device to the default settings.%></p>
+<h2><a id="content" name="content">Backup / Restore</a></h2>
+<p>Here you can backup and restore your configuration and - if possible - reset this device to the default settings.</p>
<br />
<div>
<ul>
- <li><a href="<%=REQUEST_URI%>?backup=kthxbye"><%:Create backup%></a></li>
+ <li><a href="<%=REQUEST_URI%>?backup=kthxbye">Create backup</a></li>
<% if reset_avail then -%>
- <li><a href="<%=REQUEST_URI%>?reset=yarly" onclick="return confirm('<%:Proceed reverting all settings and resetting to firmware defaults?%>')"><%:Reset this device to defaults%></a></li>
+ <li><a href="<%=REQUEST_URI%>?reset=yarly" onclick="return confirm('Proceed reverting all settings and resetting to firmware defaults?')">Reset this device to defaults</a></li>
<% end -%>
</ul>
</div>
@@ -28,12 +28,12 @@ $Id$
<br />
<form method="post" action="<%=REQUEST_URI%>" enctype="multipart/form-data">
- <div class="left"><%:Backup Archive%>:</div>
+ <div class="left">Backup Archive:</div>
<div>
<input type="file" size="30" name="archive" />
</div>
<div>
- <input type="submit" class="cbi-button cbi-input-apply" value="<%:Restore backup%>" />
+ <input type="submit" class="cbi-button cbi-input-apply" value="Restore backup" />
</div>
</form>
<%+footer%>
diff --git a/package/gluon-luci-admin/files/usr/lib/lua/luci/view/admin/index.htm b/package/gluon-luci-admin/files/usr/lib/lua/luci/view/admin/index.htm
index c1656a7e1199327707e3e49da9ce59bee5a41dc1..c789bb88bcbe2fec6018d7876549c386e1ddb6f4 100644
--- a/package/gluon-luci-admin/files/usr/lib/lua/luci/view/admin/index.htm
+++ b/package/gluon-luci-admin/files/usr/lib/lua/luci/view/admin/index.htm
@@ -1,4 +1,4 @@
-<h2><a id="content" name="content"><%:Hello!%></a></h2>
+<h2><a id="content" name="content">Hallo!</a></h2>
<p>Dies ist der Experten-Modus deines Freifunkknotens.</p>
<p>Hier kannst du weitere Einstellungen vornehmen, Firmware Upates
einspielen und auch vieles kaputt machen.</p>
diff --git a/package/gluon-luci-admin/files/usr/lib/lua/luci/view/admin/reboot.htm b/package/gluon-luci-admin/files/usr/lib/lua/luci/view/admin/reboot.htm
index 91699e3aed0e6c48dfbd34e3d4adcb52cb6a0d9c..2eaf6d7095fc1b2208da39eecacfb58b314e3790 100644
--- a/package/gluon-luci-admin/files/usr/lib/lua/luci/view/admin/reboot.htm
+++ b/package/gluon-luci-admin/files/usr/lib/lua/luci/view/admin/reboot.htm
@@ -13,19 +13,19 @@ $Id$
-%>
<%+header%>
-<h2><a id="content" name="content"><%:Reboot%></a></h2>
-<p><%:Reboots the operating system of your device%></p>
+<h2><a id="content" name="content">Reboot</a></h2>
+<p>Reboots the operating system of your device</p>
<%-
local c = require("luci.model.uci").cursor():changes()
if c and next(c) then
-%>
- <p class="warning"><%:Warning: There are unsaved changes that will be lost while rebooting!%></p>
+ <p class="warning">Warning: There are unsaved changes that will be lost while rebooting!</p>
<%-
end
if not reboot then
-%>
-<p><a href="<%=REQUEST_URI%>?reboot=1"><%:Perform reboot%></a></p>
+<p><a href="<%=REQUEST_URI%>?reboot=1">Perform reboot</a></p>
<%- else -%>
-<p><%:Please wait: Device rebooting...%></p>
+<p>Please wait: Device rebooting...</p>
<%- end -%>
-<%+footer%>
\ No newline at end of file
+<%+footer%>
diff --git a/package/gluon-luci-admin/files/usr/lib/lua/luci/view/admin/upgrade.htm b/package/gluon-luci-admin/files/usr/lib/lua/luci/view/admin/upgrade.htm
index 3d75b4158d7efe9a7a65e0e0d501dc0314fb77da..3380dc633df41a0416e87de14f998c2e1cbfefea 100644
--- a/package/gluon-luci-admin/files/usr/lib/lua/luci/view/admin/upgrade.htm
+++ b/package/gluon-luci-admin/files/usr/lib/lua/luci/view/admin/upgrade.htm
@@ -15,58 +15,58 @@ $Id$
<%+header%>
-<h2><a id="content" name="content"><%:Flash Firmware%></a></h2>
+<h2><a id="content" name="content">Flash Firmware</a></h2>
<% if step == 1 then %>
<% if supported then %>
<form method="post" action="<%=REQUEST_URI%>" enctype="multipart/form-data">
<p>
- <%: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"><%: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>
+ image format for your platform.</div>
<% end %>
</p>
<div>
- <%: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"><%:Keep configuration files%></span>
+ <span class="bold">Keep configuration files</span>
<% end -%>
<br />
- <input class="cbi-button cbi-button-apply" type="submit" value="<%:Upload image%>" />
+ <input class="cbi-button cbi-button-apply" type="submit" value="Upload image" />
</div>
</form>
<% else %>
- <div class="error"><%_ Sorry.
+ <div class="error">Sorry.
OpenWrt does not support a system upgrade on this platform.<br />
- You need to manually flash your device. %></div>
+ You need to manually flash your device.</div>
<% end %>
<% elseif step == 2 then %>
<p>
- <%_ 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. %>
+ Click "Proceed" below to start the flash procedure.
<% if flashsize > 0 and filesize > flashsize then %>
<br /><br />
- <div class="error"><%: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>
+ the image file!</div>
<% end %>
<br />
<ul>
- <li><%:Checksum%>: <code><%=checksum%></code></li>
- <li><%:Size%>: <%
+ <li>Checksum: <code><%=checksum%></code></li>
+ <li>Size: <%
local w = require "luci.tools.webadmin"
write(w.byte_format(filesize))
@@ -83,20 +83,20 @@ $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%>" />
+ <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%>" />
+ <input class="cbi-button cbi-button-reset" type="submit" value="Cancel" />
</form>
</div>
<% elseif step == 3 then %>
- <p><%_ 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
- again, depending on your settings. %></p>
+ again, depending on your settings.</p>
<iframe src="<%=REQUEST_URI%>?step=4&keepcfg=<%=keepconfig and "1" or "0"%>" style="border:1px solid black; width:100%; height:150px"></iframe>
<% end %>