all: translation fixes in templates

diff --git a/applications/luci-openvpn/luasrc/view/openvpn/pageswitch.htm b/applications/luci-openvpn/luasrc/view/openvpn/pageswitch.htm
index 0d036a9ab249a507a41e41fb4fd6f49cf786661c..9276fe3cd8007076ba6b1c332bab9999762d366d 100644 (file)
--- 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 11af7f5eca72b6b82d57aa595aedc04923d21c4a..70e6c06cfe95b2c7893f13811a5b7edb4f616e87 100644 (file)
--- 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 3fcf02bac84e80a575bafa82066d1e041313f475..b6592750509af20090eb1b655fb43edf78dcf82d 100644 (file)
--- 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 413efbe2e6b58510c591801fbec4f073868d9cc4..01dfd05c1cecd449f88e5cddb97cdead318eb1a2 100644 (file)
--- 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 ebc6faba58d2dca0e39d0be0143739166062e492..25157da40a8a4c4dd42242201b8bdd20ac8d225e 100644 (file)
--- 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 13e52257ef11193b7f1a39f9fb10fe261d378083..eacb3c3b7fdc4794c01c974c03b9eef78ef71e86 100644 (file)
--- 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 ef9ae23b5a904882955dd1b3a0a2a758b9e7dbb1..05f7ca952672ec334f7d4af639927881173268c8 100644 (file)
--- 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 0e801c791cc11514299be5af55090b217463da41..431b4b285c7f48edf5d2181e5320bc37a9f627bc 100644 (file)
--- 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 bf304c7b455c7b2a402939611e5f173c5e0d323e..71be2aa2f24ba4571b75d79bf7c8f80bcd2d1c98 100644 (file)
--- 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 />

diff --git a/libs/cbi/luasrc/view/cbi/delegator.htm b/libs/cbi/luasrc/view/cbi/delegator.htm
index 9b4d4e6bf45607cf78f71c76c2157ead7b7c8325..08c1fe7c3a8311cef4dd9809fba7ae78a6b43209 100644 (file)
--- a/libs/cbi/luasrc/view/cbi/delegator.htm
+++ b/libs/cbi/luasrc/view/cbi/delegator.htm
@@ -18,7 +18,7 @@ $Id$
                <input type="hidden" name="cbi.delg.path" value="<%=x%>" />
 <% end %>
 <% if self.allow_back and self:get_prev(self.current) then %>
-               <input class="cbi-button cbi-button-back" type="submit" name="cbi.delg.back" value="<%:cbi_back &lt; Back%>" />
+               <input class="cbi-button cbi-button-back" type="submit" name="cbi.delg.back" value="<%:« Back%>" />
 <% end %>
 <% if self.allow_reset then %>
                <input class="cbi-button cbi-button-reset" type="reset" value="<%:Reset%>" />
@@ -27,9 +27,9 @@ $Id$
                <input class="cbi-button cbi-button-cancel" type="submit" name="cbi.cancel" value="<%:Cancel%>" />
 <% end %>
 <% if self.allow_finish and not self:get_next(self.current) then %>
-       <input class="cbi-button cbi-button-finish" type="submit" value="<%:cbi_finish Finish%>" />
+       <input class="cbi-button cbi-button-finish" type="submit" value="<%:Finish%>" />
 <% elseif self:get_next(self.current) then %>
-               <input class="cbi-button cbi-button-next" type="submit" value="<%:cbi_next Next &gt;%>" />
+               <input class="cbi-button cbi-button-next" type="submit" value="<%:Next »%>" />
 <% end %>
                <script type="text/javascript">cbi_d_update();</script>
        </div>

diff --git a/libs/cbi/luasrc/view/cbi/footer.htm b/libs/cbi/luasrc/view/cbi/footer.htm
index 1796cd5dc233d6dd1beebaf52e7c6d8ce55587c3..fe5b6881c22aed8a34aa7e10ff68651a95c67947 100644 (file)
--- a/libs/cbi/luasrc/view/cbi/footer.htm
+++ b/libs/cbi/luasrc/view/cbi/footer.htm
@@ -15,7 +15,7 @@ $Id$
        <%- if pageaction then -%>
        <div class="cbi-page-actions">
                <% if flow.skip then %>
