diff --git a/applications/luci-openvpn/luasrc/view/openvpn/pageswitch.htm b/applications/luci-openvpn/luasrc/view/openvpn/pageswitch.htm index 0d036a9ab2..9276fe3cd8 100644 --- a/applications/luci-openvpn/luasrc/view/openvpn/pageswitch.htm +++ b/applications/luci-openvpn/luasrc/view/openvpn/pageswitch.htm @@ -15,23 +15,23 @@ $Id$
- "><%:openvpn_overview Overview%> » + "><%:Overview%> » <%=luci.i18n.translatef("Instance \"%s\"", self.instance)%> <% if self.mode == "basic" then %> - "><%:openvpn_switch_advanced Switch to advanced configuration »%> + "><%:Switch to advanced configuration »%> <% else %> - "><%:openvpn_switch_basic « Switch to basic configuration%> + "><%:« Switch to basic configuration%>
- <%:openvpn_confcategory Configuration category%>: + <%:Configuration category%>: <% for i, c in ipairs(self.categories) do %> <% if c == self.category then %> - <%=translate("openvpn_%s" % c, c)%> + <%=translate(c)%> <% else %> "><%=translate("openvpn_%s" % c, c)%> + )%>"><%=translate(c)%> <% 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 11af7f5eca..70e6c06cfe 100644 --- 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%>
-

<%:ff_splash Client-Splash%>

+

<%:Client-Splash%>

- <%:ff_splash_clients Active Clients%> + <%:Active Clients%>
<% if is_admin then %>
<% end %> - - - - - - + + + + + + <%- @@ -169,14 +169,14 @@ end <%- end -%> diff --git a/applications/luci-splash/luasrc/view/splash/splash.htm b/applications/luci-splash/luasrc/view/splash/splash.htm index 3fcf02bac8..b659275050 100644 --- 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:

-Mit einem Klick auf <%:accept Accept%> kannst du für <%=c.leasetime%> Stunden +Mit einem Klick auf <%:Accept%> kannst du für <%=c.leasetime%> Stunden über unser Netz das Internet verwenden. Dann wirst du erneut aufgefordet, diese Bedingungen zu akzeptieren.

diff --git a/applications/luci-splash/luasrc/view/splash_splash/splash.htm b/applications/luci-splash/luasrc/view/splash_splash/splash.htm index 413efbe2e6..01dfd05c1c 100644 --- 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%> - - + + <%+footer%> diff --git a/applications/luci-statistics/luasrc/view/admin_statistics/index.htm b/applications/luci-statistics/luasrc/view/admin_statistics/index.htm index ebc6faba58..25157da40a 100644 --- 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%> -

<%:stat_statistics Statistics%>

+

<%:Statistics%>

<%_The statistics package is based on Collectd and uses RRD Tool to render diagram images from collected data.%>

diff --git a/applications/luci-statistics/luasrc/view/admin_statistics/networkplugins.htm b/applications/luci-statistics/luasrc/view/admin_statistics/networkplugins.htm index 13e52257ef..eacb3c3b7f 100644 --- 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%> -

<%:stat_networkplugins Network plugins%>

+

<%:Network plugins%>

-

<%:stat_networkplugins_desc Network plugins are used to collect information +

<%:Network plugins are used to collect information about open tcp connections, interface traffic, iptables rules etc.%>

-

<%:stat_networkplugins_installed Installed network plugins:%> +

