Merge pull request #1735 from sumpfralle/olsr-jsoninfo-parser-handle-empty-result

[oweals/luci.git] / applications / luci-app-statistics / po / en / statistics.po

diff --git a/applications/luci-app-statistics/po/en/statistics.po b/applications/luci-app-statistics/po/en/statistics.po
index eff0a5bbd273e6ac8a07194975a917ff39cf60e2..d5d43b1925ea00258e48d1a3c4bbbedff5edc2f0 100644 (file)
--- a/applications/luci-app-statistics/po/en/statistics.po
+++ b/applications/luci-app-statistics/po/en/statistics.po
@@ -13,7 +13,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#: applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua:26
+#: applications/luci-app-statistics/luasrc/statistics/plugins/apcups.lua:7
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/apcups.lua:7
 msgid "APC UPS"
 msgstr ""
 
@@ -21,7 +22,7 @@ msgstr ""
 msgid "APCUPS Plugin Configuration"
 msgstr ""
 
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua:71
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua:70
 msgid "Action (target)"
 msgstr "Action (target)"
 
@@ -29,7 +30,7 @@ msgstr "Action (target)"
 msgid "Add command for reading values"
 msgstr "Add command for reading values"
 
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua:35
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua:34
 msgid "Add matching rule"
 msgstr "Add matching rule"
 
@@ -42,7 +43,11 @@ msgstr ""
 msgid "Add notification command"
 msgstr "Add notification command"
 
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/openvpn.lua:26
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/ping.lua:24
+msgid "Address family"
+msgstr ""
+
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/openvpn.lua:23
 msgid "Aggregate number of connected users"
 msgstr ""
 
@@ -58,7 +63,8 @@ msgstr "Basic monitoring"
 msgid "CPU Context Switches Plugin Configuration"
 msgstr ""
 
-#: applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua:30
+#: applications/luci-app-statistics/luasrc/statistics/plugins/cpufreq.lua:7
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpufreq.lua:9
 msgid "CPU Frequency"
 msgstr ""
 
@@ -70,7 +76,7 @@ msgstr ""
 msgid "CPU Plugin Configuration"
 msgstr "CPU Plugin Configuration"
 
-#: applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua:31
+#: applications/luci-app-statistics/luasrc/statistics/plugins/csv.lua:7
 msgid "CSV Output"
 msgstr "CSV Output"
 
@@ -86,7 +92,7 @@ msgstr "Cache collected data for"
 msgid "Cache flush interval"
 msgstr "Cache flush interval"
 
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua:60
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua:59
 msgid "Chain"
 msgstr "Chain"
 
@@ -116,15 +122,17 @@ msgstr ""
 "different plugins. On this page you can change general settings for the "
 "collectd daemon."
 
-#: applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua:27
+#: applications/luci-app-statistics/luasrc/statistics/plugins/conntrack.lua:7
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/conntrack.lua:7
 msgid "Conntrack"
 msgstr ""
 
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:13
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:5
 msgid "Conntrack Plugin Configuration"
 msgstr ""
 
-#: applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua:28
+#: applications/luci-app-statistics/luasrc/statistics/plugins/contextswitch.lua:7
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/contextswitch.lua:6
 msgid "Context Switches"
 msgstr ""
 
@@ -132,7 +140,8 @@ msgstr ""
 msgid "DF Plugin Configuration"
 msgstr "DF Plugin Configuration"
 
-#: applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua:35
+#: applications/luci-app-statistics/luasrc/statistics/plugins/dns.lua:7
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/dns.lua:7
 msgid "DNS"
 msgstr "DNS"
 
@@ -148,7 +157,7 @@ msgstr "Data collection interval"
 msgid "Datasets definition file"
 msgstr "Datasets definition file"
 
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua:97
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua:96
 msgid "Destination ip range"
 msgstr "Destination ip range"
 
@@ -164,11 +173,13 @@ msgstr "Directory for sub-configurations"
 msgid "Disk Plugin Configuration"
 msgstr "Disk Plugin Configuration"
 
-#: applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua:33
+#: applications/luci-app-statistics/luasrc/statistics/plugins/df.lua:7
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/df.lua:7
 msgid "Disk Space Usage"
 msgstr "Disk Space Usage"
 
