po: restore rrdtool translations

12 files changed, 1649 insertions, 629 deletions

diff --git a/po/ca/rrdtool.po b/po/ca/rrdtool.po
index 278a64f1b..7c03aad9a 100644
--- a/po/ca/rrdtool.po
+++ b/po/ca/rrdtool.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-10 03:40+0200\n"
+"POT-Creation-Date: 2009-05-26 16:39+0200\n"
 "PO-Revision-Date: 2009-05-27 01:49+0200\n"
 "Last-Translator: Eduard Duran <iopahopa@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,260 +15,345 @@ msgstr ""
 
 #. %H: Wireless - Signal Noise Ratio
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:1
-msgid "%H: Wireless - Signal Noise Ratio"
+msgid "stat_dg_title_wireless__signal_noise"
 msgstr "%H: Wireless - Relació Senyal Soroll"
 
 #. dBm
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:2
-msgid "dBm"
+msgid "stat_dg_label_wireless__signal_noise"
 msgstr "dBm"
 
 #. Noise Level
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:3
-msgid "Noise Level"
+msgid "stat_ds_signal_noise"
 msgstr "Nivell de soroll"
 
 #. Signal Strength
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:4
-msgid "Signal Strength"
+msgid "stat_ds_signal_power"
 msgstr "Potència de senyal"
 
 #. %H: Wireless - Signal Quality
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:5
-msgid "%H: Wireless - Signal Quality"
+msgid "stat_dg_title_wireless__signal_quality"
 msgstr "%H: Wireless - Qualitat de senyal"
 
 #. n
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:6
-msgid "n"
+msgid "stat_dg_label_wireless__signal_quality"
 msgstr "n"
 
 #. Signal Quality
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:7
-msgid "Signal Quality"
+msgid "stat_ds_signal_quality"
 msgstr "Qualitat de senyal"
 
 #. %H: ICMP Roundtrip Times
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:8
-msgid "%H: ICMP Roundtrip Times"
+msgid "stat_dg_title_ping"
 msgstr "%H: Temps ICMP d'anada i tornada"
 
 #. ms
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:9
-msgid "ms"
+msgid "stat_dg_label_ping"
 msgstr "ms"
 
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:10
+msgid "stat_ds_ping"
+msgstr "%di"
+
 #. %H: Firewall - Processed Packets
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:11
-msgid "%H: Firewall - Processed Packets"
+msgid "stat_dg_title_iptables__ipt_packets"
 msgstr "%H: Tallafocs - Paquets processats"
 
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:12
+msgid "stat_dg_label_iptables__ipt_packets"
+msgstr "Paquets/s"
+
 #. Chain \"%di\"
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:13
-msgid "Chain \"%di\""
+msgid "stat_ds_ipt_packets"
 msgstr "Cadena \"%di\""
 
 #. %H: Netlink - Transfer on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:14
-msgid "%H: Netlink - Transfer on %pi"
+msgid "stat_dg_title_netlink__if_octets"
 msgstr "%H: Enllaç de xarxa - Transferència en %pi"
 
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:15
+msgid "stat_dg_label_netlink__if_octets"
+msgstr "Bytes/s"
+
 #. Bytes (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:16
-msgid "Bytes (%ds)"
+msgid "stat_ds_if_octets"
 msgstr "Bytes (%ds)"
 
 #. %H: Netlink - Packets on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:17
-msgid "%H: Netlink - Packets on %pi"
+msgid "stat_dg_title_netlink__if_packets"
 msgstr "%H: Enllaç de xarxa - Paquets en %pi"
 
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:18
+msgid "stat_dg_label_netlink__if_packets"
+msgstr "Paquets/s"
+
 #. Processed (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:19
-msgid "Processed (%ds)"
+msgid "stat_ds_if_packets"
 msgstr "Processats (%ds)"
 
 #. Dropped   (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:20
-msgid "Dropped (%ds)"
+msgid "stat_ds_if_dropped"
 msgstr "Descartats   (%ds)"
 
 #. Errors    (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:21
-msgid "Errors (%ds)"
+msgid "stat_ds_if_errors"
 msgstr "Errors    (%ds)"
 
 #. %H: Netlink - Multicast on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:22
-msgid "%H: Netlink - Multicast on %pi"
+msgid "stat_dg_title_netlink__if_multicast"
 msgstr "%H: Enllaç de xarxa - Multicast en %pi"
 
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:23
+msgid "stat_dg_label_netlink__if_multicast"
+msgstr "Paquets/s"
+
 #. Packets
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:24
-msgid "Packets"
+msgid "stat_ds_if_multicast"
 msgstr "Paquets"
 
 #. %H: Netlink - Collisions on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:25
-msgid "%H: Netlink - Collisions on %pi"
+msgid "stat_dg_title_netlink__if_collisions"
 msgstr "%H: Enllaç de xarxa - Col·lisions en %pi"
 
 #. Collisions/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:26
-msgid "Collisions/s"
+msgid "stat_dg_label_netlink__if_collisions"
 msgstr "Col·lisions/s"
 
 #. Collisions
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:27
-msgid "Collisions"
+msgid "stat_ds_if_collisions"
 msgstr "Col·lisions"
 
 #. %H: Netlink - Errors on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:28
-msgid "%H: Netlink - Errors on %pi"
+msgid "stat_dg_title_netlink__if_tx_errors"
 msgstr "%H: Enllaç de xarxa - Errors on %pi"
 
 #. Errors/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:29
-msgid "Errors/s"
+msgid "stat_dg_label_netlink__if_tx_errors"
 msgstr "Errors/s"
 
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:30
+msgid "stat_ds_if_tx_errors"
+msgstr "%di"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:31
+msgid "stat_ds_if_rx_errors"
+msgstr "%di"
+
 #. %H: Processes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:32
-msgid "%H: Processes"
+msgid "stat_dg_title_processes"
 msgstr "%H: Processos"
 
 #. Processes/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:33
-msgid "Processes/s"
+msgid "stat_dg_label_processes"
 msgstr "Processos/s"
 
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:34
+msgid "stat_ds_ps_state"
+msgstr "%di"
+
 #. %H: Process %pi - used cpu time
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:35
-msgid "%H: Process %pi - used cpu time"
+msgid "stat_dg_title_processes__ps_cputime"
 msgstr "%H: Procés %pi - temps de cpu usat"
 
 #. Jiffies
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:36
-msgid "Jiffies"
+msgid "stat_dg_label_processes__ps_cputime"
 msgstr "Jiffies"
 
 #. system
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:37
-msgid "System"
+msgid "stat_ds_ps_cputime__syst"
 msgstr "sistema"
 
 #. user
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:38
-msgid "user"
+msgid "stat_ds_ps_cputime__user"
 msgstr "usuari"
 
 #. %H: Process %pi - threads and processes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:39
-msgid "%H: Process %pi - threads and processes"
+msgid "stat_dg_title_processes__ps_count"
 msgstr "%H: Procés %pi - threads i processos"
 
 #. Count
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:40
-msgid "Count"
+msgid "stat_dg_label_processes__ps_count"
 msgstr "Compte"
 
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:41
+msgid "stat_ds_ps_count"
+msgstr "%ds"
+
 #. %H: Process %pi - page faults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:42
-msgid "%H: Process %pi - page faults"
+msgid "stat_dg_title_processes__ps_pagefaults"
 msgstr "%H: Procés %pi - errors de pàgina"
 
 #. Pagefaults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:43
-msgid "Pagefaults"
+msgid "stat_dg_label_processes__ps_pagefaults"
 msgstr "Errors de pàgina"
 
 #. page faults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:44
-msgid "page faults"
+msgid "stat_ds_ps_pagefaults"
 msgstr "errors de pàgina"
 
 #. %H: Process %pi - virtual memory size
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:45
-msgid "%H: Process %pi - virtual memory size"
+msgid "stat_dg_title_processes__ps_rss"
 msgstr "%H: Procés %pi - mida de memòria virtual"
 
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:46
+msgid "stat_dg_label_processes__ps_rss"
+msgstr "Bytes"
+
 #. virtual memory
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:47
-msgid "virtual memory"
+msgid "stat_ds_ps_rss"
 msgstr "memòria virtual"
 
 #. %H: Usage on Processor #%pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:48
-msgid "%H: Usage on Processor #%pi"
+msgid "stat_dg_title_cpu"
 msgstr "%H: Ús al Processador #%pi"
 
 #. %
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:49
-msgid "%"
+msgid "stat_dg_label_cpu"
 msgstr "%"
 
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:50
+msgid "stat_ds_cpu"
+msgstr "%di"
+
 #. %H: Transfer on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:51
-msgid "%H: Transfer on %di"
+msgid "stat_dg_title_interface__if_octets"
 msgstr "%H: Transferència a %di"
 
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:52
+msgid "stat_dg_label_interface__if_octets"
+msgstr "Bytes/s"
+
 #. %H: Packets on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:53
-msgid "%H: Packets on %di"
+msgid "stat_dg_title_interface__if_packets"
 msgstr "%H: Paquets a %di"
 
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:54
+msgid "stat_dg_label_interface__if_packets"
+msgstr "Paquets/s"
+
 #. %H: TCP-Connections to Port %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:55
-msgid "%H: TCP-Connections to Port %pi"
+msgid "stat_dg_title_tcpconns"
 msgstr "%H: Connexions TCP a Port %pi"
 
 #. Connections/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:56
-msgid "Connections/s"
+msgid "stat_dg_label_tcpconns"
 msgstr "Connexions/s"
 
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:57
+msgid "stat_ds_tcp_connections"
+msgstr "%di"
+
 #. %H: Disk Space Usage on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:58
-msgid "%H: Disk Space Usage on %di"
+msgid "stat_dg_title_df"
 msgstr "%H: Ús de l'espai de disc a %di"
 
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:59
+msgid "stat_dg_label_df"
+msgstr "Bytes"
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:60
+msgid "stat_ds_df__free"
+msgstr "%ds"
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:61
+msgid "stat_ds_df__used"
+msgstr "%ds"
+
 #. %H: Interrupts
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:62
-msgid "%H: Interrupts"
+msgid "stat_dg_title_irq"
 msgstr "%H: Interrupcions"
 
 #. Issues/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:63
-msgid "Issues/s"
+msgid "stat_dg_label_irq"
 msgstr "Temes/s"
 
 #. IRQ %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:64
-msgid "IRQ %di"
+msgid "stat_ds_irq"
 msgstr "IRQ %di"
 
 #. %H: System Load
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:65
-msgid "%H: System Load"
+msgid "stat_dg_title_load"
 msgstr "%H: Càrrega de Sistema"
 
 #. Load
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:66
-msgid "Load"
+msgid "stat_dg_label_load"
 msgstr "Càrrega"
 
 #. 1 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:67
-msgid "1 min"
+msgid "stat_ds_load__shortterm"
 msgstr "1 min"
 
 #. 5 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:68
-msgid "5 min"
+msgid "stat_ds_load__midterm"
 msgstr "5 min"
 
 #. 15 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:69
-msgid "15 min"
+msgid "stat_ds_load__longterm"
 msgstr "15 min"
diff --git a/po/de/rrdtool.po b/po/de/rrdtool.po
index b6f532cc4..390fd2e6c 100644
--- a/po/de/rrdtool.po
+++ b/po/de/rrdtool.po
@@ -13,260 +13,345 @@ msgstr ""
 
 #. %H: Wireless - Signal Noise Ratio
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:1
-msgid "%H: Wireless - Signal Noise Ratio"
+msgid "stat_dg_title_wireless__signal_noise"
 msgstr "%H: Drahtlos - Signal-Noise-Verhältnis"
 
 #. dBm
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:2
-msgid "dBm"
+msgid "stat_dg_label_wireless__signal_noise"
 msgstr "dBm"
 
 #. Noise Level
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:3
-msgid "Noise Level"
+msgid "stat_ds_signal_noise"
 msgstr "Noise-Level"
 
 #. Signal Strength
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:4
-msgid "Signal Strength"
+msgid "stat_ds_signal_power"
 msgstr "Signalstärke"
 
 #. %H: Wireless - Signal Quality
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:5
-msgid "%H: Wireless - Signal Quality"
+msgid "stat_dg_title_wireless__signal_quality"
 msgstr "%H: Drahtlos - Signalqualität"
 
 #. n
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:6
-msgid "n"
+msgid "stat_dg_label_wireless__signal_quality"
 msgstr "n"
 
 #. Signal Quality
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:7
-msgid "Signal Quality"
+msgid "stat_ds_signal_quality"
 msgstr "Signalqualität"
 
 #. %H: ICMP Roundtrip Times
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:8
-msgid "%H: ICMP Roundtrip Times"
+msgid "stat_dg_title_ping"
 msgstr "%H: ICMP Antwortzeiten"
 
 #. ms
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:9
-msgid "ms"
+msgid "stat_dg_label_ping"
 msgstr "ms"
 
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:10
+msgid "stat_ds_ping"
+msgstr "%di"
+
 #. %H: Firewall - Processed Packets
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:11
-msgid "%H: Firewall - Processed Packets"
+msgid "stat_dg_title_iptables__ipt_packets"
 msgstr "%H: Firewall - Verarbeitete Pakete"
 
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:12
+msgid "stat_dg_label_iptables__ipt_packets"
+msgstr "Pakete/s"
+
 #. Chain \"%di\"
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:13
-msgid "Chain \"%di\""
+msgid "stat_ds_ipt_packets"
 msgstr "Kette \"%di\""
 
 #. %H: Netlink - Transfer on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:14
-msgid "%H: Netlink - Transfer on %pi"
+msgid "stat_dg_title_netlink__if_octets"
 msgstr "%H: Netlink - Transfer auf %pi"
 
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:15
+msgid "stat_dg_label_netlink__if_octets"
+msgstr "Bytes/s"
+
 #. Bytes (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:16
-msgid "Bytes (%ds)"
+msgid "stat_ds_if_octets"
 msgstr "Bytes (%ds)"
 
 #. %H: Netlink - Packets on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:17
-msgid "%H: Netlink - Packets on %pi"
+msgid "stat_dg_title_netlink__if_packets"
 msgstr "%H: Netlink - Pakete auf %pi"
 
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:18
+msgid "stat_dg_label_netlink__if_packets"
+msgstr "Pakete/s"
+
 #. Processed (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:19
-msgid "Processed (%ds)"
+msgid "stat_ds_if_packets"
 msgstr "Verarbeitet (%ds)"
 
 #. Dropped   (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:20
-msgid "Dropped (%ds)"
+msgid "stat_ds_if_dropped"
 msgstr "Verworfen   (%ds)"
 
 #. Errors    (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:21