<%:Installed network plugins:%>

    <% 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 ef9ae23b5a..05f7ca9526 100644 --- 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%> -

    <%:stat_outputplugins Output plugins%>

    +

    <%:Output plugins%>

    -

    <%:stat_outputplugins_desc Output plugins provide different possibilities to store collected data. +

    <%: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.%>

    -

    <%:stat_outputplugins_installed Installed output plugins:%> +

    <%:Installed output plugins:%>

      <% 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 0e801c791c..431b4b285c 100644 --- 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%> -

      <%:stat_systemplugins System plugins%>

      +

      <%:System plugins%>

      -

      <%:stat_systemplugins_desc System plugins collecting values about system state and ressource usage on the device.:%> +

      <%:System plugins collecting values about system state and ressource usage on the device.:%>

        <% 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 bf304c7b45..71be2aa2f2 100644 --- 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%> -

        <%:stat_statistics Statistics%>

        +

        <%:Statistics%>

        - +
        diff --git a/libs/cbi/luasrc/view/cbi/delegator.htm b/libs/cbi/luasrc/view/cbi/delegator.htm index 9b4d4e6bf4..08c1fe7c3a 100644 --- a/libs/cbi/luasrc/view/cbi/delegator.htm +++ b/libs/cbi/luasrc/view/cbi/delegator.htm @@ -18,7 +18,7 @@ $Id$ <% end %> <% if self.allow_back and self:get_prev(self.current) then %> - + <% end %> <% if self.allow_reset then %> @@ -27,9 +27,9 @@ $Id$ <% end %> <% if self.allow_finish and not self:get_next(self.current) then %> - + <% elseif self:get_next(self.current) then %> - + <% end %> diff --git a/libs/cbi/luasrc/view/cbi/footer.htm b/libs/cbi/luasrc/view/cbi/footer.htm index 1796cd5dc2..fe5b6881c2 100644 --- a/libs/cbi/luasrc/view/cbi/footer.htm +++ b/libs/cbi/luasrc/view/cbi/footer.htm @@ -15,7 +15,7 @@ $Id$ <%- if pageaction then -%>
        <% if flow.skip then %> - + <% end %> <% if not autoapply then%> diff --git a/libs/cbi/luasrc/view/cbi/simpleform.htm b/libs/cbi/luasrc/view/cbi/simpleform.htm index 859acd3c04..d927660da4 100644 --- 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 %>
        <%- if self.flow and self.flow.skip then %> - + <% end %> <%- if self.submit ~= false then %> /> " 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 510a51b155..ddf4fda456 100644 --- a/modules/admin-full/luasrc/view/admin_system/upgrade.htm +++ b/modules/admin-full/luasrc/view/admin_system/upgrade.htm @@ -16,58 +16,58 @@ $Id$ <%+header%>

        <%:System%>

        -

        <%:admin_upgrade Flash Firmware%>

        +

        <%:Flash Firmware%>

        <% if step == 1 then %> <% if supported then %>

        - <%: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 %>

        -

        <%:admin_upgrade_badimage The uploaded image file does not +
        <%:The uploaded image file does not contain a supported format. Make sure that you choose the generic image format for your platform. %>
        <% end %>

        - <%:admin_upgrade_fwimage Firmware image%>:
        + <%:Firmware image%>:


        <% if keepavail then -%> - <%:admin_upgrade_keepcfg Keep configuration files%> + <%:Keep configuration files%> <% end -%>
        - +
        <% else %> -
        <%:admin_upgrade_nosupport Sorry. +
        <%:Sorry. OpenWrt does not support a system upgrade on this platform.
        You need to manually flash your device. %>
        <% end %> <% elseif step == 2 then %>

        - <%: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.
        Click "Proceed" below to start the flash procedure. %> <% if flashsize > 0 and filesize > flashsize then %>

        -

        <%:admin_upgrade_toolarge It appears that you try to +
        <%:It appears that you try to flash an image that does not fit into the flash memory, please verify the image file! %>
        <% end %>
          -
        • <%:admin_upgrade_checksum Checksum%>: <%=checksum%>
          • -
        • <%:admin_upgrade_filesize Size%>: <% +
        • <%:Checksum%>: <%=checksum%>
          • +
        • <%:Size%>: <% local w = require "luci.tools.webadmin" write(w.byte_format(filesize)) @@ -84,16 +84,16 @@ $Id$
          " /> - +
          " /> - +
        <% elseif step == 3 then %> -

        <%:admin_upgrade_running The system is flashing now.
        +

        <%_ The system is flashing now.
        DO NOT POWER OFF THE DEVICE!
        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 510a51b155..1083a16188 100644 --- a/modules/admin-mini/luasrc/view/mini/upgrade.htm +++ b/modules/admin-mini/luasrc/view/mini/upgrade.htm @@ -16,58 +16,58 @@ $Id$ <%+header%>

        <%:System%>

        -

        <%:admin_upgrade Flash Firmware%>

        +

        <%:Flash Firmware%>

        <% if step == 1 then %> <% if supported then %>

        - <%: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 %>

        -

        <%:admin_upgrade_badimage The uploaded image file does not +
        <%:The uploaded image file does not contain a supported format. Make sure that you choose the generic image format for your platform. %>
        <% end %>

        - <%:admin_upgrade_fwimage Firmware image%>:
        + <%:Firmware image%>:


        <% if keepavail then -%> - <%:admin_upgrade_keepcfg Keep configuration files%> + <%:Keep configuration files%> <% end -%>
        - +
        <% else %> -
        <%:admin_upgrade_nosupport Sorry. +
        <%_ Sorry. OpenWrt does not support a system upgrade on this platform.
        You need to manually flash your device. %>
        <% end %> <% elseif step == 2 then %>

        - <%: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.
        Click "Proceed" below to start the flash procedure. %> <% if flashsize > 0 and filesize > flashsize then %>

        -

        <%:admin_upgrade_toolarge It appears that you try to +
        <%:It appears that you try to flash an image that does not fit into the flash memory, please verify the image file! %>
        <% end %>
          -
        • <%:admin_upgrade_checksum Checksum%>: <%=checksum%>
          • -
        • <%:admin_upgrade_filesize Size%>: <% +
        • <%:Checksum%>: <%=checksum%>
          • +
        • <%:Size%>: <% local w = require "luci.tools.webadmin" write(w.byte_format(filesize)) @@ -84,16 +84,16 @@ $Id$
          " /> - +
          " /> - +
        <% elseif step == 3 then %> -

        <%:admin_upgrade_running The system is flashing now.
        +

        <%_ The system is flashing now.
        DO NOT POWER OFF THE DEVICE!
        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 47ac7a3564..092ec47143 100644 --- a/modules/freifunk/luasrc/view/freifunk/remote_update.htm +++ b/modules/freifunk/luasrc/view/freifunk/remote_update.htm @@ -14,31 +14,31 @@ $Id: contact.htm 3529 2008-10-07 13:10:24Z jow $ -%> <%+header%> -

        <%:ff_remote_update Freifunk Remote Update%>

        +

        <%:Freifunk Remote Update%>

        -

        <%:ff_remote_update_desc Check for new firmware versions and perform automatic updates.%>

        +

        <%:Check for new firmware versions and perform automatic updates.%>

        <% if update then %> <% if update.info then %> - <%:ff_remote_update_available Update available!%> + <%:Update available!%> 

        <%=update.info%>

        <% else %> - <%:ff_remote_update_uptodate The installed firmware is the most recent version.%> + <%:The installed firmware is the most recent version.%>

        <% end %>

        - +

        <% elseif confirm then %> - <%:ff_remote_update_settings Update Settings%> + <%:Update Settings%>

        @@ -46,12 +46,12 @@ $Id: contact.htm 3529 2008-10-07 13:10:24Z jow $ -
        +
        -

        +

        - +

        <% 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 764a1eb781..06aae3b598 100644 --- 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")
<%:ff_splash_hostname Hostname%><%:ff_splash_ip IP Address%><%:ff_splash_mac MAC Address%><%:ff_splash_timeleft Time remaining%><%:ff_splash_traffic Traffic in/out%><%:ff_splash_policy Policy%><%:Hostname%><%:IP Address%><%:MAC Address%><%:Time remaining%><%:Traffic in/out%><%:Policy%>
<% if is_admin then %> - + <% else %> <%=c.policy%> <% end %> @@ -190,7 +190,7 @@ end -%>
-
<%:ff_splash_noclients No clients connected%>
+
<%:No clients connected%>