-                       <input class="cbi-button cbi-button-skip" type="submit" name="cbi.skip" value="<%:skip Skip%>" />
+                       <input class="cbi-button cbi-button-skip" type="submit" name="cbi.skip" value="<%:Skip%>" />
                <% end %>
                <% if not autoapply then%>
                        <input class="cbi-button cbi-button-apply" type="submit" name="cbi.apply" value="<%:Save & Apply%>" />

diff --git a/libs/cbi/luasrc/view/cbi/simpleform.htm b/libs/cbi/luasrc/view/cbi/simpleform.htm
index 859acd3c04ac1cf4362d64024a639ac0b46e897e..d927660da4d8cfa4106bcf0d0379223f5800c351 100644 (file)
--- a/libs/cbi/luasrc/view/cbi/simpleform.htm
+++ b/libs/cbi/luasrc/view/cbi/simpleform.htm
@@ -34,7 +34,7 @@ $Id$
 <% if not self.embedded then %>
        <div>
 <%- if self.flow and self.flow.skip then %>
-       <input class="cbi-button cbi-button-skip" type="submit" name="cbi.skip" value="<%:skip Skip%>" />
+       <input class="cbi-button cbi-button-skip" type="submit" name="cbi.skip" value="<%:Skip%>" />
 <% end %>
 <%- if self.submit ~= false then %>
                <input class="cbi-button-save" type="submit" value="

diff --git a/libs/cbi/luasrc/view/cbi/upload.htm b/libs/cbi/luasrc/view/cbi/upload.htm
index dc7b16feeb01f49b26ac88bb2ae10f4c6ca6a7e6..f5baa33fe4e9912729687f9e2fbad4d21c16eeb2 100644 (file)
--- a/libs/cbi/luasrc/view/cbi/upload.htm
+++ b/libs/cbi/luasrc/view/cbi/upload.htm
@@ -20,7 +20,7 @@ $Id$
 -%>
 <%+cbi/valueheader%>
        <% if s then %>
-               <%:cbi_upload Uploaded File%> (<%=t.byte_format(s.size)%>)
+               <%:Uploaded File%> (<%=t.byte_format(s.size)%>)
                <input type="hidden"<%= attr("value", v) .. attr("name", cbid) .. attr("id", cbid) %> />
                <input class="cbi-input-image" type="image" value="<%:Replace entry%>" name="cbi.rlf.<%=section .. "." .. self.option%>" alt="<%:Replace entry%>" title="<%:Replace entry%>" src="<%=resource%>/cbi/reload.gif" />
        <% else %>

diff --git a/modules/admin-full/luasrc/view/admin_system/upgrade.htm b/modules/admin-full/luasrc/view/admin_system/upgrade.htm
index 510a51b155dd0f082278665e55c56366e7b95a48..ddf4fda45645842e7b2cce803b37a67b76eb358f 100644 (file)
--- 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 510a51b155dd0f082278665e55c56366e7b95a48..1083a1618848510f163bb3a054f7a3783a45ea1f 100644 (file)
--- 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 47ac7a3564e787497a991db5e4e38f7872a9e2ac..092ec471435a221f19020d9c4595923d0732aea6 100644 (file)
--- 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 %>

diff --git a/themes/freifunk-hannover/luasrc/view/themes/freifunk-hannover/header.htm b/themes/freifunk-hannover/luasrc/view/themes/freifunk-hannover/header.htm
index 764a1eb78189ec3a3d2c1e07630c089ba89e509e..06aae3b59863fb7fb08d6d6f19af1a4158563c52 100644 (file)
--- a/themes/freifunk-hannover/luasrc/view/themes/freifunk-hannover/header.htm
+++ b/themes/freifunk-hannover/luasrc/view/themes/freifunk-hannover/header.htm
@@ -68,7 +68,7 @@ require("luci.http").prepare_content("application/xhtml+xml")
 </div>
 
 <div id="menubar">