-msgid "Errors (%ds)"
+msgid "stat_ds_if_errors"
 msgstr "Fehler      (%ds)"
 
 #. %H: Netlink - Multicast on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:22
-msgid "%H: Netlink - Multicast on %pi"
+msgid "stat_dg_title_netlink__if_multicast"
 msgstr "%H: Netlink - Multicast auf %pi"
 
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:23
+msgid "stat_dg_label_netlink__if_multicast"
+msgstr "Pakete/s"
+
 #. Packets
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:24
-msgid "Packets"
+msgid "stat_ds_if_multicast"
 msgstr "Pakete"
 
 #. %H: Netlink - Collisions on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:25
-msgid "%H: Netlink - Collisions on %pi"
+msgid "stat_dg_title_netlink__if_collisions"
 msgstr "%H: Netlink - Kollisionen auf %pi"
 
 #. Collisions/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:26
-msgid "Collisions/s"
+msgid "stat_dg_label_netlink__if_collisions"
 msgstr "Kollisionen/s"
 
 #. Collisions
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:27
-msgid "Collisions"
+msgid "stat_ds_if_collisions"
 msgstr "Kollisionen"
 
 #. %H: Netlink - Errors on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:28
-msgid "%H: Netlink - Errors on %pi"
+msgid "stat_dg_title_netlink__if_tx_errors"
 msgstr "%H: Netlink - Fehler auf %pi"
 
 #. Errors/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:29
-msgid "Errors/s"
+msgid "stat_dg_label_netlink__if_tx_errors"
 msgstr "Fehler/s"
 
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:30
+msgid "stat_ds_if_tx_errors"
+msgstr "%di"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:31
+msgid "stat_ds_if_rx_errors"
+msgstr "%di"
+
 #. %H: Processes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:32
-msgid "%H: Processes"
+msgid "stat_dg_title_processes"
 msgstr "%H: Prozesse"
 
 #. Processes/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:33
-msgid "Processes/s"
+msgid "stat_dg_label_processes"
 msgstr "Prozesse/s"
 
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:34
+msgid "stat_ds_ps_state"
+msgstr "%di"
+
 #. %H: Process %pi - used cpu time
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:35
-msgid "%H: Process %pi - used cpu time"
+msgid "stat_dg_title_processes__ps_cputime"
 msgstr "%H: Prozess %pi - Verbrauchte CPU Zeit"
 
 #. Jiffies
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:36
-msgid "Jiffies"
+msgid "stat_dg_label_processes__ps_cputime"
 msgstr "Jiffies"
 
 #. system
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:37
-msgid "System"
+msgid "stat_ds_ps_cputime__syst"
 msgstr "System"
 
 #. user
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:38
-msgid "user"
+msgid "stat_ds_ps_cputime__user"
 msgstr "User"
 
 #. %H: Process %pi - threads and processes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:39
-msgid "%H: Process %pi - threads and processes"
+msgid "stat_dg_title_processes__ps_count"
 msgstr "%H: Prozess %pi - Threads und Prozesse"
 
 #. Count
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:40
-msgid "Count"
+msgid "stat_dg_label_processes__ps_count"
 msgstr "Anzahl"
 
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:41
+msgid "stat_ds_ps_count"
+msgstr "%ds"
+
 #. %H: Process %pi - page faults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:42
-msgid "%H: Process %pi - page faults"
+msgid "stat_dg_title_processes__ps_pagefaults"
 msgstr "%H: Prozess %pi - Speicherzugriffsfehler"
 
 #. Pagefaults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:43
-msgid "Pagefaults"
+msgid "stat_dg_label_processes__ps_pagefaults"
 msgstr "Zugriffsfehler"
 
 #. page faults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:44
-msgid "page faults"
+msgid "stat_ds_ps_pagefaults"
 msgstr "Zugriffsfehler"
 
 #. %H: Process %pi - virtual memory size
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:45
-msgid "%H: Process %pi - virtual memory size"
+msgid "stat_dg_title_processes__ps_rss"
 msgstr "%H: Process %pi - Virtueller Speicher"
 
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:46
+msgid "stat_dg_label_processes__ps_rss"
+msgstr "Bytes"
+
 #. virtual memory
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:47
-msgid "virtual memory"
+msgid "stat_ds_ps_rss"
 msgstr "virtueller Speicher"
 
 #. %H: Usage on Processor #%pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:48
-msgid "%H: Usage on Processor #%pi"
+msgid "stat_dg_title_cpu"
 msgstr "%H: Auslastung auf Prozessor #%pi"
 
 #. %
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:49
-msgid "%"
+msgid "stat_dg_label_cpu"
 msgstr "%"
 
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:50
+msgid "stat_ds_cpu"
+msgstr "%di"
+
 #. %H: Transfer on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:51
-msgid "%H: Transfer on %di"
+msgid "stat_dg_title_interface__if_octets"
 msgstr "%H: Transfer auf %di"
 
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:52
+msgid "stat_dg_label_interface__if_octets"
+msgstr "Bytes/s"
+
 #. %H: Packets on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:53
-msgid "%H: Packets on %di"
+msgid "stat_dg_title_interface__if_packets"
 msgstr "%H: Pakete auf %di"
 
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:54
+msgid "stat_dg_label_interface__if_packets"
+msgstr "Pakete/s"
+
 #. %H: TCP-Connections to Port %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:55
-msgid "%H: TCP-Connections to Port %pi"
+msgid "stat_dg_title_tcpconns"
 msgstr "%H: TCP-Verbindungen auf Port %pi"
 
 #. Connections/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:56
-msgid "Connections/s"
+msgid "stat_dg_label_tcpconns"
 msgstr "Verbindungen/s"
 
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:57
+msgid "stat_ds_tcp_connections"
+msgstr "%di"
+
 #. %H: Disk Space Usage on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:58
-msgid "%H: Disk Space Usage on %di"
+msgid "stat_dg_title_df"
 msgstr "%H: Speicherverbrauch auf %di"
 
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:59
+msgid "stat_dg_label_df"
+msgstr "Bytes"
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:60
+msgid "stat_ds_df__free"
+msgstr "verfügbar"
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:61
+msgid "stat_ds_df__used"
+msgstr "belegt   "
+
 #. %H: Interrupts
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:62
-msgid "%H: Interrupts"
+msgid "stat_dg_title_irq"
 msgstr "%H: Interrupts"
 
 #. Issues/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:63
-msgid "Issues/s"
+msgid "stat_dg_label_irq"
 msgstr "Aufrufe/s"
 
 #. IRQ %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:64
-msgid "IRQ %di"
+msgid "stat_ds_irq"
 msgstr "IRQ %di"
 
 #. %H: System Load
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:65
-msgid "%H: System Load"
+msgid "stat_dg_title_load"
 msgstr "%H: Systemlast"
 
 #. Load
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:66
-msgid "Load"
+msgid "stat_dg_label_load"
 msgstr "Last"
 
 #. 1 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:67
-msgid "1 min"
+msgid "stat_ds_load__shortterm"
 msgstr "1 Minute"
 
 #. 5 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:68
-msgid "5 min"
+msgid "stat_ds_load__midterm"
 msgstr "5 Minuten"
 
 #. 15 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:69
-msgid "15 min"
+msgid "stat_ds_load__longterm"
 msgstr "15 Minuten"
diff --git a/po/el/rrdtool.po b/po/el/rrdtool.po
index 0b652b9ef..1d81166ec 100644
--- a/po/el/rrdtool.po
+++ b/po/el/rrdtool.po
@@ -14,260 +14,345 @@ msgstr ""
 
 #. %H: Wireless - Signal Noise Ratio
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:1
-msgid "%H: Wireless - Signal Noise Ratio"
+msgid "stat_dg_title_wireless__signal_noise"
 msgstr ""
 
 #. dBm
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:2
-msgid "dBm"
+msgid "stat_dg_label_wireless__signal_noise"
 msgstr ""
 
 #. Noise Level
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:3
-msgid "Noise Level"
+msgid "stat_ds_signal_noise"
 msgstr ""
 
 #. Signal Strength
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:4
-msgid "Signal Strength"
+msgid "stat_ds_signal_power"
 msgstr ""
 
 #. %H: Wireless - Signal Quality
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:5
-msgid "%H: Wireless - Signal Quality"
+msgid "stat_dg_title_wireless__signal_quality"
 msgstr ""
 
 #. n
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:6
-msgid "n"
+msgid "stat_dg_label_wireless__signal_quality"
 msgstr ""
 
 #. Signal Quality
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:7
-msgid "Signal Quality"
+msgid "stat_ds_signal_quality"
 msgstr ""
 
 #. %H: ICMP Roundtrip Times
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:8
-msgid "%H: ICMP Roundtrip Times"
+msgid "stat_dg_title_ping"
 msgstr ""
 
 #. ms
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:9
-msgid "ms"
+msgid "stat_dg_label_ping"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:10
+msgid "stat_ds_ping"
 msgstr ""
 
 #. %H: Firewall - Processed Packets
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:11
-msgid "%H: Firewall - Processed Packets"
+msgid "stat_dg_title_iptables__ipt_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:12
+msgid "stat_dg_label_iptables__ipt_packets"
 msgstr ""
 
 #. Chain \"%di\"
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:13
-msgid "Chain \"%di\""
+msgid "stat_ds_ipt_packets"
 msgstr ""
 
 #. %H: Netlink - Transfer on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:14
-msgid "%H: Netlink - Transfer on %pi"
+msgid "stat_dg_title_netlink__if_octets"
+msgstr ""
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:15
+msgid "stat_dg_label_netlink__if_octets"
 msgstr ""
 
 #. Bytes (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:16
-msgid "Bytes (%ds)"
+msgid "stat_ds_if_octets"
 msgstr ""
 
 #. %H: Netlink - Packets on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:17
-msgid "%H: Netlink - Packets on %pi"
+msgid "stat_dg_title_netlink__if_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:18
+msgid "stat_dg_label_netlink__if_packets"
 msgstr ""
 
 #. Processed (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:19
-msgid "Processed (%ds)"
+msgid "stat_ds_if_packets"
 msgstr ""
 
 #. Dropped   (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:20
-msgid "Dropped (%ds)"
+msgid "stat_ds_if_dropped"
 msgstr ""
 
 #. Errors    (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:21
-msgid "Errors (%ds)"
+msgid "stat_ds_if_errors"
 msgstr ""
 
 #. %H: Netlink - Multicast on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:22
-msgid "%H: Netlink - Multicast on %pi"
+msgid "stat_dg_title_netlink__if_multicast"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:23
+msgid "stat_dg_label_netlink__if_multicast"
 msgstr ""
 
 #. Packets
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:24
-msgid "Packets"
+msgid "stat_ds_if_multicast"
 msgstr ""
 
 #. %H: Netlink - Collisions on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:25
-msgid "%H: Netlink - Collisions on %pi"
+msgid "stat_dg_title_netlink__if_collisions"
 msgstr ""
 
 #. Collisions/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:26
-msgid "Collisions/s"
+msgid "stat_dg_label_netlink__if_collisions"
 msgstr ""
 
 #. Collisions
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:27
-msgid "Collisions"
+msgid "stat_ds_if_collisions"
 msgstr ""
 
 #. %H: Netlink - Errors on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:28
-msgid "%H: Netlink - Errors on %pi"
+msgid "stat_dg_title_netlink__if_tx_errors"
 msgstr ""
 
 #. Errors/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:29
-msgid "Errors/s"
+msgid "stat_dg_label_netlink__if_tx_errors"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:30
+msgid "stat_ds_if_tx_errors"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:31
+msgid "stat_ds_if_rx_errors"
 msgstr ""
 
 #. %H: Processes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:32
-msgid "%H: Processes"
+msgid "stat_dg_title_processes"
 msgstr ""
 
 #. Processes/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:33
-msgid "Processes/s"
+msgid "stat_dg_label_processes"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:34
+msgid "stat_ds_ps_state"
 msgstr ""
 
 #. %H: Process %pi - used cpu time
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:35
-msgid "%H: Process %pi - used cpu time"
+msgid "stat_dg_title_processes__ps_cputime"
 msgstr ""
 
 #. Jiffies
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:36
-msgid "Jiffies"
+msgid "stat_dg_label_processes__ps_cputime"
 msgstr ""
 
 #. system
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:37
-msgid "System"
+msgid "stat_ds_ps_cputime__syst"
 msgstr ""
 
 #. user
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:38
-msgid "user"
+msgid "stat_ds_ps_cputime__user"
 msgstr ""
 
 #. %H: Process %pi - threads and processes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:39
-msgid "%H: Process %pi - threads and processes"
+msgid "stat_dg_title_processes__ps_count"
 msgstr ""
 
 #. Count
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:40
-msgid "Count"
+msgid "stat_dg_label_processes__ps_count"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:41
+msgid "stat_ds_ps_count"
 msgstr ""
 
 #. %H: Process %pi - page faults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:42
-msgid "%H: Process %pi - page faults"
+msgid "stat_dg_title_processes__ps_pagefaults"
 msgstr ""
 
 #. Pagefaults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:43
-msgid "Pagefaults"
+msgid "stat_dg_label_processes__ps_pagefaults"
 msgstr ""
 
 #. page faults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:44
-msgid "page faults"
+msgid "stat_ds_ps_pagefaults"
 msgstr ""
 
 #. %H: Process %pi - virtual memory size
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:45
-msgid "%H: Process %pi - virtual memory size"
+msgid "stat_dg_title_processes__ps_rss"
+msgstr ""
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:46
+msgid "stat_dg_label_processes__ps_rss"
 msgstr ""
 
 #. virtual memory
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:47
-msgid "virtual memory"
+msgid "stat_ds_ps_rss"
 msgstr ""
 
 #. %H: Usage on Processor #%pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:48
-msgid "%H: Usage on Processor #%pi"
+msgid "stat_dg_title_cpu"
 msgstr ""
 
 #. %
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:49
-msgid "%"
+msgid "stat_dg_label_cpu"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:50
+msgid "stat_ds_cpu"
 msgstr ""
 
 #. %H: Transfer on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:51
-msgid "%H: Transfer on %di"
+msgid "stat_dg_title_interface__if_octets"
+msgstr ""
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:52
+msgid "stat_dg_label_interface__if_octets"
 msgstr ""
 
 #. %H: Packets on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:53
-msgid "%H: Packets on %di"
+msgid "stat_dg_title_interface__if_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:54
+msgid "stat_dg_label_interface__if_packets"
 msgstr ""
 
 #. %H: TCP-Connections to Port %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:55
-msgid "%H: TCP-Connections to Port %pi"
+msgid "stat_dg_title_tcpconns"
 msgstr ""
 
 #. Connections/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:56