-#: applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua:34
+#: applications/luci-app-statistics/luasrc/statistics/plugins/disk.lua:7
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/disk.lua:7
 msgid "Disk Usage"
 msgstr "Disk Usage"
 
@@ -184,7 +195,7 @@ msgstr "Display timespan »"
 msgid "E-Mail Plugin Configuration"
 msgstr "E-Mail Plugin Configuration"
 
-#: applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua:36
+#: applications/luci-app-statistics/luasrc/statistics/plugins/email.lua:7
 msgid "Email"
 msgstr "Email"
 
@@ -197,10 +208,10 @@ msgid "Enable"
 msgstr ""
 
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:18
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:10
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:11
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua:12
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua:15
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:8
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua:15
@@ -210,29 +221,30 @@ msgstr ""
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/entropy.lua:10
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/exec.lua:16
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/interface.lua:18
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua:29
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua:28
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/irq.lua:16
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iwinfo.lua:12
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/load.lua:14
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/memory.lua:18
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/memory.lua:10
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:20
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/network.lua:18
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/nut.lua:9
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/olsrd.lua:10
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/openvpn.lua:16
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/openvpn.lua:13
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/ping.lua:15
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/processes.lua:15
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/rrdtool.lua:18
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/sensors.lua:72
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/sensors.lua:70
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/splash_leases.lua:10
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/tcpconns.lua:15
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/thermal.lua:14
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/unixsock.lua:15
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/uptime.lua:18
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/uptime.lua:10
 msgid "Enable this plugin"
 msgstr "Enable this plugin"
 
-#: applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua:37
+#: applications/luci-app-statistics/luasrc/statistics/plugins/entropy.lua:7
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/entropy.lua:7
 msgid "Entropy"
 msgstr ""
 
@@ -240,7 +252,7 @@ msgstr ""
 msgid "Entropy Plugin Configuration"
 msgstr ""
 
-#: applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua:38
+#: applications/luci-app-statistics/luasrc/statistics/plugins/exec.lua:2
 msgid "Exec"
 msgstr "Exec"
 
@@ -248,11 +260,16 @@ msgstr "Exec"
 msgid "Exec Plugin Configuration"
 msgstr "Exec Plugin Configuration"
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "Extra items"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:68
 msgid "Filter class monitoring"
 msgstr "Filter class monitoring"
 
-#: applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua:40
+#: applications/luci-app-statistics/luasrc/statistics/plugins/iptables.lua:2
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/iptables.lua:7
 msgid "Firewall"
 msgstr "Firewall"
 
@@ -264,7 +281,7 @@ msgstr "Flush cache after"
 msgid "Forwarding between listen and server addresses"
 msgstr "Forwarding between listen and server addresses"
 
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/openvpn.lua:32
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/openvpn.lua:29
 msgid "Gather compression statistics"
 msgstr ""
 
@@ -272,11 +289,11 @@ msgstr ""
 msgid "General plugins"
 msgstr ""
 
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/openvpn.lua:20
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/openvpn.lua:17
 msgid "Generate a separate graph for each logged user"
 msgstr ""
 
-#: applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua:101
+#: applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua:73
 msgid "Graphs"
 msgstr "Graphs"
 
@@ -303,7 +320,7 @@ msgstr ""
 "certain threshold values have been reached. The values leading to invocation "
 "will be fed to the the called programs stdin."
 
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua:36
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua:35
 msgid ""
 "Here you can define various criteria by which the monitored iptables rules "
 "are selected."
@@ -311,7 +328,7 @@ msgstr ""
 "Here you can define various criteria by which the monitored iptables rules "
 "are selected."
 
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/sensors.lua:88
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/sensors.lua:86
 msgid "Hold Ctrl to select multiple items or to deselect entries."
 msgstr ""
 
@@ -335,7 +352,7 @@ msgstr "IRQ Plugin Configuration"
 msgid "Ignore source addresses"
 msgstr "Ignore source addresses"
 
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua:104
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua:103
 msgid "Incoming interface"
 msgstr "Incoming interface"
 
@@ -343,19 +360,21 @@ msgstr "Incoming interface"
 msgid "Interface Plugin Configuration"
 msgstr "Interface Plugin Configuration"
 
