all: change most translate statements to new format, some need manual cleanup

[project/luci.git] / applications / luci-olsr / luasrc / model / cbi / olsr / olsrd.lua

diff --git a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
index 1ea3d9762b88640dd103a6b61a48196d77381b7c..d5b771096e8444f0a6ee32bc234cc8dac54ad8cc 100644 (file)
--- a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
+++ b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
@@ -11,12 +11,12 @@ You may obtain a copy of the License at
 
 $Id$
 ]]--
+
 require("luci.tools.webadmin")
-require("luci.fs")
 
-m = Map("olsrd", "OLSR")
+m = Map("olsrd", translate("OLSR Daemon"))
 
-s = m:section(TypedSection, "olsrd", translate("olsr_general"))
+s = m:section(TypedSection, "olsrd", translate("olsrd_general"))
 s.dynamic = true
 s.anonymous = true
 
@@ -38,26 +38,26 @@ noint.optional = true
 s:option(Value, "Pollrate").optional = true
 
 tcr = s:option(ListValue, "TcRedundancy")
-tcr:value("0", translate("olsr_general_tcredundancy_0"))
-tcr:value("1", translate("olsr_general_tcredundancy_1"))
-tcr:value("2", translate("olsr_general_tcredundancy_2"))
+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
 
 lql = s:option(ListValue, "LinkQualityLevel")
 lql:value("0", translate("disable"))
-lql:value("1", translate("olsr_general_linkqualitylevel_1"))
-lql:value("2", translate("olsr_general_linkqualitylevel_2"))
+lql:value("1", translate("MPR selection"))
+lql:value("2", translate("MPR selection and routing"))
 lql.optional = true
 
 s:option(Value, "LinkQualityAging").optional = true
 
 lqa = s:option(ListValue, "LinkQualityAlgorithm")
 lqa.optional = true
-lqa:value("etx_fpm", translate("olsr_etx_fpm"))
-lqa:value("etx_float", translate("olsr_etx_float"))
-lqa:value("etx_ff", translate("olsr_etx_ff"))
+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")
@@ -92,19 +92,32 @@ willingness.optional = true
 
 
 
-i = m:section(TypedSection, "Interface", translate("interfaces"))
+i = m:section(TypedSection, "Interface", translate("Interfaces"))
 i.anonymous = true
 i.addremove = true
 i.dynamic = true
 
-ign = i:option(Flag, "ignore")
-ign.enabled  = "1"
-ign.disabled = "0"
+ign = i:option(Flag, "ignore", "Enable")
+ign.enabled  = "0"
+ign.disabled = "1"
+ign.rmempty = false
+function ign.cfgvalue(self, section)
+       return Flag.cfgvalue(self, section) or "0"
+end
 
-network = i:option(ListValue, "interface", translate("network"))
+network = i:option(ListValue, "interface", translate("Network"))
 luci.tools.webadmin.cbi_add_networks(network)
 
 i:option(Value, "Ip4Broadcast").optional = true
+
+ip6t = i:option(ListValue, "Ip6AddrType")
+ip6t:value("", translate("-- Please choose --"))
+ip6t:value("auto")
+ip6t:value("site-local")
+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
@@ -119,8 +132,10 @@ adc.enabled  = "yes"
 adc.disabled = "no"
 adc.optional = true
 
-
+--[[
 ipc = m:section(TypedSection, "IpcConnect")
+ipc.anonymous = true
+
 conns = ipc:option(Value, "MaxConnections")
 conns.isInteger = true
 
@@ -129,6 +144,6 @@ nets.optional = true
 
 hosts = ipc:option(Value, "Host")
 hosts.optional = true
-
+]]
 
 return m