-msgid "Connections/s"
+msgid "stat_dg_label_tcpconns"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:57
+msgid "stat_ds_tcp_connections"
 msgstr ""
 
 #. %H: Disk Space Usage on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:58
-msgid "%H: Disk Space Usage on %di"
+msgid "stat_dg_title_df"
+msgstr ""
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:59
+msgid "stat_dg_label_df"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:60
+msgid "stat_ds_df__free"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:61
+msgid "stat_ds_df__used"
 msgstr ""
 
 #. %H: Interrupts
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:62
-msgid "%H: Interrupts"
+msgid "stat_dg_title_irq"
 msgstr ""
 
 #. Issues/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:63
-msgid "Issues/s"
+msgid "stat_dg_label_irq"
 msgstr ""
 
 #. IRQ %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:64
-msgid "IRQ %di"
+msgid "stat_ds_irq"
 msgstr ""
 
 #. %H: System Load
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:65
-msgid "%H: System Load"
+msgid "stat_dg_title_load"
 msgstr ""
 
 #. Load
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:66
-msgid "Load"
+msgid "stat_dg_label_load"
 msgstr ""
 
 #. 1 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:67
-msgid "1 min"
+msgid "stat_ds_load__shortterm"
 msgstr ""
 
 #. 5 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:68
-msgid "5 min"
+msgid "stat_ds_load__midterm"
 msgstr ""
 
 #. 15 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:69
-msgid "15 min"
+msgid "stat_ds_load__longterm"
 msgstr ""
diff --git a/po/en/rrdtool.po b/po/en/rrdtool.po
index 9ac8acdd0..d78014453 100644
--- a/po/en/rrdtool.po
+++ b/po/en/rrdtool.po
@@ -14,260 +14,345 @@ msgstr ""
 
 #. %H: Wireless - Signal Noise Ratio
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:1
-msgid "%H: Wireless - Signal Noise Ratio"
+msgid "stat_dg_title_wireless__signal_noise"
 msgstr "%H: Wireless - Signal Noise Ratio"
 
 #. dBm
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:2
-msgid "dBm"
+msgid "stat_dg_label_wireless__signal_noise"
 msgstr "dBm"
 
 #. Noise Level
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:3
-msgid "Noise Level"
+msgid "stat_ds_signal_noise"
 msgstr "Noise Level"
 
 #. Signal Strength
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:4
-msgid "Signal Strength"
+msgid "stat_ds_signal_power"
 msgstr "Signal Strength"
 
 #. %H: Wireless - Signal Quality
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:5
-msgid "%H: Wireless - Signal Quality"
+msgid "stat_dg_title_wireless__signal_quality"
 msgstr "%H: Wireless - Signal Quality"
 
 #. n
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:6
-msgid "n"
+msgid "stat_dg_label_wireless__signal_quality"
 msgstr "n"
 
 #. Signal Quality
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:7
-msgid "Signal Quality"
+msgid "stat_ds_signal_quality"
 msgstr "Signal Quality"
 
 #. %H: ICMP Roundtrip Times
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:8
-msgid "%H: ICMP Roundtrip Times"
+msgid "stat_dg_title_ping"
 msgstr "%H: ICMP Roundtrip Times"
 
 #. ms
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:9
-msgid "ms"
+msgid "stat_dg_label_ping"
 msgstr "ms"
 
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:10
+msgid "stat_ds_ping"
+msgstr "%di"
+
 #. %H: Firewall - Processed Packets
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:11
-msgid "%H: Firewall - Processed Packets"
+msgid "stat_dg_title_iptables__ipt_packets"
 msgstr "%H: Firewall - Processed Packets"
 
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:12
+msgid "stat_dg_label_iptables__ipt_packets"
+msgstr "Packets/s"
+
 #. Chain \"%di\"
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:13
-msgid "Chain \"%di\""
+msgid "stat_ds_ipt_packets"
 msgstr "Chain \"%di\""
 
 #. %H: Netlink - Transfer on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:14
-msgid "%H: Netlink - Transfer on %pi"
+msgid "stat_dg_title_netlink__if_octets"
 msgstr "%H: Netlink - Transfer on %pi"
 
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:15
+msgid "stat_dg_label_netlink__if_octets"
+msgstr "Bytes/s"
+
 #. Bytes (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:16
-msgid "Bytes (%ds)"
+msgid "stat_ds_if_octets"
 msgstr "Bytes (%ds)"
 
 #. %H: Netlink - Packets on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:17
-msgid "%H: Netlink - Packets on %pi"
+msgid "stat_dg_title_netlink__if_packets"
 msgstr "%H: Netlink - Packets on %pi"
 
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:18
+msgid "stat_dg_label_netlink__if_packets"
+msgstr "Packets/s"
+
 #. Processed (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:19
-msgid "Processed (%ds)"
+msgid "stat_ds_if_packets"
 msgstr "Processed (%ds)"
 
 #. Dropped   (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:20
-msgid "Dropped (%ds)"
+msgid "stat_ds_if_dropped"
 msgstr "Dropped   (%ds)"
 
 #. Errors    (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:21
-msgid "Errors (%ds)"
+msgid "stat_ds_if_errors"
 msgstr "Errors    (%ds)"
 
 #. %H: Netlink - Multicast on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:22
-msgid "%H: Netlink - Multicast on %pi"
+msgid "stat_dg_title_netlink__if_multicast"
 msgstr "%H: Netlink - Multicast on %pi"
 
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:23
+msgid "stat_dg_label_netlink__if_multicast"
+msgstr "Packets/s"
+
 #. Packets
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:24
-msgid "Packets"
+msgid "stat_ds_if_multicast"
 msgstr "Packets"
 
 #. %H: Netlink - Collisions on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:25
-msgid "%H: Netlink - Collisions on %pi"
+msgid "stat_dg_title_netlink__if_collisions"
 msgstr "%H: Netlink - Collisions on %pi"
 
 #. Collisions/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:26
-msgid "Collisions/s"
+msgid "stat_dg_label_netlink__if_collisions"
 msgstr "Collisions/s"
 
 #. Collisions
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:27
-msgid "Collisions"
+msgid "stat_ds_if_collisions"
 msgstr "Collisions"
 
 #. %H: Netlink - Errors on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:28
-msgid "%H: Netlink - Errors on %pi"
+msgid "stat_dg_title_netlink__if_tx_errors"
 msgstr "%H: Netlink - Errors on %pi"
 
 #. Errors/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:29
-msgid "Errors/s"
+msgid "stat_dg_label_netlink__if_tx_errors"
 msgstr "Errors/s"
 
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:30
+msgid "stat_ds_if_tx_errors"
+msgstr "%di"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:31
+msgid "stat_ds_if_rx_errors"
+msgstr "%di"
+
 #. %H: Processes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:32
-msgid "%H: Processes"
+msgid "stat_dg_title_processes"
 msgstr "%H: Processes"
 
 #. Processes/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:33
-msgid "Processes/s"
+msgid "stat_dg_label_processes"
 msgstr "Processes/s"
 
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:34
+msgid "stat_ds_ps_state"
+msgstr "%di"
+
 #. %H: Process %pi - used cpu time
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:35
-msgid "%H: Process %pi - used cpu time"
+msgid "stat_dg_title_processes__ps_cputime"
 msgstr "%H: Process %pi - used cpu time"
 
 #. Jiffies
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:36
-msgid "Jiffies"
+msgid "stat_dg_label_processes__ps_cputime"
 msgstr "Jiffies"
 
 #. system
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:37
-msgid "System"
+msgid "stat_ds_ps_cputime__syst"
 msgstr "system"
 
 #. user
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:38
-msgid "user"
+msgid "stat_ds_ps_cputime__user"
 msgstr "user"
 
 #. %H: Process %pi - threads and processes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:39
-msgid "%H: Process %pi - threads and processes"
+msgid "stat_dg_title_processes__ps_count"
 msgstr "%H: Process %pi - threads and processes"
 
 #. Count
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:40
-msgid "Count"
+msgid "stat_dg_label_processes__ps_count"
 msgstr "Count"
 
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:41
+msgid "stat_ds_ps_count"
+msgstr "%ds"
+
 #. %H: Process %pi - page faults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:42
-msgid "%H: Process %pi - page faults"
+msgid "stat_dg_title_processes__ps_pagefaults"
 msgstr "%H: Process %pi - page faults"
 
 #. Pagefaults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:43
-msgid "Pagefaults"
+msgid "stat_dg_label_processes__ps_pagefaults"
 msgstr "Pagefaults"
 
 #. page faults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:44
-msgid "page faults"
+msgid "stat_ds_ps_pagefaults"
 msgstr "page faults"
 
 #. %H: Process %pi - virtual memory size
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:45
-msgid "%H: Process %pi - virtual memory size"
+msgid "stat_dg_title_processes__ps_rss"
 msgstr "%H: Process %pi - virtual memory size"
 
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:46
+msgid "stat_dg_label_processes__ps_rss"
+msgstr "Bytes"
+
 #. virtual memory
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:47
-msgid "virtual memory"
+msgid "stat_ds_ps_rss"
 msgstr "virtual memory"
 
 #. %H: Usage on Processor #%pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:48
-msgid "%H: Usage on Processor #%pi"
+msgid "stat_dg_title_cpu"
 msgstr "%H: Usage on Processor #%pi"
 
 #. %
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:49
-msgid "%"
+msgid "stat_dg_label_cpu"
 msgstr "%"
 
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:50
+msgid "stat_ds_cpu"
+msgstr "%di"
+
 #. %H: Transfer on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:51
-msgid "%H: Transfer on %di"
+msgid "stat_dg_title_interface__if_octets"
 msgstr "%H: Transfer on %di"
 
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:52
+msgid "stat_dg_label_interface__if_octets"
+msgstr "Bytes/s"
+
 #. %H: Packets on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:53
-msgid "%H: Packets on %di"
+msgid "stat_dg_title_interface__if_packets"
 msgstr "%H: Packets on %di"
 
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:54
+msgid "stat_dg_label_interface__if_packets"
+msgstr "Packets/s"
+
 #. %H: TCP-Connections to Port %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:55
-msgid "%H: TCP-Connections to Port %pi"
+msgid "stat_dg_title_tcpconns"
 msgstr "%H: TCP-Connections to Port %pi"
 
 #. Connections/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:56
-msgid "Connections/s"
+msgid "stat_dg_label_tcpconns"
 msgstr "Connections/s"
 
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:57
+msgid "stat_ds_tcp_connections"
+msgstr "%di"
+
 #. %H: Disk Space Usage on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:58
-msgid "%H: Disk Space Usage on %di"
+msgid "stat_dg_title_df"
 msgstr "%H: Disk Space Usage on %di"
 
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:59
+msgid "stat_dg_label_df"
+msgstr "Bytes"
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:60
+msgid "stat_ds_df__free"
+msgstr "%ds"
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:61
+msgid "stat_ds_df__used"
+msgstr "%ds"
+
 #. %H: Interrupts
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:62
-msgid "%H: Interrupts"
+msgid "stat_dg_title_irq"
 msgstr "%H: Interrupts"
 
 #. Issues/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:63
-msgid "Issues/s"
+msgid "stat_dg_label_irq"
 msgstr "Issues/s"
 
 #. IRQ %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:64
-msgid "IRQ %di"
+msgid "stat_ds_irq"
 msgstr "IRQ %di"
 
 #. %H: System Load
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:65
-msgid "%H: System Load"
+msgid "stat_dg_title_load"
 msgstr "%H: System Load"
 
 #. Load
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:66
-msgid "Load"
+msgid "stat_dg_label_load"
 msgstr "Load"
 
 #. 1 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:67
-msgid "1 min"
+msgid "stat_ds_load__shortterm"
 msgstr "1 min"
 
 #. 5 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:68
-msgid "5 min"
+msgid "stat_ds_load__midterm"
 msgstr "5 min"
 
 #. 15 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:69
-msgid "15 min"
+msgid "stat_ds_load__longterm"
 msgstr "15 min"
diff --git a/po/es/rrdtool.po b/po/es/rrdtool.po
index a4cbee1e9..d0444ceb5 100644
--- a/po/es/rrdtool.po
+++ b/po/es/rrdtool.po
@@ -14,260 +14,345 @@ msgstr ""
 
 #. %H: Wireless - Signal Noise Ratio
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:1
-msgid "%H: Wireless - Signal Noise Ratio"
+msgid "stat_dg_title_wireless__signal_noise"
 msgstr ""
 
 #. dBm
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:2
-msgid "dBm"
+msgid "stat_dg_label_wireless__signal_noise"
 msgstr ""
 
 #. Noise Level
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:3
-msgid "Noise Level"
+msgid "stat_ds_signal_noise"
 msgstr ""
 
 #. Signal Strength
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:4
-msgid "Signal Strength"
+msgid "stat_ds_signal_power"
 msgstr ""
 
 #. %H: Wireless - Signal Quality
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:5
-msgid "%H: Wireless - Signal Quality"
+msgid "stat_dg_title_wireless__signal_quality"
 msgstr ""
 
 #. n
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:6
-msgid "n"
+msgid "stat_dg_label_wireless__signal_quality"
 msgstr ""
 
 #. Signal Quality
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:7
-msgid "Signal Quality"
+msgid "stat_ds_signal_quality"
 msgstr ""
 
 #. %H: ICMP Roundtrip Times
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:8
-msgid "%H: ICMP Roundtrip Times"
+msgid "stat_dg_title_ping"
 msgstr ""
 
 #. ms
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:9
-msgid "ms"
+msgid "stat_dg_label_ping"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:10
+msgid "stat_ds_ping"
 msgstr ""
 
 #. %H: Firewall - Processed Packets
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:11
-msgid "%H: Firewall - Processed Packets"
+msgid "stat_dg_title_iptables__ipt_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:12
+msgid "stat_dg_label_iptables__ipt_packets"
 msgstr ""
 
 #. Chain \"%di\"
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:13
-msgid "Chain \"%di\""
+msgid "stat_ds_ipt_packets"
 msgstr ""
 
 #. %H: Netlink - Transfer on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:14
-msgid "%H: Netlink - Transfer on %pi"
+msgid "stat_dg_title_netlink__if_octets"
+msgstr ""
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:15
+msgid "stat_dg_label_netlink__if_octets"
 msgstr ""
 
 #. Bytes (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:16
-msgid "Bytes (%ds)"
+msgid "stat_ds_if_octets"
 msgstr ""
 
 #. %H: Netlink - Packets on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:17
-msgid "%H: Netlink - Packets on %pi"
+msgid "stat_dg_title_netlink__if_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:18
+msgid "stat_dg_label_netlink__if_packets"
 msgstr ""
 
 #. Processed (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:19
