all: yet another round of translation fixes

diff --git a/modules/admin-core/luasrc/view/sysauth.htm b/modules/admin-core/luasrc/view/sysauth.htm
index 184de5b..f39f620 100644 (file)
--- a/modules/admin-core/luasrc/view/sysauth.htm
+++ b/modules/admin-core/luasrc/view/sysauth.htm
@@ -21,7 +21,7 @@ $Id$
                <div class="cbi-map-descr">
                        <%:Please enter your username and password.%>
                        <%- if fuser then %>
-                       <div class="error"><%:sysauth_failed%></div>
+                       <div class="error"><%:Invalid username and/or password! Please try again.%></div>
                        <br />
                        <% end -%>
                </div>

diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
index bdb8235..0ad4362 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
@@ -196,7 +196,7 @@ if hwtype == "broadcom" then
        s:taboption("advanced", Flag, "frameburst", translate("Frame Bursting"))
 
        s:taboption("advanced", Value, "distance", translate("Distance Optimization"))
-       --s:option(Value, "slottime", translate("wifi_slottime"))
+       --s:option(Value, "slottime", translate("Slot time"))
 
        s:taboption("advanced", Value, "country", translate("Country Code"))
        s:taboption("advanced", Value, "maxassoc", translate("Connection Limit"))
@@ -331,8 +331,8 @@ if wnet then
                hidden:depends({mode="adhoc"})
                hidden:depends({mode="ap-wds"})
                hidden:depends({mode="sta-wds"})
-               isolate = s:taboption("advanced", Flag, "isolate", translate("wifi_isolate"),
-                translate("wifi_isolate_desc"))
+               isolate = s:taboption("advanced", Flag, "isolate", translate("Separate Clients"),
+                translate("Prevents client-to-client communication"))
                isolate:depends({mode="ap"})
                s:taboption("advanced", Flag, "bgscan", translate("Background Scan"))
 
@@ -384,8 +384,8 @@ if wnet then
                hidden:depends({mode="adhoc"})
                hidden:depends({mode="wds"})
 
-               isolate = s:taboption("advanced", Flag, "isolate", translate("wifi_isolate"),
-                translate("wifi_isolate_desc"))
+               isolate = s:taboption("advanced", Flag, "isolate", translate("Separate Clients"),
+                translate("Prevents client-to-client communication"))
                isolate:depends({mode="ap"})
 
                s:taboption("advanced", Flag, "doth", "802.11h")
@@ -454,16 +454,25 @@ if wnet then
                        encr:value("psk-mixed", "WPA-PSK/WPA2-PSK Mixed Mode", {mode="ap"}, {mode="ap-wds"}, {mode="adhoc"}, {mode="ahdemo"})
                        encr:value("wpa", "WPA-EAP", {mode="ap"}, {mode="ap-wds"})
                        encr:value("wpa2", "WPA2-EAP", {mode="ap"}, {mode="ap-wds"})
-                       encr.description = translate("wifi_wpareq")
+                       encr.description = translate(
+                               "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP " ..
+                               "and ad-hoc mode) to be installed."
+                       )
                elseif not hostapd and supplicant then
                        encr:value("psk", "WPA-PSK", {mode="sta"}, {mode="sta-wds"})
                        encr:value("psk2", "WPA2-PSK", {mode="sta"}, {mode="sta-wds"})
                        encr:value("psk-mixed", "WPA-PSK/WPA2-PSK Mixed Mode", {mode="sta"}, {mode="sta-wds"})
                        encr:value("wpa", "WPA-EAP", {mode="sta"}, {mode="sta-wds"})
                        encr:value("wpa2", "WPA2-EAP", {mode="sta"}, {mode="sta-wds"})
-                       encr.description = translate("wifi_wpareq")
+                       encr.description = translate(
+                               "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP " ..
+                               "and ad-hoc mode) to be installed."
+                       )
                else
