diff --git a/modules/admin-core/luasrc/view/error404.htm b/modules/admin-core/luasrc/view/error404.htm index 4aa40f392a..813604d12c 100644 --- a/modules/admin-core/luasrc/view/error404.htm +++ b/modules/admin-core/luasrc/view/error404.htm @@ -13,7 +13,7 @@ $Id$ -%> <%+header%> -

404 Not Found

-

Sorry, the object you requested was not found.

-Unable to dispatch: <%=luci.http.request.env.PATH_INFO%> -<%+footer%> \ No newline at end of file +

404 <%:Not Found%>

+

<%:Sorry, the object you requested was not found.%>

+<%:Unable to dispatch%>: <%=luci.http.request.env.PATH_INFO%> +<%+footer%> diff --git a/modules/admin-core/luasrc/view/error500.htm b/modules/admin-core/luasrc/view/error500.htm index 982f9b9e94..14ba0410a4 100644 --- a/modules/admin-core/luasrc/view/error500.htm +++ b/modules/admin-core/luasrc/view/error500.htm @@ -13,7 +13,7 @@ $Id$ -%> <%+header%> -

500 Internal Server Error

-

Sorry, the server encountered an unexpected error.

+

500 <%:Internal Server Error%>

+

<%:Sorry, the server encountered an unexpected error.%>

<%=message%>
<%+footer%> diff --git a/modules/admin-full/luasrc/view/admin_network/diagnostics.htm b/modules/admin-full/luasrc/view/admin_network/diagnostics.htm index 953b988397..a991f9a48f 100644 --- a/modules/admin-full/luasrc/view/admin_network/diagnostics.htm +++ b/modules/admin-full/luasrc/view/admin_network/diagnostics.htm @@ -66,17 +66,17 @@ $Id$
- +
- +
- +