-<h2 class="navigation"><a id="navigation" name="navigation"><%:navigation Navigation%></a></h2>
+<h2 class="navigation"><a id="navigation" name="navigation"><%:Navigation%></a></h2>
 <ul id="mainmenu" class="dropdowns">
 <%-
 local function submenu(prefix, node)

diff --git a/themes/openwrt-light/luasrc/view/themes/openwrt-light/header.htm b/themes/openwrt-light/luasrc/view/themes/openwrt-light/header.htm
index b6b693121bc3d31cd5ea0256e33c5eb1f8c93df3..65700c2e707e9475f3d89348e1c827a01fb5fc1e 100644 (file)
--- a/themes/openwrt-light/luasrc/view/themes/openwrt-light/header.htm
+++ b/themes/openwrt-light/luasrc/view/themes/openwrt-light/header.htm
@@ -68,7 +68,7 @@ require("luci.http").prepare_content("application/xhtml+xml")
 </div>
 
 <div id="menubar">
-<h2 class="navigation"><a id="navigation" name="navigation"><%:navigation Navigation%></a></h2>
+<h2 class="navigation"><a id="navigation" name="navigation"><%:Navigation%></a></h2>
 <ul id="mainmenu" class="dropdowns">
 <%-
 local function submenu(prefix, node)

diff --git a/themes/openwrt.org-oxygen/luasrc/view/themes/openwrt.org-oxygen/header.htm b/themes/openwrt.org-oxygen/luasrc/view/themes/openwrt.org-oxygen/header.htm
index 48b9db4284e09454deb04b3dd05f0c25088f7d65..c212af5c409c8717249361ced9cff1258df66c8c 100644 (file)
--- a/themes/openwrt.org-oxygen/luasrc/view/themes/openwrt.org-oxygen/header.htm
+++ b/themes/openwrt.org-oxygen/luasrc/view/themes/openwrt.org-oxygen/header.htm
@@ -70,7 +70,7 @@ require("luci.http").prepare_content("application/xhtml+xml")
 </div>
 
 <div id="menubar">
-<h2 class="navigation"><a id="navigation" name="navigation"><%:navigation Navigation%></a></h2>
+<h2 class="navigation"><a id="navigation" name="navigation"><%:Navigation%></a></h2>
 <ul id="mainmenu" class="dropdowns">
 <%-
 local function submenu(prefix, node)

diff --git a/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm b/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm
index c6c743c6bcf5e1d821bd0ba187b4f75d6752f580..add2c9a730b417ce15b9bf6778b5f004f1b8b94d 100644 (file)
--- a/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm
+++ b/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm
@@ -68,7 +68,7 @@ require("luci.http").prepare_content("application/xhtml+xml")
 </div>
 
 <div id="menubar">
-<h2 class="navigation"><a id="navigation" name="navigation"><%:navigation Navigation%></a></h2>
+<h2 class="navigation"><a id="navigation" name="navigation"><%:Navigation%></a></h2>
 <ul id="mainmenu" class="dropdowns">
 <%-
 local function submenu(prefix, node)

diff --git a/themes/oxygen/luasrc/view/themes/oxygen/header.htm b/themes/oxygen/luasrc/view/themes/oxygen/header.htm
index 9887e543ebcf83d44bfd58659ce4ea8a47c5fa84..6df6c8754eefd57955b5a7d3bd72155f6df06d91 100644 (file)
--- a/themes/oxygen/luasrc/view/themes/oxygen/header.htm
+++ b/themes/oxygen/luasrc/view/themes/oxygen/header.htm
@@ -109,7 +109,7 @@ ucimenu("/" .. category .. "/uci/", tree.nodes[category].nodes["uci"], "changes"
 <% end %>
 
 <div class="menubar">
-<h2 class="navigation"><a id="navigation" name="navigation"><%:navigation Navigation%></a></h2>
+<h2 class="navigation"><a id="navigation" name="navigation"><%:Navigation%></a></h2>
 <strong><%:Path%>:</strong>
 <a href="<%=controller%>"><%= luci.__appname__ %></a>