-                       encr.description = translate("wifi_wpareq")
+                       encr.description = translate(
+                               "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP " ..
+                               "and ad-hoc mode) to be installed."
+                       )
                end
        elseif hwtype == "broadcom" then
                encr:value("psk", "WPA-PSK")
@@ -477,7 +486,7 @@ if wnet then
        encr:depends("mode", "sta-wds")
        encr:depends("mode", "wds")
 
-       server = s:taboption("encryption", Value, "server", translate("RadiusServer"))
+       server = s:taboption("encryption", Value, "server", translate("Radius-Server"))
        server:depends({mode="ap", encryption="wpa"})
        server:depends({mode="ap", encryption="wpa2"})
        server.rmempty = true

diff --git a/modules/admin-full/luasrc/model/cbi/admin_system/buttons.lua b/modules/admin-full/luasrc/model/cbi/admin_system/buttons.lua
index 67601b1..d758183 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_system/buttons.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_system/buttons.lua
@@ -11,21 +11,28 @@ You may obtain a copy of the License at
 
 $Id$
 ]]--
-m = Map("system", translate("buttons"), translate("buttons_desc"))
+
+m = Map("system", translate("Buttons"),
+       translate("This page allows the configuration of custom button actions"))
 
 s = m:section(TypedSection, "button", "")
 s.anonymous = true
 s.addremove = true
 
-s:option(Value, "button")
+s:option(Value, "button", translate("Name"))
+
+act = s:option(ListValue, "action",
+       translate("Action"),
+       translate("Specifies the button state to handle"))
 
-act = s:option(ListValue, "action")
 act:value("released")
 
-s:option(Value, "handler")
+s:option(Value, "handler",
+       translate("Handler"),
+       translate("Path to executable which handles the button event"))
 
-min = s:option(Value, "min")
+min = s:option(Value, "min", translate("Minimum hold time"))
 min.rmempty = true
 
-max = s:option(Value, "max")
+max = s:option(Value, "max", translate("Maximum hold time"))
 max.rmempty = true

diff --git a/modules/admin-full/luasrc/model/cbi/admin_system/system.lua b/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
index 99ab64d..1d6163a 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
@@ -36,11 +36,11 @@ s:option(DummyValue, "_memtotal", translate("Memory")).value =
  string.format("%.2f MB (%.0f%% %s, %.0f%% %s, %.0f%% %s)",
   tonumber(memtotal) / 1024,
   100 * memcached / memtotal,
-  tostring(translate("mem_cached", "")),
+  tostring(translate("cached")),
   100 * membuffers / memtotal,
-  tostring(translate("mem_buffered", "")),
+  tostring(translate("buffered")),
   100 * memfree / memtotal,
-  tostring(translate("mem_free", ""))
+  tostring(translate("free"))
 )
 
 s:option(DummyValue, "_systime", translate("Local Time")).value =

diff --git a/modules/admin-mini/luasrc/model/cbi/mini/system.lua b/modules/admin-mini/luasrc/model/cbi/mini/system.lua
index ac11abe..f2ab5e5 100644 (file)
--- a/modules/admin-mini/luasrc/model/cbi/mini/system.lua
+++ b/modules/admin-mini/luasrc/model/cbi/mini/system.lua
@@ -38,11 +38,11 @@ s:option(DummyValue, "_memtotal", translate("Memory")).value =
  string.format("%.2f MB (%.0f%% %s, %.0f%% %s, %.0f%% %s)",
   tonumber(memtotal) / 1024,
   100 * memcached / memtotal,
-  tostring(translate("mem_cached", "")),
+  tostring(translate("cached")),
   100 * membuffers / memtotal,
-  tostring(translate("mem_buffered", "")),
+  tostring(translate("buffered")),
   100 * memfree / memtotal,
-  tostring(translate("mem_free", ""))
+  tostring(translate("free"))
 )
 
 s:option(DummyValue, "_systime", translate("Local Time")).value =