-#: applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua:39
+#: applications/luci-app-statistics/luasrc/statistics/plugins/interface.lua:7
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/interface.lua:7
 msgid "Interfaces"
 msgstr "Interfaces"
 
-#: applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua:41
+#: applications/luci-app-statistics/luasrc/statistics/plugins/irq.lua:7
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/irq.lua:7
 msgid "Interrupts"
 msgstr "Interrupts"
 
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/ping.lua:30
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/ping.lua:38
 msgid "Interval for pings"
 msgstr ""
 
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua:19
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua:18
 msgid "Iptables Plugin Configuration"
 msgstr "Iptables Plugin Configuration"
 
@@ -389,11 +408,12 @@ msgstr ""
 msgid "Maximum allowed connections"
 msgstr "Maximum allowed connections"
 
-#: applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua:44
+#: applications/luci-app-statistics/luasrc/statistics/plugins/memory.lua:7
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/memory.lua:15
 msgid "Memory"
 msgstr ""
 
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/memory.lua:13
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/memory.lua:5
 msgid "Memory Plugin Configuration"
 msgstr ""
 
@@ -403,7 +423,7 @@ msgstr ""
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/irq.lua:25
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iwinfo.lua:22
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/netlink.lua:79
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/sensors.lua:120
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/sensors.lua:118
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/thermal.lua:24
 msgid "Monitor all except specified"
 msgstr ""
@@ -412,7 +432,7 @@ msgstr ""
 msgid "Monitor all local listen ports"
 msgstr "Monitor all local listen ports"
 
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/sensors.lua:76
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/sensors.lua:74
 msgid "Monitor all sensors"
 msgstr ""
 
@@ -466,15 +486,20 @@ msgstr "Monitor processes"
 msgid "Monitor remote ports"
 msgstr "Monitor remote ports"
 
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:15
+msgid "More details about frequency usage and transitions"
+msgstr ""
+
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
 msgid "Name"
 msgstr ""
 
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua:46
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua:45
 msgid "Name of the rule"
 msgstr "Name of the rule"
 
-#: applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua:45
+#: applications/luci-app-statistics/luasrc/statistics/plugins/netlink.lua:7
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/netlink.lua:7
 msgid "Netlink"
 msgstr "Netlink"
 
@@ -482,7 +507,7 @@ msgstr "Netlink"
 msgid "Netlink Plugin Configuration"
 msgstr "Netlink Plugin Configuration"
 
-#: applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua:46
+#: applications/luci-app-statistics/luasrc/statistics/plugins/network.lua:2
 msgid "Network"
 msgstr "Network"
 
@@ -494,7 +519,7 @@ msgstr "Network Plugin Configuration"
 msgid "Network plugins"
 msgstr "Network plugins"
 
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua:82
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua:81
 msgid "Network protocol"
 msgstr "Network protocol"
 
@@ -508,7 +533,8 @@ msgstr ""
 msgid "Number of threads for data collection"
 msgstr "Number of threads for data collection"
 
-#: applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua:48
+#: applications/luci-app-statistics/luasrc/statistics/plugins/olsrd.lua:7
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/olsrd.lua:7
 msgid "OLSRd"
 msgstr ""
 
@@ -520,23 +546,24 @@ msgstr ""
 msgid "Only create average RRAs"
 msgstr "Only create average RRAs"
 
-#: applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua:49
+#: applications/luci-app-statistics/luasrc/statistics/plugins/openvpn.lua:7
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/openvpn.lua:7
 msgid "OpenVPN"
 msgstr ""
 
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/openvpn.lua:10
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/openvpn.lua:7
 msgid "OpenVPN Plugin Configuration"
 msgstr ""
 
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/openvpn.lua:44
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/openvpn.lua:41
 msgid "OpenVPN status files"
 msgstr ""
 
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua:116
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua:115
 msgid "Options"
 msgstr "Options"
 
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua:110
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua:109
 msgid "Outgoing interface"
 msgstr "Outgoing interface"
 
@@ -544,7 +571,8 @@ msgstr "Outgoing interface"
 msgid "Output plugins"
 msgstr "Output plugins"
 
-#: applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua:50
+#: applications/luci-app-statistics/luasrc/statistics/plugins/ping.lua:7
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/ping.lua:7
 msgid "Ping"
 msgstr "Ping"
 