-msgid "Processed (%ds)"
+msgid "stat_ds_if_packets"
 msgstr ""
 
 #. Dropped   (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:20
-msgid "Dropped (%ds)"
+msgid "stat_ds_if_dropped"
 msgstr ""
 
 #. Errors    (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:21
-msgid "Errors (%ds)"
+msgid "stat_ds_if_errors"
 msgstr ""
 
 #. %H: Netlink - Multicast on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:22
-msgid "%H: Netlink - Multicast on %pi"
+msgid "stat_dg_title_netlink__if_multicast"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:23
+msgid "stat_dg_label_netlink__if_multicast"
 msgstr ""
 
 #. Packets
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:24
-msgid "Packets"
+msgid "stat_ds_if_multicast"
 msgstr ""
 
 #. %H: Netlink - Collisions on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:25
-msgid "%H: Netlink - Collisions on %pi"
+msgid "stat_dg_title_netlink__if_collisions"
 msgstr ""
 
 #. Collisions/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:26
-msgid "Collisions/s"
+msgid "stat_dg_label_netlink__if_collisions"
 msgstr ""
 
 #. Collisions
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:27
-msgid "Collisions"
+msgid "stat_ds_if_collisions"
 msgstr ""
 
 #. %H: Netlink - Errors on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:28
-msgid "%H: Netlink - Errors on %pi"
+msgid "stat_dg_title_netlink__if_tx_errors"
 msgstr ""
 
 #. Errors/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:29
-msgid "Errors/s"
+msgid "stat_dg_label_netlink__if_tx_errors"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:30
+msgid "stat_ds_if_tx_errors"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:31
+msgid "stat_ds_if_rx_errors"
 msgstr ""
 
 #. %H: Processes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:32
-msgid "%H: Processes"
+msgid "stat_dg_title_processes"
 msgstr ""
 
 #. Processes/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:33
-msgid "Processes/s"
+msgid "stat_dg_label_processes"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:34
+msgid "stat_ds_ps_state"
 msgstr ""
 
 #. %H: Process %pi - used cpu time
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:35
-msgid "%H: Process %pi - used cpu time"
+msgid "stat_dg_title_processes__ps_cputime"
 msgstr ""
 
 #. Jiffies
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:36
-msgid "Jiffies"
+msgid "stat_dg_label_processes__ps_cputime"
 msgstr ""
 
 #. system
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:37
-msgid "System"
+msgid "stat_ds_ps_cputime__syst"
 msgstr ""
 
 #. user
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:38
-msgid "user"
+msgid "stat_ds_ps_cputime__user"
 msgstr ""
 
 #. %H: Process %pi - threads and processes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:39
-msgid "%H: Process %pi - threads and processes"
+msgid "stat_dg_title_processes__ps_count"
 msgstr ""
 
 #. Count
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:40
-msgid "Count"
+msgid "stat_dg_label_processes__ps_count"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:41
+msgid "stat_ds_ps_count"
 msgstr ""
 
 #. %H: Process %pi - page faults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:42
-msgid "%H: Process %pi - page faults"
+msgid "stat_dg_title_processes__ps_pagefaults"
 msgstr ""
 
 #. Pagefaults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:43
-msgid "Pagefaults"
+msgid "stat_dg_label_processes__ps_pagefaults"
 msgstr ""
 
 #. page faults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:44
-msgid "page faults"
+msgid "stat_ds_ps_pagefaults"
 msgstr ""
 
 #. %H: Process %pi - virtual memory size
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:45
-msgid "%H: Process %pi - virtual memory size"
+msgid "stat_dg_title_processes__ps_rss"
+msgstr ""
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:46
+msgid "stat_dg_label_processes__ps_rss"
 msgstr ""
 
 #. virtual memory
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:47
-msgid "virtual memory"
+msgid "stat_ds_ps_rss"
 msgstr ""
 
 #. %H: Usage on Processor #%pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:48
-msgid "%H: Usage on Processor #%pi"
+msgid "stat_dg_title_cpu"
 msgstr ""
 
 #. %
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:49
-msgid "%"
+msgid "stat_dg_label_cpu"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:50
+msgid "stat_ds_cpu"
 msgstr ""
 
 #. %H: Transfer on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:51
-msgid "%H: Transfer on %di"
+msgid "stat_dg_title_interface__if_octets"
+msgstr ""
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:52
+msgid "stat_dg_label_interface__if_octets"
 msgstr ""
 
 #. %H: Packets on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:53
-msgid "%H: Packets on %di"
+msgid "stat_dg_title_interface__if_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:54
+msgid "stat_dg_label_interface__if_packets"
 msgstr ""
 
 #. %H: TCP-Connections to Port %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:55
-msgid "%H: TCP-Connections to Port %pi"
+msgid "stat_dg_title_tcpconns"
 msgstr ""
 
 #. Connections/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:56
-msgid "Connections/s"
+msgid "stat_dg_label_tcpconns"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:57
+msgid "stat_ds_tcp_connections"
 msgstr ""
 
 #. %H: Disk Space Usage on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:58
-msgid "%H: Disk Space Usage on %di"
+msgid "stat_dg_title_df"
+msgstr ""
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:59
+msgid "stat_dg_label_df"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:60
+msgid "stat_ds_df__free"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:61
+msgid "stat_ds_df__used"
 msgstr ""
 
 #. %H: Interrupts
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:62
-msgid "%H: Interrupts"
+msgid "stat_dg_title_irq"
 msgstr ""
 
 #. Issues/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:63
-msgid "Issues/s"
+msgid "stat_dg_label_irq"
 msgstr ""
 
 #. IRQ %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:64
-msgid "IRQ %di"
+msgid "stat_ds_irq"
 msgstr ""
 
 #. %H: System Load
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:65
-msgid "%H: System Load"
+msgid "stat_dg_title_load"
 msgstr ""
 
 #. Load
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:66
-msgid "Load"
+msgid "stat_dg_label_load"
 msgstr ""
 
 #. 1 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:67
-msgid "1 min"
+msgid "stat_ds_load__shortterm"
 msgstr ""
 
 #. 5 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:68
-msgid "5 min"
+msgid "stat_ds_load__midterm"
 msgstr ""
 
 #. 15 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:69
-msgid "15 min"
+msgid "stat_ds_load__longterm"
 msgstr ""
diff --git a/po/fr/rrdtool.po b/po/fr/rrdtool.po
index a126371ed..95545db6d 100644
--- a/po/fr/rrdtool.po
+++ b/po/fr/rrdtool.po
@@ -14,260 +14,345 @@ msgstr ""
 
 #. %H: Wireless - Signal Noise Ratio
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:1
-msgid "%H: Wireless - Signal Noise Ratio"
+msgid "stat_dg_title_wireless__signal_noise"
 msgstr ""
 
 #. dBm
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:2
-msgid "dBm"
+msgid "stat_dg_label_wireless__signal_noise"
 msgstr ""
 
 #. Noise Level
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:3
-msgid "Noise Level"
+msgid "stat_ds_signal_noise"
 msgstr ""
 
 #. Signal Strength
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:4
-msgid "Signal Strength"
+msgid "stat_ds_signal_power"
 msgstr ""
 
 #. %H: Wireless - Signal Quality
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:5
-msgid "%H: Wireless - Signal Quality"
+msgid "stat_dg_title_wireless__signal_quality"
 msgstr ""
 
 #. n
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:6
-msgid "n"
+msgid "stat_dg_label_wireless__signal_quality"
 msgstr ""
 
 #. Signal Quality
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:7
-msgid "Signal Quality"
+msgid "stat_ds_signal_quality"
 msgstr ""
 
 #. %H: ICMP Roundtrip Times
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:8
-msgid "%H: ICMP Roundtrip Times"
+msgid "stat_dg_title_ping"
 msgstr ""
 
 #. ms
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:9
-msgid "ms"
+msgid "stat_dg_label_ping"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:10
+msgid "stat_ds_ping"
 msgstr ""
 
 #. %H: Firewall - Processed Packets
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:11
-msgid "%H: Firewall - Processed Packets"
+msgid "stat_dg_title_iptables__ipt_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:12
+msgid "stat_dg_label_iptables__ipt_packets"
 msgstr ""
 
 #. Chain \"%di\"
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:13
-msgid "Chain \"%di\""
+msgid "stat_ds_ipt_packets"
 msgstr ""
 
 #. %H: Netlink - Transfer on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:14
-msgid "%H: Netlink - Transfer on %pi"
+msgid "stat_dg_title_netlink__if_octets"
+msgstr ""
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:15
+msgid "stat_dg_label_netlink__if_octets"
 msgstr ""
 
 #. Bytes (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:16
-msgid "Bytes (%ds)"
+msgid "stat_ds_if_octets"
 msgstr ""
 
 #. %H: Netlink - Packets on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:17
-msgid "%H: Netlink - Packets on %pi"
+msgid "stat_dg_title_netlink__if_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:18
+msgid "stat_dg_label_netlink__if_packets"
 msgstr ""
 
 #. Processed (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:19
-msgid "Processed (%ds)"
+msgid "stat_ds_if_packets"
 msgstr ""
 
 #. Dropped   (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:20
-msgid "Dropped (%ds)"
+msgid "stat_ds_if_dropped"
 msgstr ""
 
 #. Errors    (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:21
-msgid "Errors (%ds)"
+msgid "stat_ds_if_errors"
 msgstr ""
 
 #. %H: Netlink - Multicast on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:22
-msgid "%H: Netlink - Multicast on %pi"
+msgid "stat_dg_title_netlink__if_multicast"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:23
+msgid "stat_dg_label_netlink__if_multicast"
 msgstr ""
 
 #. Packets
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:24
-msgid "Packets"
+msgid "stat_ds_if_multicast"
 msgstr ""
 
 #. %H: Netlink - Collisions on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:25
-msgid "%H: Netlink - Collisions on %pi"
+msgid "stat_dg_title_netlink__if_collisions"
 msgstr ""
 
 #. Collisions/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:26
-msgid "Collisions/s"
+msgid "stat_dg_label_netlink__if_collisions"
 msgstr ""
 
 #. Collisions
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:27
-msgid "Collisions"
+msgid "stat_ds_if_collisions"
 msgstr ""
 
 #. %H: Netlink - Errors on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:28
-msgid "%H: Netlink - Errors on %pi"
+msgid "stat_dg_title_netlink__if_tx_errors"
 msgstr ""
 
 #. Errors/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:29
-msgid "Errors/s"
+msgid "stat_dg_label_netlink__if_tx_errors"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:30
+msgid "stat_ds_if_tx_errors"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:31
+msgid "stat_ds_if_rx_errors"
 msgstr ""
 
 #. %H: Processes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:32
-msgid "%H: Processes"
+msgid "stat_dg_title_processes"
 msgstr ""
 
 #. Processes/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:33
-msgid "Processes/s"
+msgid "stat_dg_label_processes"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:34
+msgid "stat_ds_ps_state"
 msgstr ""
 
 #. %H: Process %pi - used cpu time
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:35
-msgid "%H: Process %pi - used cpu time"
+msgid "stat_dg_title_processes__ps_cputime"
 msgstr ""
 
 #. Jiffies
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:36
-msgid "Jiffies"
+msgid "stat_dg_label_processes__ps_cputime"
 msgstr ""
 
 #. system
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:37
-msgid "System"
+msgid "stat_ds_ps_cputime__syst"
 msgstr ""
 
 #. user
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:38
-msgid "user"
+msgid "stat_ds_ps_cputime__user"
 msgstr ""
 
 #. %H: Process %pi - threads and processes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:39
-msgid "%H: Process %pi - threads and processes"
+msgid "stat_dg_title_processes__ps_count"
 msgstr ""
 
 #. Count
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:40
-msgid "Count"
+msgid "stat_dg_label_processes__ps_count"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:41
+msgid "stat_ds_ps_count"
 msgstr ""
 
 #. %H: Process %pi - page faults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:42
-msgid "%H: Process %pi - page faults"
+msgid "stat_dg_title_processes__ps_pagefaults"
 msgstr ""
 
 #. Pagefaults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:43
-msgid "Pagefaults"
+msgid "stat_dg_label_processes__ps_pagefaults"
 msgstr ""
 
 #. page faults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:44
-msgid "page faults"
+msgid "stat_ds_ps_pagefaults"
 msgstr ""
 
 #. %H: Process %pi - virtual memory size
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:45
-msgid "%H: Process %pi - virtual memory size"
+msgid "stat_dg_title_processes__ps_rss"
+msgstr ""
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:46
+msgid "stat_dg_label_processes__ps_rss"
 msgstr ""
 
 #. virtual memory
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:47
-msgid "virtual memory"
+msgid "stat_ds_ps_rss"
 msgstr ""
 
 #. %H: Usage on Processor #%pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:48
-msgid "%H: Usage on Processor #%pi"
+msgid "stat_dg_title_cpu"
 msgstr ""
 
 #. %
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:49
-msgid "%"
+msgid "stat_dg_label_cpu"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:50
+msgid "stat_ds_cpu"
 msgstr ""
 
 #. %H: Transfer on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:51
-msgid "%H: Transfer on %di"
+msgid "stat_dg_title_interface__if_octets"
+msgstr ""
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:52
+msgid "stat_dg_label_interface__if_octets"
 msgstr ""
 
 #. %H: Packets on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:53
-msgid "%H: Packets on %di"
+msgid "stat_dg_title_interface__if_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:54
+msgid "stat_dg_label_interface__if_packets"
 msgstr ""
 
 #. %H: TCP-Connections to Port %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:55
-msgid "%H: TCP-Connections to Port %pi"
+msgid "stat_dg_title_tcpconns"
 msgstr ""
 
 #. Connections/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:56
-msgid "Connections/s"
+msgid "stat_dg_label_tcpconns"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:57
+msgid "stat_ds_tcp_connections"
 msgstr ""
 
 #. %H: Disk Space Usage on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:58
-msgid "%H: Disk Space Usage on %di"
+msgid "stat_dg_title_df"
+msgstr ""
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:59
+msgid "stat_dg_label_df"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:60
+msgid "stat_ds_df__free"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:61
+msgid "stat_ds_df__used"
 msgstr ""
 
 #. %H: Interrupts
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:62
-msgid "%H: Interrupts"
+msgid "stat_dg_title_irq"
 msgstr ""
 
 #. Issues/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:63
-msgid "Issues/s"
+msgid "stat_dg_label_irq"
 msgstr ""
 
 #. IRQ %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:64