diff --git a/modules/admin-full/luasrc/view/admin_network/iface_overview.htm b/modules/admin-full/luasrc/view/admin_network/iface_overview.htm index 9580a9dca3..1312b4c16d 100644 --- a/modules/admin-full/luasrc/view/admin_network/iface_overview.htm +++ b/modules/admin-full/luasrc/view/admin_network/iface_overview.htm @@ -134,7 +134,7 @@ You may obtain a copy of the License at if (ifc.type != 'tunnel') { - html += String.format('<%:MAC Address%>: %s
', ifc.macaddr); + html += String.format('<%:MAC-Address%>: %s
', ifc.macaddr); } html += String.format( diff --git a/modules/admin-full/luasrc/view/admin_network/iface_status.htm b/modules/admin-full/luasrc/view/admin_network/iface_status.htm index 428c42fec9..8136383969 100644 --- a/modules/admin-full/luasrc/view/admin_network/iface_status.htm +++ b/modules/admin-full/luasrc/view/admin_network/iface_status.htm @@ -27,7 +27,7 @@ if (ifc.type != 'tunnel') { - html += String.format('<%:MAC Address%>: %s
', ifc.macaddr); + html += String.format('<%:MAC-Address%>: %s
', ifc.macaddr); } html += String.format( 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 2455b7d6f0..d7376e7850 100644 --- a/modules/admin-full/luasrc/view/admin_network/wifi_join.htm +++ b/modules/admin-full/luasrc/view/admin_network/wifi_join.htm @@ -105,13 +105,13 @@ $Id$ <% for i, net in ipairs(scanlist(3)) do net.encryption = net.encryption or { } %> - +
<%=percent_wifi_signal(net)%>% - <%=net.ssid and utl.pcdata(net.ssid) or "hidden"%>
+ <%=net.ssid and utl.pcdata(net.ssid) or "%s" % translate("hidden")%>
Channel: <%=net.channel%> | Mode: <%=net.mode%> | BSSID: <%=net.bssid%> | 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 4ba01a5d14..1f59a1830d 100644 --- a/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm +++ b/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm @@ -43,7 +43,7 @@ $Id$ -- wl.o if name == "wl" then - local name = "Broadcom 802.11%s Wireless Controller" % bands + local name = translatef("Broadcom 802.11%s Wireless Controller", bands) local nm = 0 local fd = nixio.open("/proc/bus/pci/devices", "r") @@ -53,7 +53,7 @@ $Id$ if ln:match("wl$") then if nm == idx then local version = ln:match("^%S+%s+%S%S%S%S([0-9a-f]+)") - name = string.format( + name = translatef( "Broadcom BCM%04x 802.11 Wireless Controller", tonumber(version, 16) ) @@ -71,23 +71,23 @@ $Id$ -- madwifi elseif name == "ath" or name == "wifi" then - return "Atheros 802.11%s Wireless Controller" % bands + return translatef("Atheros 802.11%s Wireless Controller", bands) -- ralink elseif name == "ra" then - return "RaLink 802.11%s Wireless Controller" % bands + return translatef("RaLink 802.11%s Wireless Controller", bands) -- hermes elseif name == "eth" then - return "Hermes 802.11b Wireless Controller" + return translate("Hermes 802.11b Wireless Controller") -- hostap elseif name == "wlan" and fs.isdirectory("/proc/net/hostap/" .. ifname) then - return "Prism2/2.5/3 802.11b Wireless Controller" + return translate("Prism2/2.5/3 802.11b Wireless Controller") -- dunno yet else - return "Generic 802.11%s Wireless Controller" % bands + return translatef("Generic 802.11%s Wireless Controller", bands) end end @@ -204,7 +204,7 @@ $Id$ var sig = document.getElementById(iw.id + '-iw-signal'); if (sig) sig.innerHTML = String.format( - '
' + + '
' + '%d%%', icon, iw.signal, iw.noise, p ); @@ -256,8 +256,8 @@ $Id$ { if (is_assoc) dev.innerHTML = String.format( - '<%:Channel%>: %s (%s GHz) | ' + - '<%:Bitrate%>: %s Mb/s', + '<%:Channel%>: %s (%s <%:GHz%>) | ' + + '<%:Bitrate%>: %s <%:Mbit/s%>', iw.channel ? iw.channel : '?', iw.frequency ? iw.frequency : '?', iw.bitrate ? iw.bitrate : '?' @@ -296,7 +296,7 @@ $Id$ icon = "<%=resource%>/icons/signal-75-100.png"; tr.insertCell(-1).innerHTML = String.format( - '', + '', icon, assoclist[j].signal, assoclist[j].noise ); @@ -306,17 +306,17 @@ $Id$ tr.insertCell(-1).innerHTML = arptable[assoclist[j].bssid] ? arptable[assoclist[j].bssid] : '?'; - tr.insertCell(-1).innerHTML = String.format('%d dBm', assoclist[j].signal); - tr.insertCell(-1).innerHTML = String.format('%d dBm', assoclist[j].noise); + tr.insertCell(-1).innerHTML = String.format('%d <%:dBm%>', assoclist[j].signal); + tr.insertCell(-1).innerHTML = String.format('%d <%:dBm%>', assoclist[j].noise); tr.insertCell(-1).innerHTML = (assoclist[j].rx_mcs > -1) - ? String.format('%.1f Mbit/s, MCS %d, %dMHz', assoclist[j].rx_rate / 1000, assoclist[j].rx_mcs, assoclist[j].rx_40mhz ? 40 : 20) - : String.format('%.1f Mbit/s', assoclist[j].rx_rate / 1000) + ? String.format('%.1f <%:Mbit/s%>, MCS %d, %d<%:MHz%>', assoclist[j].rx_rate / 1000, assoclist[j].rx_mcs, assoclist[j].rx_40mhz ? 40 : 20) + : String.format('%.1f <%:Mbit/s%>', assoclist[j].rx_rate / 1000) ; tr.insertCell(-1).innerHTML = (assoclist[j].tx_mcs > -1) - ? String.format('%.1f Mbit/s, MCS %d, %dMHz', assoclist[j].tx_rate / 1000, assoclist[j].tx_mcs, assoclist[j].tx_40mhz ? 40 : 20) - : String.format('%.1f Mbit/s', assoclist[j].tx_rate / 1000) + ? String.format('%.1f <%:Mbit/s%>, MCS %d, %d<%:MHz%>', assoclist[j].tx_rate / 1000, assoclist[j].tx_mcs, assoclist[j].tx_40mhz ? 40 : 20) + : String.format('%.1f <%:Mbit/s%>', assoclist[j].tx_rate / 1000) ; rowstyle = (rowstyle == 1) ? 2 : 1; @@ -414,8 +414,8 @@ $Id$ <%:SSID%> - <%:MAC%> - <%:Address%> + <%:MAC-Address%> + <%:IPv4-Address%> <%:Signal%> <%:Noise%> <%:RX Rate%> diff --git a/modules/admin-full/luasrc/view/admin_network/wifi_status.htm b/modules/admin-full/luasrc/view/admin_network/wifi_status.htm index 900071b898..2484fd3c6b 100644 --- a/modules/admin-full/luasrc/view/admin_network/wifi_status.htm +++ b/modules/admin-full/luasrc/view/admin_network/wifi_status.htm @@ -27,7 +27,7 @@ var s = document.getElementById('<%=self.option%>-iw-signal'); if (s) s.innerHTML = String.format( - '
' + + '
' + '%d%%', icon, iw.signal, iw.noise, p ); @@ -38,11 +38,11 @@ '<%:SSID%>: %h
' + '<%:BSSID%>: %s | ' + '<%:Encryption%>: %s
' + - '<%:Channel%>: %d (%.3f GHz) | ' + - '<%:Tx-Power%>: %d dBm
' + - '<%:Signal%>: %d dBm | ' + - '<%:Noise%>: %d dBm
' + - '<%:Bit Rate%>: %.1f MBit/s | ' + + '<%:Channel%>: %d (%.3f <%:GHz%>) | ' + + '<%:Tx-Power%>: %d <%:dBm%>
' + + '<%:Signal%>: %d <%:dBm%> | ' + + '<%:Noise%>: %d <%:dBm%>
' + + '<%:Bitrate%>: %.1f <%:Mbit/s%> | ' + '<%:Country%>: %s', iw.mode, iw.ssid, iw.bssid, iw.encryption ? iw.encryption : '<%:None%>', diff --git a/modules/admin-full/luasrc/view/admin_status/bandwidth.htm b/modules/admin-full/luasrc/view/admin_status/bandwidth.htm index 003c3ebdc0..0c53c95bed 100644 --- a/modules/admin-full/luasrc/view/admin_status/bandwidth.htm +++ b/modules/admin-full/luasrc/view/admin_status/bandwidth.htm @@ -71,25 +71,25 @@ $Id$ function bandwidth_label(bytes, br) { - var uby = 'KByte'; + var uby = '<%:kB/s%>'; var kby = (bytes / 1024); if (kby >= 1024) { - uby = 'MByte'; + uby = '<%:MB/s%>'; kby = kby / 1024; } - var ubi = 'KBit'; + var ubi = '<%:kbit/s%>'; var kbi = (bytes * 8 / 1024); if (kbi >= 1024) { - ubi = 'MBit'; + ubi = '<%:Mbit/s%>'; kbi = kbi / 1024; } - return String.format("%f %s/s%s(%f %s/s)", + return String.format("%f %s%s(%f %s)", kbi.toFixed(2), ubi, br ? '
' : ' ', kby.toFixed(2), uby @@ -288,23 +288,23 @@ $Id$ - + - + - + - + - + - +
<%:Inbound:%>0 kbit/s
(0 KB/s)		0 <%:kbit/s%>
(0 <%:kB/s%>)		 <%:Average:%>0 kbit/s
(0 KB/s)		0 <%:kbit/s%>
(0 <%:kB/s%>)		 <%:Peak:%>0 kbit/s
(0 KB/s)		0 <%:kbit/s%>
(0 <%:kB/s%>)
<%:Outbound:%>0 kbit/s
(0 KB/s)		0 <%:kbit/s%>
(0 <%:kB/s%>)		 <%:Average:%>0 kbit/s
(0 KB/s)		0 <%:kbit/s%>
(0 <%:kB/s%>)		 <%:Peak:%>0 kbit/s
(0 KB/s)		0 <%:kbit/s%>
(0 <%:kB/s%>)
diff --git a/modules/admin-full/luasrc/view/admin_status/index.htm b/modules/admin-full/luasrc/view/admin_status/index.htm index 18e590d2dc..4f2a651a5d 100644 --- a/modules/admin-full/luasrc/view/admin_status/index.htm +++ b/modules/admin-full/luasrc/view/admin_status/index.htm @@ -302,8 +302,8 @@ $Id$ '' + '<%:SSID%>: %h
' + '<%:Mode%>: %s
' + - '<%:Channel%>: %d (%.3f GHz)
' + - '<%:Bitrate%>: %s Mb/s
', + '<%:Channel%>: %d (%.3f <%:GHz%>)
' + + '<%:Bitrate%>: %s <%:Mbit/s%>
', icon, net.signal, net.noise, net.quality, net.link, net.ssid, @@ -386,7 +386,7 @@ $Id$ icon = "<%=resource%>/icons/signal-75-100.png"; tr.insertCell(-1).innerHTML = String.format( - '', + '', icon, assoclist[i].signal, assoclist[i].noise ); @@ -398,17 +398,17 @@ $Id$ assoclist[i].name ); - tr.insertCell(-1).innerHTML = String.format('%d dBm', assoclist[i].signal); - tr.insertCell(-1).innerHTML = String.format('%d dBm', assoclist[i].noise); + tr.insertCell(-1).innerHTML = String.format('%d <%:dBm%>', assoclist[i].signal); + tr.insertCell(-1).innerHTML = String.format('%d <%:dBm%>', assoclist[i].noise); tr.insertCell(-1).innerHTML = (assoclist[i].rx_mcs > -1) - ? String.format('%.1f Mbit/s, MCS %d, %dMHz', assoclist[i].rx_rate / 1000, assoclist[i].rx_mcs, assoclist[i].rx_40mhz ? 40 : 20) - : String.format('%.1f Mbit/s', assoclist[i].rx_rate / 1000) + ? String.format('%.1f <%:Mbit/s%>, MCS %d, %d<%:MHz%>', assoclist[i].rx_rate / 1000, assoclist[i].rx_mcs, assoclist[i].rx_40mhz ? 40 : 20) + : String.format('%.1f <%:Mbit/s%>', assoclist[i].rx_rate / 1000) ; tr.insertCell(-1).innerHTML = (assoclist[i].tx_mcs > -1) - ? String.format('%.1f Mbit/s, MCS %d, %dMHz', assoclist[i].tx_rate / 1000, assoclist[i].tx_mcs, assoclist[i].tx_40mhz ? 40 : 20) - : String.format('%.1f Mbit/s', assoclist[i].tx_rate / 1000) + ? String.format('%.1f <%:Mbit/s%>, MCS %d, %d<%:MHz%>', assoclist[i].tx_rate / 1000, assoclist[i].tx_mcs, assoclist[i].tx_40mhz ? 40 : 20) + : String.format('%.1f <%:Mbit/s%>', assoclist[i].tx_rate / 1000) ; } @@ -438,23 +438,23 @@ $Id$ if (e = document.getElementById('memtotal')) e.innerHTML = progressbar( - (info.memfree + info.membuffers + info.memcached) + " kB", - info.memtotal + " kB" + (info.memfree + info.membuffers + info.memcached) + " <%:kB%>", + info.memtotal + " <%:kB%>" ); if (e = document.getElementById('memfree')) e.innerHTML = progressbar( - info.memfree + " kB", info.memtotal + " kB" + info.memfree + " <%:kB%>", info.memtotal + " <%:kB%>" ); if (e = document.getElementById('memcache')) e.innerHTML = progressbar( - info.memcached + " kB", info.memtotal + " kB" + info.memcached + " <%:kB%>", info.memtotal + " <%:kB%>" ); if (e = document.getElementById('membuff')) e.innerHTML = progressbar( - info.membuffers + " kB", info.memtotal + " kB" + info.membuffers + " <%:kB%>", info.memtotal + " <%:kB%>" ); if (e = document.getElementById('conns')) diff --git a/modules/admin-full/luasrc/view/admin_status/wireless.htm b/modules/admin-full/luasrc/view/admin_status/wireless.htm index 1524363183..ff8382bf0b 100644 --- a/modules/admin-full/luasrc/view/admin_status/wireless.htm +++ b/modules/admin-full/luasrc/view/admin_status/wireless.htm @@ -286,14 +286,14 @@ $Id$ function wireless_label(dbm, noise) { if (noise) - return String.format("%d dBm (SNR %d dBm)", noise_floor + dbm - 255, dbm - noise); + return String.format("%d <%:dBm%> (SNR %d <%:dBm%>)", noise_floor + dbm - 255, dbm - noise); else - return String.format("%d dBm", noise_floor + dbm - 255); + return String.format("%d <%:dBm%>", noise_floor + dbm - 255); } function rate_label(mbit) { - return String.format("%d MBit/s", mbit); + return String.format("%d <%:Mbit/s%>", mbit); } label_25.firstChild.data = wireless_label(1.1 * 0.25 * data_max); @@ -338,23 +338,23 @@ $Id$ - + - + - + - + - + - +
<%:Signal:%>0 dBm0 <%:dBm%> <%:Average:%>0 dBm0 <%:dBm%> <%:Peak:%>0 dBm0 <%:dBm%>
<%:Noise:%>0 dBm0 <%:dBm%> <%:Average:%>0 dBm0 <%:dBm%> <%:Peak:%>0 dBm0 <%:dBm%>
diff --git a/modules/admin-full/luasrc/view/admin_uci/apply.htm b/modules/admin-full/luasrc/view/admin_uci/apply.htm index e3231c6b56..f6a68126de 100644 --- a/modules/admin-full/luasrc/view/admin_uci/apply.htm +++ b/modules/admin-full/luasrc/view/admin_uci/apply.htm @@ -15,7 +15,7 @@ $Id$ <%+header%> -

<%:Configuration / Apply%>

+

<%:Configuration%> / <%:Apply%>

<% if changes then %> <%+cbi/apply_xhr%> diff --git a/modules/admin-full/luasrc/view/admin_uci/changes.htm b/modules/admin-full/luasrc/view/admin_uci/changes.htm index 159a7b5f0a..2415de316f 100644 --- a/modules/admin-full/luasrc/view/admin_uci/changes.htm +++ b/modules/admin-full/luasrc/view/admin_uci/changes.htm @@ -15,7 +15,7 @@ $Id$ <%+header%> -

<%:Configuration / Changes%>

+

<%:Configuration%> / <%:Changes%>

<% if changes then %> <%+admin_uci/changelog%> diff --git a/modules/admin-full/luasrc/view/admin_uci/revert.htm b/modules/admin-full/luasrc/view/admin_uci/revert.htm index f6460cf990..739b752046 100644 --- a/modules/admin-full/luasrc/view/admin_uci/revert.htm +++ b/modules/admin-full/luasrc/view/admin_uci/revert.htm @@ -15,7 +15,7 @@ $Id$ <%+header%> -

<%:Configuration / Revert%>

+

<%:Configuration%> / <%:Revert%>

<% if changes then %> <%+cbi/apply_xhr%> diff --git a/modules/admin-mini/luasrc/view/mini/index.htm b/modules/admin-mini/luasrc/view/mini/index.htm index 61d01f96f2..c14d3b0b23 100644 --- a/modules/admin-mini/luasrc/view/mini/index.htm +++ b/modules/admin-mini/luasrc/view/mini/index.htm @@ -14,7 +14,7 @@ $Id$ -%>

<%:Hello!%>

<%_This is the administration area of LuCI.%>

-

<%_LuCI is a free, flexible, and user friendly graphical interface for configuring OpenWrt Kamikaze.%>
+

<%_LuCI is a free, flexible, and user friendly graphical interface for configuring OpenWrt.%>
<%:On the following pages you can adjust all important settings of this device.%>

<%:As we always want to improve this interface we are looking forward to your feedback and suggestions.%>

<%:And now have fun with your OpenWrt device!%>