[applications] luci-olsr: Add some missing translations

diff --git a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
index 5fcc748..113ab01 100644 (file)
--- a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
+++ b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
@@ -16,81 +16,81 @@ require("luci.tools.webadmin")
 
 m = Map("olsrd", translate("OLSR Daemon"))
 
-s = m:section(TypedSection, "olsrd", translate("olsrd_general"))
+s = m:section(TypedSection, "olsrd", translate("General settings"))
 s.dynamic = true
 s.anonymous = true
 
-debug = s:option(ListValue, "DebugLevel")
+debug = s:option(ListValue, "DebugLevel", translate("Debugmode"))
 for i=0, 9 do
        debug:value(i)
 end
 debug.optional = true
 
-ipv = s:option(ListValue, "IpVersion")
+ipv = s:option(ListValue, "IpVersion", translate("Internet protocol"))
 ipv:value("4", "IPv4")
 ipv:value("6", "IPv6")
 
-noint = s:option(Flag, "AllowNoInt")
+noint = s:option(Flag, "AllowNoInt", translate("Start without network"))
 noint.enabled = "yes"
 noint.disabled = "no"
 noint.optional = true
 
-s:option(Value, "Pollrate").optional = true
+s:option(Value, "Pollrate", translate("Pollrate")).optional = true
 
-tcr = s:option(ListValue, "TcRedundancy")
+tcr = s:option(ListValue, "TcRedundancy", translate("TC redundancy"))
 tcr:value("0", translate("MPR selectors"))
 tcr:value("1", translate("MPR selectors and MPR"))
 tcr:value("2", translate("all neighbours"))
 tcr.optional = true
 
-s:option(Value, "MprCoverage").optional = true
+s:option(Value, "MprCoverage", translate("MPR coverage")).optional = true
 
-lql = s:option(ListValue, "LinkQualityLevel")
+lql = s:option(ListValue, "LinkQualityLevel", translate("LQ level"))
 lql:value("0", translate("disable"))
 lql:value("1", translate("MPR selection"))
 lql:value("2", translate("MPR selection and routing"))
 lql.optional = true
 
-s:option(Value, "LinkQualityAging").optional = true
+s:option(Value, "LinkQualityAging", translate("LQ aging")).optional = true
 
-lqa = s:option(ListValue, "LinkQualityAlgorithm")
+lqa = s:option(ListValue, "LinkQualityAlgorithm", translate("LQ algorithm"))
 lqa.optional = true
 lqa:value("etx_fpm", translate("fixed point math"))
 lqa:value("etx_float", translate("floating point"))
 lqa:value("etx_ff", translate("Freifunk"))
 lqa.optional = true
 
-lqfish = s:option(Flag, "LinkQualityFishEye")
+lqfish = s:option(Flag, "LinkQualityFishEye", translate("LQ fisheye"))
 lqfish.optional = true
 
-s:option(Value, "LinkQualityWinSize").optional = true
+s:option(Value, "LinkQualityWinSize", translate("LQ window size")).optional = true
 
-s:option(Value, "LinkQualityDijkstraLimit").optional = true
+s:option(Value, "LinkQualityDijkstraLimit", translate("LQ Dijkstra limit")).optional = true
 
-hyst = s:option(Flag, "UseHysteresis")
+hyst = s:option(Flag, "UseHysteresis", translate("Use hysteresis"))
 hyst.enabled = "yes"
 hyst.disabled = "no"
 hyst.optional = true
 
-fib = s:option(ListValue, "FIBMetric")
+fib = s:option(ListValue, "FIBMetric", translate("FIB metric"))
 fib.optional = true
 fib:value("flat")
 fib:value("correct")
 fib:value("approx")
 fib.optional = true
 
-clrscr = s:option(Flag, "ClearScreen")
+clrscr = s:option(Flag, "ClearScreen", translate ("Clear screen"))
 clrscr.enabled = "yes"
 clrscr.disabled = "no"
 clrscr.optional = true
 
-willingness = s:option(ListValue, "Willingness")
+willingness = s:option(ListValue, "Willingness", translate("Willingness"))
 for i=0,7 do
        willingness:value(i)
 end
 willingness.optional = true
 
-natthr = s:option(Value, "NatThreshold")
+natthr = s:option(Value, "NatThreshold", translate("NAT threshold"))
 natthr.optional = true
 
 
@@ -99,7 +99,7 @@ i.anonymous = true
 i.addremove = true
 i.dynamic = true
 
-ign = i:option(Flag, "ignore", "Enable")
+ign = i:option(Flag, "ignore", translate("Enable"))
 ign.enabled  = "0"
 ign.disabled = "1"
 ign.rmempty = false
@@ -110,9 +110,9 @@ end
 network = i:option(ListValue, "interface", translate("Network"))
 luci.tools.webadmin.cbi_add_networks(network)
 
-i:option(Value, "Ip4Broadcast").optional = true
+i:option(Value, "Ip4Broadcast", translate("IPv4 broadcast")).optional = true
 
-ip6t = i:option(ListValue, "Ip6AddrType")
+ip6t = i:option(ListValue, "Ip6AddrType", translate("IPv6 address type"))
 ip6t:value("", translate("-- Please choose --"))
 ip6t:value("auto")
 ip6t:value("site-local")
@@ -120,16 +120,16 @@ ip6t:value("unique-local")
 ip6t:value("global")
 ip6t.optional = true
 