-msgid "IRQ %di"
+msgid "stat_ds_irq"
 msgstr ""
 
 #. %H: System Load
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:65
-msgid "%H: System Load"
+msgid "stat_dg_title_load"
 msgstr ""
 
 #. Load
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:66
-msgid "Load"
+msgid "stat_dg_label_load"
 msgstr ""
 
 #. 1 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:67
-msgid "1 min"
+msgid "stat_ds_load__shortterm"
 msgstr ""
 
 #. 5 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:68
-msgid "5 min"
+msgid "stat_ds_load__midterm"
 msgstr ""
 
 #. 15 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:69
-msgid "15 min"
+msgid "stat_ds_load__longterm"
 msgstr ""
diff --git a/po/it/rrdtool.po b/po/it/rrdtool.po
index a126371ed..95545db6d 100644
--- a/po/it/rrdtool.po
+++ b/po/it/rrdtool.po
@@ -14,260 +14,345 @@ msgstr ""
 
 #. %H: Wireless - Signal Noise Ratio
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:1
-msgid "%H: Wireless - Signal Noise Ratio"
+msgid "stat_dg_title_wireless__signal_noise"
 msgstr ""
 
 #. dBm
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:2
-msgid "dBm"
+msgid "stat_dg_label_wireless__signal_noise"
 msgstr ""
 
 #. Noise Level
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:3
-msgid "Noise Level"
+msgid "stat_ds_signal_noise"
 msgstr ""
 
 #. Signal Strength
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:4
-msgid "Signal Strength"
+msgid "stat_ds_signal_power"
 msgstr ""
 
 #. %H: Wireless - Signal Quality
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:5
-msgid "%H: Wireless - Signal Quality"
+msgid "stat_dg_title_wireless__signal_quality"
 msgstr ""
 
 #. n
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:6
-msgid "n"
+msgid "stat_dg_label_wireless__signal_quality"
 msgstr ""
 
 #. Signal Quality
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:7
-msgid "Signal Quality"
+msgid "stat_ds_signal_quality"
 msgstr ""
 
 #. %H: ICMP Roundtrip Times
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:8
-msgid "%H: ICMP Roundtrip Times"
+msgid "stat_dg_title_ping"
 msgstr ""
 
 #. ms
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:9
-msgid "ms"
+msgid "stat_dg_label_ping"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:10
+msgid "stat_ds_ping"
 msgstr ""
 
 #. %H: Firewall - Processed Packets
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:11
-msgid "%H: Firewall - Processed Packets"
+msgid "stat_dg_title_iptables__ipt_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:12
+msgid "stat_dg_label_iptables__ipt_packets"
 msgstr ""
 
 #. Chain \"%di\"
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:13
-msgid "Chain \"%di\""
+msgid "stat_ds_ipt_packets"
 msgstr ""
 
 #. %H: Netlink - Transfer on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:14
-msgid "%H: Netlink - Transfer on %pi"
+msgid "stat_dg_title_netlink__if_octets"
+msgstr ""
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:15
+msgid "stat_dg_label_netlink__if_octets"
 msgstr ""
 
 #. Bytes (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:16
-msgid "Bytes (%ds)"
+msgid "stat_ds_if_octets"
 msgstr ""
 
 #. %H: Netlink - Packets on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:17
-msgid "%H: Netlink - Packets on %pi"
+msgid "stat_dg_title_netlink__if_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:18
+msgid "stat_dg_label_netlink__if_packets"
 msgstr ""
 
 #. Processed (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:19
-msgid "Processed (%ds)"
+msgid "stat_ds_if_packets"
 msgstr ""
 
 #. Dropped   (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:20
-msgid "Dropped (%ds)"
+msgid "stat_ds_if_dropped"
 msgstr ""
 
 #. Errors    (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:21
-msgid "Errors (%ds)"
+msgid "stat_ds_if_errors"
 msgstr ""
 
 #. %H: Netlink - Multicast on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:22
-msgid "%H: Netlink - Multicast on %pi"
+msgid "stat_dg_title_netlink__if_multicast"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:23
+msgid "stat_dg_label_netlink__if_multicast"
 msgstr ""
 
 #. Packets
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:24
-msgid "Packets"
+msgid "stat_ds_if_multicast"
 msgstr ""
 
 #. %H: Netlink - Collisions on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:25
-msgid "%H: Netlink - Collisions on %pi"
+msgid "stat_dg_title_netlink__if_collisions"
 msgstr ""
 
 #. Collisions/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:26
-msgid "Collisions/s"
+msgid "stat_dg_label_netlink__if_collisions"
 msgstr ""
 
 #. Collisions
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:27
-msgid "Collisions"
+msgid "stat_ds_if_collisions"
 msgstr ""
 
 #. %H: Netlink - Errors on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:28
-msgid "%H: Netlink - Errors on %pi"
+msgid "stat_dg_title_netlink__if_tx_errors"
 msgstr ""
 
 #. Errors/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:29
-msgid "Errors/s"
+msgid "stat_dg_label_netlink__if_tx_errors"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:30
+msgid "stat_ds_if_tx_errors"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:31
+msgid "stat_ds_if_rx_errors"
 msgstr ""
 
 #. %H: Processes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:32
-msgid "%H: Processes"
+msgid "stat_dg_title_processes"
 msgstr ""
 
 #. Processes/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:33
-msgid "Processes/s"
+msgid "stat_dg_label_processes"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:34
+msgid "stat_ds_ps_state"
 msgstr ""
 
 #. %H: Process %pi - used cpu time
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:35
-msgid "%H: Process %pi - used cpu time"
+msgid "stat_dg_title_processes__ps_cputime"
 msgstr ""
 
 #. Jiffies
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:36
-msgid "Jiffies"
+msgid "stat_dg_label_processes__ps_cputime"
 msgstr ""
 
 #. system
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:37
-msgid "System"
+msgid "stat_ds_ps_cputime__syst"
 msgstr ""
 
 #. user
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:38
-msgid "user"
+msgid "stat_ds_ps_cputime__user"
 msgstr ""
 
 #. %H: Process %pi - threads and processes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:39
-msgid "%H: Process %pi - threads and processes"
+msgid "stat_dg_title_processes__ps_count"
 msgstr ""
 
 #. Count
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:40
-msgid "Count"
+msgid "stat_dg_label_processes__ps_count"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:41
+msgid "stat_ds_ps_count"
 msgstr ""
 
 #. %H: Process %pi - page faults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:42
-msgid "%H: Process %pi - page faults"
+msgid "stat_dg_title_processes__ps_pagefaults"
 msgstr ""
 
 #. Pagefaults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:43
-msgid "Pagefaults"
+msgid "stat_dg_label_processes__ps_pagefaults"
 msgstr ""
 
 #. page faults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:44
-msgid "page faults"
+msgid "stat_ds_ps_pagefaults"
 msgstr ""
 
 #. %H: Process %pi - virtual memory size
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:45
-msgid "%H: Process %pi - virtual memory size"
+msgid "stat_dg_title_processes__ps_rss"
+msgstr ""
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:46
+msgid "stat_dg_label_processes__ps_rss"
 msgstr ""
 
 #. virtual memory
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:47
-msgid "virtual memory"
+msgid "stat_ds_ps_rss"
 msgstr ""
 
 #. %H: Usage on Processor #%pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:48
-msgid "%H: Usage on Processor #%pi"
+msgid "stat_dg_title_cpu"
 msgstr ""
 
 #. %
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:49
-msgid "%"
+msgid "stat_dg_label_cpu"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:50
+msgid "stat_ds_cpu"
 msgstr ""
 
 #. %H: Transfer on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:51
-msgid "%H: Transfer on %di"
+msgid "stat_dg_title_interface__if_octets"
+msgstr ""
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:52
+msgid "stat_dg_label_interface__if_octets"
 msgstr ""
 
 #. %H: Packets on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:53
-msgid "%H: Packets on %di"
+msgid "stat_dg_title_interface__if_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:54
+msgid "stat_dg_label_interface__if_packets"
 msgstr ""
 
 #. %H: TCP-Connections to Port %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:55
-msgid "%H: TCP-Connections to Port %pi"
+msgid "stat_dg_title_tcpconns"
 msgstr ""
 
 #. Connections/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:56
-msgid "Connections/s"
+msgid "stat_dg_label_tcpconns"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:57
+msgid "stat_ds_tcp_connections"
 msgstr ""
 
 #. %H: Disk Space Usage on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:58
-msgid "%H: Disk Space Usage on %di"
+msgid "stat_dg_title_df"
+msgstr ""
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:59
+msgid "stat_dg_label_df"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:60
+msgid "stat_ds_df__free"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:61
+msgid "stat_ds_df__used"
 msgstr ""
 
 #. %H: Interrupts
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:62
-msgid "%H: Interrupts"
+msgid "stat_dg_title_irq"
 msgstr ""
 
 #. Issues/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:63
-msgid "Issues/s"
+msgid "stat_dg_label_irq"
 msgstr ""
 
 #. IRQ %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:64
-msgid "IRQ %di"
+msgid "stat_ds_irq"
 msgstr ""
 
 #. %H: System Load
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:65
-msgid "%H: System Load"
+msgid "stat_dg_title_load"
 msgstr ""
 
 #. Load
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:66
-msgid "Load"
+msgid "stat_dg_label_load"
 msgstr ""
 
 #. 1 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:67
-msgid "1 min"
+msgid "stat_ds_load__shortterm"
 msgstr ""
 
 #. 5 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:68
-msgid "5 min"
+msgid "stat_ds_load__midterm"
 msgstr ""
 
 #. 15 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:69
-msgid "15 min"
+msgid "stat_ds_load__longterm"
 msgstr ""
diff --git a/po/ja/rrdtool.po b/po/ja/rrdtool.po
index a126371ed..95545db6d 100644
--- a/po/ja/rrdtool.po
+++ b/po/ja/rrdtool.po
@@ -14,260 +14,345 @@ msgstr ""
 
 #. %H: Wireless - Signal Noise Ratio
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:1
-msgid "%H: Wireless - Signal Noise Ratio"
+msgid "stat_dg_title_wireless__signal_noise"
 msgstr ""
 
 #. dBm
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:2
-msgid "dBm"
+msgid "stat_dg_label_wireless__signal_noise"
 msgstr ""
 
 #. Noise Level
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:3
-msgid "Noise Level"
+msgid "stat_ds_signal_noise"
 msgstr ""
 
 #. Signal Strength
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:4
-msgid "Signal Strength"
+msgid "stat_ds_signal_power"
 msgstr ""
 
 #. %H: Wireless - Signal Quality
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:5
-msgid "%H: Wireless - Signal Quality"
+msgid "stat_dg_title_wireless__signal_quality"
 msgstr ""
 
 #. n
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:6
-msgid "n"
+msgid "stat_dg_label_wireless__signal_quality"
 msgstr ""
 
 #. Signal Quality
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:7
-msgid "Signal Quality"
+msgid "stat_ds_signal_quality"
 msgstr ""
 
 #. %H: ICMP Roundtrip Times
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:8
-msgid "%H: ICMP Roundtrip Times"
+msgid "stat_dg_title_ping"
 msgstr ""
 
 #. ms
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:9
-msgid "ms"
+msgid "stat_dg_label_ping"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:10
+msgid "stat_ds_ping"
 msgstr ""
 
 #. %H: Firewall - Processed Packets
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:11
-msgid "%H: Firewall - Processed Packets"
+msgid "stat_dg_title_iptables__ipt_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:12
+msgid "stat_dg_label_iptables__ipt_packets"
 msgstr ""
 
 #. Chain \"%di\"
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:13
-msgid "Chain \"%di\""
+msgid "stat_ds_ipt_packets"
 msgstr ""
 
 #. %H: Netlink - Transfer on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:14
-msgid "%H: Netlink - Transfer on %pi"
+msgid "stat_dg_title_netlink__if_octets"
+msgstr ""
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:15
+msgid "stat_dg_label_netlink__if_octets"
 msgstr ""
 
 #. Bytes (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:16
-msgid "Bytes (%ds)"
+msgid "stat_ds_if_octets"
 msgstr ""
 
 #. %H: Netlink - Packets on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:17
-msgid "%H: Netlink - Packets on %pi"
+msgid "stat_dg_title_netlink__if_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:18
+msgid "stat_dg_label_netlink__if_packets"
 msgstr ""
 
 #. Processed (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:19
-msgid "Processed (%ds)"
+msgid "stat_ds_if_packets"
 msgstr ""
 
 #. Dropped   (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:20
-msgid "Dropped (%ds)"
+msgid "stat_ds_if_dropped"
 msgstr ""
 
 #. Errors    (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:21
-msgid "Errors (%ds)"
+msgid "stat_ds_if_errors"
 msgstr ""
 
 #. %H: Netlink - Multicast on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:22
-msgid "%H: Netlink - Multicast on %pi"
+msgid "stat_dg_title_netlink__if_multicast"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:23
+msgid "stat_dg_label_netlink__if_multicast"
 msgstr ""
 
 #. Packets
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:24
-msgid "Packets"
+msgid "stat_ds_if_multicast"
 msgstr ""
 
 #. %H: Netlink - Collisions on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:25
-msgid "%H: Netlink - Collisions on %pi"
+msgid "stat_dg_title_netlink__if_collisions"
 msgstr ""
 
 #. Collisions/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:26
-msgid "Collisions/s"
+msgid "stat_dg_label_netlink__if_collisions"
 msgstr ""
 
 #. Collisions
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:27
-msgid "Collisions"
+msgid "stat_ds_if_collisions"
 msgstr ""
 
 #. %H: Netlink - Errors on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:28
-msgid "%H: Netlink - Errors on %pi"
+msgid "stat_dg_title_netlink__if_tx_errors"
 msgstr ""
 
 #. Errors/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:29
-msgid "Errors/s"
+msgid "stat_dg_label_netlink__if_tx_errors"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:30
+msgid "stat_ds_if_tx_errors"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:31
+msgid "stat_ds_if_rx_errors"
 msgstr ""
 
 #. %H: Processes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:32
-msgid "%H: Processes"
+msgid "stat_dg_title_processes"
 msgstr ""
 
 #. Processes/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:33
-msgid "Processes/s"
+msgid "stat_dg_label_processes"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:34
+msgid "stat_ds_ps_state"
 msgstr ""
 
 #. %H: Process %pi - used cpu time
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:35
-msgid "%H: Process %pi - used cpu time"
+msgid "stat_dg_title_processes__ps_cputime"
 msgstr ""
 
 #. Jiffies
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:36
-msgid "Jiffies"
+msgid "stat_dg_label_processes__ps_cputime"
 msgstr ""
 
 #. system
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:37
-msgid "System"
+msgid "stat_ds_ps_cputime__syst"
 msgstr ""
 
 #. user
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:38
-msgid "user"
+msgid "stat_ds_ps_cputime__user"
 msgstr ""
 
 #. %H: Process %pi - threads and processes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:39