@@ -560,7 +588,8 @@ msgstr ""
 msgid "Port for apcupsd communication"
 msgstr ""
 
-#: applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua:51
+#: applications/luci-app-statistics/luasrc/statistics/plugins/processes.lua:7
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/processes.lua:7
 msgid "Processes"
 msgstr "Processes"
 
@@ -572,7 +601,8 @@ msgstr "Processes Plugin Configuration"
 msgid "Processes to monitor separated by space"
 msgstr ""
 
-#: applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua:29
+#: applications/luci-app-statistics/luasrc/statistics/plugins/cpu.lua:7
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpu.lua:7
 msgid "Processor"
 msgstr "Processor"
 
@@ -592,7 +622,7 @@ msgstr "RRD heart beat interval"
 msgid "RRD step interval"
 msgstr "RRD step interval"
 
-#: applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua:52
+#: applications/luci-app-statistics/luasrc/statistics/plugins/rrdtool.lua:7
 msgid "RRDTool"
 msgstr "RRDTool"
 
@@ -611,7 +641,7 @@ msgstr ""
 
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/collectd.lua:44
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/network.lua:78
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/ping.lua:30
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/ping.lua:38
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/rrdtool.lua:35
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/rrdtool.lua:44
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/rrdtool.lua:91
@@ -619,15 +649,16 @@ msgstr ""
 msgid "Seconds"
 msgstr "Seconds"
 
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/sensors.lua:88
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/sensors.lua:86
 msgid "Sensor list"
 msgstr ""
 
-#: applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua:53
+#: applications/luci-app-statistics/luasrc/statistics/plugins/sensors.lua:7
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/sensors.lua:7
 msgid "Sensors"
 msgstr ""
 
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/sensors.lua:66
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/sensors.lua:64
 msgid "Sensors Plugin Configuration"
 msgstr ""
 
@@ -639,7 +670,7 @@ msgstr "Server host"
 msgid "Server port"
 msgstr "Server port"
 
-#: applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua:76
+#: applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua:48
 msgid "Setup"
 msgstr ""
 
@@ -663,7 +694,7 @@ msgstr ""
 msgid "Socket permissions"
 msgstr ""
 
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua:91
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua:90
 msgid "Source ip range"
 msgstr "Source ip range"
 
@@ -679,7 +710,8 @@ msgstr ""
 msgid "Specifies what information to collect about the global topology."
 msgstr ""
 
-#: applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua:54
+#: applications/luci-app-statistics/luasrc/statistics/plugins/splash_leases.lua:7
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/splash_leases.lua:7
 msgid "Splash Leases"
 msgstr ""
 
@@ -687,7 +719,7 @@ msgstr ""
 msgid "Splash Leases Plugin Configuration"
 msgstr ""
 
-#: applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua:73
+#: applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua:45
 #: applications/luci-app-statistics/luasrc/view/admin_statistics/index.htm:9
 #: applications/luci-app-statistics/luasrc/view/public_statistics/graph.htm:9
 msgid "Statistics"
@@ -709,11 +741,13 @@ msgstr "Store data values as rates instead of absolute values"
 msgid "Stored timespans"
 msgstr "Stored timespans"
 
-#: applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua:43
+#: applications/luci-app-statistics/luasrc/statistics/plugins/load.lua:7
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/load.lua:7
 msgid "System Load"
 msgstr "System Load"
 
-#: applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua:55
+#: applications/luci-app-statistics/luasrc/statistics/plugins/tcpconns.lua:7
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/tcpconns.lua:7
 msgid "TCP Connections"
 msgstr "TCP Connections"
 
@@ -725,11 +759,11 @@ msgstr "TCPConns Plugin Configuration"
 msgid "TTL for network packets"
 msgstr "TTL for network packets"
 
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/ping.lua:24
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/ping.lua:32
 msgid "TTL for ping packets"
 msgstr "TTL for ping packets"
 
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua:49
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua:48
 msgid "Table"
 msgstr "Table"
 
@@ -747,13 +781,13 @@ msgid ""
 "plugin of OLSRd."
 msgstr ""
 
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/openvpn.lua:11
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/openvpn.lua:8
 msgid ""
 "The OpenVPN plugin gathers information about the current vpn connection "
 "status."
 msgstr ""
 
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:14
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:6
 msgid ""
 "The conntrack plugin collects statistics about the number of tracked "
 "connections."