diff --git a/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua b/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
index a062dff..762412e 100644 (file)
--- a/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
+++ b/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
@@ -236,16 +236,25 @@ if hwtype == "atheros" or hwtype == "mac80211" then
                encr:value("psk-mixed", "WPA-PSK/WPA2-PSK Mixed Mode", {mode="ap"}, {mode="adhoc"})
                encr:value("wpa", "WPA-Radius", {mode="ap"})
                encr:value("wpa2", "WPA2-Radius", {mode="ap"})
-               encr.description = translate("wifi_wpareq")
+               encr.description = translate(
+                       "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP " ..
+                       "and ad-hoc mode) to be installed."
+               )
        elseif not hostapd and supplicant then
                encr:value("psk", "WPA-PSK", {mode="sta"})
                encr:value("psk2", "WPA2-PSK", {mode="sta"})
                encr:value("psk-mixed", "WPA-PSK/WPA2-PSK Mixed Mode", {mode="sta"})
                encr:value("wpa", "WPA-EAP", {mode="sta"})
                encr:value("wpa2", "WPA2-EAP", {mode="sta"})
-               encr.description = translate("wifi_wpareq")
+               encr.description = translate(
+                       "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP " ..
+                       "and ad-hoc mode) to be installed."
+               )               
        else
-               encr.description = translate("wifi_wpareq")
+               encr.description = translate(
+                       "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP " ..
+                       "and ad-hoc mode) to be installed."
+               )
        end
 elseif hwtype == "broadcom" then
        encr:value("psk", "WPA-PSK")
@@ -264,7 +273,7 @@ key:depends({mode="ap", encryption="wpa2"})
 key.rmempty = true
 key.password = true
 
-server = s:option(Value, "server", translate("RadiusServer"))
+server = s:option(Value, "server", translate("Radius-Server"))
 server:depends({mode="ap", encryption="wpa"})
 server:depends({mode="ap", encryption="wpa2"})
 server.rmempty = true

diff --git a/modules/freifunk/luasrc/model/cbi/freifunk/public_status.lua b/modules/freifunk/luasrc/model/cbi/freifunk/public_status.lua
index 7cf17da..16f1d86 100644 (file)
--- a/modules/freifunk/luasrc/model/cbi/freifunk/public_status.lua
+++ b/modules/freifunk/luasrc/model/cbi/freifunk/public_status.lua
@@ -27,11 +27,11 @@ f:field(DummyValue, "_memtotal", translate("Memory")).value =
 string.format("%.2f MB (%.0f%% %s, %.0f%% %s, %.0f%% %s)",
        tonumber(memtotal) / 1024,
        100 * memcached / memtotal,
-       tostring(translate("mem_cached", "")),
+       tostring(translate("cached")),
        100 * membuffers / memtotal,
-       tostring(translate("mem_buffered", "")),
+       tostring(translate("buffered")),
        100 * memfree / memtotal,
-       tostring(translate("mem_free", ""))
+       tostring(translate("free"))
 )
 
 f:field(DummyValue, "_systime", translate("Local Time")).value =

diff --git a/po/en/sysauth.po b/po/en/sysauth.po
index a3bae03..10dfed2 100644 (file)
--- a/po/en/sysauth.po
+++ b/po/en/sysauth.po
@@ -24,5 +24,5 @@ msgstr "Please enter your username and password."
 
 #. Invalid username and/or password! Please try again.
 #: i18n/english/luasrc/i18n/sysauth.en.lua:3
-msgid "sysauth_failed"
+msgid "Invalid username and/or password! Please try again."
 msgstr "Invalid username and/or password! Please try again."

diff --git a/po/templates/sysauth.pot b/po/templates/sysauth.pot
index 245f041..cd8c1d2 100644 (file)
--- a/po/templates/sysauth.pot
+++ b/po/templates/sysauth.pot
@@ -15,5 +15,5 @@ msgstr ""
 
 #. Invalid username and/or password! Please try again.
 #: i18n/english/luasrc/i18n/sysauth.en.lua:3
-msgid "sysauth_failed"
+msgid "Invalid username and/or password! Please try again."
 msgstr ""