-i:option(Value, "HelloInterval").optional = true
-i:option(Value, "HelloValidityTime").optional = true
-i:option(Value, "TcInterval").optional = true
-i:option(Value, "TcValidityTime").optional = true
-i:option(Value, "MidInterval").optional = true
-i:option(Value, "MidValidityTime").optional = true
-i:option(Value, "HnaInterval").optional = true
-i:option(Value, "HnaValidityTime").optional = true
+i:option(Value, "HelloInterval", translate("Hello interval")).optional = true
+i:option(Value, "HelloValidityTime", translate("Hello validity time")).optional = true
+i:option(Value, "TcInterval", translate("TC interval")).optional = true
+i:option(Value, "TcValidityTime", translate("TC validity time")).optional = true
+i:option(Value, "MidInterval", translate("MID interval")).optional = true
+i:option(Value, "MidValidityTime", translate("MID validity time")).optional = true
+i:option(Value, "HnaInterval", translate("HNA interval")).optional = true
+i:option(Value, "HnaValidityTime", translate("HNA validity time")).optional = true
 
-adc = i:option(Flag, "AutoDetectChanges")
+adc = i:option(Flag, "AutoDetectChanges", translate("Autodetect changes"))
 adc.enabled  = "yes"
 adc.disabled = "no"
 adc.optional = true

diff --git a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdhna.lua b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdhna.lua
index c9217f6..4a1e693 100644 (file)
--- a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdhna.lua
+++ b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdhna.lua
@@ -15,22 +15,22 @@ $Id$
 mh = Map("olsrd", translate("OLSR - HNA-Announcements"))
 
 
-hna4 = mh:section(TypedSection, "Hna4")
+hna4 = mh:section(TypedSection, "Hna4", "Hna4")
 hna4.addremove = true
 hna4.anonymous = true
 hna4.template  = "cbi/tblsection"
 
-net4 = hna4:option(Value, "netaddr")
-msk4 = hna4:option(Value, "netmask")
+net4 = hna4:option(Value, "netaddr", translate("Network address"))
+msk4 = hna4:option(Value, "netmask", translate("Netmask"))
 
 
-hna6 = mh:section(TypedSection, "Hna6")
+hna6 = mh:section(TypedSection, "Hna6", "Hna6")
 hna6.addremove = true
 hna6.anonymous = true
 hna6.template  = "cbi/tblsection"
 
-net6 = hna6:option(Value, "netaddr")
-msk6 = hna6:option(Value, "prefix")
+net6 = hna6:option(Value, "netaddr", translate("Network address"))
+msk6 = hna6:option(Value, "prefix", translate("Prefix"))
 
 
 return mh

diff --git a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua
index a387c4c..dbd6ff9 100644 (file)
--- a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua
+++ b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua
@@ -19,11 +19,11 @@ local fs = require "nixio.fs"
 if arg[1] then
        mp = Map("olsrd", translate("OLSR - Plugins"))
 
-       p = mp:section(TypedSection, "LoadPlugin")
+       p = mp:section(TypedSection, "LoadPlugin", translate("Plugin configuration"))
        p:depends("library", arg[1])
        p.anonymous = true
 
-       ign = p:option(Flag, "ignore", "Enable")
+       ign = p:option(Flag, "ignore", translate("Enable"))
        ign.enabled  = "0"
        ign.disabled = "1"
        ign.rmempty  = false
@@ -162,7 +162,7 @@ if arg[1] then
                        end
 
                        if otype == Flag then
-                               local bool = p:option( Flag, name )
+                               local bool = p:option( Flag, name, name )
                                if default == "yes" or default == "no" then
                                        bool.enabled  = "yes"
                                        bool.disabled = "no"
@@ -180,7 +180,7 @@ if arg[1] then
                                bool.default = default
                                bool:depends({ library = plugin })
                        else
-                               local field = p:option( otype, name )
+                               local field = p:option( otype, name, name )
                                if values then
                                        for _, value in ipairs(values) do
                                                field:value( value )
@@ -207,7 +207,7 @@ if arg[1] then
 
 else
 
-       mpi = Map("olsrd", "OLSR - Plugins")
+       mpi = Map("olsrd", translate("OLSR - Plugins"))
 
        local plugins = {}
        mpi.uci:foreach("olsrd", "LoadPlugin",
@@ -230,7 +230,7 @@ else
                end
        end
 
-       t = mpi:section( TypedSection, "LoadPlugin", "Plugins" )
+       t = mpi:section( TypedSection, "LoadPlugin", translate("Plugins") )
        t.anonymous = true
        t.template  = "cbi/tblsection"
        t.override_scheme = true
@@ -239,7 +239,7 @@ else
                return luci.dispatcher.build_url("admin", "services", "olsrd", "plugins") .. "/" .. lib
        end
 
-       ign = t:option( Flag, "ignore", "Enabled" )
+       ign = t:option( Flag, "ignore", translate("Enabled") )
        ign.enabled  = "0"
        ign.disabled = "1"
        ign.rmempty  = false
@@ -247,7 +247,7 @@ else
                return Flag.cfgvalue(self, section) or "0"
        end
 
-       t:option( DummyValue, "library", "Library" )
+       t:option( DummyValue, "library", translate("Library") )
 
        return mpi
 end