@@ -825,7 +859,7 @@ msgid ""
 msgstr ""
 "The interface plugin collects traffic statistics on selected interfaces."
 
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua:20
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua:19
 msgid ""
 "The iptables plugin will monitor selected firewall rules and collect "
 "information about processed bytes and packets per rule."
@@ -851,7 +885,7 @@ msgstr ""
 msgid "The load plugin collects statistics about the general system load."
 msgstr "The load plugin collects statistics about the general system load."
 
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/memory.lua:14
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/memory.lua:6
 msgid "The memory plugin collects statistics about the memory usage."
 msgstr ""
 
@@ -903,7 +937,7 @@ msgstr ""
 "values will result in a very high memory consumption in the temporary "
 "directory. This can render the device unusable!</strong>"
 
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/sensors.lua:67
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/sensors.lua:65
 msgid ""
 "The sensors plugin uses the Linux Sensors framework to gather environmental "
 "statistics."
@@ -945,11 +979,12 @@ msgstr ""
 "The unixsock plugin creates a unix socket which can be used to read "
 "collected data from a running collectd instance."
 
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/uptime.lua:14
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/uptime.lua:6
 msgid "The uptime plugin collects statistics about the uptime of the system."
 msgstr ""
 
-#: applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua:56
+#: applications/luci-app-statistics/luasrc/statistics/plugins/thermal.lua:7
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/thermal.lua:6
 msgid "Thermal"
 msgstr ""
 
@@ -983,8 +1018,9 @@ msgstr ""
 msgid "Try to lookup fully qualified hostname"
 msgstr "Try to lookup fully qualified hostname"
 
-#: applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua:47
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/nut.lua:12
+#: applications/luci-app-statistics/luasrc/statistics/plugins/nut.lua:7
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/nut.lua:6
 msgid "UPS"
 msgstr ""
 
@@ -1000,7 +1036,7 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
-#: applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua:57
+#: applications/luci-app-statistics/luasrc/statistics/plugins/unixsock.lua:7
 msgid "UnixSock"
 msgstr "UnixSock"
 
@@ -1008,15 +1044,16 @@ msgstr "UnixSock"
 msgid "Unixsock Plugin Configuration"
 msgstr "Unixsock Plugin Configuration"
 
-#: applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua:58
+#: applications/luci-app-statistics/luasrc/statistics/plugins/uptime.lua:7
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/uptime.lua:15
 msgid "Uptime"
 msgstr ""
 
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/uptime.lua:13
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/uptime.lua:5
 msgid "Uptime Plugin Configuration"
 msgstr ""
 
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/openvpn.lua:38
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/openvpn.lua:35
 msgid "Use improved naming schema"
 msgstr ""
 
@@ -1033,7 +1070,8 @@ msgstr ""
 msgid "Verbose monitoring"
 msgstr "Verbose monitoring"
 
-#: applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua:42
+#: applications/luci-app-statistics/luasrc/statistics/plugins/iwinfo.lua:7
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/iwinfo.lua:7
 msgid "Wireless"
 msgstr "Wireless"
 
@@ -1046,7 +1084,8 @@ msgid ""
 "You can install additional collectd-mod-* plugins to enable more statistics."
 msgstr ""
 
-#: applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua:32
+#: applications/luci-app-statistics/luasrc/statistics/plugins/curl.lua:2
+#: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/curl.lua:7
 msgid "cUrl"
 msgstr ""
 
@@ -1054,19 +1093,19 @@ msgstr ""
 msgid "cUrl Plugin Configuration"
 msgstr ""
 
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua:110
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua:109
 msgid "e.g. br-ff"
 msgstr "e.g. br-ff"
 
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua:104
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua:103
 msgid "e.g. br-lan"
 msgstr "e.g. br-lan"
 
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua:116
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua:115
 msgid "e.g. reject-with tcp-reset"
 msgstr "e.g. reject-with tcp-reset"
 
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua:46
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua:45
 msgid "max. 16 chars"
 msgstr "max. 16 chars"
 
@@ -1081,4 +1120,3 @@ msgstr "seconds; multiple separated by space"
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/network.lua:45
 msgid "server interfaces"
 msgstr "server interfaces"
-