-msgid "%H: Process %pi - threads and processes"
+msgid "stat_dg_title_processes__ps_count"
 msgstr ""
 
 #. Count
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:40
-msgid "Count"
+msgid "stat_dg_label_processes__ps_count"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:41
+msgid "stat_ds_ps_count"
 msgstr ""
 
 #. %H: Process %pi - page faults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:42
-msgid "%H: Process %pi - page faults"
+msgid "stat_dg_title_processes__ps_pagefaults"
 msgstr ""
 
 #. Pagefaults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:43
-msgid "Pagefaults"
+msgid "stat_dg_label_processes__ps_pagefaults"
 msgstr ""
 
 #. page faults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:44
-msgid "page faults"
+msgid "stat_ds_ps_pagefaults"
 msgstr ""
 
 #. %H: Process %pi - virtual memory size
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:45
-msgid "%H: Process %pi - virtual memory size"
+msgid "stat_dg_title_processes__ps_rss"
+msgstr ""
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:46
+msgid "stat_dg_label_processes__ps_rss"
 msgstr ""
 
 #. virtual memory
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:47
-msgid "virtual memory"
+msgid "stat_ds_ps_rss"
 msgstr ""
 
 #. %H: Usage on Processor #%pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:48
-msgid "%H: Usage on Processor #%pi"
+msgid "stat_dg_title_cpu"
 msgstr ""
 
 #. %
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:49
-msgid "%"
+msgid "stat_dg_label_cpu"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:50
+msgid "stat_ds_cpu"
 msgstr ""
 
 #. %H: Transfer on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:51
-msgid "%H: Transfer on %di"
+msgid "stat_dg_title_interface__if_octets"
+msgstr ""
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:52
+msgid "stat_dg_label_interface__if_octets"
 msgstr ""
 
 #. %H: Packets on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:53
-msgid "%H: Packets on %di"
+msgid "stat_dg_title_interface__if_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:54
+msgid "stat_dg_label_interface__if_packets"
 msgstr ""
 
 #. %H: TCP-Connections to Port %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:55
-msgid "%H: TCP-Connections to Port %pi"
+msgid "stat_dg_title_tcpconns"
 msgstr ""
 
 #. Connections/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:56
-msgid "Connections/s"
+msgid "stat_dg_label_tcpconns"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:57
+msgid "stat_ds_tcp_connections"
 msgstr ""
 
 #. %H: Disk Space Usage on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:58
-msgid "%H: Disk Space Usage on %di"
+msgid "stat_dg_title_df"
+msgstr ""
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:59
+msgid "stat_dg_label_df"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:60
+msgid "stat_ds_df__free"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:61
+msgid "stat_ds_df__used"
 msgstr ""
 
 #. %H: Interrupts
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:62
-msgid "%H: Interrupts"
+msgid "stat_dg_title_irq"
 msgstr ""
 
 #. Issues/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:63
-msgid "Issues/s"
+msgid "stat_dg_label_irq"
 msgstr ""
 
 #. IRQ %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:64
-msgid "IRQ %di"
+msgid "stat_ds_irq"
 msgstr ""
 
 #. %H: System Load
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:65
-msgid "%H: System Load"
+msgid "stat_dg_title_load"
 msgstr ""
 
 #. Load
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:66
-msgid "Load"
+msgid "stat_dg_label_load"
 msgstr ""
 
 #. 1 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:67
-msgid "1 min"
+msgid "stat_ds_load__shortterm"
 msgstr ""
 
 #. 5 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:68
-msgid "5 min"
+msgid "stat_ds_load__midterm"
 msgstr ""
 
 #. 15 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:69
-msgid "15 min"
+msgid "stat_ds_load__longterm"
 msgstr ""
diff --git a/po/pt/rrdtool.po b/po/pt/rrdtool.po
index 0aa2c736f..420676788 100644
--- a/po/pt/rrdtool.po
+++ b/po/pt/rrdtool.po
@@ -13,260 +13,345 @@ msgstr ""
 
 #. %H: Wireless - Signal Noise Ratio
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:1
-msgid "%H: Wireless - Signal Noise Ratio"
+msgid "stat_dg_title_wireless__signal_noise"
 msgstr "%H: Wireless - Relação Sinal/Ruido"
 
 #. dBm
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:2
-msgid "dBm"
+msgid "stat_dg_label_wireless__signal_noise"
 msgstr "dBm"
 
 #. Noise Level
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:3
-msgid "Noise Level"
+msgid "stat_ds_signal_noise"
 msgstr "Nivel de Ruido"
 
 #. Signal Strength
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:4
-msgid "Signal Strength"
+msgid "stat_ds_signal_power"
 msgstr "Forca do Sinal"
 
 #. %H: Wireless - Signal Quality
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:5
-msgid "%H: Wireless - Signal Quality"
+msgid "stat_dg_title_wireless__signal_quality"
 msgstr "%H: Wireless - Qualidade do Sinal"
 
 #. n
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:6
-msgid "n"
+msgid "stat_dg_label_wireless__signal_quality"
 msgstr "n"
 
 #. Signal Quality
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:7
-msgid "Signal Quality"
+msgid "stat_ds_signal_quality"
 msgstr "Qualidade do Sinal"
 
 #. %H: ICMP Roundtrip Times
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:8
-msgid "%H: ICMP Roundtrip Times"
+msgid "stat_dg_title_ping"
 msgstr "%H: Tempo de resposta ICMP"
 
 #. ms
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:9
-msgid "ms"
+msgid "stat_dg_label_ping"
 msgstr "ms"
 
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:10
+msgid "stat_ds_ping"
+msgstr "%di"
+
 #. %H: Firewall - Processed Packets
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:11
-msgid "%H: Firewall - Processed Packets"
+msgid "stat_dg_title_iptables__ipt_packets"
 msgstr "%H: Firewall - Pacotes Processados"
 
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:12
+msgid "stat_dg_label_iptables__ipt_packets"
+msgstr "Pacote/s"
+
 #. Chain \"%di\"
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:13
-msgid "Chain \"%di\""
-msgstr "Cadeia \"%di\""
+msgid "stat_ds_ipt_packets"
+msgstr "Cadeia &quot;%di&quot;"
 
 #. %H: Netlink - Transfer on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:14
-msgid "%H: Netlink - Transfer on %pi"
+msgid "stat_dg_title_netlink__if_octets"
 msgstr "%H: Netlink - Transferencia na %pi"
 
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:15
+msgid "stat_dg_label_netlink__if_octets"
+msgstr "Bytes/s"
+
 #. Bytes (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:16
-msgid "Bytes (%ds)"
+msgid "stat_ds_if_octets"
 msgstr "Bytes (%ds)"
 
 #. %H: Netlink - Packets on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:17
-msgid "%H: Netlink - Packets on %pi"
+msgid "stat_dg_title_netlink__if_packets"
 msgstr "%H: Netlink - Pacotes na %pi"
 
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:18
+msgid "stat_dg_label_netlink__if_packets"
+msgstr "Packets/s"
+
 #. Processed (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:19
-msgid "Processed (%ds)"
+msgid "stat_ds_if_packets"
 msgstr "Processado (%ds)"
 
 #. Dropped   (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:20
-msgid "Dropped (%ds)"
+msgid "stat_ds_if_dropped"
 msgstr "Dropado    (%ds)"
 
 #. Errors    (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:21
-msgid "Errors (%ds)"
+msgid "stat_ds_if_errors"
 msgstr "Erros      (%ds)"
 
 #. %H: Netlink - Multicast on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:22
-msgid "%H: Netlink - Multicast on %pi"
+msgid "stat_dg_title_netlink__if_multicast"
 msgstr "%H: Netlink - Multicast na %pi"
 
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:23
+msgid "stat_dg_label_netlink__if_multicast"
+msgstr "Pacote/s"
+
 #. Packets
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:24
-msgid "Packets"
+msgid "stat_ds_if_multicast"
 msgstr "Pacotes"
 
 #. %H: Netlink - Collisions on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:25
-msgid "%H: Netlink - Collisions on %pi"
+msgid "stat_dg_title_netlink__if_collisions"
 msgstr "%H: Netlink - Colisoes na %pi"
 
 #. Collisions/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:26
-msgid "Collisions/s"
+msgid "stat_dg_label_netlink__if_collisions"
 msgstr "Colisao(es)"
 
 #. Collisions
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:27
-msgid "Collisions"
+msgid "stat_ds_if_collisions"
 msgstr "Colisoes"
 
 #. %H: Netlink - Errors on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:28
-msgid "%H: Netlink - Errors on %pi"
+msgid "stat_dg_title_netlink__if_tx_errors"
 msgstr "%H: Netlink - Erros na %pi"
 
 #. Errors/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:29
-msgid "Errors/s"
+msgid "stat_dg_label_netlink__if_tx_errors"
 msgstr "Erro/s"
 
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:30
+msgid "stat_ds_if_tx_errors"
+msgstr "%di"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:31
+msgid "stat_ds_if_rx_errors"
+msgstr "%di"
+
 #. %H: Processes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:32
-msgid "%H: Processes"
+msgid "stat_dg_title_processes"
 msgstr "%H: Processos"
 
 #. Processes/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:33
-msgid "Processes/s"
+msgid "stat_dg_label_processes"
 msgstr "Processo/s"
 
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:34
+msgid "stat_ds_ps_state"
+msgstr "%di"
+
 #. %H: Process %pi - used cpu time
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:35
-msgid "%H: Process %pi - used cpu time"
+msgid "stat_dg_title_processes__ps_cputime"
 msgstr "%H: Processo %pi - tempo usado da cpu"
 
 #. Jiffies
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:36
-msgid "Jiffies"
+msgid "stat_dg_label_processes__ps_cputime"
 msgstr "Jiffies"
 
 #. system
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:37
-msgid "System"
+msgid "stat_ds_ps_cputime__syst"
 msgstr "sistema"
 
 #. user
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:38
-msgid "user"
+msgid "stat_ds_ps_cputime__user"
 msgstr "utilizador"
 
 #. %H: Process %pi - threads and processes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:39
-msgid "%H: Process %pi - threads and processes"
+msgid "stat_dg_title_processes__ps_count"
 msgstr "%H: Processo %pi - threads e processos"
 
 #. Count
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:40
-msgid "Count"
+msgid "stat_dg_label_processes__ps_count"
 msgstr "Contagem"
 
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:41
+msgid "stat_ds_ps_count"
+msgstr "%ds"
+
 #. %H: Process %pi - page faults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:42
-msgid "%H: Process %pi - page faults"
+msgid "stat_dg_title_processes__ps_pagefaults"
 msgstr "%H: Prcesso %pi - pagina de erros"
 
 #. Pagefaults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:43
-msgid "Pagefaults"
+msgid "stat_dg_label_processes__ps_pagefaults"
 msgstr "Pagina de erros"
 
 #. page faults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:44
-msgid "page faults"
+msgid "stat_ds_ps_pagefaults"
 msgstr "pagina de erros"
 
 #. %H: Process %pi - virtual memory size
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:45
-msgid "%H: Process %pi - virtual memory size"
+msgid "stat_dg_title_processes__ps_rss"
 msgstr "%H: Processo %pi - tamanho da memoria virtual"
 
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:46
+msgid "stat_dg_label_processes__ps_rss"
+msgstr "Bytes"
+
 #. virtual memory
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:47
-msgid "virtual memory"
+msgid "stat_ds_ps_rss"
 msgstr "memoria virtual"
 
 #. %H: Usage on Processor #%pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:48
-msgid "%H: Usage on Processor #%pi"
+msgid "stat_dg_title_cpu"
 msgstr "%H: Usado no Processado #%pi"
 
 #. %
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:49
-msgid "%"
+msgid "stat_dg_label_cpu"
 msgstr "%"
 
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:50
+msgid "stat_ds_cpu"
+msgstr "%di"
+
 #. %H: Transfer on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:51
-msgid "%H: Transfer on %di"
+msgid "stat_dg_title_interface__if_octets"
 msgstr "%H: Transferencia na %di"
 
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:52
+msgid "stat_dg_label_interface__if_octets"
+msgstr "Bytes/s"
+
 #. %H: Packets on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:53
-msgid "%H: Packets on %di"
+msgid "stat_dg_title_interface__if_packets"
 msgstr "%H: Pacotes na %di"
 
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:54
+msgid "stat_dg_label_interface__if_packets"
+msgstr "Pacote/s"
+
 #. %H: TCP-Connections to Port %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:55
-msgid "%H: TCP-Connections to Port %pi"
+msgid "stat_dg_title_tcpconns"
 msgstr "%H: Ligações TCP na Porta %pi"
 
 #. Connections/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:56
-msgid "Connections/s"
+msgid "stat_dg_label_tcpconns"
 msgstr "Ligação(ões)"
 
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:57
+msgid "stat_ds_tcp_connections"
+msgstr "%di"
+
 #. %H: Disk Space Usage on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:58
-msgid "%H: Disk Space Usage on %di"
+msgid "stat_dg_title_df"
 msgstr "%H: Utilizacao de Espaco em Disco em %di"
 
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:59
+msgid "stat_dg_label_df"
+msgstr "Bytes"
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:60
+msgid "stat_ds_df__free"
+msgstr "%ds"
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:61
+msgid "stat_ds_df__used"
+msgstr "%ds"
+
 #. %H: Interrupts
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:62
-msgid "%H: Interrupts"
+msgid "stat_dg_title_irq"
 msgstr "%H: Interrupcoes"
 
 #. Issues/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:63
-msgid "Issues/s"
+msgid "stat_dg_label_irq"
 msgstr "Erro/s"
 
 #. IRQ %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:64
-msgid "IRQ %di"
+msgid "stat_ds_irq"
 msgstr "IRQ %di"
 
 #. %H: System Load
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:65
-msgid "%H: System Load"
+msgid "stat_dg_title_load"
 msgstr "%H: Carga do Sistema"
 
 #. Load
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:66
-msgid "Load"
+msgid "stat_dg_label_load"
 msgstr "Carga"
 
 #. 1 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:67
-msgid "1 min"
+msgid "stat_ds_load__shortterm"
 msgstr "1 min"
 
 #. 5 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:68
-msgid "5 min"
+msgid "stat_ds_load__midterm"
 msgstr "5 min"
 
 #. 15 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:69
-msgid "15 min"
+msgid "stat_ds_load__longterm"
 msgstr "15 min"
