summaryrefslogtreecommitdiffhomepage
path: root/modules/admin-full/luasrc/view
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2009-10-31 15:54:11 +0000
committerJo-Philipp Wich <jow@openwrt.org>2009-10-31 15:54:11 +0000
commit7c765875884d6866c53b63757731b079bace2e9b (patch)
treedb436df0eaff7de048bca26a7e419aedeb4a08a4 /modules/admin-full/luasrc/view
parentdc7138e424dfd454951ed5ed4eeddbf842457e87 (diff)
all: change most translate statements to new format, some need manual cleanup
Diffstat (limited to 'modules/admin-full/luasrc/view')
-rw-r--r--modules/admin-full/luasrc/view/admin_index/index.htm16
-rw-r--r--modules/admin-full/luasrc/view/admin_network/wifi_join.htm6
-rw-r--r--modules/admin-full/luasrc/view/admin_network/wifi_join_settings.htm14
-rw-r--r--modules/admin-full/luasrc/view/admin_network/wifi_overview.htm4
-rw-r--r--modules/admin-full/luasrc/view/admin_services/index.htm6
-rw-r--r--modules/admin-full/luasrc/view/admin_status/conntrack.htm20
-rw-r--r--modules/admin-full/luasrc/view/admin_status/dmesg.htm2
-rw-r--r--modules/admin-full/luasrc/view/admin_status/index.htm6
-rw-r--r--modules/admin-full/luasrc/view/admin_status/interfaces.htm116
-rw-r--r--modules/admin-full/luasrc/view/admin_status/iptables.htm42
-rw-r--r--modules/admin-full/luasrc/view/admin_status/routes.htm24
-rw-r--r--modules/admin-full/luasrc/view/admin_status/syslog.htm2
-rw-r--r--modules/admin-full/luasrc/view/admin_system/applyreboot.htm6
-rw-r--r--modules/admin-full/luasrc/view/admin_system/backup.htm14
-rw-r--r--modules/admin-full/luasrc/view/admin_system/ipkg.htm4
-rw-r--r--modules/admin-full/luasrc/view/admin_system/packages.htm42
-rw-r--r--modules/admin-full/luasrc/view/admin_system/reboot.htm12
-rw-r--r--modules/admin-full/luasrc/view/admin_system/upgrade.htm3
-rw-r--r--modules/admin-full/luasrc/view/admin_uci/apply.htm4
-rw-r--r--modules/admin-full/luasrc/view/admin_uci/changes.htm10
-rw-r--r--modules/admin-full/luasrc/view/admin_uci/revert.htm4
21 files changed, 177 insertions, 180 deletions
diff --git a/modules/admin-full/luasrc/view/admin_index/index.htm b/modules/admin-full/luasrc/view/admin_index/index.htm
index e6e963c0c..04e74683b 100644
--- a/modules/admin-full/luasrc/view/admin_index/index.htm
+++ b/modules/admin-full/luasrc/view/admin_index/index.htm
@@ -13,12 +13,12 @@ $Id$
-%>
<%+header%>
-<h2><a id="content" name="content"><%:a_i_i_hello%></a></h2>
-<p><%:a_i_i_admin1%></p>
-<p><%:a_i_i_admin2%><br />
-<%:a_i_i_admin3%></p>
-<p><%:a_i_i_admin4%></p>
-<p><%:a_i_i_admin5%></p>
-<p><%:a_i_i_admin6%></p>
-<p><em><strong><a href="<%=controller%>/about"><%:a_i_i_team%></a></strong></em></p>
+<h2><a id="content" name="content"><%:Hello!%></a></h2>
+<p><%:This is the administration area of <abbr title="Lua Configuration Interface">LuCI</abbr>.%></p>
+<p><%:<abbr title="Lua Configuration Interface">LuCI</abbr> is a free, flexible, and user friendly graphical interface for configuring OpenWrt Kamikaze.%><br />
+<%:On the following pages you can adjust all important settings of your router.%></p>
+<p><%:Notice: In <abbr title="Lua Configuration Interface">LuCI</abbr> changes have to be confirmed by clicking Changes - Save & Apply before being applied.%></p>
+<p><%:As we always want to improve this interface we are looking forward to your feedback and suggestions.%></p>
+<p><%:And now have fun with your router!%></p>
+<p><em><strong><a href="<%=controller%>/about"><%:The <abbr title="Lua Configuration Interface">LuCI</abbr> Team%></a></strong></em></p>
<%+footer%> \ No newline at end of file
diff --git a/modules/admin-full/luasrc/view/admin_network/wifi_join.htm b/modules/admin-full/luasrc/view/admin_network/wifi_join.htm
index ec776f697..43ba40bf1 100644
--- a/modules/admin-full/luasrc/view/admin_network/wifi_join.htm
+++ b/modules/admin-full/luasrc/view/admin_network/wifi_join.htm
@@ -71,7 +71,7 @@ $Id$
<%+header%>
-<h2><a id="content" name="content"><%:a_s_iw_scan Wireless Scan%></a></h2>
+<h2><a id="content" name="content"><%:Wireless Scan%></a></h2>
<div class="cbi-map">
<fieldset class="cbi-section">
@@ -118,11 +118,11 @@ $Id$
</div>
<div class="cbi-page-actions right">
<form class="inline" action="<%=luci.dispatcher.build_url("admin/network/wireless")%>" method="get">
- <input class="cbi-button-reset" type="submit" value="<%:a_s_iw_back_overview Back to overview%>" />
+ <input class="cbi-button-reset" type="submit" value="<%:Back to overview%>" />
</form>
<form class="inline" action="<%=REQUEST_URI%>" method="get">
<input type="hidden" name="device" value="<%=utl.pcdata(dev)%>" />
- <input class="cbi-input-find" type="submit" value="<%:a_s_iw_scan_repeat Repeat scan%>" />
+ <input class="cbi-input-find" type="submit" value="<%:Repeat scan%>" />
</form>
</div>
diff --git a/modules/admin-full/luasrc/view/admin_network/wifi_join_settings.htm b/modules/admin-full/luasrc/view/admin_network/wifi_join_settings.htm
index 1be6c2266..c3c8e10aa 100644
--- a/modules/admin-full/luasrc/view/admin_network/wifi_join_settings.htm
+++ b/modules/admin-full/luasrc/view/admin_network/wifi_join_settings.htm
@@ -31,12 +31,10 @@ $Id$
local requirement
if iwinfo.type(dev) == "broadcom" and not nixio.fs.access("/usr/sbin/nas") then
- requirement = luci.i18n.translatef("a_s_iw_require_nas",
- "You need to install the <a href='%s'>Broadcom <em>nas</em> supplicant</a> to use WPA!"
+ requirement = luci.i18n.translatef("You need to install the <a href='%s'>Broadcom <em>nas</em> supplicant</a> to use WPA!"
% luci.dispatcher.build_url("admin/system/packages?url=nas&amp;submit=1"))
elseif not nixio.fs.access("/usr/sbin/wpa_supplicant") then
- requirement = luci.i18n.translatef("a_s_iw_require_wpasupplicant",
- "You need to install <a href='%s'><em>wpa-supplicant</em></a> to use WPA!"
+ requirement = luci.i18n.translatef("You need to install <a href='%s'><em>wpa-supplicant</em></a> to use WPA!"
% luci.dispatcher.build_url("admin/system/packages?url=wpa-supplicant&amp;submit=1"))
end
@@ -44,12 +42,12 @@ $Id$
<%+header%>
-<h2><a id="content" name="content"><%:a_s_iw_join Join Network%></a></h2>
+<h2><a id="content" name="content"><%:Join Network%></a></h2>
<form method="post" action="<%=REQUEST_URI%>">
<div class="cbi-map">
<div class="cbi-map-descr">
- <%=luci.i18n.translatef("a_s_iw_join_desc", "You are about to join the wireless network <em><strong>%s</strong></em>. " ..
+ <%=luci.i18n.translatef("You are about to join the wireless network <em><strong>%s</strong></em>. " ..
"In order to complete the process, you need to provide some additional details.",
utl.pcdata(luci.http.formvalue("join") or "(hidden)")
)%>
@@ -120,8 +118,8 @@ $Id$
</fieldset>
</div>
<div class="cbi-page-actions">
- <input class="cbi-button-apply" type="submit" value="<%:a_s_iw_join_confirm Join network%>" />
- <input class="cbi-button-reset" type="submit" name="cancel" value="<%:a_s_iw_back_scan Back to scan results%>" />
+ <input class="cbi-button-apply" type="submit" value="<%:Join network%>" />
+ <input class="cbi-button-reset" type="submit" name="cancel" value="<%:Back to scan results%>" />
</div>
</form>
diff --git a/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm b/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm
index 93ce748f1..795edc4f3 100644
--- a/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm
+++ b/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm
@@ -99,7 +99,7 @@ $Id$
<%+header%>
-<h2><a id="content" name="content"><%:a_s_iw_overview Wireless Overview%></a></h2>
+<h2><a id="content" name="content"><%:Wireless Overview%></a></h2>
<div class="cbi-map">
@@ -162,7 +162,7 @@ $Id$
- <h2><a id="content" name="content"><%:a_s_iw_overview2 Associated Stations%></a></h2>
+ <h2><a id="content" name="content"><%:Associated Stations%></a></h2>
<fieldset class="cbi-section">
<table class="cbi-section-table" style="margin:10px; width:50%">
diff --git a/modules/admin-full/luasrc/view/admin_services/index.htm b/modules/admin-full/luasrc/view/admin_services/index.htm
index 973e24457..53b67c3c2 100644
--- a/modules/admin-full/luasrc/view/admin_services/index.htm
+++ b/modules/admin-full/luasrc/view/admin_services/index.htm
@@ -13,7 +13,7 @@ $Id$
-%>
<%+header%>
-<h2><a id="content" name="content"><%:services%></a></h2>
-<p><%:a_srv_services1%></p>
-<p><%:a_srv_services2%></p>
+<h2><a id="content" name="content"><%:Services%></a></h2>
+<p><%:Services and daemons perform certain tasks on your device.%></p>
+<p><%:Most of them are network servers, that offer a certain service for your device or network like shell access, serving webpages like <abbr title="Lua Configuration Interface">LuCI</abbr>, doing mesh routing, sending e-mails, ...%></p>
<%+footer%> \ No newline at end of file
diff --git a/modules/admin-full/luasrc/view/admin_status/conntrack.htm b/modules/admin-full/luasrc/view/admin_status/conntrack.htm
index d0a86b610..06827500f 100644
--- a/modules/admin-full/luasrc/view/admin_status/conntrack.htm
+++ b/modules/admin-full/luasrc/view/admin_status/conntrack.htm
@@ -21,17 +21,17 @@ $Id$
<%+header%>
<div class="cbi-map" id="cbi-conntrack">
- <h2><a id="content" name="content"><%:a_n_conntrack%></a></h2>
- <div class="cbi-map-descr"><%:a_n_conntrack_desc%></div>
+ <h2><a id="content" name="content"><%:Active Connections%></a></h2>
+ <div class="cbi-map-descr"><%:This page gives an overview over currently active network connections.%></div>
<fieldset class="cbi-section" id="cbi-table-table">
<legend>ARP</legend>
<div class="cbi-section-node">
<table class="cbi-section-table">
<tr class="cbi-section-table-titles">
- <th class="cbi-section-table-cell"><%:ipaddress%></th>
- <th class="cbi-section-table-cell"><%:macaddress%></th>
- <th class="cbi-section-table-cell"><%:interface%></th>
+ <th class="cbi-section-table-cell"><%:<abbr title="Internet Protocol Version 4">IPv4</abbr>-Address%></th>
+ <th class="cbi-section-table-cell"><%:<abbr title="Media Access Control">MAC</abbr>-Address%></th>
+ <th class="cbi-section-table-cell"><%:Interface%></th>
</tr>
<% luci.sys.net.arptable(function(e) %>
@@ -47,14 +47,14 @@ $Id$
<br />
<fieldset class="cbi-section" id="cbi-table-table">
- <legend><%:a_n_conntrack%></legend>
+ <legend><%:Active Connections%></legend>
<div class="cbi-section-node">
<table class="cbi-section-table">
<tr class="cbi-section-table-titles">
- <th class="cbi-section-table-cell"><%:network%></th>
- <th class="cbi-section-table-cell"><%:protocol%></th>
- <th class="cbi-section-table-cell"><%:source%></th>
- <th class="cbi-section-table-cell"><%:destination%></th>
+ <th class="cbi-section-table-cell"><%:Network%></th>
+ <th class="cbi-section-table-cell"><%:Protocol%></th>
+ <th class="cbi-section-table-cell"><%:Source%></th>
+ <th class="cbi-section-table-cell"><%:Destination%></th>
</tr>
<% style = true; luci.sys.net.conntrack(function(c) %>
diff --git a/modules/admin-full/luasrc/view/admin_status/dmesg.htm b/modules/admin-full/luasrc/view/admin_status/dmesg.htm
index 4fa867397..7757460a0 100644
--- a/modules/admin-full/luasrc/view/admin_status/dmesg.htm
+++ b/modules/admin-full/luasrc/view/admin_status/dmesg.htm
@@ -13,7 +13,7 @@ $Id: syslog.htm 3622 2008-10-23 16:05:55Z jow $
-%>
<%+header%>
-<h2><a id="content" name="content"><%:dmesg%></a></h2>
+<h2><a id="content" name="content"><%:Kernel Log%></a></h2>
<div id="content_syslog">
<textarea readonly="readonly" wrap="off" rows="<%=dmesg:cmatch("\n")+2%>" id="syslog"><%=dmesg:pcdata()%></textarea>
</div>
diff --git a/modules/admin-full/luasrc/view/admin_status/index.htm b/modules/admin-full/luasrc/view/admin_status/index.htm
index e4c1cc410..b26d17a9c 100644
--- a/modules/admin-full/luasrc/view/admin_status/index.htm
+++ b/modules/admin-full/luasrc/view/admin_status/index.htm
@@ -13,7 +13,7 @@ $Id$
-%>
<%+header%>
-<h2><a id="content" name="content"><%:status%></a></h2>
-<p><%:a_st_i_status1%></p>
-<p><%:a_st_i_status2%></p>
+<h2><a id="content" name="content"><%:Status%></a></h2>
+<p><%:Here you can find information about the current system status like <abbr title="Central Processing Unit">CPU</abbr> clock frequency, memory usage or network interface data.%></p>
+<p><%:Also kernel or service logfiles can be viewed here to get an overview over their current state.%></p>
<%+footer%> \ No newline at end of file
diff --git a/modules/admin-full/luasrc/view/admin_status/interfaces.htm b/modules/admin-full/luasrc/view/admin_status/interfaces.htm
index 720ce9c3d..0ee2cf659 100644
--- a/modules/admin-full/luasrc/view/admin_status/interfaces.htm
+++ b/modules/admin-full/luasrc/view/admin_status/interfaces.htm
@@ -129,13 +129,13 @@ $Id$
function get_iwmode(w)
local m = {
- ap = translate("a_s_if_iwmode_ap", "Master"),
- sta = translate("a_s_if_iwmode_sta", "Client"),
- wds = translate("a_s_if_iwmode_wds", "WDS"),
- stawds = translate("a_s_if_iwmode_stawds", "Client + WDS"),
- apwds = translate("a_s_if_iwmode_apwds", "Master + WDS"),
- adhoc = translate("a_s_if_iwmode_adhoc", "Ad-Hoc"),
- ahdemo = translate("a_s_if_iwmode_ahdemo", "Pseudo Ad-Hoc")
+ ap = translate("Master"),
+ sta = translate("Client"),
+ wds = translate("WDS"),
+ stawds = translate("Client + WDS"),
+ apwds = translate("Master + WDS"),
+ adhoc = translate("Ad-Hoc"),
+ ahdemo = translate("Pseudo Ad-Hoc")
}
return m[w.mode] or w.mode
@@ -169,7 +169,7 @@ $Id$
<%+header%>
-<h2><a id="content" name="content"><%:a_s_if_status Interface Status%></a></h2>
+<h2><a id="content" name="content"><%:Interface Status%></a></h2>
<form method="post" action="<%=REQUEST_URI%>">
<div class="cbi-map">
@@ -180,52 +180,52 @@ $Id$
if dev and devinfo and devinfo[dev] then
%>
- <h3><%:a_s_if_interface Interface%> <%=i['.name']%></h3>
+ <h3><%:Interface%> <%=i['.name']%></h3>
<p style="font-size:90%;padding-left:1em">
- <strong><%:a_s_if_device Device%>:</strong>
- <%=dev%> (<%:a_s_if_mac MAC%> <%=get_mac(dev)%>)<br />
+ <strong><%:Device%>:</strong>
+ <%=dev%> (<%:MAC%> <%=get_mac(dev)%>)<br />
- <strong><%:a_s_if_type Type%>:</strong>
+ <strong><%:Type%>:</strong>
<% if is_wifi(dev) then iw = get_iwinfo(dev) -%>
- <%:a_s_if_wifidev Wireless Adapter%> (<%=iw.type%>)<br />
+ <%:Wireless Adapter%> (<%=iw.type%>)<br />
<% if iw then %>
- &nbsp; &#x2514; <strong><%:a_s_if_iwmode Mode%>:</strong> <%=get_iwmode(iw)%><br />
- &nbsp; &#x2514; <strong><%:a_s_if_iwssid SSID%>:</strong> <%=iw.ssid%><br />
- &nbsp; &#x2514; <strong><%:a_s_if_iwchannel Channel%>:</strong> <%=iw.channel%>
+ &nbsp; &#x2514; <strong><%:Mode%>:</strong> <%=get_iwmode(iw)%><br />
+ &nbsp; &#x2514; <strong><%:SSID%>:</strong> <%=iw.ssid%><br />
+ &nbsp; &#x2514; <strong><%:Channel%>:</strong> <%=iw.channel%>
<% end %>
<% else -%>
<% if vlan then %>
- <%:a_s_if_ethswitch Ethernet Switch%> (<%=get_switch_driver(dev)%>)<br />
- &nbsp; &#x2514; <strong><%:a_s_if_vlan VLAN%>:</strong> <%=get_vlan(dev)%> (<%:a_s_if_vlanports Ports%> <%=table.concat(get_vlan_ports(dev), ", ")%>)
+ <%:Ethernet Switch%> (<%=get_switch_driver(dev)%>)<br />
+ &nbsp; &#x2514; <strong><%:VLAN%>:</strong> <%=get_vlan(dev)%> (<%:Ports%> <%=table.concat(get_vlan_ports(dev), ", ")%>)
<% else %>
- <%:a_s_if_ethdev Ethernet Adapter%>
+ <%:Ethernet Adapter%>
<% end %>
<% end -%><br />
- <strong><%:a_s_if_transfer Transfer%></strong><br />
- &nbsp; &#x2514; <strong><%:a_s_if_transfer_rx RX%>:</strong> <%=devinfo[dev][2]%> <%:a_s_if_pkts Pkts.%> (<%=wba.byte_format(tonumber(devinfo[dev][1]))%>)<br />
- &nbsp; &#x2514; <strong><%:a_s_if_transfer_tx TX%>:</strong> <%=devinfo[dev][10]%> <%:a_s_if_pkts Pkts.%> (<%=wba.byte_format(tonumber(devinfo[dev][9]))%>)<br />
+ <strong><%:Transfer%></strong><br />
+ &nbsp; &#x2514; <strong><%:RX%>:</strong> <%=devinfo[dev][2]%> <%:Pkts.%> (<%=wba.byte_format(tonumber(devinfo[dev][1]))%>)<br />
+ &nbsp; &#x2514; <strong><%:TX%>:</strong> <%=devinfo[dev][10]%> <%:Pkts.%> (<%=wba.byte_format(tonumber(devinfo[dev][9]))%>)<br />
<%- if ( i.ipaddr and #i.ipaddr > 0 ) or ( i.ip6addr and #i.ip6addr > 0 ) then -%>
- <strong><%:a_s_if_ipconfig IP Configuration%></strong><br />
- &nbsp; &#x2514; <strong><%:a_s_if_ipconfig_primary Primary%>:</strong>
+ <strong><%:IP Configuration%></strong><br />
+ &nbsp; &#x2514; <strong><%:Primary%>:</strong>
<% if i.ipaddr and #i.ipaddr > 0 then %>
<%=i.ipaddr%>/<%=i.netmask%>
<% if i.proto == "dhcp" then -%>
- (<%:a_s_if_ipconfig_dhcp DHCP assigned%>)
+ (<%:DHCP assigned%>)
<%- end %>
<% else %>
- <em><%:a_s_if_ipconfig_none Not configured%></em>
+ <em><%:Not configured%></em>
<% end %><br />
<% for i, a in ipairs(get_aliases(i)) do %>
- &nbsp; &#x2514; <strong><%:a_s_if_ipconfig_alias Alias%> #<%=i%>:</strong>
- <%=a.ipaddr%>/<%=a.netmask%> (<%:a_s_if_device Device%> <%=dev%>:<%=i%>) <br />
+ &nbsp; &#x2514; <strong><%:Alias%> #<%=i%>:</strong>
+ <%=a.ipaddr%>/<%=a.netmask%> (<%:Device%> <%=dev%>:<%=i%>) <br />
<% end %>
<% if i.ip6addr and #i.ip6addr > 0 then %>
- &nbsp; &#x2514; <strong><%:a_s_if_ipconfig_ipv6 IPv6%>:</strong> <%=i.ip6addr%><br />
+ &nbsp; &#x2514; <strong><%:IPv6%>:</strong> <%=i.ip6addr%><br />
<% end %>
<%- end -%>
<br /></p>
@@ -238,41 +238,41 @@ $Id$
if br and devinfo and devinfo[dev] then
%>
- <h3><%:a_s_if_bridge Bridge%> <%=br.name%></h3>
+ <h3><%:Bridge%> <%=br.name%></h3>
<p style="font-size:90%;padding-left:1em">
- <strong><%:a_s_if_device Device%>:</strong>
- <%=dev%> (<%:a_s_if_mac MAC%> <%=get_mac(dev)%>)<br />
+ <strong><%:Device%>:</strong>
+ <%=dev%> (<%:MAC%> <%=get_mac(dev)%>)<br />
- <strong><%:a_s_if_type Type%>:</strong>
- <%:a_s_if_ethbridge Ethernet Bridge%><br />
+ <strong><%:Type%>:</strong>
+ <%:Ethernet Bridge%><br />
- &nbsp; &#x2514; <strong><%:a_s_if_bridge_id ID%>:</strong> <%=br.id%><br />
- &nbsp; &#x2514; <strong><%:a_s_if_bridge_stp STP%>:</strong> <%=br.stp and "enabled" or "disabled"%><br />
+ &nbsp; &#x2514; <strong><%:ID%>:</strong> <%=br.id%><br />
+ &nbsp; &#x2514; <strong><%:STP%>:</strong> <%=br.stp and "enabled" or "disabled"%><br />
- <strong><%:a_s_if_transfer Transfer%></strong><br />
- &nbsp; &#x2514; <strong><%:a_s_if_transfer_rx RX%>:</strong> <%=devinfo[dev][2]%> Pkts. (<%=wba.byte_format(tonumber(devinfo[dev][1]))%>)<br />
- &nbsp; &#x2514; <strong><%:a_s_if_transfer_tx TX%>:</strong> <%=devinfo[dev][10]%> Pkts. (<%=wba.byte_format(tonumber(devinfo[dev][9]))%>)<br />
+ <strong><%:Transfer%></strong><br />
+ &nbsp; &#x2514; <strong><%:RX%>:</strong> <%=devinfo[dev][2]%> Pkts. (<%=wba.byte_format(tonumber(devinfo[dev][1]))%>)<br />
+ &nbsp; &#x2514; <strong><%:TX%>:</strong> <%=devinfo[dev][10]%> Pkts. (<%=wba.byte_format(tonumber(devinfo[dev][9]))%>)<br />
<%- if ( b.ipaddr and #b.ipaddr > 0 ) or ( b.ip6addr and #b.ip6addr > 0 ) then -%>
- <strong><%:a_s_if_ipconfig IP Configuration%></strong><br />
- &nbsp; &#x2514; <strong><%:a_s_if_ipconfig_primary Primary%>:</strong>
+ <strong><%:IP Configuration%></strong><br />
+ &nbsp; &#x2514; <strong><%:Primary%>:</strong>
<% if b.ipaddr and #b.ipaddr > 0 then %>
<%=b.ipaddr%>/<%=b.netmask%>
<% if b.proto == "dhcp" then -%>
- (<%:a_s_if_ipconfig_dhcp DHCP assigned%>)
+ (<%:DHCP assigned%>)
<%- end %>
<% else %>
- <em><%:a_s_if_ipconfig_none Not configured%></em>
+ <em><%:Not configured%></em>
<% end %><br />
<% for i, a in ipairs(get_aliases(b)) do %>
- &nbsp; &#x2514; <strong><%:a_s_if_ipconfig_alias Alias%> #<%=i%>:</strong>
- <%=a.ipaddr%>/<%=a.netmask%> (<%:a_s_if_device Device%> <%=dev%>:<%=i%>) <br />
+ &nbsp; &#x2514; <strong><%:Alias%> #<%=i%>:</strong>
+ <%=a.ipaddr%>/<%=a.netmask%> (<%:Device%> <%=dev%>:<%=i%>) <br />
<% end %>
<% if b.ip6addr and #b.ip6addr > 0 then %>
- &nbsp; &#x2514; <strong><%:a_s_if_ipconfig_ipv6 IPv6%>:</strong> <%=b.ip6addr%><br />
+ &nbsp; &#x2514; <strong><%:IPv6%>:</strong> <%=b.ip6addr%><br />
<% end %>
<%- end -%>
@@ -280,26 +280,26 @@ $Id$
dev = i
vlan = get_vlan(dev)
%>
- <strong><%:a_s_if_bridge_port Bridge Port%> <%=n%></strong><br />
+ <strong><%:Bridge Port%> <%=n%></strong><br />
- &nbsp; &#x2514; <strong><%:a_s_if_device Device%>:</strong>
- <%=dev%> (<%:a_s_if_mac MAC%> <%=get_mac(dev)%>)<br />
+ &nbsp; &#x2514; <strong><%:Device%>:</strong>
+ <%=dev%> (<%:MAC%> <%=get_mac(dev)%>)<br />
- &nbsp; &#x2514; <strong><%:a_s_if_type Type%>:</strong>
+ &nbsp; &#x2514; <strong><%:Type%>:</strong>
<% if is_wifi(dev) then iw = get_iwinfo(dev) -%>
- <%:a_s_if_wifidev Wireless Adapter%> (<%=iw.type%>)<br />
+ <%:Wireless Adapter%> (<%=iw.type%>)<br />
<% if iw then %>
- &nbsp; &nbsp; &nbsp; &#x2514; <strong><%:a_s_if_iwmode Mode%>:</strong> <%=get_iwmode(iw)%><br />
- &nbsp; &nbsp; &nbsp; &#x2514; <strong><%:a_s_if_iwssid SSID%>:</strong> <%=iw.ssid%><br />
- &nbsp; &nbsp; &nbsp; &#x2514; <strong><%:a_s_if_iwchannel Channel%>:</strong> <%=iw.channel%>
+ &nbsp; &nbsp; &nbsp; &#x2514; <strong><%:Mode%>:</strong> <%=get_iwmode(iw)%><br />
+ &nbsp; &nbsp; &nbsp; &#x2514; <strong><%:SSID%>:</strong> <%=iw.ssid%><br />
+ &nbsp; &nbsp; &nbsp; &#x2514; <strong><%:Channel%>:</strong> <%=iw.channel%>
<% end %>
<% else -%>
<% if vlan then %>
- <%:a_s_if_ethswitch Ethernet Switch%> (<%=get_switch_driver(dev)%>)<br />
- &nbsp; &nbsp; &nbsp; &#x2514; <strong><%:a_s_if_vlan VLAN%>:</strong>
- <%=get_vlan(dev)%> (<%:a_s_if_vlan_ports Ports%> <%=table.concat(get_vlan_ports(dev), ", ")%>)
+ <%:Ethernet Switch%> (<%=get_switch_driver(dev)%>)<br />
+ &nbsp; &nbsp; &nbsp; &#x2514; <strong><%:VLAN%>:</strong>
+ <%=get_vlan(dev)%> (<%:Ports%> <%=table.concat(get_vlan_ports(dev), ", ")%>)
<% else %>
- <%:a_s_if_ethdev Ethernet Adapter%>
+ <%:Ethernet Adapter%>
<% end %>
<% end -%><br />
<% end %>
diff --git a/modules/admin-full/luasrc/view/admin_status/iptables.htm b/modules/admin-full/luasrc/view/admin_status/iptables.htm
index b8f664c86..a81797dee 100644
--- a/modules/admin-full/luasrc/view/admin_status/iptables.htm
+++ b/modules/admin-full/luasrc/view/admin_status/iptables.htm
@@ -49,20 +49,20 @@ $Id$
<%+header%>
-<h2><a id="content" name="content"><%:a_s_ipt_status Firewall Status%></a></h2>
+<h2><a id="content" name="content"><%:Firewall Status%></a></h2>
<form method="post" action="<%=REQUEST_URI%>">
<div class="cbi-map">
<fieldset class="cbi-section">
- <h3><%:a_s_ipt_actions Actions%></h3>
+ <h3><%:Actions%></h3>
<ul>
- <li><a href="<%=REQUEST_URI%>?zero=1"><%:a_s_ipt_reset Reset Counters%></a></li>
- <li><a href="<%=REQUEST_URI%>?restart=1"><%:a_s_ipt_restart Restart Firewall%></a></li>
+ <li><a href="<%=REQUEST_URI%>?zero=1"><%:Reset Counters%></a></li>
+ <li><a href="<%=REQUEST_URI%>?restart=1"><%:Restart Firewall%></a></li>
</ul>
<br /><br />
<% for _, tbl in ipairs({"Filter", "NAT", "Mangle"}) do chaincnt = 0 %>
- <h3><%:a_s_ipt_table Table%>: <%=tbl%></h3>
+ <h3><%:Table%>: <%=tbl%></h3>
<table class="cbi-section-table" style="font-size:90%">
<% for _, chain in ipairs(ipt:chains(tbl)) do
rowcnt = 0
@@ -72,26 +72,26 @@ $Id$
<tr class="cbi-section-table-titles cbi-rowstyle-<%=rowstyle()%>">
<th class="cbi-section-table-cell" style="text-align:left" colspan="11">
<br /><a name="rule_<%=tbl:lower()%>_<%=chain%>"></a>
- <%:a_s_ipt_chain Chain%> <em><%=chain%></em>
+ <%:Chain%> <em><%=chain%></em>
(<%- if chaininfo.policy then -%>
- <%:a_s_ipt_policy Policy%>: <em><%=chaininfo.policy%></em>, <%:a_s_ipt_packets Packets%>: <%=chaininfo.packets%>, <%:a_s_ipt_bytes Traffic%>: <%=wba.byte_format(chaininfo.bytes)-%>
+ <%:Policy%>: <em><%=chaininfo.policy%></em>, <%:Packets%>: <%=chaininfo.packets%>, <%:Traffic%>: <%=wba.byte_format(chaininfo.bytes)-%>
<%- else -%>
- <%:a_s_ipt_references References%>: <%=chaininfo.references-%>
+ <%:References%>: <%=chaininfo.references-%>
<%- end -%>)
</th>
</tr>
<tr class="cbi-section-table-descr">
- <th class="cbi-section-table-cell"><%:a_s_ipt_rulenum Rule #%></th>
- <th class="cbi-section-table-cell"><%:a_s_ipt_packets Pkts.%></th>
- <th class="cbi-section-table-cell"><%:a_s_ipt_bytes Traffic%></th>
- <th class="cbi-section-table-cell"><%:a_s_ipt_target Target%></th>
- <th class="cbi-section-table-cell"><%:a_s_ipt_proto Prot.%></th>
- <th class="cbi-section-table-cell"><%:a_s_ipt_flags Flags%></th>
- <th class="cbi-section-table-cell"><%:a_s_ipt_inputif In%></th>
- <th class="cbi-section-table-cell"><%:a_s_ipt_outputif Out%></th>
- <th class="cbi-section-table-cell"><%:a_s_ipt_source Source%></th>
- <th class="cbi-section-table-cell"><%:a_s_ipt_destination Destination%></th>
- <th class="cbi-section-table-cell" style="width:30%"><%:a_s_ipt_options Options%></th>
+ <th class="cbi-section-table-cell"><%:Rule #%></th>
+ <th class="cbi-section-table-cell"><%:Pkts.%></th>
+ <th class="cbi-section-table-cell"><%:Traffic%></th>
+ <th class="cbi-section-table-cell"><%:Target%></th>
+ <th class="cbi-section-table-cell"><%:Prot.%></th>
+ <th class="cbi-section-table-cell"><%:Flags%></th>
+ <th class="cbi-section-table-cell"><%:In%></th>
+ <th class="cbi-section-table-cell"><%:Out%></th>
+ <th class="cbi-section-table-cell"><%:Source%></th>
+ <th class="cbi-section-table-cell"><%:Destination%></th>
+ <th class="cbi-section-table-cell" style="width:30%"><%:Options%></th>
</tr>
<% for _, rule in ipairs(ipt:find({table=tbl, chain=chain})) do %>
@@ -112,14 +112,14 @@ $Id$
<% if rowcnt == 1 then %>
<tr class="cbi-section-table-titles cbi-rowstyle-<%=rowstyle()%>">
- <td colspan="11"><em><%:a_s_ipt_norules No rules in this chain%></em></td>
+ <td colspan="11"><em><%:No rules in this chain%></em></td>
</tr>
<% end %>
<% end %>
<% if chaincnt == 0 then %>
<tr class="cbi-section-table-titles cbi-rowstyle-<%=rowstyle()%>">
- <td colspan="11"><em><%:a_s_ipt_nochains No chains in this table%></em></td>
+ <td colspan="11"><em><%:No chains in this table%></em></td>
</tr>
<% end %>
</table>
diff --git a/modules/admin-full/luasrc/view/admin_status/routes.htm b/modules/admin-full/luasrc/view/admin_status/routes.htm
index cd62b80e5..905150135 100644
--- a/modules/admin-full/luasrc/view/admin_status/routes.htm
+++ b/modules/admin-full/luasrc/view/admin_status/routes.htm
@@ -25,20 +25,20 @@ $Id$
<%+header%>
<div class="cbi-map" id="cbi-network">
- <h2><a id="content" name="content"><%:a_n_routes%></a></h2>
+ <h2><a id="content" name="content"><%:Routes%></a></h2>
<div class="cbi-map-descr"><%:a_n_routes1%></div>
<fieldset class="cbi-section" id="cbi-table-table">
- <legend><%:a_n_routes_kernel4%></legend>
+ <legend><%:Active <abbr title="Internet Protocol Version 4">IPv4</abbr>-Routes%></legend>
<div class="cbi-section-node">
<table class="cbi-section-table">
<tr class="cbi-section-table-titles">
- <th class="cbi-section-table-cell"><%:network%></th>
- <th class="cbi-section-table-cell"><%:target%></th>
- <th class="cbi-section-table-cell"><%:netmask%></th>
- <th class="cbi-section-table-cell"><%:gateway%></th>
- <th class="cbi-section-table-cell"><%:metric%></th>
+ <th class="cbi-section-table-cell"><%:Network%></th>
+ <th class="cbi-section-table-cell"><%:Target%></th>
+ <th class="cbi-section-table-cell"><%:<abbr title="Internet Protocol Version 4">IPv4</abbr>-Netmask%></th>
+ <th class="cbi-section-table-cell"><%:<abbr title="Internet Protocol Version 4">IPv4</abbr>-Gateway%></th>
+ <th class="cbi-section-table-cell"><%:Metric%></th>
</tr>
<% luci.sys.net.routes(function(rt) %>
<tr class="cbi-section-table-row cbi-rowstyle-<%=(style and 1 or 2)%>">
@@ -56,15 +56,15 @@ $Id$
<% if nixio.fs.access("/proc/net/ipv6_route") then style = true %>
<fieldset class="cbi-section" id="cbi-table-table">
- <legend><%:a_n_routes_kernel6%></legend>
+ <legend><%:Active <abbr title="Internet Protocol Version 6">IPv6</abbr>-Routes%></legend>
<div class="cbi-section-node">
<table class="cbi-section-table">
<tr class="cbi-section-table-titles">
- <th class="cbi-section-table-cell"><%:network%></th>
- <th class="cbi-section-table-cell"><%:target%></th>
- <th class="cbi-section-table-cell"><%:gateway6%></th>
- <th class="cbi-section-table-cell"><%:metric%></th>
+ <th class="cbi-section-table-cell"><%:Network%></th>
+ <th class="cbi-section-table-cell"><%:Target%></th>
+ <th class="cbi-section-table-cell"><%:<abbr title="Internet Protocol Version 6">IPv6</abbr>-Gateway%></th>
+ <th class="cbi-section-table-cell"><%:Metric%></th>
</tr>
<% luci.sys.net.routes6(function(rt) %>
<tr class="cbi-section-table-row cbi-rowstyle-<%=(style and 1 or 2)%>">
diff --git a/modules/admin-full/luasrc/view/admin_status/syslog.htm b/modules/admin-full/luasrc/view/admin_status/syslog.htm
index 2e172cfbf..06aeeb01a 100644
--- a/modules/admin-full/luasrc/view/admin_status/syslog.htm
+++ b/modules/admin-full/luasrc/view/admin_status/syslog.htm
@@ -13,7 +13,7 @@ $Id$
-%>
<%+header%>
-<h2><a id="content" name="content"><%:syslog%></a></h2>
+<h2><a id="content" name="content"><%:System Log%></a></h2>
<div id="content_syslog">
<textarea readonly="readonly" wrap="off" rows="<%=syslog:cmatch("\n")+2%>" id="syslog"><%=syslog:pcdata()%></textarea>
</div>
diff --git a/modules/admin-full/luasrc/view/admin_system/applyreboot.htm b/modules/admin-full/luasrc/view/admin_system/applyreboot.htm
index 1a1a24bb0..8ff7118c7 100644
--- a/modules/admin-full/luasrc/view/admin_system/applyreboot.htm
+++ b/modules/admin-full/luasrc/view/admin_system/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 %><%:a_s_applyreboot1%><% end %></p>
-<p><%:a_s_reboot_running%></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
diff --git a/modules/admin-full/luasrc/view/admin_system/backup.htm b/modules/admin-full/luasrc/view/admin_system/backup.htm
index 2db044ddd..a28d2b806 100644
--- a/modules/admin-full/luasrc/view/admin_system/backup.htm
+++ b/modules/admin-full/luasrc/view/admin_system/backup.htm
@@ -13,15 +13,15 @@ $Id$
-%>
<%+header%>
-<h2><a id="content" name="content"><%:system%></a></h2>
-<h3><%:a_s_backup%></h3>
-<p><%:a_s_backup1%></p>
+<h2><a id="content" name="content"><%:System%></a></h2>
+<h3><%:Backup / Restore%></h3>
+<p><%:Here you can backup and restore your router configuration and - if possible - reset the router to the default settings.%></p>
<br />
<div>
<ul>
- <li><a href="<%=REQUEST_URI%>?backup=kthxbye"><%:a_s_backup_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('<%:a_s_backup_reset1%>')"><%:a_s_backup_reset%></a></li>
+ <li><a href="<%=REQUEST_URI%>?reset=yarly" onclick="return confirm('<%:Proceed reverting all settings and resetting to firmware defaults?%>')"><%:Reset router to defaults%></a></li>
<% end -%>
</ul>
</div>
@@ -29,12 +29,12 @@ $Id$
<br />
<form method="post" action="<%=REQUEST_URI%>" enctype="multipart/form-data">
- <div class="left"><%:a_s_backup_archive%>:</div>
+ <div class="left"><%:Backup Archive%>:</div>
<div>
<input type="file" size="30" name="archive" />
</div>
<div>
- <input type="submit" class="cbi-input-apply" value="<%:a_s_backup_restore%>" />
+ <input type="submit" class="cbi-input-apply" value="<%:Restore backup%>" />
</div>
</form>
<%+footer%> \ No newline at end of file
diff --git a/modules/admin-full/luasrc/view/admin_system/ipkg.htm b/modules/admin-full/luasrc/view/admin_system/ipkg.htm
index 7f6c0fb89..c14e4546f 100644
--- a/modules/admin-full/luasrc/view/admin_system/ipkg.htm
+++ b/modules/admin-full/luasrc/view/admin_system/ipkg.htm
@@ -13,6 +13,6 @@ $Id$
-%>
<ul>
-<li><strong><%:a_s_p_ipkg_pkglists%>:</strong> <code>src <em>Name</em> <em>URL</em></code></li>
-<li><strong><%:a_s_p_ipkg_targets%>:</strong> <code>dest <em>Name</em> <em>Pfad</em></code></li>
+<li><strong><%:Package lists%>:</strong> <code>src <em>Name</em> <em>URL</em></code></li>
+<li><strong><%:Installation targets%>:</strong> <code>dest <em>Name</em> <em>Pfad</em></code></li>
</ul>
diff --git a/modules/admin-full/luasrc/view/admin_system/packages.htm b/modules/admin-full/luasrc/view/admin_system/packages.htm
index 5cd9f635a..b4ece0532 100644
--- a/modules/admin-full/luasrc/view/admin_system/packages.htm
+++ b/modules/admin-full/luasrc/view/admin_system/packages.htm
@@ -25,29 +25,29 @@ function opkg_error(code)
code = bit.rshift(tonumber(code), 8)
return translate(
'a_s_packages_code%i' % code,
- '%s %i' % { translate('code'), code }
+ '%s %i' % { translate('Code'), code }
)
end
-%>
<%+header%>
-<h2><a id="content" name="content"><%:system%></a></h2>
-<h3><%:a_s_packages%></h3>
+<h2><a id="content" name="content"><%:System%></a></h2>
+<h3><%:Software%></h3>
<br />
<% if install or remove or update or upgrade then %>
-<div class="code"><strong><%:status%>:</strong><br />
+<div class="code"><strong><%:Status%>:</strong><br />
<% if update then %>
- <%:a_s_packages_update%>: <% if update == 0 then %><span class="ok"><%:ok%></span><% else %><span class="error"><%:error%> (<%=opkg_error(update)%>)</span><% end %><br />
+ <%:Package lists updated%>: <% if update == 0 then %><span class="ok"><%:OK%></span><% else %><span class="error"><%:Error%> (<%=opkg_error(update)%>)</span><% end %><br />
<% end %>
<% if upgrade then%>
- <%:a_s_packages_upgrade%>: <% if upgrade == 0 then %><span class="ok"><%:ok%></span><% else %><span class="error"><%:error%> (<%=opkg_error(upgrade)%>)</span><% end %><br />
+ <%:Upgrade installed packages%>: <% if upgrade == 0 then %><span class="ok"><%:OK%></span><% else %><span class="error"><%:Error%> (<%=opkg_error(upgrade)%>)</span><% end %><br />
<% end %>
<% if install then for k,v in pairs(install) do %>
- <%:a_s_packages_install%> '<%=k%>': <% if v == 0 then %><span class="ok"><%:ok%></span><% else %><span class="error"><%:error%> (<%=opkg_error(v)%>)</span><% end %><br />
+ <%:Install%> '<%=k%>': <% if v == 0 then %><span class="ok"><%:OK%></span><% else %><span class="error"><%:Error%> (<%=opkg_error(v)%>)</span><% end %><br />
<% end end %>
<% if remove then for k,v in pairs(remove) do %>
- <%:a_s_packages_remove%> '<%=k%>': <% if v == 0 then %><span class="ok"><%:ok%></span><% else %><span class="error"><%:error%> (<%=opkg_error(v)%>)</span><% end %><br />
+ <%:Remove%> '<%=k%>': <% if v == 0 then %><span class="ok"><%:OK%></span><% else %><span class="error"><%:Error%> (<%=opkg_error(v)%>)</span><% end %><br />
<% end end %>
</div>
<br />
@@ -57,41 +57,41 @@ end
<div class="cbi-map">
<fieldset class="cbi-section">
<ul>
- <li><a href="<%=REQUEST_URI%>/ipkg"><%:a_s_packages_ipkg%></a></li>
- <li><a href="<%=REQUEST_URI%>?update=1"><%:a_s_packages_updatelist%></a></li>
+ <li><a href="<%=REQUEST_URI%>/ipkg"><%:Edit package lists and installation targets%></a></li>
+ <li><a href="<%=REQUEST_URI%>?update=1"><%:Update package lists%></a></li>
</ul>
<br />
<fieldset class="cbi-section-node">
<div class="cbi-value">
- <label class="cbi-value-title"><%:a_s_packages_installurl%>:</label>
+ <label class="cbi-value-title"><%:Download and install package%>:</label>
<div class="cbi-value-field">
<input type="text" name="url" size="30" value="" />
- <input class="cbi-input-save" type="submit" name="submit" value="<%:ok%>" />
+ <input class="cbi-input-save" type="submit" name="submit" value="<%:OK%>" />
</div>
</div>
<div class="cbi-value">
- <label class="cbi-value-title"><%:filter%>:</label>
+ <label class="cbi-value-title"><%:Filter%>:</label>
<div class="cbi-value-field">
<input type="text" name="query" size="20" value="<%=query%>" />
- <input type="submit" class="cbi-input-find" name="search" value="<%:a_s_packages_search%>" />
+ <input type="submit" class="cbi-input-find" name="search" value="<%:Find package%>" />
</div>
</div>
<table class="cbi-section-table">
<tr class="cbi-section-table-titles">
- <th class="cbi-section-table-cell"><%:a_s_packages_name%></th>
- <th class="cbi-section-table-cell"><%:version%></th>
- <th class="cbi-section-table-cell"><%:install%></th>
- <th class="cbi-section-table-cell"><%:delete%></th>
- <th class="cbi-section-table-cell"><%:descr%></th>
+ <th class="cbi-section-table-cell"><%:Package name%></th>
+ <th class="cbi-section-table-cell"><%:Version%></th>
+ <th class="cbi-section-table-cell"><%:Install%></th>
+ <th class="cbi-section-table-cell"><%:Delete%></th>
+ <th class="cbi-section-table-cell"><%:Description%></th>
</tr>
<% for k, pkg in pairs(pkgs) do %>
<tr class="cbi-section-table-row cbi-rowstyle-<%=rowstyle()%>">
<td><%=luci.util.pcdata(pkg.Package)%></td>
<td><%=luci.util.pcdata(pkg.Version)%></td>
<td><% if not pkg.Status or not pkg.Status.installed then %><input type="checkbox" name="install.<%=pkg.Package%>" value="1" /><% else %><%:installed%><% end %></td>
- <td><% if pkg.Status and pkg.Status.installed then %><input type="checkbox" name="remove.<%=pkg.Package%>" value="1" /><% else %><%:notinstalled%><% end %></td>
+ <td><% if pkg.Status and pkg.Status.installed then %><input type="checkbox" name="remove.<%=pkg.Package%>" value="1" /><% else %><%:not installed%><% end %></td>
<td><%=luci.util.pcdata(pkg.Description)%></td>
</tr>
<% end %>
@@ -100,7 +100,7 @@ end
<br />
<div style="text-align: right">
- <input type="submit" class="cbi-input-apply" name="submit" value="<%:a_s_packages_do%>" />
+ <input type="submit" class="cbi-input-apply" name="submit" value="<%:Perform Actions%>" />
</div>
</fieldset></fieldset>
</div>
diff --git a/modules/admin-full/luasrc/view/admin_system/reboot.htm b/modules/admin-full/luasrc/view/admin_system/reboot.htm
index f1656fbb8..5f2912d92 100644
--- a/modules/admin-full/luasrc/view/admin_system/reboot.htm
+++ b/modules/admin-full/luasrc/view/admin_system/reboot.htm
@@ -13,21 +13,21 @@ $Id$
-%>
<%+header%>
-<h2><a id="content" name="content"><%:system%></a></h2>
-<h3><%:reboot%></h3>
-<p><%:a_s_reboot1%></p>
+<h2><a id="content" name="content"><%:System%></a></h2>
+<h3><%:Reboot%></h3>
+<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"><%:a_s_reboot_u%></p>
+ <p class="warning"><%:Warning: There are unsaved changes that will be lost while rebooting!%></p>
<%-
end
if not reboot then
-%>
-<p><a href="<%=controller%>/admin/system/reboot?reboot=1"><%:a_s_reboot_do%></a></p>
+<p><a href="<%=controller%>/admin/system/reboot?reboot=1"><%:Perform reboot%></a></p>
<%- else -%>
-<p><%:a_s_reboot_running%></p>
+<p><%:Please wait: Device rebooting...%></p>
<script type="text/javascript">setTimeout("location='<%=controller%>/admin'", 60000)</script>
<%- end -%>
<%+footer%> \ No newline at end of file
diff --git a/modules/admin-full/luasrc/view/admin_system/upgrade.htm b/modules/admin-full/luasrc/view/admin_system/upgrade.htm
index 425113e62..510a51b15 100644
--- a/modules/admin-full/luasrc/view/admin_system/upgrade.htm
+++ b/modules/admin-full/luasrc/view/admin_system/upgrade.htm
@@ -15,7 +15,7 @@ $Id$
<%+header%>
-<h2><a id="content" name="content"><%:system%></a></h2>
+<h2><a id="content" name="content"><%:System%></a></h2>
<h3><%:admin_upgrade Flash Firmware%></h3>
<% if step == 1 then %>
@@ -73,7 +73,6 @@ $Id$
if flashsize > 0 then
write(luci.i18n.translatef(
- "admin_upgrade_spaceavail",
" (%s available)",
w.byte_format(flashsize)
))
diff --git a/modules/admin-full/luasrc/view/admin_uci/apply.htm b/modules/admin-full/luasrc/view/admin_uci/apply.htm
index ac18746b6..e9de29a91 100644
--- a/modules/admin-full/luasrc/view/admin_uci/apply.htm
+++ b/modules/admin-full/luasrc/view/admin_uci/apply.htm
@@ -14,8 +14,8 @@ $Id$
-%>
<%+header%>
-<h2><a id="content" name="content"><%:config%></a></h2>
-<p><strong><%:uci_applied%>:</strong></p>
+<h2><a id="content" name="content"><%:Configuration%></a></h2>
+<p><strong><%:The following changes have been applied%>:</strong></p>
<div class="cbi-section">
<code><%=(changes or "-")%></code>
diff --git a/modules/admin-full/luasrc/view/admin_uci/changes.htm b/modules/admin-full/luasrc/view/admin_uci/changes.htm
index a9db8b49b..6dd3e5990 100644
--- a/modules/admin-full/luasrc/view/admin_uci/changes.htm
+++ b/modules/admin-full/luasrc/view/admin_uci/changes.htm
@@ -15,8 +15,8 @@ $Id$
<%+header%>
-<h2><a id="content" name="content"><%:config%></a></h2>
-<p><strong><%:changes%>:</strong></p>
+<h2><a id="content" name="content"><%:Configuration%></a></h2>
+<p><strong><%:Changes%>:</strong></p>
<div class="cbi-section">
<code><%=changes%></code>
@@ -31,13 +31,13 @@ $Id$
<div style="text-align:right">
<form class="inline" method="get" action="<%=controller%>/admin/uci/apply">
- <input class="cbi-button cbi-button-apply" type="submit" value="<%:apply%>" />
+ <input class="cbi-button cbi-button-apply" type="submit" value="<%:Apply%>" />
</form>
<form class="inline" method="get" action="<%=controller%>/admin/uci/saveapply">
- <input class="cbi-button cbi-button-save" type="submit" value="<%:saveapply%>" />
+ <input class="cbi-button cbi-button-save" type="submit" value="<%:Save & Apply%>" />
</form>
<form class="inline" method="get" action="<%=controller%>/admin/uci/revert">
- <input class="cbi-button cbi-button-reset" type="submit" value="<%:revert%>" />
+ <input class="cbi-button cbi-button-reset" type="submit" value="<%:Revert%>" />
</form>
</div>
</div>
diff --git a/modules/admin-full/luasrc/view/admin_uci/revert.htm b/modules/admin-full/luasrc/view/admin_uci/revert.htm
index 9c98d452e..863cfda86 100644
--- a/modules/admin-full/luasrc/view/admin_uci/revert.htm
+++ b/modules/admin-full/luasrc/view/admin_uci/revert.htm
@@ -15,8 +15,8 @@ $Id$
<%+header%>
-<h2><a id="content" name="content"><%:config%></a></h2>
-<p><strong><%:uci_reverted%>:</strong></p>
+<h2><a id="content" name="content"><%:Configuration%></a></h2>
+<p><strong><%:The following changes have been reverted%>:</strong></p>
<div class="cbi-section">
<code><%=(changes or "-")%></code>