luci-0.8: merge r3809-r3822

6 files changed, 27 insertions, 18 deletions

diff --git a/applications/luci-olsr/luasrc/i18n/olsr.de.lua b/applications/luci-olsr/luasrc/i18n/olsr.de.lua
index dc0cfafab2..4ebcf0e2ed 100644
--- a/applications/luci-olsr/luasrc/i18n/olsr.de.lua
+++ b/applications/luci-olsr/luasrc/i18n/olsr.de.lua
@@ -75,8 +75,8 @@ olsrd_hna6 = 'IPv6 HNA-Ankündigungen'
 olsrd_hna6_desc = 'Hna6-Entries ermöglichen die Ankündigung von lokalen IPv6 Host- und Netz-Routen im Mesh-Netzwerk'
 olsrd_hna6_netaddr = 'Netzwerk-Adresse'
 olsrd_hna6_netaddr_desc = 'IPv6 Adresse'
-olsrd_hna6_netmask = 'Netzmaske'
-olsrd_hna6_netmask_desc = 'IPv6 Adresse'
+olsrd_hna6_prefix = 'Prefix'
+olsrd_hna6_prefix_desc = 'IPv6 Prefix'
 olsrd_loadplugin = 'Pluginkonfiguration'
 olsrd_loadplugin_ignore = 'Plugin aktivieren'
 olsrd_loadplugin_library = 'Bibliothek'
diff --git a/applications/luci-olsr/luasrc/i18n/olsr.de.xml b/applications/luci-olsr/luasrc/i18n/olsr.de.xml
index 3d9763dc92..3d8b5a211f 100644
--- a/applications/luci-olsr/luasrc/i18n/olsr.de.xml
+++ b/applications/luci-olsr/luasrc/i18n/olsr.de.xml
@@ -112,8 +112,8 @@
 <i18n:msg xml:id="olsrd_hna6_desc">Hna6-Entries ermöglichen die Ankündigung von lokalen IPv6 Host- und Netz-Routen im Mesh-Netzwerk</i18n:msg>
 <i18n:msg xml:id="olsrd_hna6_netaddr">Netzwerk-Adresse</i18n:msg>
 <i18n:msg xml:id="olsrd_hna6_netaddr_desc">IPv6 Adresse</i18n:msg>
-<i18n:msg xml:id="olsrd_hna6_netmask">Netzmaske</i18n:msg>
-<i18n:msg xml:id="olsrd_hna6_netmask_desc">IPv6 Adresse</i18n:msg>
+<i18n:msg xml:id="olsrd_hna6_prefix">Prefix</i18n:msg>
+<i18n:msg xml:id="olsrd_hna6_prefix_desc">IPv6 Prefix</i18n:msg>
 
 
 <!-- * PLUGIN SETUP * -->
diff --git a/applications/luci-olsr/luasrc/i18n/olsr.en.lua b/applications/luci-olsr/luasrc/i18n/olsr.en.lua
index fbba7653f8..b8621d3f7e 100644
--- a/applications/luci-olsr/luasrc/i18n/olsr.en.lua
+++ b/applications/luci-olsr/luasrc/i18n/olsr.en.lua
@@ -75,8 +75,8 @@ olsrd_hna6 = 'IPv6 HNA announcements'
 olsrd_hna6_desc = 'Hna6 entries allow you to propagate local IPv6 host- and network-routes into the mesh network'
 olsrd_hna6_netaddr = 'Network address'
 olsrd_hna6_netaddr_desc = 'IPv6 address'
-olsrd_hna6_netmask = 'Netmask'
-olsrd_hna6_netmask_desc = 'IPv6 address'
+olsrd_hna6_prefix = 'Prefix'
+olsrd_hna6_prefix_desc = 'IPv6 prefix'
 olsrd_loadplugin = 'Plugin configuration'
 olsrd_loadplugin_ignore = 'Enable plugin'
 olsrd_loadplugin_library = 'Library'
diff --git a/applications/luci-olsr/luasrc/i18n/olsr.en.xml b/applications/luci-olsr/luasrc/i18n/olsr.en.xml
index 546b7a849c..4dc7d5c943 100644
--- a/applications/luci-olsr/luasrc/i18n/olsr.en.xml
+++ b/applications/luci-olsr/luasrc/i18n/olsr.en.xml
@@ -112,8 +112,8 @@
 <i18n:msg xml:id="olsrd_hna6_desc">Hna6 entries allow you to propagate local IPv6 host- and network-routes into the mesh network</i18n:msg>
 <i18n:msg xml:id="olsrd_hna6_netaddr">Network address</i18n:msg>
 <i18n:msg xml:id="olsrd_hna6_netaddr_desc">IPv6 address</i18n:msg>
-<i18n:msg xml:id="olsrd_hna6_netmask">Netmask</i18n:msg>
-<i18n:msg xml:id="olsrd_hna6_netmask_desc">IPv6 address</i18n:msg>
+<i18n:msg xml:id="olsrd_hna6_prefix">Prefix</i18n:msg>
+<i18n:msg xml:id="olsrd_hna6_prefix_desc">IPv6 prefix</i18n:msg>
 
 
 <!-- * PLUGIN SETUP * -->
diff --git a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdhna.lua b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdhna.lua
index 632a4d4a4b..ea2f88d794 100644
--- a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdhna.lua
+++ b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdhna.lua
@@ -14,14 +14,23 @@ $Id$
 
 mh = Map("olsrd", translate("olsrd_hna", "OLSR - HNA-Ankündigungen"))
 
-for i, sect in ipairs({ "Hna4", "Hna6" }) do
-	hna = mh:section(TypedSection, sect)
-	hna.addremove = true
-	hna.anonymous = true
-	hna.template  = "cbi/tblsection"
-
-	net = hna:option(Value, "netaddr")
-	msk = hna:option(Value, "netmask")
-end
+
+hna4 = mh:section(TypedSection, "Hna4")
+hna4.addremove = true
+hna4.anonymous = true
+hna4.template  = "cbi/tblsection"
+
+net4 = hna4:option(Value, "netaddr")
+msk4 = hna4:option(Value, "netmask")
+
+
+hna6 = mh:section(TypedSection, "Hna6")
+hna6.addremove = true
+hna6.anonymous = true
+hna6.template  = "cbi/tblsection"
+
+net6 = hna6:option(Value, "netaddr")
+msk6 = hna6:option(Value, "prefix")
+
 
 return mh
diff --git a/applications/luci-statistics/luasrc/statistics/rrdtool.lua b/applications/luci-statistics/luasrc/statistics/rrdtool.lua
index 23e0170368..cf420fe6d0 100644
--- a/applications/luci-statistics/luasrc/statistics/rrdtool.lua
+++ b/applications/luci-statistics/luasrc/statistics/rrdtool.lua
@@ -42,7 +42,7 @@ function Graph.__init__( self, timespan, opts )
 
 	-- options
 	opts.timespan  = timespan       or sections.rrdtool.default_timespan or 900
-	opts.rrasingle = opts.rrasingle or ( sections.collectd_rrdtool.RRASingle ~= "0" )
+	opts.rrasingle = opts.rrasingle or ( sections.collectd_rrdtool.RRASingle == "1" )
 	opts.host      = opts.host      or sections.collectd.Hostname        or luci.sys.hostname()
 	opts.width     = opts.width     or sections.rrdtool.image_width      or 400
 	opts.rrdpath   = opts.rrdpath   or sections.collectd_rrdtool.DataDir or "/tmp/rrd"