diff --git a/po/pt_BR/rrdtool.po b/po/pt_BR/rrdtool.po
index b0d6e35d9..000d8c693 100644
--- a/po/pt_BR/rrdtool.po
+++ b/po/pt_BR/rrdtool.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-10 03:41+0200\n"
+"POT-Creation-Date: 2009-05-19 19:36+0200\n"
 "PO-Revision-Date: 2009-05-20 12:06+0200\n"
 "Last-Translator: Jose Monteiro <jm@unimos.net>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -13,260 +13,345 @@ msgstr ""
 
 #. %H: Wireless - Signal Noise Ratio
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:1
-msgid "%H: Wireless - Signal Noise Ratio"
+msgid "stat_dg_title_wireless__signal_noise"
 msgstr "%H: Wireless - Relação Sinal/Ruido"
 
 #. dBm
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:2
-msgid "dBm"
+msgid "stat_dg_label_wireless__signal_noise"
 msgstr "dBm"
 
 #. Noise Level
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:3
-msgid "Noise Level"
+msgid "stat_ds_signal_noise"
 msgstr "Nivel de Ruido"
 
 #. Signal Strength
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:4
-msgid "Signal Strength"
+msgid "stat_ds_signal_power"
 msgstr "Forca do Sinal"
 
 #. %H: Wireless - Signal Quality
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:5
-msgid "%H: Wireless - Signal Quality"
+msgid "stat_dg_title_wireless__signal_quality"
 msgstr "%H: Wireless - Qualidade do Sinal"
 
 #. n
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:6
-msgid "n"
+msgid "stat_dg_label_wireless__signal_quality"
 msgstr "n"
 
 #. Signal Quality
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:7
-msgid "Signal Quality"
+msgid "stat_ds_signal_quality"
 msgstr "Qualidade do Sinal"
 
 #. %H: ICMP Roundtrip Times
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:8
-msgid "%H: ICMP Roundtrip Times"
+msgid "stat_dg_title_ping"
 msgstr "%H: Tempo de resposta ICMP"
 
 #. ms
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:9
-msgid "ms"
+msgid "stat_dg_label_ping"
 msgstr "ms"
 
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:10
+msgid "stat_ds_ping"
+msgstr "%di"
+
 #. %H: Firewall - Processed Packets
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:11
-msgid "%H: Firewall - Processed Packets"
+msgid "stat_dg_title_iptables__ipt_packets"
 msgstr "%H: Firewall - Pacotes Processados"
 
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:12
+msgid "stat_dg_label_iptables__ipt_packets"
+msgstr "Pacote/s"
+
 #. Chain \"%di\"
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:13
-msgid "Chain \"%di\""
-msgstr "Cadeia \"%di\""
+msgid "stat_ds_ipt_packets"
+msgstr "Cadeia &quot;%di&quot;"
 
 #. %H: Netlink - Transfer on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:14
-msgid "%H: Netlink - Transfer on %pi"
+msgid "stat_dg_title_netlink__if_octets"
 msgstr "%H: Netlink - Transferencia na %pi"
 
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:15
+msgid "stat_dg_label_netlink__if_octets"
+msgstr "Bytes/s"
+
 #. Bytes (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:16
-msgid "Bytes (%ds)"
+msgid "stat_ds_if_octets"
 msgstr "Bytes (%ds)"
 
 #. %H: Netlink - Packets on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:17
-msgid "%H: Netlink - Packets on %pi"
+msgid "stat_dg_title_netlink__if_packets"
 msgstr "%H: Netlink - Pacotes na %pi"
 
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:18
+msgid "stat_dg_label_netlink__if_packets"
+msgstr "Packets/s"
+
 #. Processed (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:19
-msgid "Processed (%ds)"
+msgid "stat_ds_if_packets"
 msgstr "Processado (%ds)"
 
 #. Dropped   (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:20
-msgid "Dropped (%ds)"
+msgid "stat_ds_if_dropped"
 msgstr "Dropado    (%ds)"
 
 #. Errors    (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:21
-msgid "Errors (%ds)"
+msgid "stat_ds_if_errors"
 msgstr "Erros      (%ds)"
 
 #. %H: Netlink - Multicast on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:22
-msgid "%H: Netlink - Multicast on %pi"
+msgid "stat_dg_title_netlink__if_multicast"
 msgstr "%H: Netlink - Multicast na %pi"
 
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:23
+msgid "stat_dg_label_netlink__if_multicast"
+msgstr "Pacote/s"
+
 #. Packets
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:24
-msgid "Packets"
+msgid "stat_ds_if_multicast"
 msgstr "Pacotes"
 
 #. %H: Netlink - Collisions on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:25
-msgid "%H: Netlink - Collisions on %pi"
+msgid "stat_dg_title_netlink__if_collisions"
 msgstr "%H: Netlink - Colisoes na %pi"
 
 #. Collisions/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:26
-msgid "Collisions/s"
+msgid "stat_dg_label_netlink__if_collisions"
 msgstr "Colisao(es)"
 
 #. Collisions
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:27
-msgid "Collisions"
+msgid "stat_ds_if_collisions"
 msgstr "Colisoes"
 
 #. %H: Netlink - Errors on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:28
-msgid "%H: Netlink - Errors on %pi"
+msgid "stat_dg_title_netlink__if_tx_errors"
 msgstr "%H: Netlink - Erros na %pi"
 
 #. Errors/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:29
-msgid "Errors/s"
+msgid "stat_dg_label_netlink__if_tx_errors"
 msgstr "Erro/s"
 
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:30
+msgid "stat_ds_if_tx_errors"
+msgstr "%di"
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:31
+msgid "stat_ds_if_rx_errors"
+msgstr "%di"
+
 #. %H: Processes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:32
-msgid "%H: Processes"
+msgid "stat_dg_title_processes"
 msgstr "%H: Processos"
 
 #. Processes/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:33
-msgid "Processes/s"
+msgid "stat_dg_label_processes"
 msgstr "Processo/s"
 
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:34
+msgid "stat_ds_ps_state"
+msgstr "%di"
+
 #. %H: Process %pi - used cpu time
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:35
-msgid "%H: Process %pi - used cpu time"
+msgid "stat_dg_title_processes__ps_cputime"
 msgstr "%H: Processo %pi - tempo usado da cpu"
 
 #. Jiffies
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:36
-msgid "Jiffies"
+msgid "stat_dg_label_processes__ps_cputime"
 msgstr "Jiffies"
 
 #. system
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:37
-msgid "System"
+msgid "stat_ds_ps_cputime__syst"
 msgstr "sistema"
 
 #. user
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:38
-msgid "user"
+msgid "stat_ds_ps_cputime__user"
 msgstr "utilizador"
 
 #. %H: Process %pi - threads and processes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:39
-msgid "%H: Process %pi - threads and processes"
+msgid "stat_dg_title_processes__ps_count"
 msgstr "%H: Processo %pi - threads e processos"
 
 #. Count
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:40
-msgid "Count"
+msgid "stat_dg_label_processes__ps_count"
 msgstr "Contagem"
 
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:41
+msgid "stat_ds_ps_count"
+msgstr "%ds"
+
 #. %H: Process %pi - page faults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:42
-msgid "%H: Process %pi - page faults"
+msgid "stat_dg_title_processes__ps_pagefaults"
 msgstr "%H: Prcesso %pi - pagina de erros"
 
 #. Pagefaults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:43
-msgid "Pagefaults"
+msgid "stat_dg_label_processes__ps_pagefaults"
 msgstr "Pagina de erros"
 
 #. page faults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:44
-msgid "page faults"
+msgid "stat_ds_ps_pagefaults"
 msgstr "pagina de erros"
 
 #. %H: Process %pi - virtual memory size
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:45
-msgid "%H: Process %pi - virtual memory size"
+msgid "stat_dg_title_processes__ps_rss"
 msgstr "%H: Processo %pi - tamanho da memoria virtual"
 
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:46
+msgid "stat_dg_label_processes__ps_rss"
+msgstr "Bytes"
+
 #. virtual memory
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:47
-msgid "virtual memory"
+msgid "stat_ds_ps_rss"
 msgstr "memoria virtual"
 
 #. %H: Usage on Processor #%pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:48
-msgid "%H: Usage on Processor #%pi"
+msgid "stat_dg_title_cpu"
 msgstr "%H: Usado no Processado #%pi"
 
 #. %
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:49
-msgid "%"
+msgid "stat_dg_label_cpu"
 msgstr "%"
 
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:50
+msgid "stat_ds_cpu"
+msgstr "%di"
+
 #. %H: Transfer on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:51
-msgid "%H: Transfer on %di"
+msgid "stat_dg_title_interface__if_octets"
 msgstr "%H: Transferencia na %di"
 
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:52
+msgid "stat_dg_label_interface__if_octets"
+msgstr "Bytes/s"
+
 #. %H: Packets on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:53
-msgid "%H: Packets on %di"
+msgid "stat_dg_title_interface__if_packets"
 msgstr "%H: Pacotes na %di"
 
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:54
+msgid "stat_dg_label_interface__if_packets"
+msgstr "Pacote/s"
+
 #. %H: TCP-Connections to Port %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:55
-msgid "%H: TCP-Connections to Port %pi"
+msgid "stat_dg_title_tcpconns"
 msgstr "%H: Ligações TCP na Porta %pi"
 
 #. Connections/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:56
-msgid "Connections/s"
+msgid "stat_dg_label_tcpconns"
 msgstr "Ligação(ões)"
 
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:57
+msgid "stat_ds_tcp_connections"
+msgstr "%di"
+
 #. %H: Disk Space Usage on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:58
-msgid "%H: Disk Space Usage on %di"
+msgid "stat_dg_title_df"
 msgstr "%H: Utilizacao de Espaco em Disco em %di"
 
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:59
+msgid "stat_dg_label_df"
+msgstr "Bytes"
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:60
+msgid "stat_ds_df__free"
+msgstr "%ds"
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:61
+msgid "stat_ds_df__used"
+msgstr "%ds"
+
 #. %H: Interrupts
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:62
-msgid "%H: Interrupts"
+msgid "stat_dg_title_irq"
 msgstr "%H: Interrupcoes"
 
 #. Issues/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:63
-msgid "Issues/s"
+msgid "stat_dg_label_irq"
 msgstr "Erro/s"
 
 #. IRQ %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:64
-msgid "IRQ %di"
+msgid "stat_ds_irq"
 msgstr "IRQ %di"
 
 #. %H: System Load
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:65
-msgid "%H: System Load"
+msgid "stat_dg_title_load"
 msgstr "%H: Carga do Sistema"
 
 #. Load
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:66
-msgid "Load"
+msgid "stat_dg_label_load"
 msgstr "Carga"
 
 #. 1 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:67
-msgid "1 min"
+msgid "stat_ds_load__shortterm"
 msgstr "1 min"
 
 #. 5 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:68
-msgid "5 min"
+msgid "stat_ds_load__midterm"
 msgstr "5 min"
 
 #. 15 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:69
-msgid "15 min"
+msgid "stat_ds_load__longterm"
 msgstr "15 min"
diff --git a/po/ru/rrdtool.po b/po/ru/rrdtool.po
index a126371ed..95545db6d 100644
--- a/po/ru/rrdtool.po
+++ b/po/ru/rrdtool.po
@@ -14,260 +14,345 @@ msgstr ""
 
 #. %H: Wireless - Signal Noise Ratio
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:1
-msgid "%H: Wireless - Signal Noise Ratio"
+msgid "stat_dg_title_wireless__signal_noise"
 msgstr ""
 
 #. dBm
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:2
-msgid "dBm"
+msgid "stat_dg_label_wireless__signal_noise"
 msgstr ""
 
 #. Noise Level
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:3
-msgid "Noise Level"
+msgid "stat_ds_signal_noise"
 msgstr ""
 
 #. Signal Strength
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:4
-msgid "Signal Strength"
+msgid "stat_ds_signal_power"
 msgstr ""
 
 #. %H: Wireless - Signal Quality
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:5
-msgid "%H: Wireless - Signal Quality"
+msgid "stat_dg_title_wireless__signal_quality"
 msgstr ""
 
 #. n
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:6
-msgid "n"
+msgid "stat_dg_label_wireless__signal_quality"
 msgstr ""
 
 #. Signal Quality
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:7
-msgid "Signal Quality"
+msgid "stat_ds_signal_quality"
 msgstr ""
 
 #. %H: ICMP Roundtrip Times
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:8
-msgid "%H: ICMP Roundtrip Times"
+msgid "stat_dg_title_ping"
 msgstr ""
 
 #. ms
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:9
-msgid "ms"
+msgid "stat_dg_label_ping"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:10
+msgid "stat_ds_ping"
 msgstr ""
 
 #. %H: Firewall - Processed Packets
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:11
-msgid "%H: Firewall - Processed Packets"
+msgid "stat_dg_title_iptables__ipt_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:12
+msgid "stat_dg_label_iptables__ipt_packets"
 msgstr ""
 
 #. Chain \"%di\"
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:13
-msgid "Chain \"%di\""
+msgid "stat_ds_ipt_packets"
 msgstr ""
 
 #. %H: Netlink - Transfer on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:14
-msgid "%H: Netlink - Transfer on %pi"
+msgid "stat_dg_title_netlink__if_octets"
+msgstr ""
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:15
+msgid "stat_dg_label_netlink__if_octets"
 msgstr ""
 
 #. Bytes (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:16
-msgid "Bytes (%ds)"
+msgid "stat_ds_if_octets"
 msgstr ""
 
 #. %H: Netlink - Packets on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:17
-msgid "%H: Netlink - Packets on %pi"
+msgid "stat_dg_title_netlink__if_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:18
+msgid "stat_dg_label_netlink__if_packets"
 msgstr ""
 
 #. Processed (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:19
-msgid "Processed (%ds)"
+msgid "stat_ds_if_packets"
 msgstr ""
 
 #. Dropped   (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:20
-msgid "Dropped (%ds)"
+msgid "stat_ds_if_dropped"
 msgstr ""
 
 #. Errors    (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:21
-msgid "Errors (%ds)"
+msgid "stat_ds_if_errors"
 msgstr ""
 
 #. %H: Netlink - Multicast on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:22
-msgid "%H: Netlink - Multicast on %pi"
+msgid "stat_dg_title_netlink__if_multicast"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:23
+msgid "stat_dg_label_netlink__if_multicast"
 msgstr ""
 
 #. Packets
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:24
-msgid "Packets"
+msgid "stat_ds_if_multicast"
 msgstr ""
 
 #. %H: Netlink - Collisions on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:25
-msgid "%H: Netlink - Collisions on %pi"
+msgid "stat_dg_title_netlink__if_collisions"
 msgstr ""
 
 #. Collisions/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:26
-msgid "Collisions/s"
+msgid "stat_dg_label_netlink__if_collisions"
 msgstr ""
 
 #. Collisions
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:27
-msgid "Collisions"
+msgid "stat_ds_if_collisions"
 msgstr ""
 
 #. %H: Netlink - Errors on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:28
-msgid "%H: Netlink - Errors on %pi"
+msgid "stat_dg_title_netlink__if_tx_errors"
 msgstr ""
 
 #. Errors/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:29
-msgid "Errors/s"
+msgid "stat_dg_label_netlink__if_tx_errors"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:30
+msgid "stat_ds_if_tx_errors"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:31
+msgid "stat_ds_if_rx_errors"
 msgstr ""
 
 #. %H: Processes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:32
-msgid "%H: Processes"
+msgid "stat_dg_title_processes"
 msgstr ""
 
 #. Processes/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:33
-msgid "Processes/s"
+msgid "stat_dg_label_processes"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:34
+msgid "stat_ds_ps_state"
 msgstr ""
 
 #. %H: Process %pi - used cpu time
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:35
-msgid "%H: Process %pi - used cpu time"
+msgid "stat_dg_title_processes__ps_cputime"
 msgstr ""
 
 #. Jiffies
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:36
-msgid "Jiffies"
+msgid "stat_dg_label_processes__ps_cputime"
 msgstr ""
 
 #. system
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:37
-msgid "System"
+msgid "stat_ds_ps_cputime__syst"
 msgstr ""
 
 #. user
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:38
-msgid "user"
+msgid "stat_ds_ps_cputime__user"
 msgstr ""
 
 #. %H: Process %pi - threads and processes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:39
-msgid "%H: Process %pi - threads and processes"
+msgid "stat_dg_title_processes__ps_count"
 msgstr ""
 
 #. Count
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:40
-msgid "Count"
+msgid "stat_dg_label_processes__ps_count"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:41
+msgid "stat_ds_ps_count"
 msgstr ""
 
 #. %H: Process %pi - page faults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:42
-msgid "%H: Process %pi - page faults"
+msgid "stat_dg_title_processes__ps_pagefaults"
 msgstr ""
 
 #. Pagefaults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:43
-msgid "Pagefaults"
+msgid "stat_dg_label_processes__ps_pagefaults"
 msgstr ""
 
 #. page faults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:44
-msgid "page faults"
+msgid "stat_ds_ps_pagefaults"
 msgstr ""
 
 #. %H: Process %pi - virtual memory size
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:45
-msgid "%H: Process %pi - virtual memory size"
+msgid "stat_dg_title_processes__ps_rss"
+msgstr ""
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:46
+msgid "stat_dg_label_processes__ps_rss"
 msgstr ""
 
 #. virtual memory
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:47
-msgid "virtual memory"
+msgid "stat_ds_ps_rss"
 msgstr ""
 
 #. %H: Usage on Processor #%pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:48
-msgid "%H: Usage on Processor #%pi"
+msgid "stat_dg_title_cpu"
 msgstr ""
 
 #. %
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:49
-msgid "%"
+msgid "stat_dg_label_cpu"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:50
+msgid "stat_ds_cpu"
 msgstr ""
 
 #. %H: Transfer on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:51
-msgid "%H: Transfer on %di"
+msgid "stat_dg_title_interface__if_octets"
+msgstr ""
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:52
+msgid "stat_dg_label_interface__if_octets"
 msgstr ""
 
 #. %H: Packets on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:53
-msgid "%H: Packets on %di"
+msgid "stat_dg_title_interface__if_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:54
+msgid "stat_dg_label_interface__if_packets"
 msgstr ""
 
 #. %H: TCP-Connections to Port %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:55
-msgid "%H: TCP-Connections to Port %pi"
+msgid "stat_dg_title_tcpconns"
 msgstr ""
 
 #. Connections/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:56
-msgid "Connections/s"
+msgid "stat_dg_label_tcpconns"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:57
+msgid "stat_ds_tcp_connections"
 msgstr ""
 
 #. %H: Disk Space Usage on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:58
-msgid "%H: Disk Space Usage on %di"
+msgid "stat_dg_title_df"
+msgstr ""
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:59
+msgid "stat_dg_label_df"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:60
+msgid "stat_ds_df__free"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:61
+msgid "stat_ds_df__used"
 msgstr ""
 
 #. %H: Interrupts
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:62
-msgid "%H: Interrupts"
+msgid "stat_dg_title_irq"
 msgstr ""
 
 #. Issues/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:63
-msgid "Issues/s"
+msgid "stat_dg_label_irq"
 msgstr ""
 
 #. IRQ %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:64
-msgid "IRQ %di"
+msgid "stat_ds_irq"
 msgstr ""
 
 #. %H: System Load
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:65
-msgid "%H: System Load"
+msgid "stat_dg_title_load"
 msgstr ""
 
 #. Load
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:66
-msgid "Load"
+msgid "stat_dg_label_load"
 msgstr ""
 
 #. 1 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:67
-msgid "1 min"
+msgid "stat_ds_load__shortterm"
 msgstr ""
 
 #. 5 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:68
-msgid "5 min"
+msgid "stat_ds_load__midterm"
 msgstr ""
 
 #. 15 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:69
-msgid "15 min"
+msgid "stat_ds_load__longterm"
 msgstr ""
diff --git a/po/templates/rrdtool.pot b/po/templates/rrdtool.pot
index 7554a2763..0a105ecd4 100644
--- a/po/templates/rrdtool.pot
+++ b/po/templates/rrdtool.pot
@@ -1,264 +1,349 @@
 #  rrdtool.pot
 #  generated from ./applications/luci-statistics/luasrc/i18n/rrdtool.en.lua
 msgid ""
-msgstr "Content-Type: text/plain; charset=UTF-8"
+msgstr "Content-Type: text/plain; charset=ISO-8859-1"
 
 #. %H: Wireless - Signal Noise Ratio
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:1
-msgid "%H: Wireless - Signal Noise Ratio"
+msgid "stat_dg_title_wireless__signal_noise"
 msgstr ""
 
 #. dBm
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:2
-msgid "dBm"
+msgid "stat_dg_label_wireless__signal_noise"
 msgstr ""
 
 #. Noise Level
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:3
-msgid "Noise Level"
+msgid "stat_ds_signal_noise"
 msgstr ""
 
 #. Signal Strength
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:4
-msgid "Signal Strength"
+msgid "stat_ds_signal_power"
 msgstr ""
 
 #. %H: Wireless - Signal Quality
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:5
-msgid "%H: Wireless - Signal Quality"
+msgid "stat_dg_title_wireless__signal_quality"
 msgstr ""
 
 #. n
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:6
-msgid "n"
+msgid "stat_dg_label_wireless__signal_quality"
 msgstr ""
 
 #. Signal Quality
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:7
-msgid "Signal Quality"
+msgid "stat_ds_signal_quality"
 msgstr ""
 
 #. %H: ICMP Roundtrip Times
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:8
-msgid "%H: ICMP Roundtrip Times"
+msgid "stat_dg_title_ping"
 msgstr ""
 
 #. ms
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:9
-msgid "ms"
+msgid "stat_dg_label_ping"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:10
+msgid "stat_ds_ping"
 msgstr ""
 
 #. %H: Firewall - Processed Packets
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:11
-msgid "%H: Firewall - Processed Packets"
+msgid "stat_dg_title_iptables__ipt_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:12
+msgid "stat_dg_label_iptables__ipt_packets"
 msgstr ""
 
 #. Chain \"%di\"
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:13
-msgid "Chain \"%di\""
+msgid "stat_ds_ipt_packets"
 msgstr ""
 
 #. %H: Netlink - Transfer on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:14
-msgid "%H: Netlink - Transfer on %pi"
+msgid "stat_dg_title_netlink__if_octets"
+msgstr ""
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:15
+msgid "stat_dg_label_netlink__if_octets"
 msgstr ""
 
 #. Bytes (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:16
-msgid "Bytes (%ds)"
+msgid "stat_ds_if_octets"
 msgstr ""
 
 #. %H: Netlink - Packets on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:17
-msgid "%H: Netlink - Packets on %pi"
+msgid "stat_dg_title_netlink__if_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:18
+msgid "stat_dg_label_netlink__if_packets"
 msgstr ""
 
 #. Processed (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:19
-msgid "Processed (%ds)"
+msgid "stat_ds_if_packets"
 msgstr ""
 
 #. Dropped   (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:20
-msgid "Dropped (%ds)"
+msgid "stat_ds_if_dropped"
 msgstr ""
 
 #. Errors    (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:21
-msgid "Errors (%ds)"
+msgid "stat_ds_if_errors"
 msgstr ""
 
 #. %H: Netlink - Multicast on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:22
-msgid "%H: Netlink - Multicast on %pi"
+msgid "stat_dg_title_netlink__if_multicast"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:23
+msgid "stat_dg_label_netlink__if_multicast"
 msgstr ""
 
 #. Packets
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:24
-msgid "Packets"
+msgid "stat_ds_if_multicast"
 msgstr ""
 
 #. %H: Netlink - Collisions on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:25
-msgid "%H: Netlink - Collisions on %pi"
+msgid "stat_dg_title_netlink__if_collisions"
 msgstr ""
 
 #. Collisions/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:26
-msgid "Collisions/s"
+msgid "stat_dg_label_netlink__if_collisions"
 msgstr ""
 
 #. Collisions
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:27
-msgid "Collisions"
+msgid "stat_ds_if_collisions"
 msgstr ""
 
 #. %H: Netlink - Errors on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:28
-msgid "%H: Netlink - Errors on %pi"
+msgid "stat_dg_title_netlink__if_tx_errors"
 msgstr ""
 
 #. Errors/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:29
-msgid "Errors/s"
+msgid "stat_dg_label_netlink__if_tx_errors"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:30
+msgid "stat_ds_if_tx_errors"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:31
+msgid "stat_ds_if_rx_errors"
 msgstr ""
 
 #. %H: Processes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:32
-msgid "%H: Processes"
+msgid "stat_dg_title_processes"
 msgstr ""
 
 #. Processes/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:33
-msgid "Processes/s"
+msgid "stat_dg_label_processes"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:34
+msgid "stat_ds_ps_state"
 msgstr ""
 
 #. %H: Process %pi - used cpu time
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:35
-msgid "%H: Process %pi - used cpu time"
+msgid "stat_dg_title_processes__ps_cputime"
 msgstr ""
 
 #. Jiffies
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:36
-msgid "Jiffies"
+msgid "stat_dg_label_processes__ps_cputime"
 msgstr ""
 
 #. system
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:37
-msgid "System"
+msgid "stat_ds_ps_cputime__syst"
 msgstr ""
 
 #. user
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:38
-msgid "user"
+msgid "stat_ds_ps_cputime__user"
 msgstr ""
 
 #. %H: Process %pi - threads and processes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:39
-msgid "%H: Process %pi - threads and processes"
+msgid "stat_dg_title_processes__ps_count"
 msgstr ""
 
 #. Count
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:40
-msgid "Count"
+msgid "stat_dg_label_processes__ps_count"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:41
+msgid "stat_ds_ps_count"
 msgstr ""
 
 #. %H: Process %pi - page faults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:42
-msgid "%H: Process %pi - page faults"
+msgid "stat_dg_title_processes__ps_pagefaults"
 msgstr ""
 
 #. Pagefaults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:43
-msgid "Pagefaults"
+msgid "stat_dg_label_processes__ps_pagefaults"
 msgstr ""
 
 #. page faults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:44
-msgid "page faults"
+msgid "stat_ds_ps_pagefaults"
 msgstr ""
 
 #. %H: Process %pi - virtual memory size
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:45
-msgid "%H: Process %pi - virtual memory size"
+msgid "stat_dg_title_processes__ps_rss"
+msgstr ""
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:46
+msgid "stat_dg_label_processes__ps_rss"
 msgstr ""
 
 #. virtual memory
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:47
-msgid "virtual memory"
+msgid "stat_ds_ps_rss"
 msgstr ""
 
 #. %H: Usage on Processor #%pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:48
-msgid "%H: Usage on Processor #%pi"
+msgid "stat_dg_title_cpu"
 msgstr ""
 
 #. %
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:49
-msgid "%"
+msgid "stat_dg_label_cpu"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:50
+msgid "stat_ds_cpu"
 msgstr ""
 
 #. %H: Transfer on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:51
-msgid "%H: Transfer on %di"
+msgid "stat_dg_title_interface__if_octets"
+msgstr ""
+
+#. Bytes/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:52
+msgid "stat_dg_label_interface__if_octets"
 msgstr ""
 
 #. %H: Packets on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:53
-msgid "%H: Packets on %di"
+msgid "stat_dg_title_interface__if_packets"
+msgstr ""
+
+#. Packets/s
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:54
+msgid "stat_dg_label_interface__if_packets"
 msgstr ""
 
 #. %H: TCP-Connections to Port %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:55
-msgid "%H: TCP-Connections to Port %pi"
+msgid "stat_dg_title_tcpconns"
 msgstr ""
 
 #. Connections/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:56
-msgid "Connections/s"
+msgid "stat_dg_label_tcpconns"
+msgstr ""
+
+#. %di
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:57
+msgid "stat_ds_tcp_connections"
 msgstr ""
 
 #. %H: Disk Space Usage on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:58
-msgid "%H: Disk Space Usage on %di"
+msgid "stat_dg_title_df"
+msgstr ""
+
+#. Bytes
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:59
+msgid "stat_dg_label_df"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:60
+msgid "stat_ds_df__free"
+msgstr ""
+
+#. %ds
+#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:61
+msgid "stat_ds_df__used"
 msgstr ""
 
 #. %H: Interrupts
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:62
-msgid "%H: Interrupts"
+msgid "stat_dg_title_irq"
 msgstr ""
 
 #. Issues/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:63
-msgid "Issues/s"
+msgid "stat_dg_label_irq"
 msgstr ""
 
 #. IRQ %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:64
-msgid "IRQ %di"
+msgid "stat_ds_irq"
 msgstr ""
 
 #. %H: System Load
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:65
-msgid "%H: System Load"
+msgid "stat_dg_title_load"
 msgstr ""
 
 #. Load
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:66
-msgid "Load"
+msgid "stat_dg_label_load"
 msgstr ""
 
 #. 1 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:67
-msgid "1 min"
+msgid "stat_ds_load__shortterm"
 msgstr ""
 
 #. 5 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:68
-msgid "5 min"
+msgid "stat_ds_load__midterm"
 msgstr ""
 
 #. 15 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:69
-msgid "15 min"
+msgid "stat_ds_load__longterm"
 msgstr ""