From dc7138e424dfd454951ed5ed4eeddbf842457e87 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sat, 31 Oct 2009 15:52:50 +0000
Subject: [PATCH] po: substitute keys with english text, cleanup and unify
 translations

---
 po/ca/admin-core.po            |  826 +++++++++++-----------
 po/ca/asterisk.po              |  500 ++++++-------
 po/ca/cbi.po                   |   32 +-
 po/ca/coovachilli.po           |  352 +++++-----
 po/ca/ddns.po                  |   14 +-
 po/ca/default.po               |  192 ++---
 po/ca/freifunk.po              |   90 +--
 po/ca/hd_idle.po               |   14 +-
 po/ca/initmgr.po               |    8 +-
 po/ca/livestats.po             |   12 +-
 po/ca/luci-fw.po               |  110 +--
 po/ca/mmc_over_gpio.po         |    6 +-
 po/ca/ntpc.po                  |   16 +-
 po/ca/olsr.po                  |  254 +++----
 po/ca/openvpn.po               |  378 +++++-----
 po/ca/p910nd.po                |    6 +-
 po/ca/polipo.po                |   84 +--
 po/ca/qos.po                   |   36 +-
 po/ca/rrdtool.po               |  136 ++--
 po/ca/samba.po                 |   32 +-
 po/ca/statistics.po            |  422 +++++------
 po/ca/sysauth.po               |    4 +-
 po/ca/tinyproxy.po             |   62 +-
 po/ca/upnp.po                  |   12 +-
 po/ca/ushare.po                |   14 +-
 po/ca/uvc_streamer.po          |    8 +-
 po/ca/uvl.po                   |   76 +-
 po/ca/wifi.po                  |   76 +-
 po/de/admin-core.po            |  826 +++++++++++-----------
 po/de/asterisk.po              |  500 ++++++-------
 po/de/cbi.po                   |   32 +-
 po/de/coovachilli.po           |  352 +++++-----
 po/de/ddns.po                  |   14 +-
 po/de/default.po               |  192 ++---
 po/de/freifunk.po              |  106 +--
 po/de/hd_idle.po               |   14 +-
 po/de/initmgr.po               |    8 +-
 po/de/livestats.po             |   12 +-
 po/de/luci-fw.po               |  110 +--
 po/de/mmc_over_gpio.po         |    6 +-
 po/de/ntpc.po                  |   16 +-
 po/de/olsr.po                  |  254 +++----
 po/de/openvpn.po               |  378 +++++-----
 po/de/p910nd.po                |    6 +-
 po/de/polipo.po                |   84 +--
 po/de/qos.po                   |   36 +-
 po/de/rrdtool.po               |  136 ++--
 po/de/samba.po                 |   32 +-
 po/de/statistics.po            |  422 +++++------
 po/de/sysauth.po               |    4 +-
 po/de/tinyproxy.po             |   62 +-
 po/de/upnp.po                  |   12 +-
 po/de/ushare.po                |   14 +-
 po/de/uvc_streamer.po          |    8 +-
 po/de/uvl.po                   |   76 +-
 po/de/wifi.po                  |   76 +-
 po/el/admin-core.po            |  826 +++++++++++-----------
 po/el/asterisk.po              |  500 ++++++-------
 po/el/cbi.po                   |   32 +-
 po/el/coovachilli.po           |  352 +++++-----
 po/el/ddns.po                  |   14 +-
 po/el/default.po               |  192 ++---
 po/el/freifunk.po              |   42 +-
 po/el/hd_idle.po               |   14 +-
 po/el/initmgr.po               |    8 +-
 po/el/livestats.po             |   12 +-
 po/el/luci-fw.po               |  110 +--
 po/el/mmc_over_gpio.po         |    6 +-
 po/el/ntpc.po                  |   16 +-
 po/el/olsr.po                  |  254 +++----
 po/el/openvpn.po               |  378 +++++-----
 po/el/p910nd.po                |    6 +-
 po/el/polipo.po                |   84 +--
 po/el/qos.po                   |   36 +-
 po/el/rrdtool.po               |  136 ++--
 po/el/samba.po                 |   32 +-
 po/el/statistics.po            |  422 +++++------
 po/el/sysauth.po               |    4 +-
 po/el/tinyproxy.po             |   62 +-
 po/el/upnp.po                  |   12 +-
 po/el/ushare.po                |   14 +-
 po/el/uvc_streamer.po          |    8 +-
 po/el/uvl.po                   |   76 +-
 po/el/wifi.po                  |   76 +-
 po/en/admin-core.po            | 1204 ++++++++++++++++----------------
 po/en/asterisk.po              |  500 ++++++-------
 po/en/cbi.po                   |   32 +-
 po/en/coovachilli.po           |  352 +++++-----
 po/en/ddns.po                  |   14 +-
 po/en/default.po               |  192 ++---
 po/en/diag_core.po             |   14 +-
 po/en/diag_devinfo.po          |  180 ++---
 po/en/freifunk.po              |  106 +--
 po/en/hd_idle.po               |   14 +-
 po/en/initmgr.po               |    8 +-
 po/en/livestats.po             |   12 +-
 po/en/luci-fw.po               |  110 +--
 po/en/mmc_over_gpio.po         |    6 +-
 po/en/ntpc.po                  |   16 +-
 po/en/olsr.po                  |  254 +++----
 po/en/openvpn.po               |  378 +++++-----
 po/en/p910nd.po                |    6 +-
 po/en/polipo.po                |   84 +--
 po/en/qos.po                   |   36 +-
 po/en/rrdtool.po               |  136 ++--
 po/en/samba.po                 |   32 +-
 po/en/statistics.po            |  422 +++++------
 po/en/sysauth.po               |    4 +-
 po/en/tinyproxy.po             |   62 +-
 po/en/upnp.po                  |   12 +-
 po/en/ushare.po                |   14 +-
 po/en/uvc_streamer.po          |    8 +-
 po/en/uvl.po                   |   76 +-
 po/en/voice_core.po            |    6 +-
 po/en/voice_diag.po            |    6 +-
 po/en/wifi.po                  |   76 +-
 po/es/admin-core.po            |  826 +++++++++++-----------
 po/es/asterisk.po              |  500 ++++++-------
 po/es/cbi.po                   |   32 +-
 po/es/coovachilli.po           |  352 +++++-----
 po/es/ddns.po                  |   14 +-
 po/es/default.po               |  192 ++---
 po/es/freifunk.po              |   90 +--
 po/es/hd_idle.po               |   14 +-
 po/es/initmgr.po               |    8 +-
 po/es/livestats.po             |   12 +-
 po/es/luci-fw.po               |  110 +--
 po/es/mmc_over_gpio.po         |    6 +-
 po/es/ntpc.po                  |   16 +-
 po/es/olsr.po                  |  254 +++----
 po/es/openvpn.po               |  378 +++++-----
 po/es/p910nd.po                |    6 +-
 po/es/polipo.po                |   84 +--
 po/es/qos.po                   |   36 +-
 po/es/rrdtool.po               |  136 ++--
 po/es/samba.po                 |   32 +-
 po/es/statistics.po            |  422 +++++------
 po/es/sysauth.po               |    4 +-
 po/es/tinyproxy.po             |   62 +-
 po/es/upnp.po                  |   12 +-
 po/es/ushare.po                |   14 +-
 po/es/uvc_streamer.po          |    8 +-
 po/es/uvl.po                   |   76 +-
 po/es/wifi.po                  |   76 +-
 po/fr/admin-core.po            |  826 +++++++++++-----------
 po/fr/asterisk.po              |  500 ++++++-------
 po/fr/cbi.po                   |   32 +-
 po/fr/coovachilli.po           |  352 +++++-----
 po/fr/ddns.po                  |   14 +-
 po/fr/default.po               |  192 ++---
 po/fr/freifunk.po              |   42 +-
 po/fr/hd_idle.po               |   14 +-
 po/fr/initmgr.po               |    8 +-
 po/fr/livestats.po             |   12 +-
 po/fr/luci-fw.po               |  110 +--
 po/fr/mmc_over_gpio.po         |    6 +-
 po/fr/ntpc.po                  |   16 +-
 po/fr/olsr.po                  |  254 +++----
 po/fr/openvpn.po               |  378 +++++-----
 po/fr/p910nd.po                |    6 +-
 po/fr/polipo.po                |   84 +--
 po/fr/qos.po                   |   36 +-
 po/fr/rrdtool.po               |  136 ++--
 po/fr/samba.po                 |   32 +-
 po/fr/statistics.po            |  422 +++++------
 po/fr/sysauth.po               |    4 +-
 po/fr/tinyproxy.po             |   62 +-
 po/fr/upnp.po                  |   12 +-
 po/fr/ushare.po                |   14 +-
 po/fr/uvc_streamer.po          |    8 +-
 po/fr/uvl.po                   |   76 +-
 po/fr/wifi.po                  |   76 +-
 po/it/admin-core.po            |  826 +++++++++++-----------
 po/it/asterisk.po              |  500 ++++++-------
 po/it/cbi.po                   |   32 +-
 po/it/coovachilli.po           |  352 +++++-----
 po/it/ddns.po                  |   14 +-
 po/it/default.po               |  192 ++---
 po/it/freifunk.po              |   90 +--
 po/it/hd_idle.po               |   14 +-
 po/it/initmgr.po               |    8 +-
 po/it/livestats.po             |   12 +-
 po/it/luci-fw.po               |  110 +--
 po/it/mmc_over_gpio.po         |    6 +-
 po/it/ntpc.po                  |   16 +-
 po/it/olsr.po                  |  254 +++----
 po/it/openvpn.po               |  378 +++++-----
 po/it/p910nd.po                |    6 +-
 po/it/polipo.po                |   84 +--
 po/it/qos.po                   |   34 +-
 po/it/rrdtool.po               |  136 ++--
 po/it/samba.po                 |   32 +-
 po/it/statistics.po            |  422 +++++------
 po/it/sysauth.po               |    4 +-
 po/it/tinyproxy.po             |   62 +-
 po/it/upnp.po                  |   12 +-
 po/it/ushare.po                |   14 +-
 po/it/uvc_streamer.po          |    8 +-
 po/it/uvl.po                   |   76 +-
 po/it/wifi.po                  |   76 +-
 po/ja/admin-core.po            |  826 +++++++++++-----------
 po/ja/asterisk.po              |  500 ++++++-------
 po/ja/cbi.po                   |   32 +-
 po/ja/coovachilli.po           |  352 +++++-----
 po/ja/ddns.po                  |   14 +-
 po/ja/default.po               |  192 ++---
 po/ja/freifunk.po              |   42 +-
 po/ja/hd_idle.po               |   14 +-
 po/ja/initmgr.po               |    8 +-
 po/ja/livestats.po             |   12 +-
 po/ja/luci-fw.po               |  110 +--
 po/ja/mmc_over_gpio.po         |    6 +-
 po/ja/ntpc.po                  |   16 +-
 po/ja/olsr.po                  |  254 +++----
 po/ja/openvpn.po               |  378 +++++-----
 po/ja/p910nd.po                |    6 +-
 po/ja/polipo.po                |   84 +--
 po/ja/qos.po                   |   34 +-
 po/ja/rrdtool.po               |  136 ++--
 po/ja/samba.po                 |   32 +-
 po/ja/statistics.po            |  422 +++++------
 po/ja/sysauth.po               |    4 +-
 po/ja/tinyproxy.po             |   62 +-
 po/ja/upnp.po                  |   12 +-
 po/ja/ushare.po                |   14 +-
 po/ja/uvc_streamer.po          |    8 +-
 po/ja/uvl.po                   |   76 +-
 po/ja/wifi.po                  |   76 +-
 po/pt/admin-core.po            |  822 +++++++++++-----------
 po/pt/asterisk.po              |  500 ++++++-------
 po/pt/cbi.po                   |   32 +-
 po/pt/coovachilli.po           |  352 +++++-----
 po/pt/ddns.po                  |   14 +-
 po/pt/default.po               |  192 ++---
 po/pt/freifunk.po              |   42 +-
 po/pt/hd_idle.po               |   14 +-
 po/pt/initmgr.po               |    8 +-
 po/pt/livestats.po             |   12 +-
 po/pt/luci-fw.po               |  110 +--
 po/pt/mmc_over_gpio.po         |    6 +-
 po/pt/ntpc.po                  |   16 +-
 po/pt/olsr.po                  |  254 +++----
 po/pt/openvpn.po               |  378 +++++-----
 po/pt/p910nd.po                |    6 +-
 po/pt/polipo.po                |   84 +--
 po/pt/qos.po                   |   36 +-
 po/pt/rrdtool.po               |  136 ++--
 po/pt/samba.po                 |   32 +-
 po/pt/statistics.po            |  422 +++++------
 po/pt/sysauth.po               |    4 +-
 po/pt/tinyproxy.po             |   62 +-
 po/pt/upnp.po                  |   12 +-
 po/pt/ushare.po                |   14 +-
 po/pt/uvc_streamer.po          |    8 +-
 po/pt/uvl.po                   |   76 +-
 po/pt/wifi.po                  |   76 +-
 po/pt_BR/admin-core.po         |  826 +++++++++++-----------
 po/pt_BR/asterisk.po           |  500 ++++++-------
 po/pt_BR/cbi.po                |   32 +-
 po/pt_BR/coovachilli.po        |  352 +++++-----
 po/pt_BR/ddns.po               |   14 +-
 po/pt_BR/default.po            |  192 ++---
 po/pt_BR/freifunk.po           |   90 +--
 po/pt_BR/hd_idle.po            |   14 +-
 po/pt_BR/initmgr.po            |    8 +-
 po/pt_BR/livestats.po          |   12 +-
 po/pt_BR/luci-fw.po            |  110 +--
 po/pt_BR/mmc_over_gpio.po      |    6 +-
 po/pt_BR/ntpc.po               |   16 +-
 po/pt_BR/olsr.po               |  254 +++----
 po/pt_BR/openvpn.po            |  378 +++++-----
 po/pt_BR/p910nd.po             |    6 +-
 po/pt_BR/polipo.po             |   84 +--
 po/pt_BR/qos.po                |   36 +-
 po/pt_BR/rrdtool.po            |  136 ++--
 po/pt_BR/samba.po              |   32 +-
 po/pt_BR/statistics.po         |  422 +++++------
 po/pt_BR/sysauth.po            |    4 +-
 po/pt_BR/tinyproxy.po          |   62 +-
 po/pt_BR/upnp.po               |   12 +-
 po/pt_BR/ushare.po             |   14 +-
 po/pt_BR/uvc_streamer.po       |    8 +-
 po/pt_BR/uvl.po                |   76 +-
 po/pt_BR/wifi.po               |   76 +-
 po/ru/admin-core.po            |  822 +++++++++++-----------
 po/ru/asterisk.po              |  500 ++++++-------
 po/ru/cbi.po                   |   32 +-
 po/ru/coovachilli.po           |  352 +++++-----
 po/ru/ddns.po                  |   14 +-
 po/ru/default.po               |  192 ++---
 po/ru/freifunk.po              |   42 +-
 po/ru/hd_idle.po               |   14 +-
 po/ru/initmgr.po               |    8 +-
 po/ru/livestats.po             |   12 +-
 po/ru/luci-fw.po               |  110 +--
 po/ru/mmc_over_gpio.po         |    6 +-
 po/ru/ntpc.po                  |   16 +-
 po/ru/olsr.po                  |  254 +++----
 po/ru/openvpn.po               |  378 +++++-----
 po/ru/p910nd.po                |    6 +-
 po/ru/polipo.po                |   84 +--
 po/ru/qos.po                   |   34 +-
 po/ru/rrdtool.po               |  136 ++--
 po/ru/samba.po                 |   32 +-
 po/ru/statistics.po            |  422 +++++------
 po/ru/sysauth.po               |    4 +-
 po/ru/tinyproxy.po             |   62 +-
 po/ru/upnp.po                  |   12 +-
 po/ru/ushare.po                |   14 +-
 po/ru/uvc_streamer.po          |    8 +-
 po/ru/uvl.po                   |   76 +-
 po/ru/wifi.po                  |   76 +-
 po/templates/admin-core.pot    | 1082 ++++++++++++++--------------
 po/templates/asterisk.pot      |  581 ++++++---------
 po/templates/cbi.pot           |   36 +-
 po/templates/coovachilli.pot   |  410 +++++------
 po/templates/ddns.pot          |   16 +-
 po/templates/default.pot       |  194 ++---
 po/templates/diag_core.pot     |   23 +-
 po/templates/diag_devinfo.pot  |  232 ++----
 po/templates/freifunk.pot      |  113 +--
 po/templates/hd_idle.pot       |   16 +-
 po/templates/initmgr.pot       |   11 +-
 po/templates/livestats.pot     |   12 +-
 po/templates/luci-fw.pot       |  166 ++---
 po/templates/mmc_over_gpio.pot |   12 +-
 po/templates/ntpc.pot          |   16 +-
 po/templates/olsr.pot          |  281 ++++----
 po/templates/openvpn.pot       |  378 +++++-----
 po/templates/p910nd.pot        |    8 +-
 po/templates/polipo.pot        |  118 ++--
 po/templates/qos.pot           |   38 +-
 po/templates/rrdtool.pot       |  187 ++---
 po/templates/samba.pot         |   32 +-
 po/templates/statistics.pot    |  696 +++++-------------
 po/templates/sysauth.pot       |    4 +-
 po/templates/tinyproxy.pot     |   62 +-
 po/templates/upnp.pot          |   16 +-
 po/templates/ushare.pot        |   14 +-
 po/templates/uvc_streamer.pot  |    8 +-
 po/templates/uvl.pot           |   79 ++-
 po/templates/voice_core.pot    |   11 +-
 po/templates/voice_diag.pot    |   11 +-
 po/templates/wifi.pot          |   76 +-
 po/vi/admin-core.po            |  826 +++++++++++-----------
 po/vi/asterisk.po              |  500 ++++++-------
 po/vi/cbi.po                   |   32 +-
 po/vi/coovachilli.po           |  352 +++++-----
 po/vi/ddns.po                  |   14 +-
 po/vi/default.po               |  192 ++---
 po/vi/freifunk.po              |  106 +--
 po/vi/hd_idle.po               |   14 +-
 po/vi/initmgr.po               |    8 +-
 po/vi/livestats.po             |   12 +-
 po/vi/luci-fw.po               |  110 +--
 po/vi/mmc_over_gpio.po         |    6 +-
 po/vi/ntpc.po                  |   16 +-
 po/vi/olsr.po                  |  254 +++----
 po/vi/openvpn.po               |  378 +++++-----
 po/vi/p910nd.po                |    6 +-
 po/vi/polipo.po                |   84 +--
 po/vi/qos.po                   |   36 +-
 po/vi/rrdtool.po               |  136 ++--
 po/vi/samba.po                 |   32 +-
 po/vi/statistics.po            |  422 +++++------
 po/vi/sysauth.po               |    4 +-
 po/vi/tinyproxy.po             |   62 +-
 po/vi/upnp.po                  |   12 +-
 po/vi/ushare.po                |   14 +-
 po/vi/uvc_streamer.po          |    8 +-
 po/vi/uvl.po                   |   76 +-
 po/vi/wifi.po                  |   76 +-
 po/zh_CN/admin-core.po         |  826 +++++++++++-----------
 po/zh_CN/asterisk.po           |  500 ++++++-------
 po/zh_CN/cbi.po                |   32 +-
 po/zh_CN/ddns.po               |   14 +-
 po/zh_CN/default.po            |  192 ++---
 po/zh_CN/freifunk.po           |   90 +--
 po/zh_CN/hd_idle.po            |   14 +-
 po/zh_CN/initmgr.po            |    8 +-
 po/zh_CN/luci-fw.po            |  110 +--
 po/zh_CN/mmc_over_gpio.po      |    6 +-
 po/zh_CN/openvpn.po            |  378 +++++-----
 po/zh_CN/samba.po              |   32 +-
 po/zh_CN/statistics.po         |  422 +++++------
 po/zh_CN/sysauth.po            |    4 +-
 po/zh_CN/wifi.po               |   76 +-
 387 files changed, 26331 insertions(+), 26954 deletions(-)

diff --git a/po/ca/admin-core.po b/po/ca/admin-core.po
index 75867e3cd..e505d0286 100644
--- a/po/ca/admin-core.po
+++ b/po/ca/admin-core.po
@@ -15,22 +15,22 @@ msgstr ""
 
 #. The following changes have been applied
 #: i18n/english/luasrc/i18n/admin-core.en.lua:1
-msgid "uci_applied"
+msgid "The following changes have been applied"
 msgstr "S&#39;han aplicat els següents canvis"
 
 #. The following changes have been reverted
 #: i18n/english/luasrc/i18n/admin-core.en.lua:2
-msgid "uci_reverted"
+msgid "The following changes have been reverted"
 msgstr "S&#39;han desfet els següents canvis"
 
 #. User Interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:3
-msgid "a_i_ui"
+msgid "User Interface"
 msgstr "Interfície d&#39;usuari"
 
 #. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a collection of free Lua software including an <abbr title=\"Model-View-Controller\">MVC</abbr>-Webframework and webinterface for embedded devices. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is licensed under the Apache-License.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:4
-msgid "c_lucidesc"
+msgid "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a collection of free Lua software including an <abbr title=\"Model-View-Controller\">MVC</abbr>-Webframework and webinterface for embedded devices. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is licensed under the Apache-License."
 msgstr ""
 "<abbr title=\"Interfície de configuració Lua\">LuCI</abbr> és una col·lecció "
 "de programari lliure Lua, incloent un framework web <abbr title=\"Model-"
@@ -40,53 +40,53 @@ msgstr ""
 
 #. Project Homepage
 #: i18n/english/luasrc/i18n/admin-core.en.lua:5
-msgid "c_projecthome"
+msgid "Project Homepage"
 msgstr "Pàgina d&#39;inici del projecte"
 
 #. Lead Development
 #: i18n/english/luasrc/i18n/admin-core.en.lua:6
-msgid "c_leaddev"
+msgid "Lead Development"
 msgstr "Desenvolupadors principals"
 
 #. Contributing Developers
 #: i18n/english/luasrc/i18n/admin-core.en.lua:7
-msgid "c_contributors"
+msgid "Contributing Developers"
 msgstr "Desenvolupadors Contribuïdors"
 
 #. Thanks To
 #: i18n/english/luasrc/i18n/admin-core.en.lua:8
-msgid "c_thanksto"
+msgid "Thanks To"
 msgstr "Gràcies a"
 
 #. Hello!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:9
-msgid "a_i_i_hello"
+msgid "Hello!"
 msgstr "Hola!"
 
 #. This is the administration area of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:10
-msgid "a_i_i_admin1"
+msgid "This is the administration area of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>."
 msgstr ""
 "Aquesta és l&#39;àrea d&#39;administració de <abbr title=\"Interfície de "
 "configuració Lua\">LuCI</abbr>."
 
 #. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a free, flexible, and user friendly graphical interface for configuring OpenWrt Kamikaze.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:11
-msgid "a_i_i_admin2"
+msgid "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a free, flexible, and user friendly graphical interface for configuring OpenWrt Kamikaze."
 msgstr ""
 "<abbr title=\"Interfície de configuració Lua\">LuCI</abbr> és una interfície "
 "gràfica amigable, lliure i flexible per configurar l&#39;OpenWRT Kamikaze."
 
 #. On the following pages you can adjust all important settings of your router.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:12
-msgid "a_i_i_admin3"
+msgid "On the following pages you can adjust all important settings of your router."
 msgstr ""
 "A les pàgines següents podràs ajustar tots els paràmetres importants del teu "
 "router."
 
 #. Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> changes have to be confirmed by clicking Changes - Save &amp; Apply before being applied.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:13
-msgid "a_i_i_admin4"
+msgid "Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> changes have to be confirmed by clicking Changes - Save & Apply before being applied."
 msgstr ""
 "Alerta: A <abbr title=\"Interfície de configuració Lua\">LuCI</abbr> els "
 "canvis s&#39;han de confirmar clicant \"Canvis --> Desa &amp; Aplica\" abans "
@@ -94,36 +94,36 @@ msgstr ""
 
 #. As we always want to improve this interface we are looking forward to your feedback and suggestions.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:14
-msgid "a_i_i_admin5"
+msgid "As we always want to improve this interface we are looking forward to your feedback and suggestions."
 msgstr ""
 "Com que volem millorar aquesta interfície sempre, volem la teva opinió i els "
 "teus suggeriments."
 
 #. And now have fun with your router!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:15
-msgid "a_i_i_admin6"
+msgid "And now have fun with your router!"
 msgstr "I ara diverteix-te amb el teu router!"
 
 #. The <abbr title=\"Lua Configuration Interface\">LuCI</abbr> Team
 #: i18n/english/luasrc/i18n/admin-core.en.lua:16
-msgid "a_i_i_team"
+msgid "The <abbr title=\"Lua Configuration Interface\">LuCI</abbr> Team"
 msgstr "L&#39;equip de <abbr title=\"Interfície de configuració Lua\">LuCI</abbr>"
 
 #. Here you can customize the settings and the functionality of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:17
-msgid "a_i_luci1"
+msgid "Here you can customize the settings and the functionality of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>."
 msgstr ""
 "Aquí pots personalitzar la configuració i funcionalitats de <abbr "
 "title=\"Interfície de configuració Lua\">LuCI</abbr>"
 
 #. Post-commit actions
 #: i18n/english/luasrc/i18n/admin-core.en.lua:18
-msgid "a_i_ucicommit"
+msgid "Post-commit actions"
 msgstr "Accions Post-commit"
 
 #. These commands will be executed automatically when a given <abbr title=\"Unified Configuration Interface\">UCI</abbr> configuration is committed allowing changes to be applied instantly.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:19
-msgid "a_i_ucicommit1"
+msgid "These commands will be executed automatically when a given <abbr title=\"Unified Configuration Interface\">UCI</abbr> configuration is committed allowing changes to be applied instantly."
 msgstr ""
 "Aquestes comandes s&#39;executaran automàticament quan es publiqui una "
 "configuració <abbr title=\"Configuració d&#39;Interfície "
@@ -132,12 +132,12 @@ msgstr ""
 
 #. Files to be kept when flashing a new firmware
 #: i18n/english/luasrc/i18n/admin-core.en.lua:20
-msgid "a_i_keepflash"
+msgid "Files to be kept when flashing a new firmware"
 msgstr "Fitxers a guardar quan s&#39;actualitzi un nou firmware"
 
 #. When flashing a new firmware with <abbr title=\"Lua Configuration Interface\">LuCI</abbr> these files will be added to the new firmware installation.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:21
-msgid "a_i_keepflash1"
+msgid "When flashing a new firmware with <abbr title=\"Lua Configuration Interface\">LuCI</abbr> these files will be added to the new firmware installation."
 msgstr ""
 "Quan s&#39;actualitza un nou firmware amb un <abbr title=\"Interfície de "
 "configuració Lua\">LuCI</abbr> aquests fitxers s&#39;afegiran a la "
@@ -145,7 +145,7 @@ msgstr ""
 
 #. Here you can find information about the current system status like <abbr title=\"Central Processing Unit\">CPU</abbr> clock frequency, memory usage or network interface data.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:22
-msgid "a_st_i_status1"
+msgid "Here you can find information about the current system status like <abbr title=\"Central Processing Unit\">CPU</abbr> clock frequency, memory usage or network interface data."
 msgstr ""
 "Ací pots trobar informació sobre l&#39;estat actual del sistema, com la "
 "freqüència de rellotge de la <abbr title=\"Unitat Central de "
@@ -154,7 +154,7 @@ msgstr ""
 
 #. Also kernel or service logfiles can be viewed here to get an overview over their current state.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:23
-msgid "a_st_i_status2"
+msgid "Also kernel or service logfiles can be viewed here to get an overview over their current state."
 msgstr ""
 "Ací també es poden veure els registres del kernel o dels serveis, per tenir "
 "una vista general del seu estat actual.'iwscan = 'Escaneig <abbr "
@@ -162,89 +162,89 @@ msgstr ""
 
 #. <abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan
 #: i18n/english/luasrc/i18n/admin-core.en.lua:24
-msgid "iwscan"
+msgid "<abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan"
 msgstr "Escaneig <abbr title=\"Xarxa sense fils d&#39;àrea local\">WLAN</abbr>"
 
 #. Wifi networks in your local environment
 #: i18n/english/luasrc/i18n/admin-core.en.lua:25
-msgid "iwscan1"
+msgid "Wifi networks in your local environment"
 msgstr "Xarxes sense fils del teu entorn local"
 
 #. <abbr title=\"Encrypted\">Encr.</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:26
-msgid "iwscan_encr"
+msgid "<abbr title=\"Encrypted\">Encr.</abbr>"
 msgstr "<abbr title=\"Encriptat\">Encr.</abbr>"
 
 #. Link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:27
-msgid "iwscan_link"
+msgid "Link"
 msgstr "Enllaç"
 
 #. Signal
 #: i18n/english/luasrc/i18n/admin-core.en.lua:28
-msgid "iwscan_signal"
+msgid "Signal"
 msgstr "Senyal"
 
 #. Noise
 #: i18n/english/luasrc/i18n/admin-core.en.lua:29
-msgid "iwscan_noise"
+msgid "Noise"
 msgstr "Soroll"
 
 #. Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:30
-msgid "routes"
+msgid "Routes"
 msgstr "Rutes"
 
 #. Netmask
 #: i18n/english/luasrc/i18n/admin-core.en.lua:31
-msgid "routes_netmask"
+msgid "Netmask"
 msgstr "Màscara xarxa"
 
 #. Gateway
 #: i18n/english/luasrc/i18n/admin-core.en.lua:32
-msgid "routes_gateway"
+msgid "Gateway"
 msgstr "Passarel·la"
 
 #. Metric
 #: i18n/english/luasrc/i18n/admin-core.en.lua:33
-msgid "routes_metric"
+msgid "Metric"
 msgstr "Mètrica"
 
 #. Here you can configure the basic aspects of your device like its hostname or the timezone.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:34
-msgid "a_s_desc"
+msgid "Here you can configure the basic aspects of your device like its hostname or the timezone."
 msgstr ""
 "Ací pots configurar els aspectes bàsics del teu dispositiu, com el nom de la "
 "màquina o el fus horari."
 
 #. Software
 #: i18n/english/luasrc/i18n/admin-core.en.lua:35
-msgid "a_s_packages"
+msgid "Software"
 msgstr "Programari"
 
 #. Admin Password
 #: i18n/english/luasrc/i18n/admin-core.en.lua:36
-msgid "a_s_changepw"
+msgid "Admin Password"
 msgstr "Contrasenya d&#39;administrador"
 
 #. OPKG-Configuration
 #: i18n/english/luasrc/i18n/admin-core.en.lua:37
-msgid "a_s_p_ipkg"
+msgid "OPKG-Configuration"
 msgstr "Configuració d&#39;OPKG"
 
 #. <abbr title=\"Secure Shell\">SSH</abbr>-Keys
 #: i18n/english/luasrc/i18n/admin-core.en.lua:38
-msgid "a_s_sshkeys"
+msgid "<abbr title=\"Secure Shell\">SSH</abbr>-Keys"
 msgstr "Claus <abbr title=\"Secure Shell\">SSH</abbr>"
 
 #. Mount Points
 #: i18n/english/luasrc/i18n/admin-core.en.lua:39
-msgid "a_s_fstab"
+msgid "Mount Points"
 msgstr "Punts de muntatge"
 
 #. Change settings related to the system itself, its identification, installed hard- and software, authentication or mount points.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:40
-msgid "a_s_i_system1"
+msgid "Change settings related to the system itself, its identification, installed hard- and software, authentication or mount points."
 msgstr ""
 "Canvia la configuració relacionada amb el mateix sistema, la seva "
 "identificació, el maquinari i programari instal·lats, autenticació i punts "
@@ -252,486 +252,486 @@ msgstr ""
 
 #. These settings define the base of your system.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:41
-msgid "a_s_i_system2"
+msgid "These settings define the base of your system."
 msgstr "Aquests paràmetres defineixen la base del teu sistema."
 
 #. Pay attention as any misconfiguration here may prevent your device from booting or may lock yourself out of it.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:42
-msgid "a_s_i_system3"
+msgid "Pay attention as any misconfiguration here may prevent your device from booting or may lock yourself out of it."
 msgstr ""
 "Estigues atent perquè qualsevol mal configuració ací pot impedir arrancar al "
 "teu dispositiu, o et pot fer fora a tu del mateix."
 
 #. Interfaces
 #: i18n/english/luasrc/i18n/admin-core.en.lua:43
-msgid "a_s_if"
+msgid "Interfaces"
 msgstr "Interfícies"
 
 #. Bridge
 #: i18n/english/luasrc/i18n/admin-core.en.lua:44
-msgid "a_s_if_bridge"
+msgid "Bridge"
 msgstr "Pont"
 
 #. ID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:45
-msgid "a_s_if_bridge_id"
+msgid "ID"
 msgstr "ID"
 
 #. Bridge Port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:46
-msgid "a_s_if_bridge_port"
+msgid "Bridge Port"
 msgstr "Port de pont"
 
 #. STP
 #: i18n/english/luasrc/i18n/admin-core.en.lua:47
-msgid "a_s_if_bridge_stp"
+msgid "STP"
 msgstr "STP"
 
 #. Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:48
-msgid "a_s_if_device"
+msgid "Device"
 msgstr "Dispositiu"
 
 #. Ethernet Bridge
 #: i18n/english/luasrc/i18n/admin-core.en.lua:49
-msgid "a_s_if_ethbridge"
+msgid "Ethernet Bridge"
 msgstr "Pont Ethernet"
 
 #. Ethernet Adapter
 #: i18n/english/luasrc/i18n/admin-core.en.lua:50
-msgid "a_s_if_ethdev"
+msgid "Ethernet Adapter"
 msgstr "Adaptador Ethernet"
 
 #. Ethernet Switch
 #: i18n/english/luasrc/i18n/admin-core.en.lua:51
-msgid "a_s_if_ethswitch"
+msgid "Ethernet Switch"
 msgstr "Switch Ethernet"
 
 #. Interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:52
-msgid "a_s_if_interface"
+msgid "Interface"
 msgstr "Interfície"
 
 #. IP Configuration
 #: i18n/english/luasrc/i18n/admin-core.en.lua:53
-msgid "a_s_if_ipconfig"
+msgid "IP Configuration"
 msgstr "Configuració IP"
 
 #. Alias
 #: i18n/english/luasrc/i18n/admin-core.en.lua:54
-msgid "a_s_if_ipconfig_alias"
+msgid "Alias"
 msgstr "Àlies"
 
 #. DHCP assigned
 #: i18n/english/luasrc/i18n/admin-core.en.lua:55
-msgid "a_s_if_ipconfig_dhcp"
+msgid "DHCP assigned"
 msgstr "DHCP assignat"
 
 #. IPv6
 #: i18n/english/luasrc/i18n/admin-core.en.lua:56
-msgid "a_s_if_ipconfig_ipv6"
+msgid "IPv6"
 msgstr "IPv6"
 
 #. Not configured
 #: i18n/english/luasrc/i18n/admin-core.en.lua:57
-msgid "a_s_if_ipconfig_none"
+msgid "Not configured"
 msgstr "No configurat"
 
 #. Primary
 #: i18n/english/luasrc/i18n/admin-core.en.lua:58
-msgid "a_s_if_ipconfig_primary"
+msgid "Primary"
 msgstr "Primari"
 
 #. Channel
 #: i18n/english/luasrc/i18n/admin-core.en.lua:59
-msgid "a_s_if_iwchannel"
+msgid "Channel"
 msgstr "Canal"
 
 #. Mode
 #: i18n/english/luasrc/i18n/admin-core.en.lua:60
-msgid "a_s_if_iwmode"
+msgid "Mode"
 msgstr "Mode"
 
 #. Ad-Hoc
 #: i18n/english/luasrc/i18n/admin-core.en.lua:61
-msgid "a_s_if_iwmode_adhoc"
+msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
 #. Pseudo Ad-Hoc
 #: i18n/english/luasrc/i18n/admin-core.en.lua:62
-msgid "a_s_if_iwmode_ahdemo"
+msgid "Pseudo Ad-Hoc"
 msgstr "Pseudo Ad-Hoc"
 
 #. Master
 #: i18n/english/luasrc/i18n/admin-core.en.lua:63
-msgid "a_s_if_iwmode_ap"
+msgid "Master"
 msgstr "Master"
 
 #. Master + WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:64
-msgid "a_s_if_iwmode_apwds"
+msgid "Master + WDS"
 msgstr "Master + WDS"
 
 #. Client
 #: i18n/english/luasrc/i18n/admin-core.en.lua:65
-msgid "a_s_if_iwmode_sta"
+msgid "Client"
 msgstr "Client"
 
 #. Client + WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:66
-msgid "a_s_if_iwmode_stawds"
+msgid "Client + WDS"
 msgstr "Client + WDS"
 
 #. WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:67
-msgid "a_s_if_iwmode_wds"
+msgid "WDS"
 msgstr "WDS"
 
 #. SSID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:68
-msgid "a_s_if_iwssid"
+msgid "SSID"
 msgstr "SSID"
 
 #. MAC
 #: i18n/english/luasrc/i18n/admin-core.en.lua:69
-msgid "a_s_if_mac"
+msgid "MAC"
 msgstr "MAC"
 
 #. Pkts.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:70
-msgid "a_s_if_pkts"
+msgid "Pkts."
 msgstr "Pqts."
 
 #. Interface Status
 #: i18n/english/luasrc/i18n/admin-core.en.lua:71
-msgid "a_s_if_status"
+msgid "Interface Status"
 msgstr "Estat d'Interfície"
 
 #. Transfer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:72
-msgid "a_s_if_transfer"
+msgid "Transfer"
 msgstr "Transferència"
 
 #. RX
 #: i18n/english/luasrc/i18n/admin-core.en.lua:73
-msgid "a_s_if_transfer_rx"
+msgid "RX"
 msgstr "RX"
 
 #. TX
 #: i18n/english/luasrc/i18n/admin-core.en.lua:74
-msgid "a_s_if_transfer_tx"
+msgid "TX"
 msgstr "TX"
 
 #. Type
 #: i18n/english/luasrc/i18n/admin-core.en.lua:75
-msgid "a_s_if_type"
+msgid "Type"
 msgstr "Tipus"
 
 #. VLAN
 #: i18n/english/luasrc/i18n/admin-core.en.lua:76
-msgid "a_s_if_vlan"
+msgid "VLAN"
 msgstr "VLAN"
 
 #. Ports
 #: i18n/english/luasrc/i18n/admin-core.en.lua:77
-msgid "a_s_if_vlanports"
+msgid "Ports"
 msgstr "Ports"
 
 #. Wireless Adapter
 #: i18n/english/luasrc/i18n/admin-core.en.lua:78
-msgid "a_s_if_wifidev"
+msgid "Wireless Adapter"
 msgstr "Adaptador sense fils"
 
 #. Firewall
 #: i18n/english/luasrc/i18n/admin-core.en.lua:79
-msgid "a_s_ipt"
+msgid "Firewall"
 msgstr "Tallafocs"
 
 #. Actions
 #: i18n/english/luasrc/i18n/admin-core.en.lua:80
-msgid "a_s_ipt_actions"
+msgid "Actions"
 msgstr "Accions"
 
 #. Traffic
 #: i18n/english/luasrc/i18n/admin-core.en.lua:81
-msgid "a_s_ipt_bytes"
+msgid "Traffic"
 msgstr "Tràfic"
 
 #. Chain
 #: i18n/english/luasrc/i18n/admin-core.en.lua:82
-msgid "a_s_ipt_chain"
+msgid "Chain"
 msgstr "Cadena"
 
 #. Destination
 #: i18n/english/luasrc/i18n/admin-core.en.lua:83
-msgid "a_s_ipt_destination"
+msgid "Destination"
 msgstr "Destí"
 
 #. Flags
 #: i18n/english/luasrc/i18n/admin-core.en.lua:84
-msgid "a_s_ipt_flags"
+msgid "Flags"
 msgstr "Flags"
 
 #. In
 #: i18n/english/luasrc/i18n/admin-core.en.lua:85
-msgid "a_s_ipt_inputif"
+msgid "In"
 msgstr "In"
 
 #. No chains in this table
 #: i18n/english/luasrc/i18n/admin-core.en.lua:86
-msgid "a_s_ipt_nochains"
+msgid "No chains in this table"
 msgstr "No hi ha cadenes a aquesta taula"
 
 #. No Rules in this chain
 #: i18n/english/luasrc/i18n/admin-core.en.lua:87
-msgid "a_s_ipt_norules"
+msgid "No Rules in this chain"
 msgstr "No hi ha regles en aquesta cadena"
 
 #. Options
 #: i18n/english/luasrc/i18n/admin-core.en.lua:88
-msgid "a_s_ipt_options"
+msgid "Options"
 msgstr "Opcions"
 
 #. Out
 #: i18n/english/luasrc/i18n/admin-core.en.lua:89
-msgid "a_s_ipt_outputif"
+msgid "Out"
 msgstr "Out"
 
 #. Packets
 #: i18n/english/luasrc/i18n/admin-core.en.lua:90
-msgid "a_s_ipt_packets"
+msgid "Packets"
 msgstr "Paquets"
 
 #. Pkts.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:91
-msgid "a_s_ipt_pkts"
+msgid "Pkts."
 msgstr "Pqts."
 
 #. Policy
 #: i18n/english/luasrc/i18n/admin-core.en.lua:92
-msgid "a_s_ipt_policy"
+msgid "Policy"
 msgstr "Política"
 
 #. Prot.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:93
-msgid "a_s_ipt_prot"
+msgid "Prot."
 msgstr "Prot."
 
 #. References
 #: i18n/english/luasrc/i18n/admin-core.en.lua:94
-msgid "a_s_ipt_references"
+msgid "References"
 msgstr "Referències"
 
 #. Reset Counters
 #: i18n/english/luasrc/i18n/admin-core.en.lua:95
-msgid "a_s_ipt_reset"
+msgid "Reset Counters"
 msgstr "Reinicia Comptadors"
 
 #. Restart Firewall
 #: i18n/english/luasrc/i18n/admin-core.en.lua:96
-msgid "a_s_ipt_restart"
+msgid "Restart Firewall"
 msgstr "Reinicia Tallafocs"
 
 #. #
 #: i18n/english/luasrc/i18n/admin-core.en.lua:97
-msgid "a_s_ipt_rulenum"
+msgid "#"
 msgstr "#"
 
 #. Source
 #: i18n/english/luasrc/i18n/admin-core.en.lua:98
-msgid "a_s_ipt_source"
+msgid "Source"
 msgstr "Origen"
 
 #. Firewall Status
 #: i18n/english/luasrc/i18n/admin-core.en.lua:99
-msgid "a_s_ipt_status"
+msgid "Firewall Status"
 msgstr "Estat del tallafocs"
 
 #. Table
 #: i18n/english/luasrc/i18n/admin-core.en.lua:100
-msgid "a_s_ipt_table"
+msgid "Table"
 msgstr "Taula"
 
 #. Target
 #: i18n/english/luasrc/i18n/admin-core.en.lua:101
-msgid "a_s_ipt_target"
+msgid "Target"
 msgstr "Destí"
 
 #. Perform Actions
 #: i18n/english/luasrc/i18n/admin-core.en.lua:102
-msgid "a_s_packages_do"
+msgid "Perform Actions"
 msgstr "Realitza accions"
 
 #. Install
 #: i18n/english/luasrc/i18n/admin-core.en.lua:103
-msgid "a_s_packages_install"
+msgid "Install"
 msgstr "Instal·la"
 
 #. Download and install package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:104
-msgid "a_s_packages_installurl"
+msgid "Download and install package"
 msgstr "Descarrega i instal·la el paquet"
 
 #. Edit package lists and installation targets
 #: i18n/english/luasrc/i18n/admin-core.en.lua:105
-msgid "a_s_packages_ipkg"
+msgid "Edit package lists and installation targets"
 msgstr "Edita llistes de paquets i destins d&#39;instal·lació"
 
 #. Package name
 #: i18n/english/luasrc/i18n/admin-core.en.lua:106
-msgid "a_s_packages_name"
+msgid "Package name"
 msgstr "Nom del paquet"
 
 #. Remove
 #: i18n/english/luasrc/i18n/admin-core.en.lua:107
-msgid "a_s_packages_remove"
+msgid "Remove"
 msgstr "Esborra"
 
 #. Find package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:108
-msgid "a_s_packages_search"
+msgid "Find package"
 msgstr "Cerca paquet"
 
 #. Package lists updated
 #: i18n/english/luasrc/i18n/admin-core.en.lua:109
-msgid "a_s_packages_update"
+msgid "Package lists updated"
 msgstr "Llistes de paquets actualitzades"
 
 #. Update package lists
 #: i18n/english/luasrc/i18n/admin-core.en.lua:110
-msgid "a_s_packages_updatelist"
+msgid "Update package lists"
 msgstr "Actualitza llistes de paquets"
 
 #. Upgrade installed packages
 #: i18n/english/luasrc/i18n/admin-core.en.lua:111
-msgid "a_s_packages_upgrade"
+msgid "Upgrade installed packages"
 msgstr "Actualitza paquets instal·lats"
 
 #. Could not set default destination
 #: i18n/english/luasrc/i18n/admin-core.en.lua:112
-msgid "a_s_packages_code1"
+msgid "Could not set default destination"
 msgstr "No s'ha pogut establir el destí per defecte"
 
 #. Error parsing config file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:113
-msgid "a_s_packages_code2"
+msgid "Error parsing config file"
 msgstr "Error analitzant el fitxer de configuració"
 
 #. Could not create temporary directory (ran out of space?)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:114
-msgid "a_s_packages_code3"
+msgid "Could not create temporary directory (ran out of space?)"
 msgstr "No s'ha pogut crea el directori temporal (no hi ha prou espai?)"
 
 #. Could not get adminstrative lock (ran out of space?)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:115
-msgid "a_s_packages_code4"
+msgid "Could not get adminstrative lock (ran out of space?)"
 msgstr "No s'ha pogut crear el bloqueig d'administració (no hi ha prou espai?)"
 
 #. Unsatisfied Dependencies
 #: i18n/english/luasrc/i18n/admin-core.en.lua:116
-msgid "a_s_packages_code5"
+msgid "Unsatisfied Dependencies"
 msgstr "Dependències per satisfer"
 
 #. Refused to remove essential package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:117
-msgid "a_s_packages_code6"
+msgid "Refused to remove essential package"
 msgstr "S'ha rebutjat esborrar paquets essencials"
 
 #. Package has dependents
 #: i18n/english/luasrc/i18n/admin-core.en.lua:118
-msgid "a_s_packages_code7"
+msgid "Package has dependents"
 msgstr "El paquet té dependents"
 
 #. Package has no installation candidate (wrong name?)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:119
-msgid "a_s_packages_code8"
+msgid "Package has no installation candidate (wrong name?)"
 msgstr "El paquet no té candidat d'instal·lació (nom equivocat?)"
 
 #. Package has no available architecture 
 #: i18n/english/luasrc/i18n/admin-core.en.lua:120
-msgid "a_s_packages_code9"
+msgid "Package has no available architecture "
 msgstr "El paquet no té cap arquitectura disponible"
 
 #. Package is not trusted
 #: i18n/english/luasrc/i18n/admin-core.en.lua:121
-msgid "a_s_packages_code10"
+msgid "Package is not trusted"
 msgstr "No es confia en el paquet"
 
 #. Error while downloading
 #: i18n/english/luasrc/i18n/admin-core.en.lua:122
-msgid "a_s_packages_code11"
+msgid "Error while downloading"
 msgstr "Error mentre es descarregava"
 
 #. Conflicts with other packages
 #: i18n/english/luasrc/i18n/admin-core.en.lua:123
-msgid "a_s_packages_code12"
+msgid "Conflicts with other packages"
 msgstr "Té conflictes amb altres paquets"
 
 #. Package is already installed
 #: i18n/english/luasrc/i18n/admin-core.en.lua:124
-msgid "a_s_packages_code13"
+msgid "Package is already installed"
 msgstr "El paquet ja està instal·lat"
 
 #. Package has unresolved dependencies
 #: i18n/english/luasrc/i18n/admin-core.en.lua:125
-msgid "a_s_packages_code14"
+msgid "Package has unresolved dependencies"
 msgstr "El paquet té dependències sense resoldre"
 
 #. Refused to downgrade package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:126
-msgid "a_s_packages_code15"
+msgid "Refused to downgrade package"
 msgstr "S'ha rebutjat rebaixar la versió del paquet"
 
 #. Package manager ran out of space
 #: i18n/english/luasrc/i18n/admin-core.en.lua:127
-msgid "a_s_packages_code16"
+msgid "Package manager ran out of space"
 msgstr "El gestor de paquets s'ha quedat sense espai"
 
 #. Bad signature while verifiying package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:128
-msgid "a_s_packages_code17"
+msgid "Bad signature while verifiying package"
 msgstr "Signatura dolenta mentre es verificava el paquet"
 
 #. MD5 error while verifiying package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:129
-msgid "a_s_packages_code18"
+msgid "MD5 error while verifiying package"
 msgstr "Error MD5 mentre es verificava el paquet"
 
 #. Internal error occured
 #: i18n/english/luasrc/i18n/admin-core.en.lua:130
-msgid "a_s_packages_code19"
+msgid "Internal error occured"
 msgstr "S'ha produït un error intern"
 
 #. Package lists
 #: i18n/english/luasrc/i18n/admin-core.en.lua:131
-msgid "a_s_p_ipkg_pkglists"
+msgid "Package lists"
 msgstr "Llistes de paquets"
 
 #. Installation targets
 #: i18n/english/luasrc/i18n/admin-core.en.lua:132
-msgid "a_s_p_ipkg_targets"
+msgid "Installation targets"
 msgstr "Objectius d'instal·lació"
 
 #. Change the password of the system administrator (User <code>root</code>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:133
-msgid "a_s_changepw1"
+msgid "Change the password of the system administrator (User <code>root</code>)"
 msgstr ""
 "Canvia la contrasenya de l'administrador del sistema (Usuari "
 "<code>root</code>)"
 
 #. Password successfully changed
 #: i18n/english/luasrc/i18n/admin-core.en.lua:134
-msgid "a_s_changepw_changed"
+msgid "Password successfully changed"
 msgstr "Contrasenya canviada amb èxit"
 
 #. Error: Passwords do not match
 #: i18n/english/luasrc/i18n/admin-core.en.lua:135
-msgid "a_s_changepw_nomatch"
+msgid "Error: Passwords do not match"
 msgstr "Error: Les contrasenyes no coincideixen"
 
 #. Here you can paste public <abbr title=\"Secure Shell\">SSH</abbr>-Keys (one per line) for <abbr title=\"Secure Shell\">SSH</abbr> public-key authentication.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:136
-msgid "a_s_sshkeys1"
+msgid "Here you can paste public <abbr title=\"Secure Shell\">SSH</abbr>-Keys (one per line) for <abbr title=\"Secure Shell\">SSH</abbr> public-key authentication."
 msgstr ""
 "Ací pots enganxar les claus públiques <abbr title=\"Secure Shell\">SSH</abbr> "
 "(una per línia) per l'autenticació <abbr title=\"Secure Shell\">SSH</abbr> per "
@@ -739,46 +739,46 @@ msgstr ""
 
 #. Mount Points
 #: i18n/english/luasrc/i18n/admin-core.en.lua:137
-msgid "a_s_fstab_mountpoints"
+msgid "Mount Points"
 msgstr "Punts de muntatge"
 
 #. Mount Points define at which point a memory device will be attached to the filesystem
 #: i18n/english/luasrc/i18n/admin-core.en.lua:138
-msgid "a_s_fstab_mountpoints1"
+msgid "Mount Points define at which point a memory device will be attached to the filesystem"
 msgstr ""
 "Els punts de muntatge defineixen en quin punt un dispositiu de memòria "
 "s'adjuntarà amb el sistema de fitxers"
 
 #. Mounted file systems
 #: i18n/english/luasrc/i18n/admin-core.en.lua:139
-msgid "a_s_fstab_active"
+msgid "Mounted file systems"
 msgstr "Sistemes de fitxers muntats"
 
 #. Used
 #: i18n/english/luasrc/i18n/admin-core.en.lua:140
-msgid "a_s_fstab_used"
+msgid "Used"
 msgstr "Usat"
 
 #. Available
 #: i18n/english/luasrc/i18n/admin-core.en.lua:141
-msgid "a_s_fstab_avail"
+msgid "Available"
 msgstr "Disponible"
 
 #. Mount Point
 #: i18n/english/luasrc/i18n/admin-core.en.lua:142
-msgid "a_s_fstab_mountpoint"
+msgid "Mount Point"
 msgstr "Punt de muntatge"
 
 #. The device file of the memory or partition (<abbr title=\"for example\">e.g.</abbr> <code>/dev/sda1</code>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:143
-msgid "a_s_fstab_device1"
+msgid "The device file of the memory or partition (<abbr title=\"for example\">e.g.</abbr> <code>/dev/sda1</code>)"
 msgstr ""
 "El fitxer de dispositiu de la memòria o partició (<abbr title=\"per "
 "exemple\">p.e.</abbr> <code>/dev/sda1</code>)"
 
 #. The filesystem that was used to format the memory (<abbr title=\"for example\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></samp>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:144
-msgid "a_s_fstab_fs1"
+msgid "The filesystem that was used to format the memory (<abbr title=\"for example\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></samp>)"
 msgstr ""
 "El sistema the fitxers que es va fer servir per formatar la memòria (<abbr "
 "title=\"per exemple example\">p.e.</abbr> <samp><abbr title=\"Third Extended "
@@ -786,7 +786,7 @@ msgstr ""
 
 #. If your physical memory is insufficient unused data can be temporarily swapped to a swap-device resulting in a higher amount of usable <abbr title=\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very slow process as the swap-device cannot be accessed with the high datarates of the <abbr title=\"Random Access Memory\">RAM</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:145
-msgid "a_s_fstab_swap1"
+msgid "If your physical memory is insufficient unused data can be temporarily swapped to a swap-device resulting in a higher amount of usable <abbr title=\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very slow process as the swap-device cannot be accessed with the high datarates of the <abbr title=\"Random Access Memory\">RAM</abbr>."
 msgstr ""
 "Si la teva memòria física és insuficient, les dades no usades es poden "
 "intercanviar a un dispositiu d'intercanvi, pel qual hi haurà una quantitat "
@@ -797,88 +797,88 @@ msgstr ""
 
 #. Reboots the operating system of your device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:146
-msgid "a_s_reboot1"
+msgid "Reboots the operating system of your device"
 msgstr "Arranca de nou el sistema operatiu del teu dispositiu"
 
 #. Perform reboot
 #: i18n/english/luasrc/i18n/admin-core.en.lua:147
-msgid "a_s_reboot_do"
+msgid "Perform reboot"
 msgstr "Arranca de nou"
 
 #. Please wait: Device rebooting...
 #: i18n/english/luasrc/i18n/admin-core.en.lua:148
-msgid "a_s_reboot_running"
+msgid "Please wait: Device rebooting..."
 msgstr "Si us plau espera: Dispositiu arrancant-se de nou"
 
 #. Warning: There are unsaved changes that will be lost while rebooting!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:149
-msgid "a_s_reboot_u"
+msgid "Warning: There are unsaved changes that will be lost while rebooting!"
 msgstr ""
 "Alerta: Hi ha canvis que no s'han desat i que es perdran mentre s'arranca de "
 "nou!"
 
 #. Changes applied.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:150
-msgid "a_s_applyreboot1"
+msgid "Changes applied."
 msgstr "Canvis aplicats."
 
 #. Backup / Restore
 #: i18n/english/luasrc/i18n/admin-core.en.lua:151
-msgid "a_s_backup"
+msgid "Backup / Restore"
 msgstr "Fes còpia de seguretat / Restaura"
 
 #. Create backup
 #: i18n/english/luasrc/i18n/admin-core.en.lua:152
-msgid "a_s_backup_backup"
+msgid "Create backup"
 msgstr "Crea còpia de seguretat"
 
 #. Backup Archive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:153
-msgid "a_s_backup_archive"
+msgid "Backup Archive"
 msgstr "Arxiu de seguretat"
 
 #. Reset router to defaults
 #: i18n/english/luasrc/i18n/admin-core.en.lua:154
-msgid "a_s_backup_reset"
+msgid "Reset router to defaults"
 msgstr "Reinicia els valors per defecte del router"
 
 #. Proceed reverting all settings and resetting to firmware defaults?
 #: i18n/english/luasrc/i18n/admin-core.en.lua:155
-msgid "a_s_backup_reset1"
+msgid "Proceed reverting all settings and resetting to firmware defaults?"
 msgstr ""
 "Continua desfent tots els paràmetres i reiniciant els valors per defecte del "
 "firmware?"
 
 #. Restore backup
 #: i18n/english/luasrc/i18n/admin-core.en.lua:156
-msgid "a_s_backup_restore"
+msgid "Restore backup"
 msgstr "Restaura còpia de seguretat"
 
 #. Here you can backup and restore your router configuration and - if possible - reset the router to the default settings.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:157
-msgid "a_s_backup1"
+msgid "Here you can backup and restore your router configuration and - if possible - reset the router to the default settings."
 msgstr ""
 "Ací pots crear una còpia de seguretat i restaurar la teva configuració del "
 "router i - si és possible - reiniciar el router als paràmetres per defecte."
 
 #. <abbr title=\"Hypertext Transfer Protocol\">HTTP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:158
-msgid "a_srv_http"
+msgid "<abbr title=\"Hypertext Transfer Protocol\">HTTP</abbr>-Server"
 msgstr "Servidor <abbr title=\"Hypertext Transfer Protocol\">HTTP</abbr>"
 
 #. <abbr title=\"Secure Shell\">SSH</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:159
-msgid "a_srv_ssh"
+msgid "<abbr title=\"Secure Shell\">SSH</abbr>-Server"
 msgstr "Servidor <abbr title=\"Secure Shell\">SSH</abbr>"
 
 #. Services and daemons perform certain tasks on your device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:160
-msgid "a_srv_services1"
+msgid "Services and daemons perform certain tasks on your device."
 msgstr "Els serveis i dimonis realitzen certes tasques al teu dispositiu."
 
 #. Most of them are network servers, that offer a certain service for your device or network like shell access, serving webpages like <abbr title=\"Lua Configuration Interface\">LuCI</abbr>, doing mesh routing, sending e-mails, ...
 #: i18n/english/luasrc/i18n/admin-core.en.lua:161
-msgid "a_srv_services2"
+msgid "Most of them are network servers, that offer a certain service for your device or network like shell access, serving webpages like <abbr title=\"Lua Configuration Interface\">LuCI</abbr>, doing mesh routing, sending e-mails, ..."
 msgstr ""
 "La majoria d'ells són servidors de xarxa, que ofereixen un cert servei pel "
 "teu dispositiu o xarxa, com l'accés a consola, servir pàgines web com el "
@@ -887,87 +887,87 @@ msgstr ""
 
 #. A small webserver which can be used to serve <abbr title=\"Lua Configuration Interface\">LuCI</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:162
-msgid "a_srv_http1"
+msgid "A small webserver which can be used to serve <abbr title=\"Lua Configuration Interface\">LuCI</abbr>."
 msgstr ""
 "Un servidor web petit, que es pot fer servir per servir el <abbr "
 "title=\"Interfície de configuració Lua\">LuCI</abbr>."
 
 #. Authentication Realm
 #: i18n/english/luasrc/i18n/admin-core.en.lua:163
-msgid "a_srv_http_authrealm"
+msgid "Authentication Realm"
 msgstr "Reialme d'Autenticació"
 
 #. The realm which will be displayed at the authentication prompt for protected pages.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:164
-msgid "a_srv_http_authrealm1"
+msgid "The realm which will be displayed at the authentication prompt for protected pages."
 msgstr ""
 "El reialme que es mostrarà a la sol·licitiu d'autenticació per pàgines "
 "protegides."
 
 #. defaults to <code>/etc/httpd.conf</code>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:165
-msgid "a_srv_http_config1"
+msgid "defaults to <code>/etc/httpd.conf</code>"
 msgstr "per defecte a <code>/etc/httpd.conf</code>"
 
 #. Document root
 #: i18n/english/luasrc/i18n/admin-core.en.lua:166
-msgid "a_srv_http_root"
+msgid "Document root"
 msgstr "Arrel del document"
 
 #. Enable Keep-Alive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:167
-msgid "a_srv_http_keepalive"
+msgid "Enable Keep-Alive"
 msgstr "Activa el Keep-Alive"
 
 #. Connection timeout
 #: i18n/english/luasrc/i18n/admin-core.en.lua:168
-msgid "a_srv_http_timeout"
+msgid "Connection timeout"
 msgstr "Temps d'espera de la connexió excedit"
 
 #. Plugin path
 #: i18n/english/luasrc/i18n/admin-core.en.lua:169
-msgid "a_srv_http_path"
+msgid "Plugin path"
 msgstr "Directori de connectors"
 
 #. A lightweight HTTP/1.1 webserver written in C and Lua designed to serve LuCI
 #: i18n/english/luasrc/i18n/admin-core.en.lua:170
-msgid "a_srv_lucittpd"
+msgid "A lightweight HTTP/1.1 webserver written in C and Lua designed to serve LuCI"
 msgstr ""
 "Un servidor web HTTP/1.1 lleuger escrit en C i LUA dissenyat per servir LuCI"
 
 #. Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:171
-msgid "a_srv_dropbear1"
+msgid "Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
 msgstr ""
 "El Dropbear ofereix accés per la xarxa a consola <abbr title=\"Secure "
 "Shell\">SSH</abbr>i un servidor <abbr title=\"Secure Copy\">SCP</abbr> integrat"
 
 #. Password authentication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:172
-msgid "a_srv_d_pwauth"
+msgid "Password authentication"
 msgstr "Autenticació per contrasenya"
 
 #. Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:173
-msgid "a_srv_d_pwauth1"
+msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
 msgstr ""
 "Permet autenticació <abbr title=\"Secure Shell\">SSH</abbr> per contrasenya"
 
 #. Channel
 #: i18n/english/luasrc/i18n/admin-core.en.lua:174
-msgid "a_w_channel"
+msgid "Channel"
 msgstr "Canal"
 
 #. On this pages you can find configuration options for <abbr title=\"Wireless Local Area Network\">WLAN</abbr> based wireless networks.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:175
-msgid "a_w_wifi1"
+msgid "On this pages you can find configuration options for <abbr title=\"Wireless Local Area Network\">WLAN</abbr> based wireless networks."
 msgstr ""
 "En aquestes pàgines pots trobar els paràmetres de configuració per les "
 "xarxes sense fils <abbr title=\"Xarxes sense fils d'àrea local\">WLAN</abbr>."
 
 #. You can easily integrate your 802.11a/b/g/n-devices into your physical network and use the virtual adapter support to build wireless repeaters or offer several networks with one device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:176
-msgid "a_w_wifi2"
+msgid "You can easily integrate your 802.11a/b/g/n-devices into your physical network and use the virtual adapter support to build wireless repeaters or offer several networks with one device."
 msgstr ""
 "Pots integrar fàcilment els teus dispositius 802.11a/b/g/n a la teva xarxa "
 "física i fer servir el suport de l'adaptador virtual per fer repetidors "
@@ -975,7 +975,7 @@ msgstr ""
 
 #. There is support for Managed, Client, Ad-Hoc and <abbr title=\"Wireless Distribution System\">WDS</abbr> operating modes as well as <abbr title=\"Wi-Fi Protected Access\">WPA</abbr> and <abbr title=\"Wi-Fi Protected Access 2\">WPA2</abbr> encryption for secure communnication.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:177
-msgid "a_w_wifi3"
+msgid "There is support for Managed, Client, Ad-Hoc and <abbr title=\"Wireless Distribution System\">WDS</abbr> operating modes as well as <abbr title=\"Wi-Fi Protected Access\">WPA</abbr> and <abbr title=\"Wi-Fi Protected Access 2\">WPA2</abbr> encryption for secure communnication."
 msgstr ""
 "Existeix suport pels modes operatius de Managed, Client, Ad-Hoc i <abbr "
 "title=\"Wireless Distribution System\">WDS</abbr> així com encriptació <abbr "
@@ -984,42 +984,42 @@ msgstr ""
 
 #. Here you can configure installed wifi devices.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:178
-msgid "a_w_devices1"
+msgid "Here you can configure installed wifi devices."
 msgstr "Ací pots configurar els dispositius sense fils instal·lats."
 
 #. Transmit Antenna
 #: i18n/english/luasrc/i18n/admin-core.en.lua:179
-msgid "a_w_txantenna"
+msgid "Transmit Antenna"
 msgstr "Antena de transmissió"
 
 #. Receive Antenna
 #: i18n/english/luasrc/i18n/admin-core.en.lua:180
-msgid "a_w_rxantenna"
+msgid "Receive Antenna"
 msgstr "Antena de recepció"
 
 #. Distance to furthest station (in meter)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:181
-msgid "a_w_distance1"
+msgid "Distance to furthest station (in meter)"
 msgstr "Distància a l'estació més llunyana (en metres)"
 
 #. Diversity
 #: i18n/english/luasrc/i18n/admin-core.en.lua:182
-msgid "a_w_diversity"
+msgid "Diversity"
 msgstr "Diversitat"
 
 #. Country Code
 #: i18n/english/luasrc/i18n/admin-core.en.lua:183
-msgid "a_w_countrycode"
+msgid "Country Code"
 msgstr "Codi de País"
 
 #. Connection Limit
 #: i18n/english/luasrc/i18n/admin-core.en.lua:184
-msgid "a_w_connlimit"
+msgid "Connection Limit"
 msgstr "Límit de connexió"
 
 #. You can run several wifi networks with one device. Be aware that there are certain hardware and driverspecific restrictions. Normally you can operate 1 Ad-Hoc or up to 3 Master-Mode and 1 Client-Mode network simultaneously.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:185
-msgid "a_w_networks1"
+msgid "You can run several wifi networks with one device. Be aware that there are certain hardware and driverspecific restrictions. Normally you can operate 1 Ad-Hoc or up to 3 Master-Mode and 1 Client-Mode network simultaneously."
 msgstr ""
 "Pots fer servir diverses xarxes sense fils amb un sol dispositiu. Tingues en "
 "compte que hi ha certes restriccions específiques del maquinari i dels "
@@ -1029,93 +1029,93 @@ msgstr ""
 
 #. Network Name (<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:186
-msgid "a_w_netid"
+msgid "Network Name (<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>)"
 msgstr ""
 "Nom de Xarxa (<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>)"
 
 #. Add the Wifi network to physical network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:187
-msgid "a_w_network1"
+msgid "Add the Wifi network to physical network"
 msgstr "Afegeix la xarxa sense fils a la xarxa física"
 
 #.  - Create new Network - 
 #: i18n/english/luasrc/i18n/admin-core.en.lua:188
-msgid "a_w_netmanual"
+msgid " - Create new Network - "
 msgstr " - Crea una xarxa nova - "
 
 #. Transmit Power
 #: i18n/english/luasrc/i18n/admin-core.en.lua:189
-msgid "a_w_txpwr"
+msgid "Transmit Power"
 msgstr "Potència de transmissió"
 
 #. Broadcom Frameburst
 #: i18n/english/luasrc/i18n/admin-core.en.lua:190
-msgid "a_w_brcmburst"
+msgid "Broadcom Frameburst"
 msgstr "Frameburst de Broadcom"
 
 #. Atheros Frameburst
 #: i18n/english/luasrc/i18n/admin-core.en.lua:191
-msgid "a_w_athburst"
+msgid "Atheros Frameburst"
 msgstr "Frameburst d'Atheros"
 
 #. RadiusServer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:192
-msgid "a_w_radiussrv"
+msgid "RadiusServer"
 msgstr "Servidor Radius"
 
 #. Radius-Port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:193
-msgid "a_w_radiusport"
+msgid "Radius-Port"
 msgstr "Port Radius"
 
 #. AP-Isolation
 #: i18n/english/luasrc/i18n/admin-core.en.lua:194
-msgid "a_w_apisolation"
+msgid "AP-Isolation"
 msgstr "Aïllament d'AP"
 
 #. Prevents Client to Client communication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:195
-msgid "a_w_apisolation1"
+msgid "Prevents Client to Client communication"
 msgstr "Evita la comunicació Client a Client"
 
 #. Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:196
-msgid "a_w_hideessid"
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "No mostris l'<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
 #. Access Point
 #: i18n/english/luasrc/i18n/admin-core.en.lua:197
-msgid "a_w_ap"
+msgid "Access Point"
 msgstr "Punt d'accés"
 
 #. Ad-Hoc
 #: i18n/english/luasrc/i18n/admin-core.en.lua:198
-msgid "a_w_adhoc"
+msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
 #. Pseudo Ad-Hoc (ahdemo)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:199
-msgid "a_w_ahdemo"
+msgid "Pseudo Ad-Hoc (ahdemo)"
 msgstr "Pseudo Ad-Hoc (ahdemo)"
 
 #. Client
 #: i18n/english/luasrc/i18n/admin-core.en.lua:200
-msgid "a_w_client"
+msgid "Client"
 msgstr "Client"
 
 #. WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:201
-msgid "a_w_wds"
+msgid "WDS"
 msgstr "WDS"
 
 #. Monitor
 #: i18n/english/luasrc/i18n/admin-core.en.lua:202
-msgid "a_w_monitor"
+msgid "Monitor"
 msgstr "Monitor"
 
 #. Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> firewalls
 #: i18n/english/luasrc/i18n/admin-core.en.lua:203
-msgid "dhcp_dnsmasq_desc"
+msgid "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> firewalls"
 msgstr ""
 "El Dnsmasq és un servidor <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> combinat i un reenviador de <abbr title=\"Domain Name "
@@ -1124,243 +1124,243 @@ msgstr ""
 
 #. Domain required
 #: i18n/english/luasrc/i18n/admin-core.en.lua:204
-msgid "dhcp_dnsmasq_domainneeded"
+msgid "Domain required"
 msgstr "Es requereix un domini"
 
 #. Don&#39;t forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without <abbr title=\"Domain Name System\">DNS</abbr>-Name
 #: i18n/english/luasrc/i18n/admin-core.en.lua:205
-msgid "dhcp_dnsmasq_domainneeded_desc"
+msgid "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without <abbr title=\"Domain Name System\">DNS</abbr>-Name"
 msgstr ""
 "No reenviïs les peticions <abbr title=\"Domain Name System\">DNS</abbr> sense "
 "el nom <abbr title=\"Domain Name System\">DNS</abbr>"
 
 #. Authoritative
 #: i18n/english/luasrc/i18n/admin-core.en.lua:206
-msgid "dhcp_dnsmasq_authoritative"
+msgid "Authoritative"
 msgstr "Autoritzada"
 
 #. This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> in the local network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:207
-msgid "dhcp_dnsmasq_authoritative_desc"
+msgid "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> in the local network"
 msgstr ""
 "Aquest és l'únic <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> a la teva xarxa local"
 
 #. Filter private
 #: i18n/english/luasrc/i18n/admin-core.en.lua:208
-msgid "dhcp_dnsmasq_boguspriv"
+msgid "Filter private"
 msgstr "Filtra privat"
 
 #. Don&#39;t forward reverse lookups for local networks
 #: i18n/english/luasrc/i18n/admin-core.en.lua:209
-msgid "dhcp_dnsmasq_boguspriv_desc"
+msgid "Don't forward reverse lookups for local networks"
 msgstr "No reenviïs les cerques inverses per la xarxa local"
 
 #. Filter useless
 #: i18n/english/luasrc/i18n/admin-core.en.lua:210
-msgid "dhcp_dnsmasq_filterwin2k"
+msgid "Filter useless"
 msgstr "Filtra els no útils"
 
 #. filter useless <abbr title=\"Domain Name System\">DNS</abbr>-queries of Windows-systems
 #: i18n/english/luasrc/i18n/admin-core.en.lua:211
-msgid "dhcp_dnsmasq_filterwin2k_desc"
+msgid "filter useless <abbr title=\"Domain Name System\">DNS</abbr>-queries of Windows-systems"
 msgstr ""
 "filtra les consultes <abbr title=\"Domain Name System\">DNS</abbr> no útils de "
 "sistemes Windows"
 
 #. Localise queries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:212
-msgid "dhcp_dnsmasq_localisequeries"
+msgid "Localise queries"
 msgstr "Localitza les consultes"
 
 #. localises the hostname depending on its subnet
 #: i18n/english/luasrc/i18n/admin-core.en.lua:213
-msgid "dhcp_dnsmasq_localisequeries_desc"
+msgid "localises the hostname depending on its subnet"
 msgstr "localitza el nom de màquina depenent de la seva subxarxa"
 
 #. Local Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:214
-msgid "dhcp_dnsmasq_local"
+msgid "Local Server"
 msgstr "Servidor Local"
 
 #. Local Domain
 #: i18n/english/luasrc/i18n/admin-core.en.lua:215
-msgid "dhcp_dnsmasq_domain"
+msgid "Local Domain"
 msgstr "Domini Local"
 
 #. Expand Hosts
 #: i18n/english/luasrc/i18n/admin-core.en.lua:216
-msgid "dhcp_dnsmasq_expandhosts"
+msgid "Expand Hosts"
 msgstr "Expandeix els Noms de Domini"
 
 #. adds domain names to hostentries in the resolv file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:217
-msgid "dhcp_dnsmasq_expandhosts_desc"
+msgid "adds domain names to hostentries in the resolv file"
 msgstr "afegeix Noms de Domini a les entrades de noms al fitxer resolv"
 
 #. don&#39;t cache unknown
 #: i18n/english/luasrc/i18n/admin-core.en.lua:218
-msgid "dhcp_dnsmasq_nonegcache"
+msgid "don't cache unknown"
 msgstr "no emmagatzemis en memòria cau els desconeguts"
 
 #. prevents caching of negative <abbr title=\"Domain Name System\">DNS</abbr>-replies
 #: i18n/english/luasrc/i18n/admin-core.en.lua:219
-msgid "dhcp_dnsmasq_nonegcache_desc"
+msgid "prevents caching of negative <abbr title=\"Domain Name System\">DNS</abbr>-replies"
 msgstr ""
 "evita emmagatzemar en memòria cau les respostes <abbr title=\"Domain Name "
 "System\">DNS</abbr> negatives"
 
 #. Use <code>/etc/ethers</code>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:220
-msgid "dhcp_dnsmasq_readethers"
+msgid "Use <code>/etc/ethers</code>"
 msgstr "Fes servir <code>/etc/ethers</code>"
 
 #. Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:221
-msgid "dhcp_dnsmasq_readethers_desc"
+msgid "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server"
 msgstr ""
 "Llegeix <code>/etc/ethers</code> per configurar el servidor <abbr "
 "title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 
 #. Leasefile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:222
-msgid "dhcp_dnsmasq_leasefile"
+msgid "Leasefile"
 msgstr "Fitxer de Lease"
 
 #. file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-leases will be stored
 #: i18n/english/luasrc/i18n/admin-core.en.lua:223
-msgid "dhcp_dnsmasq_leasefile_desc"
+msgid "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-leases will be stored"
 msgstr ""
 "fitxer on els leases de <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> s'emmagatzemaran"
 
 #. Resolvfile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:224
-msgid "dhcp_dnsmasq_resolvfile"
+msgid "Resolvfile"
 msgstr "Fitxer de Resolució"
 
 #. local <abbr title=\"Domain Name System\">DNS</abbr> file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:225
-msgid "dhcp_dnsmasq_resolvfile_desc"
+msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "fitxer <abbr title=\"Domain Name System\">DNS</abbr> local"
 
 #. Ignore <code>/etc/hosts</code>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:226
-msgid "dhcp_dnsmasq_nohosts"
+msgid "Ignore <code>/etc/hosts</code>"
 msgstr "Ignora <code>/etc/hosts</code>"
 
 #. Strict order
 #: i18n/english/luasrc/i18n/admin-core.en.lua:227
-msgid "dhcp_dnsmasq_strictorder"
+msgid "Strict order"
 msgstr "Ordre estricte"
 
 #. <abbr title=\"Domain Name System\">DNS</abbr>-Server will be queried in the order of the resolvfile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:228
-msgid "dhcp_dnsmasq_strictorder_desc"
+msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Server will be queried in the order of the resolvfile"
 msgstr ""
 "Es consultarà el servidor <abbr title=\"Domain Name System\">DNS</abbr> en "
 "l'ordre del fitxer de Resolució"
 
 #. Log queries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:229
-msgid "dhcp_dnsmasq_logqueries"
+msgid "Log queries"
 msgstr "Registra consultes"
 
 #. Ignore resolve file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:230
-msgid "dhcp_dnsmasq_noresolv"
+msgid "Ignore resolve file"
 msgstr "Ignora el fitxer de Resolució"
 
 #. concurrent queries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:231
-msgid "dhcp_dnsmasq_dnsforwardmax"
+msgid "concurrent queries"
 msgstr "consultes concurrents"
 
 #. <abbr title=\"Domain Name System\">DNS</abbr>-Port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:232
-msgid "dhcp_dnsmasq_port"
+msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Port"
 msgstr "Port <abbr title=\"Domain Name System\">DNS</abbr>"
 
 #. <abbr title=\"maximal\">max.</abbr> <abbr title=\"Extension Mechanisms for Domain Name System\">EDNS0</abbr> paket size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:233
-msgid "dhcp_dnsmasq_ednspacket_max"
+msgid "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Extension Mechanisms for Domain Name System\">EDNS0</abbr> paket size"
 msgstr ""
 "<abbr title=\"màxima\">max.</abbr> mida de paquet <abbr title=\"Extension "
 "Mechanisms for Domain Name System\">EDNS0</abbr>"
 
 #. <abbr title=\"maximal\">max.</abbr> <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:234
-msgid "dhcp_dnsmasq_dhcpleasemax"
+msgid "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Leases"
 msgstr ""
 "<abbr title=\"màxims\">max.</abbr> leases <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>"
 
 #. additional hostfile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:235
-msgid "dhcp_dnsmasq_addnhosts"
+msgid "additional hostfile"
 msgstr "fitxer de noms addicional"
 
 #. query port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:236
-msgid "dhcp_dnsmasq_queryport"
+msgid "query port"
 msgstr "port de consulta"
 
 #. Enable TFTP-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:237
-msgid "dhcp_dnsmasq_enabletftp"
+msgid "Enable TFTP-Server"
 msgstr "Habilita el Servidor TFTP"
 
 #. TFTP-Server Root
 #: i18n/english/luasrc/i18n/admin-core.en.lua:238
-msgid "dhcp_dnsmasq_tftproot"
+msgid "TFTP-Server Root"
 msgstr "Arrel del Servidor TFTP"
 
 #. Network Boot Image
 #: i18n/english/luasrc/i18n/admin-core.en.lua:239
-msgid "dhcp_dnsmasq_dhcpboot"
+msgid "Network Boot Image"
 msgstr "Imatge de Càrrega de Xarxa"
 
 #. Switch
 #: i18n/english/luasrc/i18n/admin-core.en.lua:240
-msgid "a_n_switch"
+msgid "Switch"
 msgstr "Switch"
 
 #. Active Connections
 #: i18n/english/luasrc/i18n/admin-core.en.lua:241
-msgid "a_n_conntrack"
+msgid "Active Connections"
 msgstr "Connexions actives"
 
 #. This page gives an overview over currently active network connections.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:242
-msgid "a_n_conntrack_desc"
+msgid "This page gives an overview over currently active network connections."
 msgstr ""
 "Aquesta pàgina ofereix una vista general de les connexions de xarxa actives "
 "actualment."
 
 #. Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:243
-msgid "a_n_routes"
+msgid "Routes"
 msgstr "Rutes"
 
 #. IPv4 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:244
-msgid "a_n_routes4"
+msgid "IPv4 Routes"
 msgstr "Rutes IPv4"
 
 #. IPv6 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:245
-msgid "a_n_routes6"
+msgid "IPv6 Routes"
 msgstr "Rutes IPv6"
 
 #. In this area you find all network-related settings.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:246
-msgid "a_network1"
+msgid "In this area you find all network-related settings."
 msgstr ""
 "En aquesta àrea podràs trobar tots els paràmetres relacionats amb la xarxa."
 
 #. On most routers the network switch can be freely configured and splitted up into several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:247
-msgid "a_network2"
+msgid "On most routers the network switch can be freely configured and splitted up into several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s."
 msgstr ""
 "En la majoria de routers el switch de xarxa es pot configurar lliurement i "
 "separar-lo en diferents <abbr title=\"Virtual Local Area "
@@ -1368,7 +1368,7 @@ msgstr ""
 
 #. Interfaces and <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> / <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Settings allow a custom organisation of the network and connections to other networks like the internet.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:248
-msgid "a_network3"
+msgid "Interfaces and <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> / <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Settings allow a custom organisation of the network and connections to other networks like the internet."
 msgstr ""
 "La configuració de les Interfícies i <abbr title=\"Point-to-Point Protocol "
 "over Ethernet\">PPPoE</abbr> / <abbr title=\"Point-to-Point Tunneling "
@@ -1377,7 +1377,7 @@ msgstr ""
 
 #. With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> devices in your local network can be automatically configured for network communication.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:249
-msgid "a_network4"
+msgid "With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> devices in your local network can be automatically configured for network communication."
 msgstr ""
 "Amb els dispositius <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> a la teva xarxa local es pot configurar automàticament "
@@ -1385,14 +1385,14 @@ msgstr ""
 
 #. Firewall and portforwarding can be used to secure your network while providing services to external networks.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:250
-msgid "a_network5"
+msgid "Firewall and portforwarding can be used to secure your network while providing services to external networks."
 msgstr ""
 "El tallafocs i reenviament de ports es pot fer servir per assegurar la teva "
 "xarxa mentre que es proveeixen serveis a xarxes externes."
 
 #. The network ports on your router can be combined to several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s in which computers can communicate directly with each other. <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s are often used to separate different network segments. Often there is by default one Uplink port for a connection to the next greater network like the internet and other ports for a local network.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:251
-msgid "a_n_switch1"
+msgid "The network ports on your router can be combined to several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s in which computers can communicate directly with each other. <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s are often used to separate different network segments. Often there is by default one Uplink port for a connection to the next greater network like the internet and other ports for a local network."
 msgstr ""
 "Els ports de xarxa del teu router es poden combinar amb diverses <abbr "
 "title=\"Virtual Local Area Network\">VLAN</abbr>s en les que els ordinador es "
@@ -1403,7 +1403,7 @@ msgstr ""
 
 #. Ports belonging to a <abbr title=\"Virtual Local Area Network\">VLAN</abbr> are separated with spaces. The port with the highest number (usually 5) is oftern the connection to the internal network interface of the router. On devices with 5 ports often the one with the lowest number (0) is the predefined Uplink port.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:252
-msgid "network_switch_desc"
+msgid "Ports belonging to a <abbr title=\"Virtual Local Area Network\">VLAN</abbr> are separated with spaces. The port with the highest number (usually 5) is oftern the connection to the internal network interface of the router. On devices with 5 ports often the one with the lowest number (0) is the predefined Uplink port."
 msgstr ""
 "Els ports que pertanyin a un <abbr title=\"Virtual Local Area "
 "Network\">VLAN</abbr> estan separats per espais. El port amb el número més "
@@ -1413,7 +1413,7 @@ msgstr ""
 
 #. On this page you can configure the network interfaces. You can bridge several interfaces by ticking the &quot;bridge interfaces&quot; field and enter the names of several network interfaces separated by spaces. You can also use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation <samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: <samp>eth0.1</samp>).
 #: i18n/english/luasrc/i18n/admin-core.en.lua:253
-msgid "a_n_ifaces1"
+msgid "On this page you can configure the network interfaces. You can bridge several interfaces by ticking the \"bridge interfaces\" field and enter the names of several network interfaces separated by spaces. You can also use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation <samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: <samp>eth0.1</samp>)."
 msgstr ""
 "En aquesta pàgina pots configurar les interfícies de xarxa. Pots fer un pont "
 "entre diverses interfícies clicant sobre el camp \"interfície pont\" i "
@@ -1424,25 +1424,25 @@ msgstr ""
 
 #. Bridge interfaces
 #: i18n/english/luasrc/i18n/admin-core.en.lua:254
-msgid "a_n_i_bridge"
+msgid "Bridge interfaces"
 msgstr "Interfície pont"
 
 #. creates a bridge over specified interface(s)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:255
-msgid "a_n_i_bridge1"
+msgid "creates a bridge over specified interface(s)"
 msgstr "crea un pont entre les interfícies especificades"
 
 #. Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>
-msgid "a_n_i_stp"
+msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 msgstr "Habilita l'<abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 
 #. Enables the Spanning Tree Protocol on this bridge
-msgid "a_n_i_stp1"
+msgid "Enables the Spanning Tree Protocol on this bridge"
 msgstr "Habilita l'Spanning Tree Protocol a aquest pont"
 
 #. With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> network members can automatically receive their network settings (<abbr title=\"Internet Protocol\">IP</abbr>-address, netmask, <abbr title=\"Domain Name System\">DNS</abbr>-server, ...).
 #: i18n/english/luasrc/i18n/admin-core.en.lua:256
-msgid "dhcp_desc"
+msgid "With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> network members can automatically receive their network settings (<abbr title=\"Internet Protocol\">IP</abbr>-address, netmask, <abbr title=\"Domain Name System\">DNS</abbr>-server, ...)."
 msgstr ""
 "Amb el <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> els "
 "membres d'una xarxa poden rebre automàticament els seus paràmetres de xarxa "
@@ -1451,81 +1451,81 @@ msgstr ""
 
 #. Leasetime
 #: i18n/english/luasrc/i18n/admin-core.en.lua:257
-msgid "dhcp_dhcp_leasetime"
+msgid "Leasetime"
 msgstr "Temps del Lease"
 
 #. Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:258
-msgid "dhcp_dhcp_dynamicdhcp"
+msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 msgstr "<abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> dinàmic"
 
 #. Ignore interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:259
-msgid "dhcp_dhcp_ignore"
+msgid "Ignore interface"
 msgstr "Ignora la interfície"
 
 #. disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for this interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:260
-msgid "dhcp_dhcp_ignore_desc"
+msgid "disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for this interface"
 msgstr ""
 "deshabilita el <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
 "per aquesta interfície"
 
 #. Force
 #: i18n/english/luasrc/i18n/admin-core.en.lua:261
-msgid "dhcp_dhcp_force"
+msgid "Force"
 msgstr "Força"
 
 #. first address (last octet)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:262
-msgid "dhcp_dhcp_start_desc"
+msgid "first address (last octet)"
 msgstr "primera adreça (últim octet)"
 
 #. number of leased addresses -1
 #: i18n/english/luasrc/i18n/admin-core.en.lua:263
-msgid "dhcp_dhcp_limit_desc"
+msgid "number of leased addresses -1"
 msgstr "número d'adreces lease -1"
 
 #. DHCP-Options
 #: i18n/english/luasrc/i18n/admin-core.en.lua:264
-msgid "dhcp_dhcp_dhcpoption"
+msgid "DHCP-Options"
 msgstr "Opcions de DHCP"
 
 #. See &quot;dnsmasq --help dhcp&quot; for a list of available options.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:265
-msgid "dhcp_dhcp_dhcpoption_desc"
+msgid "See \"dnsmasq --help dhcp\" for a list of available options."
 msgstr ""
 "Vegi's &quot;dnsmasq --help dhcp&quot; per una llista de les opcions "
 "disponibles."
 
 #. Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:266
-msgid "dhcp_leases"
+msgid "Leases"
 msgstr "Leases"
 
 #. Static Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:267
-msgid "luci_ethers"
+msgid "Static Leases"
 msgstr "Leases estàtics"
 
 #. Leasetime remaining
 #: i18n/english/luasrc/i18n/admin-core.en.lua:268
-msgid "dhcp_timeremain"
+msgid "Leasetime remaining"
 msgstr "Temps de Lease restant"
 
 #. Active Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:269
-msgid "dhcp_leases_active"
+msgid "Active Leases"
 msgstr "Leases Actius"
 
 #. Point-to-Point Connections
 #: i18n/english/luasrc/i18n/admin-core.en.lua:270
-msgid "a_n_ptp"
+msgid "Point-to-Point Connections"
 msgstr "Connexions Point-to-Point"
 
 #. Point-to-Point connections with <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> or <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr> are often used to connect a device over <abbr title=\"Digital Subscriber Line\">DSL</abbr> or similar technologies to an internet access point.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:271
-msgid "a_n_ptp1"
+msgid "Point-to-Point connections with <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> or <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr> are often used to connect a device over <abbr title=\"Digital Subscriber Line\">DSL</abbr> or similar technologies to an internet access point."
 msgstr ""
 "Les connexions Point-to-Point amb <abbr title=\"Point-to-Point Protocol over "
 "Ethernet\">PPPoE</abbr> o <abbr title=\"Point-to-Point Tunneling "
@@ -1535,7 +1535,7 @@ msgstr ""
 
 #. You need to install &quot;comgt&quot; for UMTS/GPRS, &quot;ppp-mod-pppoe&quot; for PPPoE, &quot;ppp-mod-pppoa&quot; for PPPoA or &quot;pptp&quot; for PPtP support
 #: i18n/english/luasrc/i18n/admin-core.en.lua:272
-msgid "network_interface_prereq"
+msgid "You need to install \"comgt\" for UMTS/GPRS, \"ppp-mod-pppoe\" for PPPoE, \"ppp-mod-pppoa\" for PPPoA or \"pptp\" for PPtP support"
 msgstr ""
 "Necessites instal·lar &quot;comgt&quot; per suport UMTS/GPRS, &quot;ppp-mod-"
 "pppoe&quot; per suport PPPoE, &quot;ppp-mod-pppoa&quot; per suport PPPoA o "
@@ -1543,714 +1543,714 @@ msgstr ""
 
 #. You need to install &quot;ppp-mod-pppoe&quot; for PPPoE or &quot;pptp&quot; for PPtP support
 #: i18n/english/luasrc/i18n/admin-core.en.lua:273
-msgid "network_interface_prereq_mini"
+msgid "You need to install \"ppp-mod-pppoe\" for PPPoE or \"pptp\" for PPtP support"
 msgstr ""
 "Necessites instal·lar &quot;ppp-mod-pppoe&quot; per suport PPPoE o "
 "&quot;pptp&quot; per suport PPtP"
 
 #. <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:274
-msgid "network_interface_server"
+msgid "<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"
 msgstr "Servidor <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>"
 
 #. Automatic Disconnect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:275
-msgid "network_interface_demand"
+msgid "Automatic Disconnect"
 msgstr "Desconnexió Automàtica"
 
 #. Time (in seconds) after which an unused connection will be closed
 #: i18n/english/luasrc/i18n/admin-core.en.lua:276
-msgid "network_interface_demand_desc"
+msgid "Time (in seconds) after which an unused connection will be closed"
 msgstr ""
 "Temps (en segons) després del qual les connexions sense fer servir es "
 "tancaran"
 
 #. Keep-Alive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:277
-msgid "network_interface_keepalive"
+msgid "Keep-Alive"
 msgstr "Keep-Alive"
 
 #. Number of failed connection tests to initiate automatic reconnect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:278
-msgid "network_interface_keepalive_desc"
+msgid "Number of failed connection tests to initiate automatic reconnect"
 msgstr "Número de connexions de test fallades per iniciar reconnexió automàtica"
 
 #. Modem device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:279
-msgid "network_interface_device"
+msgid "Modem device"
 msgstr "Dispositiu de Modem"
 
 #. The device node of your modem, e.g. /dev/ttyUSB0
 #: i18n/english/luasrc/i18n/admin-core.en.lua:280
-msgid "network_interface_device_desc"
+msgid "The device node of your modem, e.g. /dev/ttyUSB0"
 msgstr "El node de dispositiu del teu modem, p.e. /dev/ttyUSB0"
 
 #. Replace default route
 #: i18n/english/luasrc/i18n/admin-core.en.lua:281
-msgid "network_interface_defaultroute"
+msgid "Replace default route"
 msgstr "Reemplaça la ruta per defecte"
 
 #. Let pppd replace the current default route to use the PPP interface after successful connect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:282
-msgid "network_interface_defaultroute_desc"
+msgid "Let pppd replace the current default route to use the PPP interface after successful connect"
 msgstr ""
 "Permet que el pppd reemplaci la ruta per defecte actual per fer servir les "
 "interfícies PPP després de connectar-se amb èxit"
 
 #. Use peer DNS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:283
-msgid "network_interface_peerdns"
+msgid "Use peer DNS"
 msgstr "Fes servir peer DNS"
 
 #. Configure the local DNS server to use the name servers adverticed by the PPP peer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:284
-msgid "network_interface_peerdns_desc"
+msgid "Configure the local DNS server to use the name servers adverticed by the PPP peer"
 msgstr ""
 "Configura el servidor DNS local per fer servir els servidors anunciats pel "
 "peer PPP"
 
 #. Enable IPv6 on PPP link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:285
-msgid "network_interface_ipv6"
+msgid "Enable IPv6 on PPP link"
 msgstr "Habilita IPv6 a l'enllaç PPP"
 
 #. Connect script
 #: i18n/english/luasrc/i18n/admin-core.en.lua:286
-msgid "network_interface_connect"
+msgid "Connect script"
 msgstr "Script de connexió"
 
 #. Let pppd run this script after establishing the PPP link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:287
-msgid "network_interface_connect_desc"
+msgid "Let pppd run this script after establishing the PPP link"
 msgstr "Permet que el pppd executi aquest script abans d'establir l'enllaç PPP"
 
 #. Disconnect script
 #: i18n/english/luasrc/i18n/admin-core.en.lua:288
-msgid "network_interface_disconnect"
+msgid "Disconnect script"
 msgstr "Script de desconnexió"
 
 #. Let pppd run this script before tearing down the PPP link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:289
-msgid "network_interface_disconnect_desc"
+msgid "Let pppd run this script before tearing down the PPP link"
 msgstr ""
 "Permet que el pppd executi aquest script abans de desconnectar l'enllaç PPP"
 
 #. Additional pppd options
 #: i18n/english/luasrc/i18n/admin-core.en.lua:290
-msgid "network_interface_pppd_options"
+msgid "Additional pppd options"
 msgstr "Opcions pppd addicionals"
 
 #. Specify additional command line arguments for pppd here
 #: i18n/english/luasrc/i18n/admin-core.en.lua:291
-msgid "network_interface_pppd_options_desc"
+msgid "Specify additional command line arguments for pppd here"
 msgstr "Especifica arguments de línia de comanda addicionals pel pppd"
 
 #. Access point (APN)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:292
-msgid "network_interface_apn"
+msgid "Access point (APN)"
 msgstr "Punt d'accés (APN)"
 
 #. PIN code
 #: i18n/english/luasrc/i18n/admin-core.en.lua:293
-msgid "network_interface_pincode"
+msgid "PIN code"
 msgstr "Codi PIN"
 
 #. Make sure that you provide the correct pin code here or you might lock your sim card!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:294
-msgid "network_interface_pincode_desc"
+msgid "Make sure that you provide the correct pin code here or you might lock your sim card!"
 msgstr ""
 "Assegura't d'introduir el codi pin correcte o pots bloquejar la teva targeta "
 "SIM!"
 
 #. Service type
 #: i18n/english/luasrc/i18n/admin-core.en.lua:295
-msgid "network_interface_service"
+msgid "Service type"
 msgstr "Tipus de servei"
 
 #. Setup wait time
 #: i18n/english/luasrc/i18n/admin-core.en.lua:296
-msgid "network_interface_maxwait"
+msgid "Setup wait time"
 msgstr "Temps d'espera de configuració"
 
 #. Seconds to wait for the modem to become ready before attempting to connect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:297
-msgid "network_interface_maxwait_desc"
+msgid "Seconds to wait for the modem to become ready before attempting to connect"
 msgstr ""
 "Segons a esperar per tal que el modem estigui apunt abans de provar de "
 "connectar-se"
 
 #. PPPoA Encapsulation
 #: i18n/english/luasrc/i18n/admin-core.en.lua:298
-msgid "network_interface_encaps"
+msgid "PPPoA Encapsulation"
 msgstr "Encapsulació PPPoA"
 
 #. Routes specify over which interface and gateway a certain host or network can be reached.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:299
-msgid "a_n_r_routes1"
+msgid "Routes specify over which interface and gateway a certain host or network can be reached."
 msgstr ""
 "Les rutes especifiquen per quina interfície i passarel·la es pot arribar a "
 "un cert ordinador o xarxa."
 
 #. Static Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:300
-msgid "a_n_routes_static"
+msgid "Static Routes"
 msgstr "Rutes estàtiques"
 
 #. Static IPv4 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:301
-msgid "a_n_routes_static4"
+msgid "Static IPv4 Routes"
 msgstr "Rutes IPv4 estàtiques"
 
 #. Static IPv6 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:302
-msgid "a_n_routes_static6"
+msgid "Static IPv6 Routes"
 msgstr "Rutes IPv6 estàtiques"
 
 #. Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:303
-msgid "a_n_routes_kernel4"
+msgid "Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes"
 msgstr "Rutes <abbr title=\"Internet Protocol Version 4\">IPv4</abbr> actives"
 
 #. Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:304
-msgid "a_n_routes_kernel6"
+msgid "Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes"
 msgstr "Rutes <abbr title=\"Internet Protocol Version 6\">IPv6</abbr> actives"
 
 #. Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:305
-msgid "a_n_r_target1"
+msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
 msgstr "Xarxa o adreça <abbr title=\"Internet Protocol Address\">IP</abbr>"
 
 #. <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network (CIDR)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:306
-msgid "a_n_r_target6"
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network (CIDR)"
 msgstr ""
 "Adreça <abbr title=\"Internet Protocol Version 6\">IPv6</abbr> o Xarxa (CIDR)"
 
 #. if target is a network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:307
-msgid "a_n_r_netmask1"
+msgid "if target is a network"
 msgstr "si el destí és una xarxa"
 
 #. Internet Connection
 #: i18n/english/luasrc/i18n/admin-core.en.lua:308
-msgid "m_n_inet"
+msgid "Internet Connection"
 msgstr "Connexió a Internet"
 
 #. Local Network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:309
-msgid "m_n_local"
+msgid "Local Network"
 msgstr "Xarxa Local"
 
 #. Route
 #: i18n/english/luasrc/i18n/admin-core.en.lua:310
-msgid "m_n_route"
+msgid "Route"
 msgstr "Ruta"
 
 #. Bridge
 #: i18n/english/luasrc/i18n/admin-core.en.lua:311
-msgid "m_n_brdige"
+msgid "Bridge"
 msgstr "Pont"
 
 #. Provide (Access Point)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:312
-msgid "m_w_ap"
+msgid "Provide (Access Point)"
 msgstr "Proveeix (Punt d'Accés)"
 
 #. Independent (Ad-Hoc)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:313
-msgid "m_w_adhoc"
+msgid "Independent (Ad-Hoc)"
 msgstr "Independent (Ad-Hoc)"
 
 #. Join (Client)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:314
-msgid "m_w_client"
+msgid "Join (Client)"
 msgstr "Uneix-te (Client)"
 
 #. Distributed (<abbr title=\"Wireless Distribution System\">WDS</abbr>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:315
-msgid "m_w_wds"
+msgid "Distributed (<abbr title=\"Wireless Distribution System\">WDS</abbr>)"
 msgstr "Distribuït (<abbr title=\"Wireless Distribution System\">WDS</abbr>)"
 
 #. Clientmode
 #: i18n/english/luasrc/i18n/admin-core.en.lua:316
-msgid "m_w_clientmode"
+msgid "Clientmode"
 msgstr "mode Client"
 
 #. System log buffer size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:317
-msgid "system_system_logsize"
+msgid "System log buffer size"
 msgstr "Mida de buffer del registre del sistema"
 
 #. External system log server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:318
-msgid "system_system_logip"
+msgid "External system log server"
 msgstr "Servidor del registre de sistema extern"
 
 #. Log output level
 #: i18n/english/luasrc/i18n/admin-core.en.lua:319
-msgid "system_system_conloglevel"
+msgid "Log output level"
 msgstr "Nivell de sortida del registre"
 
 #. Level of log messages on the console
 #: i18n/english/luasrc/i18n/admin-core.en.lua:320
-msgid "system_system_conloglevel_desc"
+msgid "Level of log messages on the console"
 msgstr "Nivell de sortida de consola del registre"
 
 #. Processor
 #: i18n/english/luasrc/i18n/admin-core.en.lua:321
-msgid "m_i_processor"
+msgid "Processor"
 msgstr "Processador"
 
 #. Memory
 #: i18n/english/luasrc/i18n/admin-core.en.lua:322
-msgid "m_i_memory"
+msgid "Memory"
 msgstr "Memòria"
 
 #. Local Time
 #: i18n/english/luasrc/i18n/admin-core.en.lua:323
-msgid "m_i_systemtime"
+msgid "Local Time"
 msgstr "Hora local"
 
 #. Uptime
 #: i18n/english/luasrc/i18n/admin-core.en.lua:324
-msgid "m_i_uptime"
+msgid "Uptime"
 msgstr "Temps d'activitat"
 
 #. First leased address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:325
-msgid "m_n_d_firstaddress"
+msgid "First leased address"
 msgstr "Primera adreça de lease"
 
 #. Number of leased addresses
 #: i18n/english/luasrc/i18n/admin-core.en.lua:326
-msgid "m_n_d_numleases"
+msgid "Number of leased addresses"
 msgstr "Número d'adreces de lease"
 
 #. Routing table
 #: i18n/english/luasrc/i18n/admin-core.en.lua:327
-msgid "routingtable"
+msgid "Routing table"
 msgstr "Taula d'enrutament"
 
 #. Wifi scan
 #: i18n/english/luasrc/i18n/admin-core.en.lua:328
-msgid "wlanscan"
+msgid "Wifi scan"
 msgstr "Escaneig sense fils"
 
 #. Frequency
 #: i18n/english/luasrc/i18n/admin-core.en.lua:329
-msgid "frequency"
+msgid "Frequency"
 msgstr "Freqüència"
 
 #. Power
 #: i18n/english/luasrc/i18n/admin-core.en.lua:330
-msgid "power"
+msgid "Power"
 msgstr "Potència"
 
 #. Noise
 #: i18n/english/luasrc/i18n/admin-core.en.lua:331
-msgid "noise"
+msgid "Noise"
 msgstr "Soroll"
 
 #. Signal
 #: i18n/english/luasrc/i18n/admin-core.en.lua:332
-msgid "signal"
+msgid "Signal"
 msgstr "Senyal"
 
 #. Link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:333
-msgid "link"
+msgid "Link"
 msgstr "Enllaç"
 
 #. <abbr title=\"Fragmentation\">Frag.</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:334
-msgid "frag"
+msgid "<abbr title=\"Fragmentation\">Frag.</abbr>"
 msgstr "<abbr title=\"Fragmentació\">Frag.</abbr>"
 
 #. <abbr title=\"Request To Send\">RTS</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:335
-msgid "rts"
+msgid "<abbr title=\"Request To Send\">RTS</abbr>"
 msgstr "<abbr title=\"Request To Send\">RTS</abbr>"
 
 #. Bitrate
 #: i18n/english/luasrc/i18n/admin-core.en.lua:336
-msgid "bitrate"
+msgid "Bitrate"
 msgstr "Taxa de bits"
 
 #. automatically reconnect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:337
-msgid "m_n_keepalive"
+msgid "automatically reconnect"
 msgstr "reconnecta automàticament"
 
 #. disconnect when idle for
 #: i18n/english/luasrc/i18n/admin-core.en.lua:338
-msgid "m_n_dialondemand"
+msgid "disconnect when idle for"
 msgstr "desconnecta per inactivitat durant"
 
 #. <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:339
-msgid "m_n_pptp_server"
+msgid "<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"
 msgstr "Servidor <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>"
 
 #. <abbr title=\"Light Emitting Diode\">LED</abbr> Configuration
 #: i18n/english/luasrc/i18n/admin-core.en.lua:340
-msgid "leds"
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "Configuració <abbr title=\"Light Emitting Diode\">LED</abbr>"
 
 #. Customizes the behaviour of the device <abbr title=\"Light Emitting Diode\">LED</abbr>s if possible.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:341
-msgid "leds_desc"
+msgid "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode\">LED</abbr>s if possible."
 msgstr ""
 "Personalitza el comportament dels <abbr title=\"Light Emitting "
 "Diode\">LED</abbr>s del dispositiu si és possible."
 
 #. <abbr title=\"Light Emitting Diode\">LED</abbr> Name
 #: i18n/english/luasrc/i18n/admin-core.en.lua:342
-msgid "system_led_name"
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr "Nom del <abbr title=\"Light Emitting Diode\">LED</abbr>"
 
 #. <abbr title=\"Light Emitting Diode\">LED</abbr> Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:343
-msgid "system_led_sysfs"
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Device"
 msgstr "Dispositiu del <abbr title=\"Light Emitting Diode\">LED</abbr>"
 
 #. Default state
 #: i18n/english/luasrc/i18n/admin-core.en.lua:344
-msgid "system_led_default"
+msgid "Default state"
 msgstr "Estat per defecte"
 
 #. ticked = on
 #: i18n/english/luasrc/i18n/admin-core.en.lua:345
-msgid "system_led_default_desc"
+msgid "ticked = on"
 msgstr "seleccionat = on"
 
 #. Trigger
 #: i18n/english/luasrc/i18n/admin-core.en.lua:346
-msgid "system_led_trigger"
+msgid "Trigger"
 msgstr "Activador"
 
 #. None
 #: i18n/english/luasrc/i18n/admin-core.en.lua:347
-msgid "system_led_trigger_none"
+msgid "None"
 msgstr "Cap"
 
 #. Default On
 #: i18n/english/luasrc/i18n/admin-core.en.lua:348
-msgid "system_led_trigger_defaulton"
+msgid "Default On"
 msgstr "Encès per defecte"
 
 #. Timer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:349
-msgid "system_led_trigger_timer"
+msgid "Timer"
 msgstr "Temporitzador"
 
 #. Heartbeat (Load Average)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:350
-msgid "system_led_trigger_heartbeat"
+msgid "Heartbeat (Load Average)"
 msgstr "Heartbeat (Càrrega)"
 
 #. Network Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:351
-msgid "system_led_trigger_netdev"
+msgid "Network Device"
 msgstr "Dispositiu de xarxa"
 
 #. Off-State Delay
 #: i18n/english/luasrc/i18n/admin-core.en.lua:352
-msgid "system_led_delayoff"
+msgid "Off-State Delay"
 msgstr "Retard d'estat apagat"
 
 #. Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is off
 #: i18n/english/luasrc/i18n/admin-core.en.lua:353
-msgid "system_led_delayoff_desc"
+msgid "Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is off"
 msgstr ""
 "Temps (en ms) en què el <abbr title=\"Light Emitting Diode\">LED</abbr> està "
 "apagat"
 
 #. On-State Delay
 #: i18n/english/luasrc/i18n/admin-core.en.lua:354
-msgid "system_led_delayon"
+msgid "On-State Delay"
 msgstr "Retard d'estat encès"
 
 #. Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is on
 #: i18n/english/luasrc/i18n/admin-core.en.lua:355
-msgid "system_led_delayon_desc"
+msgid "Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is on"
 msgstr ""
 "Temps (en ms) en què el <abbr title=\"Light Emitting Diode\">LED</abbr> està "
 "encès"
 
 #. Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:356
-msgid "system_led_dev"
+msgid "Device"
 msgstr "Dispositiu"
 
 #. Trigger Mode
 #: i18n/english/luasrc/i18n/admin-core.en.lua:357
-msgid "system_led_mode"
+msgid "Trigger Mode"
 msgstr "Mode d'activació"
 
 #. Link On
 #: i18n/english/luasrc/i18n/admin-core.en.lua:358
-msgid "system_led_mode_link"
+msgid "Link On"
 msgstr "Enllaç activat"
 
 #. Transmit
 #: i18n/english/luasrc/i18n/admin-core.en.lua:359
-msgid "system_led_mode_tx"
+msgid "Transmit"
 msgstr "Transmet"
 
 #. Receive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:360
-msgid "system_led_mode_rx"
+msgid "Receive"
 msgstr "Rep"
 
 #. Active
 #: i18n/english/luasrc/i18n/admin-core.en.lua:361
-msgid "network_interface_up"
+msgid "Active"
 msgstr "Actiu"
 
 #. <abbr title=\"Media Access Control\">MAC</abbr>-Address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:362
-msgid "network_interface_hwaddr"
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr "Adreça <abbr title=\"Media Access Control\">MAC</abbr>"
 
 #. Hardware Address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:363
-msgid "network_interface_hwaddr_desc"
+msgid "Hardware Address"
 msgstr "Adreça <abbr title=\"Media Access Control\">MAC</abbr>"
 
 #. Traffic
 #: i18n/english/luasrc/i18n/admin-core.en.lua:364
-msgid "network_interface_txrx"
+msgid "Traffic"
 msgstr "Tràfic"
 
 #. transmitted / received
 #: i18n/english/luasrc/i18n/admin-core.en.lua:365
-msgid "network_interface_txrx_desc"
+msgid "transmitted / received"
 msgstr "transmès / rebut"
 
 #. Errors
 #: i18n/english/luasrc/i18n/admin-core.en.lua:366
-msgid "network_interface_err"
+msgid "Errors"
 msgstr "Errors"
 
 #. TX / RX
 #: i18n/english/luasrc/i18n/admin-core.en.lua:367
-msgid "network_interface_err_desc"
+msgid "TX / RX"
 msgstr "TX / RX"
 
 #. Create / Assign firewall-zone
 #: i18n/english/luasrc/i18n/admin-core.en.lua:368
-msgid "network_interface_fwzone"
+msgid "Create / Assign firewall-zone"
 msgstr "Crea / Assigna zona de tallafocs"
 
 #. This interface does not belong to any firewall zone yet.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:369
-msgid "network_interface_fwzone_desc"
+msgid "Choose the firewall zone you want to assign to this interface. Select <em>unspecified</em> to remove the interface from the associated zone or fill out the <em>create</em> field to define a new zone and attach the interface to it."
 msgstr "Aquesta interfície no pertany a cap zona de tallafocs encara."
 
 #. Processes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:370
-msgid "process_head"
+msgid "Processes"
 msgstr "Processos"
 
 #. This list gives an overview over currently running system processes and their status.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:371
-msgid "process_descr"
+msgid "This list gives an overview over currently running system processes and their status."
 msgstr ""
 "Aquesta llista mostra una vista general sobre els processos corrent al "
 "sistema actualment i el seu estat."
 
 #. PID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:372
-msgid "process_pid"
+msgid "PID"
 msgstr "PID"
 
 #. Owner
 #: i18n/english/luasrc/i18n/admin-core.en.lua:373
-msgid "process_owner"
+msgid "Owner"
 msgstr "Propietari"
 
 #. Command
 #: i18n/english/luasrc/i18n/admin-core.en.lua:374
-msgid "process_command"
+msgid "Command"
 msgstr "Ordre"
 
 #. CPU usage (%)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:375
-msgid "process_cpu"
+msgid "CPU usage (%)"
 msgstr "Ús de CPU (%)"
 
 #. Memory usage (%)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:376
-msgid "process_mem"
+msgid "Memory usage (%)"
 msgstr "Ús de Memòria (%)"
 
 #. Hang Up
 #: i18n/english/luasrc/i18n/admin-core.en.lua:377
-msgid "process_hup"
+msgid "Hang Up"
 msgstr "Penja"
 
 #. Terminate
 #: i18n/english/luasrc/i18n/admin-core.en.lua:378
-msgid "process_term"
+msgid "Terminate"
 msgstr "Acaba"
 
 #. Kill
 #: i18n/english/luasrc/i18n/admin-core.en.lua:379
-msgid "process_kill"
+msgid "Kill"
 msgstr "Mata"
 
 #. cached
 #: i18n/english/luasrc/i18n/admin-core.en.lua:380
-msgid "mem_cached"
+msgid "cached"
 msgstr "emmagatzemat en memòria cau"
 
 #. buffered
 #: i18n/english/luasrc/i18n/admin-core.en.lua:381
-msgid "mem_buffered"
+msgid "buffered"
 msgstr "emmagatzemat en memòria intermèdia"
 
 #. free
 #: i18n/english/luasrc/i18n/admin-core.en.lua:382
-msgid "mem_free"
+msgid "free"
 msgstr "lliure"
 
 #. Scheduled Tasks
 #: i18n/english/luasrc/i18n/admin-core.en.lua:383
-msgid "a_s_crontab"
+msgid "Scheduled Tasks"
 msgstr "Tasques programades"
 
 #. This is the system crontab in which scheduled tasks can be defined.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:384
-msgid "a_s_crontab1"
+msgid "This is the system crontab in which scheduled tasks can be defined."
 msgstr ""
 "Aquest és el crontab del sistema en el qual es poden definir tasques "
 "programades."
 
 #. NAS ID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:385
-msgid "a_w_nasid"
+msgid "NAS ID"
 msgstr "NAS ID"
 
 #. Path to CA-Certificate
 #: i18n/english/luasrc/i18n/admin-core.en.lua:386
-msgid "a_w_cacert"
+msgid "Path to CA-Certificate"
 msgstr "Ruta als Certificats CA"
 
 #. EAP-Method
 #: i18n/english/luasrc/i18n/admin-core.en.lua:387
-msgid "a_w_eaptype"
+msgid "EAP-Method"
 msgstr "Mètode EAP"
 
 #. Path to Private Key
 #: i18n/english/luasrc/i18n/admin-core.en.lua:388
-msgid "a_w_tlsprivkey"
+msgid "Path to Private Key"
 msgstr "Ruta a la clau privada"
 
 #. Password of Private Key
 #: i18n/english/luasrc/i18n/admin-core.en.lua:389
-msgid "a_w_tlsprivkeypwd"
+msgid "Password of Private Key"
 msgstr "Contrasenya de la clau privada"
 
 #. Authentication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:390
-msgid "a_w_peapauth"
+msgid "Authentication"
 msgstr "Autenticació PEAP"
 
 #. Identity
 #: i18n/english/luasrc/i18n/admin-core.en.lua:391
-msgid "a_w_peapidentity"
+msgid "Identity"
 msgstr "Identitat PEAP"
 
 #. Password
 #: i18n/english/luasrc/i18n/admin-core.en.lua:392
-msgid "a_w_peappassword"
+msgid "Password"
 msgstr "Contrasenya PEAP"
 
 #. Create Network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:393
-msgid "a_w_create"
+msgid "Create Network"
 msgstr "Crea Xarxa"
 
 #. Hostnames
 #: i18n/english/luasrc/i18n/admin-core.en.lua:394
-msgid "hostnames"
+msgid "Hostnames"
 msgstr "Noms de màquina"
 
 #. Host entries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:395
-msgid "hostnames_entries"
+msgid "Host entries"
 msgstr "Entrades de noms de màquina"
 
 #. Hostname
 #: i18n/english/luasrc/i18n/admin-core.en.lua:396
-msgid "hostnames_hostname"
+msgid "Hostname"
 msgstr "Nom de màquina"
 
 #. IP address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:397
-msgid "hostnames_address"
+msgid "IP address"
 msgstr "Adreça IP"
 
 #. Clamp Segment Size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:398
-msgid "m_n_mssfix"
+msgid "Clamp Segment Size"
 msgstr "Mida de segment Clamp"
 
 #. Fixes problems with unreachable websites, submitting forms or other unexpected behaviour for some ISPs.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:399
-msgid "m_n_mssfix_desc"
+msgid "Fixes problems with unreachable websites, submitting forms or other unexpected behaviour for some ISPs."
 msgstr ""
 "Resol problemes amb llocs web inassolibles, enviant formularis o altres "
 "comportaments inesperats d'alguns ISPs."
 
 #. Flash Firmware
 #: i18n/english/luasrc/i18n/admin-core.en.lua:400
-msgid "admin_upgrade"
+msgid "Flash Firmware"
 msgstr "Actualitza el firmware"
 
 #. The uploaded image file does not contain a supported format. Make sure that you choose the generic image format for your platform.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:401
-msgid "admin_upgrade_badimage"
+msgid "The uploaded image file does not contain a supported format. Make sure that you choose the generic image format for your platform."
 msgstr ""
 "La imatge pujada no conté un format suportat. Assegura't de triar el format "
 "d'imatge genèric per la teva plataforma."
 
 #. Checksum
 #: i18n/english/luasrc/i18n/admin-core.en.lua:402
-msgid "admin_upgrade_checksum"
+msgid "Checksum"
 msgstr "Suma de verificació"
 
 #. Upload an OpenWrt image file to reflash the device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:403
-msgid "admin_upgrade_desc"
+msgid "Upload an OpenWrt image file to reflash the device."
 msgstr "Penja una imatge d'OpenWRT per actualitzar el firmware del dispositiu."
 
 #. Size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:404
-msgid "admin_upgrade_filesize"
+msgid "Size"
 msgstr "Mida"
 
 #. Firmware image
 #: i18n/english/luasrc/i18n/admin-core.en.lua:405
-msgid "admin_upgrade_fwimage"
+msgid "Firmware image"
 msgstr "Imatge de firmware"
 
 #. Keep configuration files
 #: i18n/english/luasrc/i18n/admin-core.en.lua:406
-msgid "admin_upgrade_keepcfg"
+msgid "Keep configuration files"
 msgstr "Mantingues els fitxers de configuració"
 
 #. Sorry. OpenWrt does not support a system upgrade on this platform.<br /> You need to manually flash your device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:407
-msgid "admin_upgrade_nosupport"
+msgid "Sorry. OpenWrt does not support a system upgrade on this platform.<br /> You need to manually flash your device."
 msgstr ""
 "Ho sento, l'OpenWRT no suporta una actualització del sistema en aquesdta "
 "plataforma.<br />Has actualitzar manualment el teu dispositiu."
 
 #. The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a few minutes until you try to reconnect. It might be necessary to renew the address of your computer to reach the device again, depending on your settings.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:408
-msgid "admin_upgrade_running"
+msgid "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a few minutes until you try to reconnect. It might be necessary to renew the address of your computer to reach the device again, depending on your settings."
 msgstr ""
 "El sistema s'està actualitzant ara.<br />NO APAGUIS EL DISPOSITIU!<br "
 "/>Espera uns minuts abans no intentis connectar-te de nou. Pot ser necessari "
@@ -2259,19 +2259,19 @@ msgstr ""
 
 #.  (%s available)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:409
-msgid "admin_upgrade_spaceavail"
+msgid " (%s available)"
 msgstr "(%s disponible)"
 
 #. It appears that you try to flash an image that does not fit into the flash memory, please verify the image file!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:410
-msgid "admin_upgrade_toolarge"
+msgid "It appears that you try to flash an image that does not fit into the flash memory, please verify the image file!"
 msgstr ""
 "Sembla que intentes actualitzar una imatge que no hi cap a la memòria flaix, "
 "si us plau verifica el fitxer d'imatge!"
 
 #. Upload image
 #: i18n/english/luasrc/i18n/admin-core.en.lua:411
-msgid "admin_upgrade_upload"
+msgid "Upload image"
 msgstr "Penja imatge"
 
 #. The flash image was uploaded. Below is the checksum and file size listed, compare them with the original file to ensure data integrity.<br /> Click \"Proceed\" below to start the flash procedure.
diff --git a/po/ca/asterisk.po b/po/ca/asterisk.po
index 581e7895d..8c4b480db 100644
--- a/po/ca/asterisk.po
+++ b/po/ca/asterisk.po
@@ -15,1252 +15,1252 @@ msgstr ""
 
 #. Asterisk General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:1
-msgid "asterisk_asterisk"
+msgid "Asterisk General Options"
 msgstr "Opcions Generals d'Asterisk"
 
 #. AGI directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:2
-msgid "asterisk_asterisk_agidir"
+msgid "AGI directory"
 msgstr "Directori AGI"
 
 #. Cache recorded sound files during recording
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:3
-msgid "asterisk_asterisk_cacherecordfiles"
+msgid "Cache recorded sound files during recording"
 msgstr "Desa en memòria cau els sons gravats durant la gravació"
 
 #. Debug Level
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:4
-msgid "asterisk_asterisk_debug"
+msgid "Debug Level"
 msgstr "Nivell de depuració"
 
 #. Disable some warnings
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:5
-msgid "asterisk_asterisk_dontwarn"
+msgid "Disable some warnings"
 msgstr "Desactiva algunes alertes"
 
 #. Dump core on crash
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:6
-msgid "asterisk_asterisk_dumpcore"
+msgid "Dump core on crash"
 msgstr "Bolca el nucli en cas de fallada"
 
 #. High Priority
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:7
-msgid "asterisk_asterisk_highpriority"
+msgid "High Priority"
 msgstr "Alta Prioritat"
 
 #. Initialise Crypto
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:8
-msgid "asterisk_asterisk_initcrypto"
+msgid "Initialise Crypto"
 msgstr "Inicialitza Crypto"
 
 #. Use Internal Timing
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:9
-msgid "asterisk_asterisk_internaltiming"
+msgid "Use Internal Timing"
 msgstr "Utilitza l'hora interna"
 
 #. Log directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:10
-msgid "asterisk_asterisk_logdir"
+msgid "Log directory"
 msgstr "Directori de registres"
 
 #. Maximum number of calls allowed
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:11
-msgid "asterisk_asterisk_maxcalls"
+msgid "Maximum number of calls allowed"
 msgstr "Número màxim de trucades permeses"
 
 #. Maximum load to stop accepting new calls
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:12
-msgid "asterisk_asterisk_maxload"
+msgid "Maximum load to stop accepting new calls"
 msgstr "Càrrega màxima per deixar d'acceptar trucades noves"
 
 #. Disable console colors
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:13
-msgid "asterisk_asterisk_nocolor"
+msgid "Disable console colors"
 msgstr "Desactiva els colors de consola"
 
 #. Sound files Cache directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:14
-msgid "asterisk_asterisk_recordcachedir"
+msgid "Sound files Cache directory"
 msgstr "Directori de memòria cau dels fitxers de so"
 
 #. The Group to run as
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:15
-msgid "asterisk_asterisk_rungroup"
+msgid "The Group to run as"
 msgstr "Executa amb els permisos del Grup"
 
 #. The User to run as
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:16
-msgid "asterisk_asterisk_runuser"
+msgid "The User to run as"
 msgstr "Executa amb els permisos de l'Usuari"
 
 #. Voicemail Spool directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:17
-msgid "asterisk_asterisk_spooldir"
+msgid "Voicemail Spool directory"
 msgstr "Directori de bústia de correu"
 
 #. Prefix UniquID with system name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:18
-msgid "asterisk_asterisk_systemname"
+msgid "Prefix UniquID with system name"
 msgstr "Prefixa l'UniquID amb el nom del sistema"
 
 #. Build transcode paths via SLINEAR, not directly
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:19
-msgid "asterisk_asterisk_transcodeviasln"
+msgid "Build transcode paths via SLINEAR, not directly"
 msgstr "Munta les rutes de transcodificació via SLINEAR, no directament"
 
 #. Transmit SLINEAR silence while recording a channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:20
-msgid "asterisk_asterisk_transmitsilenceduringrecord"
+msgid "Transmit SLINEAR silence while recording a channel"
 msgstr "Transmet silenci SLINEAR mentre s'enregistri un canal"
 
 #. Verbose Level
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:21
-msgid "asterisk_asterisk_verbose"
+msgid "Verbose Level"
 msgstr "Nivell de detall"
 
 #. Time Zone
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:22
-msgid "asterisk_asterisk_zone"
+msgid "Time Zone"
 msgstr "Fus horari"
 
 #. Section dialplan
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:23
-msgid "asterisk_dialplan"
+msgid "Section dialplan"
 msgstr "Secció Dialplan"
 
 #. include
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:24
-msgid "asterisk_dialplan_include"
+msgid "include"
 msgstr "inclou"
 
 #. Dialplan Extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:25
-msgid "asterisk_dialplanexten"
+msgid "Dialplan Extension"
 msgstr "Connector Dialplan"
 
 #. Dialplan General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:26
-msgid "asterisk_dialplangeneral"
+msgid "Dialplan General Options"
 msgstr "Opcions generals de Dialplan"
 
 #. Allow transfer
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:27
-msgid "asterisk_dialplangeneral_allowtransfer"
+msgid "Allow transfer"
 msgstr "Permet la transferència"
 
 #. Reinvite/redirect media connections
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:28
-msgid "asterisk_dialplangeneral_canreinvite"
+msgid "Reinvite/redirect media connections"
 msgstr "Torna a convidar/redirigeix connexions mèdia"
 
 #. Clear global vars
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:29
-msgid "asterisk_dialplangeneral_clearglobalvars"
+msgid "Clear global vars"
 msgstr "Buida les variables globals"
 
 #. Dialplan Goto
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:30
-msgid "asterisk_dialplangoto"
+msgid "Dialplan Goto"
 msgstr "Dialplan Goto"
 
 #. Dialplan Conference
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:31
-msgid "asterisk_dialplanmeetme"
+msgid "Dialplan Conference"
 msgstr "Conferència Dialplan"
 
 #. Dialplan Time
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:32
-msgid "asterisk_dialplansaytime"
+msgid "Dialplan Time"
 msgstr "Dialplan Time"
 
 #. Dialplan Voicemail
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:33
-msgid "asterisk_dialplanvoice"
+msgid "Dialplan Voicemail"
 msgstr "Bústia de correu Dialplan"
 
 #. Dial Zones for Dialplan
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:34
-msgid "asterisk_dialzone"
+msgid "Dial Zones for Dialplan"
 msgstr "Zones de marcatge per Dialplan"
 
 #. Prefix to add matching dialplans
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:35
-msgid "asterisk_dialzone_addprefix"
+msgid "Prefix to add matching dialplans"
 msgstr "Prefix per afegir als Dialplan que coincideixin"
 
 #. Match International prefix
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:36
-msgid "asterisk_dialzone_international"
+msgid "Match International prefix"
 msgstr "Coincideix amb el prefix Internacional"
 
 #. Prefix (0) to add/remove to/from international numbers
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:37
-msgid "asterisk_dialzone_localprefix"
+msgid "Prefix (0) to add/remove to/from international numbers"
 msgstr "Prefix (0) per afegir/esborrar a/des de números internacionals"
 
 #. localzone
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:38
-msgid "asterisk_dialzone_localzone"
+msgid "localzone"
 msgstr "zona local"
 
 #. Match plan
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:39
-msgid "asterisk_dialzone_match"
+msgid "Match plan"
 msgstr "Pla coincident"
 
 #. Connection to use
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:40
-msgid "asterisk_dialzone_uses"
+msgid "Connection to use"
 msgstr "Connexió a fer servir"
 
 #. Feature Key maps
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:41
-msgid "asterisk_featuremap"
+msgid "Feature Key maps"
 msgstr "Mapa de Funcions Principals"
 
 #. Attended transfer key
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:42
-msgid "asterisk_featuremap_atxfer"
+msgid "Attended transfer key"
 msgstr "Tecla de transferència assistida"
 
 #. Blind transfer key
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:43
-msgid "asterisk_featuremap_blindxfer"
+msgid "Blind transfer key"
 msgstr "Tecla de transferència cega"
 
 #. Key to Disconnect call
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:44
-msgid "asterisk_featuremap_disconnect"
+msgid "Key to Disconnect call"
 msgstr "Tecla per desconnectar trucada"
 
 #. Key to Park call
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:45
-msgid "asterisk_featuremap_parkcall"
+msgid "Key to Park call"
 msgstr "Tecla per trucada en espera"
 
 #. Parking Feature
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:46
-msgid "asterisk_featurepark"
+msgid "Parking Feature"
 msgstr "Funció de trucada en espera"
 
 #. ADSI Park
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:47
-msgid "asterisk_featurepark_adsipark"
+msgid "ADSI Park"
 msgstr "Trucada en espera ADSI"
 
 #. Attended transfer timeout (sec)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:48
-msgid "asterisk_featurepark_atxfernoanswertimeout"
+msgid "Attended transfer timeout (sec)"
 msgstr "Temps d'espera de transferència assistida (seg)"
 
 #. One touch record key
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:49
-msgid "asterisk_featurepark_automon"
+msgid "One touch record key"
 msgstr "Tecla de registre d'un toc"
 
 #. Name of call context for parking
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:50
-msgid "asterisk_featurepark_context"
+msgid "Name of call context for parking"
 msgstr "Nom del context de la trucada en espera"
 
 #. Sound file to play to parked caller
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:51
-msgid "asterisk_featurepark_courtesytone"
+msgid "Sound file to play to parked caller"
 msgstr "Fitxer de so per reproduir a la trucada en espera"
 
 #. Max time (ms) between digits for feature activation
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:52
-msgid "asterisk_featurepark_featuredigittimeout"
+msgid "Max time (ms) between digits for feature activation"
 msgstr "Temps màxim (en ms) entre dígits per l'activació de funció"
 
 #. Method to Find Parking slot
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:53
-msgid "asterisk_featurepark_findslot"
+msgid "Method to Find Parking slot"
 msgstr "Mètode per trobar una ranura de trucada en espera"
 
 #. parkedmusicclass
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:54
-msgid "asterisk_featurepark_parkedmusicclass"
+msgid "parkedmusicclass"
 msgstr "parkedmusicclass"
 
 #. Play courtesy tone to
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:55
-msgid "asterisk_featurepark_parkedplay"
+msgid "Play courtesy tone to"
 msgstr "Reprodueix to de cortesia a"
 
 #. Enable Parking
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:56
-msgid "asterisk_featurepark_parkenabled"
+msgid "Enable Parking"
 msgstr "Activa les trucades en espera"
 
 #. Extension to dial to park
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:57
-msgid "asterisk_featurepark_parkext"
+msgid "Extension to dial to park"
 msgstr "Extensió per marcar per deixar en espera una trucada"
 
 #. Parking time (secs)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:58
-msgid "asterisk_featurepark_parkingtime"
+msgid "Parking time (secs)"
 msgstr "Temps de trucada en espera (secs)"
 
 #. Range of extensions for call parking
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:59
-msgid "asterisk_featurepark_parkpos"
+msgid "Range of extensions for call parking"
 msgstr "Rang d'extensions per trucada en espera"
 
 #. Pickup extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:60
-msgid "asterisk_featurepark_pickupexten"
+msgid "Pickup extension"
 msgstr "Connector de recol·lecció"
 
 #. Seconds to wait bewteen digits when transferring
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:61
-msgid "asterisk_featurepark_transferdigittimeout"
+msgid "Seconds to wait bewteen digits when transferring"
 msgstr "Segons a esperar entre dígits quan es transfereix"
 
 #. sound when attended transfer is complete
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:62
-msgid "asterisk_featurepark_xferfailsound"
+msgid "sound when attended transfer is complete"
 msgstr "so quan es completa la transferència assistida"
 
 #. Sound when attended transfer fails
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:63
-msgid "asterisk_featurepark_xfersound"
+msgid "Sound when attended transfer fails"
 msgstr "so quan falla la transferència assitida"
 
 #. Reload Hardware Config
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:64
-msgid "asterisk_hardwarereboot"
+msgid "Reload Hardware Config"
 msgstr "Recarrega la configuració de maquinari"
 
 #. Reboot Method
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:65
-msgid "asterisk_hardwarereboot_method"
+msgid "Reboot Method"
 msgstr "Mètode de Reinici"
 
 #. Parameter
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:66
-msgid "asterisk_hardwarereboot_param"
+msgid "Parameter"
 msgstr "Paràmetre"
 
 #. SIP Connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:67
-msgid "asterisk_iax"
+msgid "SIP Connection"
 msgstr "Connexió SIP"
 
 #. Always Dial International
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:68
-msgid "asterisk_iax_alwaysinternational"
+msgid "Always Dial International"
 msgstr "Marca internacional sempre"
 
 #. context
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:69
-msgid "asterisk_iax_context"
+msgid "context"
 msgstr "context"
 
 #. Country Code for connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:70
-msgid "asterisk_iax_countrycode"
+msgid "Country Code for connection"
 msgstr "Codi de país per connexió"
 
 #. Add as Extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:71
-msgid "asterisk_iax_extension"
+msgid "Add as Extension"
 msgstr "Afegeix com una Extensió"
 
 #. Host name (or blank)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:72
-msgid "asterisk_iax_host"
+msgid "Host name (or blank)"
 msgstr "Nom de màquina (o en blanc)"
 
 #. International Dial Prefix
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:73
-msgid "asterisk_iax_internationalprefix"
+msgid "International Dial Prefix"
 msgstr "Prefix de trucada internacional"
 
 #. Dial Prefix (for external line)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:74
-msgid "asterisk_iax_prefix"
+msgid "Dial Prefix (for external line)"
 msgstr "Prefix de trucada (per línia externa)"
 
 #. Secret
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:75
-msgid "asterisk_iax_secret"
+msgid "Secret"
 msgstr "Secret"
 
 #. Dial Timeout (sec)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:76
-msgid "asterisk_iax_timeout"
+msgid "Dial Timeout (sec)"
 msgstr "Temps d'espera màxim de trucada (sec)"
 
 #. Option type
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:77
-msgid "asterisk_iax_type"
+msgid "Option type"
 msgstr "Tipus d'opció"
 
 #. User name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:78
-msgid "asterisk_iax_username"
+msgid "User name"
 msgstr "Nom d'usuari"
 
 #. IAX General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:79
-msgid "asterisk_iaxgeneral"
+msgid "IAX General Options"
 msgstr "Opcions generals IAX"
 
 #. Allow Codecs
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:80
-msgid "asterisk_iaxgeneral_allow"
+msgid "Allow Codecs"
 msgstr "Permet Codecs"
 
 #. Reinvite/redirect media connections
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:81
-msgid "asterisk_iaxgeneral_canreinvite"
+msgid "Reinvite/redirect media connections"
 msgstr "Reconvida/readreça connexions mèdia"
 
 #. Static
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:82
-msgid "asterisk_iaxgeneral_static"
+msgid "Static"
 msgstr "Estàtic"
 
 #. Write Protect
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:83
-msgid "asterisk_iaxgeneral_writeprotect"
+msgid "Write Protect"
 msgstr "Protecció d'escriptura"
 
 #. Meetme Conference
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:84
-msgid "asterisk_meetme"
+msgid "Meetme Conference"
 msgstr "Conferència Meetme"
 
 #. Admin PIN
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:85
-msgid "asterisk_meetme_adminpin"
+msgid "Admin PIN"
 msgstr "PIN d'administrador"
 
 #. Meeting PIN
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:86
-msgid "asterisk_meetme_pin"
+msgid "Meeting PIN"
 msgstr "PIN de reunió"
 
 #. Meetme Conference General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:87
-msgid "asterisk_meetmegeneral"
+msgid "Meetme Conference General Options"
 msgstr "Opcions generals de conferència Meetme"
 
 #. Number of 20ms audio buffers to be used
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:88
-msgid "asterisk_meetmegeneral_audiobuffers"
+msgid "Number of 20ms audio buffers to be used"
 msgstr "Número de memòries intermitges d'àudio de 20 ms a utilitzar"
 
 #. Modules
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:89
-msgid "asterisk_module"
+msgid "Modules"
 msgstr "Mòduls"
 
 #. Alarm Receiver Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:90
-msgid "asterisk_module_appalarmreceiver"
+msgid "Alarm Receiver Application"
 msgstr "Aplicació de recepció d'alarma"
 
 #. Authentication Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:91
-msgid "asterisk_module_appauthenticate"
+msgid "Authentication Application"
 msgstr "Aplicació d'autenticació"
 
 #. Make sure asterisk doesnt save CDR
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:92
-msgid "asterisk_module_appcdr"
+msgid "Make sure asterisk doesnt save CDR"
 msgstr "Assegura't que asterisk no desa CDR"
 
 #. Check if channel is available
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:93
-msgid "asterisk_module_appchanisavail"
+msgid "Check if channel is available"
 msgstr "Comprova que el canal estigui disponible"
 
 #. Listen in on any channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:94
-msgid "asterisk_module_appchanspy"
+msgid "Listen in on any channel"
 msgstr "Escolta a qualsevol canal"
 
 #. Control Playback Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:95
-msgid "asterisk_module_appcontrolplayback"
+msgid "Control Playback Application"
 msgstr "Aplicació de control de reproducció"
 
 #. Cuts up variables
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:96
-msgid "asterisk_module_appcut"
+msgid "Cuts up variables"
 msgstr "Talla les variables"
 
 #. Database access functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:97
-msgid "asterisk_module_appdb"
+msgid "Database access functions"
 msgstr "Funcions d'accés a base de dades"
 
 #. Dialing Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:98
-msgid "asterisk_module_appdial"
+msgid "Dialing Application"
 msgstr "Aplicació de marcatge"
 
 #. Virtual Dictation Machine Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:99
-msgid "asterisk_module_appdictate"
+msgid "Virtual Dictation Machine Application"
 msgstr "Aplicació de màquina de dictat virtual"
 
 #. Directed Call Pickup Support
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:100
-msgid "asterisk_module_appdirectedpickup"
+msgid "Directed Call Pickup Support"
 msgstr "Suport de recollida de trucades adreçades"
 
 #. Extension Directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:101
-msgid "asterisk_module_appdirectory"
+msgid "Extension Directory"
 msgstr "Directori de connectors"
 
 #. DISA (Direct Inward System Access) Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:102
-msgid "asterisk_module_appdisa"
+msgid "DISA (Direct Inward System Access) Application"
 msgstr "Aplicació DISA (Direct Inward System Access)"
 
 #. Dump channel variables Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:103
-msgid "asterisk_module_appdumpchan"
+msgid "Dump channel variables Application"
 msgstr "Bolca les variables de canal de l'aplicació"
 
 #. Simple Echo Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:104
-msgid "asterisk_module_appecho"
+msgid "Simple Echo Application"
 msgstr "Aplicació d'eco simple"
 
 #. ENUM Lookup
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:105
-msgid "asterisk_module_appenumlookup"
+msgid "ENUM Lookup"
 msgstr "Consulta ENUM"
 
 #. Reevaluates strings
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:106
-msgid "asterisk_module_appeval"
+msgid "Reevaluates strings"
 msgstr "Reavalua cadenes"
 
 #. Executes applications
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:107
-msgid "asterisk_module_appexec"
+msgid "Executes applications"
 msgstr "Executa aplicacions"
 
 #. External IVR application interface
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:108
-msgid "asterisk_module_appexternalivr"
+msgid "External IVR application interface"
 msgstr "Interfície d'aplicació IVR externa"
 
 #. Fork The CDR into 2 seperate entities
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:109
-msgid "asterisk_module_appforkcdr"
+msgid "Fork The CDR into 2 seperate entities"
 msgstr "Bifurca el CDR en 2 entitats separades"
 
 #. Get ADSI CPE ID
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:110
-msgid "asterisk_module_appgetcpeid"
+msgid "Get ADSI CPE ID"
 msgstr "Obtingues la ADSI CPE ID"
 
 #. Group Management Routines
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:111
-msgid "asterisk_module_appgroupcount"
+msgid "Group Management Routines"
 msgstr "Rutines de gestió de grup"
 
 #. Encode and Stream via icecast and ices
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:112
-msgid "asterisk_module_appices"
+msgid "Encode and Stream via icecast and ices"
 msgstr "Codifica i emet via icecast i ices"
 
 #. Image Transmission Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:113
-msgid "asterisk_module_appimage"
+msgid "Image Transmission Application"
 msgstr "Aplicació de transmissió d'imatge"
 
 #. Look up Caller*ID name/number from black
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:114
-msgid "asterisk_module_applookupblacklist"
+msgid "Look up Caller*ID name/number from black"
 msgstr "Cerca la ID/nom/número de qui truca de negre"
 
 #. Look up CallerID Name from local databas
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:115
-msgid "asterisk_module_applookupcidname"
+msgid "Look up CallerID Name from local databas"
 msgstr "Cerca la ID/nom/número de qui truca de la base de dades local"
 
 #. Extension Macros
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:116
-msgid "asterisk_module_appmacro"
+msgid "Extension Macros"
 msgstr "Macros de connectors"
 
 #. A simple math Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:117
-msgid "asterisk_module_appmath"
+msgid "A simple math Application"
 msgstr "Una aplicació de matemàtiques simple"
 
 #. MD5 checksum Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:118
-msgid "asterisk_module_appmd5"
+msgid "MD5 checksum Application"
 msgstr "Aplicació de suma de verificació MD5"
 
 #. Digital Milliwatt (mu-law) Test Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:119
-msgid "asterisk_module_appmilliwatt"
+msgid "Digital Milliwatt (mu-law) Test Application"
 msgstr "Aplicació de prova de milliwat digital (mu-law)"
 
 #. Record a call and mix the audio during the recording
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:120
-msgid "asterisk_module_appmixmonitor"
+msgid "Record a call and mix the audio during the recording"
 msgstr "Registra una trucada i mescla l'àudio durant la gravació"
 
 #. Call Parking and Announce Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:121
-msgid "asterisk_module_appparkandannounce"
+msgid "Call Parking and Announce Application"
 msgstr "Aplicació d'anunci de trucades i trucada en espera"
 
 #. Trivial Playback Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:122
-msgid "asterisk_module_appplayback"
+msgid "Trivial Playback Application"
 msgstr "Aplicació de reproducció trivial"
 
 #. Require phone number to be entered
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:123
-msgid "asterisk_module_appprivacy"
+msgid "Require phone number to be entered"
 msgstr "Requereix que s'entri un número de telèfon"
 
 #. True Call Queueing
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:124
-msgid "asterisk_module_appqueue"
+msgid "True Call Queueing"
 msgstr "Encuament de trucades real"
 
 #. Random goto
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:125
-msgid "asterisk_module_apprandom"
+msgid "Random goto"
 msgstr "Goto aleatori"
 
 #. Read Variable Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:126
-msgid "asterisk_module_appread"
+msgid "Read Variable Application"
 msgstr "Aplicació de lectura de variables"
 
 #. Read in a file
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:127
-msgid "asterisk_module_appreadfile"
+msgid "Read in a file"
 msgstr "Llegeix en un fitxer"
 
 #. Realtime Data Lookup/Rewrite
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:128
-msgid "asterisk_module_apprealtime"
+msgid "Realtime Data Lookup/Rewrite"
 msgstr "Cerca/reescriptura de dades en temps real"
 
 #. Trivial Record Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:129
-msgid "asterisk_module_apprecord"
+msgid "Trivial Record Application"
 msgstr "Aplicació d'enregistrament trivial"
 
 #. Say time
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:130
-msgid "asterisk_module_appsayunixtime"
+msgid "Say time"
 msgstr "Digues l'hora"
 
 #. Send DTMF digits Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:131
-msgid "asterisk_module_appsenddtmf"
+msgid "Send DTMF digits Application"
 msgstr "Envia aplicació de dígits DTMF"
 
 #. Send Text Applications
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:132
-msgid "asterisk_module_appsendtext"
+msgid "Send Text Applications"
 msgstr "Envia aplicacions de text"
 
 #. Set CallerID Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:133
-msgid "asterisk_module_appsetcallerid"
+msgid "Set CallerID Application"
 msgstr "Estableix l'aplicació CallerID"
 
 #. CDR user field apps
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:134
-msgid "asterisk_module_appsetcdruserfield"
+msgid "CDR user field apps"
 msgstr "Aplicacions de camp d'usuari CDR"
 
 #. load =&gt; .so ; Set CallerID Name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:135
-msgid "asterisk_module_appsetcidname"
+msgid "load => .so ; Set CallerID Name"
 msgstr "load =&gt; .so ; Estableix el nom CallerID"
 
 #. load =&gt; .so ; Set CallerID Number
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:136
-msgid "asterisk_module_appsetcidnum"
+msgid "load => .so ; Set CallerID Number"
 msgstr "load =&gt; .so ; Estableix el número CallerID"
 
 #. Set RDNIS Number
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:137
-msgid "asterisk_module_appsetrdnis"
+msgid "Set RDNIS Number"
 msgstr "Estableix el número RDNIS"
 
 #. Set ISDN Transfer Capability
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:138
-msgid "asterisk_module_appsettransfercapability"
+msgid "Set ISDN Transfer Capability"
 msgstr "Estableix la capacitat de transferència XDSI"
 
 #. SMS/PSTN handler
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:139
-msgid "asterisk_module_appsms"
+msgid "SMS/PSTN handler"
 msgstr "Gestor SMS/PSTN"
 
 #. Hangs up the requested channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:140
-msgid "asterisk_module_appsofthangup"
+msgid "Hangs up the requested channel"
 msgstr "Penja el canal sol·licitat"
 
 #. Stack Routines
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:141
-msgid "asterisk_module_appstack"
+msgid "Stack Routines"
 msgstr "Rutines de pila"
 
 #. Generic System() application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:142
-msgid "asterisk_module_appsystem"
+msgid "Generic System() application"
 msgstr "Aplicació genèrica de System()"
 
 #. Playback with Talk Detection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:143
-msgid "asterisk_module_apptalkdetect"
+msgid "Playback with Talk Detection"
 msgstr "Playback amb Detecció de Parla"
 
 #. Interface Test Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:144
-msgid "asterisk_module_apptest"
+msgid "Interface Test Application"
 msgstr "Aplicació de proves d'interfície"
 
 #. Transfer
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:145
-msgid "asterisk_module_apptransfer"
+msgid "Transfer"
 msgstr "Transfereix"
 
 #. TXTCIDName
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:146
-msgid "asterisk_module_apptxtcidname"
+msgid "TXTCIDName"
 msgstr "TXTCIDName"
 
 #. Send URL Applications
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:147
-msgid "asterisk_module_appurl"
+msgid "Send URL Applications"
 msgstr "Envia aplicacions d'URL"
 
 #. Custom User Event Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:148
-msgid "asterisk_module_appuserevent"
+msgid "Custom User Event Application"
 msgstr "Aplicació d'esdeveniments personalitzats d'usuari"
 
 #. Send verbose output
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:149
-msgid "asterisk_module_appverbose"
+msgid "Send verbose output"
 msgstr "Envia sortida detallada"
 
 #. Voicemail
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:150
-msgid "asterisk_module_appvoicemail"
+msgid "Voicemail"
 msgstr "Bústia de veu"
 
 #. Waits until first ring after time
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:151
-msgid "asterisk_module_appwaitforring"
+msgid "Waits until first ring after time"
 msgstr "Espera fins el primer to després del temps"
 
 #. Wait For Silence Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:152
-msgid "asterisk_module_appwaitforsilence"
+msgid "Wait For Silence Application"
 msgstr "Espera l'aplicació de silenci"
 
 #. While Loops and Conditional Execution
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:153
-msgid "asterisk_module_appwhile"
+msgid "While Loops and Conditional Execution"
 msgstr "Execució de bucles while i condicionals"
 
 #. Comma Separated Values CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:154
-msgid "asterisk_module_cdrcsv"
+msgid "Comma Separated Values CDR Backend"
 msgstr "Valors de Backend CDR separats per comes"
 
 #. Customizable Comma Separated Values CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:155
-msgid "asterisk_module_cdrcustom"
+msgid "Customizable Comma Separated Values CDR Backend"
 msgstr "Valors de Backend CDR personalitzats separats per comes"
 
 #. Asterisk Call Manager CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:156
-msgid "asterisk_module_cdrmanager"
+msgid "Asterisk Call Manager CDR Backend"
 msgstr "Backend CDR del gestor de trucades Asterisk"
 
 #. MySQL CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:157
-msgid "asterisk_module_cdrmysql"
+msgid "MySQL CDR Backend"
 msgstr "Backend CDR MySQL"
 
 #. PostgreSQL CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:158
-msgid "asterisk_module_cdrpgsql"
+msgid "PostgreSQL CDR Backend"
 msgstr "Backend CDR PostgreSQL"
 
 #. SQLite CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:159
-msgid "asterisk_module_cdrsqlite"
+msgid "SQLite CDR Backend"
 msgstr "Backend CDR SQLite"
 
 #. Agent Proxy Channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:160
-msgid "asterisk_module_chanagent"
+msgid "Agent Proxy Channel"
 msgstr "Canal de l'Agent Proxy"
 
 #. Channel driver for GTalk
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:161
-msgid "asterisk_module_chanalsa"
+msgid "Channel driver for GTalk"
 msgstr "Controlador de canal pel GTalk"
 
 #. Channel driver for GTalk
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:162
-msgid "asterisk_module_changtalk"
+msgid "Channel driver for GTalk"
 msgstr "Controlador de canal pel GTalk"
 
 #. Option chan_iax2
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:163
-msgid "asterisk_module_chaniax2"
+msgid "Option chan_iax2"
 msgstr "Opció chan_iax2"
 
 #. Local Proxy Channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:164
-msgid "asterisk_module_chanlocal"
+msgid "Local Proxy Channel"
 msgstr "Canal de proxy local"
 
 #. Session Initiation Protocol (SIP)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:165
-msgid "asterisk_module_chansip"
+msgid "Session Initiation Protocol (SIP)"
 msgstr "Protocol d'inicialització de sessió (SIP)"
 
 #. Adaptive Differential PCM Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:166
-msgid "asterisk_module_codecadpcm"
+msgid "Adaptive Differential PCM Coder/Decoder"
 msgstr "Codificador/Decodificador PCM adaptatiu diferencial"
 
 #. A-law Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:167
-msgid "asterisk_module_codecalaw"
+msgid "A-law Coder/Decoder"
 msgstr "Codificador/Decodificador de llei A"
 
 #. A-law and Mulaw direct Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:168
-msgid "asterisk_module_codecamu"
+msgid "A-law and Mulaw direct Coder/Decoder"
 msgstr "Codificador/Decodificador directe de llei A i Mu"
 
 #. ITU G.726-32kbps G726 Transcoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:169
-msgid "asterisk_module_codecg726"
+msgid "ITU G.726-32kbps G726 Transcoder"
 msgstr "Transcodificador ITU G.726-32kbps G726"
 
 #. GSM/PCM16 (signed linear) Codec Translation
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:170
-msgid "asterisk_module_codecgsm"
+msgid "GSM/PCM16 (signed linear) Codec Translation"
 msgstr "Còdec de traducció GSM/PCM16 (lineal amb signe)"
 
 #. Speex/PCM16 (signed linear) Codec Translator
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:171
-msgid "asterisk_module_codecspeex"
+msgid "Speex/PCM16 (signed linear) Codec Translator"
 msgstr "Còdec de traducció Speex/PCM16 (lineal amb signe)"
 
 #. Mu-law Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:172
-msgid "asterisk_module_codeculaw"
+msgid "Mu-law Coder/Decoder"
 msgstr "Codificador/Decodificador llei Mu"
 
 #. Sun Microsystems AU format (signed linear)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:173
-msgid "asterisk_module_formatau"
+msgid "Sun Microsystems AU format (signed linear)"
 msgstr "Format AU de Sun Microsystems (lineal amb signe)"
 
 #. G.723.1 Simple Timestamp File Format
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:174
-msgid "asterisk_module_formatg723"
+msgid "G.723.1 Simple Timestamp File Format"
 msgstr "Format de fitxer de marca de temps simple G.723.1"
 
 #. Raw G.726 (16/24/32/40kbps) data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:175
-msgid "asterisk_module_formatg726"
+msgid "Raw G.726 (16/24/32/40kbps) data"
 msgstr "Dades Raw G.726 (16/24/32/40kbps)"
 
 #. Raw G729 data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:176
-msgid "asterisk_module_formatg729"
+msgid "Raw G729 data"
 msgstr "Dades Raw G729"
 
 #. Raw GSM data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:177
-msgid "asterisk_module_formatgsm"
+msgid "Raw GSM data"
 msgstr "Dades Raw GSM"
 
 #. Raw h263 data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:178
-msgid "asterisk_module_formath263"
+msgid "Raw h263 data"
 msgstr "Dades Raw h263"
 
 #. JPEG (Joint Picture Experts Group) Image
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:179
-msgid "asterisk_module_formatjpeg"
+msgid "JPEG (Joint Picture Experts Group) Image"
 msgstr "Imatge JPEG (Joint Picture Experts Group)"
 
 #. Raw uLaw 8khz Audio support (PCM)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:180
-msgid "asterisk_module_formatpcm"
+msgid "Raw uLaw 8khz Audio support (PCM)"
 msgstr "Suport d'àudio Raw llei-u 8khz (PCM)"
 
 #. load =&gt; .so ; Raw aLaw 8khz PCM Audio support
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:181
-msgid "asterisk_module_formatpcmalaw"
+msgid "load => .so ; Raw aLaw 8khz PCM Audio support"
 msgstr "load =&gt; .so ; suport d'àudio Raw llei-a 8khz PCM"
 
 #. Raw Signed Linear Audio support (SLN)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:182
-msgid "asterisk_module_formatsln"
+msgid "Raw Signed Linear Audio support (SLN)"
 msgstr "Suport d'àudio Raw amb signe lineal (SLN)"
 
 #. Dialogic VOX (ADPCM) File Format
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:183
-msgid "asterisk_module_formatvox"
+msgid "Dialogic VOX (ADPCM) File Format"
 msgstr "Format de fitxer Dialogic VOX (ADPCM)"
 
 #. Microsoft WAV format (8000hz Signed Line
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:184
-msgid "asterisk_module_formatwav"
+msgid "Microsoft WAV format (8000hz Signed Line"
 msgstr "Format Microsoft WAV (8000hz amb signe lineal)"
 
 #. Microsoft WAV format (Proprietary GSM)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:185
-msgid "asterisk_module_formatwavgsm"
+msgid "Microsoft WAV format (Proprietary GSM)"
 msgstr "Format Microsoft WAV (GSM propietari)"
 
 #. Caller ID related dialplan functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:186
-msgid "asterisk_module_funccallerid"
+msgid "Caller ID related dialplan functions"
 msgstr "Functions de dialplan relacionades amb la ID de qui truca"
 
 #. ENUM Functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:187
-msgid "asterisk_module_funcenum"
+msgid "ENUM Functions"
 msgstr "Funcions ENUM"
 
 #. URI encoding / decoding functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:188
-msgid "asterisk_module_funcuri"
+msgid "URI encoding / decoding functions"
 msgstr "Funcions de codificació / decodificació d'URI"
 
 #. Asterisk Extension Language Compiler
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:189
-msgid "asterisk_module_pbxael"
+msgid "Asterisk Extension Language Compiler"
 msgstr "Compilador del llenguatge de connectors d'Asterisk"
 
 #. Text Extension Configuration
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:190
-msgid "asterisk_module_pbxconfig"
+msgid "Text Extension Configuration"
 msgstr "Configuració del connector de text"
 
 #. load =&gt; .so ; Builtin dialplan functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:191
-msgid "asterisk_module_pbxfunctions"
+msgid "load => .so ; Builtin dialplan functions"
 msgstr "load =&gt; .s ; Funcions integrades dialplan"
 
 #. Loopback Switch
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:192
-msgid "asterisk_module_pbxloopback"
+msgid "Loopback Switch"
 msgstr "Switch loopback"
 
 #. Realtime Switch
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:193
-msgid "asterisk_module_pbxrealtime"
+msgid "Realtime Switch"
 msgstr "Switch en temps real"
 
 #. Outgoing Spool Support
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:194
-msgid "asterisk_module_pbxspool"
+msgid "Outgoing Spool Support"
 msgstr "Suport de gestió de cues sortint"
 
 #. Wil Cal U (Auto Dialer)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:195
-msgid "asterisk_module_pbxwilcalu"
+msgid "Wil Cal U (Auto Dialer)"
 msgstr "Wil Cal U (Auto Marcatge)"
 
 #. MySQL Config Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:196
-msgid "asterisk_module_resconfigmysql"
+msgid "MySQL Config Resource"
 msgstr "Configuració del recurs MySQL"
 
 #. ODBC Config Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:197
-msgid "asterisk_module_resconfigodbc"
+msgid "ODBC Config Resource"
 msgstr "Configuració del recurs ODBC"
 
 #. PGSQL Module
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:198
-msgid "asterisk_module_resconfigpgsql"
+msgid "PGSQL Module"
 msgstr "Mòdul PGSQL"
 
 #. Cryptographic Digital Signatures
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:199
-msgid "asterisk_module_rescrypto"
+msgid "Cryptographic Digital Signatures"
 msgstr "Signatures digitals criptogràfiques"
 
 #. Call Parking Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:200
-msgid "asterisk_module_resfeatures"
+msgid "Call Parking Resource"
 msgstr "Recurs de trucada en espera"
 
 #. Indications Configuration
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:201
-msgid "asterisk_module_resindications"
+msgid "Indications Configuration"
 msgstr "Configuració d'indicacions"
 
 #. Call Monitoring Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:202
-msgid "asterisk_module_resmonitor"
+msgid "Call Monitoring Resource"
 msgstr "Recurs de monitoreig de trucades"
 
 #. Music On Hold Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:203
-msgid "asterisk_module_resmusiconhold"
+msgid "Music On Hold Resource"
 msgstr "Recurs de música en espera"
 
 #. ODBC Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:204
-msgid "asterisk_module_resodbc"
+msgid "ODBC Resource"
 msgstr "Recurs ODBC"
 
 #. SMDI Module
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:205
-msgid "asterisk_module_ressmdi"
+msgid "SMDI Module"
 msgstr "Mòdul SMDI"
 
 #. SNMP Module
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:206
-msgid "asterisk_module_ressnmp"
+msgid "SNMP Module"
 msgstr "Mòdul SNMP"
 
 #. Music On Hold
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:207
-msgid "asterisk_moh"
+msgid "Music On Hold"
 msgstr "Música en espera"
 
 #. Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:208
-msgid "asterisk_moh_application"
+msgid "Application"
 msgstr "Aplicació"
 
 #. Directory of Music
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:209
-msgid "asterisk_moh_directory"
+msgid "Directory of Music"
 msgstr "Directori de música"
 
 #. Option mode
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:210
-msgid "asterisk_moh_mode"
+msgid "Option mode"
 msgstr "Mode d'opció"
 
 #. Random Play
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:211
-msgid "asterisk_moh_random"
+msgid "Random Play"
 msgstr "Reproducció aleatòria"
 
 #. SIP Connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:212
-msgid "asterisk_sip"
+msgid "SIP Connection"
 msgstr "Connexió SIP"
 
 #. Always Dial International
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:213
-msgid "asterisk_sip_alwaysinternational"
+msgid "Always Dial International"
 msgstr "Marca sempre Internacional"
 
 #. Reinvite/redirect media connections
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:214
-msgid "asterisk_sip_canreinvite"
+msgid "Reinvite/redirect media connections"
 msgstr "Reconvida/readreça connexions media"
 
 #. context
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:215
-msgid "asterisk_sip_context"
+msgid "context"
 msgstr "context"
 
 #. Country Code for connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:216
-msgid "asterisk_sip_countrycode"
+msgid "Country Code for connection"
 msgstr "Codi de país per la connexió"
 
 #. DTMF mode
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:217
-msgid "asterisk_sip_dtmfmode"
+msgid "DTMF mode"
 msgstr "Mode DTMF"
 
 #. Add as Extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:218
-msgid "asterisk_sip_extension"
+msgid "Add as Extension"
 msgstr "Afegeix com a Connector"
 
 #. Primary domain identity for From: headers
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:219
-msgid "asterisk_sip_fromdomain"
+msgid "Primary domain identity for From: headers"
 msgstr "Domini d'identitat primari per les capçaleres From:"
 
 #. From user (required by many SIP providers)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:220
-msgid "asterisk_sip_fromuser"
+msgid "From user (required by many SIP providers)"
 msgstr "Usuari d'inici (requerit per diversos proveïdors SIP)"
 
 #. Host name (or blank)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:221
-msgid "asterisk_sip_host"
+msgid "Host name (or blank)"
 msgstr "Nom de màquina (o en blanc)"
 
 #. Ring on incoming dialplan contexts
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:222
-msgid "asterisk_sip_incoming"
+msgid "Ring on incoming dialplan contexts"
 msgstr "Truca en contextos d'entrades dialplan"
 
 #. Allow Insecure for
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:223
-msgid "asterisk_sip_insecure"
+msgid "Allow Insecure for"
 msgstr "Permet insegur per"
 
 #. International Dial Prefix
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:224
-msgid "asterisk_sip_internationalprefix"
+msgid "International Dial Prefix"
 msgstr "Prefix de trucada Internacional"
 
 #. Mailbox for MWI
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:225
-msgid "asterisk_sip_mailbox"
+msgid "Mailbox for MWI"
 msgstr "Bústia de veu per MWI"
 
 #. NAT between phone and Asterisk
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:226
-msgid "asterisk_sip_nat"
+msgid "NAT between phone and Asterisk"
 msgstr "NAT entre el telèfon i l'Asterisk"
 
 #. Check tags in headers
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:227
-msgid "asterisk_sip_pedantic"
+msgid "Check tags in headers"
 msgstr "Comprova etiquetes a les capçaleres"
 
 #. SIP Port
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:228
-msgid "asterisk_sip_port"
+msgid "SIP Port"
 msgstr "Port SIP"
 
 #. Dial Prefix (for external line)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:229
-msgid "asterisk_sip_prefix"
+msgid "Dial Prefix (for external line)"
 msgstr "Prefix de marcatge (per línia externa)"
 
 #. Reply Timeout (ms) for down connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:230
-msgid "asterisk_sip_qualify"
+msgid "Reply Timeout (ms) for down connection"
 msgstr "Temps d'esperi per contestar (ms) per caigudes de connexió"
 
 #. Register connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:231
-msgid "asterisk_sip_register"
+msgid "Register connection"
 msgstr "Registra connexió"
 
 #. Secret
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:232
-msgid "asterisk_sip_secret"
+msgid "Secret"
 msgstr "Secret"
 
 #. Dial own extension for mailbox
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:233
-msgid "asterisk_sip_selfmailbox"
+msgid "Dial own extension for mailbox"
 msgstr "Truca el propi connector per la bústia de veu"
 
 #. Dial Timeout (sec)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:234
-msgid "asterisk_sip_timeout"
+msgid "Dial Timeout (sec)"
 msgstr "Temps d'expiració de trucada (seg)"
 
 #. Client Type
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:235
-msgid "asterisk_sip_type"
+msgid "Client Type"
 msgstr "Tipus de client"
 
 #. Username
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:236
-msgid "asterisk_sip_username"
+msgid "Username"
 msgstr "Nom d'usuari"
 
 #. Section sipgeneral
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:237
-msgid "asterisk_sipgeneral"
+msgid "Section sipgeneral"
 msgstr "Secció sipgeneral"
 
 #. Allow codecs
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:238
-msgid "asterisk_sipgeneral_allow"
+msgid "Allow codecs"
 msgstr "Permet còdecs"
 
 #. SIP Port
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:239
-msgid "asterisk_sipgeneral_port"
+msgid "SIP Port"
 msgstr "Port SIP"
 
 #. SIP realm
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:240
-msgid "asterisk_sipgeneral_realm"
+msgid "SIP realm"
 msgstr "Reialme SIP"
 
 #. Voicemail general options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:241
-msgid "asterisk_voicegeneral"
+msgid "Voicemail general options"
 msgstr "Opcions generals de bústia de veu"
 
 #. From Email address of server
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:242
-msgid "asterisk_voicegeneral_serveremail"
+msgid "From Email address of server"
 msgstr "Adreça de correu electrònic d'origen del servidor"
 
 #. Voice Mail boxes
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:243
-msgid "asterisk_voicemail"
+msgid "Voice Mail boxes"
 msgstr "Bústies de la bústia de veu"
 
 #. Email contains attachment
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:244
-msgid "asterisk_voicemail_attach"
+msgid "Email contains attachment"
 msgstr "El correu electrònic conté fitxers adjunts"
 
 #. Email
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:245
-msgid "asterisk_voicemail_email"
+msgid "Email"
 msgstr "Correu electrònic"
 
 #. Display Name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:246
-msgid "asterisk_voicemail_name"
+msgid "Display Name"
 msgstr "Nom a mostrar"
 
 #. Password
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:247
-msgid "asterisk_voicemail_password"
+msgid "Password"
 msgstr "Contrasenya"
 
 #. zone
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:248
-msgid "asterisk_voicemail_zone"
+msgid "zone"
 msgstr "zona"
 
 #. Voice Zone settings
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:249
-msgid "asterisk_voicezone"
+msgid "Voice Zone settings"
 msgstr "Configuració de zona de veu"
 
 #. Message Format
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:250
-msgid "asterisk_voicezone_message"
+msgid "Message Format"
 msgstr "Format de missatge"
 
 #. Time Zone
diff --git a/po/ca/cbi.po b/po/ca/cbi.po
index d973897d6..476105013 100644
--- a/po/ca/cbi.po
+++ b/po/ca/cbi.po
@@ -15,86 +15,86 @@ msgstr ""
 
 #. Add entry
 #: i18n/english/luasrc/i18n/cbi.en.lua:1
-msgid "cbi_add"
+msgid "Add"
 msgstr "Afegeix entrada"
 
 #. Remove entry
 #: i18n/english/luasrc/i18n/cbi.en.lua:2
-msgid "cbi_del"
+msgid "Delete"
 msgstr "Esborra entrada"
 
 #. Replace entry
 #: i18n/english/luasrc/i18n/cbi.en.lua:3
-msgid "cbi_replace"
+msgid "Replace entry"
 msgstr "Reemplaça entrada"
 
 #. Invalid input value
 #: i18n/english/luasrc/i18n/cbi.en.lua:4
-msgid "cbi_invalid"
+msgid "Invalid"
 msgstr "Valor d'entrada invàlid"
 
 #. <strong>Validation failed:</strong> Please check any input fields for mistakes.
 #: i18n/english/luasrc/i18n/cbi.en.lua:5
-msgid "cbi_invalid_section"
+msgid "<strong>Validation failed:</strong> Please check any input fields for mistakes."
 msgstr ""
 "<strong>Ha fallat la validació:</strong> Si us plau revisa qualsevol camp "
 "d'entrada per problemes."
 
 #. This field is mandatory
 #: i18n/english/luasrc/i18n/cbi.en.lua:6
-msgid "cbi_missing"
+msgid "This field is mandatory"
 msgstr "Aquest camp és obligatori"
 
 #. <strong>Validation failed:</strong> At least one mandatory field has no or an invalid value
 #: i18n/english/luasrc/i18n/cbi.en.lua:7
-msgid "cbi_deperror"
+msgid "<strong>Validation failed:</strong> At least one mandatory field has no or an invalid value"
 msgstr ""
 "<strong>Ha fallat la validació:</strong> Almenys un camp obligatori té un "
 "valor incorrecte o inexistent"
 
 #. A requirement for this option was not met
 #: i18n/english/luasrc/i18n/cbi.en.lua:8
-msgid "cbi_reqerror"
+msgid "A requirement for this option was not met"
 msgstr "No s'ha satisfet un requeriment d'aquesta opció"
 
 #. -- Additional Field --
 #: i18n/english/luasrc/i18n/cbi.en.lua:9
-msgid "cbi_addopt"
+msgid "-- Additional Field --"
 msgstr "-- Camp addicional --"
 
 #.  (optional)
 #: i18n/english/luasrc/i18n/cbi.en.lua:10
-msgid "cbi_optional"
+msgid " (optional)"
 msgstr "(opcional)"
 
 #. This section contains no values yet
 #: i18n/english/luasrc/i18n/cbi.en.lua:11
-msgid "cbi_sectempty"
+msgid "This section contains no values yet"
 msgstr "Aquesta secció no conté cap valor encara"
 
 #. -- custom --
 #: i18n/english/luasrc/i18n/cbi.en.lua:12
-msgid "cbi_manual"
+msgid "-- custom --"
 msgstr "-- personalitzat --"
 
 #. -- Please choose --
 #: i18n/english/luasrc/i18n/cbi.en.lua:13
-msgid "cbi_select"
+msgid "-- Please choose --"
 msgstr "-- Escull --"
 
 #. Go to relevant configuration page
 #: i18n/english/luasrc/i18n/cbi.en.lua:14
-msgid "cbi_gorel"
+msgid " "
 msgstr "Vés a la pàgina de configuració"
 
 #. Applying changes
 #: i18n/english/luasrc/i18n/cbi.en.lua:15
-msgid "cbi_applying"
+msgid "Applying changes"
 msgstr "Aplicant els canvis"
 
 #. Uploaded File
 #: i18n/english/luasrc/i18n/cbi.en.lua:16
-msgid "cbi_upload"
+msgid "Uploaded File"
 msgstr "Fitxer pujat"
 
 #. Search file...
diff --git a/po/ca/coovachilli.po b/po/ca/coovachilli.po
index a35ff210e..d6490b23d 100644
--- a/po/ca/coovachilli.po
+++ b/po/ca/coovachilli.po
@@ -15,37 +15,37 @@ msgstr ""
 
 #. CoovaChilli
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:1
-msgid "coovachilli"
+msgid "CoovaChilli"
 msgstr "CoovaChilli"
 
 #. General configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:2
-msgid "coovachilli_general"
+msgid "General configuration"
 msgstr "Configuració general"
 
 #. General CoovaChilli settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:3
-msgid "coovachilli_general_desc"
+msgid "General CoovaChilli settings"
 msgstr "Configuració CoovaChilli general"
 
 #. Command socket
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:4
-msgid "coovachilli_general_cmdsock"
+msgid "Command socket"
 msgstr "Socket de comanda"
 
 #. UNIX socket used for communication with chilli_query
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:5
-msgid "coovachilli_general_cmdsock_desc"
+msgid "UNIX socket used for communication with chilli_query"
 msgstr "SocketUNIX usat per comunicació amb chilli_query"
 
 #. Config refresh interval
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:6
-msgid "coovachilli_general_interval"
+msgid "Config refresh interval"
 msgstr "Configuració d'interval de refresc"
 
 #. Re-read configuration file and do DNS lookups every interval seconds. This has the same effect as sending the HUP signal. If interval is 0 (zero) this feature is disabled. 
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:7
-msgid "coovachilli_general_interval_desc"
+msgid "Re-read configuration file and do DNS lookups every interval seconds. This has the same effect as sending the HUP signal. If interval is 0 (zero) this feature is disabled. "
 msgstr ""
 "Re-llegeix el fitxer de configuració i les consultes DNS cada interval "
 "segons. Això té el mateix efecte que enviar el senyal HUP. Si l'interval és "
@@ -53,288 +53,288 @@ msgstr ""
 
 #. Pid file
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:8
-msgid "coovachilli_general_pidfile"
+msgid "Pid file"
 msgstr "Fitxer PID"
 
 #. Filename to put the process id
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:9
-msgid "coovachilli_general_pidfile_desc"
+msgid "Filename to put the process id"
 msgstr "Nom de fitxer on posar la ID de procés"
 
 #. State directory
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:10
-msgid "coovachilli_general_statedir"
+msgid "State directory"
 msgstr "Directori d'estat"
 
 #. Directory of non-volatile data
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:11
-msgid "coovachilli_general_statedir_desc"
+msgid "Directory of non-volatile data"
 msgstr "Directori de dades no volàtils"
 
 #. TUN/TAP configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:12
-msgid "coovachilli_tun"
+msgid "TUN/TAP configuration"
 msgstr "Configuració TUN/TAP"
 
 #. Network/Tun configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:13
-msgid "coovachilli_tun_desc"
+msgid "Network/Tun configuration"
 msgstr "Configuració de xarxa/tun"
 
 #. Network down script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:14
-msgid "coovachilli_tun_condown"
+msgid "Network down script"
 msgstr "Script de baixada de xarxa"
 
 #. Script executed after a session has moved from authorized state to unauthorized
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:15
-msgid "coovachilli_tun_condown_desc"
+msgid "Script executed after a session has moved from authorized state to unauthorized"
 msgstr ""
 "Script executat quan es mou una sessió des de l'estat autoritzat a no "
 "autoritzat"
 
 #. Network up script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:16
-msgid "coovachilli_tun_conup"
+msgid "Network up script"
 msgstr "Script de pujada de xarxa"
 
 #. Script executed after the tun network interface has been brought up
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:17
-msgid "coovachilli_tun_conup_desc"
+msgid "Script executed after the tun network interface has been brought up"
 msgstr "Script executat després que la interfície de xarxa tun s'hagi alçat"
 
 #. Primary DNS Server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:18
-msgid "coovachilli_tun_dns1"
+msgid "Primary DNS Server"
 msgstr "Servidor DNS primari"
 
 #. Is used to inform the client about the DNS address to use for host name resolution
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:19
-msgid "coovachilli_tun_dns1_desc"
+msgid "Is used to inform the client about the DNS address to use for host name resolution"
 msgstr ""
 "S'utilitza per informar el client sobre l'adreça DNS per utilitzar per la "
 "resolució de noms de màquina"
 
 #. Secondary DNS Server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:20
-msgid "coovachilli_tun_dns2"
+msgid "Secondary DNS Server"
 msgstr "Servidor DNS secundari"
 
 #. Is used to inform the client about the DNS address to use for host name resolution
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:21
-msgid "coovachilli_tun_dns2_desc"
+msgid "Is used to inform the client about the DNS address to use for host name resolution"
 msgstr ""
 "S'utilitza per informar el client sobre les adreces DNS  per utilitzar per "
 "la resolució de noms de domini"
 
 #. Domain name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:22
-msgid "coovachilli_tun_domain"
+msgid "Domain name"
 msgstr "Nom de domini"
 
 #. Is used to inform the client about the domain name to use for DNS lookups
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:23
-msgid "coovachilli_tun_domain_desc"
+msgid "Is used to inform the client about the domain name to use for DNS lookups"
 msgstr ""
 "S'utilitza per informar el client sobre el no mde domini a utilitzar per les "
 "consultes DNS"
 
 #. Dynamic IP address pool
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:24
-msgid "coovachilli_tun_dynip"
+msgid "Dynamic IP address pool"
 msgstr "Bateria d'adreces IP dinàmiques"
 
 #. Specifies a pool of dynamic IP addresses
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:25
-msgid "coovachilli_tun_dynip_desc"
+msgid "Specifies a pool of dynamic IP addresses"
 msgstr "Especifica una bateria d'adreces IP dinàmiques"
 
 #. IP down script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:26
-msgid "coovachilli_tun_ipdown"
+msgid "IP down script"
 msgstr "Scripts de baixada IP"
 
 #. Script executed after the tun network interface has been taken down
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:27
-msgid "coovachilli_tun_ipdown_desc"
+msgid "Script executed after the tun network interface has been taken down"
 msgstr "Script executat després que s'hagi abaixat la interfície de xarxa tun"
 
 #. IP up script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:28
-msgid "coovachilli_tun_ipup"
+msgid "IP up script"
 msgstr "Script de pujada IP"
 
 #. Script executed after the TUN/TAP network interface has been brought up
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:29
-msgid "coovachilli_tun_ipup_desc"
+msgid "Script executed after the TUN/TAP network interface has been brought up"
 msgstr ""
 "Script executat després que s'hagi apujat la interfície de xarxa TUN/TAP"
 
 #. Uplink subnet
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:30
-msgid "coovachilli_tun_net"
+msgid "Uplink subnet"
 msgstr "Subxarxa de pujada"
 
 #. Network address of the uplink interface (CIDR notation)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:31
-msgid "coovachilli_tun_net_desc"
+msgid "Network address of the uplink interface (CIDR notation)"
 msgstr "Adreça de xarxa de la interfície d'enllaç de pujada (notació CIDR)"
 
 #. Static IP address pool
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:32
-msgid "coovachilli_tun_statip"
+msgid "Static IP address pool"
 msgstr "Bateria d'adreces IP estàtiques"
 
 #. Specifies a pool of static IP addresses
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:33
-msgid "coovachilli_tun_statip_desc"
+msgid "Specifies a pool of static IP addresses"
 msgstr "Especifica una bateria d'adreces IP estàtiques"
 
 #. TUN/TAP device
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:34
-msgid "coovachilli_tun_tundev"
+msgid "TUN/TAP device"
 msgstr "Dispositiu TUN/TAP"
 
 #. The specific device to use for the TUN/TAP interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:35
-msgid "coovachilli_tun_tundev_desc"
+msgid "The specific device to use for the TUN/TAP interface"
 msgstr "El dispositiu específic utilitzar per la interfície TUN/TAP"
 
 #. TX queue length
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:36
-msgid "coovachilli_tun_txqlen"
+msgid "TX queue length"
 msgstr "Llargària de la cua TX"
 
 #. The TX queue length to set on the TUN/TAP interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:37
-msgid "coovachilli_tun_txqlen_desc"
+msgid "The TX queue length to set on the TUN/TAP interface"
 msgstr "La llargària de la cua TX per establir la interfície TUN/TAP"
 
 #. Use TAP device
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:38
-msgid "coovachilli_tun_usetap"
+msgid "Use TAP device"
 msgstr "Utilitza dispositiu TAP"
 
 #. Use the TAP interface instead of TUN
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:39
-msgid "coovachilli_tun_usetap_desc"
+msgid "Use the TAP interface instead of TUN"
 msgstr "Utilitza la interfície TAP en comptes de TUN"
 
 #. DHCP configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:40
-msgid "coovachilli_dhcp"
+msgid "DHCP configuration"
 msgstr "Configuració DHCP"
 
 #. Set DHCP options for connecting clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:41
-msgid "coovachilli_dhcp_desc"
+msgid "Set DHCP options for connecting clients"
 msgstr "Estebleix les opcions DHCP pels clients connectats"
 
 #. DHCP end number
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:42
-msgid "coovachilli_dhcp_dhcpend"
+msgid "DHCP end number"
 msgstr "Número final de DHCP"
 
 #. Where to stop assigning IP addresses (default 254)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:43
-msgid "coovachilli_dhcp_dhcpend_desc"
+msgid "Where to stop assigning IP addresses (default 254)"
 msgstr "Quan deixar d'assignar adreces IP (per defecte 254)"
 
 #. DHCP interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:44
-msgid "coovachilli_dhcp_dhcpif"
+msgid "DHCP interface"
 msgstr "Interfície DHCP"
 
 #. Ethernet interface to listen to for the downlink interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:45
-msgid "coovachilli_dhcp_dhcpif_desc"
+msgid "Ethernet interface to listen to for the downlink interface"
 msgstr ""
 "Interfície Ethernet per escoltar les connexions a la interfície de baixada"
 
 #. Listen MAC address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:46
-msgid "coovachilli_dhcp_dhcpmac"
+msgid "Listen MAC address"
 msgstr "Escolta adreça MAC"
 
 #. MAC address to listen to. If not specified the MAC address of the interface will be used
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:47
-msgid "coovachilli_dhcp_dhcpmac_desc"
+msgid "MAC address to listen to. If not specified the MAC address of the interface will be used"
 msgstr ""
 "Adreça MAC per escoltar. Si no s'especifica, s'utilitzarà l'adreça MAC de la "
 "interfície."
 
 #. DHCP start number
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:48
-msgid "coovachilli_dhcp_dhcpstart"
+msgid "DHCP start number"
 msgstr "Número d'inici de DHCP"
 
 #. Where to start assigning IP addresses (default 10)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:49
-msgid "coovachilli_dhcp_dhcpstart_desc"
+msgid "Where to start assigning IP addresses (default 10)"
 msgstr "Quan començar a assignar adreces IP (per defecte 10)"
 
 #. Enable IEEE 802.1x
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:50
-msgid "coovachilli_dhcp_eapolenable"
+msgid "Enable IEEE 802.1x"
 msgstr "Activa IEEE 802.1x"
 
 #. Enable IEEE 802.1x authentication and listen for EAP requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:51
-msgid "coovachilli_dhcp_eapolenable_desc"
+msgid "Enable IEEE 802.1x authentication and listen for EAP requests"
 msgstr "Activa l'autenticació IEEE 802.1x i escolta peticions EAP"
 
 #. Leasetime
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:52
-msgid "coovachilli_dhcp_lease"
+msgid "Leasetime"
 msgstr "Temps de Lease"
 
 #. Use a DHCP lease of seconds (default 600)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:53
-msgid "coovachilli_dhcp_lease_desc"
+msgid "Use a DHCP lease of seconds (default 600)"
 msgstr "Utilitza un lease de segons (per defecte 600)"
 
 #. RADIUS configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:54
-msgid "coovachilli_radius"
+msgid "RADIUS configuration"
 msgstr "Configuració RADIUS"
 
 #. RADIUS configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:55
-msgid "coovachilli_radius_desc"
+msgid "RADIUS configuration"
 msgstr "Configuració RADIUS"
 
 #. Allow session update through RADIUS
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:56
-msgid "coovachilli_radius_acctupdate"
+msgid "Allow session update through RADIUS"
 msgstr "Permet l'actualització de sessió a través de RADIUS"
 
 #. Allow updating of session parameters with RADIUS attributes sent in Accounting-Response
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:57
-msgid "coovachilli_radius_acctupdate_desc"
+msgid "Allow updating of session parameters with RADIUS attributes sent in Accounting-Response"
 msgstr ""
 "Permet l'actualització dels paràmetres de sessió amb atributs RADIUS enviats "
 "per Accounting-Response"
 
 #. Admin password
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:58
-msgid "coovachilli_radius_adminpasswd"
+msgid "Admin password"
 msgstr "Contrasenya d'administració"
 
 #. Password to use for Administrative-User authentication in order to pick up chilli configurations and establish a device &quot;system&quot; session
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:59
-msgid "coovachilli_radius_adminpasswd_desc"
+msgid "Password to use for Administrative-User authentication in order to pick up chilli configurations and establish a device \"system\" session"
 msgstr ""
 "Contrasenya per utilitzar per autenticació d'usuari administrador per agafar "
 "configurcions Chilli i establir una sessió &quot;system&quot; de dispositiu"
 
 #. Admin user
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:60
-msgid "coovachilli_radius_adminuser"
+msgid "Admin user"
 msgstr "Usuari administrador"
 
 #. User-name to use for Administrative-User authentication in order to pick up chilli configurations and establish a device &quot;system&quot; session
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:61
-msgid "coovachilli_radius_adminuser_desc"
+msgid "User-name to use for Administrative-User authentication in order to pick up chilli configurations and establish a device \"system\" session"
 msgstr ""
 "Nom d'usuari per utilitzar per autenticació d'usuari administrador per "
 "agafar configurcions Chilli i establir una sessió &quot;system&quot; de "
@@ -342,619 +342,619 @@ msgstr ""
 
 #. Do not check disconnection requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:62
-msgid "coovachilli_radius_coanoipcheck"
+msgid "Do not check disconnection requests"
 msgstr "No comprovis les peticions de desconnexió"
 
 #. Do not check the source IP address of radius disconnect requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:63
-msgid "coovachilli_radius_coanoipcheck_desc"
+msgid "Do not check the source IP address of radius disconnect requests"
 msgstr ""
 "No comprovis l'origen de l'adreça IP de les peticions de desconnexió RADIUS"
 
 #. RADIUS disconnect port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:64
-msgid "coovachilli_radius_coaport"
+msgid "RADIUS disconnect port"
 msgstr "Port de desconnexió RADIUS"
 
 #. UDP port to listen to for accepting radius disconnect requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:65
-msgid "coovachilli_radius_coaport_desc"
+msgid "UDP port to listen to for accepting radius disconnect requests"
 msgstr "Port UDP per acceptar peticions de desconnexió RADIUS"
 
 #. NAS IP
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:66
-msgid "coovachilli_radius_nasip"
+msgid "NAS IP"
 msgstr "NAS IP"
 
 #. Value to use in RADIUS NAS-IP-Address attribute
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:67
-msgid "coovachilli_radius_nasip_desc"
+msgid "Value to use in RADIUS NAS-IP-Address attribute"
 msgstr "Valor per utilitzar a l'atribut RADIUS adreça NAS-IP"
 
 #. NAS MAC
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:68
-msgid "coovachilli_radius_nasmac"
+msgid "NAS MAC"
 msgstr "NAS MAC"
 
 #. MAC address value to use in RADIUS Called-Station-ID attribute
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:69
-msgid "coovachilli_radius_nasmac_desc"
+msgid "MAC address value to use in RADIUS Called-Station-ID attribute"
 msgstr "Valor d'adreça MAC per utilitzar a l'atribiut RADIUS Called-Station-ID"
 
 #. Allow OpenID authentication
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:70
-msgid "coovachilli_radius_openidauth"
+msgid "Allow OpenID authentication"
 msgstr "Permet autenticació OpenID"
 
 #. Allows OpenID authentication by sending ChilliSpot-Config=allow-openidauth in RADIUS Access-Requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:71
-msgid "coovachilli_radius_openidauth_desc"
+msgid "Allows OpenID authentication by sending ChilliSpot-Config=allow-openidauth in RADIUS Access-Requests"
 msgstr ""
 "Permet autenticació OpenID enviant ChilliSpot-Config=allow-openidauth als "
 "Access-Requests de RADIUS"
 
 #. RADIUS accounting port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:72
-msgid "coovachilli_radius_radiusacctport"
+msgid "RADIUS accounting port"
 msgstr "Port d'accounting RADIUS"
 
 #. The UDP port number to use for radius accounting requests (default 1813)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:73
-msgid "coovachilli_radius_radiusacctport_desc"
+msgid "The UDP port number to use for radius accounting requests (default 1813)"
 msgstr ""
 "Port UDP a utilitzar per les peticions d'accounting RADIUS (per defecte "
 "1813)"
 
 #. RADIUS authentication port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:74
-msgid "coovachilli_radius_radiusauthport"
+msgid "RADIUS authentication port"
 msgstr "Port d'autenticació RADIUS"
 
 #. The UDP port number to use for radius authentication requests (default 1812)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:75
-msgid "coovachilli_radius_radiusauthport_desc"
+msgid "The UDP port number to use for radius authentication requests (default 1812)"
 msgstr ""
 "Port UDP a utilitzar per les peticions d'autenticació RADIUS (per defecte "
 "1812)"
 
 #. Option radiuscalled
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:76
-msgid "coovachilli_radius_radiuscalled"
+msgid "Option radiuscalled"
 msgstr "Opció radiuscalled"
 
 #. RADIUS listen address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:77
-msgid "coovachilli_radius_radiuslisten"
+msgid "RADIUS listen address"
 msgstr "Adreça per rebre connexions RADIUS"
 
 #. Local interface IP address to use for the radius interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:78
-msgid "coovachilli_radius_radiuslisten_desc"
+msgid "Local interface IP address to use for the radius interface"
 msgstr "Adreça IP d'interfície local per utilitzar per la interfície RADIUS"
 
 #. RADIUS location ID
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:79
-msgid "coovachilli_radius_radiuslocationid"
+msgid "RADIUS location ID"
 msgstr "ID de localització RADIUS"
 
 #. WISPr Location ID
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:80
-msgid "coovachilli_radius_radiuslocationid_desc"
+msgid "WISPr Location ID"
 msgstr "ID de localització WISPr"
 
 #. RADIUS location name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:81
-msgid "coovachilli_radius_radiuslocationname"
+msgid "RADIUS location name"
 msgstr "Nom de localització RADIUS"
 
 #. WISPr Location Name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:82
-msgid "coovachilli_radius_radiuslocationname_desc"
+msgid "WISPr Location Name"
 msgstr "Nom de localització WISPr"
 
 #. NAS ID
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:83
-msgid "coovachilli_radius_radiusnasid"
+msgid "NAS ID"
 msgstr "NAS ID"
 
 #. Network access server identifier
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:84
-msgid "coovachilli_radius_radiusnasid_desc"
+msgid "Network access server identifier"
 msgstr "Identificació de servidor d'accés de xarxa"
 
 #. Option radiusnasip
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:85
-msgid "coovachilli_radius_radiusnasip"
+msgid "Option radiusnasip"
 msgstr "Opció radiusnasip"
 
 #. NAS port type
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:86
-msgid "coovachilli_radius_radiusnasporttype"
+msgid "NAS port type"
 msgstr "Tipus de port NAS"
 
 #. Value of NAS-Port-Type attribute. Defaults to 19 (Wireless-IEEE-802.11)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:87
-msgid "coovachilli_radius_radiusnasporttype_desc"
+msgid "Value of NAS-Port-Type attribute. Defaults to 19 (Wireless-IEEE-802.11)"
 msgstr "Valor de l'atribut NAS-Port-Type. Per defecte 19 (Wireless-IEEE-802.11)"
 
 #. Send RADIUS VSA
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:88
-msgid "coovachilli_radius_radiusoriginalurl"
+msgid "Send RADIUS VSA"
 msgstr "Envia RADIUS VSA"
 
 #. Send the ChilliSpot-OriginalURL RADIUS VSA in Access-Request
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:89
-msgid "coovachilli_radius_radiusoriginalurl_desc"
+msgid "Send the ChilliSpot-OriginalURL RADIUS VSA in Access-Request"
 msgstr "Envia el RADIUS VSA ChilliSpot-OriginalURl al Access-Request"
 
 #. RADIUS secret
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:90
-msgid "coovachilli_radius_radiussecret"
+msgid "RADIUS secret"
 msgstr "Secret RADIUS"
 
 #. Radius shared secret for both servers
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:91
-msgid "coovachilli_radius_radiussecret_desc"
+msgid "Radius shared secret for both servers"
 msgstr "Secret compartit RADIUS pels dos servidors"
 
 #. RADIUS server 1
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:92
-msgid "coovachilli_radius_radiusserver1"
+msgid "RADIUS server 1"
 msgstr "Servidor RADIUS 1"
 
 #. The IP address of radius server 1
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:93
-msgid "coovachilli_radius_radiusserver1_desc"
+msgid "The IP address of radius server 1"
 msgstr "L'adreça IP del servidor RADIUS 1"
 
 #. RADIUS server 2
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:94
-msgid "coovachilli_radius_radiusserver2"
+msgid "RADIUS server 2"
 msgstr "Servidor RADIUS 2"
 
 #. The IP address of radius server 2
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:95
-msgid "coovachilli_radius_radiusserver2_desc"
+msgid "The IP address of radius server 2"
 msgstr "L'adreça IP del servidor RADIUS 2"
 
 #. Swap octets
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:96
-msgid "coovachilli_radius_swapoctets"
+msgid "Swap octets"
 msgstr "Intercanvia octets"
 
 #. Swap the meaning of &quot;input octets&quot; and &quot;output octets&quot; as it related to RADIUS attribtues
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:97
-msgid "coovachilli_radius_swapoctets_desc"
+msgid "Swap the meaning of \"input octets\" and \"output octets\" as it related to RADIUS attribtues"
 msgstr ""
 "Intercanvia el significat dels &quot;octets d'entrada&quot; i els "
 "&quot;octets de sortida&quot; com es relacionen els atributs RADIUS"
 
 #. Allow WPA guests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:98
-msgid "coovachilli_radius_wpaguests"
+msgid "Allow WPA guests"
 msgstr "Permet convidats WPA"
 
 #. Allows WPA Guest authentication by sending ChilliSpot-Config=allow-wpa-guests in RADIUS Access-Requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:99
-msgid "coovachilli_radius_wpaguests_desc"
+msgid "Allows WPA Guest authentication by sending ChilliSpot-Config=allow-wpa-guests in RADIUS Access-Requests"
 msgstr ""
 "Permet l'autenticació de convidats WPA enviant un ChilliSpot-Config=allow-"
 "wpa-guests als Access-Requests de RADIUS"
 
 #. RADIUS proxy settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:100
-msgid "coovachilli_proxy"
+msgid "RADIUS proxy settings"
 msgstr "Configuració de proxy RADIUS"
 
 #. RADIUS proxy settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:101
-msgid "coovachilli_proxy_desc"
+msgid "RADIUS proxy settings"
 msgstr "Configuració de proxy RADIUS"
 
 #. Proxy client
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:102
-msgid "coovachilli_proxy_proxyclient"
+msgid "Proxy client"
 msgstr "Client proxy"
 
 #. IP address from which radius requests are accepted. If omitted the server will not accept radius requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:103
-msgid "coovachilli_proxy_proxyclient_desc"
+msgid "IP address from which radius requests are accepted. If omitted the server will not accept radius requests"
 msgstr ""
 "Adreça IP des de la qual s'accepten les peticions RADIUS. Si s'omet, el "
 "servidor no acceptarà peticions RADIUS"
 
 #. Proxy listen address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:104
-msgid "coovachilli_proxy_proxylisten"
+msgid "Proxy listen address"
 msgstr "Adreça que rep connexions del proxy"
 
 #. Local interface IP address to use for accepting radius requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:105
-msgid "coovachilli_proxy_proxylisten_desc"
+msgid "Local interface IP address to use for accepting radius requests"
 msgstr ""
 "L'adreça IP de la interfície local a utilitzar per acceptar peticions RADIUS"
 
 #. Proxy port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:106
-msgid "coovachilli_proxy_proxyport"
+msgid "Proxy port"
 msgstr "Port proxy"
 
 #. UDP Port to listen to for accepting radius requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:107
-msgid "coovachilli_proxy_proxyport_desc"
+msgid "UDP Port to listen to for accepting radius requests"
 msgstr "Port UDP a rebre connexions per acceptar peticions RADIUS"
 
 #. Proxy secret
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:108
-msgid "coovachilli_proxy_proxysecret"
+msgid "Proxy secret"
 msgstr "Secret de proxy"
 
 #. Radius shared secret for clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:109
-msgid "coovachilli_proxy_proxysecret_desc"
+msgid "Radius shared secret for clients"
 msgstr "Secret compartit de RADIUS pels clients"
 
 #. UAM configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:110
-msgid "coovachilli_uam"
+msgid "UAM configuration"
 msgstr "Configuració UAM"
 
 #. Unified Configuration Method settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:111
-msgid "coovachilli_uam_desc"
+msgid "Unified Configuration Method settings"
 msgstr "Preferències de Mètode de Configuració Unificat"
 
 #. Use Chilli XML
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:112
-msgid "coovachilli_uam_chillixml"
+msgid "Use Chilli XML"
 msgstr "Utilitza XML Chilli"
 
 #. Return the so-called Chilli XML along with WISPr XML
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:113
-msgid "coovachilli_uam_chillixml_desc"
+msgid "Return the so-called Chilli XML along with WISPr XML"
 msgstr "Retorna l'XML Chilli juntament amb l'XML WISPr"
 
 #. Default idle timeout
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:114
-msgid "coovachilli_uam_defidletimeout"
+msgid "Default idle timeout"
 msgstr "Temps d'espera d'inactivitat màxim per defecte"
 
 #. Default idle timeout unless otherwise set by RADIUS (defaults to 0)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:115
-msgid "coovachilli_uam_defidletimeout_desc"
+msgid "Default idle timeout unless otherwise set by RADIUS (defaults to 0)"
 msgstr ""
 "Temps d'espera d'inactivitat màxim per defecte excepte si s'estableix pel "
 "RADIUS (per defecte 0)"
 
 #. Default interim interval
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:116
-msgid "coovachilli_uam_definteriminterval"
+msgid "Default interim interval"
 msgstr "Interval provisional predeterminat"
 
 #. Default interim-interval for RADIUS accounting unless otherwise set by RADIUS (defaults to 0)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:117
-msgid "coovachilli_uam_definteriminterval_desc"
+msgid "Default interim-interval for RADIUS accounting unless otherwise set by RADIUS (defaults to 0)"
 msgstr ""
 "Interval provisional predeterminat per accounting RADIUS excepte si "
 "s'estableix pel RADIUS (per defecte 0)"
 
 #. Default session timeout
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:118
-msgid "coovachilli_uam_defsessiontimeout"
+msgid "Default session timeout"
 msgstr "Temps d'espera màxim de sessió per defecte"
 
 #. Default session timeout unless otherwise set by RADIUS (defaults to 0)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:119
-msgid "coovachilli_uam_defsessiontimeout_desc"
+msgid "Default session timeout unless otherwise set by RADIUS (defaults to 0)"
 msgstr ""
 "Temps d'espera màxim de sessió per defecte excepte si s'estableix pel RADIUS "
 "(per defecte 0)"
 
 #. Inspect DNS traffic
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:120
-msgid "coovachilli_uam_dnsparanoia"
+msgid "Inspect DNS traffic"
 msgstr "Inspeccions tràfic DNS"
 
 #. Inspect DNS packets and drop responses with any non- A, CNAME, SOA, or MX records to prevent dns tunnels (experimental)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:121
-msgid "coovachilli_uam_dnsparanoia_desc"
+msgid "Inspect DNS packets and drop responses with any non- A, CNAME, SOA, or MX records to prevent dns tunnels (experimental)"
 msgstr ""
 "Inspecciona paquets DNS i descarta ls respostes per qualsevol registre que "
 "no sigui A, CNAME, SOA o MX per prevenir túnels DNS (experimental)"
 
 #. Local users file
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:122
-msgid "coovachilli_uam_localusers"
+msgid "Local users file"
 msgstr "Fitxers d'usuaris local"
 
 #. A colon seperated file containing usernames and passwords of locally authenticated users
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:123
-msgid "coovachilli_uam_localusers_desc"
+msgid "A colon seperated file containing usernames and passwords of locally authenticated users"
 msgstr ""
 "Un fitxer contenint usuaris i contrasenyes separats per punts d'usuaris "
 "autenticats localment"
 
 #. Location name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:124
-msgid "coovachilli_uam_locationname"
+msgid "Location name"
 msgstr "Nom de localització"
 
 #. Human readable location name used in JSON interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:125
-msgid "coovachilli_uam_locationname_desc"
+msgid "Human readable location name used in JSON interface"
 msgstr "Nom de localització llegible utilitzat en l'interfície JSON"
 
 #. Do not redirect to UAM server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:126
-msgid "coovachilli_uam_nouamsuccess"
+msgid "Do not redirect to UAM server"
 msgstr "No readrecis al servidor UAM"
 
 #. Do not return to UAM server on login success, just redirect to original URL
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:127
-msgid "coovachilli_uam_nouamsuccess_desc"
+msgid "Do not return to UAM server on login success, just redirect to original URL"
 msgstr ""
 "No retornis al servidor UAM amb quan s'iniciï la sessió amb èxit, readreça "
 "només a la URL original"
 
 #. Do not do WISPr
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:128
-msgid "coovachilli_uam_nouamwispr"
+msgid "Do not do WISPr"
 msgstr "No facis WISPr"
 
 #. Do not do any WISPr XML, assume the back-end is doing this instead
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:129
-msgid "coovachilli_uam_nouamwispr_desc"
+msgid "Do not do any WISPr XML, assume the back-end is doing this instead"
 msgstr "No facis cap XML WISPr, assumeix que el back-end ho està fent"
 
 #. Post auth proxy
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:130
-msgid "coovachilli_uam_postauthproxy"
+msgid "Post auth proxy"
 msgstr "Proxy post autenticació"
 
 #. Used with postauthproxyport to define a post authentication HTTP proxy server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:131
-msgid "coovachilli_uam_postauthproxy_desc"
+msgid "Used with postauthproxyport to define a post authentication HTTP proxy server"
 msgstr ""
 "Utilitzat amb postauthproxyport per definir una autenticació HTTP posterior "
 "de proxy server"
 
 #. Post auth proxy port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:132
-msgid "coovachilli_uam_postauthproxyport"
+msgid "Post auth proxy port"
 msgstr "Port proxy post autenticació"
 
 #. Used with postauthproxy to define a post authentication HTTP proxy server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:133
-msgid "coovachilli_uam_postauthproxyport_desc"
+msgid "Used with postauthproxy to define a post authentication HTTP proxy server"
 msgstr ""
 "Utilitzat amb postauthproxy per definir un servidor proxy HTTP "
 "d'autenticació posterior"
 
 #. Allowed resources
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:134
-msgid "coovachilli_uam_uamallowed"
+msgid "Allowed resources"
 msgstr "Recursos permesos"
 
 #. List of resources the client can access without first authenticating
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:135
-msgid "coovachilli_uam_uamallowed_desc"
+msgid "List of resources the client can access without first authenticating"
 msgstr ""
 "Llista dels recursos que el client pot accedir sense autenticar-se primer"
 
 #. Allow any DNS server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:136
-msgid "coovachilli_uam_uamanydns"
+msgid "Allow any DNS server"
 msgstr "Permet qualsevol servidor DNS"
 
 #. Allow any DNS server for unauthenticated clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:137
-msgid "coovachilli_uam_uamanydns_desc"
+msgid "Allow any DNS server for unauthenticated clients"
 msgstr "Permet qualsevol servidor DNS per clients no autenticats"
 
 #. Allow any IP address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:138
-msgid "coovachilli_uam_uamanyip"
+msgid "Allow any IP address"
 msgstr "Permet qualsevol adreça IP"
 
 #. Allow clients to use any IP settings they wish by spoofing ARP (experimental)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:139
-msgid "coovachilli_uam_uamanyip_desc"
+msgid "Allow clients to use any IP settings they wish by spoofing ARP (experimental)"
 msgstr ""
 "Permet que els clients utilitzin qualsevol configuració IP que vulguin fent "
 "ARP spoofind (experimental)"
 
 #. Allowed domains
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:140
-msgid "coovachilli_uam_uamdomain"
+msgid "Allowed domains"
 msgstr "Dominis permesos"
 
 #. Defines a list of domain names to automatically add to the walled garden
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:141
-msgid "coovachilli_uam_uamdomain_desc"
+msgid "Defines a list of domain names to automatically add to the walled garden"
 msgstr ""
 "Defineix una llista de noms de domini per afegir automàticament al jardí "
 "tancat"
 
 #. UAM homepage
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:142
-msgid "coovachilli_uam_uamhomepage"
+msgid "UAM homepage"
 msgstr "Pàgina d'inici UAM"
 
 #. URL of homepage to redirect unauthenticated users to
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:143
-msgid "coovachilli_uam_uamhomepage_desc"
+msgid "URL of homepage to redirect unauthenticated users to"
 msgstr "URL de la pàgina d'inici per readreçar usuari no autenticats"
 
 #. UAM static content port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:144
-msgid "coovachilli_uam_uamiport"
+msgid "UAM static content port"
 msgstr "Port de contingut estàtic UAM"
 
 #. TCP port to bind to for only serving embedded content
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:145
-msgid "coovachilli_uam_uamiport_desc"
+msgid "TCP port to bind to for only serving embedded content"
 msgstr "Port TCP on escoltar per servir només contingut empotrat"
 
 #. UAM listening address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:146
-msgid "coovachilli_uam_uamlisten"
+msgid "UAM listening address"
 msgstr "Adreça per on escoltar UAM"
 
 #. IP address to listen to for authentication of clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:147
-msgid "coovachilli_uam_uamlisten_desc"
+msgid "IP address to listen to for authentication of clients"
 msgstr "Adreça IP on escoltar pels l'autenticació dels clients"
 
 #. UAM logout IP
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:148
-msgid "coovachilli_uam_uamlogoutip"
+msgid "UAM logout IP"
 msgstr "IP de final de sessió UAM"
 
 #. Use this IP address to instantly logout a client accessing it (defaults to 1.1.1.1)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:149
-msgid "coovachilli_uam_uamlogoutip_desc"
+msgid "Use this IP address to instantly logout a client accessing it (defaults to 1.1.1.1)"
 msgstr ""
 "Utilitza aquesta adreça IP per finalitzar la sessió d'un que hi accedeix "
 "instantàniament (per defecte 1.1.1.1)"
 
 #. UAM listening port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:150
-msgid "coovachilli_uam_uamport"
+msgid "UAM listening port"
 msgstr "Port on escoltar UAM"
 
 #. TCP port to bind to for authenticating clients (default 3990)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:151
-msgid "coovachilli_uam_uamport_desc"
+msgid "TCP port to bind to for authenticating clients (default 3990)"
 msgstr "Port TCP per on escoltar l'autenticació de clients (per defecte 3990)"
 
 #. UAM secret
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:152
-msgid "coovachilli_uam_uamsecret"
+msgid "UAM secret"
 msgstr "Secret UAM"
 
 #. Shared secret between uamserver and chilli
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:153
-msgid "coovachilli_uam_uamsecret_desc"
+msgid "Shared secret between uamserver and chilli"
 msgstr "Secret compartit entre el uamserver i el chilli"
 
 #. UAM server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:154
-msgid "coovachilli_uam_uamserver"
+msgid "UAM server"
 msgstr "Servidor UAM"
 
 #. URL of web server to use for authenticating clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:155
-msgid "coovachilli_uam_uamserver_desc"
+msgid "URL of web server to use for authenticating clients"
 msgstr "URL del servidor URL a utilitzar per clients autenticats"
 
 #. UAM user interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:156
-msgid "coovachilli_uam_uamui"
+msgid "UAM user interface"
 msgstr "Interfície d'usuari UAM"
 
 #. An init.d style program to handle local content on the uamuiport web server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:157
-msgid "coovachilli_uam_uamui_desc"
+msgid "An init.d style program to handle local content on the uamuiport web server"
 msgstr ""
 "Un programa de l'stil init.d per gestionar el contingut local al servidor "
 "web uamuiport"
 
 #. Use status file
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:158
-msgid "coovachilli_uam_usestatusfile"
+msgid "Use status file"
 msgstr "Utilitza fitxer d'estat"
 
 #. Write the status of clients in a non-volatile state file (experimental)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:159
-msgid "coovachilli_uam_usestatusfile_desc"
+msgid "Write the status of clients in a non-volatile state file (experimental)"
 msgstr ""
 "Escriu l'estat dels clients en un fitxer d'estat no volàtil (experimental)"
 
 #. WISPr login url
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:160
-msgid "coovachilli_uam_wisprlogin"
+msgid "WISPr login url"
 msgstr "URL d'inici de sessió WISPr"
 
 #. Specific URL to be given in WISPr XML LoginURL
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:161
-msgid "coovachilli_uam_wisprlogin_desc"
+msgid "Specific URL to be given in WISPr XML LoginURL"
 msgstr "URL específica a donar a la URL d'inici de sessió de l'XML WISPr"
 
 #. CGI program
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:162
-msgid "coovachilli_uam_wwwbin"
+msgid "CGI program"
 msgstr "Programa CGI"
 
 #. Executable to run as a CGI type program (like haserl) for URLs with extention .chi
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:163
-msgid "coovachilli_uam_wwwbin_desc"
+msgid "Executable to run as a CGI type program (like haserl) for URLs with extention .chi"
 msgstr ""
 "Executable per executar com un programa de tipus CGI (com el haserl) per "
 "URLs amb extensió .chi"
 
 #. Web content directory
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:164
-msgid "coovachilli_uam_wwwdir"
+msgid "Web content directory"
 msgstr "Directori de contingut web"
 
 #. Directory where embedded local web content is placed
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:165
-msgid "coovachilli_uam_wwwdir_desc"
+msgid "Directory where embedded local web content is placed"
 msgstr "Directori on se situa el contingut web local empotrat"
 
 #. MAC configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:166
-msgid "coovachilli_macauth"
+msgid "MAC configuration"
 msgstr "Configuració MAC"
 
 #. Configure MAC authentication
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:167
-msgid "coovachilli_macauth_desc"
+msgid "Configure MAC authentication"
 msgstr "Configura l'autenticació MAC"
 
 #. Allowed MAC addresses
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:168
-msgid "coovachilli_macauth_macallowed"
+msgid "Allowed MAC addresses"
 msgstr "Adreces MAC permeses"
 
 #. List of MAC addresses for which MAC authentication will be performed
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:169
-msgid "coovachilli_macauth_macallowed_desc"
+msgid "List of MAC addresses for which MAC authentication will be performed"
 msgstr "Llista d'adreces MAC per les que es realitzarà autenticació MAC"
 
 #. Authenticate locally allowed MACs
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:170
-msgid "coovachilli_macauth_macallowlocal"
+msgid "Authenticate locally allowed MACs"
 msgstr "Autentica localment les MACs permeses"
 
 #. Authenticate allowed MAC addresses without the use of RADIUS
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:171
-msgid "coovachilli_macauth_macallowlocal_desc"
+msgid "Authenticate allowed MAC addresses without the use of RADIUS"
 msgstr "Autentica les adreces MAC permeses sense l'ús del RADIUS"
 
 #. Enable MAC authentification
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:172
-msgid "coovachilli_macauth_macauth"
+msgid "Enable MAC authentification"
 msgstr "Activa l'autenticació MAC"
 
 #. Try to authenticate all users based on their mac address alone
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:173
-msgid "coovachilli_macauth_macauth_desc"
+msgid "Try to authenticate all users based on their mac address alone"
 msgstr "Intenta autenticar tots els usuaris basats només en la seva adreça MAC"
 
 #. Password
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:174
-msgid "coovachilli_macauth_macpasswd"
+msgid "Password"
 msgstr "Contrasenya"
 
 #. Password used when performing MAC authentication
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:175
-msgid "coovachilli_macauth_macpasswd_desc"
+msgid "Password used when performing MAC authentication"
 msgstr "Contrasenya utilitzada quan es realitza autenticació MAC"
 
 #. Suffix
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:176
-msgid "coovachilli_macauth_macsuffix"
+msgid "Suffix"
 msgstr "Sufix"
 
 #. Suffix to add to the MAC address in order to form the User-Name, which is sent to the radius server
diff --git a/po/ca/ddns.po b/po/ca/ddns.po
index f81965260..fd077e198 100644
--- a/po/ca/ddns.po
+++ b/po/ca/ddns.po
@@ -15,39 +15,39 @@ msgstr ""
 
 #. Dynamic DNS
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:1
-msgid "ddns"
+msgid "Dynamic DNS"
 msgstr "DNS dinàmic"
 
 #. Dynamic DNS allows that your router can be reached with a fixed hostname while having a dynamically changing IP-Address.
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:2
-msgid "ddns_desc"
+msgid "Dynamic DNS allows that your router can be reached with a fixed hostname while having a dynamically changing IP-Address."
 msgstr ""
 "El DNS dinàmic permet que el teu router sigui localitzable amb un nom de "
 "màquin fix mentre té una adreça IP dinàmica."
 
 #. Source of IP-Address
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:3
-msgid "ddns_service_ipsource"
+msgid "Source of IP-Address"
 msgstr "Origen de l'adreça IP"
 
 #. Check for changed IP every
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:4
-msgid "ddns_service_checkinterval"
+msgid "Check for changed IP every"
 msgstr "Comprova si s'ha canviat la IP cada"
 
 #. Check-Time unit
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:5
-msgid "ddns_service_checkunit"
+msgid "Check-Time unit"
 msgstr "Unitat de temps de comprovació"
 
 #. Force update every
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:6
-msgid "ddns_service_forceinterval"
+msgid "Force update every"
 msgstr "Força actualització cada"
 
 #. Force-Time unit
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:7
-msgid "ddns_service_forceunit"
+msgid "Force-Time unit"
 msgstr "Unitat de temps de forceig"
 
 #. Custom Update-URL
diff --git a/po/ca/default.po b/po/ca/default.po
index 5350f2604..e1e4bbac0 100644
--- a/po/ca/default.po
+++ b/po/ca/default.po
@@ -15,37 +15,37 @@ msgstr ""
 
 #. Skip to navigation
 #: i18n/english/luasrc/i18n/default.en.lua:1
-msgid "skiplink1"
+msgid "Skip to navigation"
 msgstr "Salta a la navegació"
 
 #. Skip to content
 #: i18n/english/luasrc/i18n/default.en.lua:2
-msgid "skiplink2"
+msgid "Skip to content"
 msgstr "Salta al contingut"
 
 #. Navigation
 #: i18n/english/luasrc/i18n/default.en.lua:3
-msgid "navigation"
+msgid "Navigation"
 msgstr "Navegació"
 
 #. About
 #: i18n/english/luasrc/i18n/default.en.lua:4
-msgid "about"
+msgid "About"
 msgstr "Sobre"
 
 #. Add
 #: i18n/english/luasrc/i18n/default.en.lua:5
-msgid "add"
+msgid "Add"
 msgstr "Afegeix"
 
 #. Addresses
 #: i18n/english/luasrc/i18n/default.en.lua:6
-msgid "addresses"
+msgid "Addresses"
 msgstr "Addreces"
 
 #. Aliases
 #: i18n/english/luasrc/i18n/default.en.lua:7
-msgid "aliases"
+msgid "Aliases"
 msgstr "Aliases"
 
 #. all
@@ -60,99 +60,99 @@ msgstr "enrere"
 
 #. Administration
 #: i18n/english/luasrc/i18n/default.en.lua:10
-msgid "administration"
+msgid "Administration"
 msgstr "Administració"
 
 #. Essentials
 #: i18n/english/luasrc/i18n/default.en.lua:11
-msgid "essentials"
+msgid "Essentials"
 msgstr "Essencials"
 
 #. Apply
 #: i18n/english/luasrc/i18n/default.en.lua:12
-msgid "apply"
+msgid "Apply"
 msgstr "Aplica"
 
 #. Basic Settings
 #: i18n/english/luasrc/i18n/default.en.lua:13
-msgid "basicsettings"
+msgid "Basic Settings"
 msgstr "Configuració bàsica"
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast
 #: i18n/english/luasrc/i18n/default.en.lua:14
-msgid "broadcast"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"
 msgstr "Broadcast <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
 
 #. Cancel
 #: i18n/english/luasrc/i18n/default.en.lua:15
-msgid "cancel"
+msgid "Cancel"
 msgstr "Cancel·la"
 
 #. Changes
 #: i18n/english/luasrc/i18n/default.en.lua:16
-msgid "changes"
+msgid "Changes"
 msgstr "Canvis"
 
 #. Channel
 #: i18n/english/luasrc/i18n/default.en.lua:17
-msgid "channel"
+msgid "Channel"
 msgstr "Canal"
 
 #. <abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/prefix
 #: i18n/english/luasrc/i18n/default.en.lua:18
-msgid "cidr6"
+msgid "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/prefix"
 msgstr ""
 "Notació <abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>: "
 "adreça/prefix"
 
 #. Code
 #: i18n/english/luasrc/i18n/default.en.lua:19
-msgid "code"
+msgid "Code"
 msgstr "Codi"
 
 #. Configuration
 #: i18n/english/luasrc/i18n/default.en.lua:20
-msgid "config"
+msgid "Configuration"
 msgstr "Configuració"
 
 #. Configuration file
 #: i18n/english/luasrc/i18n/default.en.lua:21
-msgid "configfile"
+msgid "Configuration file"
 msgstr "Fitxer de configuració"
 
 #. Confirmation
 #: i18n/english/luasrc/i18n/default.en.lua:22
-msgid "confirmation"
+msgid "Confirmation"
 msgstr "Confirmació"
 
 #. Delete
 #: i18n/english/luasrc/i18n/default.en.lua:23
-msgid "delete"
+msgid "Delete"
 msgstr "Esborra"
 
 #. Description
 #: i18n/english/luasrc/i18n/default.en.lua:24
-msgid "descr"
+msgid "Description"
 msgstr "Descripció"
 
 #. Design
 #: i18n/english/luasrc/i18n/default.en.lua:25
-msgid "design"
+msgid "Design"
 msgstr "Disseny"
 
 #. Destination
 #: i18n/english/luasrc/i18n/default.en.lua:26
-msgid "destination"
+msgid "Destination"
 msgstr "Destí"
 
 #. Device
 #: i18n/english/luasrc/i18n/default.en.lua:27
-msgid "device"
+msgid "Device"
 msgstr "Dispositiu"
 
 #. Devices
 #: i18n/english/luasrc/i18n/default.en.lua:28
-msgid "devices"
+msgid "Devices"
 msgstr "Dispositius"
 
 #. disable
@@ -162,22 +162,22 @@ msgstr "deshabilita"
 
 #. Distance
 #: i18n/english/luasrc/i18n/default.en.lua:30
-msgid "distance"
+msgid "Distance"
 msgstr "Distància"
 
 #. Kernel Log
 #: i18n/english/luasrc/i18n/default.en.lua:31
-msgid "dmesg"
+msgid "Kernel Log"
 msgstr "Registre del Kernel"
 
 #. <abbr title=\"Domain Name System\">DNS</abbr>-Server
 #: i18n/english/luasrc/i18n/default.en.lua:32
-msgid "dnsserver"
+msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Server"
 msgstr "Servidor <abbr title=\"Domain Name System\">DNS</abbr>"
 
 #. Edit
 #: i18n/english/luasrc/i18n/default.en.lua:33
-msgid "edit"
+msgid "Edit"
 msgstr "Edita"
 
 #. enable
@@ -187,47 +187,47 @@ msgstr "habilita"
 
 #. Encryption
 #: i18n/english/luasrc/i18n/default.en.lua:35
-msgid "encryption"
+msgid "Encryption"
 msgstr "Encriptació"
 
 #. Error
 #: i18n/english/luasrc/i18n/default.en.lua:36
-msgid "error"
+msgid "Error"
 msgstr "Error"
 
 #. Filesystem
 #: i18n/english/luasrc/i18n/default.en.lua:37
-msgid "filesystem"
+msgid "Filesystem"
 msgstr "Sistema de fitxers"
 
 #. Filter
 #: i18n/english/luasrc/i18n/default.en.lua:38
-msgid "filter"
+msgid "Filter"
 msgstr "Filtre"
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway
 #: i18n/english/luasrc/i18n/default.en.lua:39
-msgid "gateway"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
 msgstr "Passarel·la <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
 
 #. <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway
 #: i18n/english/luasrc/i18n/default.en.lua:40
-msgid "gateway6"
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 msgstr "Passarel·la <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>"
 
 #. General
 #: i18n/english/luasrc/i18n/default.en.lua:41
-msgid "general"
+msgid "General"
 msgstr "General"
 
 #. Hostname
 #: i18n/english/luasrc/i18n/default.en.lua:42
-msgid "hostname"
+msgid "Hostname"
 msgstr "Nom de màquina"
 
 #. Install
 #: i18n/english/luasrc/i18n/default.en.lua:43
-msgid "install"
+msgid "Install"
 msgstr "Instal·la"
 
 #. installed
@@ -237,102 +237,102 @@ msgstr "instal·lat"
 
 #. Interface
 #: i18n/english/luasrc/i18n/default.en.lua:45
-msgid "interface"
+msgid "Interface"
 msgstr "Interfície"
 
 #. Interfaces
 #: i18n/english/luasrc/i18n/default.en.lua:46
-msgid "interfaces"
+msgid "Interfaces"
 msgstr "Interfícies"
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address
 #: i18n/english/luasrc/i18n/default.en.lua:47
-msgid "ipaddress"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
 msgstr "Adreça <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
 
 #. <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address
 #: i18n/english/luasrc/i18n/default.en.lua:48
-msgid "ip6address"
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address"
 msgstr "Adreça <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>"
 
 #. Legend
 #: i18n/english/luasrc/i18n/default.en.lua:49
-msgid "legend"
+msgid "Legend"
 msgstr "Llegenda"
 
 #. Library
 #: i18n/english/luasrc/i18n/default.en.lua:50
-msgid "library"
+msgid "Library"
 msgstr "Llibreria"
 
 #. Logout
 #: i18n/english/luasrc/i18n/default.en.lua:51
-msgid "logout"
+msgid "Logout"
 msgstr "Final de sessió"
 
 #. Key
 #: i18n/english/luasrc/i18n/default.en.lua:52
-msgid "key"
+msgid "Key"
 msgstr "Clau"
 
 #. Language
 #: i18n/english/luasrc/i18n/default.en.lua:53
-msgid "language"
+msgid "Language"
 msgstr "Llengua"
 
 #. Limit
 #: i18n/english/luasrc/i18n/default.en.lua:54
-msgid "limit"
+msgid "Limit"
 msgstr "Límit"
 
 #. Load
 #: i18n/english/luasrc/i18n/default.en.lua:55
-msgid "load"
+msgid "Load"
 msgstr "Carrega"
 
 #. Login
 #: i18n/english/luasrc/i18n/default.en.lua:56
-msgid "login"
+msgid "Login"
 msgstr "Inici de sessió"
 
 #. <abbr title=\"Media Access Control\">MAC</abbr>-Address
 #: i18n/english/luasrc/i18n/default.en.lua:57
-msgid "macaddress"
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr "Adreça <abbr title=\"Media Access Control\">MAC</abbr>"
 
 #. see &#39;%s&#39; manpage
 #: i18n/english/luasrc/i18n/default.en.lua:58
-msgid "manpage"
+msgid "see '%s' manpage"
 msgstr "pàgina de manual de &#39;%s&#39;"
 
 #. Metric
 #: i18n/english/luasrc/i18n/default.en.lua:59
-msgid "metric"
+msgid "Metric"
 msgstr "Mètrica"
 
 #. Mode
 #: i18n/english/luasrc/i18n/default.en.lua:60
-msgid "mode"
+msgid "Mode"
 msgstr "Mode"
 
 #. Name
 #: i18n/english/luasrc/i18n/default.en.lua:61
-msgid "name"
+msgid "Name"
 msgstr "Nom"
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask
 #: i18n/english/luasrc/i18n/default.en.lua:62
-msgid "netmask"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr "Màscara de xarxa <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
 
 #. Network
 #: i18n/english/luasrc/i18n/default.en.lua:63
-msgid "network"
+msgid "Network"
 msgstr "Xarxa"
 
 #. Networks
 #: i18n/english/luasrc/i18n/default.en.lua:64
-msgid "networks"
+msgid "Networks"
 msgstr "Xarxes"
 
 #. none
@@ -342,117 +342,117 @@ msgstr "cap"
 
 #. not installed
 #: i18n/english/luasrc/i18n/default.en.lua:66
-msgid "notinstalled"
+msgid "not installed"
 msgstr "no instal·lat"
 
 #. OK
 #: i18n/english/luasrc/i18n/default.en.lua:67
-msgid "ok"
+msgid "OK"
 msgstr "D'acord"
 
 #. Options
 #: i18n/english/luasrc/i18n/default.en.lua:68
-msgid "options"
+msgid "Options"
 msgstr "Opcions"
 
 #. Overview
 #: i18n/english/luasrc/i18n/default.en.lua:69
-msgid "overview"
+msgid "Overview"
 msgstr "Vista general"
 
 #. Package Manager
 #: i18n/english/luasrc/i18n/default.en.lua:70
-msgid "packagemanager"
+msgid "Package Manager"
 msgstr "Gestor de paquets"
 
 #. Password
 #: i18n/english/luasrc/i18n/default.en.lua:71
-msgid "password"
+msgid "Password"
 msgstr "Contrasenya"
 
 #. Path
 #: i18n/english/luasrc/i18n/default.en.lua:72
-msgid "path"
+msgid "Path"
 msgstr "Ruta"
 
 #. Port
 #: i18n/english/luasrc/i18n/default.en.lua:73
-msgid "port"
+msgid "Port"
 msgstr "Port"
 
 #. Ports
 #: i18n/english/luasrc/i18n/default.en.lua:74
-msgid "ports"
+msgid "Ports"
 msgstr "Ports"
 
 #. Proceed
 #: i18n/english/luasrc/i18n/default.en.lua:75
-msgid "proceed"
+msgid "Proceed"
 msgstr "continua"
 
 #. Protocol
 #: i18n/english/luasrc/i18n/default.en.lua:76
-msgid "protocol"
+msgid "Protocol"
 msgstr "Protocol"
 
 #. Reboot
 #: i18n/english/luasrc/i18n/default.en.lua:77
-msgid "reboot"
+msgid "Reboot"
 msgstr "Arranca de nou"
 
 #. Reset
 #: i18n/english/luasrc/i18n/default.en.lua:78
-msgid "reset"
+msgid "Reset"
 msgstr "Reinicia"
 
 #. Revert
 #: i18n/english/luasrc/i18n/default.en.lua:79
-msgid "revert"
+msgid "Revert"
 msgstr "Reverteix"
 
 #. Save
 #: i18n/english/luasrc/i18n/default.en.lua:80
-msgid "save"
+msgid "Save"
 msgstr "Desa"
 
 #. Save &amp; Apply
 #: i18n/english/luasrc/i18n/default.en.lua:81
-msgid "saveapply"
+msgid "Save & Apply"
 msgstr "Desa &amp; Aplica"
 
 #. Scan
 #: i18n/english/luasrc/i18n/default.en.lua:82
-msgid "scan"
+msgid "Scan"
 msgstr "Escaneja"
 
 #. Service
 #: i18n/english/luasrc/i18n/default.en.lua:83
-msgid "service"
+msgid "Service"
 msgstr "Servei"
 
 #. Services
 #: i18n/english/luasrc/i18n/default.en.lua:84
-msgid "services"
+msgid "Services"
 msgstr "Serveis"
 
 #. Settings
 #: i18n/english/luasrc/i18n/default.en.lua:85
-msgid "settings"
+msgid "Settings"
 msgstr "Configuració"
 
 #. Size
 #: i18n/english/luasrc/i18n/default.en.lua:86
-msgid "size"
+msgid "Size"
 msgstr "Mida"
 
 #. Source
 #: i18n/english/luasrc/i18n/default.en.lua:87
-msgid "source"
+msgid "Source"
 msgstr "Origen"
 
 #. Start
 #: i18n/english/luasrc/i18n/default.en.lua:88
-msgid "start"
+msgid "Start"
 msgstr "Inici"
 
 #. static
@@ -462,72 +462,72 @@ msgstr "estàtic"
 
 #. Status
 #: i18n/english/luasrc/i18n/default.en.lua:90
-msgid "status"
+msgid "Status"
 msgstr "Estat"
 
 #. Statistics
 #: i18n/english/luasrc/i18n/default.en.lua:91
-msgid "statistics"
+msgid "Statistics"
 msgstr "Estadístiques"
 
 #. Submit
 #: i18n/english/luasrc/i18n/default.en.lua:92
-msgid "submit"
+msgid "Submit"
 msgstr "Envia"
 
 #. System Log
 #: i18n/english/luasrc/i18n/default.en.lua:93
-msgid "syslog"
+msgid "System Log"
 msgstr "Registre del sistema"
 
 #. System
 #: i18n/english/luasrc/i18n/default.en.lua:94
-msgid "system"
+msgid "System"
 msgstr "Sistema"
 
 #. Target
 #: i18n/english/luasrc/i18n/default.en.lua:95
-msgid "target"
+msgid "Target"
 msgstr "Destí"
 
 #. Timezone
 #: i18n/english/luasrc/i18n/default.en.lua:96
-msgid "timezone"
+msgid "Timezone"
 msgstr "Zona horària"
 
 #. Type
 #: i18n/english/luasrc/i18n/default.en.lua:97
-msgid "type"
+msgid "Type"
 msgstr "Tipus"
 
 #. Unknown Error
 #: i18n/english/luasrc/i18n/default.en.lua:98
-msgid "unknownerror"
+msgid "Unknown Error"
 msgstr "Error desconegut"
 
 #. Unsaved Changes
 #: i18n/english/luasrc/i18n/default.en.lua:99
-msgid "unsavedchanges"
+msgid "Unsaved Changes"
 msgstr "Canvis sense desar"
 
 #. Username
 #: i18n/english/luasrc/i18n/default.en.lua:100
-msgid "username"
+msgid "Username"
 msgstr "Nom d'usuari"
 
 #. Version
 #: i18n/english/luasrc/i18n/default.en.lua:101
-msgid "version"
+msgid "Version"
 msgstr "Versió"
 
 #. Web <abbr title=\"User Interface\">UI</abbr>
 #: i18n/english/luasrc/i18n/default.en.lua:102
-msgid "webui"
+msgid "Web <abbr title=\"User Interface\">UI</abbr>"
 msgstr "Web <abbr title=\"Interfície d'Usuari\">UI</abbr>"
 
 #. Wifi
 #: i18n/english/luasrc/i18n/default.en.lua:103
-msgid "wifi"
+msgid "Wifi"
 msgstr "Wifi"
 
 #. Zone
diff --git a/po/ca/freifunk.po b/po/ca/freifunk.po
index f215011a0..23ba85226 100644
--- a/po/ca/freifunk.po
+++ b/po/ca/freifunk.po
@@ -15,208 +15,208 @@ msgstr ""
 
 #. Hello and welcome in the network of
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:1
-msgid "ff_hellonet"
+msgid "Hello and welcome in the network of"
 msgstr "Hola i benvingut a la xarxa de"
 
 #. We are an initiative to establish a free, independent and open wireless mesh network.
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:2
-msgid "ff_public1"
+msgid "We are an initiative to establish a free, independent and open wireless mesh network."
 msgstr ""
 "Som una iniciativa per establir una xarxa mesh lliure, independent i oberta."
 
 #. This is the access point
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:3
-msgid "ff_public2"
+msgid "This is the access point"
 msgstr "Això és un punt d'accés"
 
 #. It is operated by
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:4
-msgid "ff_public3"
+msgid "It is operated by"
 msgstr "És administrat per"
 
 #. You can find further information about the global Freifunk initiative at
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:5
-msgid "ff_public4"
+msgid "You can find further information about the global Freifunk initiative at"
 msgstr "Pots trobar més informació sobre la iniciativa global Freifunk a"
 
 #. If you are interested in our project then contact the local community
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:6
-msgid "ff_public5"
+msgid "If you are interested in our project then contact the local community"
 msgstr ""
 "Si estàs interessat en el nostre projecte, llavors contacta la comunitat "
 "local"
 
 #. Internet access depends on technical and organisational conditions and may or may not work for you.
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:7
-msgid "ff_public6"
+msgid "Internet access depends on technical and organisational conditions and may or may not work for you."
 msgstr ""
 "L'accés a Internet depèn de les condicions tècniques i organitzatives, i pot "
 "funcionar o no per tu."
 
 #. Location
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:8
-msgid "ff_location"
+msgid "Location"
 msgstr "Localització"
 
 #. E-Mail
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:9
-msgid "ff_mail"
+msgid "E-Mail"
 msgstr "Adreça electrònica"
 
 #. You really should provide your address here!
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:10
-msgid "ff_mail1"
+msgid "You really should provide your address here!"
 msgstr "Hauries de posar la teva adreça aquí!"
 
 #. Nickname
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:11
-msgid "ff_nickname"
+msgid "Nickname"
 msgstr "Nickname"
 
 #. Realname
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:12
-msgid "ff_name"
+msgid "Realname"
 msgstr "Nom real"
 
 #. Node
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:13
-msgid "ff_node"
+msgid "Node"
 msgstr "Node"
 
 #. Notice
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:14
-msgid "ff_note"
+msgid "Notice"
 msgstr "Avís"
 
 #. Phone
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:15
-msgid "ff_phone"
+msgid "Phone"
 msgstr "Telèfon"
 
 #. Memory
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:16
-msgid "ff_ram"
+msgid "Memory"
 msgstr "Memòria"
 
 #. Free
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:17
-msgid "ff_free"
+msgid "Free"
 msgstr "Lliure"
 
 #. Buffers
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:18
-msgid "ff_buffers"
+msgid "Buffers"
 msgstr "Memòria intermèdia"
 
 #. Cached
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:19
-msgid "ff_cached"
+msgid "Cached"
 msgstr "En memòria cau"
 
 #. Total
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:20
-msgid "ff_total"
+msgid "Total"
 msgstr "Total"
 
 #. Coordinates
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:21
-msgid "ff_geocoord"
+msgid "Coordinates"
 msgstr "Coordenades"
 
 #. Client-Splash
-msgid "ff_splash"
+msgid "Client-Splash"
 msgstr "Client-Splash"
 
 #. Active Clients
-msgid "ff_splash_clients"
+msgid "Active Clients"
 msgstr "Clients actius"
 
 #. Hostname
-msgid "ff_splash_hostname"
+msgid "Hostname"
 msgstr "Nom de màquina"
 
 #. IP Address
-msgid "ff_splash_ip"
+msgid "IP Address"
 msgstr "Adreça IP"
 
 #. MAC Address
-msgid "ff_splash_mac"
+msgid "MAC Address"
 msgstr "Adreça MAC"
 
 #. Time remaining
-msgid "ff_splash_timeleft"
+msgid "Time remaining"
 msgstr "Temps restant"
 
 #. Outgoing traffic
-msgid "ff_splash_traffic"
+msgid "Traffic (down/up)"
 msgstr "Tràfic sortint"
 
 #. Policy
-msgid "ff_splash_policy"
+msgid "Policy"
 msgstr "Política"
 
 #. unknown
-msgid "ff_splash_unknown"
+msgid "unknown"
 msgstr "desconegut"
 
 #. expired
-msgid "ff_splash_expired"
+msgid "expired"
 msgstr "expirat"
 
 #. whitelisted
-msgid "ff_splash_whitelisted"
+msgid "whitelisted"
 msgstr "a la llista blanca"
 
 #. splashed
-msgid "ff_splash_splashed"
+msgid "splashed"
 msgstr "splashed"
 
 #. blacklisted
-msgid "ff_splash_blacklisted"
+msgid "blacklisted"
 msgstr "a la llista negra"
 
 #. temporarily blocked
-msgid "ff_splash_tempblock"
+msgid "temporarily blocked"
 msgstr "blocat temporalment"
 
 #. No clients connected
-msgid "ff_splash_noclients"
+msgid "No clients connected"
 msgstr "No hi ha cap client connectat"
 
 #. P2P-Block
-msgid "ff_p2pblock"
+msgid "P2P-Block"
 msgstr "Blocat P2P"
 
 #. P2P-Block is a greylisting mechanism to block various peer-to-peer protocols for non-whitelisted clients.
-msgid "ff_p2pblock_desc"
+msgid "P2P-Block is a greylisting mechanism to block various peer-to-peer protocols for non-whitelisted clients."
 msgstr ""
 "El Blocat P2P és un mecanisme de llista grisa per blocar diversos protocols "
 "peer-tp-peer per clients que no estiguin a la llista blanca."
 
 #. Enable P2P-Block
-msgid "ff_p2pblock_enabled"
+msgid "Enable P2P-Block"
 msgstr "Habilita el Blocat P2P"
 
 #. Portrange
-msgid "ff_p2pblock_portrange"
+msgid "Portrange"
 msgstr "Rang de ports"
 
 #. Block Time
-msgid "ff_p2pblock_blocktime"
+msgid "Block Time"
 msgstr "Temps de bloqueig"
 
 #. seconds
-msgid "ff_p2pblock_blocktime_desc"
+msgid "seconds"
 msgstr "segons"
 
 #. Whitelisted IPs
-msgid "ff_p2pblock_whitelist"
+msgid "Whitelisted IPs"
 msgstr "IPs a la llista blanca"
 
 #. Layer7-Protokolle
-msgid "ff_p2pblock_layer7"
+msgid "Layer7-Protocols"
 msgstr "Protocols de capa 7"
 
 #. IP-P2P
-msgid "ff_p2pblock_ipp2p"
+msgid "IP-P2P"
 msgstr "IP-P2P"
diff --git a/po/ca/hd_idle.po b/po/ca/hd_idle.po
index b92a59fac..37e4aec33 100644
--- a/po/ca/hd_idle.po
+++ b/po/ca/hd_idle.po
@@ -15,37 +15,37 @@ msgstr ""
 
 #. Disk
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:1
-msgid "disk"
+msgid "Disk"
 msgstr "Disc"
 
 #. Enable debug
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:2
-msgid "enable_debug"
+msgid "Enable debug"
 msgstr "Habilita la depuració"
 
 #. hd-idle
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:3
-msgid "hd_idle"
+msgid "hd-idle"
 msgstr "hd-idle"
 
 #. hd-idle is a utility program for spinning-down external disks after a period of idle time.
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:4
-msgid "hd_idle_desc"
+msgid "hd-idle is a utility program for spinning-down external disks after a period of idle time."
 msgstr ""
 "hd-idle és un programa per ralentitzar els discos externs després d'un "
 "període de temps inactiu."
 
 #. Idle-Time
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:5
-msgid "idle_time_interval"
+msgid "Idle-Time"
 msgstr "Temps d'inactivitat"
 
 #. Idle-Time unit
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:6
-msgid "idle_time_unit"
+msgid "Idle-Time unit"
 msgstr "Unitat de temps d'inactivitat"
 
 #. Settings
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:7
-msgid "settings"
+msgid "Settings"
 msgstr "Configuració"
diff --git a/po/ca/initmgr.po b/po/ca/initmgr.po
index c889e3c55..47e90749a 100644
--- a/po/ca/initmgr.po
+++ b/po/ca/initmgr.po
@@ -15,12 +15,12 @@ msgstr ""
 
 #. Initscripts
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:1
-msgid "initmgr"
+msgid "Initscripts"
 msgstr "Scripts d'inici"
 
 #. You can enable or disable installed init scripts here. Changes will applied after a device reboot.<br /><strong>Warning: If you disable essential init scripts like &quot;network&quot;, your device might become inaccesable!</strong>
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:2
-msgid "initmgr_desc"
+msgid "You can enable or disable installed init scripts here. Changes will applied after a device reboot.<br /><strong>Warning: If you disable essential init scripts like \"network\", your device might become inaccesable!</strong>"
 msgstr ""
 "Pots activar o desactivar els scripts d'inici instal·lats ací. Els canvis "
 "s'aplicaran després d'arrancar de nou el dispositiu.<br /><strong>Atenció: "
@@ -29,12 +29,12 @@ msgstr ""
 
 #. Start priority
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:3
-msgid "initmgr_index"
+msgid "Start priority"
 msgstr "Prioritat d'inici"
 
 #. Initscript
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:4
-msgid "initmgr_name"
+msgid "Initscript"
 msgstr "Script d'inici"
 
 #. Enable/Disable
diff --git a/po/ca/livestats.po b/po/ca/livestats.po
index c5ff9ad2b..23d1135fb 100644
--- a/po/ca/livestats.po
+++ b/po/ca/livestats.po
@@ -15,32 +15,32 @@ msgstr ""
 
 #. incoming
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:1
-msgid "livestats_incoming"
+msgid "incoming"
 msgstr "entrant"
 
 #. outgoing
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:2
-msgid "livestats_outgoing"
+msgid "outgoing"
 msgstr "sortint"
 
 #. traffic on
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:3
-msgid "livestats_traffic"
+msgid "traffic on"
 msgstr "tràfic a"
 
 #. signal-to-noise ratio for
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:4
-msgid "livestats_wifi"
+msgid "signal-to-noise ratio for"
 msgstr "relació senyal-soroll per"
 
 #. load average
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:5
-msgid "livestats_loadavg"
+msgid "load average"
 msgstr "càrrega mitjana"
 
 #. Realtime Wireless Status
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:6
-msgid "livestats_stat_wireless"
+msgid "Realtime Wireless Status"
 msgstr "Estat Wireless en temps real"
 
 #. Realtime Network Traffic
diff --git a/po/ca/luci-fw.po b/po/ca/luci-fw.po
index 3041ded5a..d53146f36 100644
--- a/po/ca/luci-fw.po
+++ b/po/ca/luci-fw.po
@@ -15,61 +15,61 @@ msgstr ""
 
 #. Port forwarding
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:1
-msgid "fw_portfw"
+msgid "Port forwarding"
 msgstr "Readreçament de port"
 
 #. Traffic Redirection
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:2
-msgid "fw_redirect"
+msgid "Traffic Redirection"
 msgstr "Readreçament de tràfic"
 
 #. Traffic redirection allows you to change the destination address of forwarded packets.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:3
-msgid "fw_redirect_desc"
+msgid "Traffic redirection allows you to change the destination address of forwarded packets."
 msgstr ""
 "El readreçament de tràfic et permet canviar l'adreça destí dels paquets "
 "reenviats."
 
 #. Zone-to-Zone traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:4
-msgid "fw_forwarding"
+msgid "Zone-to-Zone traffic"
 msgstr "Tràfic zona a zona"
 
 #. Firewall
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:5
-msgid "fw_fw"
+msgid "Firewall"
 msgstr "Tallafocs"
 
 #. Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:6
-msgid "fw_zone"
+msgid "Zone"
 msgstr "Zona"
 
 #. Zones
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:7
-msgid "fw_zones"
+msgid "Zones"
 msgstr "Zones"
 
 #. Custom forwarding
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:8
-msgid "fw_custfwd"
+msgid "Custom forwarding"
 msgstr "Reenviament personalitzat"
 
 #. The firewall creates zones over your network interfaces to control network traffic flow.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:9
-msgid "fw_fw1"
+msgid "The firewall creates zones over your network interfaces to control network traffic flow."
 msgstr ""
 "El tallafocs crea zones a les teves interfícies de xarxa per controlar el "
 "flux de tràfic de xarxa."
 
 #. Advanced Rules
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:10
-msgid "firewall_rule"
+msgid "Advanced Rules"
 msgstr "Regles avançades"
 
 #. Advanced rules let you customize the firewall to your needs. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:11
-msgid "firewall_rule_desc"
+msgid "Advanced rules let you customize the firewall to your needs. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall."
 msgstr ""
 "Les regles avançades et deixen personalitzar el teu tallafocs per les teves "
 "necessitats. Només s'hi correspondran les connexions noves. Als paquets que "
@@ -78,139 +78,139 @@ msgstr ""
 
 #. Input Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:12
-msgid "firewall_rule_src"
+msgid "Input Zone"
 msgstr "Zona d'entrada"
 
 #. Output Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:13
-msgid "firewall_rule_dest"
+msgid "Output Zone"
 msgstr "Zona de sortida"
 
 #. Source address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:14
-msgid "firewall_rule_srcip"
+msgid "Source address"
 msgstr "Adreça origen"
 
 #. Destination address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:15
-msgid "firewall_rule_destip"
+msgid "Destination address"
 msgstr "Adreça destí"
 
 #. Source MAC-Address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:16
-msgid "firewall_rule_srcmac"
+msgid "Source MAC-Address"
 msgstr "Adreça MAC d'origen"
 
 #. Source port
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:17
-msgid "firewall_rule_srcport"
+msgid "Source port"
 msgstr "Port d'origen"
 
 #. Destination port
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:18
-msgid "firewall_rule_destport"
+msgid "Destination port"
 msgstr "Port de destí"
 
 #. Action
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:19
-msgid "firewall_rule_target"
+msgid "Action"
 msgstr "Acció"
 
 #. accept
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:20
-msgid "fw_accept"
+msgid "accept"
 msgstr "accepta"
 
 #. reject
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:21
-msgid "fw_reject"
+msgid "reject"
 msgstr "rebutja"
 
 #. drop
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:22
-msgid "fw_drop"
+msgid "drop"
 msgstr "descarta"
 
 #. Source
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:23
-msgid "fw_src"
+msgid "Source"
 msgstr "Origen"
 
 #. Destination
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:24
-msgid "fw_dest"
+msgid "Destination"
 msgstr "Destí"
 
 #. Traffic Control
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:25
-msgid "fw_traffic"
+msgid "Traffic Control"
 msgstr "Control de tràfic"
 
 #. MSS Clamping
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:26
-msgid "fw_mtufix"
+msgid "MSS Clamping"
 msgstr "Clamping MSS"
 
 #. Drop invalid packets
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:27
-msgid "fw_dropinvalid"
+msgid "Drop invalid packets"
 msgstr "Descarta els paquets invàlids"
 
 #. Port forwarding allows to provide network services in the internal network to an external network.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:28
-msgid "fw_portfw1"
+msgid "Port forwarding allows to provide network services in the internal network to an external network."
 msgstr ""
 "El readreçament de ports permet proveir serveis de la xarxa interna a una "
 "xarxa externa."
 
 #. External Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:29
-msgid "firewall_redirect_src_desc"
+msgid "External Zone"
 msgstr "Zona externa"
 
 #. External port
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:30
-msgid "firewall_redirect_srcdport"
+msgid "External port"
 msgstr "Port extern"
 
 #. port or range as first-last
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:31
-msgid "firewall_redirect_srcdport_desc"
+msgid "port or range as first-last"
 msgstr "port o rang del tipus primer-últim"
 
 #. Source address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:32
-msgid "firewall_redirect_srcip"
+msgid "Source address"
 msgstr "Adreça origen"
 
 #. Source MAC
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:33
-msgid "firewall_redirect_srcmac"
+msgid "Source MAC"
 msgstr "MAC origen"
 
 #. Internal address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:34
-msgid "firewall_redirect_destip"
+msgid "Internal address"
 msgstr "Adreça interna"
 
 #. IP-Address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:35
-msgid "firewall_redirect_destip_desc"
+msgid "IP-Address"
 msgstr "Adreça IP"
 
 #. Internal port (optional)
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:36
-msgid "firewall_redirect_destport"
+msgid "Internal port (optional)"
 msgstr "Port intern (opcional)"
 
 #. port or range as first-last
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:37
-msgid "firewall_redirect_destport_desc"
+msgid "port or range as first-last"
 msgstr "port o rang del tipus primer-últim"
 
 #. Here you can specify which network traffic is allowed to flow between network zones. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall. If you experience occasional connection problems try enabling MSS Clamping otherwise disable it for performance reasons.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:38
-msgid "fw_forwarding1"
+msgid "Here you can specify which network traffic is allowed to flow between network zones. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall. If you experience occasional connection problems try enabling MSS Clamping otherwise disable it for performance reasons."
 msgstr ""
 "Ací pots especificar quin tràfic de xarxes es permet entre les zones de "
 "xarxa. Només s'hi correspondren les connexions noves. Als paquets que "
@@ -220,49 +220,49 @@ msgstr ""
 
 #. Input
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:39
-msgid "firewall_forwarding_src"
+msgid "Input"
 msgstr "Entrada"
 
 #. Output
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:40
-msgid "firewall_forwarding_dest"
+msgid "Output"
 msgstr "Sortida"
 
 #. Defaults
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:41
-msgid "firewall_defaults"
+msgid "Defaults"
 msgstr "Per defecte"
 
 #. These are the default settings that are used if no other rules match.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:42
-msgid "firewall_defaults_desc"
+msgid "These are the default settings that are used if no other rules match."
 msgstr ""
 "Aquesta és la configuració per defecte utilitzada si no hi ha cap altra "
 "regla que es correspongui."
 
 #. SYN-flood protection
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:43
-msgid "firewall_defaults_synflood"
+msgid "SYN-flood protection"
 msgstr "Protecció SYN-flood"
 
 #. Incoming Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:44
-msgid "firewall_defaults_input"
+msgid "Incoming Traffic"
 msgstr "Tràfic entrant"
 
 #. Outgoing Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:45
-msgid "firewall_defaults_output"
+msgid "Outgoing Traffic"
 msgstr "Tràfic sortint"
 
 #. Forwarded Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:46
-msgid "firewall_defaults_forward"
+msgid "Forwarded Traffic"
 msgstr "Tràfic readreçat"
 
 #. Zones part the network interfaces into certain isolated areas to separate network traffic. One or more networks can belong to a zone. The MASQ-flag enables NAT masquerading for all outgoing traffic on this zone.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:47
-msgid "firewall_zone_desc"
+msgid "Zones part the network interfaces into certain isolated areas to separate network traffic. One or more networks can belong to a zone. The MASQ-flag enables NAT masquerading for all outgoing traffic on this zone."
 msgstr ""
 "Les zones parteixen les interfícies de xarxa en certes àrees aïllades per "
 "separar el tràfic de xarxa. Una o més xarxes poden pertànyer a una zona. El "
@@ -271,42 +271,42 @@ msgstr ""
 
 #. Incoming Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:48
-msgid "firewall_zone_input"
+msgid "Incoming Traffic"
 msgstr "Tràfic entrant"
 
 #. Default Policy
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:49
-msgid "firewall_zone_input_desc"
+msgid "Default Policy"
 msgstr "Política per defecte"
 
 #. Outgoing Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:50
-msgid "firewall_zone_output"
+msgid "Outgoing Traffic"
 msgstr "Tràfic de sortida"
 
 #. Default Policy
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:51
-msgid "firewall_zone_output_desc"
+msgid "Default Policy"
 msgstr "Política per defecte"
 
 #. Forwarded Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:52
-msgid "firewall_zone_forward"
+msgid "Forwarded Traffic"
 msgstr "Tràfic readreçat"
 
 #. Default Policy
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:53
-msgid "firewall_zone_forward_desc"
+msgid "Default Policy"
 msgstr "Política per defecte"
 
 #. MASQ
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:54
-msgid "firewall_zone_masq"
+msgid "MASQ"
 msgstr "MASQ"
 
 #. Networks
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:55
-msgid "firewall_zone_network"
+msgid "Networks"
 msgstr "Xarxes"
 
 #. contained networks
diff --git a/po/ca/mmc_over_gpio.po b/po/ca/mmc_over_gpio.po
index 4234d7a29..1766744d3 100644
--- a/po/ca/mmc_over_gpio.po
+++ b/po/ca/mmc_over_gpio.po
@@ -15,15 +15,15 @@ msgstr ""
 
 #. MMC/SD driver configuration
 #: applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua:1
-msgid "mmc_over_gpio"
+msgid "MMC/SD driver configuration"
 msgstr "Configuració del controlador MMC/SD"
 
 #. MMC/SD driver configuration
 #: applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua:2
-msgid "mmc_over_gpio_desc"
+msgid "MMC/SD driver configuration"
 msgstr "Configuració del controlador MMC/SD"
 
 #. Settings
 #: applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua:3
-msgid "settings"
+msgid "Settings"
 msgstr "Configuració"
diff --git a/po/ca/ntpc.po b/po/ca/ntpc.po
index bfc206780..64c42c52c 100644
--- a/po/ca/ntpc.po
+++ b/po/ca/ntpc.po
@@ -15,42 +15,42 @@ msgstr ""
 
 #. Time Synchronisation
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:1
-msgid "ntpc"
+msgid "Time Synchronisation"
 msgstr "Sincronització d'horari"
 
 #. Synchronizes the system time
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:2
-msgid "ntpc_desc"
+msgid "Synchronizes the system time"
 msgstr "Sincronitza l'hora del sistema"
 
 #. Time Server
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:3
-msgid "ntpc_timeserver"
+msgid "Time Server"
 msgstr "Servidor d'horari"
 
 #. Update Interval (in s)
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:4
-msgid "ntpc_interval"
+msgid "Update Interval (in s)"
 msgstr "Intèrval d'actualització (en s)"
 
 #. Count of Time Measurements
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:5
-msgid "ntpc_count"
+msgid "Count of Time Measurements"
 msgstr "Compte de mesures d'horari"
 
 #. empty = infinite
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:6
-msgid "ntpc_count_desc"
+msgid "empty = infinite"
 msgstr "buit = infinit"
 
 #. Clock Adjustment
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:7
-msgid "ntpc_drift"
+msgid "Clock Adjustment"
 msgstr "Ajustament de rellotge"
 
 #. Offset Frequency
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:8
-msgid "ntpc_drift_freq"
+msgid "Offset Frequency"
 msgstr "Compensació de freqüència"
 
 #. Current system time
diff --git a/po/ca/olsr.po b/po/ca/olsr.po
index 157809603..811a08527 100644
--- a/po/ca/olsr.po
+++ b/po/ca/olsr.po
@@ -15,42 +15,42 @@ msgstr ""
 
 #. OLSR Daemon
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:1
-msgid "olsrd"
+msgid "OLSR Daemon"
 msgstr "Dimoni OLSR"
 
 #. Neighbour IP
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:2
-msgid "olsrd_neighbour_ip"
+msgid "Neighbour IP"
 msgstr "IP del veí"
 
 #. Local interface IP
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:3
-msgid "olsrd_local_ip"
+msgid "Local interface IP"
 msgstr "IP d'interfície local"
 
 #. Announced network
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:4
-msgid "olsrd_network"
+msgid "Announced network"
 msgstr "Xarxa anunciada"
 
 #. OLSR gateway
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:5
-msgid "olsrd_gateway"
+msgid "OLSR gateway"
 msgstr "Passarel·la OLSR"
 
 #. OLSR node
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:6
-msgid "olsrd_node"
+msgid "OLSR node"
 msgstr "Node OLSR"
 
 #. Unable to connect to the OLSR daemon!
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:7
-msgid "olsrd_error"
+msgid "Unable to connect to the OLSR daemon!"
 msgstr "No s'ha pogut connectar al dimoni OLSR"
 
 #. Make sure that OLSRd is running, the &quot;txtinfo&quot; plugin is loaded, configured on port 2006 and accepts connections from &quot;127.0.0.1&quot;.
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:8
-msgid "olsrd_error_desc"
+msgid "Make sure that OLSRd is running, the \"txtinfo\" plugin is loaded, configured on port 2006 and accepts connections from \"127.0.0.1\"."
 msgstr ""
 "Assegura't que l'OLSRd està corrent, que el connector &quot;txtinfo&quot; "
 "està carregat, configurat al port 2006, i que accepta connexions de "
@@ -58,609 +58,609 @@ msgstr ""
 
 #. OLSR - HNA-Announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:9
-msgid "olsrd_hna"
+msgid "OLSR - HNA-Announcements"
 msgstr "Anuncis OLSR - HNA"
 
 #. OLSR - Plugins
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:10
-msgid "olsrd_plugins"
+msgid "OLSR - Plugins"
 msgstr "OLSR - Connectors"
 
 #. OLSR connections
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:11
-msgid "olsrd_links"
+msgid "OLSR connections"
 msgstr "Connexions OLSR"
 
 #. Overview of currently established OLSR connections
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:12
-msgid "olsrd_links_desc"
+msgid "Overview of currently established OLSR connections"
 msgstr "Vista general de les connexions OLSR establertes actualment"
 
 #. Expected retransmission count
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:13
-msgid "olsrd_links_etx_desc"
+msgid "Expected retransmission count"
 msgstr "Compte de retransmissió previst"
 
 #. Success rate of sent packages
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:14
-msgid "olsrd_links_lq_desc"
+msgid "Success rate of sent packages"
 msgstr "Taxa d'èxit de paquets enviats"
 
 #. Success rate of received packages
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:15
-msgid "olsrd_links_nlq_desc"
+msgid "Success rate of received packages"
 msgstr "Taxa d'èxit de paquets rebuts"
 
 #. Known OLSR routes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:16
-msgid "olsrd_routes"
+msgid "Known OLSR routes"
 msgstr "Rutes OLSR conegudes"
 
 #. Overview of currently known routes to other OLSR nodes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:17
-msgid "olsrd_routes_desc"
+msgid "Overview of currently known routes to other OLSR nodes"
 msgstr "Vista general de rutes conegudes actualment a altres nodes OLSR"
 
 #. Active OLSR nodes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:18
-msgid "olsrd_topology"
+msgid "Active OLSR nodes"
 msgstr "Nodes OLSR actius"
 
 #. Overview of currently known OLSR nodes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:19
-msgid "olsrd_topology_desc"
+msgid "Overview of currently known OLSR nodes"
 msgstr "Vista general dels nodes OLSR coneguts actualment"
 
 #. Last hop
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:20
-msgid "olsrd_topology_lasthop"
+msgid "Last hop"
 msgstr "Últim salt"
 
 #. Active host net announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:21
-msgid "olsrd_hna2"
+msgid "Active host net announcements"
 msgstr "Anuncis de xarxa de màquines actives"
 
 #. Overview of currently active OLSR host net announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:22
-msgid "olsrd_hna_desc"
+msgid "Overview of currently active OLSR host net announcements"
 msgstr "Vista general d'anuncis de xarxa de màquines OLSR actives"
 
 #. Active MID announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:23
-msgid "olsrd_mid"
+msgid "Active MID announcements"
 msgstr "Anuncis MID actius"
 
 #. Overview of known multiple interface announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:24
-msgid "olsrd_mid_desc"
+msgid "Overview of known multiple interface announcements"
 msgstr "Vista general d'anuncis d'interfície múltiple coneguts"
 
 #. Secondary OLSR interfaces
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:25
-msgid "olsrd_mid_aliases"
+msgid "Secondary OLSR interfaces"
 msgstr "Interfícies OSLR secundàries"
 
 #. Freifunk
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:26
-msgid "olsrd_etx_ff"
+msgid "Freifunk"
 msgstr "Freifunk"
 
 #. floating point
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:27
-msgid "olsrd_etx_float"
+msgid "floating point"
 msgstr "punt flotant"
 
 #. fixed point math
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:28
-msgid "olsrd_etx_fpm"
+msgid "fixed point math"
 msgstr "punt fixat matemàtic"
 
 #. General settings
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:29
-msgid "olsrd_olsrd"
+msgid "General settings"
 msgstr "Configuració general"
 
 #. Start without network
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:30
-msgid "olsrd_olsrd_allownoint"
+msgid "Start without network"
 msgstr "Comença sense xarxa"
 
 #. Clear screen
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:31
-msgid "olsrd_olsrd_clearscreen"
+msgid "Clear screen"
 msgstr "Neteja la pantalla"
 
 #. Debugmode
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:32
-msgid "olsrd_olsrd_debuglevel"
+msgid "Debugmode"
 msgstr "Mode de depuració"
 
 #. FIB metric
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:33
-msgid "olsrd_olsrd_fibmetric"
+msgid "FIB metric"
 msgstr "Mètrica FIB"
 
 #. Internet protocol
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:34
-msgid "olsrd_olsrd_ipversion"
+msgid "Internet protocol"
 msgstr "Protocol d'Internet"
 
 #. LQ aging
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:35
-msgid "olsrd_olsrd_linkqualityaging"
+msgid "LQ aging"
 msgstr "Envelliment LQ"
 
 #. LQ algorithm
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:36
-msgid "olsrd_olsrd_linkqualityalgorithm"
+msgid "LQ algorithm"
 msgstr "Algoritme LQ"
 
 #. LQ Dijkstra limit
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:37
-msgid "olsrd_olsrd_linkqualitydijkstralimit"
+msgid "LQ Dijkstra limit"
 msgstr "Límit de Dijkstra LQ"
 
 #. LQ fisheye
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:38
-msgid "olsrd_olsrd_linkqualityfisheye"
+msgid "LQ fisheye"
 msgstr "LQ fisheye"
 
 #. LQ level
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:39
-msgid "olsrd_olsrd_linkqualitylevel"
+msgid "LQ level"
 msgstr "Nivell LQ"
 
 #. MPR selection
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:40
-msgid "olsrd_olsrd_linkqualitylevel_1"
+msgid "MPR selection"
 msgstr "Selecció MPR"
 
 #. MPR selection and routing
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:41
-msgid "olsrd_olsrd_linkqualitylevel_2"
+msgid "MPR selection and routing"
 msgstr "Selecció i enrutament MPR"
 
 #. LQ window size
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:42
-msgid "olsrd_olsrd_linkqualitywinsize"
+msgid "LQ window size"
 msgstr "Mida de finestra LQ"
 
 #. MPR coverage
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:43
-msgid "olsrd_olsrd_mprcoverage"
+msgid "MPR coverage"
 msgstr "Cobertura MPR"
 
 #. Pollrate
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:44
-msgid "olsrd_olsrd_pollrate"
+msgid "Pollrate"
 msgstr "Taxa de sondeig"
 
 #. TC redundancy
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:45
-msgid "olsrd_olsrd_tcredundancy"
+msgid "TC redundancy"
 msgstr "Redundància TC"
 
 #. MPR selectors
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:46
-msgid "olsrd_olsrd_tcredundancy_0"
+msgid "MPR selectors"
 msgstr "Selectors MPR"
 
 #. MPR selectors and MPR
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:47
-msgid "olsrd_olsrd_tcredundancy_1"
+msgid "MPR selectors and MPR"
 msgstr "Selectors MPR i MPR"
 
 #. all neighbours
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:48
-msgid "olsrd_olsrd_tcredundancy_2"
+msgid "all neighbours"
 msgstr "tots els veïns"
 
 #. Use hysteresis
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:49
-msgid "olsrd_olsrd_usehysteresis"
+msgid "Use hysteresis"
 msgstr "Utilitza histèresi"
 
 #. Willingness
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:50
-msgid "olsrd_olsrd_willingness"
+msgid "Willingness"
 msgstr "Voluntat"
 
 #. Hello interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:51
-msgid "olsrd_interface_hellointerval"
+msgid "Hello interval"
 msgstr "Interval Hello"
 
 #. Hello validity time
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:52
-msgid "olsrd_interface_hellovaliditytime"
+msgid "Hello validity time"
 msgstr "Temps de validesa Hello"
 
 #. HNA interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:53
-msgid "olsrd_interface_hnainterval"
+msgid "HNA interval"
 msgstr "Interval HNA"
 
 #. HNA validity time
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:54
-msgid "olsrd_interface_hnavaliditytime"
+msgid "HNA validity time"
 msgstr "Temps de validesa HNA"
 
 #. IPv4 broadcast
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:55
-msgid "olsrd_interface_ip4broadcast"
+msgid "IPv4 broadcast"
 msgstr "Broadcast IPv4"
 
 #. MID interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:56
-msgid "olsrd_interface_midinterval"
+msgid "MID interval"
 msgstr "Interval MID"
 
 #. MID validity time
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:57
-msgid "olsrd_interface_midvaliditytime"
+msgid "MID validity time"
 msgstr "Temps de validesa MID"
 
 #. TC interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:58
-msgid "olsrd_interface_tcinterval"
+msgid "TC interval"
 msgstr "Interval TC"
 
 #. TC validity time
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:59
-msgid "olsrd_interface_tcvaliditytime"
+msgid "TC validity time"
 msgstr "Temps de validesa TC"
 
 #. IPv6 address type
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:60
-msgid "olsrd_interface_ip6addrtype"
+msgid "IPv6 address type"
 msgstr "Tipus d'adreça IPv6"
 
 #. IPC settings
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:61
-msgid "olsrd_ipcconnect"
+msgid "IPC settings"
 msgstr "Configuració IPC"
 
 #. IPC connections enable you to remote-control the local OLSRd instance using external programs
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:62
-msgid "olsrd_ipcconnect_desc"
+msgid "IPC connections enable you to remote-control the local OLSRd instance using external programs"
 msgstr ""
 "Les connexions IPC et permeten controlar remotament la instància OLSRd fent "
 "servir programes externs"
 
 #. Allowed host addresses
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:63
-msgid "olsrd_ipcconnect_host"
+msgid "Allowed host addresses"
 msgstr "Adreçes de màquina permeses"
 
 #. Multiple separated by spaces
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:64
-msgid "olsrd_ipcconnect_host_desc"
+msgid "Multiple separated by spaces"
 msgstr "Múltiples separades per espais"
 
 #. Maxmimum connection count
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:65
-msgid "olsrd_ipcconnect_maxconnections"
+msgid "Maxmimum connection count"
 msgstr "Màxim número de connexions"
 
 #. Set to 0 to disable IPC
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:66
-msgid "olsrd_ipcconnect_maxconnections_desc"
+msgid "Set to 0 to disable IPC"
 msgstr "Estableix a 0 per desactivar IPC"
 
 #. Allowed subnets
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:67
-msgid "olsrd_ipcconnect_net"
+msgid "Allowed subnets"
 msgstr "Subxarxes permeses"
 
 #. Address Mask; multiple separated by space
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:68
-msgid "olsrd_ipcconnect_net_desc"
+msgid "Address Mask; multiple separated by space"
 msgstr "Màscara d'adreça; múltiples separades per espais"
 
 #. IPv4 HNA announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:69
-msgid "olsrd_hna4"
+msgid "IPv4 HNA announcements"
 msgstr "Anuncis IPv4 HNA"
 
 #. Hna4 entries allow you to propagate local IPv4 host- and network-routes into the mesh network
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:70
-msgid "olsrd_hna4_desc"
+msgid "Hna4 entries allow you to propagate local IPv4 host- and network-routes into the mesh network"
 msgstr ""
 "Les entrades hna4 et permeten propagar les rutes de màquina i xarxa IPv4 "
 "locals a la xarxa mesh"
 
 #. Network address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:71
-msgid "olsrd_hna4_netaddr"
+msgid "Network address"
 msgstr "Adreça de xarxa"
 
 #. IPv4 address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:72
-msgid "olsrd_hna4_netaddr_desc"
+msgid "IPv4 address"
 msgstr "Adreça IPv4"
 
 #. Netmask
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:73
-msgid "olsrd_hna4_netmask"
+msgid "Netmask"
 msgstr "Màscara de xarxa"
 
 #. IPv4 address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:74
-msgid "olsrd_hna4_netmask_desc"
+msgid "IPv4 address"
 msgstr "Adreça IPv4"
 
 #. IPv6 HNA announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:75
-msgid "olsrd_hna6"
+msgid "IPv6 HNA announcements"
 msgstr "Anuncis IPv6 HNA"
 
 #. Hna6 entries allow you to propagate local IPv6 host- and network-routes into the mesh network
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:76
-msgid "olsrd_hna6_desc"
+msgid "Hna6 entries allow you to propagate local IPv6 host- and network-routes into the mesh network"
 msgstr ""
 "Les entrades hna6 et permeten propagar rutes de màquina i xarxa IPv6 locals "
 "a la xarxa mesh"
 
 #. Network address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:77
-msgid "olsrd_hna6_netaddr"
+msgid "Network address"
 msgstr "Adreça de xarxa"
 
 #. IPv6 address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:78
-msgid "olsrd_hna6_netaddr_desc"
+msgid "IPv6 address"
 msgstr "Adreça IPv6"
 
 #. Prefix
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:79
-msgid "olsrd_hna6_prefix"
+msgid "Prefix"
 msgstr "Prefix"
 
 #. IPv6 prefix
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:80
-msgid "olsrd_hna6_prefix_desc"
+msgid "IPv6 prefix"
 msgstr "Prefix IPv6"
 
 #. Plugin configuration
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:81
-msgid "olsrd_loadplugin"
+msgid "Plugin configuration"
 msgstr "Configuració de connector"
 
 #. Enable plugin
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:82
-msgid "olsrd_loadplugin_ignore"
+msgid "Enable plugin"
 msgstr "Activa connector"
 
 #. Library
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:83
-msgid "olsrd_loadplugin_library"
+msgid "Library"
 msgstr "Llibreria"
 
 #. Allow connections from this hosts
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:84
-msgid "olsrd_loadplugin_accept"
+msgid "Allow connections from this hosts"
 msgstr "Permet connexions des d'aquestes màquines"
 
 #. Ping test addresses
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:85
-msgid "olsrd_loadplugin_ping"
+msgid "Ping test addresses"
 msgstr "Ping adreces de prova"
 
 #. Interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:86
-msgid "olsrd_loadplugin_interval"
+msgid "Refresh interval in seconds"
 msgstr "interval"
 
 #. HNA announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:87
-msgid "olsrd_loadplugin_hna"
+msgid "HNA announcements"
 msgstr "Anuncis HNA"
 
 #. Format: IP-Address Netmask / OLSR will announce this network once it is reachable
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:88
-msgid "olsrd_loadplugin_hna_desc"
+msgid "Format: IP-Address Netmask / OLSR will announce this network once it is reachable"
 msgstr ""
 "Format: Adreça IP Màscara / OLSR anunciarà aquesta xarxa quan sigui "
 "accessible"
 
 #. Alternative \"hosts\" file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:89
-msgid "olsrd_loadplugin_addhosts"
+msgid "Alternative \"hosts\" file"
 msgstr "Fitxer de \"hosts\" alternatiu"
 
 #. The contents of this file will be appended to the autogenerated \"hosts\" file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:90
-msgid "olsrd_loadplugin_addhosts_desc"
+msgid "The contents of this file will be appended to the autogenerated \"hosts\" file"
 msgstr "El contingut d'aquest fitxer s'afegirà al fitxer autogenerat \"hosts\""
 
 #. DNS server
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:91
-msgid "olsrd_loadplugin_dnsserver"
+msgid "DNS server"
 msgstr "Servidor DNS"
 
 #. Alternative hostnames
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:92
-msgid "olsrd_loadplugin_hosts"
+msgid "Alternative hostnames"
 msgstr "Noms de màquina alternatius"
 
 #. Format: Interface-IP Hostname
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:93
-msgid "olsrd_loadplugin_hosts_desc"
+msgid "Format: Interface-IP Hostname"
 msgstr "Format: Interfície-IP nom de màquina"
 
 #. Path to the \"hosts\" file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:94
-msgid "olsrd_loadplugin_hostsfile"
+msgid "Path to the \"hosts\" file"
 msgstr "Ruta al fitxer de \"hosts\""
 
 #. Latitude
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:95
-msgid "olsrd_loadplugin_lat"
+msgid "Latitude"
 msgstr "Latitud"
 
 #. Output file for coordinates
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:96
-msgid "olsrd_loadplugin_latlonfile"
+msgid "Output file for coordinates"
 msgstr "Fitxer de sortida per les coordenades"
 
 #. OLSR will write received coordinates of other nodes to this file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:97
-msgid "olsrd_loadplugin_latlonfile_desc"
+msgid "OLSR will write received coordinates of other nodes to this file"
 msgstr "L'OLSR escriurà les coordenades rebudes d'altres nodes a aquest fitxer"
 
 #. Input file for coordinates
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:98
-msgid "olsrd_loadplugin_latloninfile"
+msgid "Input file for coordinates"
 msgstr "Fitxer d'entrada per coordenades"
 
 #. OLSR periodically checks this file for new coordinates and propagates them
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:99
-msgid "olsrd_loadplugin_latloninfile_desc"
+msgid "OLSR periodically checks this file for new coordinates and propagates them"
 msgstr ""
 "L'OLSR comprova periòdicament aquest fitxer per coordenades noves i les "
 "propaga"
 
 #. Longitude
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:100
-msgid "olsrd_loadplugin_lon"
+msgid "Longitude"
 msgstr "Longitud"
 
 #. Hostnames
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:101
-msgid "olsrd_loadplugin_name"
+msgid "Hostnames"
 msgstr "Noms de màquina"
 
 #. Command for name changes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:102
-msgid "olsrd_loadplugin_namechangescript"
+msgid "Command for name changes"
 msgstr "Comanda per canvis de nom"
 
 #. OLSR executes this command once entries in the \"hosts\" are changed
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:103
-msgid "olsrd_loadplugin_namechangescript_desc"
+msgid "OLSR executes this command once entries in the \"hosts\" are changed"
 msgstr "L'OLSR executa aquesta comanda quan les entrades al \"hosts\" es canvien"
 
 #. Path to the \"resolv\" file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:104
-msgid "olsrd_loadplugin_resolvfile"
+msgid "Path to the \"resolv\" file"
 msgstr "Ruta al fitxer \"resolv\""
 
 #. Command for service changes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:105
-msgid "olsrd_loadplugin_serviceschangescript"
+msgid "Command for service changes"
 msgstr "Comanda per canvis de servei"
 
 #. OLSR excutes this command once new service announcements are received
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:106
-msgid "olsrd_loadplugin_serviceschangescript_desc"
+msgid "OLSR excutes this command once new service announcements are received"
 msgstr "L'OLSR executa aquesta comanda quan es rep l'anunci d'un nou servei"
 
 #. PID file for SIGHUP signals
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:107
-msgid "olsrd_loadplugin_sighuppidfile"
+msgid "PID file for SIGHUP signals"
 msgstr "Fitxer PID per senyals SIGHUP"
 
 #. OLSR sends a HUP signal to this PID once the \"hosts\" oder \"resolv\" file is changed
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:108
-msgid "olsrd_loadplugin_sighuppidfile_desc"
+msgid "OLSR sends a HUP signal to this PID once the \"hosts\" oder \"resolv\" file is changed"
 msgstr ""
 "L'OLSR envia un senyal HUP a aquest PID quan es canvien el fitxer \"hosts\" o "
 "bé el fitxer \"resolv\""
 
 #. Domain suffix
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:109
-msgid "olsrd_loadplugin_suffix"
+msgid "Domain suffix"
 msgstr "Sufix de domini"
 
 #. Timeout
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:110
-msgid "olsrd_loadplugin_timeout"
+msgid "Timeout"
 msgstr "Temps d'espera màxim"
 
 #. Name of the BMF interface
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:111
-msgid "olsrd_loadplugin_bmfinterface"
+msgid "Name of the BMF interface"
 msgstr "Nom de la interfície BMF"
 
 #. IP address of the BMF interface
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:112
-msgid "olsrd_loadplugin_bmfinterfaceid"
+msgid "IP address of the BMF interface"
 msgstr "Adreça de la interfície BMF"
 
 #. Redirect local broadcasts
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:113
-msgid "olsrd_loadplugin_dolocalbroadcast"
+msgid "Redirect local broadcasts"
 msgstr "Readreça broadcasts locals"
 
 #. Also redirect broadcasts from OLSR interfaces
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:114
-msgid "olsrd_loadplugin_capturepacketsonolsrinterfaces"
+msgid "Also redirect broadcasts from OLSR interfaces"
 msgstr "També readreça broadcasts d'interfícies OLSR"
 
 #. Propagation mechanism
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:115
-msgid "olsrd_loadplugin_bmfmechanism"
+msgid "Propagation mechanism"
 msgstr "Mecanisme de propagació"
 
 #. Number of retransmissions per package
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:116
-msgid "olsrd_loadplugin_broadcastretransmitcount"
+msgid "Number of retransmissions per package"
 msgstr "Número de retransmissions per paquet"
 
 #. Minimum number of neighbours for broadcast redirection
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:117
-msgid "olsrd_loadplugin_fanoutlimit"
+msgid "Minimum number of neighbours for broadcast redirection"
 msgstr "Número mínim de veïns per readreçament broadcast"
 
 #. Non-OLSR interfaces
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:118
-msgid "olsrd_loadplugin_nonolsrif"
+msgid "Non-OLSR interfaces"
 msgstr "Interfície no-OLSR"
 
 #. Used port
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:119
-msgid "olsrd_loadplugin_port"
+msgid "Used port"
 msgstr "Port utilitzat"
 
 #. Allow connections from hosts
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:120
-msgid "olsrd_loadplugin_host"
+msgid "Allow connections from hosts"
 msgstr "Permet connexions de les màquines"
 
 #. Allow connections from subnets
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:121
-msgid "olsrd_loadplugin_net"
+msgid "Allow connections from subnets"
 msgstr "Permet connexions de les subxarxes"
 
 #. Format: IP-AddresseNetmask
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:122
-msgid "olsrd_loadplugin_net_desc"
+msgid "Format: IP-AddresseNetmask"
 msgstr "Format: Adreça_IPMàscara"
 
 #. Used protocols
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:123
-msgid "olsrd_loadplugin_redistribute"
+msgid "Used protocols"
 msgstr "Protocols utilitzats"
 
 #. Only export routes to Quagga or to kernel too
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:124
-msgid "olsrd_loadplugin_exportroutes"
+msgid "Only export routes to Quagga or to kernel too"
 msgstr "Exporta només rutes al Quagga o també al kernel"
 
 #. Always prefer local routes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:125
-msgid "olsrd_loadplugin_localpref"
+msgid "Always prefer local routes"
 msgstr "Prefereix sempre les rutes locals"
 
 #. Distance of exported routes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:126
-msgid "olsrd_loadplugin_distance"
+msgid "Distance of exported routes"
 msgstr "Distància de les rutes exportades"
 
 #. Key file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:127
-msgid "olsrd_loadplugin_keyfile"
+msgid "Key file"
 msgstr "Fitxer de clau"
 
 #. Watchdog timestamp file
diff --git a/po/ca/openvpn.po b/po/ca/openvpn.po
index e457c4648..acfd8650f 100644
--- a/po/ca/openvpn.po
+++ b/po/ca/openvpn.po
@@ -15,950 +15,950 @@ msgstr ""
 
 #. OpenVPN
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:1
-msgid "openvpn"
+msgid "OpenVPN"
 msgstr "OpenVPN"
 
 #. Switch to basic configuration
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:3
-msgid "openvpn_switch_basic"
+msgid "« Switch to basic configuration"
 msgstr "Canvia a configuració bàsica"
 
 #. Switch to advanced configuration
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:4
-msgid "openvpn_switch_advanced"
+msgid "Switch to advanced configuration »"
 msgstr "Canvia a configuració avançada"
 
 #. Enabled
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:6
-msgid "openvpn_enable"
+msgid "Enabled"
 msgstr "Activat"
 
 #. Started
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:7
-msgid "openvpn_active"
+msgid "Started"
 msgstr "Iniciat"
 
 #. no
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:8
-msgid "openvpn_active_no"
+msgid "no"
 msgstr "no"
 
 #. yes (%i)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:9
-msgid "openvpn_active_yes"
+msgid "yes (%i)"
 msgstr "sí (%i)"
 
 #. Port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:10
-msgid "openvpn_port"
+msgid "Port"
 msgstr "Port"
 
 #. Protocol
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:11
-msgid "openvpn_proto"
+msgid "Protocol"
 msgstr "Protocol"
 
 #. Instance \"%s\"
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:13
-msgid "openvpn_instance"
+msgid "Instance \"%s\""
 msgstr "Instància \"%s\""
 
 #. OpenVPN instances
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:15
-msgid "openvpn_overview"
+msgid "OpenVPN instances"
 msgstr "Instàncies OpenVPN"
 
 #. Below is a list of configured OpenVPN instances and their current state
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:16
-msgid "openvpn_overview_desc"
+msgid "Below is a list of configured OpenVPN instances and their current state"
 msgstr ""
 "A sota hi ha una llista d'instàncies OpenVPN configurades i el seu estat "
 "actual"
 
 #. Daemon configuration
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:18
-msgid "openvpn_service"
+msgid "Daemon configuration"
 msgstr "Configuració del dimoni"
 
 #. Networking options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:19
-msgid "openvpn_networking"
+msgid "Networking options"
 msgstr "Opcions de xarxa"
 
 #. VPN options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:20
-msgid "openvpn_vpn"
+msgid "VPN options"
 msgstr "Opcions VPN"
 
 #. Cryptography settings
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:21
-msgid "openvpn_cryptography"
+msgid "Cryptography settings"
 msgstr "Configuració criptogràfica"
 
 #. Read configuration options from file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:23
-msgid "openvpn_param_config"
+msgid "Read configuration options from file"
 msgstr "Llegeix les opcions de configuració d'un fitxer"
 
 #. Local host name or ip address
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:24
-msgid "openvpn_param_local"
+msgid "Local host name or ip address"
 msgstr "Nom de màquina local o adreça IP"
 
 #. Remote host name or ip address
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:25
-msgid "openvpn_param_remote"
+msgid "Remote host name or ip address"
 msgstr "Nom de màquina remot o adreça IP"
 
 #. Randomly choose remote server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:26
-msgid "openvpn_param_remote_random"
+msgid "Randomly choose remote server"
 msgstr "Tria aleatòriament el servidor remot"
 
 #. Major mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:27
-msgid "openvpn_param_mode"
+msgid "Major mode"
 msgstr "Mode major"
 
 #. Use protocol
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:28
-msgid "openvpn_param_proto"
+msgid "Use protocol"
 msgstr "Utilitza protocol"
 
 #. Connection retry interval
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:29
-msgid "openvpn_param_connect_retry"
+msgid "Connection retry interval"
 msgstr "Interval de reintent de connexió"
 
 #. Connection timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:30
-msgid "openvpn_param_connect_timeout"
+msgid "Connection timeout"
 msgstr "Temps d'espera de connexió"
 
 #. Maximum connection attempt retries
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:31
-msgid "openvpn_param_connect_retry_max"
+msgid "Maximum connection attempt retries"
 msgstr "Número màxim d'intents de reconnexió"
 
 #. Try to sense proxy settings automatically
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:32
-msgid "openvpn_param_auto_proxy"
+msgid "Try to sense proxy settings automatically"
 msgstr "Intenta aconseguir la configuració de proxy automàticament"
 
 #. Connect to remote host
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:33
-msgid "openvpn_param_http_proxy"
+msgid "Connect to remote host"
 msgstr "Connecta't a una màquina remota"
 
 #. Retry indefinitely on HTTP proxy errors
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:34
-msgid "openvpn_param_http_proxy_retry"
+msgid "Retry indefinitely on HTTP proxy errors"
 msgstr "Reintenta indefinidament en errors de proxy HTTP"
 
 #. Proxy timeout in seconds
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:35
-msgid "openvpn_param_http_proxy_timeout"
+msgid "Proxy timeout in seconds"
 msgstr "Temps d'espera màxim de proxy en segons"
 
 #. Set extended HTTP proxy options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:36
-msgid "openvpn_param_http_proxy_option"
+msgid "Set extended HTTP proxy options"
 msgstr "Estableix les opcions de proxy HTTP exteses"
 
 #. Connect through Socks5 proxy
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:37
-msgid "openvpn_param_socks_proxy"
+msgid "Connect through Socks5 proxy"
 msgstr "Connecta't a través un proxy Socks5"
 
 #. Retry indefinitely on Socks proxy errors
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:38
-msgid "openvpn_param_socks_proxy_retry"
+msgid "Retry indefinitely on Socks proxy errors"
 msgstr "Reintenta indefinidament en errors de proxy Socks"
 
 #. If hostname resolve fails, retry
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:39
-msgid "openvpn_param_resolv_retry"
+msgid "If hostname resolve fails, retry"
 msgstr "Si la resolució del nom de màquina falla, reintenta-ho"
 
 #. Allow remote to change its IP or port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:40
-msgid "openvpn_param_float"
+msgid "Allow remote to change its IP or port"
 msgstr "Permet al remot canviar la seva IP o port"
 
 #. Execute shell command on remote ip change
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:41
-msgid "openvpn_param_ipchange"
+msgid "Execute shell command on remote ip change"
 msgstr "Executa una ordre de consola quan hi hagi un canvi d'IP remot"
 
 #. TCP/UDP port # for both local and remote
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:42
-msgid "openvpn_param_port"
+msgid "TCP/UDP port # for both local and remote"
 msgstr "Port TCP/UDP tan per local com per remot"
 
 #. TCP/UDP port # for local (default=1194)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:43
-msgid "openvpn_param_lport"
+msgid "TCP/UDP port # for local (default=1194)"
 msgstr "Port TCP/UDP per local (defecte=1194)"
 
 #. TCP/UDP port # for remote (default=1194)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:44
-msgid "openvpn_param_rport"
+msgid "TCP/UDP port # for remote (default=1194)"
 msgstr "Port TCP/UDP per remot (defecte=1194)"
 
 #. Bind to local address and port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:45
-msgid "openvpn_param_bind"
+msgid "Bind to local address and port"
 msgstr "Vincula a adreça i port locals"
 
 #. Do not bind to local address and port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:46
-msgid "openvpn_param_nobind"
+msgid "Do not bind to local address and port"
 msgstr "No vinculis a adreça i port locals"
 
 #. tun/tap device
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:47
-msgid "openvpn_param_dev"
+msgid "tun/tap device"
 msgstr "dispositiu tun/tap"
 
 #. Type of used device
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:48
-msgid "openvpn_param_dev_type"
+msgid "Type of used device"
 msgstr "Tipus de dispositiu utilitzat"
 
 #. Use tun/tap device node
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:49
-msgid "openvpn_param_dev_node"
+msgid "Use tun/tap device node"
 msgstr "Utilitza un node de dispositiu tun/tap"
 
 #. Set the link layer address of the tap device
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:50
-msgid "openvpn_param_lladdr"
+msgid "Set the link layer address of the tap device"
 msgstr "Estableix l'adreça de capa d'enllaç del dispositiu tap"
 
 #. 'net30', 'p2p', or 'subnet'
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:51
-msgid "openvpn_param_topology"
+msgid "'net30', 'p2p', or 'subnet'"
 msgstr "'net30', 'p2p', o 'subnet'"
 
 #. Make tun device IPv6 capable
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:52
-msgid "openvpn_param_tun_ipv6"
+msgid "Make tun device IPv6 capable"
 msgstr "Fes que el dispositiu tun sigui apte per IPv6"
 
 #. Configure device to use IP address
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:53
-msgid "openvpn_param_ifconfig"
+msgid "Configure device to use IP address"
 msgstr "Configura el dispositiu per fer servir l'adreça IP"
 
 #. Don't actually execute ifconfig
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:54
-msgid "openvpn_param_ifconfig_noexec"
+msgid "Don't actually execute ifconfig"
 msgstr "No executis ifconfig"
 
 #. Don't warn on ifconfig inconsistencies
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:55
-msgid "openvpn_param_ifconfig_nowarn"
+msgid "Don't warn on ifconfig inconsistencies"
 msgstr "No alertis d'inconsistències ifconfig"
 
 #. Add route after establishing connection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:56
-msgid "openvpn_param_route"
+msgid "Add route after establishing connection"
 msgstr "Afegeix ruta després d'establir connexió"
 
 #. Specify a default gateway for routes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:57
-msgid "openvpn_param_route_gateway"
+msgid "Specify a default gateway for routes"
 msgstr "Especifica una passarel·la per defecte per rutes"
 
 #. Specify a default metric for routes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:58
-msgid "openvpn_param_route_metric"
+msgid "Specify a default metric for routes"
 msgstr "Especifica una mètrica per defecte per rutes"
 
 #. Delay n seconds after connection 
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:59
-msgid "openvpn_param_route_delay"
+msgid "Delay n seconds after connection "
 msgstr "Endarrereix n segons després de la connexió"
 
 #. Execute shell cmd after routes are added
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:60
-msgid "openvpn_param_route_up"
+msgid "Execute shell cmd after routes are added"
 msgstr "Executa comanda després d'afegir les rutes"
 
 #. Don't add routes automatically
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:61
-msgid "openvpn_param_route_noexec"
+msgid "Don't add routes automatically"
 msgstr "No afegeixis rutes automàticament"
 
 #. Don't pull options from server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:62
-msgid "openvpn_param_route_nopull"
+msgid "Don't pull options from server"
 msgstr "No agafis les opcions del servidor"
 
 #. Automatically redirect default route
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:63
-msgid "openvpn_param_redirect_gateway"
+msgid "Automatically redirect default route"
 msgstr "Readreça automàticament la ruta per defecte"
 
 #. Pass environment variables to script
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:64
-msgid "openvpn_param_setenv"
+msgid "Pass environment variables to script"
 msgstr "Passa les variables d'ambient a l'script"
 
 #. Shaping for peer bandwidth
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:65
-msgid "openvpn_param_shaper"
+msgid "Shaping for peer bandwidth"
 msgstr "Configuració d'ample de banda d'un peer"
 
 #. Set timeouts in server mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:66
-msgid "openvpn_param_keepalive"
+msgid "Set timeouts in server mode"
 msgstr "Estableix temps d'espera màxims en mode servidor"
 
 #. tun/tap inactivity timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:67
-msgid "openvpn_param_inactive"
+msgid "tun/tap inactivity timeout"
 msgstr "temps d'espera màxim d'inactivitat tun/tap"
 
 #. Remote ping timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:68
-msgid "openvpn_param_ping_exit"
+msgid "Remote ping timeout"
 msgstr "Temps d'espera màxim de ping remot"
 
 #. Restart after remote ping timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:69
-msgid "openvpn_param_ping_restart"
+msgid "Restart after remote ping timeout"
 msgstr "Reinicia després d'excedir el temps d'espera de ping remot"
 
 #. Only process ping timeouts if routes exist
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:70
-msgid "openvpn_param_ping_timer_rem"
+msgid "Only process ping timeouts if routes exist"
 msgstr "Processa l'excés de temps d'espera de pings remots si la ruta existeix"
 
 #. Ping remote every n seconds over TCP/UDP port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:71
-msgid "openvpn_param_ping"
+msgid "Ping remote every n seconds over TCP/UDP port"
 msgstr "Ping remot cada n segons sobre port TCP/UDP"
 
 #. Configure a multi-homed UDP server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:72
-msgid "openvpn_param_multihome"
+msgid "Configure a multi-homed UDP server"
 msgstr "Configura un servidor UDP multi-homed"
 
 #. Optimize TUN/TAP/UDP writes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:73
-msgid "openvpn_param_fast_io"
+msgid "Optimize TUN/TAP/UDP writes"
 msgstr "Optimitza les escriptures TUN/TAP/UDP"
 
 #. Remap SIGUSR1 signals
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:74
-msgid "openvpn_param_remap_usr1"
+msgid "Remap SIGUSR1 signals"
 msgstr "Remapeja senyals SIGUSR1"
 
 #. Keep tun/tap device open on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:75
-msgid "openvpn_param_persist_tun"
+msgid "Keep tun/tap device open on restart"
 msgstr "Mantingues el dispositiu tun/tap obert al reiniciar"
 
 #. Keep remote IP address on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:76
-msgid "openvpn_param_persist_remote_ip"
+msgid "Keep remote IP address on restart"
 msgstr "Mantingues l'adreça IP remota al reiniciar"
 
 #. Keep local IP address on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:77
-msgid "openvpn_param_persist_local_ip"
+msgid "Keep local IP address on restart"
 msgstr "Mantingues l'adreça IP local al reiniciar"
 
 #. Don't re-read key on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:78
-msgid "openvpn_param_persist_key"
+msgid "Don't re-read key on restart"
 msgstr "No rellegeixis la clau al reiniciar"
 
 #. TOS passthrough (applies to IPv4 only)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:79
-msgid "openvpn_param_passtos"
+msgid "TOS passthrough (applies to IPv4 only)"
 msgstr "Pas TOS (aplica només a IPv4)"
 
 #. Set tun/tap device MTU
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:80
-msgid "openvpn_param_tun_mtu"
+msgid "Set tun/tap device MTU"
 msgstr "Estableix la MTU del dispositiu tun/tap"
 
 #. Set tun/tap device overhead
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:81
-msgid "openvpn_param_tun_mtu_extra"
+msgid "Set tun/tap device overhead"
 msgstr "Estableix la càrrega (overhead) del dispositiu tun/tap"
 
 #. Set TCP/UDP MTU
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:82
-msgid "openvpn_param_link_mtu"
+msgid "Set TCP/UDP MTU"
 msgstr "Estableix la MTU de TCP/UDP"
 
 #. Enable Path MTU discovery
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:83
-msgid "openvpn_param_mtu_disc"
+msgid "Enable Path MTU discovery"
 msgstr "Activa el Path MTU discovery"
 
 #. Empirically measure MTU
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:84
-msgid "openvpn_param_mtu_test"
+msgid "Empirically measure MTU"
 msgstr "Mesura empíricament l'MTU"
 
 #. Enable internal datagram fragmentation
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:85
-msgid "openvpn_param_fragment"
+msgid "Enable internal datagram fragmentation"
 msgstr "Activa la fragmentació de datagrames interna"
 
 #. Set upper bound on TCP MSS
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:86
-msgid "openvpn_param_mssfix"
+msgid "Set upper bound on TCP MSS"
 msgstr "Estableix el límit superior al TCP MSS"
 
 #. Set the TCP/UDP send buffer size
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:87
-msgid "openvpn_param_sndbuf"
+msgid "Set the TCP/UDP send buffer size"
 msgstr "Estableix la mida de memòria intermèdia d'enviament TCP/UDP"
 
 #. Set the TCP/UDP receive buffer size
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:88
-msgid "openvpn_param_rcvbuf"
+msgid "Set the TCP/UDP receive buffer size"
 msgstr "Estableix la mida de memòria intermèdia de recepció TCP/UDP"
 
 #. Set tun/tap TX queue length
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:89
-msgid "openvpn_param_txqueuelen"
+msgid "Set tun/tap TX queue length"
 msgstr "Estableix la mida de cua TX de tun/tap"
 
 #. Disable Paging
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:90
-msgid "openvpn_param_mlock"
+msgid "Disable Paging"
 msgstr "Desactiva Paging"
 
 #. Shell cmd to execute after tun device open
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:91
-msgid "openvpn_param_up"
+msgid "Shell cmd to execute after tun device open"
 msgstr "Ordre a executar després que s'obri un dispositiu tun"
 
 #. Delay tun/tap open and up script execution
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:92
-msgid "openvpn_param_up_delay"
+msgid "Delay tun/tap open and up script execution"
 msgstr "Retarda l'obertura tun/tap i l'execució d'script d'activació"
 
 #. Shell cmd to run after tun device close
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:93
-msgid "openvpn_param_down"
+msgid "Shell cmd to run after tun device close"
 msgstr "Ordre a executar després que es tanqui un dispositiu tun"
 
 #. Call down cmd/script before TUN/TAP close
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:94
-msgid "openvpn_param_down_pre"
+msgid "Call down cmd/script before TUN/TAP close"
 msgstr ""
 "Crida l'script/comanda de desactivació abans de tancar el dispositiu TUN/TAP"
 
 #. Run up/down scripts for all restarts
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:95
-msgid "openvpn_param_up_restart"
+msgid "Run up/down scripts for all restarts"
 msgstr "Executa els scripts d'activació/desactivació per tots els reinicis."
 
 #. Set UID to user
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:96
-msgid "openvpn_param_user"
+msgid "Set UID to user"
 msgstr "Estableix l'UID per l'usuari"
 
 #. Set GID to group
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:97
-msgid "openvpn_param_group"
+msgid "Set GID to group"
 msgstr "Estableix el GID al grup"
 
 #. Chroot to directory after initialization
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:98
-msgid "openvpn_param_chroot"
+msgid "Chroot to directory after initialization"
 msgstr "Chroot al directori després de la inicialització"
 
 #. Change to directory before initialization
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:99
-msgid "openvpn_param_cd"
+msgid "Change to directory before initialization"
 msgstr "Canvia el directori abans de la inicialització"
 
 #. Daemonize after initialization
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:100
-msgid "openvpn_param_daemon"
+msgid "Daemonize after initialization"
 msgstr "Dimonitza després d'inicialitzar"
 
 #. Output to syslog and do not daemonize
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:101
-msgid "openvpn_param_syslog"
+msgid "Output to syslog and do not daemonize"
 msgstr "Sortida al syslog i no dimonitzis"
 
 #. Run as an inetd or xinetd server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:102
-msgid "openvpn_param_inetd"
+msgid "Run as an inetd or xinetd server"
 msgstr "Executa com un servidor inetd o xinetd"
 
 #. Write log to file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:103
-msgid "openvpn_param_log"
+msgid "Write log to file"
 msgstr "Escriu registre al fitxer"
 
 #. Append log to file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:104
-msgid "openvpn_param_log_append"
+msgid "Append log to file"
 msgstr "Afegeix el registre al fitxer"
 
 #. Don't log timestamps
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:105
-msgid "openvpn_param_suppress_timestamps"
+msgid "Don't log timestamps"
 msgstr "No registris les marques horàries"
 
 #. Write process ID to file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:106
-msgid "openvpn_param_writepid"
+msgid "Write process ID to file"
 msgstr "Escriu l'ID del procés al fitxer"
 
 #. Change process priority
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:107
-msgid "openvpn_param_nice"
+msgid "Change process priority"
 msgstr "Canvia la prioritat del procés"
 
 #. Echo parameters to log
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:108
-msgid "openvpn_param_echo"
+msgid "Echo parameters to log"
 msgstr "Escriu els paràmetres al registre"
 
 #. Set output verbosity
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:109
-msgid "openvpn_param_verb"
+msgid "Set output verbosity"
 msgstr "Estableix el detall de sortida"
 
 #. Limit repeated log messages
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:110
-msgid "openvpn_param_mute"
+msgid "Limit repeated log messages"
 msgstr "Limita els missatges de registre repetits"
 
 #. Write status to file every n seconds
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:111
-msgid "openvpn_param_status"
+msgid "Write status to file every n seconds"
 msgstr "Escriu l'estat al fitxer cada n segons"
 
 #. Status file format version
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:112
-msgid "openvpn_param_status_version"
+msgid "Status file format version"
 msgstr "Versió de format de fitxer d'estat"
 
 #. Disable options consistency check
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:113
-msgid "openvpn_param_disable_occ"
+msgid "Disable options consistency check"
 msgstr "Desactiva la comprovació de consistència d'opcions"
 
 #. Special stress testing mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:114
-msgid "openvpn_param_gremlin"
+msgid "Special stress testing mode"
 msgstr "Mode de proves d'estrés especial"
 
 #. Use fast LZO compression
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:115
-msgid "openvpn_param_comp_lzo"
+msgid "Use fast LZO compression"
 msgstr "Utilitza compressió ràpida LZO"
 
 #. Don't use adaptive lzo compression
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:116
-msgid "openvpn_param_comp_noadapt"
+msgid "Don't use adaptive lzo compression"
 msgstr "No utilitzis compressió adaptativa LZO"
 
 #. Enable management interface on <em>IP</em> <em>port</em>
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:117
-msgid "openvpn_param_management"
+msgid "Enable management interface on <em>IP</em> <em>port</em>"
 msgstr "Activa la interfície de gestió a <em>IP</em> <em>port</em>"
 
 #. Management interface will connect as a TCP client
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:118
-msgid "openvpn_param_management_client"
+msgid "Management interface will connect as a TCP client"
 msgstr "La interfície de gestió es connectarà com un client TCP"
 
 #. Query management channel for private key
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:119
-msgid "openvpn_param_management_query_passwords"
+msgid "Query management channel for private key"
 msgstr "Consulta el canal de gestió per una clau privada"
 
 #. Start OpenVPN in a hibernating state
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:120
-msgid "openvpn_param_management_hold"
+msgid "Start OpenVPN in a hibernating state"
 msgstr "Inicia l'OpenVPN en un estat d'hivernació"
 
 #. Issue SIGUSR1 on management disconnect
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:121
-msgid "openvpn_param_management_signal"
+msgid "Issue SIGUSR1 on management disconnect"
 msgstr "Publica SIGUSR1 en desconnexions de gestió"
 
 #. Forget passwords on management disconnect
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:122
-msgid "openvpn_param_management_forget_disconnect"
+msgid "Forget passwords on management disconnect"
 msgstr "Oblida contrasenyes en desconnexions de gestió"
 
 #. Number of lines for log file history
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:123
-msgid "openvpn_param_management_log_cache"
+msgid "Number of lines for log file history"
 msgstr "Número de línies per historial de fitxer de registre"
 
 #. Load plug-in module
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:124
-msgid "openvpn_param_plugin"
+msgid "Load plug-in module"
 msgstr "Carrega el mòdul de connectors"
 
 #. Configure server mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:125
-msgid "openvpn_param_server"
+msgid "Configure server mode"
 msgstr "Configura el mode servidor"
 
 #. Configure server bridge
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:126
-msgid "openvpn_param_server_bridge"
+msgid "Configure server bridge"
 msgstr "Configura el pont de servidor"
 
 #. Push options to peer
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:127
-msgid "openvpn_param_push"
+msgid "Push options to peer"
 msgstr "Envia opcions al peer"
 
 #. Don't inherit global push options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:128
-msgid "openvpn_param_push_reset"
+msgid "Don't inherit global push options"
 msgstr "No heretis les opcions globals enviades pel servidor"
 
 #. Set aside a pool of subnets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:129
-msgid "openvpn_param_ifconfig_pool"
+msgid "Set aside a pool of subnets"
 msgstr "Deixa de banda un conjunt de subxarxes"
 
 #. Use individual addresses rather than /30 subnets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:130
-msgid "openvpn_param_ifconfig_pool_linear"
+msgid "Use individual addresses rather than /30 subnets"
 msgstr "Utilitza adreces individuals en comptes de subxarxes /30"
 
 #. Persist/unpersist ifconfig-pool
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:131
-msgid "openvpn_param_ifconfig_pool_persist"
+msgid "Persist/unpersist ifconfig-pool"
 msgstr "Persisteix/deixa de persistir ifconfig-pool"
 
 #. Push an ifconfig option to remote
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:132
-msgid "openvpn_param_ifconfig_push"
+msgid "Push an ifconfig option to remote"
 msgstr "Envia una opció ifconfig al remot"
 
 #. Route subnet to client
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:133
-msgid "openvpn_param_iroute"
+msgid "Route subnet to client"
 msgstr "Enruta subxarxa al client"
 
 #. Client is disabled
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:134
-msgid "openvpn_param_disable"
+msgid "Client is disabled"
 msgstr "El client està deshabilitat"
 
 #. Don't require client certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:135
-msgid "openvpn_param_client_cert_not_required"
+msgid "Don't require client certificate"
 msgstr "No requereixis el certificat de client"
 
 #. Use username as common name
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:136
-msgid "openvpn_param_username_as_common_name"
+msgid "Use username as common name"
 msgstr "Utilitza el nom d'usuari com a nom comú"
 
 #. Script to verify interactive authentication
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:137
-msgid "openvpn_param_auth_user_pass_verify"
+msgid "Script to verify interactive authentication"
 msgstr "Script per verificar l'autenticació interactiva"
 
 #. Allow client-to-client traffic
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:138
-msgid "openvpn_param_client_to_client"
+msgid "Allow client-to-client traffic"
 msgstr "Permet tràfic client a client"
 
 #. Allow multiple clients with same certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:139
-msgid "openvpn_param_duplicate_cn"
+msgid "Allow multiple clients with same certificate"
 msgstr "Permet múltiples clients amb el mateix certificat"
 
 #. Run script cmd on client connection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:140
-msgid "openvpn_param_client_connect"
+msgid "Run script cmd on client connection"
 msgstr "Executa l'script en connectar-se el client"
 
 #. Run script cmd on client disconnection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:141
-msgid "openvpn_param_client_disconnect"
+msgid "Run script cmd on client disconnection"
 msgstr "Executa l'script en desconnectar-te el client"
 
 #. Directory for custom client config files
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:142
-msgid "openvpn_param_client_config_dir"
+msgid "Directory for custom client config files"
 msgstr "Directori per fitxers de configuració de client personalitzats"
 
 #. Refuse connection if no custom client config
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:143
-msgid "openvpn_param_ccd_exclusive"
+msgid "Refuse connection if no custom client config"
 msgstr "Refusa la connexió si no hi ha configuració de client personalitzada"
 
 #. Temporary directory for client-connect return file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:144
-msgid "openvpn_param_tmp_dir"
+msgid "Temporary directory for client-connect return file"
 msgstr "Directori temporal pel fitxer de retorn per la connexió de client"
 
 #. Set size of real and virtual address hash tables
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:145
-msgid "openvpn_param_hash_size"
+msgid "Set size of real and virtual address hash tables"
 msgstr "Estableix la mida de les taules de dispersió d'adreces reals i virtuals"
 
 #. Number of allocated broadcast buffers
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:146
-msgid "openvpn_param_bcast_buffers"
+msgid "Number of allocated broadcast buffers"
 msgstr "Número de memòries intermitges de broadcast assignades"
 
 #. Maximum number of queued TCP output packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:147
-msgid "openvpn_param_tcp_queue_limit"
+msgid "Maximum number of queued TCP output packets"
 msgstr "Número màxim de paquets TCP encuats a la sortida"
 
 #. Script to validate client virtual addresses
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:148
-msgid "openvpn_param_learn_address"
+msgid "Script to validate client virtual addresses"
 msgstr "Script per validar les adreces virtuals de client"
 
 #. Allowed maximum of new connections
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:149
-msgid "openvpn_param_connect_freq"
+msgid "Allowed maximum of new connections"
 msgstr "Màxim de noves connexions permesès"
 
 #. Allowed maximum of connected clients
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:150
-msgid "openvpn_param_max_clients"
+msgid "Allowed maximum of connected clients"
 msgstr "Màxim de clients connectats pemès"
 
 #. Allowed maximum of internal
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:151
-msgid "openvpn_param_max_routes_per_client"
+msgid "Allowed maximum of internal"
 msgstr "Màxim permès d'interns"
 
 #. Proxy incoming HTTPS sessions
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:152
-msgid "openvpn_param_port_share"
+msgid "Proxy incoming HTTPS sessions"
 msgstr "Sessions entrants HTTPS de proxy"
 
 #. Configure client mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:153
-msgid "openvpn_param_client"
+msgid "Configure client mode"
 msgstr "Configura el mode client"
 
 #. Authenticate using username/password
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:154
-msgid "openvpn_param_auth_user_pass"
+msgid "Authenticate using username/password"
 msgstr "Autentica utilitzant nom d'usuari/contrasenya"
 
 #. Accept options pushed from server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:155
-msgid "openvpn_param_pull"
+msgid "Accept options pushed from server"
 msgstr "Accepta opcions rebudes del servidor"
 
 #. Handling of authentication failures
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:156
-msgid "openvpn_param_auth_retry"
+msgid "Handling of authentication failures"
 msgstr "Gestió de fallades d'autenticació"
 
 #. Send notification to peer on disconnect
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:157
-msgid "openvpn_param_explicit_exit_notify"
+msgid "Send notification to peer on disconnect"
 msgstr "Envia notificació al peer en desconnectar-se"
 
 #. Enable Static Key encryption mode (non-TLS)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:158
-msgid "openvpn_param_secret"
+msgid "Enable Static Key encryption mode (non-TLS)"
 msgstr "Activa el mode d'encriptació de Clau Estàtica (no-TLS)"
 
 #. HMAC authentication for packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:159
-msgid "openvpn_param_auth"
+msgid "HMAC authentication for packets"
 msgstr "Autenticació HMAC per paquets"
 
 #. Encryption cipher for packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:160
-msgid "openvpn_param_cipher"
+msgid "Encryption cipher for packets"
 msgstr "Xifra d'encriptació per paquets"
 
 #. Size of cipher key
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:161
-msgid "openvpn_param_keysize"
+msgid "Size of cipher key"
 msgstr "Mida de la clau de xifratge"
 
 #. Enable OpenSSL hardware crypto engines
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:162
-msgid "openvpn_param_engine"
+msgid "Enable OpenSSL hardware crypto engines"
 msgstr "Activa motor criptogràfic OpenSSL de maquinari"
 
 #. Disable replay protection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:163
-msgid "openvpn_param_no_replay"
+msgid "Disable replay protection"
 msgstr "Desactiva la protecció de reproducció"
 
 #. Silence the output of replay warnings
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:164
-msgid "openvpn_param_mute_replay_warnings"
+msgid "Silence the output of replay warnings"
 msgstr "Silencia la sortida d'alertes de reproducció"
 
 #. Replay protection sliding window size
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:165
-msgid "openvpn_param_replay_window"
+msgid "Replay protection sliding window size"
 msgstr "Mida de la finestra lliscant de protecció de reproducció"
 
 #. Disable cipher initialisation vector
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:166
-msgid "openvpn_param_no_iv"
+msgid "Disable cipher initialisation vector"
 msgstr "Desactiva xifratge de vector d'inicialització"
 
 #. Persist replay-protection state
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:167
-msgid "openvpn_param_replay_persist"
+msgid "Persist replay-protection state"
 msgstr "Persisteix l'estat de protecció de reproducció"
 
 #. Run a self-test of crypto features
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:168
-msgid "openvpn_param_test_crypto"
+msgid "Run a self-test of crypto features"
 msgstr "Executa un test propi de característiques criptogràfiques"
 
 #. Enable TLS and assume server role
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:169
-msgid "openvpn_param_tls_server"
+msgid "Enable TLS and assume server role"
 msgstr "Activa el TLS i assumeix el rol de servidor"
 
 #. Enable TLS and assume client role
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:170
-msgid "openvpn_param_tls_client"
+msgid "Enable TLS and assume client role"
 msgstr "Activa el TLS i assumeix el rol de client"
 
 #. Data channel key exchange method
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:171
-msgid "openvpn_param_key_method"
+msgid "Data channel key exchange method"
 msgstr "Mètode d'intercanvi de clau de canal de dades"
 
 #. Certificate authority
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:172
-msgid "openvpn_param_ca"
+msgid "Certificate authority"
 msgstr "Autoritat de certificat"
 
 #. Directory of trusted certificates (CAs and CRLs)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:173
-msgid "openvpn_param_capath"
+msgid "Directory of trusted certificates (CAs and CRLs)"
 msgstr "Directori de certificats de confiança (CAs i CRLs)"
 
 #. Diffie Hellman parameters
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:174
-msgid "openvpn_param_dh"
+msgid "Diffie Hellman parameters"
 msgstr "Paràmetres Diffie-Hellman"
 
 #. Local certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:175
-msgid "openvpn_param_cert"
+msgid "Local certificate"
 msgstr "Certificat local"
 
 #. Local private key
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:176
-msgid "openvpn_param_key"
+msgid "Local private key"
 msgstr "Clau privada local"
 
 #. PKCS#12 file containing keys
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:177
-msgid "openvpn_param_pkcs12"
+msgid "PKCS#12 file containing keys"
 msgstr "Fitxer PKCS#12 contenidor de claus"
 
 #. TLS cipher
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:178
-msgid "openvpn_param_tls_cipher"
+msgid "TLS cipher"
 msgstr "Xifrador TLS"
 
 #. Retransmit timeout on TLS control channel
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:179
-msgid "openvpn_param_tls_timeout"
+msgid "Retransmit timeout on TLS control channel"
 msgstr "Temps d'espera de retransmissió en canal de control TLS"
 
 #. Renegotiate data chan. key after bytes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:180
-msgid "openvpn_param_reneg_bytes"
+msgid "Renegotiate data chan. key after bytes"
 msgstr "Renegocia clau de canal de dades després de bytes"
 
 #. Renegotiate data chan. key after packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:181
-msgid "openvpn_param_reneg_pkts"
+msgid "Renegotiate data chan. key after packets"
 msgstr "Renegocia clau de canal de dades després de paquets"
 
 #. Renegotiate data chan. key after seconds
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:182
-msgid "openvpn_param_reneg_sec"
+msgid "Renegotiate data chan. key after seconds"
 msgstr "Renegocia clau de canal de dades després de segons"
 
 #. Timeframe for key exchange
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:183
-msgid "openvpn_param_hand_window"
+msgid "Timeframe for key exchange"
 msgstr "Calendari per intercanvi de claus"
 
 #. Key transition window
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:184
-msgid "openvpn_param_tran_window"
+msgid "Key transition window"
 msgstr "Finestra de transició de clau"
 
 #. Allow only one session
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:185
-msgid "openvpn_param_single_session"
+msgid "Allow only one session"
 msgstr "Permet només una sessió"
 
 #. Exit on TLS negotiation failure
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:186
-msgid "openvpn_param_tls_exit"
+msgid "Exit on TLS negotiation failure"
 msgstr "Surt en fallar la negociació TLS"
 
 #. Additional authentication over TLS
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:187
-msgid "openvpn_param_tls_auth"
+msgid "Additional authentication over TLS"
 msgstr "Autenticació addicional sobre TLS"
 
 #. Get PEM password from controlling tty before we daemonize
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:188
-msgid "openvpn_param_askpass"
+msgid "Get PEM password from controlling tty before we daemonize"
 msgstr "Aconsegueix contrasenya PEM de controlar tty abans de dimonitzar"
 
 #. Don't cache --askpass or --auth-user-pass passwords
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:189
-msgid "openvpn_param_auth_nocache"
+msgid "Don't cache --askpass or --auth-user-pass passwords"
 msgstr "No desis a la memòria cau contrasenyes --askpass o --auth-user-pass"
 
 #. Check peer certificate against a CRL
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:190
-msgid "openvpn_param_crl_verify"
+msgid "Check peer certificate against a CRL"
 msgstr "Comprova el certificat de peer contra un CRL"
 
 #. Shell command to verify X509 name
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:191
-msgid "openvpn_param_tls_verify"
+msgid "Shell command to verify X509 name"
 msgstr "Ordre de comanda per verificar el nom X509"
 
 #. Only accept connections from given X509 name
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:192
-msgid "openvpn_param_tls_remote"
+msgid "Only accept connections from given X509 name"
 msgstr "Accepta connexions només d'un cert nom X509"
 
 #. Require explicit designation on certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:193
-msgid "openvpn_param_ns_cert_type"
+msgid "Require explicit designation on certificate"
 msgstr "Requereix una designació explícita al certificat"
 
 #. Require explicit key usage on certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:194
-msgid "openvpn_param_remote_cert_ku"
+msgid "Require explicit key usage on certificate"
 msgstr "Requereix ús de clau explícit al certificat"
 
 #. Require extended explicit key usage on certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:195
-msgid "openvpn_param_remote_cert_eku"
+msgid "Require extended explicit key usage on certificate"
 msgstr "Requereix ús de clau explícita extesa al certificat"
 
 #. Require normal and extended key usage on certificate
diff --git a/po/ca/p910nd.po b/po/ca/p910nd.po
index 5fc070476..9f25c1159 100644
--- a/po/ca/p910nd.po
+++ b/po/ca/p910nd.po
@@ -15,19 +15,19 @@ msgstr ""
 
 #. p910nd - Printer server
 #: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:1
-msgid "p910nd"
+msgid "p910nd - Printer server"
 msgstr "p910nd - Servidor d'impressió"
 
 #. First you have to install the packages to get support for USB (kmod-usb-printer) or parallel port (kmod-lp).
 #: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:2
-msgid "p910nd_desc"
+msgid "First you have to install the packages to get support for USB (kmod-usb-printer) or parallel port (kmod-lp)."
 msgstr ""
 "Primer has d'instal·lar els paquets de suport USB (kmod-usb-printer) o de "
 "port paral·lel (kmod-lp)"
 
 #. Bidirectional mode
 #: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:3
-msgid "bidirectional"
+msgid "Bidirectional mode"
 msgstr "Mode bidireccional"
 
 #. p910nd listens on port 910+N. E.g. 9100 for the first printer.
diff --git a/po/ca/polipo.po b/po/ca/polipo.po
index 3b8d6e47a..832032b0e 100644
--- a/po/ca/polipo.po
+++ b/po/ca/polipo.po
@@ -15,27 +15,27 @@ msgstr ""
 
 #. Polipo
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:1
-msgid "polipo"
+msgid "Polipo"
 msgstr "Polipo"
 
 #. On-Disk Cache
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:2
-msgid "polipo_cache"
+msgid "On-Disk Cache"
 msgstr "Memòria cau en disc"
 
 #. Shared cache
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:3
-msgid "polipo_cache_cacheisshared"
+msgid "Shared cache"
 msgstr "Memòria cau compartida"
 
 #. Enable if cache (proxy) is shared by multiple users.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:4
-msgid "polipo_cache_cacheisshared_desc"
+msgid "Enable if cache (proxy) is shared by multiple users."
 msgstr "Activa si la memòria cau (proxy) és compartida per múltiples usuaris."
 
 #. To enable polipo on-disk cache cleaning (highly recommended), you should add a cron job in Scheduled Tasks services that will execute /usr/sbin/polipo_purge script. For example to perform disk cache cleanup every day at 6:00 in the morning you should add the following line in Scheduled Tasks &quot;0 6 * * *	/usr/sbin/polipo_purge&quot; (without quotes).
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:5
-msgid "polipo_cache_desc"
+msgid "To enable polipo on-disk cache cleaning (highly recommended), you should add a cron job in Scheduled Tasks services that will execute /usr/sbin/polipo_purge script. For example to perform disk cache cleanup every day at 6:00 in the morning you should add the following line in Scheduled Tasks \"0 6 * * *\\t/usr/sbin/polipo_purge\" (without quotes)."
 msgstr ""
 "Per activar la neteja memòria cau en disc de polipo (altament recomenat), "
 "hauries d'afegir una tasca de cron al servei de Tasques Programades que "
@@ -46,12 +46,12 @@ msgstr ""
 
 #. Disk cache location
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:6
-msgid "polipo_cache_diskcacheroot"
+msgid "Disk cache location"
 msgstr "Localització de la memòria cau del disc"
 
 #. Location where polipo will cache files permanently. Use of external storage devices is recommended, because the cache can grow considerably. Leave it empty to disable on-disk cache.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:7
-msgid "polipo_cache_diskcacheroot_desc"
+msgid "Location where polipo will cache files permanently. Use of external storage devices is recommended, because the cache can grow considerably. Leave it empty to disable on-disk cache."
 msgstr ""
 "Localització on polipo desarà els fitxers de memòria cau permanentment. Es "
 "recomana l'ús de dispositius d'emmagatzematge extern, perquè la memòria cau "
@@ -60,58 +60,58 @@ msgstr ""
 
 #. Truncate cache files size (in bytes)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:8
-msgid "polipo_cache_diskcachetruncatesize"
+msgid "Truncate cache files size (in bytes)"
 msgstr "Mida de truncatge de fitxer de memòria cau (en bytes)"
 
 #. Size to which cached files should be truncated. (default value: 1048576)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:9
-msgid "polipo_cache_diskcachetruncatesize_desc"
+msgid "Size to which cached files should be truncated. (default value: 1048576)"
 msgstr ""
 "Mida a la qual els fitxers de memòria cau s'haurien de truncar (valor per "
 "defecte: 1048576)"
 
 #. Truncate cache files time
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:10
-msgid "polipo_cache_diskcachetruncatetime"
+msgid "Truncate cache files time"
 msgstr "Hora de truncatge de fitxers de memòria cau"
 
 #. Time after which cached files will be truncated. (default value: 4d12h)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:11
-msgid "polipo_cache_diskcachetruncatetime_desc"
+msgid "Time after which cached files will be truncated. (default value: 4d12h)"
 msgstr ""
 "Hora després de la qual els fitxers de memòria cau es truncaran (valor per "
 "defecte: 4d12h)."
 
 #. Delete cache files time
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:12
-msgid "polipo_cache_diskcacheunlinktime"
+msgid "Delete cache files time"
 msgstr "Hora d'esborrat de fitxers de memòria cau"
 
 #. Time after which cached files will be deleted. (default value: 32d)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:13
-msgid "polipo_cache_diskcacheunlinktime_desc"
+msgid "Time after which cached files will be deleted. (default value: 32d)"
 msgstr ""
 "Hora després de la qual els fitxers de memòria s'esborraran (valor per "
 "defecte: 32d)."
 
 #. Polipo is a small and fast caching web proxy.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:14
-msgid "polipo_desc"
+msgid "Polipo is a small and fast caching web proxy."
 msgstr "Polipo és un proxy caché web petit i ràpid."
 
 #. General
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:15
-msgid "polipo_general"
+msgid "General"
 msgstr "General"
 
 #. Allowed clients
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:16
-msgid "polipo_general_allowedclients"
+msgid "Allowed clients"
 msgstr "Clients permesos"
 
 #. When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients that are allowed to connect. The format is IP address or network address (192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6)).
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:17
-msgid "polipo_general_allowedclients_desc"
+msgid "When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients that are allowed to connect. The format is IP address or network address (192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))."
 msgstr ""
 "Quan l'adreça d'escolta s'estableix a 0.0.0.0 o :: (IPv6), has de llistar "
 "els clients que es permeten per connectar. El format és adreça IP o adreça "
@@ -119,46 +119,46 @@ msgstr ""
 
 #. In RAM cache size (in bytes)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:18
-msgid "polipo_general_chunkhighmark"
+msgid "In RAM cache size (in bytes)"
 msgstr "Mida de memòria cau a la RAM (en bytes)"
 
 #. How much RAM should Polipo use for its cache.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:19
-msgid "polipo_general_chunkhighmark_desc"
+msgid "How much RAM should Polipo use for its cache."
 msgstr "Quanta RAM hauria de fer servir Polipo per la seva memòria cau"
 
 #. DNS server address
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:20
-msgid "polipo_general_dnsnameserver"
+msgid "DNS server address"
 msgstr "Adreça de servidor DNS"
 
 #. Set the DNS server address to use, if you want Polipo to use different DNS server than the host system.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:21
-msgid "polipo_general_dnsnameserver_desc"
+msgid "Set the DNS server address to use, if you want Polipo to use different DNS server than the host system."
 msgstr ""
 "Estableix l'adreça de servidor DNS a utilitzar, si vols que Polipo faci "
 "servir un servidor DNS diferent al del sistema."
 
 #. Query DNS for IPv6
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:22
-msgid "polipo_general_dnsqueryipv6"
+msgid "Query DNS for IPv6"
 msgstr "Consulta DNS per IPv6"
 
 #. false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = Query both, prefer IPv6; true = Query only IPv6
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:23
-msgid "polipo_general_dnsqueryipv6_desc"
+msgid "false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = Query both, prefer IPv6; true = Query only IPv6"
 msgstr ""
 "fals = No consultis IPv6; a contracor = Consulta els dos, prefereix IPv4; "
 "feliçment = Consulta els dos, prefereix IPv6; cert = Consulta només IPv6"
 
 #. Query DNS by hostname
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:24
-msgid "polipo_general_dnsusegethostbyname"
+msgid "Query DNS by hostname"
 msgstr "Consulta DNS per nom de màquina"
 
 #. false = Never use system DNS resolver; reluctantly = Query DNS directly, if DNS server is unavailable fail to system DNS resolver; happily = Query DNS directly, if host could not be found fallback to system DNS resolver; true = Always use system DNS resolver
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:25
-msgid "polipo_general_dnsusegethostbyname_desc"
+msgid "false = Never use system DNS resolver; reluctantly = Query DNS directly, if DNS server is unavailable fail to system DNS resolver; happily = Query DNS directly, if host could not be found fallback to system DNS resolver; true = Always use system DNS resolver"
 msgstr ""
 "fals = mai utilitzis resoledor DNS; a contracor = Consulta DNS directament, "
 "si el servidor DNS està indisponible no utilitzis el sistema resoledor de "
@@ -168,80 +168,80 @@ msgstr ""
 
 #. Syslog facility
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:26
-msgid "polipo_general_logfacility"
+msgid "Syslog facility"
 msgstr "Instal·lació syslog"
 
 #. Log file location
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:27
-msgid "polipo_general_logfile"
+msgid "Log file location"
 msgstr "Localització de fitxer registre"
 
 #. Use of external storage device is recommended, because the log file is written frequently and can grow considerably.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:28
-msgid "polipo_general_logfile_desc"
+msgid "Use of external storage device is recommended, because the log file is written frequently and can grow considerably."
 msgstr ""
 "Es recomana l'ǘs de dispositius d'emmagatzematge externs, ja que el fitxer "
 "de registre és escrit freqüentment i pot créixer considerablement."
 
 #. Log to syslog
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:29
-msgid "polipo_general_logsyslog"
+msgid "Log to syslog"
 msgstr "Registra al syslog"
 
 #. Parent proxy authentication
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:30
-msgid "polipo_general_parentauthcredentials"
+msgid "Parent proxy authentication"
 msgstr "Autenticació de proxy pare"
 
 #. Basic HTTP authentication supported. Provide username and password in username:password format.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:31
-msgid "polipo_general_parentauthcredentials_desc"
+msgid "Basic HTTP authentication supported. Provide username and password in username:password format."
 msgstr ""
 "Se suporta autenticació HTTP bàsica. Entra el nom d'usuari i contrasenya en "
 "format usuari:contrasenya."
 
 #. Parent proxy address
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:32
-msgid "polipo_general_parentproxy"
+msgid "Parent proxy address"
 msgstr "Adreça de proxy pare"
 
 #. Parent proxy address (in host:port format), to which Polipo will forward the requests.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:33
-msgid "polipo_general_parentproxy_desc"
+msgid "Parent proxy address (in host:port format), to which Polipo will forward the requests."
 msgstr ""
 "Adreça de proxy pare (en format host:port), al que Polipo readreçarà les "
 "sol·licituds."
 
 #. Listen address
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:34
-msgid "polipo_general_proxyaddress"
+msgid "Listen address"
 msgstr "Adreça que rep connexions"
 
 #. The interface on which Polipo will listen. To listen on all interfaces use 0.0.0.0 or :: (IPv6).
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:35
-msgid "polipo_general_proxyaddress_desc"
+msgid "The interface on which Polipo will listen. To listen on all interfaces use 0.0.0.0 or :: (IPv6)."
 msgstr ""
 "La interfície a la que Polipo rebrà les connexions. Per rebre-les a a totes "
 "les interfícies, utilitza 0.0.0.0 o :: (IPv6)."
 
 #. Listen port
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:36
-msgid "polipo_general_proxyport"
+msgid "Listen port"
 msgstr "Port que rep connexions"
 
 #. Port on which Polipo will listen. (default value: 8123)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:37
-msgid "polipo_general_proxyport_desc"
+msgid "Port on which Polipo will listen. (default value: 8123)"
 msgstr "Port al que Polipo rebrà les connexions (valor per defecte: 8123)."
 
 #. Poor Man&#39;s Multiplexing
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:38
-msgid "polipo_pmm"
+msgid "Poor Man's Multiplexing"
 msgstr "Multiplexació Poor Man's"
 
 #. Poor Man&#39;s Multiplexing (PMM) is a technique that simulates multiplexing by requesting an instance in multiple segments. It tries to lower the latency caused by the weakness of HTTP protocol. NOTE: some sites may not work with PMM enabled.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:39
-msgid "polipo_pmm_desc"
+msgid "Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by requesting an instance in multiple segments. It tries to lower the latency caused by the weakness of HTTP protocol. NOTE: some sites may not work with PMM enabled."
 msgstr ""
 "Multiplexació Poor Man's (PMM) és una tècnica que multiplexa sol·licitant "
 "una instància en segments múltiples. Intenta reduir la latència causada per "
@@ -250,19 +250,19 @@ msgstr ""
 
 #. First PMM segment size (in bytes)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:40
-msgid "polipo_pmm_pmmfirstsize"
+msgid "First PMM segment size (in bytes)"
 msgstr "Mida de segment del primer PMM (en bytes)"
 
 #. Size of the first PMM segment. If not defined, it defaults to twice the PMM segment size.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:41
-msgid "polipo_pmm_pmmfirstsize_desc"
+msgid "Size of the first PMM segment. If not defined, it defaults to twice the PMM segment size."
 msgstr ""
 "Mida del primer segment PMM. Si no es defineix, per defecte és el doble de "
 "la mida de segment MMS."
 
 #. PMM segments size (in bytes)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:42
-msgid "polipo_pmm_pmmsize"
+msgid "PMM segments size (in bytes)"
 msgstr "Mida de segments MMS (en bytes)"
 
 #. To enable PMM, PMM segment size must be set to some positive value.
diff --git a/po/ca/qos.po b/po/ca/qos.po
index 9e923b1e0..765a2ce1e 100644
--- a/po/ca/qos.po
+++ b/po/ca/qos.po
@@ -15,93 +15,93 @@ msgstr ""
 
 #. Quality of Service
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:1
-msgid "qos"
+msgid "Quality of Service"
 msgstr "Qualitat de Servei"
 
 #. With QoS you can priorize network traffic selected by adresses, ports or services.
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:2
-msgid "qos_desc"
+msgid "With QoS you can priorize network traffic selected by adresses, ports or services."
 msgstr ""
 "Amb QoS pots prioritzar el tràfic de xarxa seleccionat per adreces, ports o "
 "serveis."
 
 #. Classification
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:3
-msgid "qos_interface_classgroup"
+msgid "Classification"
 msgstr "Classificació"
 
 #. Calculate Overhead
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:4
-msgid "qos_interface_overhead"
+msgid "Calculate Overhead"
 msgstr "Calcula càrrega (overhead)"
 
 #. Half-Duplex
-msgid "qos_interface_halfduplex"
+msgid "Half-Duplex"
 msgstr "Half-duplex"
 
 #. Downlink
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:5
-msgid "qos_interface_download"
+msgid "Downlink"
 msgstr "Enllaç de baixada"
 
 #. Uplink
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:6
-msgid "qos_interface_upload"
+msgid "Uplink"
 msgstr "Enllaç de pujada"
 
 #. Prioritization
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:7
-msgid "qos_classify"
+msgid "Prioritization"
 msgstr "Priorització"
 
 #. Priority
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:8
-msgid "qos_classify_target"
+msgid "Priority"
 msgstr "Prioritat"
 
 #. Source address
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:9
-msgid "qos_classify_srchost"
+msgid "Source address"
 msgstr "Adreça origen"
 
 #. source network / source host
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:10
-msgid "qos_classify_srchost_dest"
+msgid "source network / source host"
 msgstr "xarxa d'origen / màquina d'origen"
 
 #. Target address
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:11
-msgid "qos_classify_dsthost"
+msgid "Target address"
 msgstr "Adreça destí"
 
 #. target network / target host
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:12
-msgid "qos_classify_dsthost_dest"
+msgid "target network / target host"
 msgstr "xarxa de destí / màquina de destí"
 
 #. portrange
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:13
-msgid "qos_classify_portrange"
+msgid "portrange"
 msgstr "rang de ports"
 
 #. low
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:14
-msgid "qos_bulk"
+msgid "low"
 msgstr "baix"
 
 #. normal
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:15
-msgid "qos_normal"
+msgid "normal"
 msgstr "normal"
 
 #. express
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:16
-msgid "qos_express"
+msgid "express"
 msgstr "exprés"
 
 #. priority
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:17
-msgid "qos_priority"
+msgid "priority"
 msgstr "prioritat"
 
 #. Bytes sent
diff --git a/po/ca/rrdtool.po b/po/ca/rrdtool.po
index d4b6d79fa..b1afffc16 100644
--- a/po/ca/rrdtool.po
+++ b/po/ca/rrdtool.po
@@ -15,342 +15,342 @@ msgstr ""
 
 #. %H: Wireless - Signal Noise Ratio
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:1
-msgid "stat_dg_title_wireless__signal_noise"
+msgid "%H: Wireless - Signal Noise Ratio"
 msgstr "%H: Wireless - Relació Senyal Soroll"
 
 #. dBm
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:2
-msgid "stat_dg_label_wireless__signal_noise"
+msgid "dBm"
 msgstr "dBm"
 
 #. Noise Level
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:3
-msgid "stat_ds_signal_noise"
+msgid "Noise Level"
 msgstr "Nivell de soroll"
 
 #. Signal Strength
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:4
-msgid "stat_ds_signal_power"
+msgid "Signal Strength"
 msgstr "Potència de senyal"
 
 #. %H: Wireless - Signal Quality
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:5
-msgid "stat_dg_title_wireless__signal_quality"
+msgid "%H: Wireless - Signal Quality"
 msgstr "%H: Wireless - Qualitat de senyal"
 
 #. n
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:6
-msgid "stat_dg_label_wireless__signal_quality"
+msgid "n"
 msgstr "n"
 
 #. Signal Quality
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:7
-msgid "stat_ds_signal_quality"
+msgid "Signal Quality"
 msgstr "Qualitat de senyal"
 
 #. %H: ICMP Roundtrip Times
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:8
-msgid "stat_dg_title_ping"
+msgid "%H: ICMP Roundtrip Times"
 msgstr "%H: Temps ICMP d'anada i tornada"
 
 #. ms
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:9
-msgid "stat_dg_label_ping"
+msgid "ms"
 msgstr "ms"
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:10
-msgid "stat_ds_ping"
+msgid "%di"
 msgstr "%di"
 
 #. %H: Firewall - Processed Packets
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:11
-msgid "stat_dg_title_iptables__ipt_packets"
+msgid "%H: Firewall - Processed Packets"
 msgstr "%H: Tallafocs - Paquets processats"
 
 #. Packets/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:12
-msgid "stat_dg_label_iptables__ipt_packets"
+msgid "Packets/s"
 msgstr "Paquets/s"
 
 #. Chain \"%di\"
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:13
-msgid "stat_ds_ipt_packets"
+msgid "Chain \"%di\""
 msgstr "Cadena \"%di\""
 
 #. %H: Netlink - Transfer on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:14
-msgid "stat_dg_title_netlink__if_octets"
+msgid "%H: Netlink - Transfer on %pi"
 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"
+msgid "Bytes/s"
 msgstr "Bytes/s"
 
 #. Bytes (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:16
-msgid "stat_ds_if_octets"
+msgid "Bytes (%ds)"
 msgstr "Bytes (%ds)"
 
 #. %H: Netlink - Packets on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:17
-msgid "stat_dg_title_netlink__if_packets"
+msgid "%H: Netlink - Packets on %pi"
 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"
+msgid "Packets/s"
 msgstr "Paquets/s"
 
 #. Processed (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:19
-msgid "stat_ds_if_packets"
+msgid "Processed (%ds)"
 msgstr "Processats (%ds)"
 
 #. Dropped   (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:20
-msgid "stat_ds_if_dropped"
+msgid "Dropped (%ds)"
 msgstr "Descartats   (%ds)"
 
 #. Errors    (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:21
-msgid "stat_ds_if_errors"
+msgid "Errors (%ds)"
 msgstr "Errors    (%ds)"
 
 #. %H: Netlink - Multicast on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:22
-msgid "stat_dg_title_netlink__if_multicast"
+msgid "%H: Netlink - Multicast on %pi"
 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"
+msgid "Packets/s"
 msgstr "Paquets/s"
 
 #. Packets
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:24
-msgid "stat_ds_if_multicast"
+msgid "Packets"
 msgstr "Paquets"
 
 #. %H: Netlink - Collisions on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:25
-msgid "stat_dg_title_netlink__if_collisions"
+msgid "%H: Netlink - Collisions on %pi"
 msgstr "%H: Enllaç de xarxa - Col·lisions en %pi"
 
 #. Collisions/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:26
-msgid "stat_dg_label_netlink__if_collisions"
+msgid "Collisions/s"
 msgstr "Col·lisions/s"
 
 #. Collisions
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:27
-msgid "stat_ds_if_collisions"
+msgid "Collisions"
 msgstr "Col·lisions"
 
 #. %H: Netlink - Errors on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:28
-msgid "stat_dg_title_netlink__if_tx_errors"
+msgid "%H: Netlink - Errors on %pi"
 msgstr "%H: Enllaç de xarxa - Errors on %pi"
 
 #. Errors/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:29
-msgid "stat_dg_label_netlink__if_tx_errors"
+msgid "Errors/s"
 msgstr "Errors/s"
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:30
-msgid "stat_ds_if_tx_errors"
+msgid "%di"
 msgstr "%di"
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:31
-msgid "stat_ds_if_rx_errors"
+msgid "%di"
 msgstr "%di"
 
 #. %H: Processes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:32
-msgid "stat_dg_title_processes"
+msgid "%H: Processes"
 msgstr "%H: Processos"
 
 #. Processes/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:33
-msgid "stat_dg_label_processes"
+msgid "Processes/s"
 msgstr "Processos/s"
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:34
-msgid "stat_ds_ps_state"
+msgid "%di"
 msgstr "%di"
 
 #. %H: Process %pi - used cpu time
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:35
-msgid "stat_dg_title_processes__ps_cputime"
+msgid "%H: Process %pi - used cpu time"
 msgstr "%H: Procés %pi - temps de cpu usat"
 
 #. Jiffies
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:36
-msgid "stat_dg_label_processes__ps_cputime"
+msgid "Jiffies"
 msgstr "Jiffies"
 
 #. system
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:37
-msgid "stat_ds_ps_cputime__syst"
+msgid "System"
 msgstr "sistema"
 
 #. user
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:38
-msgid "stat_ds_ps_cputime__user"
+msgid "user"
 msgstr "usuari"
 
 #. %H: Process %pi - threads and processes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:39
-msgid "stat_dg_title_processes__ps_count"
+msgid "%H: Process %pi - threads and processes"
 msgstr "%H: Procés %pi - threads i processos"
 
 #. Count
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:40
-msgid "stat_dg_label_processes__ps_count"
+msgid "Count"
 msgstr "Compte"
 
 #. %ds
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:41
-msgid "stat_ds_ps_count"
+msgid "%ds"
 msgstr "%ds"
 
 #. %H: Process %pi - page faults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:42
-msgid "stat_dg_title_processes__ps_pagefaults"
+msgid "%H: Process %pi - page faults"
 msgstr "%H: Procés %pi - errors de pàgina"
 
 #. Pagefaults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:43
-msgid "stat_dg_label_processes__ps_pagefaults"
+msgid "Pagefaults"
 msgstr "Errors de pàgina"
 
 #. page faults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:44
-msgid "stat_ds_ps_pagefaults"
+msgid "page faults"
 msgstr "errors de pàgina"
 
 #. %H: Process %pi - virtual memory size
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:45
-msgid "stat_dg_title_processes__ps_rss"
+msgid "%H: Process %pi - virtual memory size"
 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"
+msgid "Bytes"
 msgstr "Bytes"
 
 #. virtual memory
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:47
-msgid "stat_ds_ps_rss"
+msgid "virtual memory"
 msgstr "memòria virtual"
 
 #. %H: Usage on Processor #%pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:48
-msgid "stat_dg_title_cpu"
+msgid "%H: Usage on Processor #%pi"
 msgstr "%H: Ús al Processador #%pi"
 
 #. %
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:49
-msgid "stat_dg_label_cpu"
+msgid "%"
 msgstr "%"
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:50
-msgid "stat_ds_cpu"
+msgid "%di"
 msgstr "%di"
 
 #. %H: Transfer on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:51
-msgid "stat_dg_title_interface__if_octets"
+msgid "%H: Transfer on %di"
 msgstr "%H: Transferència a %di"
 
 #. Bytes/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:52
-msgid "stat_dg_label_interface__if_octets"
+msgid "Bytes/s"
 msgstr "Bytes/s"
 
 #. %H: Packets on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:53
-msgid "stat_dg_title_interface__if_packets"
+msgid "%H: Packets on %di"
 msgstr "%H: Paquets a %di"
 
 #. Packets/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:54
-msgid "stat_dg_label_interface__if_packets"
+msgid "Packets/s"
 msgstr "Paquets/s"
 
 #. %H: TCP-Connections to Port %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:55
-msgid "stat_dg_title_tcpconns"
+msgid "%H: TCP-Connections to Port %pi"
 msgstr "%H: Connexions TCP a Port %pi"
 
 #. Connections/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:56
-msgid "stat_dg_label_tcpconns"
+msgid "Connections/s"
 msgstr "Connexions/s"
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:57
-msgid "stat_ds_tcp_connections"
+msgid "%di"
 msgstr "%di"
 
 #. %H: Disk Space Usage on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:58
-msgid "stat_dg_title_df"
+msgid "%H: Disk Space Usage on %di"
 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"
+msgid "Bytes"
 msgstr "Bytes"
 
 #. %ds
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:60
-msgid "stat_ds_df__free"
+msgid "%ds"
 msgstr "%ds"
 
 #. %ds
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:61
-msgid "stat_ds_df__used"
+msgid "%ds"
 msgstr "%ds"
 
 #. %H: Interrupts
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:62
-msgid "stat_dg_title_irq"
+msgid "%H: Interrupts"
 msgstr "%H: Interrupcions"
 
 #. Issues/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:63
-msgid "stat_dg_label_irq"
+msgid "Issues/s"
 msgstr "Temes/s"
 
 #. IRQ %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:64
-msgid "stat_ds_irq"
+msgid "IRQ %di"
 msgstr "IRQ %di"
 
 #. %H: System Load
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:65
-msgid "stat_dg_title_load"
+msgid "%H: System Load"
 msgstr "%H: Càrrega de Sistema"
 
 #. Load
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:66
-msgid "stat_dg_label_load"
+msgid "Load"
 msgstr "Càrrega"
 
 #. 1 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:67
-msgid "stat_ds_load__shortterm"
+msgid "1 min"
 msgstr "1 min"
 
 #. 5 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:68
-msgid "stat_ds_load__midterm"
+msgid "5 min"
 msgstr "5 min"
 
 #. 15 min
diff --git a/po/ca/samba.po b/po/ca/samba.po
index f1f6edb40..8bfffeec1 100644
--- a/po/ca/samba.po
+++ b/po/ca/samba.po
@@ -15,84 +15,84 @@ msgstr ""
 
 #. Network Shares
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:1
-msgid "samba"
+msgid "Network Shares"
 msgstr "Comparticions de xarxa"
 
 #. Hostname
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:2
-msgid "samba_samba_name"
+msgid "Hostname"
 msgstr "Nom de màquina"
 
 #. Description
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:3
-msgid "samba_samba_description"
+msgid "Description"
 msgstr "Descripció"
 
 #. Workgroup
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:4
-msgid "samba_samba_workgroup"
+msgid "Workgroup"
 msgstr "Grup de treball"
 
 #. Share home-directories
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:5
-msgid "samba_samba_homes"
+msgid "Share home-directories"
 msgstr "Comparteix directoris d'inici"
 
 #. System users can reach their home directories via network shares.
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:6
-msgid "samba_samba_homes_desc"
+msgid "System users can reach their home directories via network shares."
 msgstr ""
 "Els usuaris del sistema poden arribar als directoris d'inici via compartició "
 "de xarxa."
 
 #. Shared Directories
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:7
-msgid "samba_sambashare"
+msgid "Shared Directories"
 msgstr "Directoris compartits"
 
 #. Shared Directory
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:8
-msgid "samba_sambashare_path"
+msgid "Shared Directory"
 msgstr "Directori compartit"
 
 #. Physical Path
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:9
-msgid "samba_sambashare_path_desc"
+msgid "Physical Path"
 msgstr "Ruta física"
 
 #. Allowed Users
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:10
-msgid "samba_sambashare_users"
+msgid "Allowed Users"
 msgstr "Usuaris permesos"
 
 #. optional
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:11
-msgid "samba_sambashare_users_desc"
+msgid "optional"
 msgstr "opcional"
 
 #. Read Only
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:12
-msgid "samba_sambashare_readonly"
+msgid "Read Only"
 msgstr "Només lectura"
 
 #. Allow Guests
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:13
-msgid "samba_sambashare_guestok"
+msgid "Allow Guests"
 msgstr "Permet convidats"
 
 #. Create Mask
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:14
-msgid "samba_sambashare_createmask"
+msgid "Create Mask"
 msgstr "Crea màscara"
 
 #. Mask for new files
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:15
-msgid "samba_sambashare_createmask_desc"
+msgid "Mask for new files"
 msgstr "Màscara per fitxers nous"
 
 #. Directory Mask
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:16
-msgid "samba_sambashare_dirmask"
+msgid "Directory Mask"
 msgstr "Màscara de directori"
 
 #. Mask for new directories
diff --git a/po/ca/statistics.po b/po/ca/statistics.po
index 06ca0e83b..36b8c1ee0 100644
--- a/po/ca/statistics.po
+++ b/po/ca/statistics.po
@@ -15,12 +15,12 @@ msgstr ""
 
 #. Statistics
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:1
-msgid "stat_statistics"
+msgid "Statistics"
 msgstr "Estadístiques"
 
 #. The statistics package is based on <a href=\"http://collectd.org/index.shtml\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD Tool</a> to render diagram images from collected data.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:2
-msgid "stat_desc"
+msgid "The statistics package is based on <a href=\"http://collectd.org/index.shtml\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD Tool</a> to render diagram images from collected data."
 msgstr ""
 "El paquet d'estadísitiques està basat en <a "
 "href=\\\"http://collectd.org/index.shtml\\\">Collectd</a> i utilitza l'eina <a "
@@ -29,142 +29,142 @@ msgstr ""
 
 #. System plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:3
-msgid "stat_systemplugins"
+msgid "System plugins"
 msgstr "Connectors de sistema"
 
 #. Network plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:4
-msgid "stat_networkplugins"
+msgid "Network plugins"
 msgstr "Connectors de xarxa"
 
 #. Output plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:5
-msgid "stat_outputplugins"
+msgid "Output plugins"
 msgstr "Connectors de sortida"
 
 #. Display timespan
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:6
-msgid "stat_showtimespan"
+msgid "Display timespan »"
 msgstr "Mostra l'hora"
 
 #. Graphs
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:7
-msgid "stat_graphs"
+msgid "Graphs"
 msgstr "Gràfics"
 
 #. Collectd
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:8
-msgid "stat_collectd"
+msgid "Collectd"
 msgstr "Collectd"
 
 #. Processor
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:9
-msgid "stat_cpu"
+msgid "Processor"
 msgstr "Processador"
 
 #. Ping
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:10
-msgid "stat_ping"
+msgid "Ping"
 msgstr "Ping"
 
 #. Firewall
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:11
-msgid "stat_iptables"
+msgid "Firewall"
 msgstr "Tallafocs"
 
 #. Netlink
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:12
-msgid "stat_netlink"
+msgid "Netlink"
 msgstr "Enllaç de xarxa"
 
 #. Processes
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:13
-msgid "stat_processes"
+msgid "Processes"
 msgstr "Processos"
 
 #. Wireless
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:14
-msgid "stat_wireless"
+msgid "Wireless"
 msgstr "Wireless"
 
 #. TCP Connections
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:15
-msgid "stat_tcpconns"
+msgid "TCP Connections"
 msgstr "Connexions TCP"
 
 #. Interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:16
-msgid "stat_interface"
+msgid "Interfaces"
 msgstr "Interfícies"
 
 #. Disk Space Usage
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:17
-msgid "stat_df"
+msgid "Disk Space Usage"
 msgstr "Ús d'espai en disc"
 
 #. Interrupts
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:18
-msgid "stat_irq"
+msgid "Interrupts"
 msgstr "Interrupcions"
 
 #. Disk Usage
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:19
-msgid "stat_disk"
+msgid "Disk Usage"
 msgstr "Ús de disc"
 
 #. Exec
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:20
-msgid "stat_exec"
+msgid "Exec"
 msgstr "Exec"
 
 #. RRDTool
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:21
-msgid "stat_rrdtool"
+msgid "RRDTool"
 msgstr "RRDTool"
 
 #. Network
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:22
-msgid "stat_network"
+msgid "Network"
 msgstr "Xarxa"
 
 #. CSV Output
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:23
-msgid "stat_csv"
+msgid "CSV Output"
 msgstr "Sortida CSV"
 
 #. System Load
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:24
-msgid "stat_load"
+msgid "System Load"
 msgstr "Càrrega de sistema"
 
 #. DNS
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:25
-msgid "stat_dns"
+msgid "DNS"
 msgstr "DNS"
 
 #. Email
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:26
-msgid "stat_email"
+msgid "Email"
 msgstr "Adreça electrònica"
 
 #. UnixSock
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:27
-msgid "stat_unixsock"
+msgid "UnixSock"
 msgstr "Sock Unix"
 
 #. Statistics
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:28
-msgid "lucistatistics"
+msgid "Statistics"
 msgstr "Estadístiques"
 
 #. Collectd Settings
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:29
-msgid "lucistatistics_collectd"
+msgid "Collectd Settings"
 msgstr "Configuració Collectd"
 
 #. Collectd is a small daeomon for collecting data from various sources through different plugins. On this page you can change general settings for the collectd daemon.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:30
-msgid "lucistatistics_collectd_desc"
+msgid "Collectd is a small daeomon for collecting data from various sources through different plugins. On this page you can change general settings for the collectd daemon."
 msgstr ""
 "Collectd és un petit dimoni per recollir dades de diverses fonts a través "
 "dels connectors. En aquesta pàgina pots canviar la configuració general pel "
@@ -172,229 +172,229 @@ msgstr ""
 
 #. Hostname
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:31
-msgid "lucistatistics_collectd_hostname"
+msgid "Hostname"
 msgstr "Nom de màquina"
 
 #. Base Directory
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:32
-msgid "lucistatistics_collectd_basedir"
+msgid "Base Directory"
 msgstr "Directori base"
 
 #. Directory for sub-configurations
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:33
-msgid "lucistatistics_collectd_include"
+msgid "Directory for sub-configurations"
 msgstr "Directori per sub-configuracions"
 
 #. Directory for collectd plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:34
-msgid "lucistatistics_collectd_plugindir"
+msgid "Directory for collectd plugins"
 msgstr "Directori pels connectors connectd"
 
 #. Used PID file
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:35
-msgid "lucistatistics_collectd_pidfile"
+msgid "Used PID file"
 msgstr "Fitxer PID usat"
 
 #. Datasets definition file
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:36
-msgid "lucistatistics_collectd_typesdb"
+msgid "Datasets definition file"
 msgstr "Fitxer de definició de dades"
 
 #. Data collection interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:37
-msgid "lucistatistics_collectd_interval"
+msgid "Data collection interval"
 msgstr "Interval de recol·lecció de dades"
 
 #. Seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:38
-msgid "lucistatistics_collectd_interval_desc"
+msgid "Seconds"
 msgstr "Segons"
 
 #. Number of threads for data collection
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:39
-msgid "lucistatistics_collectd_readthreads"
+msgid "Number of threads for data collection"
 msgstr "Número de fils de recol·lecció de dades"
 
 #. Try to lookup fully qualified hostname
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:40
-msgid "lucistatistics_collectd_fqdnlookup"
+msgid "Try to lookup fully qualified hostname"
 msgstr "Intenta resoldre el nom de màquina (fqdn)"
 
 #. CPU Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:41
-msgid "lucistatistics_collectdcpu"
+msgid "CPU Plugin Configuration"
 msgstr "Configuració del connector de CPU"
 
 #. The cpu plugin collects basic statistics about the processor usage.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:42
-msgid "lucistatistics_collectdcpu_desc"
+msgid "The cpu plugin collects basic statistics about the processor usage."
 msgstr ""
 "El connector de cpu recull estadístiques bàsiques sobre l'ús del "
 "processador."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:43
-msgid "lucistatistics_collectdcpu_enable"
+msgid "Enable this plugin"
 msgstr "Activa aquest connector"
 
 #. CSV Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:44
-msgid "lucistatistics_collectdcsv"
+msgid "CSV Plugin Configuration"
 msgstr "Configuració del connector CSV"
 
 #. The csv plugin stores collected data in csv file format for further processing by external programs.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:45
-msgid "lucistatistics_collectdcsv_desc"
+msgid "The csv plugin stores collected data in csv file format for further processing by external programs."
 msgstr ""
 "El connector CSV desa les dades recollides en format CSV per ser processades "
 "posteriorment per programes externs."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:46
-msgid "lucistatistics_collectdcsv_enable"
+msgid "Enable this plugin"
 msgstr "Activa aquest connector"
 
 #. Storage directory for the csv files
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:47
-msgid "lucistatistics_collectdcsv_datadir"
+msgid "Storage directory for the csv files"
 msgstr "Directori d'emmagatzematge dels fitxers CSV"
 
 #. Store data values as rates instead of absolute values
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:48
-msgid "lucistatistics_collectdcsv_storerates"
+msgid "Store data values as rates instead of absolute values"
 msgstr ""
 "Emmagatzema els valors de dades com a relacions en comptes de com a valors "
 "absoluts"
 
 #. DF Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:49
-msgid "lucistatistics_collectddf"
+msgid "DF Plugin Configuration"
 msgstr "Configuració del connector DF"
 
 #. The df plugin collects statistics about the disk space usage on different devices, mount points or filesystem types.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:50
-msgid "lucistatistics_collectddf_desc"
+msgid "The df plugin collects statistics about the disk space usage on different devices, mount points or filesystem types."
 msgstr ""
 "El connector DF recull dades sobre l'ús d'espai en disc de diferents "
 "dispositius, punts de muntatge i tipus de sistema de fitxers."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:51
-msgid "lucistatistics_collectddf_enable"
+msgid "Enable this plugin"
 msgstr "Activa aquest connector"
 
 #. Monitor devices
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:52
-msgid "lucistatistics_collectddf_devices"
+msgid "Monitor devices"
 msgstr "Monitoritza dispositius"
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:53
-msgid "lucistatistics_collectddf_devices_desc"
+msgid "multiple separated by space"
 msgstr "múltiples separats per espais"
 
 #. Monitor mount points
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:54
-msgid "lucistatistics_collectddf_mountpoints"
+msgid "Monitor mount points"
 msgstr "Monitoritza punts de muntatge"
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:55
-msgid "lucistatistics_collectddf_mountpoints_desc"
+msgid "multiple separated by space"
 msgstr "múltiples separats per espais"
 
 #. Monitor filesystem types
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:56
-msgid "lucistatistics_collectddf_fstypes"
+msgid "Monitor filesystem types"
 msgstr "Monitoritza els tipus de sistema de fitxers"
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:57
-msgid "lucistatistics_collectddf_fstypes_desc"
+msgid "multiple separated by space"
 msgstr "múltiples separats per espais"
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:58
-msgid "lucistatistics_collectddf_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr "Monitoritza-ho tot excepte els seleccionats"
 
 #. Disk Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:59
-msgid "lucistatistics_collectddisk"
+msgid "Disk Plugin Configuration"
 msgstr "Configuració del connector de disc"
 
 #. The disk plugin collects detailled usage statistics for selected partitions or whole disks.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:60
-msgid "lucistatistics_collectddisk_desc"
+msgid "The disk plugin collects detailled usage statistics for selected partitions or whole disks."
 msgstr ""
 "El connector de disc recull estadístiques d'ús detallades per les particions "
 "seleccionades o per tot el disc."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:61
-msgid "lucistatistics_collectddisk_enable"
+msgid "Enable this plugin"
 msgstr "Activa aquest connector"
 
 #. Monitor disks and partitions
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:62
-msgid "lucistatistics_collectddisk_disks"
+msgid "Monitor disks and partitions"
 msgstr "Monitoritza els discs i les particions"
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:63
-msgid "lucistatistics_collectddisk_disks_desc"
+msgid "multiple separated by space"
 msgstr "múltiples separats per espais"
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:64
-msgid "lucistatistics_collectddisk_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr "Monitoritza-ho tot excepte els seleccionats"
 
 #. DNS Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:65
-msgid "lucistatistics_collectddns"
+msgid "DNS Plugin Configuration"
 msgstr "Configuració del connector DNS"
 
 #. The dns plugin collects detailled statistics about dns related traffic on selected interfaces.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:66
-msgid "lucistatistics_collectddns_desc"
+msgid "The dns plugin collects detailled statistics about dns related traffic on selected interfaces."
 msgstr ""
 "El connector DNS recull estadístiques detallades sobre el tràfic DNS a les "
 "interfícies seleccionades."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:67
-msgid "lucistatistics_collectddns_enable"
+msgid "Enable this plugin"
 msgstr "Activa aquest connector"
 
 #. Monitor interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:68
-msgid "lucistatistics_collectddns_interfaces"
+msgid "Monitor interfaces"
 msgstr "Monitoritza interfícies"
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:69
-msgid "lucistatistics_collectddns_interfaces_desc"
+msgid "multiple separated by space"
 msgstr "múltiples separades per espais"
 
 #. Ignore source addresses
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:70
-msgid "lucistatistics_collectddns_ignoresources"
+msgid "Ignore source addresses"
 msgstr "Ignora adreces origen"
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:71
-msgid "lucistatistics_collectddns_ignoresources_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr "apreta el Ctrl mentre cliques per seleccionar interfícies múltiples"
 
 #. E-Mail Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:72
-msgid "lucistatistics_collectdemail"
+msgid "E-Mail Plugin Configuration"
 msgstr "Configuració del connector d'adreça electrònica"
 
 #. The email plugin creates a unix socket which can be used to transmit email-statistics to a running collectd daemon. This plugin is primarily intended to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can be used in other ways as well.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:73
-msgid "lucistatistics_collectdemail_desc"
+msgid "The email plugin creates a unix socket which can be used to transmit email-statistics to a running collectd daemon. This plugin is primarily intended to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can be used in other ways as well."
 msgstr ""
 "El connector d'adreça electrònica crea un socket unix que es pot utilitzar "
 "per transmetre estadístiques d'email a un dimoni collectd. Aquest connector "
@@ -403,91 +403,91 @@ msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:74
-msgid "lucistatistics_collectdemail_enable"
+msgid "Enable this plugin"
 msgstr "Activa aquest connector"
 
 #. Filepath of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:75
-msgid "lucistatistics_collectdemail_socketfile"
+msgid "Filepath of the unix socket"
 msgstr "Ruta de fitxers pel socket unix"
 
 #. Group ownership of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:76
-msgid "lucistatistics_collectdemail_socketgroup"
+msgid "Group ownership of the unix socket"
 msgstr "Propietat de grup del socket unix"
 
 #. group name
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:77
-msgid "lucistatistics_collectdemail_socketgroup_desc"
+msgid "group name"
 msgstr "nom de grup"
 
 #. File permissions of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:78
-msgid "lucistatistics_collectdemail_socketperms"
+msgid "File permissions of the unix socket"
 msgstr "Permissos de fitxer del socket unix"
 
 #. octal
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:79
-msgid "lucistatistics_collectdemail_socketperms_desc"
+msgid "octal"
 msgstr "octal"
 
 #. Maximum allowed connections
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:80
-msgid "lucistatistics_collectdemail_maxconns"
+msgid "Maximum allowed connections"
 msgstr "Connexions màximes permeses"
 
 #. Exec Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:81
-msgid "lucistatistics_collectdexec"
+msgid "Exec Plugin Configuration"
 msgstr "Configuració del connector exec"
 
 #. The exec plugin starts external commands to read values from or to notify external processes when certain threshold values have been reached.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:82
-msgid "lucistatistics_collectdexec_desc"
+msgid "The exec plugin starts external commands to read values from or to notify external processes when certain threshold values have been reached."
 msgstr ""
 "El connector exec inicia ordres externes per llegir valors des de o a "
 "processos externs quan s'arriba a certs valors de llindar."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:83
-msgid "lucistatistics_collectdexec_enable"
+msgid "Enable this plugin"
 msgstr "Activa aquest connector"
 
 #. Add command for reading values
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:84
-msgid "lucistatistics_collectdexecinput"
+msgid "Add command for reading values"
 msgstr "Afegeix ordre per llegir valors"
 
 #. Here you can define external commands which will be started by collectd in order to read certain values. The values will be read from stdout.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:85
-msgid "lucistatistics_collectdexecinput_desc"
+msgid "Here you can define external commands which will be started by collectd in order to read certain values. The values will be read from stdout."
 msgstr ""
 "Ací pots definir ordres externes que s'iniciaran pel collectd per llegir "
 "certs valors. Els valors es llegiran des del stdout"
 
 #. Commandline
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:86
-msgid "lucistatistics_collectdexecinput_cmdline"
+msgid "Commandline"
 msgstr "Línia d'ordres"
 
 #. Run as user
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:87
-msgid "lucistatistics_collectdexecinput_cmduser"
+msgid "Run as user"
 msgstr "Executa-ho com a usuari"
 
 #. Run as group
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:88
-msgid "lucistatistics_collectdexecinput_cmdgroup"
+msgid "Run as group"
 msgstr "Executa-ho com a grup"
 
 #. Add notification command
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:89
-msgid "lucistatistics_collectdexecnotify"
+msgid "Add notification command"
 msgstr "Afegeix ordre de notificació"
 
 #. Here you can define external commands which will be started by collectd when certain threshold values have been reached. The values leading to invokation will be feeded to the the called programs stdin.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:90
-msgid "lucistatistics_collectdexecnotify_desc"
+msgid "Here you can define external commands which will be started by collectd when certain threshold values have been reached. The values leading to invokation will be feeded to the the called programs stdin."
 msgstr ""
 "Ací pots definir ordres externes que s'iniciaran pel collectd quan s'aribi a "
 "uns certs valors llindars. Els valors que condueixin a la invocació, "
@@ -495,168 +495,168 @@ msgstr ""
 
 #. Commandline
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:91
-msgid "lucistatistics_collectdexecnotify_cmdline"
+msgid "Commandline"
 msgstr "Línia de comandes"
 
 #. Run as user
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:92
-msgid "lucistatistics_collectdexecnotify_cmduser"
+msgid "Run as user"
 msgstr "Executa-ho com a usuari"
 
 #. Run as group
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:93
-msgid "lucistatistics_collectdexecnotify_cmdgroup"
+msgid "Run as group"
 msgstr "Executa-ho com a grup"
 
 #. Interface Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:94
-msgid "lucistatistics_collectdinterface"
+msgid "Interface Plugin Configuration"
 msgstr "Configuració de connector d'interfície"
 
 #. The interface plugin collects traffic statistics on selected interfaces.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:95
-msgid "lucistatistics_collectdinterface_desc"
+msgid "The interface plugin collects traffic statistics on selected interfaces."
 msgstr ""
 "El connector d'interfície recull estadístiques de tràfic a les interfícies "
 "seleccionades."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:96
-msgid "lucistatistics_collectdinterface_enable"
+msgid "Enable this plugin"
 msgstr "Activa aquest connector"
 
 #. Monitor interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:97
-msgid "lucistatistics_collectdinterface_interfaces"
+msgid "Monitor interfaces"
 msgstr "Monitoritza interfícies"
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:98
-msgid "lucistatistics_collectdinterface_interfaces_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr "apreta el Ctrl mentre cliques per seleccionar interfícies múltiples"
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:99
-msgid "lucistatistics_collectdinterface_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr "Monitoritza-ho tot excepte els seleccionats"
 
 #. Iptables Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:100
-msgid "lucistatistics_collectdiptables"
+msgid "Iptables Plugin Configuration"
 msgstr "Configuració del connector iptables"
 
 #. The iptables plugin will monitor selected firewall rules and collect informations about processed bytes and packets per rule.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:101
-msgid "lucistatistics_collectdiptables_desc"
+msgid "The iptables plugin will monitor selected firewall rules and collect informations about processed bytes and packets per rule."
 msgstr ""
 "El connector iptables monitoritzarà les regles de tallafocs seleccionades i "
 "recollirà informacions sobre els bytes i paquests processats per regla."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:102
-msgid "lucistatistics_collectdiptables_enable"
+msgid "Enable this plugin"
 msgstr "Activa aquest connector"
 
 #. Add matching rule
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:103
-msgid "lucistatistics_collectdiptablesmatch"
+msgid "Add matching rule"
 msgstr "Afegeix regla coincident"
 
 #. Here you can define various criteria by which the monitored iptables rules are selected.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:104
-msgid "lucistatistics_collectdiptablesmatch_desc"
+msgid "Here you can define various criteria by which the monitored iptables rules are selected."
 msgstr ""
 "Ací pots definir diversos criteris pels que es seleccionaran les regles "
 "iptables monitoritzades ."
 
 #. Name of the rule
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:105
-msgid "lucistatistics_collectdiptablesmatch_name"
+msgid "Name of the rule"
 msgstr "Nom de la regla"
 
 #. max. 16 chars
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:106
-msgid "lucistatistics_collectdiptablesmatch_name_desc"
+msgid "max. 16 chars"
 msgstr "màx. 16 caràcters"
 
 #. Table
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:107
-msgid "lucistatistics_collectdiptablesmatch_table"
+msgid "Table"
 msgstr "Taula"
 
 #. Chain
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:108
-msgid "lucistatistics_collectdiptablesmatch_chain"
+msgid "Chain"
 msgstr "Cadena"
 
 #. Action (target)
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:109
-msgid "lucistatistics_collectdiptablesmatch_target"
+msgid "Action (target)"
 msgstr "Acció (objectiu)"
 
 #. Network protocol
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:110
-msgid "lucistatistics_collectdiptablesmatch_protocol"
+msgid "Network protocol"
 msgstr "Protocol de xarxa"
 
 #. Source ip range
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:111
-msgid "lucistatistics_collectdiptablesmatch_source"
+msgid "Source ip range"
 msgstr "Rang d'IP origen"
 
 #. CIDR notation
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:112
-msgid "lucistatistics_collectdiptablesmatch_source_desc"
+msgid "CIDR notation"
 msgstr "Notació CIDR"
 
 #. Destination ip range
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:113
-msgid "lucistatistics_collectdiptablesmatch_destination"
+msgid "Destination ip range"
 msgstr "Rang d'IP destí"
 
 #. CIDR notation
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:114
-msgid "lucistatistics_collectdiptablesmatch_destination_desc"
+msgid "CIDR notation"
 msgstr "Notació CIDR"
 
 #. Incoming interface
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:115
-msgid "lucistatistics_collectdiptablesmatch_inputif"
+msgid "Incoming interface"
 msgstr "Interfície entrant"
 
 #. e.g. br-lan
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:116
-msgid "lucistatistics_collectdiptablesmatch_inputif_desc"
+msgid "e.g. br-lan"
 msgstr "p.e. br-lan"
 
 #. Outgoing interface
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:117
-msgid "lucistatistics_collectdiptablesmatch_outputif"
+msgid "Outgoing interface"
 msgstr "Interfície sortint"
 
 #. e.g. br-ff
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:118
-msgid "lucistatistics_collectdiptablesmatch_outputif_desc"
+msgid "e.g. br-ff"
 msgstr "p.e. br-ff"
 
 #. Options
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:119
-msgid "lucistatistics_collectdiptablesmatch_options"
+msgid "Options"
 msgstr "Opcions"
 
 #. e.g. reject-with tcp-reset
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:120
-msgid "lucistatistics_collectdiptablesmatch_options_desc"
+msgid "e.g. reject-with tcp-reset"
 msgstr "p.e. reject-with tcp-reset"
 
 #. IRQ Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:121
-msgid "lucistatistics_collectdirq"
+msgid "IRQ Plugin Configuration"
 msgstr "Configuració de connector IRQ"
 
 #. The irq plugin will monitor the rate of issues per second for each selected interrupt. If no interrupt is selected then all interrupts are monitored.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:122
-msgid "lucistatistics_collectdirq_desc"
+msgid "The irq plugin will monitor the rate of issues per second for each selected interrupt. If no interrupt is selected then all interrupts are monitored."
 msgstr ""
 "El connector IRQ monitoritzarà la taxa de qüestions per segon per cada "
 "interrupció seleccionada. Si no se selecciona cap interrupció, es "
@@ -664,121 +664,121 @@ msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:123
-msgid "lucistatistics_collectdirq_enable"
+msgid "Enable this plugin"
 msgstr "Activa aquest connector"
 
 #. Monitor interrupts
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:124
-msgid "lucistatistics_collectdirq_irqs"
+msgid "Monitor interrupts"
 msgstr "Monitoritza interrupcions"
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:125
-msgid "lucistatistics_collectdirq_irqs_desc"
+msgid "multiple separated by space"
 msgstr "múltiples separats per espais"
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:126
-msgid "lucistatistics_collectdirq_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr "Monitoritza-ho tot excepte els seleccionats"
 
 #. Load Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:127
-msgid "lucistatistics_collectdload"
+msgid "Load Plugin Configuration"
 msgstr "Configuració de connector de càrrega"
 
 #. The load plugin collects statistics about the general system load.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:128
-msgid "lucistatistics_collectdload_desc"
+msgid "The load plugin collects statistics about the general system load."
 msgstr ""
 "El connector de càrrega recull estadístiques sobre la càrrega de sistema "
 "general."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:129
-msgid "lucistatistics_collectdload_enable"
+msgid "Enable this plugin"
 msgstr "Activa aquest connector"
 
 #. Netlink Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:130
-msgid "lucistatistics_collectdnetlink"
+msgid "Netlink Plugin Configuration"
 msgstr "Configuració de connector d'enllaç de xarxa"
 
 #. The netlink plugin collects extended informations like qdisc-, class- and filter-statistics for selected interfaces.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:131
-msgid "lucistatistics_collectdnetlink_desc"
+msgid "The netlink plugin collects extended informations like qdisc-, class- and filter-statistics for selected interfaces."
 msgstr ""
 "El connector d'enllaç de xarxa recull informació extensa com estadístiques "
 "de qdisc-, class- i filter- per les interfícies seleccionades."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:132
-msgid "lucistatistics_collectdnetlink_enable"
+msgid "Enable this plugin"
 msgstr "Activa aquest connector"
 
 #. Basic monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:133
-msgid "lucistatistics_collectdnetlink_interfaces"
+msgid "Basic monitoring"
 msgstr "Monitoreig bàsic"
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:134
-msgid "lucistatistics_collectdnetlink_interfaces_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr "apreta el Ctrl mentre cliques per seleccionar les interfícies múltiples"
 
 #. Verbose monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:135
-msgid "lucistatistics_collectdnetlink_verboseinterfaces"
+msgid "Verbose monitoring"
 msgstr "Monitoreig detallat"
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:136
-msgid "lucistatistics_collectdnetlink_verboseinterfaces_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr "apreta el Ctrl mentre cliques per seleccionar les interfícies múltiples"
 
 #. Qdisc monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:137
-msgid "lucistatistics_collectdnetlink_qdiscs"
+msgid "Qdisc monitoring"
 msgstr "Monitoreig Qdisc"
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:138
-msgid "lucistatistics_collectdnetlink_qdiscs_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr "apreta el Ctrl mentre cliques per seleccionar les interfícies múltiples"
 
 #. Shaping class monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:139
-msgid "lucistatistics_collectdnetlink_classes"
+msgid "Shaping class monitoring"
 msgstr "Monitoreig de classe shaping"
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:140
-msgid "lucistatistics_collectdnetlink_classes_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr "apreta el Ctrl mentre cliques per seleccionar les interfícies múltiples"
 
 #. Filter class monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:141
-msgid "lucistatistics_collectdnetlink_filters"
+msgid "Filter class monitoring"
 msgstr "Monitoreig de classe filter"
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:142
-msgid "lucistatistics_collectdnetlink_filters_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr "apreta el Ctrl mentre cliques per seleccionar les interfícies múltiples"
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:143
-msgid "lucistatistics_collectdnetlink_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr "Monitoritza-ho tot excepte els seleccionats"
 
 #. Network Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:144
-msgid "lucistatistics_collectdnetwork"
+msgid "Network Plugin Configuration"
 msgstr "Configuració del connector de xarxa"
 
 #. The network plugin provides network based communication between different collectd instances. Collectd can operate both in client and server mode. In client mode locally collected date is transferred to a collectd server instance, in server mode the local instance receives data from other hosts.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:145
-msgid "lucistatistics_collectdnetwork_desc"
+msgid "The network plugin provides network based communication between different collectd instances. Collectd can operate both in client and server mode. In client mode locally collected date is transferred to a collectd server instance, in server mode the local instance receives data from other hosts."
 msgstr ""
 "El connector de xarxa proporciona comunicacions basades en xarxa entre "
 "diferents instàncies de collectd. El collectd pot operar tan en mode "
@@ -788,170 +788,170 @@ msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:146
-msgid "lucistatistics_collectdnetwork_enable"
+msgid "Enable this plugin"
 msgstr "Activa aquest connector"
 
 #. Listener interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:147
-msgid "lucistatistics_collectdnetworklisten"
+msgid "Listener interfaces"
 msgstr "Interfícies que reben connexions"
 
 #. This section defines on which interfaces collectd will wait for incoming connections.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:148
-msgid "lucistatistics_collectdnetworklisten_desc"
+msgid "This section defines on which interfaces collectd will wait for incoming connections."
 msgstr ""
 "Aquesta secció defineix en quines interfícies el collectd rebrà connexions "
 "entrants."
 
 #. Listen host
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:149
-msgid "lucistatistics_collectdnetworklisten_host"
+msgid "Listen host"
 msgstr "Màquina que rep connexions"
 
 #. host-, ip- or ip6 address
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:150
-msgid "lucistatistics_collectdnetworklisten_host_desc"
+msgid "host-, ip- or ip6 address"
 msgstr "Adreça de màquina, IP o IPv6"
 
 #. Listen port
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:151
-msgid "lucistatistics_collectdnetworklisten_port"
+msgid "Listen port"
 msgstr "Port que rep connexions"
 
 #. 0 - 65535
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:152
-msgid "lucistatistics_collectdnetworklisten_port_desc"
+msgid "0 - 65535"
 msgstr "0 - 65535"
 
 #. server interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:153
-msgid "lucistatistics_collectdnetworkserver"
+msgid "server interfaces"
 msgstr "interfícies de servidor"
 
 #. This section defines to which servers the locally collected data is sent to.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:154
-msgid "lucistatistics_collectdnetworkserver_desc"
+msgid "This section defines to which servers the locally collected data is sent to."
 msgstr ""
 "Aquesta secció defineix a quins servidors s'enviaran les dades recollides "
 "localment."
 
 #. Server host
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:155
-msgid "lucistatistics_collectdnetworkserver_host"
+msgid "Server host"
 msgstr "Màquina servidor"
 
 #. host-, ip- or ip6 address
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:156
-msgid "lucistatistics_collectdnetworkserver_host_desc"
+msgid "host-, ip- or ip6 address"
 msgstr "Adreça de màquina, IP, o IPv6"
 
 #. Server port
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:157
-msgid "lucistatistics_collectdnetworkserver_port"
+msgid "Server port"
 msgstr "Port del servidor"
 
 #. 0 - 65535
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:158
-msgid "lucistatistics_collectdnetworkserver_port_desc"
+msgid "0 - 65535"
 msgstr "0 - 65535"
 
 #. TTL for network packets
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:159
-msgid "lucistatistics_collectdnetwork_timetolive"
+msgid "TTL for network packets"
 msgstr "TTL pels paquets de xarxa"
 
 #. 0 - 255
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:160
-msgid "lucistatistics_collectdnetwork_timetolive_desc"
+msgid "0 - 255"
 msgstr "0 - 255"
 
 #. Forwarding between listen and server addresses
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:161
-msgid "lucistatistics_collectdnetwork_forward"
+msgid "Forwarding between listen and server addresses"
 msgstr "Readreçant entre adreces que reben connexions i adreces de servidors"
 
 #. Cache flush interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:162
-msgid "lucistatistics_collectdnetwork_cacheflush"
+msgid "Cache flush interval"
 msgstr "Interval de neteja de memòria cau"
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:163
-msgid "lucistatistics_collectdnetwork_cacheflush_desc"
+msgid "seconds"
 msgstr "segons"
 
 #. Ping Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:164
-msgid "lucistatistics_collectdping"
+msgid "Ping Plugin Configuration"
 msgstr "Configuració del connector ping"
 
 #. The ping plugin will send icmp echo replies to selected hosts and measure the roundtrip time for each host.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:165
-msgid "lucistatistics_collectdping_desc"
+msgid "The ping plugin will send icmp echo replies to selected hosts and measure the roundtrip time for each host."
 msgstr ""
 "El connector de ping enviarà ICMP Echo Replies a les màquines seleccionades "
 "i mesurarà el temps d'anada i tornada en cada màquina."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:166
-msgid "lucistatistics_collectdping_enable"
+msgid "Enable this plugin"
 msgstr "Activa aquest connector"
 
 #. Monitor hosts
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:167
-msgid "lucistatistics_collectdping_hosts"
+msgid "Monitor hosts"
 msgstr "Monitoritza màquines"
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:168
-msgid "lucistatistics_collectdping_hosts_desc"
+msgid "multiple separated by space"
 msgstr "múltiples separades per espais"
 
 #. TTL for ping packets
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:169
-msgid "lucistatistics_collectdping_ttl"
+msgid "TTL for ping packets"
 msgstr "TTL per paquets ping"
 
 #. 0 - 255
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:170
-msgid "lucistatistics_collectdping_ttl_desc"
+msgid "0 - 255"
 msgstr "0 - 255"
 
 #. Processes Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:171
-msgid "lucistatistics_collectdprocesses"
+msgid "Processes Plugin Configuration"
 msgstr "Configuració del connector de processos"
 
 #. The processes plugin collects informations like cpu time, page faults and memory usage of selected processes.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:172
-msgid "lucistatistics_collectdprocesses_desc"
+msgid "The processes plugin collects informations like cpu time, page faults and memory usage of selected processes."
 msgstr ""
 "El connector de processor recollirà informacions com el temps de cpu, errors "
 "de pàgina i ús de memòria dels processos seleccionats."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:173
-msgid "lucistatistics_collectdprocesses_enable"
+msgid "Enable this plugin"
 msgstr "Activa aquest connector"
 
 #. Monitor processes
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:174
-msgid "lucistatistics_collectdprocesses_processes"
+msgid "Monitor processes"
 msgstr "Monitoritza processos"
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:175
-msgid "lucistatistics_collectdprocesses_processes_desc"
+msgid "multiple separated by space"
 msgstr "múltiples separats per espais"
 
 #. RRDTool Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:176
-msgid "lucistatistics_collectdrrdtool"
+msgid "RRDTool Plugin Configuration"
 msgstr "Configuració del connector RRDTool"
 
 #. The rrdtool plugin stores the collected data in rrd database files, the foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong values will result in a very high memory consumption in the temporary directory. This can render the device unusable!</strong>
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:177
-msgid "lucistatistics_collectdrrdtool_desc"
+msgid "The rrdtool plugin stores the collected data in rrd database files, the foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong values will result in a very high memory consumption in the temporary directory. This can render the device unusable!</strong>"
 msgstr ""
 "El connector RRDTool desa les dades recollides als fitxers de base de dades "
 "RRD, la base dels diagrames.<br /><br /><strong>Alerta: Establir els valors "
@@ -960,176 +960,176 @@ msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:178
-msgid "lucistatistics_collectdrrdtool_enable"
+msgid "Enable this plugin"
 msgstr "Activa aquest connector"
 
 #. Storage directory
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:179
-msgid "lucistatistics_collectdrrdtool_datadir"
+msgid "Storage directory"
 msgstr "Directori d'emmagatzematge"
 
 #. RRD step interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:180
-msgid "lucistatistics_collectdrrdtool_stepsize"
+msgid "RRD step interval"
 msgstr "Interval de pas RRD"
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:181
-msgid "lucistatistics_collectdrrdtool_stepsize_desc"
+msgid "seconds"
 msgstr "segons"
 
 #. RRD heart beat interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:182
-msgid "lucistatistics_collectdrrdtool_heartbeat"
+msgid "RRD heart beat interval"
 msgstr "Interval de batec de cor RRD"
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:183
-msgid "lucistatistics_collectdrrdtool_heartbeat_desc"
+msgid "seconds"
 msgstr "segons"
 
 #. Only create average RRAs
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:184
-msgid "lucistatistics_collectdrrdtool_rrasingle"
+msgid "Only create average RRAs"
 msgstr "Crea només RRAs mitjans"
 
 #. reduces rrd size
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:185
-msgid "lucistatistics_collectdrrdtool_rrasingle_desc"
+msgid "reduces rrd size"
 msgstr "redueix mida RRD"
 
 #. Stored timespans
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:186
-msgid "lucistatistics_collectdrrdtool_rratimespans"
+msgid "Stored timespans"
 msgstr "Marques de temps emmagatzemades"
 
 #. seconds; multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:187
-msgid "lucistatistics_collectdrrdtool_rratimespans_desc"
+msgid "seconds; multiple separated by space"
 msgstr "segons; múltiples separats per espais"
 
 #. Rows per RRA
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:188
-msgid "lucistatistics_collectdrrdtool_rrarows"
+msgid "Rows per RRA"
 msgstr "Files per RRA"
 
 #. RRD XFiles Factor
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:189
-msgid "lucistatistics_collectdrrdtool_xff"
+msgid "RRD XFiles Factor"
 msgstr "Factor RRD XFiles"
 
 #. Cache collected data for
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:190
-msgid "lucistatistics_collectdrrdtool_cachetimeout"
+msgid "Cache collected data for"
 msgstr "Emmagatzema en memòria cau les dades recollides de"
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:191
-msgid "lucistatistics_collectdrrdtool_cachetimeout_desc"
+msgid "seconds"
 msgstr "segons"
 
 #. Flush cache after
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:192
-msgid "lucistatistics_collectdrrdtool_cacheflush"
+msgid "Flush cache after"
 msgstr "Neteja la memòria cau després de"
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:193
-msgid "lucistatistics_collectdrrdtool_cacheflush_desc"
+msgid "seconds"
 msgstr "segons"
 
 #. TCPConns Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:194
-msgid "lucistatistics_collectdtcpconns"
+msgid "TCPConns Plugin Configuration"
 msgstr "Configuració de connector TCPConns"
 
 #. The tcpconns plugin collects informations about open tcp connections on selected ports.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:195
-msgid "lucistatistics_collectdtcpconns_desc"
+msgid "The tcpconns plugin collects informations about open tcp connections on selected ports."
 msgstr ""
 "El connector TCPConns recull informació sobre les connexions TCP obertes en "
 "els ports seleccionats."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:196
-msgid "lucistatistics_collectdtcpconns_enable"
+msgid "Enable this plugin"
 msgstr "Activa aquest connector"
 
 #. Monitor all local listen ports
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:197
-msgid "lucistatistics_collectdtcpconns_listeningports"
+msgid "Monitor all local listen ports"
 msgstr "Monitoritza tots els ports locals que reben connexions"
 
 #. Monitor local ports
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:198
-msgid "lucistatistics_collectdtcpconns_localports"
+msgid "Monitor local ports"
 msgstr "Monitoritza els ports locals"
 
 #. 0 - 65535; multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:199
-msgid "lucistatistics_collectdtcpconns_localports_desc"
+msgid "0 - 65535; multiple separated by space"
 msgstr "0 - 65535; múltiples separats per espais"
 
 #. Monitor remote ports
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:200
-msgid "lucistatistics_collectdtcpconns_remoteports"
+msgid "Monitor remote ports"
 msgstr "Monitoritza els ports remots"
 
 #. 0 - 65535; multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:201
-msgid "lucistatistics_collectdtcpconns_remoteports_desc"
+msgid "0 - 65535; multiple separated by space"
 msgstr "0 - 65535; múltiples separats per espais"
 
 #. Unixsock Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:202
-msgid "lucistatistics_collectdunixsock"
+msgid "Unixsock Plugin Configuration"
 msgstr "Configuració de connector Unixsock"
 
 #. The unixsock plugin creates a unix socket which can be used to read collected data from a running collectd instance.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:203
-msgid "lucistatistics_collectdunixsock_desc"
+msgid "The unixsock plugin creates a unix socket which can be used to read collected data from a running collectd instance."
 msgstr ""
 "El connector unixsock crea un socket Unix que es pot fer servir per llegir "
 "dades recollides d'una instància collectd."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:204
-msgid "lucistatistics_collectdunixsock_enable"
+msgid "Enable this plugin"
 msgstr "Activa aquest connector"
 
 #. Filepath of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:205
-msgid "lucistatistics_collectdunixsock_socketfile"
+msgid "Filepath of the unix socket"
 msgstr "Ruta al socket Unix"
 
 #. Group ownership of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:206
-msgid "lucistatistics_collectdunixsock_socketgroup"
+msgid "Group ownership of the unix socket"
 msgstr "Grup propietari del socket Unix"
 
 #. group name
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:207
-msgid "lucistatistics_collectdunixsock_socketgroup_desc"
+msgid "group name"
 msgstr "nom del grup"
 
 #. File permissions of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:208
-msgid "lucistatistics_collectdunixsock_socketperms"
+msgid "File permissions of the unix socket"
 msgstr "Permisos de fitxer pel socket Unix"
 
 #. octal
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:209
-msgid "lucistatistics_collectdunixsock_socketperms_desc"
+msgid "octal"
 msgstr "octal"
 
 #. Wireless Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:210
-msgid "lucistatistics_collectdwireless"
+msgid "Wireless Plugin Configuration"
 msgstr "Configuració del connector Wireless"
 
 #. The wireless plugin collects statistics about wireless signal strength, noise and quality.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:211
-msgid "lucistatistics_collectdwireless_desc"
+msgid "The wireless plugin collects statistics about wireless signal strength, noise and quality."
 msgstr ""
 "El connector Wireless recull estadístiques sobre la potència del senyal "
 "sense fils, el soroll i la qualitat."
diff --git a/po/ca/sysauth.po b/po/ca/sysauth.po
index ad64bacb0..c5934a16d 100644
--- a/po/ca/sysauth.po
+++ b/po/ca/sysauth.po
@@ -15,12 +15,12 @@ msgstr ""
 
 #. Authorization Required
 #: i18n/english/luasrc/i18n/sysauth.en.lua:1
-msgid "sysauth_head"
+msgid "Authorization Required"
 msgstr "Es requereix autenticació"
 
 #. Please enter your username and password.
 #: i18n/english/luasrc/i18n/sysauth.en.lua:2
-msgid "sysauth_prompt"
+msgid "Please enter your username and password."
 msgstr "Si us plau entra el teu nom d'usuari i contrasenya."
 
 #. Invalid username and/or password! Please try again.
diff --git a/po/ca/tinyproxy.po b/po/ca/tinyproxy.po
index 139feb74c..eb090fd4a 100644
--- a/po/ca/tinyproxy.po
+++ b/po/ca/tinyproxy.po
@@ -15,157 +15,157 @@ msgstr ""
 
 #. Tinyproxy
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:1
-msgid "tinyproxy"
+msgid "Tinyproxy"
 msgstr "Tinyproxy"
 
 #. Tinyproxy is a small and fast non-caching HTTP(S)-Proxy
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:2
-msgid "tinyproxy_desc"
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
 msgstr "Tinyproxy és un proxy HTTP no caché petit i ràpid"
 
 #. Allow access from
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:3
-msgid "tinyproxy_tinyproxy_allow"
+msgid "Allow access from"
 msgstr "Permet l'accés des de"
 
 #. Allowed headers for anonymous proxy
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:4
-msgid "tinyproxy_tinyproxy_anonymous"
+msgid "Allowed headers for anonymous proxy"
 msgstr "Capçaleres permeses pel proxy anònim"
 
 #. Bind outgoing traffic to address
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:5
-msgid "tinyproxy_tinyproxy_bind"
+msgid "Bind outgoing traffic to address"
 msgstr "Vincula el tràfic sortint a l'adreça"
 
 #. Ports allowed for CONNECT method
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:6
-msgid "tinyproxy_tinyproxy_connectport"
+msgid "Ports allowed for CONNECT method"
 msgstr "Ports permesos pel mètode CONNECT"
 
 #. 0 = disabled, empty = all
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:7
-msgid "tinyproxy_tinyproxy_connectport_desc"
+msgid "0 = disabled, empty = all"
 msgstr "0 = desactivats, buit = tots"
 
 #. Error document
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:8
-msgid "tinyproxy_tinyproxy_defaulterrorfile"
+msgid "Error document"
 msgstr "Document d'error"
 
 #. Filter list
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:9
-msgid "tinyproxy_tinyproxy_filter"
+msgid "Filter list"
 msgstr "Llista de filtre"
 
 #. Case sensitive filters
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:10
-msgid "tinyproxy_tinyproxy_filtercasesensitive"
+msgid "Case sensitive filters"
 msgstr "Filtres distingint majúscules i minúscules"
 
 #. Filter list is a whitelist
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:11
-msgid "tinyproxy_tinyproxy_filterdefaultdeny"
+msgid "Filter list is a whitelist"
 msgstr "La llista de filtre és una llista blanca"
 
 #. Extended regular expression filters
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:12
-msgid "tinyproxy_tinyproxy_filterextended"
+msgid "Extended regular expression filters"
 msgstr "Filtres d'expressions regulars exteses"
 
 #. Filter URLs instead of domains
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:13
-msgid "tinyproxy_tinyproxy_filterurls"
+msgid "Filter URLs instead of domains"
 msgstr "Filtra URLs en comptes de dominis"
 
 #. Listen on address
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:14
-msgid "tinyproxy_tinyproxy_listen"
+msgid "Listen on address"
 msgstr "Escolta a l'adreça"
 
 #. Logfile
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:15
-msgid "tinyproxy_tinyproxy_logfile"
+msgid "Logfile"
 msgstr "Fitxer de registre"
 
 #. Log level
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:16
-msgid "tinyproxy_tinyproxy_loglevel"
+msgid "Log level"
 msgstr "Nivell de registre"
 
 #. Maximum number of clients
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:17
-msgid "tinyproxy_tinyproxy_maxclients"
+msgid "Maximum number of clients"
 msgstr "Màxim número de clients"
 
 #. Maximum requests per thread
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:18
-msgid "tinyproxy_tinyproxy_maxrequestsperchild"
+msgid "Maximum requests per thread"
 msgstr "Màximes peticions per fil"
 
 #. Max. spare servers
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:19
-msgid "tinyproxy_tinyproxy_maxspareservers"
+msgid "Max. spare servers"
 msgstr "Màx servidors spare"
 
 #. Min. spare servers
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:20
-msgid "tinyproxy_tinyproxy_minspareservers"
+msgid "Min. spare servers"
 msgstr "Mín servidors spare"
 
 #. Spare servers to start with
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:21
-msgid "tinyproxy_tinyproxy_startservers"
+msgid "Spare servers to start with"
 msgstr "Servidors spare amb els que començar"
 
 #. Statistic document
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:22
-msgid "tinyproxy_tinyproxy_statfile"
+msgid "Statistic document"
 msgstr "Document estadístic"
 
 #. Write to syslog
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:23
-msgid "tinyproxy_tinyproxy_syslog"
+msgid "Write to syslog"
 msgstr "Escriu al syslog"
 
 #. Connection Timeout
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:24
-msgid "tinyproxy_tinyproxy_timeout"
+msgid "Connection Timeout"
 msgstr "Temps d'espera excedit"
 
 #. Value of Via-Header
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:25
-msgid "tinyproxy_tinyproxy_viaproxyname"
+msgid "Value of Via-Header"
 msgstr "Valor de Via-Header"
 
 #. Include client IP
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:26
-msgid "tinyproxy_tinyproxy_xtinyproxy"
+msgid "Include client IP"
 msgstr "Inclou client IP"
 
 #. Via proxy
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:27
-msgid "tinyproxy_type_proxy"
+msgid "Via proxy"
 msgstr "Via proxy"
 
 #. Reject access
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:28
-msgid "tinyproxy_type_reject"
+msgid "Reject access"
 msgstr "Rebutja accés"
 
 #. Upstream Control
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:29
-msgid "tinyproxy_upstream"
+msgid "Upstream Control"
 msgstr "Control de pujada"
 
 #. Target host
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:30
-msgid "tinyproxy_upstream_target"
+msgid "Target host"
 msgstr "Màquina destí"
 
 #. Type
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:31
-msgid "tinyproxy_upstream_type"
+msgid "Type"
 msgstr "Tipus"
 
 #. Upstream Proxy
diff --git a/po/ca/upnp.po b/po/ca/upnp.po
index 2b994796d..bae3b3762 100644
--- a/po/ca/upnp.po
+++ b/po/ca/upnp.po
@@ -15,36 +15,36 @@ msgstr ""
 
 #. Universal Plug &amp; Play
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:1
-msgid "upnpd"
+msgid "Universal Plug & Play"
 msgstr "Universal Plug &amp; Play"
 
 #. UPNP allows clients in the local network to automatically configure the router.
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:2
-msgid "upnpd_desc"
+msgid "UPNP allows clients in the local network to automatically configure the router."
 msgstr ""
 "UPnP permet als clients de la xarxa local configurar automàticament el "
 "router."
 
 #. UPNP should only be enabled if absolutely necessary as it can result in high security risks for your network.
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:3
-msgid "upnpd_config_desc"
+msgid "UPNP should only be enabled if absolutely necessary as it can result in high security risks for your network."
 msgstr ""
 "Només s'hauria d'activar l'UPnP si és absolutament necessari, ja que en "
 "poden resultar alts riscos de seguretat a la teva xarxa."
 
 #. Enable secure mode
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:4
-msgid "upnpd_config_securemode"
+msgid "Enable secure mode"
 msgstr "Activa mode segur"
 
 #. Log output
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:5
-msgid "upnpd_config_logoutput"
+msgid "Log output"
 msgstr "Registra la sortida"
 
 #. Downlink
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:6
-msgid "upnpd_config_download"
+msgid "Downlink"
 msgstr "Enllaç de baixada"
 
 #. Uplink
diff --git a/po/ca/ushare.po b/po/ca/ushare.po
index 935d00e25..0e2b2fef7 100644
--- a/po/ca/ushare.po
+++ b/po/ca/ushare.po
@@ -15,37 +15,37 @@ msgstr ""
 
 #. Content directories
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:1
-msgid "content_directories"
+msgid "Content directories"
 msgstr "Directoris de contingut"
 
 #. Disable telnet console
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:2
-msgid "disable_telnet"
+msgid "Disable telnet console"
 msgstr "Desactiva la consola telnet"
 
 #. Disable webinterface
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:3
-msgid "disable_webif"
+msgid "Disable webinterface"
 msgstr "Desactiva la interfície web"
 
 #. Options
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:4
-msgid "options"
+msgid "Options"
 msgstr "Opcions"
 
 #. Servername
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:5
-msgid "servername"
+msgid "Servername"
 msgstr "Nom de servidor"
 
 #. Settings
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:6
-msgid "settings"
+msgid "Settings"
 msgstr "Configuració"
 
 #. uShare
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:7
-msgid "ushare"
+msgid "uShare"
 msgstr "uShare"
 
 #. uShare
diff --git a/po/ca/uvc_streamer.po b/po/ca/uvc_streamer.po
index 1d5345f38..9a016ffae 100644
--- a/po/ca/uvc_streamer.po
+++ b/po/ca/uvc_streamer.po
@@ -15,22 +15,22 @@ msgstr ""
 
 #. Frames per second
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
-msgid "framespersecond"
+msgid "Frames per second"
 msgstr "Fotogrames per segon"
 
 #. Resolution
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
-msgid "resolution"
+msgid "Resolution"
 msgstr "Resolució"
 
 #. Settings
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
-msgid "settings"
+msgid "Settings"
 msgstr "Configuració"
 
 #. Webcam streaming
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
-msgid "uvc_streamer"
+msgid "Webcam streaming"
 msgstr "Transmissió de càmera web"
 
 #. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
diff --git a/po/ca/uvl.po b/po/ca/uvl.po
index ce2d64e91..ec1b9d742 100644
--- a/po/ca/uvl.po
+++ b/po/ca/uvl.po
@@ -15,213 +15,213 @@ msgstr ""
 
 #. Unable to load config \"%p\": %1
 #: libs/uvl/luasrc/i18n/uvl.en.lua:1
-msgid "uvl_err_uciload"
+msgid "Unable to load config \"%p\": %1"
 msgstr "No s'ha pogut carregar la configuració \"%p\": %1"
 
 #. Error in scheme \"%p\":\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:2
-msgid "uvl_err_scheme"
+msgid "Error in scheme \"%p\":\\n%c"
 msgstr ""
 "Error en l'esquema \"%p\":\n"
 "%c"
 
 #. Error in config \"%p\":\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:3
-msgid "uvl_err_config"
+msgid "Error in config \"%p\":\\n%c"
 msgstr ""
 "Error a la configuració \"%p\":\n"
 "%c"
 
 #. Error in section \"%i\" (%I):\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:4
-msgid "uvl_err_section"
+msgid "Error in section \"%i\" (%I):\\n%c"
 msgstr ""
 "Error a la secció \"%i\" (%I):\n"
 "%c"
 
 #. Error in option \"%i\" (%I):\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:5
-msgid "uvl_err_option"
+msgid "Error in option \"%i\" (%I):\\n%c"
 msgstr ""
 "Error a l'opció \"%i\" (%I):\n"
 "%c"
 
 #. Option \"%i\" has invalid reference specification %1:\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:6
-msgid "uvl_err_reference"
+msgid "Option \"%i\" has invalid reference specification %1:\\n%c"
 msgstr ""
 "L'opció \"%i\" té una especificació de referència invàlida %1:\n"
 "%c"
 
 #. In dependency check for %t \"%i\":\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:7
-msgid "uvl_err_dependency"
+msgid "In dependency check for %t \"%i\":\\n%c"
 msgstr ""
 "Comprova dependència per %t \"%i\":\n"
 "%c"
 
 #. Can not find scheme \"%p\" in \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:8
-msgid "uvl_err_sme_find"
+msgid "Can not find scheme \"%p\" in \"%1\""
 msgstr "Mp es pot trobar l'esquema \"%p\" a \"%1\""
 
 #. Can not access file \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:9
-msgid "uvl_err_sme_read"
+msgid "Can not access file \"%1\""
 msgstr "No es pot accedir al fitxer \"%1\""
 
 #. Missing required scheme field \"%1\" in \"%i\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:10
-msgid "uvl_err_sme_reqfld"
+msgid "Missing required scheme field \"%1\" in \"%i\""
 msgstr "Falta el camp d'esquema requerit \"%1\" a \"%i\""
 
 #. Illegal reference \"%1\" to an anonymous section
 #: libs/uvl/luasrc/i18n/uvl.en.lua:11
-msgid "uvl_err_sme_invref"
+msgid "Illegal reference \"%1\" to an anonymous section"
 msgstr "Referència \"%1\" il·legal a unaa secció anònima"
 
 #. Malformed reference in \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:12
-msgid "uvl_err_sme_badref"
+msgid "Malformed reference in \"%1\""
 msgstr "Referència malformada a \"%1\""
 
 #. Malformed dependency specification \"%1\" in \"%i\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:13
-msgid "uvl_err_sme_baddep"
+msgid "Malformed dependency specification \"%1\" in \"%i\""
 msgstr "Especificació de dependència \"%1\" malformada a \"%i\""
 
 #. Malformed validator specification \"%1\" in \"%i\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:14
-msgid "uvl_err_sme_badval"
+msgid "Malformed validator specification \"%1\" in \"%i\""
 msgstr "Especificació de validador \"%1\" malformada a \"%i\""
 
 #. External validator \"%1\" failed: %2
 #: libs/uvl/luasrc/i18n/uvl.en.lua:15
-msgid "uvl_err_sme_errval"
+msgid "External validator \"%1\" failed: %2"
 msgstr "Ha fallat el validador extern \"%1\": %2"
 
 #. Variable \"%o\" in scheme \"%p\" references unknown package \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:16
-msgid "uvl_err_sme_vbadpack"
+msgid "Variable \"%o\" in scheme \"%p\" references unknown package \"%1\""
 msgstr "La variable \"%o\" a l'esquema \"%p\" referencia el paquet desconegut \"%1\""
 
 #. Variable \"%o\" in scheme \"%p\" references unknown section \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:17
-msgid "uvl_err_sme_vbadsect"
+msgid "Variable \"%o\" in scheme \"%p\" references unknown section \"%1\""
 msgstr "La variable \"%o\" a l'esquema \"%p\" referencia la secció desconeguda \"%1\""
 
 #. Enum \"%v\" in scheme \"%p\" references unknown package \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:18
-msgid "uvl_err_sme_ebadpack"
+msgid "Enum \"%v\" in scheme \"%p\" references unknown package \"%1\""
 msgstr "L'enum \"%v\" a l'esquema \"%p\" referencia el paquet desconegut \"%1\""
 
 #. Enum \"%v\" in scheme \"%p\" references unknown section \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:19
-msgid "uvl_err_sme_ebadsect"
+msgid "Enum \"%v\" in scheme \"%p\" references unknown section \"%1\""
 msgstr "L'enum \"%v\" a l'esquema \"%p\" referencia el la secció desconeguda \"%1\""
 
 #. Enum \"%v\" in scheme \"%p\" references unknown option \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:20
-msgid "uvl_err_sme_ebadopt"
+msgid "Enum \"%v\" in scheme \"%p\" references unknown option \"%1\""
 msgstr "L'enum \"%v\" a l'esquema \"%p\" referencia l'opció desconeguda \"%1\""
 
 #. Enum \"%v\" in scheme \"%p\" references non-enum option \"%p.%s.%o\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:21
-msgid "uvl_err_sme_ebadtype"
+msgid "Enum \"%v\" in scheme \"%p\" references non-enum option \"%p.%s.%o\""
 msgstr "L'enum \"%v\" a l'esquema \"%p\" referencia l'opció no-enum \"%p.%s.%o\""
 
 #. Enum \"%v\" in scheme \"%p\" redeclares the default value of \"%p.%s.%o\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:22
-msgid "uvl_err_sme_ebaddef"
+msgid "Enum \"%v\" in scheme \"%p\" redeclares the default value of \"%p.%s.%o\""
 msgstr "L'enum \"%v\" a l'esquema \"%p\" redeclara el valor per defecte \"%p.%s.%o\""
 
 #. Section \"%i\" (%I) not found in scheme
 #: libs/uvl/luasrc/i18n/uvl.en.lua:23
-msgid "uvl_err_sect_unknown"
+msgid "Section \"%i\" (%I) not found in scheme"
 msgstr "No s'ha trobat la secció \"%i\" (%I) a l'esquema"
 
 #. Required section \"%p.%s\" not found in config
 #: libs/uvl/luasrc/i18n/uvl.en.lua:24
-msgid "uvl_err_sect_required"
+msgid "Required section \"%p.%s\" not found in config"
 msgstr "No s'ha trobat la secció \"%p.%s\" requerida a la configuració"
 
 #. Unique section \"%p.%s\" occurs multiple times in config
 #: libs/uvl/luasrc/i18n/uvl.en.lua:25
-msgid "uvl_err_sect_unique"
+msgid "Unique section \"%p.%s\" occurs multiple times in config"
 msgstr "La secció única \"%p.%s\" hi és més d'un cop a la configuració"
 
 #. The section of type \"%p.%s\" is stored anonymously in config but must be named
 #: libs/uvl/luasrc/i18n/uvl.en.lua:26
-msgid "uvl_err_sect_named"
+msgid "The section of type \"%p.%s\" is stored anonymously in config but must be named"
 msgstr ""
 "La secció del tipus \"%p.%s\" s'emmagatzema anònimament a la configuració però "
 "s'ha d'anomenar"
 
 #. Section \"%p.%s\" not found in config
 #: libs/uvl/luasrc/i18n/uvl.en.lua:27
-msgid "uvl_err_sect_notfound"
+msgid "Section \"%p.%s\" not found in config"
 msgstr "No s'ha trobat la secció \"%p.%s\" a la configuració"
 
 #. Option \"%i\" (%I) not found in scheme
 #: libs/uvl/luasrc/i18n/uvl.en.lua:28
-msgid "uvl_err_opt_unknown"
+msgid "Option \"%i\" (%I) not found in scheme"
 msgstr "No s'ha trobat l'esquema \"%p.%s\" a l'esquema"
 
 #. Required option \"%i\" has no value
 #: libs/uvl/luasrc/i18n/uvl.en.lua:29
-msgid "uvl_err_opt_required"
+msgid "Required option \"%i\" has no value"
 msgstr "L'opció requerida \"%i\" no té valor"
 
 #. Value \"%1\" of option \"%i\" is not defined in enum %2
 #: libs/uvl/luasrc/i18n/uvl.en.lua:30
-msgid "uvl_err_opt_badvalue"
+msgid "Value \"%1\" of option \"%i\" is not defined in enum %2"
 msgstr "El valor \"%1\" de l'opció \"%i\" no està definit a l'enum %2"
 
 #. Value \"%1\" of option \"%i\" does not validate as datatype \"%2\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:31
-msgid "uvl_err_opt_invvalue"
+msgid "Value \"%1\" of option \"%i\" does not validate as datatype \"%2\""
 msgstr "El valor \"%1\" de l'opció \"%i\" no valida com el tipus de data \"%2\""
 
 #. Option \"%i\" is defined as list but stored as plain value
 #: libs/uvl/luasrc/i18n/uvl.en.lua:32
-msgid "uvl_err_opt_notlist"
+msgid "Option \"%i\" is defined as list but stored as plain value"
 msgstr ""
 "L'opció \"%i\" està definida com una llista però emmagatzemada com a text pla"
 
 #. Option \"%i\" has unknown datatype \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:33
-msgid "uvl_err_opt_datatype"
+msgid "Option \"%i\" has unknown datatype \"%1\""
 msgstr "L'opció \"%i\" té el tipus de dades desconegut \"%1\""
 
 #. Option \"%p.%s.%o\" not found in config
 #: libs/uvl/luasrc/i18n/uvl.en.lua:34
-msgid "uvl_err_opt_notfound"
+msgid "Option \"%p.%s.%o\" not found in config"
 msgstr "No s'ha trobat l'opció \"%p.%s.%o\" a la configuració"
 
 #. Dependency (%1) failed:\noption \"%i\" is not eqal \"%2\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:35
-msgid "uvl_err_dep_notequal"
+msgid "Dependency (%1) failed:\\noption \"%i\" is not eqal \"%2\""
 msgstr ""
 "Ha fallat la dependència %1:\n"
 "l'opció \"%i\" no és igual \"%2\""
 
 #. Dependency (%1) failed:\noption \"%i\" has no value
 #: libs/uvl/luasrc/i18n/uvl.en.lua:36
-msgid "uvl_err_dep_novalue"
+msgid "Dependency (%1) failed:\\noption \"%i\" has no value"
 msgstr ""
 "Ha fallat la dependència %1:\n"
 "l'opció \"%i\" no té valor"
 
 #. Dependency (%1) failed:\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:37
-msgid "uvl_err_dep_notvalid"
+msgid "Dependency (%1) failed:\\n%c"
 msgstr ""
 "Ha fallat la dependència %1:\n"
 "%c"
 
 #. Recursive dependency for option \"%i\" detected
 #: libs/uvl/luasrc/i18n/uvl.en.lua:38
-msgid "uvl_err_dep_recursive"
+msgid "Recursive dependency for option \"%i\" detected"
 msgstr "S'ha detectat una dependència recusriva per l'opció \"%i\""
 
 #. In dependency check for enum value \"%i\":\n%c
diff --git a/po/ca/wifi.po b/po/ca/wifi.po
index 6a7e8a755..56e0cb179 100644
--- a/po/ca/wifi.po
+++ b/po/ca/wifi.po
@@ -15,192 +15,192 @@ msgstr ""
 
 #. auto
 #: i18n/english/luasrc/i18n/wifi.en.lua:1
-msgid "wifi_auto"
+msgid "auto"
 msgstr "auto"
 
 #. Frequency Hopping
 #: i18n/english/luasrc/i18n/wifi.en.lua:2
-msgid "wifi_fh"
+msgid "Frequency Hopping"
 msgstr "Salts de freqüència"
 
 #. Diversity
 #: i18n/english/luasrc/i18n/wifi.en.lua:3
-msgid "wifi_diversity"
+msgid "Diversity"
 msgstr "Diversitat"
 
 #. Transmitter Antenna
 #: i18n/english/luasrc/i18n/wifi.en.lua:4
-msgid "wifi_txantenna"
+msgid "Transmitter Antenna"
 msgstr "Antena transmissora"
 
 #. Receiver Antenna
 #: i18n/english/luasrc/i18n/wifi.en.lua:5
-msgid "wifi_rxantenna"
+msgid "Receiver Antenna"
 msgstr "Antena receptora"
 
 #. Distance Optimization
 #: i18n/english/luasrc/i18n/wifi.en.lua:6
-msgid "wifi_distance"
+msgid "Distance Optimization"
 msgstr "Optimització de distància"
 
 #. Distance to farthest network member in meters.
 #: i18n/english/luasrc/i18n/wifi.en.lua:7
-msgid "wifi_distance_desc"
+msgid "Distance to farthest network member in meters."
 msgstr "Distància al membre de la xarxa més allunyat en metres."
 
 #. MAC-Address Filter
 #: i18n/english/luasrc/i18n/wifi.en.lua:8
-msgid "wifi_macpolicy"
+msgid "MAC-Address Filter"
 msgstr "Filtre d'adreces MAC"
 
 #. Allow listed only
 #: i18n/english/luasrc/i18n/wifi.en.lua:9
-msgid "wifi_whitelist"
+msgid "Allow listed only"
 msgstr "Permet només les llistades"
 
 #. Allow all except listed
 #: i18n/english/luasrc/i18n/wifi.en.lua:10
-msgid "wifi_blacklist"
+msgid "Allow all except listed"
 msgstr "Permet-les totes menys les llistades"
 
 #. MAC-List
 #: i18n/english/luasrc/i18n/wifi.en.lua:11
-msgid "wifi_maclist"
+msgid "MAC-List"
 msgstr "Llista MAC"
 
 #. Frame Bursting
 #: i18n/english/luasrc/i18n/wifi.en.lua:12
-msgid "wifi_bursting"
+msgid "Frame Bursting"
 msgstr "Frame Bursting"
 
 #. Regulatory Domain
 #: i18n/english/luasrc/i18n/wifi.en.lua:13
-msgid "wifi_regdomain"
+msgid "Regulatory Domain"
 msgstr "Domini regulatori"
 
 #. Country Code
 #: i18n/english/luasrc/i18n/wifi.en.lua:14
-msgid "wifi_country"
+msgid "Country Code"
 msgstr "Codi de país"
 
 #. Outdoor Channels
 #: i18n/english/luasrc/i18n/wifi.en.lua:15
-msgid "wifi_outdoor"
+msgid "Outdoor Channels"
 msgstr "Canals d'exteriors"
 
 #. Connection Limit
 #: i18n/english/luasrc/i18n/wifi.en.lua:16
-msgid "wifi_maxassoc"
+msgid "Connection Limit"
 msgstr "Límit de connexions"
 
 #. <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:17
-msgid "wifi_essid"
+msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
 #. <abbr title=\"Basic Service Set Identifier\">BSSID</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:18
-msgid "wifi_bssid"
+msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 
 #. Fragmentation Threshold
 #: i18n/english/luasrc/i18n/wifi.en.lua:19
-msgid "wifi_frag"
+msgid "Fragmentation Threshold"
 msgstr "Llindar de Fragmentació"
 
 #. RTS/CTS Threshold
 #: i18n/english/luasrc/i18n/wifi.en.lua:20
-msgid "wifi_rts"
+msgid "RTS/CTS Threshold"
 msgstr "Llindar RTS/CTS"
 
 #. <abbr title=\"Wireless Distribution System\">WDS</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:21
-msgid "wifi_wds"
+msgid "<abbr title=\"Wireless Distribution System\">WDS</abbr>"
 msgstr "<abbr title=\"Wireless Distribution System\">WDS</abbr>"
 
 #. Separate WDS
 #: i18n/english/luasrc/i18n/wifi.en.lua:22
-msgid "wifi_wdssep"
+msgid "Separate WDS"
 msgstr "WDS Separats"
 
 #. Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:23
-msgid "wifi_hidden"
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "Amaga l'<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
 #. Isolate Clients
 #: i18n/english/luasrc/i18n/wifi.en.lua:24
-msgid "wifi_isloate"
+msgid "Isolate Clients"
 msgstr "Aïlla clients"
 
 #. Prevent Client to Client Communication
 #: i18n/english/luasrc/i18n/wifi.en.lua:25
-msgid "wifi_isloate_desc"
+msgid "Prevent Client to Client Communication"
 msgstr "Evita comunicació Client a Client"
 
 #. Background Scan
 #: i18n/english/luasrc/i18n/wifi.en.lua:26
-msgid "wifi_bgscan"
+msgid "Background Scan"
 msgstr "Escaneig de fons"
 
 #. Transmission Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:27
-msgid "wifi_rate"
+msgid "Transmission Rate"
 msgstr "Taxa de transmissió"
 
 #. Multicast Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:28
-msgid "wifi_mcast_rate"
+msgid "Multicast Rate"
 msgstr "Taxa Multicast"
 
 #. Minimum Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:29
-msgid "wifi_minrate"
+msgid "Minimum Rate"
 msgstr "Taxa Mínima"
 
 #. Maximum Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:30
-msgid "wifi_maxrate"
+msgid "Maximum Rate"
 msgstr "Taxa Màxima"
 
 #. Compression
 #: i18n/english/luasrc/i18n/wifi.en.lua:31
-msgid "wifi_compression"
+msgid "Compression"
 msgstr "Compressió"
 
 #. Turbo Mode
 #: i18n/english/luasrc/i18n/wifi.en.lua:32
-msgid "wifi_turbo"
+msgid "Turbo Mode"
 msgstr "Mode Turbo"
 
 #. Fast Frames
 #: i18n/english/luasrc/i18n/wifi.en.lua:33
-msgid "wifi_ff"
+msgid "Fast Frames"
 msgstr "Fast Frames"
 
 #. WMM Mode
 #: i18n/english/luasrc/i18n/wifi.en.lua:34
-msgid "wifi_wmm"
+msgid "WMM Mode"
 msgstr "Mode WMM"
 
 #. XR Support
 #: i18n/english/luasrc/i18n/wifi.en.lua:35
-msgid "wifi_xr"
+msgid "XR Support"
 msgstr "Suport XR"
 
 #. AR Support
 #: i18n/english/luasrc/i18n/wifi.en.lua:36
-msgid "wifi_ar"
+msgid "AR Support"
 msgstr "Suport AR"
 
 #. Disable HW-Beacon timer
 #: i18n/english/luasrc/i18n/wifi.en.lua:37
-msgid "wifi_nosbeacon"
+msgid "Disable HW-Beacon timer"
 msgstr "Desactiva el temporitzador HW-Beacon"
 
 #. Do not send probe responses
 #: i18n/english/luasrc/i18n/wifi.en.lua:38
-msgid "wifi_noprobereq"
+msgid "Do not send probe responses"
 msgstr "No enviïs les respostes de prova"
 
 #. WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP and ad-hoc mode) to be installed.
diff --git a/po/de/admin-core.po b/po/de/admin-core.po
index c2bed6340..5dee9e225 100644
--- a/po/de/admin-core.po
+++ b/po/de/admin-core.po
@@ -13,22 +13,22 @@ msgstr ""
 
 #. The following changes have been applied
 #: i18n/english/luasrc/i18n/admin-core.en.lua:1
-msgid "uci_applied"
+msgid "The following changes have been applied"
 msgstr "Die folgenden Änderungen wurden übernommen"
 
 #. The following changes have been reverted
 #: i18n/english/luasrc/i18n/admin-core.en.lua:2
-msgid "uci_reverted"
+msgid "The following changes have been reverted"
 msgstr "Die folgenden Änderungen wurden verworfen"
 
 #. User Interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:3
-msgid "a_i_ui"
+msgid "User Interface"
 msgstr "Benutzeroberfläche"
 
 #. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a collection of free Lua software including an <abbr title=\"Model-View-Controller\">MVC</abbr>-Webframework and webinterface for embedded devices. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is licensed under the Apache-License.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:4
-msgid "c_lucidesc"
+msgid "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a collection of free Lua software including an <abbr title=\"Model-View-Controller\">MVC</abbr>-Webframework and webinterface for embedded devices. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is licensed under the Apache-License."
 msgstr ""
 "LuCI ist eine Sammlung freier Lua-Software einschließlich eines MVC-"
 "Webframeworks und einer Weboberfläche für eingebettete Geräte. Luci steht "
@@ -36,58 +36,58 @@ msgstr ""
 
 #. Project Homepage
 #: i18n/english/luasrc/i18n/admin-core.en.lua:5
-msgid "c_projecthome"
+msgid "Project Homepage"
 msgstr "Projekt Homepage"
 
 #. Lead Development
 #: i18n/english/luasrc/i18n/admin-core.en.lua:6
-msgid "c_leaddev"
+msgid "Lead Development"
 msgstr "Leitende Entwicklung"
 
 #. Contributing Developers
 #: i18n/english/luasrc/i18n/admin-core.en.lua:7
-msgid "c_contributors"
+msgid "Contributing Developers"
 msgstr "Mitwirkende Entwickler"
 
 #. Thanks To
 #: i18n/english/luasrc/i18n/admin-core.en.lua:8
-msgid "c_thanksto"
+msgid "Thanks To"
 msgstr "Dank an"
 
 #. Hello!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:9
-msgid "a_i_i_hello"
+msgid "Hello!"
 msgstr "Hallo!"
 
 #. This is the administration area of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:10
-msgid "a_i_i_admin1"
+msgid "This is the administration area of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>."
 msgstr "Dies ist der Administrationsbereich von LuCI."
 
 #. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a free, flexible, and user friendly graphical interface for configuring OpenWrt Kamikaze.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:11
-msgid "a_i_i_admin2"
+msgid "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a free, flexible, and user friendly graphical interface for configuring OpenWrt Kamikaze."
 msgstr ""
 "LuCI ist eine freie, flexible und benutzerfreundliche grafische Oberfläche "
 "zur Konfiguration von OpenWrt Kamikaze."
 
 #. On the following pages you can adjust all important settings of your router.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:12
-msgid "a_i_i_admin3"
+msgid "On the following pages you can adjust all important settings of your router."
 msgstr ""
 "Auf den folgenden Seiten können alle wichtigen Einstellungen des Routers "
 "vorgenommen werden."
 
 #. Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> changes have to be confirmed by clicking Changes - Save &amp; Apply before being applied.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:13
-msgid "a_i_i_admin4"
+msgid "Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> changes have to be confirmed by clicking Changes - Save & Apply before being applied."
 msgstr ""
 "Hinweis: In LuCI werden getätigte Änderungen erst nach einem Klick auf "
 "Änderungen - Speichern &amp; Anwenden angewandt."
 
 #. As we always want to improve this interface we are looking forward to your feedback and suggestions.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:14
-msgid "a_i_i_admin5"
+msgid "As we always want to improve this interface we are looking forward to your feedback and suggestions."
 msgstr ""
 "Wir sind natürlich stets darum bemüht, diese Oberfläche noch besser und "
 "intuitiver zu Gestalten und freuen uns über jegliche Art von Feedback oder "
@@ -95,29 +95,29 @@ msgstr ""
 
 #. And now have fun with your router!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:15
-msgid "a_i_i_admin6"
+msgid "And now have fun with your router!"
 msgstr "Und nun wünschen wir viel Spaß mit dem Router!"
 
 #. The <abbr title=\"Lua Configuration Interface\">LuCI</abbr> Team
 #: i18n/english/luasrc/i18n/admin-core.en.lua:16
-msgid "a_i_i_team"
+msgid "The <abbr title=\"Lua Configuration Interface\">LuCI</abbr> Team"
 msgstr "Das LuCI-Team"
 
 #. Here you can customize the settings and the functionality of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:17
-msgid "a_i_luci1"
+msgid "Here you can customize the settings and the functionality of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>."
 msgstr ""
 "Hier können Eigenschaften und die Funktionalität der Oberfläche angepasst "
 "werden."
 
 #. Post-commit actions
 #: i18n/english/luasrc/i18n/admin-core.en.lua:18
-msgid "a_i_ucicommit"
+msgid "Post-commit actions"
 msgstr "UCI-Befehle beim Anwenden"
 
 #. These commands will be executed automatically when a given <abbr title=\"Unified Configuration Interface\">UCI</abbr> configuration is committed allowing changes to be applied instantly.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:19
-msgid "a_i_ucicommit1"
+msgid "These commands will be executed automatically when a given <abbr title=\"Unified Configuration Interface\">UCI</abbr> configuration is committed allowing changes to be applied instantly."
 msgstr ""
 "Beim Anwenden der Konfiguration aus der Oberflächliche heraus können "
 "automatisch die relevanten Dienste neugestart werden, sodass Änderungen "
@@ -126,115 +126,115 @@ msgstr ""
 
 #. Files to be kept when flashing a new firmware
 #: i18n/english/luasrc/i18n/admin-core.en.lua:20
-msgid "a_i_keepflash"
+msgid "Files to be kept when flashing a new firmware"
 msgstr "Zu übernehmende Dateien bei Firmwareupgrade"
 
 #. When flashing a new firmware with <abbr title=\"Lua Configuration Interface\">LuCI</abbr> these files will be added to the new firmware installation.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:21
-msgid "a_i_keepflash1"
+msgid "When flashing a new firmware with <abbr title=\"Lua Configuration Interface\">LuCI</abbr> these files will be added to the new firmware installation."
 msgstr ""
 "Die folgenden Dateien und Verzeichnisse werden beim Aktualisieren der "
 "Firmware über die Oberfläche automatisch in die neue Firmware übernommen."
 
 #. Here you can find information about the current system status like <abbr title=\"Central Processing Unit\">CPU</abbr> clock frequency, memory usage or network interface data.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:22
-msgid "a_st_i_status1"
+msgid "Here you can find information about the current system status like <abbr title=\"Central Processing Unit\">CPU</abbr> clock frequency, memory usage or network interface data."
 msgstr ""
 "Hier finden sich Informationen über den aktuellen Status des Systems, "
 "beispielsweise Prozessortakt, Speicherauslastung und Netzwerkschnittstellen."
 
 #. Also kernel or service logfiles can be viewed here to get an overview over their current state.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:23
-msgid "a_st_i_status2"
+msgid "Also kernel or service logfiles can be viewed here to get an overview over their current state."
 msgstr ""
 "Zusätzlich können hier Protokolldaten, des Kernels und diverser "
 "Systemdienste eingesehen werden, um deren Zustand zu kontrollieren."
 
 #. <abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan
 #: i18n/english/luasrc/i18n/admin-core.en.lua:24
-msgid "iwscan"
+msgid "<abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan"
 msgstr "WLAN-Scan"
 
 #. Wifi networks in your local environment
 #: i18n/english/luasrc/i18n/admin-core.en.lua:25
-msgid "iwscan1"
+msgid "Wifi networks in your local environment"
 msgstr "Drahtlosnetzwerke in der lokalen Umgebung des Routers:"
 
 #. <abbr title=\"Encrypted\">Encr.</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:26
-msgid "iwscan_encr"
+msgid "<abbr title=\"Encrypted\">Encr.</abbr>"
 msgstr "Vers."
 
 #. Link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:27
-msgid "iwscan_link"
+msgid "Link"
 msgstr "Verb."
 
 #. Signal
 #: i18n/english/luasrc/i18n/admin-core.en.lua:28
-msgid "iwscan_signal"
+msgid "Signal"
 msgstr "Signal"
 
 #. Noise
 #: i18n/english/luasrc/i18n/admin-core.en.lua:29
-msgid "iwscan_noise"
+msgid "Noise"
 msgstr "Rausch"
 
 #. Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:30
-msgid "routes"
+msgid "Routes"
 msgstr "Routen"
 
 #. Netmask
 #: i18n/english/luasrc/i18n/admin-core.en.lua:31
-msgid "routes_netmask"
+msgid "Netmask"
 msgstr "Netzmaske"
 
 #. Gateway
 #: i18n/english/luasrc/i18n/admin-core.en.lua:32
-msgid "routes_gateway"
+msgid "Gateway"
 msgstr "Gateway"
 
 #. Metric
 #: i18n/english/luasrc/i18n/admin-core.en.lua:33
-msgid "routes_metric"
+msgid "Metric"
 msgstr "Metrik"
 
 #. Here you can configure the basic aspects of your device like its hostname or the timezone.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:34
-msgid "a_s_desc"
+msgid "Here you can configure the basic aspects of your device like its hostname or the timezone."
 msgstr ""
 "An dieser Stelle können Grundeinstellungen des Systems wie Hostname oder "
 "Zeitzone vorgenommen werden."
 
 #. Software
 #: i18n/english/luasrc/i18n/admin-core.en.lua:35
-msgid "a_s_packages"
+msgid "Software"
 msgstr "Paketverwaltung"
 
 #. Admin Password
 #: i18n/english/luasrc/i18n/admin-core.en.lua:36
-msgid "a_s_changepw"
+msgid "Admin Password"
 msgstr "Passwort ändern"
 
 #. OPKG-Configuration
 #: i18n/english/luasrc/i18n/admin-core.en.lua:37
-msgid "a_s_p_ipkg"
+msgid "OPKG-Configuration"
 msgstr "OPKG-Konfiguration"
 
 #. <abbr title=\"Secure Shell\">SSH</abbr>-Keys
 #: i18n/english/luasrc/i18n/admin-core.en.lua:38
-msgid "a_s_sshkeys"
+msgid "<abbr title=\"Secure Shell\">SSH</abbr>-Keys"
 msgstr "SSH-Schlüssel"
 
 #. Mount Points
 #: i18n/english/luasrc/i18n/admin-core.en.lua:39
-msgid "a_s_fstab"
+msgid "Mount Points"
 msgstr "Einhängepunkte"
 
 #. Change settings related to the system itself, its identification, installed hard- and software, authentication or mount points.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:40
-msgid "a_s_i_system1"
+msgid "Change settings related to the system itself, its identification, installed hard- and software, authentication or mount points."
 msgstr ""
 "Hier finden sich Einstellungen, die das System selbst, dessen Kennung, "
 "installierte Software und Hardware, Authentifizierung oder eingehängte "
@@ -242,539 +242,539 @@ msgstr ""
 
 #. These settings define the base of your system.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:41
-msgid "a_s_i_system2"
+msgid "These settings define the base of your system."
 msgstr ""
 "Diese Einstellungen definieren die Grundlage des Systems, auf dem die "
 "installierte Software aufbaut."
 
 #. Pay attention as any misconfiguration here may prevent your device from booting or may lock yourself out of it.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:42
-msgid "a_s_i_system3"
+msgid "Pay attention as any misconfiguration here may prevent your device from booting or may lock yourself out of it."
 msgstr ""
 "Beachte bitte, dass eine fehlerhafte Konfiguration den Start des Routers "
 "verhindern oder dich vom Zugriff auf diesen ausschließen kann."
 
 #. Interfaces
 #: i18n/english/luasrc/i18n/admin-core.en.lua:43
-msgid "a_s_if"
+msgid "Interfaces"
 msgstr "Schnittstellen"
 
 #. Bridge
 #: i18n/english/luasrc/i18n/admin-core.en.lua:44
-msgid "a_s_if_bridge"
+msgid "Bridge"
 msgstr "Netzwerkbrücke"
 
 #. ID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:45
-msgid "a_s_if_bridge_id"
+msgid "ID"
 msgstr "Bezeichner"
 
 #. Bridge Port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:46
-msgid "a_s_if_bridge_port"
+msgid "Bridge Port"
 msgstr "Port"
 
 #. STP
 #: i18n/english/luasrc/i18n/admin-core.en.lua:47
-msgid "a_s_if_bridge_stp"
+msgid "STP"
 msgstr "Spanning-Tree-Protokoll"
 
 #. Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:48
-msgid "a_s_if_device"
+msgid "Device"
 msgstr "Gerät"
 
 #. Ethernet Bridge
 #: i18n/english/luasrc/i18n/admin-core.en.lua:49
-msgid "a_s_if_ethbridge"
+msgid "Ethernet Bridge"
 msgstr "Netzwerkbrücke"
 
 #. Ethernet Adapter
 #: i18n/english/luasrc/i18n/admin-core.en.lua:50
-msgid "a_s_if_ethdev"
+msgid "Ethernet Adapter"
 msgstr "Netzwerkschnittstelle"
 
 #. Ethernet Switch
 #: i18n/english/luasrc/i18n/admin-core.en.lua:51
-msgid "a_s_if_ethswitch"
+msgid "Ethernet Switch"
 msgstr "Netzwerk Switch"
 
 #. Interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:52
-msgid "a_s_if_interface"
+msgid "Interface"
 msgstr "Schnittstelle"
 
 #. IP Configuration
 #: i18n/english/luasrc/i18n/admin-core.en.lua:53
-msgid "a_s_if_ipconfig"
+msgid "IP Configuration"
 msgstr "IP Konfiguration"
 
 #. Alias
 #: i18n/english/luasrc/i18n/admin-core.en.lua:54
-msgid "a_s_if_ipconfig_alias"
+msgid "Alias"
 msgstr "IP Alias"
 
 #. DHCP assigned
 #: i18n/english/luasrc/i18n/admin-core.en.lua:55
-msgid "a_s_if_ipconfig_dhcp"
+msgid "DHCP assigned"
 msgstr "durch DHCP zugewiesen"
 
 #. IPv6
 #: i18n/english/luasrc/i18n/admin-core.en.lua:56
-msgid "a_s_if_ipconfig_ipv6"
+msgid "IPv6"
 msgstr "IPv6 Konfiguration"
 
 #. Not configured
 #: i18n/english/luasrc/i18n/admin-core.en.lua:57
-msgid "a_s_if_ipconfig_none"
+msgid "Not configured"
 msgstr "nicht konfiguriert"
 
 #. Primary
 #: i18n/english/luasrc/i18n/admin-core.en.lua:58
-msgid "a_s_if_ipconfig_primary"
+msgid "Primary"
 msgstr "primär"
 
 # Funkkanal?
 #. Channel
 #: i18n/english/luasrc/i18n/admin-core.en.lua:59
-msgid "a_s_if_iwchannel"
+msgid "Channel"
 msgstr "WLAN-Kanal"
 
 # Betriebsmodus?
 #. Mode
 #: i18n/english/luasrc/i18n/admin-core.en.lua:60
-msgid "a_s_if_iwmode"
+msgid "Mode"
 msgstr "WLAN-Modus"
 
 #. Ad-Hoc
 #: i18n/english/luasrc/i18n/admin-core.en.lua:61
-msgid "a_s_if_iwmode_adhoc"
+msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
 #. Pseudo Ad-Hoc
 #: i18n/english/luasrc/i18n/admin-core.en.lua:62
-msgid "a_s_if_iwmode_ahdemo"
+msgid "Pseudo Ad-Hoc"
 msgstr "Pseudo-Ad-Hoc (Atheros)"
 
 #. Master
 #: i18n/english/luasrc/i18n/admin-core.en.lua:63
-msgid "a_s_if_iwmode_ap"
+msgid "Master"
 msgstr "Master"
 
 #. Master + WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:64
-msgid "a_s_if_iwmode_apwds"
+msgid "Master + WDS"
 msgstr "Master mit WDS"
 
 #. Client
 #: i18n/english/luasrc/i18n/admin-core.en.lua:65
-msgid "a_s_if_iwmode_sta"
+msgid "Client"
 msgstr "Client"
 
 #. Client + WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:66
-msgid "a_s_if_iwmode_stawds"
+msgid "Client + WDS"
 msgstr "Client mit WDS"
 
 #. WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:67
-msgid "a_s_if_iwmode_wds"
+msgid "WDS"
 msgstr "WDS"
 
 #. SSID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:68
-msgid "a_s_if_iwssid"
+msgid "SSID"
 msgstr "SSID"
 
 #. MAC
 #: i18n/english/luasrc/i18n/admin-core.en.lua:69
-msgid "a_s_if_mac"
+msgid "MAC"
 msgstr "MAC-Adresse"
 
 #. Pkts.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:70
-msgid "a_s_if_pkts"
+msgid "Pkts."
 msgstr "Pkt."
 
 #. Interface Status
 #: i18n/english/luasrc/i18n/admin-core.en.lua:71
-msgid "a_s_if_status"
+msgid "Interface Status"
 msgstr "Netzwerkschnittstellen-Status"
 
 #. Transfer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:72
-msgid "a_s_if_transfer"
+msgid "Transfer"
 msgstr "Transfer"
 
 # Ein / Aus, eingehend / ausgehend?
 #. RX
 #: i18n/english/luasrc/i18n/admin-core.en.lua:73
-msgid "a_s_if_transfer_rx"
+msgid "RX"
 msgstr "<abbr title=\"empfangene Pakete\">RX</abbr>"
 
 # same as RX
 #. TX
 #: i18n/english/luasrc/i18n/admin-core.en.lua:74
-msgid "a_s_if_transfer_tx"
+msgid "TX"
 msgstr "<abbr title=\"gesendete Pakete\">TX</abbr>"
 
 #. Type
 #: i18n/english/luasrc/i18n/admin-core.en.lua:75
-msgid "a_s_if_type"
+msgid "Type"
 msgstr "Typ"
 
 #. VLAN
 #: i18n/english/luasrc/i18n/admin-core.en.lua:76
-msgid "a_s_if_vlan"
+msgid "VLAN"
 msgstr "VLAN"
 
 #. Ports
 #: i18n/english/luasrc/i18n/admin-core.en.lua:77
-msgid "a_s_if_vlanports"
+msgid "Ports"
 msgstr "Ports"
 
 #. Wireless Adapter
 #: i18n/english/luasrc/i18n/admin-core.en.lua:78
-msgid "a_s_if_wifidev"
+msgid "Wireless Adapter"
 msgstr "WLAN-Gerät"
 
 #. Firewall
 #: i18n/english/luasrc/i18n/admin-core.en.lua:79
-msgid "a_s_ipt"
+msgid "Firewall"
 msgstr "Firewall"
 
 #. Actions
 #: i18n/english/luasrc/i18n/admin-core.en.lua:80
-msgid "a_s_ipt_actions"
+msgid "Actions"
 msgstr "Aktionen"
 
 #. Traffic
 #: i18n/english/luasrc/i18n/admin-core.en.lua:81
-msgid "a_s_ipt_bytes"
+msgid "Traffic"
 msgstr "Verkehr"
 
 #. Chain
 #: i18n/english/luasrc/i18n/admin-core.en.lua:82
-msgid "a_s_ipt_chain"
+msgid "Chain"
 msgstr "Kette"
 
 #. Destination
 #: i18n/english/luasrc/i18n/admin-core.en.lua:83
-msgid "a_s_ipt_destination"
+msgid "Destination"
 msgstr "Ziel"
 
 #. Flags
 #: i18n/english/luasrc/i18n/admin-core.en.lua:84
-msgid "a_s_ipt_flags"
+msgid "Flags"
 msgstr "Parameter"
 
 #. In
 #: i18n/english/luasrc/i18n/admin-core.en.lua:85
-msgid "a_s_ipt_inputif"
+msgid "In"
 msgstr "<abbr title=\"Eingehende Schnittstelle\">Ein</abbr>"
 
 #. No chains in this table
 #: i18n/english/luasrc/i18n/admin-core.en.lua:86
-msgid "a_s_ipt_nochains"
+msgid "No chains in this table"
 msgstr "Keine Ketten in dieser Tabelle"
 
 #. No Rules in this chain
 #: i18n/english/luasrc/i18n/admin-core.en.lua:87
-msgid "a_s_ipt_norules"
+msgid "No Rules in this chain"
 msgstr "Keine Regeln in dieser Kette"
 
 #. Options
 #: i18n/english/luasrc/i18n/admin-core.en.lua:88
-msgid "a_s_ipt_options"
+msgid "Options"
 msgstr "Optionen"
 
 #. Out
 #: i18n/english/luasrc/i18n/admin-core.en.lua:89
-msgid "a_s_ipt_outputif"
+msgid "Out"
 msgstr "<abbr title=\"Ausgehende Schnittstelle\">Aus</abbr>"
 
 #. Packets
 #: i18n/english/luasrc/i18n/admin-core.en.lua:90
-msgid "a_s_ipt_packets"
+msgid "Packets"
 msgstr "<abbr title=\"gezählte Pakete\">Pkt.</abbr>"
 
 #. Pkts.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:91
-msgid "a_s_ipt_pkts"
+msgid "Pkts."
 msgstr "<abbr title=\"gezählte Pakete\">Pkt.</abbr>"
 
 #. Policy
 #: i18n/english/luasrc/i18n/admin-core.en.lua:92
-msgid "a_s_ipt_policy"
+msgid "Policy"
 msgstr "Standardregel"
 
 #. Prot.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:93
-msgid "a_s_ipt_prot"
+msgid "Prot."
 msgstr "<abbr title=\"Netzwerkprotokoll\">Prot.</abbr>"
 
 #. References
 #: i18n/english/luasrc/i18n/admin-core.en.lua:94
-msgid "a_s_ipt_references"
+msgid "References"
 msgstr "Verweise"
 
 #. Reset Counters
 #: i18n/english/luasrc/i18n/admin-core.en.lua:95
-msgid "a_s_ipt_reset"
+msgid "Reset Counters"
 msgstr "Zähler zurücksetzen"
 
 #. Restart Firewall
 #: i18n/english/luasrc/i18n/admin-core.en.lua:96
-msgid "a_s_ipt_restart"
+msgid "Restart Firewall"
 msgstr "Firewall neu starten"
 
 #. #
 #: i18n/english/luasrc/i18n/admin-core.en.lua:97
-msgid "a_s_ipt_rulenum"
+msgid "#"
 msgstr "#"
 
 #. Source
 #: i18n/english/luasrc/i18n/admin-core.en.lua:98
-msgid "a_s_ipt_source"
+msgid "Source"
 msgstr "Quelle"
 
 #. Firewall Status
 #: i18n/english/luasrc/i18n/admin-core.en.lua:99
-msgid "a_s_ipt_status"
+msgid "Firewall Status"
 msgstr "Firewall-Status"
 
 #. Table
 #: i18n/english/luasrc/i18n/admin-core.en.lua:100
-msgid "a_s_ipt_table"
+msgid "Table"
 msgstr "Tabelle"
 
 #. Target
 #: i18n/english/luasrc/i18n/admin-core.en.lua:101
-msgid "a_s_ipt_target"
+msgid "Target"
 msgstr "Aktion"
 
 #. Perform Actions
 #: i18n/english/luasrc/i18n/admin-core.en.lua:102
-msgid "a_s_packages_do"
+msgid "Perform Actions"
 msgstr "Aktionen ausführen"
 
 #. Install
 #: i18n/english/luasrc/i18n/admin-core.en.lua:103
-msgid "a_s_packages_install"
+msgid "Install"
 msgstr "Installation von"
 
 #. Download and install package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:104
-msgid "a_s_packages_installurl"
+msgid "Download and install package"
 msgstr "Paket herunterladen und installieren"
 
 #. Edit package lists and installation targets
 #: i18n/english/luasrc/i18n/admin-core.en.lua:105
-msgid "a_s_packages_ipkg"
+msgid "Edit package lists and installation targets"
 msgstr "Paketlisten und Installationsziele bearbeiten"
 
 #. Package name
 #: i18n/english/luasrc/i18n/admin-core.en.lua:106
-msgid "a_s_packages_name"
+msgid "Package name"
 msgstr "Paketname"
 
 #. Remove
 #: i18n/english/luasrc/i18n/admin-core.en.lua:107
-msgid "a_s_packages_remove"
+msgid "Remove"
 msgstr "Deinstallation von"
 
 #. Find package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:108
-msgid "a_s_packages_search"
+msgid "Find package"
 msgstr "Paket suchen"
 
 #. Package lists updated
 #: i18n/english/luasrc/i18n/admin-core.en.lua:109
-msgid "a_s_packages_update"
+msgid "Package lists updated"
 msgstr "Paketlisten wurden aktualisiert"
 
 #. Update package lists
 #: i18n/english/luasrc/i18n/admin-core.en.lua:110
-msgid "a_s_packages_updatelist"
+msgid "Update package lists"
 msgstr "Paketlisten aktualisieren"
 
 #. Upgrade installed packages
 #: i18n/english/luasrc/i18n/admin-core.en.lua:111
-msgid "a_s_packages_upgrade"
+msgid "Upgrade installed packages"
 msgstr "Installierte Pakete aktualisieren"
 
 #. Could not set default destination
 #: i18n/english/luasrc/i18n/admin-core.en.lua:112
-msgid "a_s_packages_code1"
+msgid "Could not set default destination"
 msgstr "Konnte das Zielverzeichnis nicht auswählen"
 
 #. Error parsing config file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:113
-msgid "a_s_packages_code2"
+msgid "Error parsing config file"
 msgstr "Fehler beim Lesen der Konfigurationsdatei"
 
 #. Could not create temporary directory (ran out of space?)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:114
-msgid "a_s_packages_code3"
+msgid "Could not create temporary directory (ran out of space?)"
 msgstr "Konnte kein temporäres Verzeichnis erstellen (kein Platz mehr frei?)"
 
 #. Could not get adminstrative lock (ran out of space?)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:115
-msgid "a_s_packages_code4"
+msgid "Could not get adminstrative lock (ran out of space?)"
 msgstr "Konnte keine Lock-Datei erzeugen (kein Platz mehr frei?)"
 
 #. Unsatisfied Dependencies
 #: i18n/english/luasrc/i18n/admin-core.en.lua:116
-msgid "a_s_packages_code5"
+msgid "Unsatisfied Dependencies"
 msgstr "Ein oder mehrere Abhängigkeiten konnten nicht aufgelöst werden"
 
 #. Refused to remove essential package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:117
-msgid "a_s_packages_code6"
+msgid "Refused to remove essential package"
 msgstr "Deinstallation von essentiellem Paket verweigert"
 
 #. Package has dependents
 #: i18n/english/luasrc/i18n/admin-core.en.lua:118
-msgid "a_s_packages_code7"
+msgid "Package has dependents"
 msgstr "Andere Pakete hängen noch von diesem Paket ab"
 
 #. Package has no installation candidate (wrong name?)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:119
-msgid "a_s_packages_code8"
+msgid "Package has no installation candidate (wrong name?)"
 msgstr "Paket hat keinen Installationskandidaten (falscher Name?)"
 
 #. Package has no available architecture 
 #: i18n/english/luasrc/i18n/admin-core.en.lua:120
-msgid "a_s_packages_code9"
+msgid "Package has no available architecture "
 msgstr "Paket hat keine verfügbare Architektur definiert"
 
 #. Package is not trusted
 #: i18n/english/luasrc/i18n/admin-core.en.lua:121
-msgid "a_s_packages_code10"
+msgid "Package is not trusted"
 msgstr "Das Paket ist nicht vertrauenswürdig"
 
 #. Error while downloading
 #: i18n/english/luasrc/i18n/admin-core.en.lua:122
-msgid "a_s_packages_code11"
+msgid "Error while downloading"
 msgstr "Fehler beim Herunterladen"
 
 #. Conflicts with other packages
 #: i18n/english/luasrc/i18n/admin-core.en.lua:123
-msgid "a_s_packages_code12"
+msgid "Conflicts with other packages"
 msgstr "Konflikte mit anderem Paket"
 
 #. Package is already installed
 #: i18n/english/luasrc/i18n/admin-core.en.lua:124
-msgid "a_s_packages_code13"
+msgid "Package is already installed"
 msgstr "Paket ist bereits installiert"
 
 #. Package has unresolved dependencies
 #: i18n/english/luasrc/i18n/admin-core.en.lua:125
-msgid "a_s_packages_code14"
+msgid "Package has unresolved dependencies"
 msgstr "Ein oder mehrere Abhängigkeiten konnten nicht aufgelöst werden"
 
 #. Refused to downgrade package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:126
-msgid "a_s_packages_code15"
+msgid "Refused to downgrade package"
 msgstr "Installation von älterer Paketversion verweigert"
 
 #. Package manager ran out of space
 #: i18n/english/luasrc/i18n/admin-core.en.lua:127
-msgid "a_s_packages_code16"
+msgid "Package manager ran out of space"
 msgstr "Nicht genug verfügbarer Arbeitsspeicher"
 
 #. Bad signature while verifiying package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:128
-msgid "a_s_packages_code17"
+msgid "Bad signature while verifiying package"
 msgstr "Kaputte Signatur beim Versuch das Paket zu verifizieren"
 
 #. MD5 error while verifiying package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:129
-msgid "a_s_packages_code18"
+msgid "MD5 error while verifiying package"
 msgstr "Falsche Prüfsumme beim Versuch das Paket zu verifizieren"
 
 #. Internal error occured
 #: i18n/english/luasrc/i18n/admin-core.en.lua:130
-msgid "a_s_packages_code19"
+msgid "Internal error occured"
 msgstr "Interner Fehler aufgetreten"
 
 #. Package lists
 #: i18n/english/luasrc/i18n/admin-core.en.lua:131
-msgid "a_s_p_ipkg_pkglists"
+msgid "Package lists"
 msgstr "Paketlisten"
 
 #. Installation targets
 #: i18n/english/luasrc/i18n/admin-core.en.lua:132
-msgid "a_s_p_ipkg_targets"
+msgid "Installation targets"
 msgstr "Installationsziele"
 
 #. Change the password of the system administrator (User <code>root</code>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:133
-msgid "a_s_changepw1"
+msgid "Change the password of the system administrator (User <code>root</code>)"
 msgstr "Ändert das Passwort des Systemverwalters (Benutzer \"root\")"
 
 #. Password successfully changed
 #: i18n/english/luasrc/i18n/admin-core.en.lua:134
-msgid "a_s_changepw_changed"
+msgid "Password successfully changed"
 msgstr "Passwort erfolgreich geändert"
 
 #. Error: Passwords do not match
 #: i18n/english/luasrc/i18n/admin-core.en.lua:135
-msgid "a_s_changepw_nomatch"
+msgid "Error: Passwords do not match"
 msgstr "Fehler: Die Passwörter stimmen nicht überein"
 
 #. Here you can paste public <abbr title=\"Secure Shell\">SSH</abbr>-Keys (one per line) for <abbr title=\"Secure Shell\">SSH</abbr> public-key authentication.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:136
-msgid "a_s_sshkeys1"
+msgid "Here you can paste public <abbr title=\"Secure Shell\">SSH</abbr>-Keys (one per line) for <abbr title=\"Secure Shell\">SSH</abbr> public-key authentication."
 msgstr ""
 "Hier können öffentliche SSH-Schlüssel (einer pro Zeile) zur "
 "Authentifizierung abgelegt werden."
 
 #. Mount Points
 #: i18n/english/luasrc/i18n/admin-core.en.lua:137
-msgid "a_s_fstab_mountpoints"
+msgid "Mount Points"
 msgstr "Einhängepunkte"
 
 #. Mount Points define at which point a memory device will be attached to the filesystem
 #: i18n/english/luasrc/i18n/admin-core.en.lua:138
-msgid "a_s_fstab_mountpoints1"
+msgid "Mount Points define at which point a memory device will be attached to the filesystem"
 msgstr ""
 "Einhängepunkte bestimmen, an welcher Stelle des Dateisystems bestimmte "
 "Laufwerke und Speicher zur Verwendung eingebunden werden."
 
 #. Mounted file systems
 #: i18n/english/luasrc/i18n/admin-core.en.lua:139
-msgid "a_s_fstab_active"
+msgid "Mounted file systems"
 msgstr "Eingehängte Dateisysteme"
 
 #. Used
 #: i18n/english/luasrc/i18n/admin-core.en.lua:140
-msgid "a_s_fstab_used"
+msgid "Used"
 msgstr "Belegt"
 
 #. Available
 #: i18n/english/luasrc/i18n/admin-core.en.lua:141
-msgid "a_s_fstab_avail"
+msgid "Available"
 msgstr "Verfügbar"
 
 #. Mount Point
 #: i18n/english/luasrc/i18n/admin-core.en.lua:142
-msgid "a_s_fstab_mountpoint"
+msgid "Mount Point"
 msgstr "Einhängepunkt"
 
 #. The device file of the memory or partition (<abbr title=\"for example\">e.g.</abbr> <code>/dev/sda1</code>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:143
-msgid "a_s_fstab_device1"
+msgid "The device file of the memory or partition (<abbr title=\"for example\">e.g.</abbr> <code>/dev/sda1</code>)"
 msgstr "Die Gerätedatei des Speichers oder der Partition (z.B.: /dev/sda)"
 
 #. The filesystem that was used to format the memory (<abbr title=\"for example\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></samp>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:144
-msgid "a_s_fstab_fs1"
+msgid "The filesystem that was used to format the memory (<abbr title=\"for example\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></samp>)"
 msgstr "Das Dateisystem mit dem der Speicher formatiert ist (z.B.: ext3)"
 
 #. If your physical memory is insufficient unused data can be temporarily swapped to a swap-device resulting in a higher amount of usable <abbr title=\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very slow process as the swap-device cannot be accessed with the high datarates of the <abbr title=\"Random Access Memory\">RAM</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:145
-msgid "a_s_fstab_swap1"
+msgid "If your physical memory is insufficient unused data can be temporarily swapped to a swap-device resulting in a higher amount of usable <abbr title=\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very slow process as the swap-device cannot be accessed with the high datarates of the <abbr title=\"Random Access Memory\">RAM</abbr>."
 msgstr ""
 "Falls der Arbeitsspeicher des Routers nicht ausreicht, kann dieser nicht "
 "benutzte Daten zeitweise auf einem SWAP-Laufwerk auslagern um so die "
@@ -783,66 +783,66 @@ msgstr ""
 
 #. Reboots the operating system of your device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:146
-msgid "a_s_reboot1"
+msgid "Reboots the operating system of your device"
 msgstr "Startet das Betriebssystem des Routers neu."
 
 #. Perform reboot
 #: i18n/english/luasrc/i18n/admin-core.en.lua:147
-msgid "a_s_reboot_do"
+msgid "Perform reboot"
 msgstr "Neustart durchführen"
 
 #. Please wait: Device rebooting...
 #: i18n/english/luasrc/i18n/admin-core.en.lua:148
-msgid "a_s_reboot_running"
+msgid "Please wait: Device rebooting..."
 msgstr "Bitte warten: Neustart wird durchgeführt..."
 
 #. Warning: There are unsaved changes that will be lost while rebooting!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:149
-msgid "a_s_reboot_u"
+msgid "Warning: There are unsaved changes that will be lost while rebooting!"
 msgstr ""
 "Warnung: Es gibt ungespeicherte Änderungen, die beim Neustart verloren "
 "gehen!"
 
 #. Changes applied.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:150
-msgid "a_s_applyreboot1"
+msgid "Changes applied."
 msgstr "Änderungen angewandt."
 
 #. Backup / Restore
 #: i18n/english/luasrc/i18n/admin-core.en.lua:151
-msgid "a_s_backup"
+msgid "Backup / Restore"
 msgstr "Sichern / Wiederherstellen"
 
 #. Create backup
 #: i18n/english/luasrc/i18n/admin-core.en.lua:152
-msgid "a_s_backup_backup"
+msgid "Create backup"
 msgstr "Sicherung erstellen"
 
 #. Backup Archive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:153
-msgid "a_s_backup_archive"
+msgid "Backup Archive"
 msgstr "Sicherungsarchiv"
 
 #. Reset router to defaults
 #: i18n/english/luasrc/i18n/admin-core.en.lua:154
-msgid "a_s_backup_reset"
+msgid "Reset router to defaults"
 msgstr "Grundeinstellungen wiederherstellen"
 
 #. Proceed reverting all settings and resetting to firmware defaults?
 #: i18n/english/luasrc/i18n/admin-core.en.lua:155
-msgid "a_s_backup_reset1"
+msgid "Proceed reverting all settings and resetting to firmware defaults?"
 msgstr ""
 "Alle aktuellen Einstellungen verwerfen und Grundeinstellungen "
 "wiederherstellen?"
 
 #. Restore backup
 #: i18n/english/luasrc/i18n/admin-core.en.lua:156
-msgid "a_s_backup_restore"
+msgid "Restore backup"
 msgstr "Sicherung wiederherstellen"
 
 #. Here you can backup and restore your router configuration and - if possible - reset the router to the default settings.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:157
-msgid "a_s_backup1"
+msgid "Here you can backup and restore your router configuration and - if possible - reset the router to the default settings."
 msgstr ""
 "Auf dieser Seite können Sicherungen der Konfiguration erstellt und "
 "eingespielt werden und - wenn möglich - die Grundeinstellungen "
@@ -851,24 +851,24 @@ msgstr ""
 # so okey?
 #. <abbr title=\"Hypertext Transfer Protocol\">HTTP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:158
-msgid "a_srv_http"
+msgid "<abbr title=\"Hypertext Transfer Protocol\">HTTP</abbr>-Server"
 msgstr "<abbr title=\"Hypertext Transfer Protocol\">HTTP-</abbr>-Server"
 
 #. <abbr title=\"Secure Shell\">SSH</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:159
-msgid "a_srv_ssh"
+msgid "<abbr title=\"Secure Shell\">SSH</abbr>-Server"
 msgstr "<abbr title=\"Secure Shell\">SSH</abbr>-Server"
 
 #. Services and daemons perform certain tasks on your device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:160
-msgid "a_srv_services1"
+msgid "Services and daemons perform certain tasks on your device."
 msgstr ""
 "Dienste und Hintergrundprozesse stellen den Großteil der Funktionalitäten "
 "auf dem Router zur Verfügung."
 
 #. Most of them are network servers, that offer a certain service for your device or network like shell access, serving webpages like <abbr title=\"Lua Configuration Interface\">LuCI</abbr>, doing mesh routing, sending e-mails, ...
 #: i18n/english/luasrc/i18n/admin-core.en.lua:161
-msgid "a_srv_services2"
+msgid "Most of them are network servers, that offer a certain service for your device or network like shell access, serving webpages like <abbr title=\"Lua Configuration Interface\">LuCI</abbr>, doing mesh routing, sending e-mails, ..."
 msgstr ""
 "Es handelt sich hierbei meist um Netzwerkserver, die verschiedene Aufgaben "
 "auf dem Router erfüllen, beispielsweise Shell-Zugang ermöglichen oder diese "
@@ -876,85 +876,85 @@ msgstr ""
 
 #. A small webserver which can be used to serve <abbr title=\"Lua Configuration Interface\">LuCI</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:162
-msgid "a_srv_http1"
+msgid "A small webserver which can be used to serve <abbr title=\"Lua Configuration Interface\">LuCI</abbr>."
 msgstr ""
 "Ein kleiner Webserver, der für die Bereitstellung von LuCI genutzt werden "
 "kann."
 
 #. Authentication Realm
 #: i18n/english/luasrc/i18n/admin-core.en.lua:163
-msgid "a_srv_http_authrealm"
+msgid "Authentication Realm"
 msgstr "Anmeldeaufforderung"
 
 #. The realm which will be displayed at the authentication prompt for protected pages.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:164
-msgid "a_srv_http_authrealm1"
+msgid "The realm which will be displayed at the authentication prompt for protected pages."
 msgstr "Aufforderungstext zum Anmelden im Administrationsbereich"
 
 #. defaults to <code>/etc/httpd.conf</code>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:165
-msgid "a_srv_http_config1"
+msgid "defaults to <code>/etc/httpd.conf</code>"
 msgstr "nutzt <code>/etc/httpd.conf</code> wenn leer"
 
 #. Document root
 #: i18n/english/luasrc/i18n/admin-core.en.lua:166
-msgid "a_srv_http_root"
+msgid "Document root"
 msgstr "Wurzelverzeichnis"
 
 #. Enable Keep-Alive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:167
-msgid "a_srv_http_keepalive"
+msgid "Enable Keep-Alive"
 msgstr "Keep-Alive aktivieren"
 
 #. Connection timeout
 #: i18n/english/luasrc/i18n/admin-core.en.lua:168
-msgid "a_srv_http_timeout"
+msgid "Connection timeout"
 msgstr "Verbindungszeitlimit"
 
 #. Plugin path
 #: i18n/english/luasrc/i18n/admin-core.en.lua:169
-msgid "a_srv_http_path"
+msgid "Plugin path"
 msgstr "Pluginpfad"
 
 #. A lightweight HTTP/1.1 webserver written in C and Lua designed to serve LuCI
 #: i18n/english/luasrc/i18n/admin-core.en.lua:170
-msgid "a_srv_lucittpd"
+msgid "A lightweight HTTP/1.1 webserver written in C and Lua designed to serve LuCI"
 msgstr ""
 "Ein schlanker HTTP/1.1 webserver in C und Lua geschrieben um LuCI zu "
 "betreiben."
 
 #. Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:171
-msgid "a_srv_dropbear1"
+msgid "Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
 msgstr ""
 "Der SSH-Server ermöglicht Shell-Zugriff über das Netzwerk und bietet einen "
 "integrierten SCP-Dienst."
 
 #. Password authentication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:172
-msgid "a_srv_d_pwauth"
+msgid "Password authentication"
 msgstr "Passwortanmeldung"
 
 #. Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:173
-msgid "a_srv_d_pwauth1"
+msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
 msgstr "Erlaube Anmeldung per Passwort"
 
 #. Channel
 #: i18n/english/luasrc/i18n/admin-core.en.lua:174
-msgid "a_w_channel"
+msgid "Channel"
 msgstr "Funkkanal"
 
 #. On this pages you can find configuration options for <abbr title=\"Wireless Local Area Network\">WLAN</abbr> based wireless networks.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:175
-msgid "a_w_wifi1"
+msgid "On this pages you can find configuration options for <abbr title=\"Wireless Local Area Network\">WLAN</abbr> based wireless networks."
 msgstr ""
 "Hier finden sich Konfiugrationsmöglichkeiten für Drahtlos-Netzwerke nach dem "
 "WLAN-Standard."
 
 #. You can easily integrate your 802.11a/b/g/n-devices into your physical network and use the virtual adapter support to build wireless repeaters or offer several networks with one device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:176
-msgid "a_w_wifi2"
+msgid "You can easily integrate your 802.11a/b/g/n-devices into your physical network and use the virtual adapter support to build wireless repeaters or offer several networks with one device."
 msgstr ""
 "802.11b/g/a/n-Geräte können so einfach in das bestehende physische Netzwerk "
 "integriert werden. Die Unterstützung von virtuellen Adaptern ermöglicht auch "
@@ -963,49 +963,49 @@ msgstr ""
 
 #. There is support for Managed, Client, Ad-Hoc and <abbr title=\"Wireless Distribution System\">WDS</abbr> operating modes as well as <abbr title=\"Wi-Fi Protected Access\">WPA</abbr> and <abbr title=\"Wi-Fi Protected Access 2\">WPA2</abbr> encryption for secure communnication.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:177
-msgid "a_w_wifi3"
+msgid "There is support for Managed, Client, Ad-Hoc and <abbr title=\"Wireless Distribution System\">WDS</abbr> operating modes as well as <abbr title=\"Wi-Fi Protected Access\">WPA</abbr> and <abbr title=\"Wi-Fi Protected Access 2\">WPA2</abbr> encryption for secure communnication."
 msgstr ""
 "Es werden Managed, Client, Ad-Hoc und WDS-Modus unterstützt sowie WPA und "
 "WPA2-Verschlüsselung zur gesicherten Kommunikation."
 
 #. Here you can configure installed wifi devices.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:178
-msgid "a_w_devices1"
+msgid "Here you can configure installed wifi devices."
 msgstr "An dieser Stelle können eingebaute WLAN-Geräte konfiguriert werden."
 
 #. Transmit Antenna
 #: i18n/english/luasrc/i18n/admin-core.en.lua:179
-msgid "a_w_txantenna"
+msgid "Transmit Antenna"
 msgstr "Sendeantenne"
 
 #. Receive Antenna
 #: i18n/english/luasrc/i18n/admin-core.en.lua:180
-msgid "a_w_rxantenna"
+msgid "Receive Antenna"
 msgstr "Empfangsantenne"
 
 #. Distance to furthest station (in meter)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:181
-msgid "a_w_distance1"
+msgid "Distance to furthest station (in meter)"
 msgstr "Distanz zum am weitesten entfernten Funkpartner (m)"
 
 #. Diversity
 #: i18n/english/luasrc/i18n/admin-core.en.lua:182
-msgid "a_w_diversity"
+msgid "Diversity"
 msgstr "Diversität"
 
 #. Country Code
 #: i18n/english/luasrc/i18n/admin-core.en.lua:183
-msgid "a_w_countrycode"
+msgid "Country Code"
 msgstr "Ländercode"
 
 #. Connection Limit
 #: i18n/english/luasrc/i18n/admin-core.en.lua:184
-msgid "a_w_connlimit"
+msgid "Connection Limit"
 msgstr "Verbindungslimit"
 
 #. You can run several wifi networks with one device. Be aware that there are certain hardware and driverspecific restrictions. Normally you can operate 1 Ad-Hoc or up to 3 Master-Mode and 1 Client-Mode network simultaneously.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:185
-msgid "a_w_networks1"
+msgid "You can run several wifi networks with one device. Be aware that there are certain hardware and driverspecific restrictions. Normally you can operate 1 Ad-Hoc or up to 3 Master-Mode and 1 Client-Mode network simultaneously."
 msgstr ""
 "Pro WLAN-Gerät können mehrere Netze bereitgestellt werden. Es sollte "
 "beachtet werden, dass es hardware- / treiberspezifische Einschränkungen "
@@ -1014,93 +1014,93 @@ msgstr ""
 
 #. Network Name (<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:186
-msgid "a_w_netid"
+msgid "Network Name (<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>)"
 msgstr "Netzkennung (ESSID)"
 
 #. Add the Wifi network to physical network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:187
-msgid "a_w_network1"
+msgid "Add the Wifi network to physical network"
 msgstr "WLAN-Netz zu Netzwerk hinzufügen"
 
 #.  - Create new Network - 
 #: i18n/english/luasrc/i18n/admin-core.en.lua:188
-msgid "a_w_netmanual"
+msgid " - Create new Network - "
 msgstr "- Neues Netzwerk erstellen -"
 
 #. Transmit Power
 #: i18n/english/luasrc/i18n/admin-core.en.lua:189
-msgid "a_w_txpwr"
+msgid "Transmit Power"
 msgstr "Sendeleistung"
 
 #. Broadcom Frameburst
 #: i18n/english/luasrc/i18n/admin-core.en.lua:190
-msgid "a_w_brcmburst"
+msgid "Broadcom Frameburst"
 msgstr "Broadcom-Frameburst"
 
 #. Atheros Frameburst
 #: i18n/english/luasrc/i18n/admin-core.en.lua:191
-msgid "a_w_athburst"
+msgid "Atheros Frameburst"
 msgstr "Atheros-Frameburst"
 
 #. RadiusServer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:192
-msgid "a_w_radiussrv"
+msgid "RadiusServer"
 msgstr "Radius-Server"
 
 #. Radius-Port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:193
-msgid "a_w_radiusport"
+msgid "Radius-Port"
 msgstr "Radius-Port"
 
 #. AP-Isolation
 #: i18n/english/luasrc/i18n/admin-core.en.lua:194
-msgid "a_w_apisolation"
+msgid "AP-Isolation"
 msgstr "AP-Isolation"
 
 #. Prevents Client to Client communication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:195
-msgid "a_w_apisolation1"
+msgid "Prevents Client to Client communication"
 msgstr "Unterbindet Client-Client-Verkehr"
 
 #. Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:196
-msgid "a_w_hideessid"
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "ESSID verstecken"
 
 #. Access Point
 #: i18n/english/luasrc/i18n/admin-core.en.lua:197
-msgid "a_w_ap"
+msgid "Access Point"
 msgstr "Access Point"
 
 #. Ad-Hoc
 #: i18n/english/luasrc/i18n/admin-core.en.lua:198
-msgid "a_w_adhoc"
+msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
 #. Pseudo Ad-Hoc (ahdemo)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:199
-msgid "a_w_ahdemo"
+msgid "Pseudo Ad-Hoc (ahdemo)"
 msgstr "Pseudo Ad-Hoc (ahdemo)"
 
 #. Client
 #: i18n/english/luasrc/i18n/admin-core.en.lua:200
-msgid "a_w_client"
+msgid "Client"
 msgstr "Client"
 
 #. WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:201
-msgid "a_w_wds"
+msgid "WDS"
 msgstr "WDS"
 
 #. Monitor
 #: i18n/english/luasrc/i18n/admin-core.en.lua:202
-msgid "a_w_monitor"
+msgid "Monitor"
 msgstr "Monitor"
 
 # Nur für NAT-Firewalls?
 #. Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> firewalls
 #: i18n/english/luasrc/i18n/admin-core.en.lua:203
-msgid "dhcp_dnsmasq_desc"
+msgid "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> firewalls"
 msgstr ""
 "Dnsmasq ist ein kombinierter <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr>-Server und<abbr title=\"Domain Name "
@@ -1109,253 +1109,253 @@ msgstr ""
 
 #. Domain required
 #: i18n/english/luasrc/i18n/admin-core.en.lua:204
-msgid "dhcp_dnsmasq_domainneeded"
+msgid "Domain required"
 msgstr "Anfragen nur mit Domain"
 
 #. Don&#39;t forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without <abbr title=\"Domain Name System\">DNS</abbr>-Name
 #: i18n/english/luasrc/i18n/admin-core.en.lua:205
-msgid "dhcp_dnsmasq_domainneeded_desc"
+msgid "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without <abbr title=\"Domain Name System\">DNS</abbr>-Name"
 msgstr "Anfragen ohne Domainnamen nicht weiterleiten"
 
 #. Authoritative
 #: i18n/english/luasrc/i18n/admin-core.en.lua:206
-msgid "dhcp_dnsmasq_authoritative"
+msgid "Authoritative"
 msgstr "Authoritativ"
 
 #. This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> in the local network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:207
-msgid "dhcp_dnsmasq_authoritative_desc"
+msgid "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> in the local network"
 msgstr "Dies ist der einzige DHCP im lokalen Netz"
 
 #. Filter private
 #: i18n/english/luasrc/i18n/admin-core.en.lua:208
-msgid "dhcp_dnsmasq_boguspriv"
+msgid "Filter private"
 msgstr "Private Anfragen filtern"
 
 #. Don&#39;t forward reverse lookups for local networks
 #: i18n/english/luasrc/i18n/admin-core.en.lua:209
-msgid "dhcp_dnsmasq_boguspriv_desc"
+msgid "Don't forward reverse lookups for local networks"
 msgstr "Reverse DNS-Anfragen für lokale Netze nicht weiterleiten"
 
 #. Filter useless
 #: i18n/english/luasrc/i18n/admin-core.en.lua:210
-msgid "dhcp_dnsmasq_filterwin2k"
+msgid "Filter useless"
 msgstr "Windowsanfragen filtern"
 
 #. filter useless <abbr title=\"Domain Name System\">DNS</abbr>-queries of Windows-systems
 #: i18n/english/luasrc/i18n/admin-core.en.lua:211
-msgid "dhcp_dnsmasq_filterwin2k_desc"
+msgid "filter useless <abbr title=\"Domain Name System\">DNS</abbr>-queries of Windows-systems"
 msgstr "nutzlose DNS-Anfragen aktueller Windowssysteme filtern"
 
 #. Localise queries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:212
-msgid "dhcp_dnsmasq_localisequeries"
+msgid "Localise queries"
 msgstr "Lokalisiere Anfragen"
 
 #. localises the hostname depending on its subnet
 #: i18n/english/luasrc/i18n/admin-core.en.lua:213
-msgid "dhcp_dnsmasq_localisequeries_desc"
+msgid "localises the hostname depending on its subnet"
 msgstr "Gibt die Adresse eines Hostnamen entsprechend seines Subnetzes zurück"
 
 #. Local Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:214
-msgid "dhcp_dnsmasq_local"
+msgid "Local Server"
 msgstr "Lokale Server"
 
 #. Local Domain
 #: i18n/english/luasrc/i18n/admin-core.en.lua:215
-msgid "dhcp_dnsmasq_domain"
+msgid "Local Domain"
 msgstr "Lokale Domain"
 
 #. Expand Hosts
 #: i18n/english/luasrc/i18n/admin-core.en.lua:216
-msgid "dhcp_dnsmasq_expandhosts"
+msgid "Expand Hosts"
 msgstr "Erweitere Hosts"
 
 #. adds domain names to hostentries in the resolv file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:217
-msgid "dhcp_dnsmasq_expandhosts_desc"
+msgid "adds domain names to hostentries in the resolv file"
 msgstr "Fügt Domainnamen zu einfachen Hosteinträgen in der Resolvdatei hinzu"
 
 #. don&#39;t cache unknown
 #: i18n/english/luasrc/i18n/admin-core.en.lua:218
-msgid "dhcp_dnsmasq_nonegcache"
+msgid "don't cache unknown"
 msgstr "Unbekannte nicht cachen"
 
 #. prevents caching of negative <abbr title=\"Domain Name System\">DNS</abbr>-replies
 #: i18n/english/luasrc/i18n/admin-core.en.lua:219
-msgid "dhcp_dnsmasq_nonegcache_desc"
+msgid "prevents caching of negative <abbr title=\"Domain Name System\">DNS</abbr>-replies"
 msgstr "Negative DNS-Antworten nicht zwischenspeichern"
 
 #. Use <code>/etc/ethers</code>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:220
-msgid "dhcp_dnsmasq_readethers"
+msgid "Use <code>/etc/ethers</code>"
 msgstr "Verwende /etc/ethers"
 
 #. Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:221
-msgid "dhcp_dnsmasq_readethers_desc"
+msgid "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server"
 msgstr "Lese Informationen aus /etc/ethers um den DHCP-Server zu konfigurieren"
 
 #. Leasefile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:222
-msgid "dhcp_dnsmasq_leasefile"
+msgid "Leasefile"
 msgstr "Leasedatei"
 
 #. file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-leases will be stored
 #: i18n/english/luasrc/i18n/admin-core.en.lua:223
-msgid "dhcp_dnsmasq_leasefile_desc"
+msgid "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-leases will be stored"
 msgstr "Speicherort für vergebenen DHCP-Adressen"
 
 #. Resolvfile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:224
-msgid "dhcp_dnsmasq_resolvfile"
+msgid "Resolvfile"
 msgstr "Resolvdatei"
 
 #. local <abbr title=\"Domain Name System\">DNS</abbr> file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:225
-msgid "dhcp_dnsmasq_resolvfile_desc"
+msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "Lokale DNS-Datei"
 
 #. Ignore <code>/etc/hosts</code>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:226
-msgid "dhcp_dnsmasq_nohosts"
+msgid "Ignore <code>/etc/hosts</code>"
 msgstr "Ignoriere /etc/hosts"
 
 #. Strict order
 #: i18n/english/luasrc/i18n/admin-core.en.lua:227
-msgid "dhcp_dnsmasq_strictorder"
+msgid "Strict order"
 msgstr "Strikte Reihenfolge"
 
 #. <abbr title=\"Domain Name System\">DNS</abbr>-Server will be queried in the order of the resolvfile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:228
-msgid "dhcp_dnsmasq_strictorder_desc"
+msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Server will be queried in the order of the resolvfile"
 msgstr ""
 "DNS-Server werden strikt der Reihenfolge in der Resolvdatei nach abgefragt"
 
 #. Log queries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:229
-msgid "dhcp_dnsmasq_logqueries"
+msgid "Log queries"
 msgstr "Schreibe Abfragelog"
 
 #. Ignore resolve file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:230
-msgid "dhcp_dnsmasq_noresolv"
+msgid "Ignore resolve file"
 msgstr "Ignoriere Resolvdatei"
 
 #. concurrent queries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:231
-msgid "dhcp_dnsmasq_dnsforwardmax"
+msgid "concurrent queries"
 msgstr "gleichzeitige Abfragen"
 
 #. <abbr title=\"Domain Name System\">DNS</abbr>-Port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:232
-msgid "dhcp_dnsmasq_port"
+msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Port"
 msgstr "DNS-Port"
 
 #. <abbr title=\"maximal\">max.</abbr> <abbr title=\"Extension Mechanisms for Domain Name System\">EDNS0</abbr> paket size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:233
-msgid "dhcp_dnsmasq_ednspacket_max"
+msgid "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Extension Mechanisms for Domain Name System\">EDNS0</abbr> paket size"
 msgstr ""
 "maximale <abbr title=\"Extension Mechanisms for Domain Name "
 "System\">EDNS.0</abbr> Paketgröße"
 
 #. <abbr title=\"maximal\">max.</abbr> <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:234
-msgid "dhcp_dnsmasq_dhcpleasemax"
+msgid "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Leases"
 msgstr "maximale Anzahl von DHCP-Leases"
 
 #. additional hostfile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:235
-msgid "dhcp_dnsmasq_addnhosts"
+msgid "additional hostfile"
 msgstr "Zusätzliche Hostdatei"
 
 #. query port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:236
-msgid "dhcp_dnsmasq_queryport"
+msgid "query port"
 msgstr "Abfrageport"
 
 #. Enable TFTP-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:237
-msgid "dhcp_dnsmasq_enabletftp"
+msgid "Enable TFTP-Server"
 msgstr "TFTP-Server aktivieren"
 
 #. TFTP-Server Root
 #: i18n/english/luasrc/i18n/admin-core.en.lua:238
-msgid "dhcp_dnsmasq_tftproot"
+msgid "TFTP-Server Root"
 msgstr "TFTP-Server Wurzelverzeichnis"
 
 #. Network Boot Image
 #: i18n/english/luasrc/i18n/admin-core.en.lua:239
-msgid "dhcp_dnsmasq_dhcpboot"
+msgid "Network Boot Image"
 msgstr "Netzwerk-Boot Abbild"
 
 #. Switch
 #: i18n/english/luasrc/i18n/admin-core.en.lua:240
-msgid "a_n_switch"
+msgid "Switch"
 msgstr "Switch"
 
 #. Active Connections
 #: i18n/english/luasrc/i18n/admin-core.en.lua:241
-msgid "a_n_conntrack"
+msgid "Active Connections"
 msgstr "Aktive Verbindungen"
 
 #. This page gives an overview over currently active network connections.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:242
-msgid "a_n_conntrack_desc"
+msgid "This page gives an overview over currently active network connections."
 msgstr "Diese Seite gibt eine Übersicht über aktive Netzwerkverbindungen."
 
 #. Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:243
-msgid "a_n_routes"
+msgid "Routes"
 msgstr "Routen"
 
 #. IPv4 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:244
-msgid "a_n_routes4"
+msgid "IPv4 Routes"
 msgstr "IPv4 Routen"
 
 #. IPv6 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:245
-msgid "a_n_routes6"
+msgid "IPv6 Routes"
 msgstr "IPv6 Routen"
 
 #. In this area you find all network-related settings.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:246
-msgid "a_network1"
+msgid "In this area you find all network-related settings."
 msgstr "In diesem Bereich finden sich alle netzwerkbezogenen Einstellungen."
 
 #. On most routers the network switch can be freely configured and splitted up into several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:247
-msgid "a_network2"
+msgid "On most routers the network switch can be freely configured and splitted up into several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s."
 msgstr ""
 "Der Netzwerkswitch kann bei den meisten Routern frei konfiguriert und in "
 "mehrere VLANs aufgeteilt werden."
 
 #. Interfaces and <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> / <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Settings allow a custom organisation of the network and connections to other networks like the internet.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:248
-msgid "a_network3"
+msgid "Interfaces and <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> / <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Settings allow a custom organisation of the network and connections to other networks like the internet."
 msgstr ""
 "Schnittstellen und PPPoE/PPTP-Einstellungen ermöglichen die freie "
 "Organisation des Netzwerks und die Anbindung an ein WAN."
 
 #. With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> devices in your local network can be automatically configured for network communication.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:249
-msgid "a_network4"
+msgid "With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> devices in your local network can be automatically configured for network communication."
 msgstr ""
 "DHCP ermöglichst die automatische Netzwerkkonfiguration von Rechnern im "
 "(W)LAN."
 
 #. Firewall and portforwarding can be used to secure your network while providing services to external networks.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:250
-msgid "a_network5"
+msgid "Firewall and portforwarding can be used to secure your network while providing services to external networks."
 msgstr ""
 "Portweiterleitung und Firewall erlauben eine effektive Absicherung des "
 "Netzes, bei gleichzeitiger Bereitstellung von externen Diensten."
 
 #. The network ports on your router can be combined to several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s in which computers can communicate directly with each other. <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s are often used to separate different network segments. Often there is by default one Uplink port for a connection to the next greater network like the internet and other ports for a local network.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:251
-msgid "a_n_switch1"
+msgid "The network ports on your router can be combined to several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s in which computers can communicate directly with each other. <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s are often used to separate different network segments. Often there is by default one Uplink port for a connection to the next greater network like the internet and other ports for a local network."
 msgstr ""
 "Die Netzwerkschnittstellen am Router können zu verschienden VLANs "
 "zusammengefasst werden, in denen Geräte miteinander direkt kommunizieren "
@@ -1366,7 +1366,7 @@ msgstr ""
 
 #. Ports belonging to a <abbr title=\"Virtual Local Area Network\">VLAN</abbr> are separated with spaces. The port with the highest number (usually 5) is oftern the connection to the internal network interface of the router. On devices with 5 ports often the one with the lowest number (0) is the predefined Uplink port.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:252
-msgid "network_switch_desc"
+msgid "Ports belonging to a <abbr title=\"Virtual Local Area Network\">VLAN</abbr> are separated with spaces. The port with the highest number (usually 5) is oftern the connection to the internal network interface of the router. On devices with 5 ports often the one with the lowest number (0) is the predefined Uplink port."
 msgstr ""
 "Die zu einem VLAN gehörenden Schnittstellen werden durch Leerzeichen "
 "getrennt. Die Schnittstelle mit der höchsten Nummer (meistens 5) bildet in "
@@ -1376,7 +1376,7 @@ msgstr ""
 
 #. On this page you can configure the network interfaces. You can bridge several interfaces by ticking the &quot;bridge interfaces&quot; field and enter the names of several network interfaces separated by spaces. You can also use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation <samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: <samp>eth0.1</samp>).
 #: i18n/english/luasrc/i18n/admin-core.en.lua:253
-msgid "a_n_ifaces1"
+msgid "On this page you can configure the network interfaces. You can bridge several interfaces by ticking the \"bridge interfaces\" field and enter the names of several network interfaces separated by spaces. You can also use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation <samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: <samp>eth0.1</samp>)."
 msgstr ""
 "An dieser Stelle können die einzelnen Schnittstellen des Netzwerkes "
 "konfiguriert werden. Es können mehrere Schnittstellen zu einer Brücke "
@@ -1387,25 +1387,25 @@ msgstr ""
 
 #. Bridge interfaces
 #: i18n/english/luasrc/i18n/admin-core.en.lua:254
-msgid "a_n_i_bridge"
+msgid "Bridge interfaces"
 msgstr "Netzwerkbrücke"
 
 #. creates a bridge over specified interface(s)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:255
-msgid "a_n_i_bridge1"
+msgid "creates a bridge over specified interface(s)"
 msgstr "überbrückt angegebene Schnittstelle(n)"
 
 #. Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>
-msgid "a_n_i_stp"
+msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 msgstr "<abbr title=\"Spanning Tree Protocol\">STP</abbr> aktivieren"
 
 #. Enables the Spanning Tree Protocol on this bridge
-msgid "a_n_i_stp1"
+msgid "Enables the Spanning Tree Protocol on this bridge"
 msgstr "Aktiviert das Spanning Tree Protokoll auf dieser Netzwerkbrücke"
 
 #. With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> network members can automatically receive their network settings (<abbr title=\"Internet Protocol\">IP</abbr>-address, netmask, <abbr title=\"Domain Name System\">DNS</abbr>-server, ...).
 #: i18n/english/luasrc/i18n/admin-core.en.lua:256
-msgid "dhcp_desc"
+msgid "With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> network members can automatically receive their network settings (<abbr title=\"Internet Protocol\">IP</abbr>-address, netmask, <abbr title=\"Domain Name System\">DNS</abbr>-server, ...)."
 msgstr ""
 "Mit <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> können "
 "Netzwerkteilnehmer automatisch Einstellungen wie <abbr title=\"Internet "
@@ -1414,78 +1414,78 @@ msgstr ""
 
 #. Leasetime
 #: i18n/english/luasrc/i18n/admin-core.en.lua:257
-msgid "dhcp_dhcp_leasetime"
+msgid "Leasetime"
 msgstr "Laufzeit"
 
 #. Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:258
-msgid "dhcp_dhcp_dynamicdhcp"
+msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 msgstr "Dynamisches DHCP"
 
 #. Ignore interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:259
-msgid "dhcp_dhcp_ignore"
+msgid "Ignore interface"
 msgstr "Schnittstelle ignorieren"
 
 #. disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for this interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:260
-msgid "dhcp_dhcp_ignore_desc"
+msgid "disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for this interface"
 msgstr "DHCP für dieses Netzwerk deaktivieren"
 
 #. Force
 #: i18n/english/luasrc/i18n/admin-core.en.lua:261
-msgid "dhcp_dhcp_force"
+msgid "Force"
 msgstr "Start erzwingen"
 
 #. first address (last octet)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:262
-msgid "dhcp_dhcp_start_desc"
+msgid "first address (last octet)"
 msgstr "Erste vergebene Adresse (letztes Oktett)"
 
 #. number of leased addresses -1
 #: i18n/english/luasrc/i18n/admin-core.en.lua:263
-msgid "dhcp_dhcp_limit_desc"
+msgid "number of leased addresses -1"
 msgstr "Anzahl zu vergebender Adressen -1"
 
 #. DHCP-Options
 #: i18n/english/luasrc/i18n/admin-core.en.lua:264
-msgid "dhcp_dhcp_dhcpoption"
+msgid "DHCP-Options"
 msgstr "DHCP-Optionen"
 
 #. See &quot;dnsmasq --help dhcp&quot; for a list of available options.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:265
-msgid "dhcp_dhcp_dhcpoption_desc"
+msgid "See \"dnsmasq --help dhcp\" for a list of available options."
 msgstr ""
 "Siehe &quot;dnsmasq --help dhcp&quot; für eine Liste verfügbarer Optionen."
 
 #. Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:266
-msgid "dhcp_leases"
+msgid "Leases"
 msgstr "Zuweisungen"
 
 #. Static Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:267
-msgid "luci_ethers"
+msgid "Static Leases"
 msgstr "Statische Einträge"
 
 #. Leasetime remaining
 #: i18n/english/luasrc/i18n/admin-core.en.lua:268
-msgid "dhcp_timeremain"
+msgid "Leasetime remaining"
 msgstr "Verbleibende Gültigkeit"
 
 #. Active Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:269
-msgid "dhcp_leases_active"
+msgid "Active Leases"
 msgstr "Aktive Zuweisungen"
 
 #. Point-to-Point Connections
 #: i18n/english/luasrc/i18n/admin-core.en.lua:270
-msgid "a_n_ptp"
+msgid "Point-to-Point Connections"
 msgstr "Punkt-zu-Punkt Verbindungen"
 
 #. Point-to-Point connections with <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> or <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr> are often used to connect a device over <abbr title=\"Digital Subscriber Line\">DSL</abbr> or similar technologies to an internet access point.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:271
-msgid "a_n_ptp1"
+msgid "Point-to-Point connections with <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> or <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr> are often used to connect a device over <abbr title=\"Digital Subscriber Line\">DSL</abbr> or similar technologies to an internet access point."
 msgstr ""
 "Punkt-zu-Punkt Verbindungen über PPPoE oder PPTP werden häufig dazu "
 "verwendet, um über DSL o.ä. Techniken eine Verbindung zum Internetgateway "
@@ -1493,7 +1493,7 @@ msgstr ""
 
 #. You need to install &quot;comgt&quot; for UMTS/GPRS, &quot;ppp-mod-pppoe&quot; for PPPoE, &quot;ppp-mod-pppoa&quot; for PPPoA or &quot;pptp&quot; for PPtP support
 #: i18n/english/luasrc/i18n/admin-core.en.lua:272
-msgid "network_interface_prereq"
+msgid "You need to install \"comgt\" for UMTS/GPRS, \"ppp-mod-pppoe\" for PPPoE, \"ppp-mod-pppoa\" for PPPoA or \"pptp\" for PPtP support"
 msgstr ""
 "Für die Unterstützung von UMTS/GPRS muss &quot;comgt&quot;, für PPPoE &quot"
 ";ppp-mod-pppoe&quot;, für PPPoA &quot;ppp-mod-pppoa&quot; und für PPtP "
@@ -1501,711 +1501,711 @@ msgstr ""
 
 #. You need to install &quot;ppp-mod-pppoe&quot; for PPPoE or &quot;pptp&quot; for PPtP support
 #: i18n/english/luasrc/i18n/admin-core.en.lua:273
-msgid "network_interface_prereq_mini"
+msgid "You need to install \"ppp-mod-pppoe\" for PPPoE or \"pptp\" for PPtP support"
 msgstr ""
 "Für die Unterstützung von PPPoE muss &quot;ppp-mod-pppoe&quot; und für PPtP "
 "&quot;pptp&quot; installiert sein"
 
 #. <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:274
-msgid "network_interface_server"
+msgid "<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"
 msgstr "PPTP-Server"
 
 #. Automatic Disconnect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:275
-msgid "network_interface_demand"
+msgid "Automatic Disconnect"
 msgstr "Automatische Trennung"
 
 #. Time (in seconds) after which an unused connection will be closed
 #: i18n/english/luasrc/i18n/admin-core.en.lua:276
-msgid "network_interface_demand_desc"
+msgid "Time (in seconds) after which an unused connection will be closed"
 msgstr "Zeit (in s) nach der die Verbindung bei Inaktivität getrennt wird"
 
 #. Keep-Alive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:277
-msgid "network_interface_keepalive"
+msgid "Keep-Alive"
 msgstr "Keep-Alive"
 
 #. Number of failed connection tests to initiate automatic reconnect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:278
-msgid "network_interface_keepalive_desc"
+msgid "Number of failed connection tests to initiate automatic reconnect"
 msgstr ""
 "Anzahl fehlgeschlagener Verbindungstests nach der automatisch neu verbunden "
 "wird"
 
 #. Modem device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:279
-msgid "network_interface_device"
+msgid "Modem device"
 msgstr "Modemgerät"
 
 #. The device node of your modem, e.g. /dev/ttyUSB0
 #: i18n/english/luasrc/i18n/admin-core.en.lua:280
-msgid "network_interface_device_desc"
+msgid "The device node of your modem, e.g. /dev/ttyUSB0"
 msgstr "Geräteknoten des Modems, z.B. /dev/ttyUSB0"
 
 #. Replace default route
 #: i18n/english/luasrc/i18n/admin-core.en.lua:281
-msgid "network_interface_defaultroute"
+msgid "Replace default route"
 msgstr "Standardroute ersetzen"
 
 #. Let pppd replace the current default route to use the PPP interface after successful connect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:282
-msgid "network_interface_defaultroute_desc"
+msgid "Let pppd replace the current default route to use the PPP interface after successful connect"
 msgstr ""
 "Lässt pppd die aktuelle Standardroute ersetzen und über die PPP "
 "Schnittstelle leiten"
 
 #. Use peer DNS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:283
-msgid "network_interface_peerdns"
+msgid "Use peer DNS"
 msgstr "DNS der Gegenstelle nutzen"
 
 #. Configure the local DNS server to use the name servers adverticed by the PPP peer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:284
-msgid "network_interface_peerdns_desc"
+msgid "Configure the local DNS server to use the name servers adverticed by the PPP peer"
 msgstr ""
 "Konfiguriert den lokalen DNS-Server so, dass er die von der Gegenstelle "
 "angekündigten Nameserver-Adressen nutzt"
 
 #. Enable IPv6 on PPP link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:285
-msgid "network_interface_ipv6"
+msgid "Enable IPv6 on PPP link"
 msgstr "IPv6 für die PPP-Verbindung aktivieren"
 
 #. Connect script
 #: i18n/english/luasrc/i18n/admin-core.en.lua:286
-msgid "network_interface_connect"
+msgid "Connect script"
 msgstr "Verbindungs-Script"
 
 #. Let pppd run this script after establishing the PPP link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:287
-msgid "network_interface_connect_desc"
+msgid "Let pppd run this script after establishing the PPP link"
 msgstr ""
 "Lässt pppd das angegebene Script nach dem Aufbau der PPP Verbindung "
 "abarbeiten"
 
 #. Disconnect script
 #: i18n/english/luasrc/i18n/admin-core.en.lua:288
-msgid "network_interface_disconnect"
+msgid "Disconnect script"
 msgstr "Trennuns-Script"
 
 #. Let pppd run this script before tearing down the PPP link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:289
-msgid "network_interface_disconnect_desc"
+msgid "Let pppd run this script before tearing down the PPP link"
 msgstr ""
 "Lässt pppd das angegebene Script vor dem Trennen der PPP Verbindung "
 "abarbeiten"
 
 #. Additional pppd options
 #: i18n/english/luasrc/i18n/admin-core.en.lua:290
-msgid "network_interface_pppd_options"
+msgid "Additional pppd options"
 msgstr "Weitere pppd Optionen"
 
 #. Specify additional command line arguments for pppd here
 #: i18n/english/luasrc/i18n/admin-core.en.lua:291
-msgid "network_interface_pppd_options_desc"
+msgid "Specify additional command line arguments for pppd here"
 msgstr ""
 "Hier können zusätzliche Kommandozeilenargumente für pppd angegeben werden"
 
 #. Access point (APN)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:292
-msgid "network_interface_apn"
+msgid "Access point (APN)"
 msgstr "Zugriffspunkt (APN)"
 
 #. PIN code
 #: i18n/english/luasrc/i18n/admin-core.en.lua:293
-msgid "network_interface_pincode"
+msgid "PIN code"
 msgstr "PIN-Code"
 
 #. Make sure that you provide the correct pin code here or you might lock your sim card!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:294
-msgid "network_interface_pincode_desc"
+msgid "Make sure that you provide the correct pin code here or you might lock your sim card!"
 msgstr ""
 "Stellen Sie sicher das die richtige PIN hier eingetragen wird, sonst könnte "
 "die SIM-Karte gesperrt werden!"
 
 #. Service type
 #: i18n/english/luasrc/i18n/admin-core.en.lua:295
-msgid "network_interface_service"
+msgid "Service type"
 msgstr "Dienstart"
 
 #. Setup wait time
 #: i18n/english/luasrc/i18n/admin-core.en.lua:296
-msgid "network_interface_maxwait"
+msgid "Setup wait time"
 msgstr "Initialisierungszeit"
 
 #. Seconds to wait for the modem to become ready before attempting to connect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:297
-msgid "network_interface_maxwait_desc"
+msgid "Seconds to wait for the modem to become ready before attempting to connect"
 msgstr ""
 "Zeit in Sekunden um auf die Initialisierung des Modems zu warten bevor ein "
 "Verbindungsversuch unternommen wird"
 
 #. PPPoA Encapsulation
 #: i18n/english/luasrc/i18n/admin-core.en.lua:298
-msgid "network_interface_encaps"
+msgid "PPPoA Encapsulation"
 msgstr "PPPoA Kapselung"
 
 #. Routes specify over which interface and gateway a certain host or network can be reached.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:299
-msgid "a_n_r_routes1"
+msgid "Routes specify over which interface and gateway a certain host or network can be reached."
 msgstr ""
 "Netzwerkrouten geben an, über welche Schnittstellen bestimmte Rechner oder "
 "Netzwerke erreicht werden können"
 
 #. Static Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:300
-msgid "a_n_routes_static"
+msgid "Static Routes"
 msgstr "Statische Routen"
 
 #. Static IPv4 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:301
-msgid "a_n_routes_static4"
+msgid "Static IPv4 Routes"
 msgstr "Statische IPv4 Routen"
 
 #. Static IPv6 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:302
-msgid "a_n_routes_static6"
+msgid "Static IPv6 Routes"
 msgstr "Statische IPv6 Routen"
 
 #. Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:303
-msgid "a_n_routes_kernel4"
+msgid "Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes"
 msgstr "Aktive IPv4-Routen"
 
 #. Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:304
-msgid "a_n_routes_kernel6"
+msgid "Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes"
 msgstr "Aktive IPv6-Routen"
 
 #. Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:305
-msgid "a_n_r_target1"
+msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
 msgstr "Host-IP oder Netzwerk"
 
 #. <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network (CIDR)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:306
-msgid "a_n_r_target6"
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network (CIDR)"
 msgstr "IPv6 Host- oder Netzwerk-Addresse (CIDR)"
 
 #. if target is a network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:307
-msgid "a_n_r_netmask1"
+msgid "if target is a network"
 msgstr "falls Ziel ein Netzwerk ist"
 
 #. Internet Connection
 #: i18n/english/luasrc/i18n/admin-core.en.lua:308
-msgid "m_n_inet"
+msgid "Internet Connection"
 msgstr "Internetverbindung"
 
 #. Local Network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:309
-msgid "m_n_local"
+msgid "Local Network"
 msgstr "Lokales Netz"
 
 #. Route
 #: i18n/english/luasrc/i18n/admin-core.en.lua:310
-msgid "m_n_route"
+msgid "Route"
 msgstr "Weiterleiten"
 
 #. Bridge
 #: i18n/english/luasrc/i18n/admin-core.en.lua:311
-msgid "m_n_brdige"
+msgid "Bridge"
 msgstr "Netzwerkbrücke"
 
 #. Provide (Access Point)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:312
-msgid "m_w_ap"
+msgid "Provide (Access Point)"
 msgstr "Anbieten (Access Point)"
 
 #. Independent (Ad-Hoc)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:313
-msgid "m_w_adhoc"
+msgid "Independent (Ad-Hoc)"
 msgstr "Unabhängig (Ad-Hoc)"
 
 #. Join (Client)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:314
-msgid "m_w_client"
+msgid "Join (Client)"
 msgstr "Einklinken (Client)"
 
 #. Distributed (<abbr title=\"Wireless Distribution System\">WDS</abbr>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:315
-msgid "m_w_wds"
+msgid "Distributed (<abbr title=\"Wireless Distribution System\">WDS</abbr>)"
 msgstr "Verteilen (WDS)"
 
 #. Clientmode
 #: i18n/english/luasrc/i18n/admin-core.en.lua:316
-msgid "m_w_clientmode"
+msgid "Clientmode"
 msgstr "Verbindungsmodus"
 
 #. System log buffer size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:317
-msgid "system_system_logsize"
+msgid "System log buffer size"
 msgstr "Größe des Systemprotokollpuffers"
 
 #. External system log server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:318
-msgid "system_system_logip"
+msgid "External system log server"
 msgstr "Externer Systemprotokollserver"
 
 #. Log output level
 #: i18n/english/luasrc/i18n/admin-core.en.lua:319
-msgid "system_system_conloglevel"
+msgid "Log output level"
 msgstr "Protokollausgabelevel"
 
 #. Level of log messages on the console
 #: i18n/english/luasrc/i18n/admin-core.en.lua:320
-msgid "system_system_conloglevel_desc"
+msgid "Level of log messages on the console"
 msgstr "Level auf der Konsole ausgegebener Meldungen"
 
 #. Processor
 #: i18n/english/luasrc/i18n/admin-core.en.lua:321
-msgid "m_i_processor"
+msgid "Processor"
 msgstr "Prozessor"
 
 #. Memory
 #: i18n/english/luasrc/i18n/admin-core.en.lua:322
-msgid "m_i_memory"
+msgid "Memory"
 msgstr "Hauptspeicher"
 
 #. Local Time
 #: i18n/english/luasrc/i18n/admin-core.en.lua:323
-msgid "m_i_systemtime"
+msgid "Local Time"
 msgstr "Lokale Zeit"
 
 #. Uptime
 #: i18n/english/luasrc/i18n/admin-core.en.lua:324
-msgid "m_i_uptime"
+msgid "Uptime"
 msgstr "Laufzeit"
 
 #. First leased address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:325
-msgid "m_n_d_firstaddress"
+msgid "First leased address"
 msgstr "Erste vergebene Adresse"
 
 #. Number of leased addresses
 #: i18n/english/luasrc/i18n/admin-core.en.lua:326
-msgid "m_n_d_numleases"
+msgid "Number of leased addresses"
 msgstr "Anzahl vergebener Adressen"
 
 #. Routing table
 #: i18n/english/luasrc/i18n/admin-core.en.lua:327
-msgid "routingtable"
+msgid "Routing table"
 msgstr "Routingtabelle"
 
 #. Wifi scan
 #: i18n/english/luasrc/i18n/admin-core.en.lua:328
-msgid "wlanscan"
+msgid "Wifi scan"
 msgstr "WLAN-Scan"
 
 #. Frequency
 #: i18n/english/luasrc/i18n/admin-core.en.lua:329
-msgid "frequency"
+msgid "Frequency"
 msgstr "Frequenz"
 
 #. Power
 #: i18n/english/luasrc/i18n/admin-core.en.lua:330
-msgid "power"
+msgid "Power"
 msgstr "Leistung"
 
 #. Noise
 #: i18n/english/luasrc/i18n/admin-core.en.lua:331
-msgid "noise"
+msgid "Noise"
 msgstr "Rausch"
 
 #. Signal
 #: i18n/english/luasrc/i18n/admin-core.en.lua:332
-msgid "signal"
+msgid "Signal"
 msgstr "Signal"
 
 #. Link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:333
-msgid "link"
+msgid "Link"
 msgstr "Verb."
 
 #. <abbr title=\"Fragmentation\">Frag.</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:334
-msgid "frag"
+msgid "<abbr title=\"Fragmentation\">Frag.</abbr>"
 msgstr "Frag."
 
 #. <abbr title=\"Request To Send\">RTS</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:335
-msgid "rts"
+msgid "<abbr title=\"Request To Send\">RTS</abbr>"
 msgstr "RTS"
 
 #. Bitrate
 #: i18n/english/luasrc/i18n/admin-core.en.lua:336
-msgid "bitrate"
+msgid "Bitrate"
 msgstr "Bitrate"
 
 #. automatically reconnect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:337
-msgid "m_n_keepalive"
+msgid "automatically reconnect"
 msgstr "automatisch neu verbinden"
 
 #. disconnect when idle for
 #: i18n/english/luasrc/i18n/admin-core.en.lua:338
-msgid "m_n_dialondemand"
+msgid "disconnect when idle for"
 msgstr "trennen bei Inaktivität nach"
 
 #. <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:339
-msgid "m_n_pptp_server"
+msgid "<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"
 msgstr "PPTP-Server"
 
 #. <abbr title=\"Light Emitting Diode\">LED</abbr> Configuration
 #: i18n/english/luasrc/i18n/admin-core.en.lua:340
-msgid "leds"
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "LED Konfiguration"
 
 #. Customizes the behaviour of the device <abbr title=\"Light Emitting Diode\">LED</abbr>s if possible.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:341
-msgid "leds_desc"
+msgid "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode\">LED</abbr>s if possible."
 msgstr "Passt das Verhalten der Geräte-LEDs an - wenn dies möglich ist."
 
 #. <abbr title=\"Light Emitting Diode\">LED</abbr> Name
 #: i18n/english/luasrc/i18n/admin-core.en.lua:342
-msgid "system_led_name"
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr "LED Name"
 
 #. <abbr title=\"Light Emitting Diode\">LED</abbr> Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:343
-msgid "system_led_sysfs"
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Device"
 msgstr "LED Gerät"
 
 #. Default state
 #: i18n/english/luasrc/i18n/admin-core.en.lua:344
-msgid "system_led_default"
+msgid "Default state"
 msgstr "Grundzustand"
 
 #. ticked = on
 #: i18n/english/luasrc/i18n/admin-core.en.lua:345
-msgid "system_led_default_desc"
+msgid "ticked = on"
 msgstr "ausgewählt = an"
 
 #. Trigger
 #: i18n/english/luasrc/i18n/admin-core.en.lua:346
-msgid "system_led_trigger"
+msgid "Trigger"
 msgstr "Auslöser"
 
 #. None
 #: i18n/english/luasrc/i18n/admin-core.en.lua:347
-msgid "system_led_trigger_none"
+msgid "None"
 msgstr "Keiner"
 
 #. Default On
 #: i18n/english/luasrc/i18n/admin-core.en.lua:348
-msgid "system_led_trigger_defaulton"
+msgid "Default On"
 msgstr "Immer an"
 
 #. Timer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:349
-msgid "system_led_trigger_timer"
+msgid "Timer"
 msgstr "Taktgeber"
 
 #. Heartbeat (Load Average)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:350
-msgid "system_led_trigger_heartbeat"
+msgid "Heartbeat (Load Average)"
 msgstr "Herzschlag (Mittlere Systemlast)"
 
 #. Network Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:351
-msgid "system_led_trigger_netdev"
+msgid "Network Device"
 msgstr "Netzwerkschnittstelle"
 
 #. Off-State Delay
 #: i18n/english/luasrc/i18n/admin-core.en.lua:352
-msgid "system_led_delayoff"
+msgid "Off-State Delay"
 msgstr "Einschaltverzögerung"
 
 #. Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is off
 #: i18n/english/luasrc/i18n/admin-core.en.lua:353
-msgid "system_led_delayoff_desc"
+msgid "Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is off"
 msgstr "Zeit (in ms) die die LED deaktiviert ist"
 
 #. On-State Delay
 #: i18n/english/luasrc/i18n/admin-core.en.lua:354
-msgid "system_led_delayon"
+msgid "On-State Delay"
 msgstr "Ausschaltverzögerung"
 
 #. Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is on
 #: i18n/english/luasrc/i18n/admin-core.en.lua:355
-msgid "system_led_delayon_desc"
+msgid "Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is on"
 msgstr "Zeit (in ms) die die LED aktiviert ist"
 
 #. Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:356
-msgid "system_led_dev"
+msgid "Device"
 msgstr "Schnittstelle"
 
 #. Trigger Mode
 #: i18n/english/luasrc/i18n/admin-core.en.lua:357
-msgid "system_led_mode"
+msgid "Trigger Mode"
 msgstr "Auslösemodus"
 
 #. Link On
 #: i18n/english/luasrc/i18n/admin-core.en.lua:358
-msgid "system_led_mode_link"
+msgid "Link On"
 msgstr "Verbindung hergestellt"
 
 #. Transmit
 #: i18n/english/luasrc/i18n/admin-core.en.lua:359
-msgid "system_led_mode_tx"
+msgid "Transmit"
 msgstr "Senden"
 
 #. Receive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:360
-msgid "system_led_mode_rx"
+msgid "Receive"
 msgstr "Empfangen"
 
 #. Active
 #: i18n/english/luasrc/i18n/admin-core.en.lua:361
-msgid "network_interface_up"
+msgid "Active"
 msgstr "Aktiv"
 
 #. <abbr title=\"Media Access Control\">MAC</abbr>-Address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:362
-msgid "network_interface_hwaddr"
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr "MAC-Adresse"
 
 #. Hardware Address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:363
-msgid "network_interface_hwaddr_desc"
+msgid "Hardware Address"
 msgstr "Hardware Adresse"
 
 #. Traffic
 #: i18n/english/luasrc/i18n/admin-core.en.lua:364
-msgid "network_interface_txrx"
+msgid "Traffic"
 msgstr "Traffic"
 
 #. transmitted / received
 #: i18n/english/luasrc/i18n/admin-core.en.lua:365
-msgid "network_interface_txrx_desc"
+msgid "transmitted / received"
 msgstr "gesendet / empfangen"
 
 #. Errors
 #: i18n/english/luasrc/i18n/admin-core.en.lua:366
-msgid "network_interface_err"
+msgid "Errors"
 msgstr "Fehler"
 
 #. TX / RX
 #: i18n/english/luasrc/i18n/admin-core.en.lua:367
-msgid "network_interface_err_desc"
+msgid "TX / RX"
 msgstr "TX / RX"
 
 #. Create / Assign firewall-zone
 #: i18n/english/luasrc/i18n/admin-core.en.lua:368
-msgid "network_interface_fwzone"
+msgid "Create / Assign firewall-zone"
 msgstr "Firewallzone anlegen / zuweisen"
 
 #. This interface does not belong to any firewall zone yet.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:369
-msgid "network_interface_fwzone_desc"
+msgid "Choose the firewall zone you want to assign to this interface. Select <em>unspecified</em> to remove the interface from the associated zone or fill out the <em>create</em> field to define a new zone and attach the interface to it."
 msgstr "Diese Schnittstelle gehört bis jetzt zu keiner Firewallzone."
 
 #. Processes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:370
-msgid "process_head"
+msgid "Processes"
 msgstr "Prozesse"
 
 #. This list gives an overview over currently running system processes and their status.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:371
-msgid "process_descr"
+msgid "This list gives an overview over currently running system processes and their status."
 msgstr ""
 "Diese Tabelle gibt eine Übersicht über aktuell laufende Systemprozeese und "
 "deren Status."
 
 #. PID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:372
-msgid "process_pid"
+msgid "PID"
 msgstr "PID"
 
 #. Owner
 #: i18n/english/luasrc/i18n/admin-core.en.lua:373
-msgid "process_owner"
+msgid "Owner"
 msgstr "Besitzer"
 
 #. Command
 #: i18n/english/luasrc/i18n/admin-core.en.lua:374
-msgid "process_command"
+msgid "Command"
 msgstr "Befehl"
 
 #. CPU usage (%)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:375
-msgid "process_cpu"
+msgid "CPU usage (%)"
 msgstr "CPU-Nutzung (%)"
 
 #. Memory usage (%)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:376
-msgid "process_mem"
+msgid "Memory usage (%)"
 msgstr "Speichernutzung (%)"
 
 #. Hang Up
 #: i18n/english/luasrc/i18n/admin-core.en.lua:377
-msgid "process_hup"
+msgid "Hang Up"
 msgstr "Auflegen"
 
 #. Terminate
 #: i18n/english/luasrc/i18n/admin-core.en.lua:378
-msgid "process_term"
+msgid "Terminate"
 msgstr "Beenden"
 
 #. Kill
 #: i18n/english/luasrc/i18n/admin-core.en.lua:379
-msgid "process_kill"
+msgid "Kill"
 msgstr "Töten"
 
 #. cached
 #: i18n/english/luasrc/i18n/admin-core.en.lua:380
-msgid "mem_cached"
+msgid "cached"
 msgstr "gecached"
 
 #. buffered
 #: i18n/english/luasrc/i18n/admin-core.en.lua:381
-msgid "mem_buffered"
+msgid "buffered"
 msgstr "gepuffert"
 
 #. free
 #: i18n/english/luasrc/i18n/admin-core.en.lua:382
-msgid "mem_free"
+msgid "free"
 msgstr "frei"
 
 #. Scheduled Tasks
 #: i18n/english/luasrc/i18n/admin-core.en.lua:383
-msgid "a_s_crontab"
+msgid "Scheduled Tasks"
 msgstr "Geplante Aufgaben"
 
 #. This is the system crontab in which scheduled tasks can be defined.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:384
-msgid "a_s_crontab1"
+msgid "This is the system crontab in which scheduled tasks can be defined."
 msgstr ""
 "Dies ist die System-Crontab in der geplante Aufgaben definiert werden "
 "können."
 
 #. NAS ID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:385
-msgid "a_w_nasid"
+msgid "NAS ID"
 msgstr "NAS ID"
 
 #. Path to CA-Certificate
 #: i18n/english/luasrc/i18n/admin-core.en.lua:386
-msgid "a_w_cacert"
+msgid "Path to CA-Certificate"
 msgstr "Pfad zum CA-Zertifikat"
 
 #. EAP-Method
 #: i18n/english/luasrc/i18n/admin-core.en.lua:387
-msgid "a_w_eaptype"
+msgid "EAP-Method"
 msgstr "EAP-Methode"
 
 #. Path to Private Key
 #: i18n/english/luasrc/i18n/admin-core.en.lua:388
-msgid "a_w_tlsprivkey"
+msgid "Path to Private Key"
 msgstr "Pfad zum Privaten Schlüssel"
 
 #. Password of Private Key
 #: i18n/english/luasrc/i18n/admin-core.en.lua:389
-msgid "a_w_tlsprivkeypwd"
+msgid "Password of Private Key"
 msgstr "Passwort des Privaten Schlüssels"
 
 #. Authentication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:390
-msgid "a_w_peapauth"
+msgid "Authentication"
 msgstr "Authentifizierung"
 
 #. Identity
 #: i18n/english/luasrc/i18n/admin-core.en.lua:391
-msgid "a_w_peapidentity"
+msgid "Identity"
 msgstr "Identität"
 
 #. Password
 #: i18n/english/luasrc/i18n/admin-core.en.lua:392
-msgid "a_w_peappassword"
+msgid "Password"
 msgstr "Passwort"
 
 #. Create Network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:393
-msgid "a_w_create"
+msgid "Create Network"
 msgstr "Netzwerk anlegen"
 
 #. Hostnames
 #: i18n/english/luasrc/i18n/admin-core.en.lua:394
-msgid "hostnames"
+msgid "Hostnames"
 msgstr "Rechnernamen"
 
 #. Host entries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:395
-msgid "hostnames_entries"
+msgid "Host entries"
 msgstr "Host-Einträge"
 
 #. Hostname
 #: i18n/english/luasrc/i18n/admin-core.en.lua:396
-msgid "hostnames_hostname"
+msgid "Hostname"
 msgstr "Rechnername"
 
 #. IP address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:397
-msgid "hostnames_address"
+msgid "IP address"
 msgstr "IP-Adresse"
 
 #. Clamp Segment Size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:398
-msgid "m_n_mssfix"
+msgid "Clamp Segment Size"
 msgstr "Segmentgrößen Clamping"
 
 #. Fixes problems with unreachable websites, submitting forms or other unexpected behaviour for some ISPs.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:399
-msgid "m_n_mssfix_desc"
+msgid "Fixes problems with unreachable websites, submitting forms or other unexpected behaviour for some ISPs."
 msgstr ""
 "Behebt Probleme bei nicht erreichbaren Webseiten, Absenden von Formularen "
 "oder anderes unerwartetes Verhalten für einige ISPs."
 
 #. Flash Firmware
 #: i18n/english/luasrc/i18n/admin-core.en.lua:400
-msgid "admin_upgrade"
+msgid "Flash Firmware"
 msgstr "Firmware Flash"
 
 #. The uploaded image file does not contain a supported format. Make sure that you choose the generic image format for your platform.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:401
-msgid "admin_upgrade_badimage"
+msgid "The uploaded image file does not contain a supported format. Make sure that you choose the generic image format for your platform."
 msgstr ""
 "Das hochgeladene Firmware-Image hat ein nicht unterstütztes Format. Stellen "
 "Sie sicher dass Sie das generische Format für Ihre Platform gewählt haben."
 
 #. Checksum
 #: i18n/english/luasrc/i18n/admin-core.en.lua:402
-msgid "admin_upgrade_checksum"
+msgid "Checksum"
 msgstr "Prüfsumme"
 
 #. Upload an OpenWrt image file to reflash the device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:403
-msgid "admin_upgrade_desc"
+msgid "Upload an OpenWrt image file to reflash the device."
 msgstr "Firmware-Image hochladen um das Gerät neu zu flaschen"
 
 #. Size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:404
-msgid "admin_upgrade_filesize"
+msgid "Size"
 msgstr "Größe"
 
 #. Firmware image
 #: i18n/english/luasrc/i18n/admin-core.en.lua:405
-msgid "admin_upgrade_fwimage"
+msgid "Firmware image"
 msgstr "Firmware-Image"
 
 #. Keep configuration files
 #: i18n/english/luasrc/i18n/admin-core.en.lua:406
-msgid "admin_upgrade_keepcfg"
+msgid "Keep configuration files"
 msgstr "Konfigurationsdateien erhalten"
 
 #. Sorry. OpenWrt does not support a system upgrade on this platform.<br /> You need to manually flash your device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:407
-msgid "admin_upgrade_nosupport"
+msgid "Sorry. OpenWrt does not support a system upgrade on this platform.<br /> You need to manually flash your device."
 msgstr ""
 "Sorry. OpenWrt unterstützt kein Systemupdate auf dieser Platform.<br /> Sie "
 "müssen das Gerät manuell neu flashen."
 
 #. The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a few minutes until you try to reconnect. It might be necessary to renew the address of your computer to reach the device again, depending on your settings.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:408
-msgid "admin_upgrade_running"
+msgid "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a few minutes until you try to reconnect. It might be necessary to renew the address of your computer to reach the device again, depending on your settings."
 msgstr ""
 "Der Flashvorgang läuft jetzt.<br /> SCHALTEN SIE NICHT DEN STROM AUS!<br /> "
 "Warten Sie einige Minuten bis das Gerät wieder erreichbar ist. Je nach "
@@ -2214,19 +2214,19 @@ msgstr ""
 
 #.  (%s available)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:409
-msgid "admin_upgrade_spaceavail"
+msgid " (%s available)"
 msgstr " (%s verfügbar)"
 
 #. It appears that you try to flash an image that does not fit into the flash memory, please verify the image file!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:410
-msgid "admin_upgrade_toolarge"
+msgid "It appears that you try to flash an image that does not fit into the flash memory, please verify the image file!"
 msgstr ""
 "Das verwendete Image scheint zu groß für den internen Flash-Speicher zu "
 "sein. Überprüfen Sie die Imagedatei!"
 
 #. Upload image
 #: i18n/english/luasrc/i18n/admin-core.en.lua:411
-msgid "admin_upgrade_upload"
+msgid "Upload image"
 msgstr "Image hochladen"
 
 #. The flash image was uploaded. Below is the checksum and file size listed, compare them with the original file to ensure data integrity.<br /> Click \"Proceed\" below to start the flash procedure.
diff --git a/po/de/asterisk.po b/po/de/asterisk.po
index 0ecdfed7f..c5e5504a2 100644
--- a/po/de/asterisk.po
+++ b/po/de/asterisk.po
@@ -13,1264 +13,1264 @@ msgstr ""
 
 #. Asterisk General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:1
-msgid "asterisk_asterisk"
+msgid "Asterisk General Options"
 msgstr "Grundeinstellungen für Asterisk"
 
 #. AGI directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:2
-msgid "asterisk_asterisk_agidir"
+msgid "AGI directory"
 msgstr "AGI - Verzeichniss"
 
 #. Cache recorded sound files during recording
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:3
 #, fuzzy
-msgid "asterisk_asterisk_cacherecordfiles"
+msgid "Cache recorded sound files during recording"
 msgstr "Puffere aufgenommene Audiodateien während der Aufname."
 
 #. Debug Level
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:4
 #, fuzzy
-msgid "asterisk_asterisk_debug"
+msgid "Debug Level"
 msgstr "Fehlerausgabestufe"
 
 #. Disable some warnings
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:5
-msgid "asterisk_asterisk_dontwarn"
+msgid "Disable some warnings"
 msgstr "Schalte einige Warnungen aus"
 
 #. Dump core on crash
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:6
 #, fuzzy
-msgid "asterisk_asterisk_dumpcore"
+msgid "Dump core on crash"
 msgstr "Schalte einige Warnungen aus"
 
 #. High Priority
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:7
-msgid "asterisk_asterisk_highpriority"
+msgid "High Priority"
 msgstr "Hohe Priorität"
 
 #. Initialise Crypto
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:8
-msgid "asterisk_asterisk_initcrypto"
+msgid "Initialise Crypto"
 msgstr ""
 
 #. Use Internal Timing
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:9
-msgid "asterisk_asterisk_internaltiming"
+msgid "Use Internal Timing"
 msgstr ""
 
 #. Log directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:10
 #, fuzzy
-msgid "asterisk_asterisk_logdir"
+msgid "Log directory"
 msgstr "AGI - Verzeichniss"
 
 #. Maximum number of calls allowed
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:11
 #, fuzzy
-msgid "asterisk_asterisk_maxcalls"
+msgid "Maximum number of calls allowed"
 msgstr "AGI - Verzeichniss"
 
 #. Maximum load to stop accepting new calls
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:12
 #, fuzzy
-msgid "asterisk_asterisk_maxload"
+msgid "Maximum load to stop accepting new calls"
 msgstr "AGI - Verzeichniss"
 
 #. Disable console colors
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:13
 #, fuzzy
-msgid "asterisk_asterisk_nocolor"
+msgid "Disable console colors"
 msgstr "Schalte einige Warnungen aus"
 
 #. Sound files Cache directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:14
-msgid "asterisk_asterisk_recordcachedir"
+msgid "Sound files Cache directory"
 msgstr ""
 
 #. The Group to run as
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:15
 #, fuzzy
-msgid "asterisk_asterisk_rungroup"
+msgid "The Group to run as"
 msgstr "Schalte einige Warnungen aus"
 
 #. The User to run as
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:16
 #, fuzzy
-msgid "asterisk_asterisk_runuser"
+msgid "The User to run as"
 msgstr "Schalte einige Warnungen aus"
 
 #. Voicemail Spool directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:17
 #, fuzzy
-msgid "asterisk_asterisk_spooldir"
+msgid "Voicemail Spool directory"
 msgstr "AGI - Verzeichniss"
 
 #. Prefix UniquID with system name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:18
-msgid "asterisk_asterisk_systemname"
+msgid "Prefix UniquID with system name"
 msgstr ""
 
 #. Build transcode paths via SLINEAR, not directly
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:19
-msgid "asterisk_asterisk_transcodeviasln"
+msgid "Build transcode paths via SLINEAR, not directly"
 msgstr ""
 
 #. Transmit SLINEAR silence while recording a channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:20
-msgid "asterisk_asterisk_transmitsilenceduringrecord"
+msgid "Transmit SLINEAR silence while recording a channel"
 msgstr ""
 
 #. Verbose Level
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:21
 #, fuzzy
-msgid "asterisk_asterisk_verbose"
+msgid "Verbose Level"
 msgstr "Fehlerausgabestufe"
 
 #. Time Zone
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:22
 #, fuzzy
-msgid "asterisk_asterisk_zone"
+msgid "Time Zone"
 msgstr "Fehlerausgabestufe"
 
 #. Section dialplan
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:23
-msgid "asterisk_dialplan"
+msgid "Section dialplan"
 msgstr ""
 
 #. include
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:24
-msgid "asterisk_dialplan_include"
+msgid "include"
 msgstr ""
 
 #. Dialplan Extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:25
-msgid "asterisk_dialplanexten"
+msgid "Dialplan Extension"
 msgstr ""
 
 #. Dialplan General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:26
-msgid "asterisk_dialplangeneral"
+msgid "Dialplan General Options"
 msgstr ""
 
 #. Allow transfer
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:27
-msgid "asterisk_dialplangeneral_allowtransfer"
+msgid "Allow transfer"
 msgstr ""
 
 #. Reinvite/redirect media connections
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:28
-msgid "asterisk_dialplangeneral_canreinvite"
+msgid "Reinvite/redirect media connections"
 msgstr ""
 
 #. Clear global vars
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:29
-msgid "asterisk_dialplangeneral_clearglobalvars"
+msgid "Clear global vars"
 msgstr ""
 
 #. Dialplan Goto
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:30
-msgid "asterisk_dialplangoto"
+msgid "Dialplan Goto"
 msgstr ""
 
 #. Dialplan Conference
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:31
-msgid "asterisk_dialplanmeetme"
+msgid "Dialplan Conference"
 msgstr ""
 
 #. Dialplan Time
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:32
-msgid "asterisk_dialplansaytime"
+msgid "Dialplan Time"
 msgstr ""
 
 #. Dialplan Voicemail
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:33
-msgid "asterisk_dialplanvoice"
+msgid "Dialplan Voicemail"
 msgstr ""
 
 #. Dial Zones for Dialplan
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:34
-msgid "asterisk_dialzone"
+msgid "Dial Zones for Dialplan"
 msgstr ""
 
 #. Prefix to add matching dialplans
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:35
-msgid "asterisk_dialzone_addprefix"
+msgid "Prefix to add matching dialplans"
 msgstr ""
 
 #. Match International prefix
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:36
-msgid "asterisk_dialzone_international"
+msgid "Match International prefix"
 msgstr ""
 
 #. Prefix (0) to add/remove to/from international numbers
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:37
-msgid "asterisk_dialzone_localprefix"
+msgid "Prefix (0) to add/remove to/from international numbers"
 msgstr ""
 
 #. localzone
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:38
-msgid "asterisk_dialzone_localzone"
+msgid "localzone"
 msgstr ""
 
 #. Match plan
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:39
-msgid "asterisk_dialzone_match"
+msgid "Match plan"
 msgstr ""
 
 #. Connection to use
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:40
-msgid "asterisk_dialzone_uses"
+msgid "Connection to use"
 msgstr ""
 
 #. Feature Key maps
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:41
-msgid "asterisk_featuremap"
+msgid "Feature Key maps"
 msgstr ""
 
 #. Attended transfer key
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:42
-msgid "asterisk_featuremap_atxfer"
+msgid "Attended transfer key"
 msgstr ""
 
 #. Blind transfer key
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:43
-msgid "asterisk_featuremap_blindxfer"
+msgid "Blind transfer key"
 msgstr ""
 
 #. Key to Disconnect call
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:44
-msgid "asterisk_featuremap_disconnect"
+msgid "Key to Disconnect call"
 msgstr ""
 
 #. Key to Park call
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:45
-msgid "asterisk_featuremap_parkcall"
+msgid "Key to Park call"
 msgstr ""
 
 #. Parking Feature
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:46
-msgid "asterisk_featurepark"
+msgid "Parking Feature"
 msgstr ""
 
 #. ADSI Park
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:47
-msgid "asterisk_featurepark_adsipark"
+msgid "ADSI Park"
 msgstr ""
 
 #. Attended transfer timeout (sec)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:48
-msgid "asterisk_featurepark_atxfernoanswertimeout"
+msgid "Attended transfer timeout (sec)"
 msgstr ""
 
 #. One touch record key
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:49
-msgid "asterisk_featurepark_automon"
+msgid "One touch record key"
 msgstr ""
 
 #. Name of call context for parking
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:50
-msgid "asterisk_featurepark_context"
+msgid "Name of call context for parking"
 msgstr ""
 
 #. Sound file to play to parked caller
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:51
-msgid "asterisk_featurepark_courtesytone"
+msgid "Sound file to play to parked caller"
 msgstr ""
 
 #. Max time (ms) between digits for feature activation
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:52
-msgid "asterisk_featurepark_featuredigittimeout"
+msgid "Max time (ms) between digits for feature activation"
 msgstr ""
 
 #. Method to Find Parking slot
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:53
-msgid "asterisk_featurepark_findslot"
+msgid "Method to Find Parking slot"
 msgstr ""
 
 #. parkedmusicclass
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:54
-msgid "asterisk_featurepark_parkedmusicclass"
+msgid "parkedmusicclass"
 msgstr ""
 
 #. Play courtesy tone to
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:55
-msgid "asterisk_featurepark_parkedplay"
+msgid "Play courtesy tone to"
 msgstr ""
 
 #. Enable Parking
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:56
-msgid "asterisk_featurepark_parkenabled"
+msgid "Enable Parking"
 msgstr ""
 
 #. Extension to dial to park
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:57
-msgid "asterisk_featurepark_parkext"
+msgid "Extension to dial to park"
 msgstr ""
 
 #. Parking time (secs)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:58
-msgid "asterisk_featurepark_parkingtime"
+msgid "Parking time (secs)"
 msgstr ""
 
 #. Range of extensions for call parking
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:59
-msgid "asterisk_featurepark_parkpos"
+msgid "Range of extensions for call parking"
 msgstr ""
 
 #. Pickup extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:60
-msgid "asterisk_featurepark_pickupexten"
+msgid "Pickup extension"
 msgstr ""
 
 #. Seconds to wait bewteen digits when transferring
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:61
-msgid "asterisk_featurepark_transferdigittimeout"
+msgid "Seconds to wait bewteen digits when transferring"
 msgstr ""
 
 #. sound when attended transfer is complete
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:62
-msgid "asterisk_featurepark_xferfailsound"
+msgid "sound when attended transfer is complete"
 msgstr ""
 
 #. Sound when attended transfer fails
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:63
-msgid "asterisk_featurepark_xfersound"
+msgid "Sound when attended transfer fails"
 msgstr ""
 
 #. Reload Hardware Config
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:64
-msgid "asterisk_hardwarereboot"
+msgid "Reload Hardware Config"
 msgstr ""
 
 #. Reboot Method
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:65
-msgid "asterisk_hardwarereboot_method"
+msgid "Reboot Method"
 msgstr ""
 
 #. Parameter
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:66
-msgid "asterisk_hardwarereboot_param"
+msgid "Parameter"
 msgstr ""
 
 #. SIP Connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:67
-msgid "asterisk_iax"
+msgid "SIP Connection"
 msgstr ""
 
 #. Always Dial International
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:68
-msgid "asterisk_iax_alwaysinternational"
+msgid "Always Dial International"
 msgstr ""
 
 #. context
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:69
-msgid "asterisk_iax_context"
+msgid "context"
 msgstr ""
 
 #. Country Code for connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:70
-msgid "asterisk_iax_countrycode"
+msgid "Country Code for connection"
 msgstr ""
 
 #. Add as Extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:71
-msgid "asterisk_iax_extension"
+msgid "Add as Extension"
 msgstr ""
 
 #. Host name (or blank)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:72
-msgid "asterisk_iax_host"
+msgid "Host name (or blank)"
 msgstr ""
 
 #. International Dial Prefix
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:73
-msgid "asterisk_iax_internationalprefix"
+msgid "International Dial Prefix"
 msgstr ""
 
 #. Dial Prefix (for external line)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:74
-msgid "asterisk_iax_prefix"
+msgid "Dial Prefix (for external line)"
 msgstr ""
 
 #. Secret
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:75
-msgid "asterisk_iax_secret"
+msgid "Secret"
 msgstr ""
 
 #. Dial Timeout (sec)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:76
-msgid "asterisk_iax_timeout"
+msgid "Dial Timeout (sec)"
 msgstr ""
 
 #. Option type
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:77
-msgid "asterisk_iax_type"
+msgid "Option type"
 msgstr ""
 
 #. User name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:78
-msgid "asterisk_iax_username"
+msgid "User name"
 msgstr ""
 
 #. IAX General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:79
-msgid "asterisk_iaxgeneral"
+msgid "IAX General Options"
 msgstr ""
 
 #. Allow Codecs
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:80
-msgid "asterisk_iaxgeneral_allow"
+msgid "Allow Codecs"
 msgstr ""
 
 #. Reinvite/redirect media connections
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:81
-msgid "asterisk_iaxgeneral_canreinvite"
+msgid "Reinvite/redirect media connections"
 msgstr ""
 
 #. Static
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:82
-msgid "asterisk_iaxgeneral_static"
+msgid "Static"
 msgstr ""
 
 #. Write Protect
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:83
-msgid "asterisk_iaxgeneral_writeprotect"
+msgid "Write Protect"
 msgstr ""
 
 #. Meetme Conference
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:84
-msgid "asterisk_meetme"
+msgid "Meetme Conference"
 msgstr ""
 
 #. Admin PIN
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:85
-msgid "asterisk_meetme_adminpin"
+msgid "Admin PIN"
 msgstr ""
 
 #. Meeting PIN
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:86
-msgid "asterisk_meetme_pin"
+msgid "Meeting PIN"
 msgstr ""
 
 #. Meetme Conference General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:87
-msgid "asterisk_meetmegeneral"
+msgid "Meetme Conference General Options"
 msgstr ""
 
 #. Number of 20ms audio buffers to be used
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:88
-msgid "asterisk_meetmegeneral_audiobuffers"
+msgid "Number of 20ms audio buffers to be used"
 msgstr ""
 
 #. Modules
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:89
-msgid "asterisk_module"
+msgid "Modules"
 msgstr ""
 
 #. Alarm Receiver Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:90
-msgid "asterisk_module_appalarmreceiver"
+msgid "Alarm Receiver Application"
 msgstr ""
 
 #. Authentication Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:91
-msgid "asterisk_module_appauthenticate"
+msgid "Authentication Application"
 msgstr ""
 
 #. Make sure asterisk doesnt save CDR
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:92
-msgid "asterisk_module_appcdr"
+msgid "Make sure asterisk doesnt save CDR"
 msgstr ""
 
 #. Check if channel is available
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:93
-msgid "asterisk_module_appchanisavail"
+msgid "Check if channel is available"
 msgstr ""
 
 #. Listen in on any channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:94
-msgid "asterisk_module_appchanspy"
+msgid "Listen in on any channel"
 msgstr ""
 
 #. Control Playback Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:95
-msgid "asterisk_module_appcontrolplayback"
+msgid "Control Playback Application"
 msgstr ""
 
 #. Cuts up variables
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:96
-msgid "asterisk_module_appcut"
+msgid "Cuts up variables"
 msgstr ""
 
 #. Database access functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:97
-msgid "asterisk_module_appdb"
+msgid "Database access functions"
 msgstr ""
 
 #. Dialing Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:98
-msgid "asterisk_module_appdial"
+msgid "Dialing Application"
 msgstr ""
 
 #. Virtual Dictation Machine Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:99
-msgid "asterisk_module_appdictate"
+msgid "Virtual Dictation Machine Application"
 msgstr ""
 
 #. Directed Call Pickup Support
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:100
-msgid "asterisk_module_appdirectedpickup"
+msgid "Directed Call Pickup Support"
 msgstr ""
 
 #. Extension Directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:101
-msgid "asterisk_module_appdirectory"
+msgid "Extension Directory"
 msgstr ""
 
 #. DISA (Direct Inward System Access) Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:102
-msgid "asterisk_module_appdisa"
+msgid "DISA (Direct Inward System Access) Application"
 msgstr ""
 
 #. Dump channel variables Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:103
-msgid "asterisk_module_appdumpchan"
+msgid "Dump channel variables Application"
 msgstr ""
 
 #. Simple Echo Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:104
-msgid "asterisk_module_appecho"
+msgid "Simple Echo Application"
 msgstr ""
 
 #. ENUM Lookup
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:105
-msgid "asterisk_module_appenumlookup"
+msgid "ENUM Lookup"
 msgstr ""
 
 #. Reevaluates strings
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:106
-msgid "asterisk_module_appeval"
+msgid "Reevaluates strings"
 msgstr ""
 
 #. Executes applications
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:107
-msgid "asterisk_module_appexec"
+msgid "Executes applications"
 msgstr ""
 
 #. External IVR application interface
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:108
-msgid "asterisk_module_appexternalivr"
+msgid "External IVR application interface"
 msgstr ""
 
 #. Fork The CDR into 2 seperate entities
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:109
-msgid "asterisk_module_appforkcdr"
+msgid "Fork The CDR into 2 seperate entities"
 msgstr ""
 
 #. Get ADSI CPE ID
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:110
-msgid "asterisk_module_appgetcpeid"
+msgid "Get ADSI CPE ID"
 msgstr ""
 
 #. Group Management Routines
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:111
-msgid "asterisk_module_appgroupcount"
+msgid "Group Management Routines"
 msgstr ""
 
 #. Encode and Stream via icecast and ices
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:112
-msgid "asterisk_module_appices"
+msgid "Encode and Stream via icecast and ices"
 msgstr ""
 
 #. Image Transmission Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:113
-msgid "asterisk_module_appimage"
+msgid "Image Transmission Application"
 msgstr ""
 
 #. Look up Caller*ID name/number from black
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:114
-msgid "asterisk_module_applookupblacklist"
+msgid "Look up Caller*ID name/number from black"
 msgstr ""
 
 #. Look up CallerID Name from local databas
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:115
-msgid "asterisk_module_applookupcidname"
+msgid "Look up CallerID Name from local databas"
 msgstr ""
 
 #. Extension Macros
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:116
-msgid "asterisk_module_appmacro"
+msgid "Extension Macros"
 msgstr ""
 
 #. A simple math Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:117
-msgid "asterisk_module_appmath"
+msgid "A simple math Application"
 msgstr ""
 
 #. MD5 checksum Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:118
-msgid "asterisk_module_appmd5"
+msgid "MD5 checksum Application"
 msgstr ""
 
 #. Digital Milliwatt (mu-law) Test Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:119
-msgid "asterisk_module_appmilliwatt"
+msgid "Digital Milliwatt (mu-law) Test Application"
 msgstr ""
 
 #. Record a call and mix the audio during the recording
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:120
-msgid "asterisk_module_appmixmonitor"
+msgid "Record a call and mix the audio during the recording"
 msgstr ""
 
 #. Call Parking and Announce Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:121
-msgid "asterisk_module_appparkandannounce"
+msgid "Call Parking and Announce Application"
 msgstr ""
 
 #. Trivial Playback Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:122
-msgid "asterisk_module_appplayback"
+msgid "Trivial Playback Application"
 msgstr ""
 
 #. Require phone number to be entered
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:123
-msgid "asterisk_module_appprivacy"
+msgid "Require phone number to be entered"
 msgstr ""
 
 #. True Call Queueing
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:124
-msgid "asterisk_module_appqueue"
+msgid "True Call Queueing"
 msgstr ""
 
 #. Random goto
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:125
-msgid "asterisk_module_apprandom"
+msgid "Random goto"
 msgstr ""
 
 #. Read Variable Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:126
-msgid "asterisk_module_appread"
+msgid "Read Variable Application"
 msgstr ""
 
 #. Read in a file
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:127
-msgid "asterisk_module_appreadfile"
+msgid "Read in a file"
 msgstr ""
 
 #. Realtime Data Lookup/Rewrite
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:128
-msgid "asterisk_module_apprealtime"
+msgid "Realtime Data Lookup/Rewrite"
 msgstr ""
 
 #. Trivial Record Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:129
-msgid "asterisk_module_apprecord"
+msgid "Trivial Record Application"
 msgstr ""
 
 #. Say time
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:130
-msgid "asterisk_module_appsayunixtime"
+msgid "Say time"
 msgstr ""
 
 #. Send DTMF digits Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:131
-msgid "asterisk_module_appsenddtmf"
+msgid "Send DTMF digits Application"
 msgstr ""
 
 #. Send Text Applications
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:132
-msgid "asterisk_module_appsendtext"
+msgid "Send Text Applications"
 msgstr ""
 
 #. Set CallerID Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:133
-msgid "asterisk_module_appsetcallerid"
+msgid "Set CallerID Application"
 msgstr ""
 
 #. CDR user field apps
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:134
-msgid "asterisk_module_appsetcdruserfield"
+msgid "CDR user field apps"
 msgstr ""
 
 #. load =&gt; .so ; Set CallerID Name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:135
-msgid "asterisk_module_appsetcidname"
+msgid "load => .so ; Set CallerID Name"
 msgstr ""
 
 #. load =&gt; .so ; Set CallerID Number
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:136
-msgid "asterisk_module_appsetcidnum"
+msgid "load => .so ; Set CallerID Number"
 msgstr ""
 
 #. Set RDNIS Number
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:137
-msgid "asterisk_module_appsetrdnis"
+msgid "Set RDNIS Number"
 msgstr ""
 
 #. Set ISDN Transfer Capability
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:138
-msgid "asterisk_module_appsettransfercapability"
+msgid "Set ISDN Transfer Capability"
 msgstr ""
 
 #. SMS/PSTN handler
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:139
-msgid "asterisk_module_appsms"
+msgid "SMS/PSTN handler"
 msgstr ""
 
 #. Hangs up the requested channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:140
-msgid "asterisk_module_appsofthangup"
+msgid "Hangs up the requested channel"
 msgstr ""
 
 #. Stack Routines
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:141
-msgid "asterisk_module_appstack"
+msgid "Stack Routines"
 msgstr ""
 
 #. Generic System() application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:142
-msgid "asterisk_module_appsystem"
+msgid "Generic System() application"
 msgstr ""
 
 #. Playback with Talk Detection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:143
-msgid "asterisk_module_apptalkdetect"
+msgid "Playback with Talk Detection"
 msgstr ""
 
 #. Interface Test Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:144
-msgid "asterisk_module_apptest"
+msgid "Interface Test Application"
 msgstr ""
 
 #. Transfer
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:145
-msgid "asterisk_module_apptransfer"
+msgid "Transfer"
 msgstr ""
 
 #. TXTCIDName
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:146
-msgid "asterisk_module_apptxtcidname"
+msgid "TXTCIDName"
 msgstr ""
 
 #. Send URL Applications
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:147
-msgid "asterisk_module_appurl"
+msgid "Send URL Applications"
 msgstr ""
 
 #. Custom User Event Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:148
-msgid "asterisk_module_appuserevent"
+msgid "Custom User Event Application"
 msgstr ""
 
 #. Send verbose output
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:149
-msgid "asterisk_module_appverbose"
+msgid "Send verbose output"
 msgstr ""
 
 #. Voicemail
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:150
-msgid "asterisk_module_appvoicemail"
+msgid "Voicemail"
 msgstr ""
 
 #. Waits until first ring after time
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:151
-msgid "asterisk_module_appwaitforring"
+msgid "Waits until first ring after time"
 msgstr ""
 
 #. Wait For Silence Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:152
-msgid "asterisk_module_appwaitforsilence"
+msgid "Wait For Silence Application"
 msgstr ""
 
 #. While Loops and Conditional Execution
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:153
-msgid "asterisk_module_appwhile"
+msgid "While Loops and Conditional Execution"
 msgstr ""
 
 #. Comma Separated Values CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:154
-msgid "asterisk_module_cdrcsv"
+msgid "Comma Separated Values CDR Backend"
 msgstr ""
 
 #. Customizable Comma Separated Values CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:155
-msgid "asterisk_module_cdrcustom"
+msgid "Customizable Comma Separated Values CDR Backend"
 msgstr ""
 
 #. Asterisk Call Manager CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:156
-msgid "asterisk_module_cdrmanager"
+msgid "Asterisk Call Manager CDR Backend"
 msgstr ""
 
 #. MySQL CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:157
-msgid "asterisk_module_cdrmysql"
+msgid "MySQL CDR Backend"
 msgstr ""
 
 #. PostgreSQL CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:158
-msgid "asterisk_module_cdrpgsql"
+msgid "PostgreSQL CDR Backend"
 msgstr ""
 
 #. SQLite CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:159
-msgid "asterisk_module_cdrsqlite"
+msgid "SQLite CDR Backend"
 msgstr ""
 
 #. Agent Proxy Channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:160
-msgid "asterisk_module_chanagent"
+msgid "Agent Proxy Channel"
 msgstr ""
 
 #. Channel driver for GTalk
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:161
-msgid "asterisk_module_chanalsa"
+msgid "Channel driver for GTalk"
 msgstr ""
 
 #. Channel driver for GTalk
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:162
-msgid "asterisk_module_changtalk"
+msgid "Channel driver for GTalk"
 msgstr ""
 
 #. Option chan_iax2
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:163
-msgid "asterisk_module_chaniax2"
+msgid "Option chan_iax2"
 msgstr ""
 
 #. Local Proxy Channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:164
-msgid "asterisk_module_chanlocal"
+msgid "Local Proxy Channel"
 msgstr ""
 
 #. Session Initiation Protocol (SIP)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:165
-msgid "asterisk_module_chansip"
+msgid "Session Initiation Protocol (SIP)"
 msgstr ""
 
 #. Adaptive Differential PCM Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:166
-msgid "asterisk_module_codecadpcm"
+msgid "Adaptive Differential PCM Coder/Decoder"
 msgstr ""
 
 #. A-law Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:167
-msgid "asterisk_module_codecalaw"
+msgid "A-law Coder/Decoder"
 msgstr ""
 
 #. A-law and Mulaw direct Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:168
-msgid "asterisk_module_codecamu"
+msgid "A-law and Mulaw direct Coder/Decoder"
 msgstr ""
 
 #. ITU G.726-32kbps G726 Transcoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:169
-msgid "asterisk_module_codecg726"
+msgid "ITU G.726-32kbps G726 Transcoder"
 msgstr ""
 
 #. GSM/PCM16 (signed linear) Codec Translation
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:170
-msgid "asterisk_module_codecgsm"
+msgid "GSM/PCM16 (signed linear) Codec Translation"
 msgstr ""
 
 #. Speex/PCM16 (signed linear) Codec Translator
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:171
-msgid "asterisk_module_codecspeex"
+msgid "Speex/PCM16 (signed linear) Codec Translator"
 msgstr ""
 
 #. Mu-law Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:172
-msgid "asterisk_module_codeculaw"
+msgid "Mu-law Coder/Decoder"
 msgstr ""
 
 #. Sun Microsystems AU format (signed linear)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:173
-msgid "asterisk_module_formatau"
+msgid "Sun Microsystems AU format (signed linear)"
 msgstr ""
 
 #. G.723.1 Simple Timestamp File Format
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:174
-msgid "asterisk_module_formatg723"
+msgid "G.723.1 Simple Timestamp File Format"
 msgstr ""
 
 #. Raw G.726 (16/24/32/40kbps) data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:175
-msgid "asterisk_module_formatg726"
+msgid "Raw G.726 (16/24/32/40kbps) data"
 msgstr ""
 
 #. Raw G729 data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:176
-msgid "asterisk_module_formatg729"
+msgid "Raw G729 data"
 msgstr ""
 
 #. Raw GSM data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:177
-msgid "asterisk_module_formatgsm"
+msgid "Raw GSM data"
 msgstr ""
 
 #. Raw h263 data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:178
-msgid "asterisk_module_formath263"
+msgid "Raw h263 data"
 msgstr ""
 
 #. JPEG (Joint Picture Experts Group) Image
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:179
-msgid "asterisk_module_formatjpeg"
+msgid "JPEG (Joint Picture Experts Group) Image"
 msgstr ""
 
 #. Raw uLaw 8khz Audio support (PCM)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:180
-msgid "asterisk_module_formatpcm"
+msgid "Raw uLaw 8khz Audio support (PCM)"
 msgstr ""
 
 #. load =&gt; .so ; Raw aLaw 8khz PCM Audio support
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:181
-msgid "asterisk_module_formatpcmalaw"
+msgid "load => .so ; Raw aLaw 8khz PCM Audio support"
 msgstr ""
 
 #. Raw Signed Linear Audio support (SLN)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:182
-msgid "asterisk_module_formatsln"
+msgid "Raw Signed Linear Audio support (SLN)"
 msgstr ""
 
 #. Dialogic VOX (ADPCM) File Format
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:183
-msgid "asterisk_module_formatvox"
+msgid "Dialogic VOX (ADPCM) File Format"
 msgstr ""
 
 #. Microsoft WAV format (8000hz Signed Line
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:184
-msgid "asterisk_module_formatwav"
+msgid "Microsoft WAV format (8000hz Signed Line"
 msgstr ""
 
 #. Microsoft WAV format (Proprietary GSM)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:185
-msgid "asterisk_module_formatwavgsm"
+msgid "Microsoft WAV format (Proprietary GSM)"
 msgstr ""
 
 #. Caller ID related dialplan functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:186
-msgid "asterisk_module_funccallerid"
+msgid "Caller ID related dialplan functions"
 msgstr ""
 
 #. ENUM Functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:187
-msgid "asterisk_module_funcenum"
+msgid "ENUM Functions"
 msgstr ""
 
 #. URI encoding / decoding functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:188
-msgid "asterisk_module_funcuri"
+msgid "URI encoding / decoding functions"
 msgstr ""
 
 #. Asterisk Extension Language Compiler
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:189
-msgid "asterisk_module_pbxael"
+msgid "Asterisk Extension Language Compiler"
 msgstr ""
 
 #. Text Extension Configuration
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:190
-msgid "asterisk_module_pbxconfig"
+msgid "Text Extension Configuration"
 msgstr ""
 
 #. load =&gt; .so ; Builtin dialplan functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:191
-msgid "asterisk_module_pbxfunctions"
+msgid "load => .so ; Builtin dialplan functions"
 msgstr ""
 
 #. Loopback Switch
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:192
-msgid "asterisk_module_pbxloopback"
+msgid "Loopback Switch"
 msgstr ""
 
 #. Realtime Switch
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:193
-msgid "asterisk_module_pbxrealtime"
+msgid "Realtime Switch"
 msgstr ""
 
 #. Outgoing Spool Support
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:194
-msgid "asterisk_module_pbxspool"
+msgid "Outgoing Spool Support"
 msgstr ""
 
 #. Wil Cal U (Auto Dialer)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:195
-msgid "asterisk_module_pbxwilcalu"
+msgid "Wil Cal U (Auto Dialer)"
 msgstr ""
 
 #. MySQL Config Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:196
-msgid "asterisk_module_resconfigmysql"
+msgid "MySQL Config Resource"
 msgstr ""
 
 #. ODBC Config Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:197
-msgid "asterisk_module_resconfigodbc"
+msgid "ODBC Config Resource"
 msgstr ""
 
 #. PGSQL Module
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:198
-msgid "asterisk_module_resconfigpgsql"
+msgid "PGSQL Module"
 msgstr ""
 
 #. Cryptographic Digital Signatures
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:199
-msgid "asterisk_module_rescrypto"
+msgid "Cryptographic Digital Signatures"
 msgstr ""
 
 #. Call Parking Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:200
-msgid "asterisk_module_resfeatures"
+msgid "Call Parking Resource"
 msgstr ""
 
 #. Indications Configuration
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:201
-msgid "asterisk_module_resindications"
+msgid "Indications Configuration"
 msgstr ""
 
 #. Call Monitoring Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:202
-msgid "asterisk_module_resmonitor"
+msgid "Call Monitoring Resource"
 msgstr ""
 
 #. Music On Hold Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:203
-msgid "asterisk_module_resmusiconhold"
+msgid "Music On Hold Resource"
 msgstr ""
 
 #. ODBC Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:204
-msgid "asterisk_module_resodbc"
+msgid "ODBC Resource"
 msgstr ""
 
 #. SMDI Module
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:205
-msgid "asterisk_module_ressmdi"
+msgid "SMDI Module"
 msgstr ""
 
 #. SNMP Module
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:206
-msgid "asterisk_module_ressnmp"
+msgid "SNMP Module"
 msgstr ""
 
 #. Music On Hold
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:207
-msgid "asterisk_moh"
+msgid "Music On Hold"
 msgstr ""
 
 #. Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:208
-msgid "asterisk_moh_application"
+msgid "Application"
 msgstr ""
 
 #. Directory of Music
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:209
-msgid "asterisk_moh_directory"
+msgid "Directory of Music"
 msgstr ""
 
 #. Option mode
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:210
-msgid "asterisk_moh_mode"
+msgid "Option mode"
 msgstr ""
 
 #. Random Play
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:211
-msgid "asterisk_moh_random"
+msgid "Random Play"
 msgstr ""
 
 #. SIP Connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:212
-msgid "asterisk_sip"
+msgid "SIP Connection"
 msgstr ""
 
 #. Always Dial International
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:213
-msgid "asterisk_sip_alwaysinternational"
+msgid "Always Dial International"
 msgstr ""
 
 #. Reinvite/redirect media connections
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:214
-msgid "asterisk_sip_canreinvite"
+msgid "Reinvite/redirect media connections"
 msgstr ""
 
 #. context
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:215
-msgid "asterisk_sip_context"
+msgid "context"
 msgstr ""
 
 #. Country Code for connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:216
-msgid "asterisk_sip_countrycode"
+msgid "Country Code for connection"
 msgstr ""
 
 #. DTMF mode
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:217
-msgid "asterisk_sip_dtmfmode"
+msgid "DTMF mode"
 msgstr ""
 
 #. Add as Extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:218
-msgid "asterisk_sip_extension"
+msgid "Add as Extension"
 msgstr ""
 
 #. Primary domain identity for From: headers
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:219
-msgid "asterisk_sip_fromdomain"
+msgid "Primary domain identity for From: headers"
 msgstr ""
 
 #. From user (required by many SIP providers)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:220
-msgid "asterisk_sip_fromuser"
+msgid "From user (required by many SIP providers)"
 msgstr ""
 
 #. Host name (or blank)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:221
-msgid "asterisk_sip_host"
+msgid "Host name (or blank)"
 msgstr ""
 
 #. Ring on incoming dialplan contexts
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:222
-msgid "asterisk_sip_incoming"
+msgid "Ring on incoming dialplan contexts"
 msgstr ""
 
 #. Allow Insecure for
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:223
-msgid "asterisk_sip_insecure"
+msgid "Allow Insecure for"
 msgstr ""
 
 #. International Dial Prefix
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:224
-msgid "asterisk_sip_internationalprefix"
+msgid "International Dial Prefix"
 msgstr ""
 
 #. Mailbox for MWI
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:225
-msgid "asterisk_sip_mailbox"
+msgid "Mailbox for MWI"
 msgstr ""
 
 #. NAT between phone and Asterisk
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:226
-msgid "asterisk_sip_nat"
+msgid "NAT between phone and Asterisk"
 msgstr ""
 
 #. Check tags in headers
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:227
-msgid "asterisk_sip_pedantic"
+msgid "Check tags in headers"
 msgstr ""
 
 #. SIP Port
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:228
-msgid "asterisk_sip_port"
+msgid "SIP Port"
 msgstr ""
 
 #. Dial Prefix (for external line)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:229
-msgid "asterisk_sip_prefix"
+msgid "Dial Prefix (for external line)"
 msgstr ""
 
 #. Reply Timeout (ms) for down connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:230
-msgid "asterisk_sip_qualify"
+msgid "Reply Timeout (ms) for down connection"
 msgstr ""
 
 #. Register connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:231
-msgid "asterisk_sip_register"
+msgid "Register connection"
 msgstr ""
 
 #. Secret
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:232
-msgid "asterisk_sip_secret"
+msgid "Secret"
 msgstr ""
 
 #. Dial own extension for mailbox
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:233
-msgid "asterisk_sip_selfmailbox"
+msgid "Dial own extension for mailbox"
 msgstr ""
 
 #. Dial Timeout (sec)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:234
-msgid "asterisk_sip_timeout"
+msgid "Dial Timeout (sec)"
 msgstr ""
 
 #. Client Type
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:235
-msgid "asterisk_sip_type"
+msgid "Client Type"
 msgstr ""
 
 #. Username
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:236
-msgid "asterisk_sip_username"
+msgid "Username"
 msgstr ""
 
 #. Section sipgeneral
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:237
-msgid "asterisk_sipgeneral"
+msgid "Section sipgeneral"
 msgstr ""
 
 #. Allow codecs
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:238
-msgid "asterisk_sipgeneral_allow"
+msgid "Allow codecs"
 msgstr ""
 
 #. SIP Port
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:239
-msgid "asterisk_sipgeneral_port"
+msgid "SIP Port"
 msgstr ""
 
 #. SIP realm
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:240
-msgid "asterisk_sipgeneral_realm"
+msgid "SIP realm"
 msgstr ""
 
 #. Voicemail general options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:241
-msgid "asterisk_voicegeneral"
+msgid "Voicemail general options"
 msgstr ""
 
 #. From Email address of server
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:242
-msgid "asterisk_voicegeneral_serveremail"
+msgid "From Email address of server"
 msgstr ""
 
 #. Voice Mail boxes
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:243
-msgid "asterisk_voicemail"
+msgid "Voice Mail boxes"
 msgstr ""
 
 #. Email contains attachment
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:244
-msgid "asterisk_voicemail_attach"
+msgid "Email contains attachment"
 msgstr ""
 
 #. Email
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:245
-msgid "asterisk_voicemail_email"
+msgid "Email"
 msgstr ""
 
 #. Display Name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:246
-msgid "asterisk_voicemail_name"
+msgid "Display Name"
 msgstr ""
 
 #. Password
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:247
-msgid "asterisk_voicemail_password"
+msgid "Password"
 msgstr ""
 
 #. zone
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:248
-msgid "asterisk_voicemail_zone"
+msgid "zone"
 msgstr ""
 
 #. Voice Zone settings
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:249
-msgid "asterisk_voicezone"
+msgid "Voice Zone settings"
 msgstr ""
 
 #. Message Format
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:250
-msgid "asterisk_voicezone_message"
+msgid "Message Format"
 msgstr ""
 
 #. Time Zone
diff --git a/po/de/cbi.po b/po/de/cbi.po
index 4b6b32ea0..1a4fbbcc5 100644
--- a/po/de/cbi.po
+++ b/po/de/cbi.po
@@ -13,86 +13,86 @@ msgstr ""
 
 #. Add entry
 #: i18n/english/luasrc/i18n/cbi.en.lua:1
-msgid "cbi_add"
+msgid "Add"
 msgstr "Eintrag hinzufügen"
 
 #. Remove entry
 #: i18n/english/luasrc/i18n/cbi.en.lua:2
-msgid "cbi_del"
+msgid "Delete"
 msgstr "Eintrag entfernen"
 
 #. Replace entry
 #: i18n/english/luasrc/i18n/cbi.en.lua:3
-msgid "cbi_replace"
+msgid "Replace entry"
 msgstr "Eintrag ersetzen"
 
 #. Invalid input value
 #: i18n/english/luasrc/i18n/cbi.en.lua:4
-msgid "cbi_invalid"
+msgid "Invalid"
 msgstr "Ungültige Eingabe"
 
 #. <strong>Validation failed:</strong> Please check any input fields for mistakes.
 #: i18n/english/luasrc/i18n/cbi.en.lua:5
-msgid "cbi_invalid_section"
+msgid "<strong>Validation failed:</strong> Please check any input fields for mistakes."
 msgstr ""
 "<strong>Validierung fehlgeschlagen:</strong> Bitte die Eingabefelder auf "
 "Fehler überprüfen."
 
 #. This field is mandatory
 #: i18n/english/luasrc/i18n/cbi.en.lua:6
-msgid "cbi_missing"
+msgid "This field is mandatory"
 msgstr "Dieses Feld muss ausgefüllt werden"
 
 #. <strong>Validation failed:</strong> At least one mandatory field has no or an invalid value
 #: i18n/english/luasrc/i18n/cbi.en.lua:7
-msgid "cbi_deperror"
+msgid "<strong>Validation failed:</strong> At least one mandatory field has no or an invalid value"
 msgstr ""
 "<strong>Validierung fehlgeschlagen:</strong> Mindestens ein benötigtes Feld "
 "ist leer oder hat einen ungültigen Wert"
 
 #. A requirement for this option was not met
 #: i18n/english/luasrc/i18n/cbi.en.lua:8
-msgid "cbi_reqerror"
+msgid "A requirement for this option was not met"
 msgstr "Nicht erfüllte Abhängigkeit für dieses Feld"
 
 #. -- Additional Field --
 #: i18n/english/luasrc/i18n/cbi.en.lua:9
-msgid "cbi_addopt"
+msgid "-- Additional Field --"
 msgstr "-- Zusätzliches Feld --"
 
 #.  (optional)
 #: i18n/english/luasrc/i18n/cbi.en.lua:10
-msgid "cbi_optional"
+msgid " (optional)"
 msgstr " (optional)"
 
 #. This section contains no values yet
 #: i18n/english/luasrc/i18n/cbi.en.lua:11
-msgid "cbi_sectempty"
+msgid "This section contains no values yet"
 msgstr "Diese Sektion enthält noch keine Einträge"
 
 #. -- custom --
 #: i18n/english/luasrc/i18n/cbi.en.lua:12
-msgid "cbi_manual"
+msgid "-- custom --"
 msgstr "-- benutzerdefiniert --"
 
 #. -- Please choose --
 #: i18n/english/luasrc/i18n/cbi.en.lua:13
-msgid "cbi_select"
+msgid "-- Please choose --"
 msgstr "-- Bitte auswählen --"
 
 #. Go to relevant configuration page
 #: i18n/english/luasrc/i18n/cbi.en.lua:14
-msgid "cbi_gorel"
+msgid " "
 msgstr "Gehe zu relevanter Konfigurationsseite"
 
 #. Applying changes
 #: i18n/english/luasrc/i18n/cbi.en.lua:15
-msgid "cbi_applying"
+msgid "Applying changes"
 msgstr "Änderungen werden angewandt"
 
 #. Uploaded File
 #: i18n/english/luasrc/i18n/cbi.en.lua:16
-msgid "cbi_upload"
+msgid "Uploaded File"
 msgstr "hochgeladene Datei"
 
 #. Search file...
diff --git a/po/de/coovachilli.po b/po/de/coovachilli.po
index 056a9978d..3c2557a47 100644
--- a/po/de/coovachilli.po
+++ b/po/de/coovachilli.po
@@ -13,51 +13,51 @@ msgstr ""
 
 #. CoovaChilli
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:1
-msgid "coovachilli"
+msgid "CoovaChilli"
 msgstr "CoovaChilli"
 
 #. General configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:2
-msgid "coovachilli_general"
+msgid "General configuration"
 msgstr "Allgemeine Einstellungen"
 
 #. General CoovaChilli settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:3
-msgid "coovachilli_general_desc"
+msgid "General CoovaChilli settings"
 msgstr "Allgemeine Einstellungen zu CoovaChilli"
 
 #. Command socket
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:4
 #, fuzzy
-msgid "coovachilli_general_cmdsock"
+msgid "Command socket"
 msgstr "Eingabeschnittstelle"
 
 #. UNIX socket used for communication with chilli_query
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:5
 #, fuzzy
-msgid "coovachilli_general_cmdsock_desc"
+msgid "UNIX socket used for communication with chilli_query"
 msgstr "Eingabeschnittstelle"
 
 #. Config refresh interval
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:6
 #, fuzzy
-msgid "coovachilli_general_interval"
+msgid "Config refresh interval"
 msgstr "Zeit zwischen neuladen der Konfiguration"
 
 #. Re-read configuration file and do DNS lookups every interval seconds. This has the same effect as sending the HUP signal. If interval is 0 (zero) this feature is disabled. 
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:7
 #, fuzzy
-msgid "coovachilli_general_interval_desc"
+msgid "Re-read configuration file and do DNS lookups every interval seconds. This has the same effect as sending the HUP signal. If interval is 0 (zero) this feature is disabled. "
 msgstr "Zeit zwischen neuladen der Konfiguration"
 
 #. Pid file
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:8
-msgid "coovachilli_general_pidfile"
+msgid "Pid file"
 msgstr "<abbr title=\"Prozessindentifikationsnummer\">Pid</abbr>-Datei"
 
 #. Filename to put the process id
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:9
-msgid "coovachilli_general_pidfile_desc"
+msgid "Filename to put the process id"
 msgstr ""
 "Name der Datei, in der die <abbr "
 "title=\"Prozessindentifikationsnummer\">Pid</abbr> gespeichert wird"
@@ -65,30 +65,30 @@ msgstr ""
 #. State directory
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:10
 #, fuzzy
-msgid "coovachilli_general_statedir"
+msgid "State directory"
 msgstr "Statisches Verzeichniss"
 
 #. Directory of non-volatile data
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:11
-msgid "coovachilli_general_statedir_desc"
+msgid "Directory of non-volatile data"
 msgstr "Verzeichniss für statische Daten"
 
 #. TUN/TAP configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:12
 #, fuzzy
-msgid "coovachilli_tun"
+msgid "TUN/TAP configuration"
 msgstr "TUN/TAP Konfiguration"
 
 #. Network/Tun configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:13
 #, fuzzy
-msgid "coovachilli_tun_desc"
+msgid "Network/Tun configuration"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. Network down script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:14
 #, fuzzy
-msgid "coovachilli_tun_condown"
+msgid "Network down script"
 msgstr ""
 "Script, das nach einer Umwandlung von einer autorisierten zu einer "
 "unautorisierten Sitzung ausgeführt wird"
@@ -96,7 +96,7 @@ msgstr ""
 #. Script executed after a session has moved from authorized state to unauthorized
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:15
 #, fuzzy
-msgid "coovachilli_tun_condown_desc"
+msgid "Script executed after a session has moved from authorized state to unauthorized"
 msgstr ""
 "Script, das nach einer Umwandlung von einer autorisierten zu einer "
 "unautorisierten Sitzung ausgeführt wird"
@@ -104,37 +104,37 @@ msgstr ""
 #. Network up script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:16
 #, fuzzy
-msgid "coovachilli_tun_conup"
+msgid "Network up script"
 msgstr "Primärer DNS-Server"
 
 #. Script executed after the tun network interface has been brought up
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:17
 #, fuzzy
-msgid "coovachilli_tun_conup_desc"
+msgid "Script executed after the tun network interface has been brought up"
 msgstr "Script, dass nach erfolgreicher tun - Verbindung ausgeführt wird"
 
 #. Primary DNS Server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:18
-msgid "coovachilli_tun_dns1"
+msgid "Primary DNS Server"
 msgstr "Primärer DNS-Server"
 
 #. Is used to inform the client about the DNS address to use for host name resolution
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:19
 #, fuzzy
-msgid "coovachilli_tun_dns1_desc"
+msgid "Is used to inform the client about the DNS address to use for host name resolution"
 msgstr ""
 "Zur Auflösung der Host-Namen benötigter DNS Server, die an den client "
 "übertragen wird"
 
 #. Secondary DNS Server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:20
-msgid "coovachilli_tun_dns2"
+msgid "Secondary DNS Server"
 msgstr "Sekundärer DNS-Server"
 
 #. Is used to inform the client about the DNS address to use for host name resolution
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:21
 #, fuzzy
-msgid "coovachilli_tun_dns2_desc"
+msgid "Is used to inform the client about the DNS address to use for host name resolution"
 msgstr ""
 "Zur Auflösung der Host-Namen benötigter DNS Server, die an den client "
 "übertragen wird"
@@ -142,13 +142,13 @@ msgstr ""
 #. Domain name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:22
 #, fuzzy
-msgid "coovachilli_tun_domain"
+msgid "Domain name"
 msgstr "Domain Name"
 
 #. Is used to inform the client about the domain name to use for DNS lookups
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:23
 #, fuzzy
-msgid "coovachilli_tun_domain_desc"
+msgid "Is used to inform the client about the domain name to use for DNS lookups"
 msgstr ""
 "Script, das nach einer Umwandlung von einer autorisierten zu einer "
 "unautorisierten Sitzung ausgeführt wird"
@@ -156,13 +156,13 @@ msgstr ""
 #. Dynamic IP address pool
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:24
 #, fuzzy
-msgid "coovachilli_tun_dynip"
+msgid "Dynamic IP address pool"
 msgstr "Primärer DNS-Server"
 
 #. Specifies a pool of dynamic IP addresses
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:25
 #, fuzzy
-msgid "coovachilli_tun_dynip_desc"
+msgid "Specifies a pool of dynamic IP addresses"
 msgstr ""
 "Zur Auflösung der Host-Namen benötigter DNS Server, die an den client "
 "übertragen wird"
@@ -170,13 +170,13 @@ msgstr ""
 #. IP down script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:26
 #, fuzzy
-msgid "coovachilli_tun_ipdown"
+msgid "IP down script"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. Script executed after the tun network interface has been taken down
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:27
 #, fuzzy
-msgid "coovachilli_tun_ipdown_desc"
+msgid "Script executed after the tun network interface has been taken down"
 msgstr ""
 "Script, das nach einer Umwandlung von einer autorisierten zu einer "
 "unautorisierten Sitzung ausgeführt wird"
@@ -184,25 +184,25 @@ msgstr ""
 #. IP up script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:28
 #, fuzzy
-msgid "coovachilli_tun_ipup"
+msgid "IP up script"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. Script executed after the TUN/TAP network interface has been brought up
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:29
 #, fuzzy
-msgid "coovachilli_tun_ipup_desc"
+msgid "Script executed after the TUN/TAP network interface has been brought up"
 msgstr "Script, dass nach erfolgreicher tun - Verbindung ausgeführt wird"
 
 #. Uplink subnet
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:30
 #, fuzzy
-msgid "coovachilli_tun_net"
+msgid "Uplink subnet"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. Network address of the uplink interface (CIDR notation)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:31
 #, fuzzy
-msgid "coovachilli_tun_net_desc"
+msgid "Network address of the uplink interface (CIDR notation)"
 msgstr ""
 "Zur Auflösung der Host-Namen benötigter DNS Server, die an den client "
 "übertragen wird"
@@ -210,25 +210,25 @@ msgstr ""
 #. Static IP address pool
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:32
 #, fuzzy
-msgid "coovachilli_tun_statip"
+msgid "Static IP address pool"
 msgstr "Domain Name"
 
 #. Specifies a pool of static IP addresses
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:33
 #, fuzzy
-msgid "coovachilli_tun_statip_desc"
+msgid "Specifies a pool of static IP addresses"
 msgstr "Script, dass nach erfolgreicher tun - Verbindung ausgeführt wird"
 
 #. TUN/TAP device
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:34
 #, fuzzy
-msgid "coovachilli_tun_tundev"
+msgid "TUN/TAP device"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. The specific device to use for the TUN/TAP interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:35
 #, fuzzy
-msgid "coovachilli_tun_tundev_desc"
+msgid "The specific device to use for the TUN/TAP interface"
 msgstr ""
 "Script, das nach einer Umwandlung von einer autorisierten zu einer "
 "unautorisierten Sitzung ausgeführt wird"
@@ -236,13 +236,13 @@ msgstr ""
 #. TX queue length
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:36
 #, fuzzy
-msgid "coovachilli_tun_txqlen"
+msgid "TX queue length"
 msgstr "Domain Name"
 
 #. The TX queue length to set on the TUN/TAP interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:37
 #, fuzzy
-msgid "coovachilli_tun_txqlen_desc"
+msgid "The TX queue length to set on the TUN/TAP interface"
 msgstr ""
 "Script, das nach einer Umwandlung von einer autorisierten zu einer "
 "unautorisierten Sitzung ausgeführt wird"
@@ -250,130 +250,130 @@ msgstr ""
 #. Use TAP device
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:38
 #, fuzzy
-msgid "coovachilli_tun_usetap"
+msgid "Use TAP device"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. Use the TAP interface instead of TUN
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:39
 #, fuzzy
-msgid "coovachilli_tun_usetap_desc"
+msgid "Use the TAP interface instead of TUN"
 msgstr "Script, dass nach erfolgreicher tun - Verbindung ausgeführt wird"
 
 #. DHCP configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:40
 #, fuzzy
-msgid "coovachilli_dhcp"
+msgid "DHCP configuration"
 msgstr "TUN/TAP Konfiguration"
 
 #. Set DHCP options for connecting clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:41
 #, fuzzy
-msgid "coovachilli_dhcp_desc"
+msgid "Set DHCP options for connecting clients"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. DHCP end number
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:42
 #, fuzzy
-msgid "coovachilli_dhcp_dhcpend"
+msgid "DHCP end number"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. Where to stop assigning IP addresses (default 254)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:43
 #, fuzzy
-msgid "coovachilli_dhcp_dhcpend_desc"
+msgid "Where to stop assigning IP addresses (default 254)"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. DHCP interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:44
 #, fuzzy
-msgid "coovachilli_dhcp_dhcpif"
+msgid "DHCP interface"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. Ethernet interface to listen to for the downlink interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:45
 #, fuzzy
-msgid "coovachilli_dhcp_dhcpif_desc"
+msgid "Ethernet interface to listen to for the downlink interface"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. Listen MAC address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:46
 #, fuzzy
-msgid "coovachilli_dhcp_dhcpmac"
+msgid "Listen MAC address"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. MAC address to listen to. If not specified the MAC address of the interface will be used
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:47
 #, fuzzy
-msgid "coovachilli_dhcp_dhcpmac_desc"
+msgid "MAC address to listen to. If not specified the MAC address of the interface will be used"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. DHCP start number
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:48
 #, fuzzy
-msgid "coovachilli_dhcp_dhcpstart"
+msgid "DHCP start number"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. Where to start assigning IP addresses (default 10)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:49
 #, fuzzy
-msgid "coovachilli_dhcp_dhcpstart_desc"
+msgid "Where to start assigning IP addresses (default 10)"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. Enable IEEE 802.1x
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:50
 #, fuzzy
-msgid "coovachilli_dhcp_eapolenable"
+msgid "Enable IEEE 802.1x"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. Enable IEEE 802.1x authentication and listen for EAP requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:51
 #, fuzzy
-msgid "coovachilli_dhcp_eapolenable_desc"
+msgid "Enable IEEE 802.1x authentication and listen for EAP requests"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. Leasetime
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:52
 #, fuzzy
-msgid "coovachilli_dhcp_lease"
+msgid "Leasetime"
 msgstr "Vorhaltezeit"
 
 #. Use a DHCP lease of seconds (default 600)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:53
-msgid "coovachilli_dhcp_lease_desc"
+msgid "Use a DHCP lease of seconds (default 600)"
 msgstr "Benutze eine DHCP-Vorhaltezeit in Sekunden (voreingestelllt 600)"
 
 #. RADIUS configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:54
-msgid "coovachilli_radius"
+msgid "RADIUS configuration"
 msgstr "RADIUS konfiguration"
 
 #. RADIUS configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:55
-msgid "coovachilli_radius_desc"
+msgid "RADIUS configuration"
 msgstr "Konfiguration des RADIUS"
 
 #. Allow session update through RADIUS
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:56
-msgid "coovachilli_radius_acctupdate"
+msgid "Allow session update through RADIUS"
 msgstr "Erlaube Sitzungsupdates durch RADIUS"
 
 #. Allow updating of session parameters with RADIUS attributes sent in Accounting-Response
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:57
 #, fuzzy
-msgid "coovachilli_radius_acctupdate_desc"
+msgid "Allow updating of session parameters with RADIUS attributes sent in Accounting-Response"
 msgstr ""
 "Erlaubt das Aktuallisieren der Sitzungsparameter mit RADIUS-attributen, die "
 "im der Konten-Antwort enthalten sind"
 
 #. Admin password
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:58
-msgid "coovachilli_radius_adminpasswd"
+msgid "Admin password"
 msgstr "Administratorkennwort"
 
 #. Password to use for Administrative-User authentication in order to pick up chilli configurations and establish a device &quot;system&quot; session
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:59
 #, fuzzy
-msgid "coovachilli_radius_adminpasswd_desc"
+msgid "Password to use for Administrative-User authentication in order to pick up chilli configurations and establish a device \"system\" session"
 msgstr ""
 "Kennwort zur Administratoren-Authentifizierung um die chilli- "
 "konfigurationen aufzunehmen und eine Systemsitzung fürs Gerät zu erstellen"
@@ -381,680 +381,680 @@ msgstr ""
 #. Admin user
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:60
 #, fuzzy
-msgid "coovachilli_radius_adminuser"
+msgid "Admin user"
 msgstr "Adminstratorenkennung"
 
 #. User-name to use for Administrative-User authentication in order to pick up chilli configurations and establish a device &quot;system&quot; session
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:61
 #, fuzzy
-msgid "coovachilli_radius_adminuser_desc"
+msgid "User-name to use for Administrative-User authentication in order to pick up chilli configurations and establish a device \"system\" session"
 msgstr "Benutzername des für Administration berechtigten Benutzers. "
 
 #. Do not check disconnection requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:62
 #, fuzzy
-msgid "coovachilli_radius_coanoipcheck"
+msgid "Do not check disconnection requests"
 msgstr "Ignoriere die Verbindungstrennungsanfragen"
 
 #. Do not check the source IP address of radius disconnect requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:63
 #, fuzzy
-msgid "coovachilli_radius_coanoipcheck_desc"
+msgid "Do not check the source IP address of radius disconnect requests"
 msgstr "Prüft nicht die Quell-IP einer RADIUS Verbindungstrennungsanfrage."
 
 #. RADIUS disconnect port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:64
 #, fuzzy
-msgid "coovachilli_radius_coaport"
+msgid "RADIUS disconnect port"
 msgstr "Port f&uuml;r die Verbindungstrennung"
 
 #. UDP port to listen to for accepting radius disconnect requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:65
 #, fuzzy
-msgid "coovachilli_radius_coaport_desc"
+msgid "UDP port to listen to for accepting radius disconnect requests"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. NAS IP
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:66
 #, fuzzy
-msgid "coovachilli_radius_nasip"
+msgid "NAS IP"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. Value to use in RADIUS NAS-IP-Address attribute
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:67
 #, fuzzy
-msgid "coovachilli_radius_nasip_desc"
+msgid "Value to use in RADIUS NAS-IP-Address attribute"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. NAS MAC
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:68
 #, fuzzy
-msgid "coovachilli_radius_nasmac"
+msgid "NAS MAC"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. MAC address value to use in RADIUS Called-Station-ID attribute
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:69
 #, fuzzy
-msgid "coovachilli_radius_nasmac_desc"
+msgid "MAC address value to use in RADIUS Called-Station-ID attribute"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. Allow OpenID authentication
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:70
 #, fuzzy
-msgid "coovachilli_radius_openidauth"
+msgid "Allow OpenID authentication"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. Allows OpenID authentication by sending ChilliSpot-Config=allow-openidauth in RADIUS Access-Requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:71
 #, fuzzy
-msgid "coovachilli_radius_openidauth_desc"
+msgid "Allows OpenID authentication by sending ChilliSpot-Config=allow-openidauth in RADIUS Access-Requests"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. RADIUS accounting port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:72
 #, fuzzy
-msgid "coovachilli_radius_radiusacctport"
+msgid "RADIUS accounting port"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. The UDP port number to use for radius accounting requests (default 1813)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:73
 #, fuzzy
-msgid "coovachilli_radius_radiusacctport_desc"
+msgid "The UDP port number to use for radius accounting requests (default 1813)"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. RADIUS authentication port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:74
 #, fuzzy
-msgid "coovachilli_radius_radiusauthport"
+msgid "RADIUS authentication port"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. The UDP port number to use for radius authentication requests (default 1812)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:75
 #, fuzzy
-msgid "coovachilli_radius_radiusauthport_desc"
+msgid "The UDP port number to use for radius authentication requests (default 1812)"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. Option radiuscalled
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:76
 #, fuzzy
-msgid "coovachilli_radius_radiuscalled"
+msgid "Option radiuscalled"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. RADIUS listen address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:77
 #, fuzzy
-msgid "coovachilli_radius_radiuslisten"
+msgid "RADIUS listen address"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. Local interface IP address to use for the radius interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:78
 #, fuzzy
-msgid "coovachilli_radius_radiuslisten_desc"
+msgid "Local interface IP address to use for the radius interface"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. RADIUS location ID
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:79
 #, fuzzy
-msgid "coovachilli_radius_radiuslocationid"
+msgid "RADIUS location ID"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. WISPr Location ID
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:80
 #, fuzzy
-msgid "coovachilli_radius_radiuslocationid_desc"
+msgid "WISPr Location ID"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. RADIUS location name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:81
 #, fuzzy
-msgid "coovachilli_radius_radiuslocationname"
+msgid "RADIUS location name"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. WISPr Location Name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:82
 #, fuzzy
-msgid "coovachilli_radius_radiuslocationname_desc"
+msgid "WISPr Location Name"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. NAS ID
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:83
 #, fuzzy
-msgid "coovachilli_radius_radiusnasid"
+msgid "NAS ID"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. Network access server identifier
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:84
 #, fuzzy
-msgid "coovachilli_radius_radiusnasid_desc"
+msgid "Network access server identifier"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. Option radiusnasip
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:85
 #, fuzzy
-msgid "coovachilli_radius_radiusnasip"
+msgid "Option radiusnasip"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. NAS port type
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:86
 #, fuzzy
-msgid "coovachilli_radius_radiusnasporttype"
+msgid "NAS port type"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. Value of NAS-Port-Type attribute. Defaults to 19 (Wireless-IEEE-802.11)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:87
 #, fuzzy
-msgid "coovachilli_radius_radiusnasporttype_desc"
+msgid "Value of NAS-Port-Type attribute. Defaults to 19 (Wireless-IEEE-802.11)"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. Send RADIUS VSA
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:88
 #, fuzzy
-msgid "coovachilli_radius_radiusoriginalurl"
+msgid "Send RADIUS VSA"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. Send the ChilliSpot-OriginalURL RADIUS VSA in Access-Request
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:89
 #, fuzzy
-msgid "coovachilli_radius_radiusoriginalurl_desc"
+msgid "Send the ChilliSpot-OriginalURL RADIUS VSA in Access-Request"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. RADIUS secret
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:90
 #, fuzzy
-msgid "coovachilli_radius_radiussecret"
+msgid "RADIUS secret"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. Radius shared secret for both servers
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:91
 #, fuzzy
-msgid "coovachilli_radius_radiussecret_desc"
+msgid "Radius shared secret for both servers"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. RADIUS server 1
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:92
 #, fuzzy
-msgid "coovachilli_radius_radiusserver1"
+msgid "RADIUS server 1"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. The IP address of radius server 1
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:93
 #, fuzzy
-msgid "coovachilli_radius_radiusserver1_desc"
+msgid "The IP address of radius server 1"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. RADIUS server 2
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:94
 #, fuzzy
-msgid "coovachilli_radius_radiusserver2"
+msgid "RADIUS server 2"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. The IP address of radius server 2
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:95
 #, fuzzy
-msgid "coovachilli_radius_radiusserver2_desc"
+msgid "The IP address of radius server 2"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. Swap octets
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:96
 #, fuzzy
-msgid "coovachilli_radius_swapoctets"
+msgid "Swap octets"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. Swap the meaning of &quot;input octets&quot; and &quot;output octets&quot; as it related to RADIUS attribtues
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:97
 #, fuzzy
-msgid "coovachilli_radius_swapoctets_desc"
+msgid "Swap the meaning of \"input octets\" and \"output octets\" as it related to RADIUS attribtues"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. Allow WPA guests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:98
 #, fuzzy
-msgid "coovachilli_radius_wpaguests"
+msgid "Allow WPA guests"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. Allows WPA Guest authentication by sending ChilliSpot-Config=allow-wpa-guests in RADIUS Access-Requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:99
 #, fuzzy
-msgid "coovachilli_radius_wpaguests_desc"
+msgid "Allows WPA Guest authentication by sending ChilliSpot-Config=allow-wpa-guests in RADIUS Access-Requests"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. RADIUS proxy settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:100
 #, fuzzy
-msgid "coovachilli_proxy"
+msgid "RADIUS proxy settings"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. RADIUS proxy settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:101
 #, fuzzy
-msgid "coovachilli_proxy_desc"
+msgid "RADIUS proxy settings"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. Proxy client
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:102
-msgid "coovachilli_proxy_proxyclient"
+msgid "Proxy client"
 msgstr ""
 
 #. IP address from which radius requests are accepted. If omitted the server will not accept radius requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:103
-msgid "coovachilli_proxy_proxyclient_desc"
+msgid "IP address from which radius requests are accepted. If omitted the server will not accept radius requests"
 msgstr ""
 
 #. Proxy listen address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:104
-msgid "coovachilli_proxy_proxylisten"
+msgid "Proxy listen address"
 msgstr ""
 
 #. Local interface IP address to use for accepting radius requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:105
-msgid "coovachilli_proxy_proxylisten_desc"
+msgid "Local interface IP address to use for accepting radius requests"
 msgstr ""
 
 #. Proxy port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:106
-msgid "coovachilli_proxy_proxyport"
+msgid "Proxy port"
 msgstr ""
 
 #. UDP Port to listen to for accepting radius requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:107
-msgid "coovachilli_proxy_proxyport_desc"
+msgid "UDP Port to listen to for accepting radius requests"
 msgstr ""
 
 #. Proxy secret
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:108
-msgid "coovachilli_proxy_proxysecret"
+msgid "Proxy secret"
 msgstr ""
 
 #. Radius shared secret for clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:109
-msgid "coovachilli_proxy_proxysecret_desc"
+msgid "Radius shared secret for clients"
 msgstr ""
 
 #. UAM configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:110
 #, fuzzy
-msgid "coovachilli_uam"
+msgid "UAM configuration"
 msgstr "TUN/TAP Konfiguration"
 
 #. Unified Configuration Method settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:111
 #, fuzzy
-msgid "coovachilli_uam_desc"
+msgid "Unified Configuration Method settings"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. Use Chilli XML
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:112
-msgid "coovachilli_uam_chillixml"
+msgid "Use Chilli XML"
 msgstr ""
 
 #. Return the so-called Chilli XML along with WISPr XML
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:113
-msgid "coovachilli_uam_chillixml_desc"
+msgid "Return the so-called Chilli XML along with WISPr XML"
 msgstr ""
 
 #. Default idle timeout
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:114
-msgid "coovachilli_uam_defidletimeout"
+msgid "Default idle timeout"
 msgstr ""
 
 #. Default idle timeout unless otherwise set by RADIUS (defaults to 0)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:115
-msgid "coovachilli_uam_defidletimeout_desc"
+msgid "Default idle timeout unless otherwise set by RADIUS (defaults to 0)"
 msgstr ""
 
 #. Default interim interval
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:116
-msgid "coovachilli_uam_definteriminterval"
+msgid "Default interim interval"
 msgstr ""
 
 #. Default interim-interval for RADIUS accounting unless otherwise set by RADIUS (defaults to 0)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:117
-msgid "coovachilli_uam_definteriminterval_desc"
+msgid "Default interim-interval for RADIUS accounting unless otherwise set by RADIUS (defaults to 0)"
 msgstr ""
 
 #. Default session timeout
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:118
-msgid "coovachilli_uam_defsessiontimeout"
+msgid "Default session timeout"
 msgstr ""
 
 #. Default session timeout unless otherwise set by RADIUS (defaults to 0)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:119
-msgid "coovachilli_uam_defsessiontimeout_desc"
+msgid "Default session timeout unless otherwise set by RADIUS (defaults to 0)"
 msgstr ""
 
 #. Inspect DNS traffic
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:120
 #, fuzzy
-msgid "coovachilli_uam_dnsparanoia"
+msgid "Inspect DNS traffic"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. Inspect DNS packets and drop responses with any non- A, CNAME, SOA, or MX records to prevent dns tunnels (experimental)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:121
 #, fuzzy
-msgid "coovachilli_uam_dnsparanoia_desc"
+msgid "Inspect DNS packets and drop responses with any non- A, CNAME, SOA, or MX records to prevent dns tunnels (experimental)"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. Local users file
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:122
 #, fuzzy
-msgid "coovachilli_uam_localusers"
+msgid "Local users file"
 msgstr "Domain Name"
 
 #. A colon seperated file containing usernames and passwords of locally authenticated users
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:123
 #, fuzzy
-msgid "coovachilli_uam_localusers_desc"
+msgid "A colon seperated file containing usernames and passwords of locally authenticated users"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. Location name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:124
-msgid "coovachilli_uam_locationname"
+msgid "Location name"
 msgstr ""
 
 #. Human readable location name used in JSON interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:125
 #, fuzzy
-msgid "coovachilli_uam_locationname_desc"
+msgid "Human readable location name used in JSON interface"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. Do not redirect to UAM server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:126
 #, fuzzy
-msgid "coovachilli_uam_nouamsuccess"
+msgid "Do not redirect to UAM server"
 msgstr "Domain Name"
 
 #. Do not return to UAM server on login success, just redirect to original URL
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:127
 #, fuzzy
-msgid "coovachilli_uam_nouamsuccess_desc"
+msgid "Do not return to UAM server on login success, just redirect to original URL"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. Do not do WISPr
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:128
 #, fuzzy
-msgid "coovachilli_uam_nouamwispr"
+msgid "Do not do WISPr"
 msgstr "Domain Name"
 
 #. Do not do any WISPr XML, assume the back-end is doing this instead
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:129
 #, fuzzy
-msgid "coovachilli_uam_nouamwispr_desc"
+msgid "Do not do any WISPr XML, assume the back-end is doing this instead"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. Post auth proxy
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:130
-msgid "coovachilli_uam_postauthproxy"
+msgid "Post auth proxy"
 msgstr ""
 
 #. Used with postauthproxyport to define a post authentication HTTP proxy server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:131
-msgid "coovachilli_uam_postauthproxy_desc"
+msgid "Used with postauthproxyport to define a post authentication HTTP proxy server"
 msgstr ""
 
 #. Post auth proxy port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:132
-msgid "coovachilli_uam_postauthproxyport"
+msgid "Post auth proxy port"
 msgstr ""
 
 #. Used with postauthproxy to define a post authentication HTTP proxy server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:133
-msgid "coovachilli_uam_postauthproxyport_desc"
+msgid "Used with postauthproxy to define a post authentication HTTP proxy server"
 msgstr ""
 
 #. Allowed resources
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:134
 #, fuzzy
-msgid "coovachilli_uam_uamallowed"
+msgid "Allowed resources"
 msgstr "Domain Name"
 
 #. List of resources the client can access without first authenticating
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:135
 #, fuzzy
-msgid "coovachilli_uam_uamallowed_desc"
+msgid "List of resources the client can access without first authenticating"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. Allow any DNS server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:136
 #, fuzzy
-msgid "coovachilli_uam_uamanydns"
+msgid "Allow any DNS server"
 msgstr "Domain Name"
 
 #. Allow any DNS server for unauthenticated clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:137
 #, fuzzy
-msgid "coovachilli_uam_uamanydns_desc"
+msgid "Allow any DNS server for unauthenticated clients"
 msgstr "Domain Name"
 
 #. Allow any IP address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:138
 #, fuzzy
-msgid "coovachilli_uam_uamanyip"
+msgid "Allow any IP address"
 msgstr "Domain Name"
 
 #. Allow clients to use any IP settings they wish by spoofing ARP (experimental)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:139
 #, fuzzy
-msgid "coovachilli_uam_uamanyip_desc"
+msgid "Allow clients to use any IP settings they wish by spoofing ARP (experimental)"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. Allowed domains
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:140
 #, fuzzy
-msgid "coovachilli_uam_uamdomain"
+msgid "Allowed domains"
 msgstr "Domain Name"
 
 #. Defines a list of domain names to automatically add to the walled garden
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:141
 #, fuzzy
-msgid "coovachilli_uam_uamdomain_desc"
+msgid "Defines a list of domain names to automatically add to the walled garden"
 msgstr "Domain Name"
 
 #. UAM homepage
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:142
 #, fuzzy
-msgid "coovachilli_uam_uamhomepage"
+msgid "UAM homepage"
 msgstr "Domain Name"
 
 #. URL of homepage to redirect unauthenticated users to
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:143
 #, fuzzy
-msgid "coovachilli_uam_uamhomepage_desc"
+msgid "URL of homepage to redirect unauthenticated users to"
 msgstr "Domain Name"
 
 #. UAM static content port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:144
 #, fuzzy
-msgid "coovachilli_uam_uamiport"
+msgid "UAM static content port"
 msgstr "Domain Name"
 
 #. TCP port to bind to for only serving embedded content
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:145
 #, fuzzy
-msgid "coovachilli_uam_uamiport_desc"
+msgid "TCP port to bind to for only serving embedded content"
 msgstr "Domain Name"
 
 #. UAM listening address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:146
 #, fuzzy
-msgid "coovachilli_uam_uamlisten"
+msgid "UAM listening address"
 msgstr "Domain Name"
 
 #. IP address to listen to for authentication of clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:147
 #, fuzzy
-msgid "coovachilli_uam_uamlisten_desc"
+msgid "IP address to listen to for authentication of clients"
 msgstr "Domain Name"
 
 #. UAM logout IP
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:148
 #, fuzzy
-msgid "coovachilli_uam_uamlogoutip"
+msgid "UAM logout IP"
 msgstr "Domain Name"
 
 #. Use this IP address to instantly logout a client accessing it (defaults to 1.1.1.1)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:149
 #, fuzzy
-msgid "coovachilli_uam_uamlogoutip_desc"
+msgid "Use this IP address to instantly logout a client accessing it (defaults to 1.1.1.1)"
 msgstr "Domain Name"
 
 #. UAM listening port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:150
 #, fuzzy
-msgid "coovachilli_uam_uamport"
+msgid "UAM listening port"
 msgstr "Domain Name"
 
 #. TCP port to bind to for authenticating clients (default 3990)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:151
 #, fuzzy
-msgid "coovachilli_uam_uamport_desc"
+msgid "TCP port to bind to for authenticating clients (default 3990)"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. UAM secret
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:152
 #, fuzzy
-msgid "coovachilli_uam_uamsecret"
+msgid "UAM secret"
 msgstr "Domain Name"
 
 #. Shared secret between uamserver and chilli
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:153
 #, fuzzy
-msgid "coovachilli_uam_uamsecret_desc"
+msgid "Shared secret between uamserver and chilli"
 msgstr "Domain Name"
 
 #. UAM server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:154
 #, fuzzy
-msgid "coovachilli_uam_uamserver"
+msgid "UAM server"
 msgstr "Domain Name"
 
 #. URL of web server to use for authenticating clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:155
 #, fuzzy
-msgid "coovachilli_uam_uamserver_desc"
+msgid "URL of web server to use for authenticating clients"
 msgstr "Domain Name"
 
 #. UAM user interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:156
 #, fuzzy
-msgid "coovachilli_uam_uamui"
+msgid "UAM user interface"
 msgstr "Domain Name"
 
 #. An init.d style program to handle local content on the uamuiport web server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:157
 #, fuzzy
-msgid "coovachilli_uam_uamui_desc"
+msgid "An init.d style program to handle local content on the uamuiport web server"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. Use status file
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:158
-msgid "coovachilli_uam_usestatusfile"
+msgid "Use status file"
 msgstr ""
 
 #. Write the status of clients in a non-volatile state file (experimental)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:159
-msgid "coovachilli_uam_usestatusfile_desc"
+msgid "Write the status of clients in a non-volatile state file (experimental)"
 msgstr ""
 
 #. WISPr login url
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:160
 #, fuzzy
-msgid "coovachilli_uam_wisprlogin"
+msgid "WISPr login url"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. Specific URL to be given in WISPr XML LoginURL
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:161
 #, fuzzy
-msgid "coovachilli_uam_wisprlogin_desc"
+msgid "Specific URL to be given in WISPr XML LoginURL"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. CGI program
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:162
 #, fuzzy
-msgid "coovachilli_uam_wwwbin"
+msgid "CGI program"
 msgstr "Domain Name"
 
 #. Executable to run as a CGI type program (like haserl) for URLs with extention .chi
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:163
 #, fuzzy
-msgid "coovachilli_uam_wwwbin_desc"
+msgid "Executable to run as a CGI type program (like haserl) for URLs with extention .chi"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. Web content directory
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:164
 #, fuzzy
-msgid "coovachilli_uam_wwwdir"
+msgid "Web content directory"
 msgstr "Domain Name"
 
 #. Directory where embedded local web content is placed
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:165
 #, fuzzy
-msgid "coovachilli_uam_wwwdir_desc"
+msgid "Directory where embedded local web content is placed"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. MAC configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:166
 #, fuzzy
-msgid "coovachilli_macauth"
+msgid "MAC configuration"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. Configure MAC authentication
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:167
 #, fuzzy
-msgid "coovachilli_macauth_desc"
+msgid "Configure MAC authentication"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. Allowed MAC addresses
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:168
 #, fuzzy
-msgid "coovachilli_macauth_macallowed"
+msgid "Allowed MAC addresses"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. List of MAC addresses for which MAC authentication will be performed
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:169
 #, fuzzy
-msgid "coovachilli_macauth_macallowed_desc"
+msgid "List of MAC addresses for which MAC authentication will be performed"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. Authenticate locally allowed MACs
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:170
 #, fuzzy
-msgid "coovachilli_macauth_macallowlocal"
+msgid "Authenticate locally allowed MACs"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. Authenticate allowed MAC addresses without the use of RADIUS
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:171
 #, fuzzy
-msgid "coovachilli_macauth_macallowlocal_desc"
+msgid "Authenticate allowed MAC addresses without the use of RADIUS"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. Enable MAC authentification
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:172
 #, fuzzy
-msgid "coovachilli_macauth_macauth"
+msgid "Enable MAC authentification"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. Try to authenticate all users based on their mac address alone
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:173
 #, fuzzy
-msgid "coovachilli_macauth_macauth_desc"
+msgid "Try to authenticate all users based on their mac address alone"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. Password
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:174
 #, fuzzy
-msgid "coovachilli_macauth_macpasswd"
+msgid "Password"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. Password used when performing MAC authentication
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:175
 #, fuzzy
-msgid "coovachilli_macauth_macpasswd_desc"
+msgid "Password used when performing MAC authentication"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. Suffix
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:176
 #, fuzzy
-msgid "coovachilli_macauth_macsuffix"
+msgid "Suffix"
 msgstr "Netzwerk/TUN Konfiguration"
 
 #. Suffix to add to the MAC address in order to form the User-Name, which is sent to the radius server
diff --git a/po/de/ddns.po b/po/de/ddns.po
index 5b4d0db98..42090cb66 100644
--- a/po/de/ddns.po
+++ b/po/de/ddns.po
@@ -14,39 +14,39 @@ msgstr ""
 
 #. Dynamic DNS
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:1
-msgid "ddns"
+msgid "Dynamic DNS"
 msgstr "Dynamisches DNS"
 
 #. Dynamic DNS allows that your router can be reached with a fixed hostname while having a dynamically changing IP-Address.
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:2
-msgid "ddns_desc"
+msgid "Dynamic DNS allows that your router can be reached with a fixed hostname while having a dynamically changing IP-Address."
 msgstr ""
 "Dynamisches DNS erlaubt es, den Router bei dynamischer IP-Adresse über einen "
 "festen DNS-Namen zu erreichen."
 
 #. Source of IP-Address
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:3
-msgid "ddns_service_ipsource"
+msgid "Source of IP-Address"
 msgstr "Quelle der IP-Adresse"
 
 #. Check for changed IP every
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:4
-msgid "ddns_service_checkinterval"
+msgid "Check for changed IP every"
 msgstr "Teste auf neue IP alle"
 
 #. Check-Time unit
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:5
-msgid "ddns_service_checkunit"
+msgid "Check-Time unit"
 msgstr "Test-Zeiteinheit"
 
 #. Force update every
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:6
-msgid "ddns_service_forceinterval"
+msgid "Force update every"
 msgstr "Erzwinge Aktualisierung alle"
 
 #. Force-Time unit
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:7
-msgid "ddns_service_forceunit"
+msgid "Force-Time unit"
 msgstr "Erzwinge-Zeiteinheit"
 
 #. Custom Update-URL
diff --git a/po/de/default.po b/po/de/default.po
index 29725b0ba..9fefe0755 100644
--- a/po/de/default.po
+++ b/po/de/default.po
@@ -14,37 +14,37 @@ msgstr ""
 
 #. Skip to navigation
 #: i18n/english/luasrc/i18n/default.en.lua:1
-msgid "skiplink1"
+msgid "Skip to navigation"
 msgstr "Zur Navigation springen"
 
 #. Skip to content
 #: i18n/english/luasrc/i18n/default.en.lua:2
-msgid "skiplink2"
+msgid "Skip to content"
 msgstr "Zum Inhalt springen"
 
 #. Navigation
 #: i18n/english/luasrc/i18n/default.en.lua:3
-msgid "navigation"
+msgid "Navigation"
 msgstr "Navigation"
 
 #. About
 #: i18n/english/luasrc/i18n/default.en.lua:4
-msgid "about"
+msgid "About"
 msgstr "Über"
 
 #. Add
 #: i18n/english/luasrc/i18n/default.en.lua:5
-msgid "add"
+msgid "Add"
 msgstr "Hinzufügen"
 
 #. Addresses
 #: i18n/english/luasrc/i18n/default.en.lua:6
-msgid "addresses"
+msgid "Addresses"
 msgstr "Adressen"
 
 #. Aliases
 #: i18n/english/luasrc/i18n/default.en.lua:7
-msgid "aliases"
+msgid "Aliases"
 msgstr "Aliasse"
 
 #. all
@@ -59,97 +59,97 @@ msgstr "zurück"
 
 #. Administration
 #: i18n/english/luasrc/i18n/default.en.lua:10
-msgid "administration"
+msgid "Administration"
 msgstr "Administration"
 
 #. Essentials
 #: i18n/english/luasrc/i18n/default.en.lua:11
-msgid "essentials"
+msgid "Essentials"
 msgstr "Vereinfacht"
 
 #. Apply
 #: i18n/english/luasrc/i18n/default.en.lua:12
-msgid "apply"
+msgid "Apply"
 msgstr "Anwenden"
 
 #. Basic Settings
 #: i18n/english/luasrc/i18n/default.en.lua:13
-msgid "basicsettings"
+msgid "Basic Settings"
 msgstr "Grundeinstellungen"
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast
 #: i18n/english/luasrc/i18n/default.en.lua:14
-msgid "broadcast"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"
 msgstr "IPv4-Broadcast"
 
 #. Cancel
 #: i18n/english/luasrc/i18n/default.en.lua:15
-msgid "cancel"
+msgid "Cancel"
 msgstr "Abbrechen"
 
 #. Changes
 #: i18n/english/luasrc/i18n/default.en.lua:16
-msgid "changes"
+msgid "Changes"
 msgstr "Änderungen"
 
 #. Channel
 #: i18n/english/luasrc/i18n/default.en.lua:17
-msgid "channel"
+msgid "Channel"
 msgstr "Kanal"
 
 #. <abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/prefix
 #: i18n/english/luasrc/i18n/default.en.lua:18
-msgid "cidr6"
+msgid "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/prefix"
 msgstr "CIDR-Notation: Adresse/Prefix"
 
 #. Code
 #: i18n/english/luasrc/i18n/default.en.lua:19
-msgid "code"
+msgid "Code"
 msgstr "Code"
 
 #. Configuration
 #: i18n/english/luasrc/i18n/default.en.lua:20
-msgid "config"
+msgid "Configuration"
 msgstr "Konfiguration"
 
 #. Configuration file
 #: i18n/english/luasrc/i18n/default.en.lua:21
-msgid "configfile"
+msgid "Configuration file"
 msgstr "Konfigurationsdatei"
 
 #. Confirmation
 #: i18n/english/luasrc/i18n/default.en.lua:22
-msgid "confirmation"
+msgid "Confirmation"
 msgstr "Bestätigung"
 
 #. Delete
 #: i18n/english/luasrc/i18n/default.en.lua:23
-msgid "delete"
+msgid "Delete"
 msgstr "Löschen"
 
 #. Description
 #: i18n/english/luasrc/i18n/default.en.lua:24
-msgid "descr"
+msgid "Description"
 msgstr "Beschreibung"
 
 #. Design
 #: i18n/english/luasrc/i18n/default.en.lua:25
-msgid "design"
+msgid "Design"
 msgstr "Design"
 
 #. Destination
 #: i18n/english/luasrc/i18n/default.en.lua:26
-msgid "destination"
+msgid "Destination"
 msgstr "Ziel"
 
 #. Device
 #: i18n/english/luasrc/i18n/default.en.lua:27
-msgid "device"
+msgid "Device"
 msgstr "Gerät"
 
 #. Devices
 #: i18n/english/luasrc/i18n/default.en.lua:28
-msgid "devices"
+msgid "Devices"
 msgstr "Geräte"
 
 #. disable
@@ -159,22 +159,22 @@ msgstr "deaktivieren"
 
 #. Distance
 #: i18n/english/luasrc/i18n/default.en.lua:30
-msgid "distance"
+msgid "Distance"
 msgstr "Distanz"
 
 #. Kernel Log
 #: i18n/english/luasrc/i18n/default.en.lua:31
-msgid "dmesg"
+msgid "Kernel Log"
 msgstr "Kernelprotokoll"
 
 #. <abbr title=\"Domain Name System\">DNS</abbr>-Server
 #: i18n/english/luasrc/i18n/default.en.lua:32
-msgid "dnsserver"
+msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Server"
 msgstr "DNS-Server"
 
 #. Edit
 #: i18n/english/luasrc/i18n/default.en.lua:33
-msgid "edit"
+msgid "Edit"
 msgstr "Bearbeiten"
 
 #. enable
@@ -184,47 +184,47 @@ msgstr "aktivieren"
 
 #. Encryption
 #: i18n/english/luasrc/i18n/default.en.lua:35
-msgid "encryption"
+msgid "Encryption"
 msgstr "Verschlüsselung"
 
 #. Error
 #: i18n/english/luasrc/i18n/default.en.lua:36
-msgid "error"
+msgid "Error"
 msgstr "Fehler"
 
 #. Filesystem
 #: i18n/english/luasrc/i18n/default.en.lua:37
-msgid "filesystem"
+msgid "Filesystem"
 msgstr "Dateisystem"
 
 #. Filter
 #: i18n/english/luasrc/i18n/default.en.lua:38
-msgid "filter"
+msgid "Filter"
 msgstr "Filter"
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway
 #: i18n/english/luasrc/i18n/default.en.lua:39
-msgid "gateway"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
 msgstr "IPv4-Gateway"
 
 #. <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway
 #: i18n/english/luasrc/i18n/default.en.lua:40
-msgid "gateway6"
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 msgstr "IPv6-Gateway"
 
 #. General
 #: i18n/english/luasrc/i18n/default.en.lua:41
-msgid "general"
+msgid "General"
 msgstr "Allgemeines"
 
 #. Hostname
 #: i18n/english/luasrc/i18n/default.en.lua:42
-msgid "hostname"
+msgid "Hostname"
 msgstr "Hostname"
 
 #. Install
 #: i18n/english/luasrc/i18n/default.en.lua:43
-msgid "install"
+msgid "Install"
 msgstr "Installieren"
 
 #. installed
@@ -234,102 +234,102 @@ msgstr "installiert"
 
 #. Interface
 #: i18n/english/luasrc/i18n/default.en.lua:45
-msgid "interface"
+msgid "Interface"
 msgstr "Schnittstelle"
 
 #. Interfaces
 #: i18n/english/luasrc/i18n/default.en.lua:46
-msgid "interfaces"
+msgid "Interfaces"
 msgstr "Schnittstellen"
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address
 #: i18n/english/luasrc/i18n/default.en.lua:47
-msgid "ipaddress"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
 msgstr "IPv4-Adresse"
 
 #. <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address
 #: i18n/english/luasrc/i18n/default.en.lua:48
-msgid "ip6address"
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address"
 msgstr "IPv6-Adresse"
 
 #. Legend
 #: i18n/english/luasrc/i18n/default.en.lua:49
-msgid "legend"
+msgid "Legend"
 msgstr "Legende"
 
 #. Library
 #: i18n/english/luasrc/i18n/default.en.lua:50
-msgid "library"
+msgid "Library"
 msgstr "Bibliothek"
 
 #. Logout
 #: i18n/english/luasrc/i18n/default.en.lua:51
-msgid "logout"
+msgid "Logout"
 msgstr "Abmelden"
 
 #. Key
 #: i18n/english/luasrc/i18n/default.en.lua:52
-msgid "key"
+msgid "Key"
 msgstr "Schlüssel"
 
 #. Language
 #: i18n/english/luasrc/i18n/default.en.lua:53
-msgid "language"
+msgid "Language"
 msgstr "Sprache"
 
 #. Limit
 #: i18n/english/luasrc/i18n/default.en.lua:54
-msgid "limit"
+msgid "Limit"
 msgstr "Limit"
 
 #. Load
 #: i18n/english/luasrc/i18n/default.en.lua:55
-msgid "load"
+msgid "Load"
 msgstr "Last"
 
 #. Login
 #: i18n/english/luasrc/i18n/default.en.lua:56
-msgid "login"
+msgid "Login"
 msgstr "Anmelden"
 
 #. <abbr title=\"Media Access Control\">MAC</abbr>-Address
 #: i18n/english/luasrc/i18n/default.en.lua:57
-msgid "macaddress"
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr "MAC-Adresse"
 
 #. see &#39;%s&#39; manpage
 #: i18n/english/luasrc/i18n/default.en.lua:58
-msgid "manpage"
+msgid "see '%s' manpage"
 msgstr "siehe &#39;%s&#39; manpage"
 
 #. Metric
 #: i18n/english/luasrc/i18n/default.en.lua:59
-msgid "metric"
+msgid "Metric"
 msgstr "Metrik"
 
 #. Mode
 #: i18n/english/luasrc/i18n/default.en.lua:60
-msgid "mode"
+msgid "Mode"
 msgstr "Modus"
 
 #. Name
 #: i18n/english/luasrc/i18n/default.en.lua:61
-msgid "name"
+msgid "Name"
 msgstr "Name"
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask
 #: i18n/english/luasrc/i18n/default.en.lua:62
-msgid "netmask"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr "IPv4-Netzmaske"
 
 #. Network
 #: i18n/english/luasrc/i18n/default.en.lua:63
-msgid "network"
+msgid "Network"
 msgstr "Netzwerk"
 
 #. Networks
 #: i18n/english/luasrc/i18n/default.en.lua:64
-msgid "networks"
+msgid "Networks"
 msgstr "Netzwerke"
 
 #. none
@@ -339,117 +339,117 @@ msgstr "keine"
 
 #. not installed
 #: i18n/english/luasrc/i18n/default.en.lua:66
-msgid "notinstalled"
+msgid "not installed"
 msgstr "nicht installiert"
 
 #. OK
 #: i18n/english/luasrc/i18n/default.en.lua:67
-msgid "ok"
+msgid "OK"
 msgstr "OK"
 
 #. Options
 #: i18n/english/luasrc/i18n/default.en.lua:68
-msgid "options"
+msgid "Options"
 msgstr "Optionen"
 
 #. Overview
 #: i18n/english/luasrc/i18n/default.en.lua:69
-msgid "overview"
+msgid "Overview"
 msgstr "Übersicht"
 
 #. Package Manager
 #: i18n/english/luasrc/i18n/default.en.lua:70
-msgid "packagemanager"
+msgid "Package Manager"
 msgstr "Packet-Manager"
 
 #. Password
 #: i18n/english/luasrc/i18n/default.en.lua:71
-msgid "password"
+msgid "Password"
 msgstr "Passwort"
 
 #. Path
 #: i18n/english/luasrc/i18n/default.en.lua:72
-msgid "path"
+msgid "Path"
 msgstr "Pfad"
 
 #. Port
 #: i18n/english/luasrc/i18n/default.en.lua:73
-msgid "port"
+msgid "Port"
 msgstr "Port"
 
 #. Ports
 #: i18n/english/luasrc/i18n/default.en.lua:74
-msgid "ports"
+msgid "Ports"
 msgstr "Ports"
 
 #. Proceed
 #: i18n/english/luasrc/i18n/default.en.lua:75
-msgid "proceed"
+msgid "Proceed"
 msgstr "Fortfahren"
 
 #. Protocol
 #: i18n/english/luasrc/i18n/default.en.lua:76
-msgid "protocol"
+msgid "Protocol"
 msgstr "Protokoll"
 
 #. Reboot
 #: i18n/english/luasrc/i18n/default.en.lua:77
-msgid "reboot"
+msgid "Reboot"
 msgstr "Neu Starten"
 
 #. Reset
 #: i18n/english/luasrc/i18n/default.en.lua:78
-msgid "reset"
+msgid "Reset"
 msgstr "Zurücksetzen"
 
 #. Revert
 #: i18n/english/luasrc/i18n/default.en.lua:79
-msgid "revert"
+msgid "Revert"
 msgstr "Verwerfen"
 
 #. Save
 #: i18n/english/luasrc/i18n/default.en.lua:80
-msgid "save"
+msgid "Save"
 msgstr "Speichern"
 
 #. Save &amp; Apply
 #: i18n/english/luasrc/i18n/default.en.lua:81
-msgid "saveapply"
+msgid "Save & Apply"
 msgstr "Speichern &amp; Anwenden"
 
 #. Scan
 #: i18n/english/luasrc/i18n/default.en.lua:82
-msgid "scan"
+msgid "Scan"
 msgstr "Scan"
 
 #. Service
 #: i18n/english/luasrc/i18n/default.en.lua:83
-msgid "service"
+msgid "Service"
 msgstr "Dienst"
 
 #. Services
 #: i18n/english/luasrc/i18n/default.en.lua:84
-msgid "services"
+msgid "Services"
 msgstr "Dienste"
 
 #. Settings
 #: i18n/english/luasrc/i18n/default.en.lua:85
-msgid "settings"
+msgid "Settings"
 msgstr "Einstellungen"
 
 #. Size
 #: i18n/english/luasrc/i18n/default.en.lua:86
-msgid "size"
+msgid "Size"
 msgstr "Größe"
 
 #. Source
 #: i18n/english/luasrc/i18n/default.en.lua:87
-msgid "source"
+msgid "Source"
 msgstr "Quelle"
 
 #. Start
 #: i18n/english/luasrc/i18n/default.en.lua:88
-msgid "start"
+msgid "Start"
 msgstr "Start"
 
 #. static
@@ -459,72 +459,72 @@ msgstr "statisch"
 
 #. Status
 #: i18n/english/luasrc/i18n/default.en.lua:90
-msgid "status"
+msgid "Status"
 msgstr "Status"
 
 #. Statistics
 #: i18n/english/luasrc/i18n/default.en.lua:91
-msgid "statistics"
+msgid "Statistics"
 msgstr "Statistiken"
 
 #. Submit
 #: i18n/english/luasrc/i18n/default.en.lua:92
-msgid "submit"
+msgid "Submit"
 msgstr "Absenden"
 
 #. System Log
 #: i18n/english/luasrc/i18n/default.en.lua:93
-msgid "syslog"
+msgid "System Log"
 msgstr "Systemprotokoll"
 
 #. System
 #: i18n/english/luasrc/i18n/default.en.lua:94
-msgid "system"
+msgid "System"
 msgstr "System"
 
 #. Target
 #: i18n/english/luasrc/i18n/default.en.lua:95
-msgid "target"
+msgid "Target"
 msgstr "Ziel"
 
 #. Timezone
 #: i18n/english/luasrc/i18n/default.en.lua:96
-msgid "timezone"
+msgid "Timezone"
 msgstr "Zeitzone"
 
 #. Type
 #: i18n/english/luasrc/i18n/default.en.lua:97
-msgid "type"
+msgid "Type"
 msgstr "Typ"
 
 #. Unknown Error
 #: i18n/english/luasrc/i18n/default.en.lua:98
-msgid "unknownerror"
+msgid "Unknown Error"
 msgstr "Unbekannter Fehler"
 
 #. Unsaved Changes
 #: i18n/english/luasrc/i18n/default.en.lua:99
-msgid "unsavedchanges"
+msgid "Unsaved Changes"
 msgstr "Ungespeicherte Änderungen"
 
 #. Username
 #: i18n/english/luasrc/i18n/default.en.lua:100
-msgid "username"
+msgid "Username"
 msgstr "Benutzername"
 
 #. Version
 #: i18n/english/luasrc/i18n/default.en.lua:101
-msgid "version"
+msgid "Version"
 msgstr "Version"
 
 #. Web <abbr title=\"User Interface\">UI</abbr>
 #: i18n/english/luasrc/i18n/default.en.lua:102
-msgid "webui"
+msgid "Web <abbr title=\"User Interface\">UI</abbr>"
 msgstr "Weboberfläche"
 
 #. Wifi
 #: i18n/english/luasrc/i18n/default.en.lua:103
-msgid "wifi"
+msgid "Wifi"
 msgstr "Drahtlos"
 
 #. Zone
diff --git a/po/de/freifunk.po b/po/de/freifunk.po
index 946908610..9026f15b1 100644
--- a/po/de/freifunk.po
+++ b/po/de/freifunk.po
@@ -13,41 +13,41 @@ msgstr ""
 
 #. Hello and welcome in the network of
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:1
-msgid "ff_hellonet"
+msgid "Hello and welcome in the network of"
 msgstr "Hallo und willkommen im Netz von"
 
 #. We are an initiative to establish a free, independent and open wireless mesh network.
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:2
-msgid "ff_public1"
+msgid "We are an initiative to establish a free, independent and open wireless mesh network."
 msgstr ""
 "Wir sind eine Initiative zur Schaffung eines freien, offenen und "
 "unabhängigen Funknetzwerks auf WLAN-Basis."
 
 #. This is the access point
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:3
-msgid "ff_public2"
+msgid "This is the access point"
 msgstr "Dies ist der Zugangspunkt "
 
 #. It is operated by
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:4
-msgid "ff_public3"
+msgid "It is operated by"
 msgstr "Er wird betrieben von "
 
 #. You can find further information about the global Freifunk initiative at
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:5
-msgid "ff_public4"
+msgid "You can find further information about the global Freifunk initiative at"
 msgstr "Weitere Informationen zur globalen Freifunkinitiative findest du unter"
 
 #. If you are interested in our project then contact the local community
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:6
-msgid "ff_public5"
+msgid "If you are interested in our project then contact the local community"
 msgstr ""
 "Hast du Interesse an diesem Projekt, dann wende dich an deine lokale "
 "Gemeinschaft"
 
 #. Internet access depends on technical and organisational conditions and may or may not work for you.
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:7
-msgid "ff_public6"
+msgid "Internet access depends on technical and organisational conditions and may or may not work for you."
 msgstr ""
 "Der Internetzugang über das experimentelle Freifunknetz ist an technische "
 "und organisatorische Bedingungen geknüpft und deshalb möglicherweise nicht "
@@ -55,204 +55,204 @@ msgstr ""
 
 #. Location
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:8
-msgid "ff_location"
+msgid "Location"
 msgstr "Standort"
 
 #. E-Mail
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:9
-msgid "ff_mail"
+msgid "E-Mail"
 msgstr "E-Mail"
 
 #. You really should provide your address here!
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:10
-msgid "ff_mail1"
+msgid "You really should provide your address here!"
 msgstr "Bitte unbedingt angeben!"
 
 #. Nickname
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:11
-msgid "ff_nickname"
+msgid "Nickname"
 msgstr "Pseudonym"
 
 #. Realname
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:12
-msgid "ff_name"
+msgid "Realname"
 msgstr "Name"
 
 #. Node
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:13
-msgid "ff_node"
+msgid "Node"
 msgstr "Knoten"
 
 #. Notice
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:14
-msgid "ff_note"
+msgid "Notice"
 msgstr "Notiz"
 
 #. Phone
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:15
-msgid "ff_phone"
+msgid "Phone"
 msgstr "Telefon"
 
 #. Memory
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:16
-msgid "ff_ram"
+msgid "Memory"
 msgstr "Hauptspeicher"
 
 #. Free
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:17
-msgid "ff_free"
+msgid "Free"
 msgstr "Frei"
 
 #. Buffers
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:18
-msgid "ff_buffers"
+msgid "Buffers"
 msgstr "Buffers"
 
 #. Cached
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:19
-msgid "ff_cached"
+msgid "Cached"
 msgstr "Cached"
 
 #. Total
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:20
-msgid "ff_total"
+msgid "Total"
 msgstr "Gesamt"
 
 #. Coordinates
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:21
-msgid "ff_geocoord"
+msgid "Coordinates"
 msgstr "Geokoordinaten"
 
 #. Client-Splash
-msgid "ff_splash"
+msgid "Client-Splash"
 msgstr "Verkehr (down/up)"
 
 #. Active Clients
-msgid "ff_splash_clients"
+msgid "Active Clients"
 msgstr "Verbundene Clients"
 
 #. Hostname
-msgid "ff_splash_hostname"
+msgid "Hostname"
 msgstr "Hostname"
 
 #. IP Address
-msgid "ff_splash_ip"
+msgid "IP Address"
 msgstr "IP-Adresse"
 
 #. MAC Address
-msgid "ff_splash_mac"
+msgid "MAC Address"
 msgstr "MAC-Adresse"
 
 #. Time remaining
-msgid "ff_splash_timeleft"
+msgid "Time remaining"
 msgstr "Verbleibende Zeit"
 
 #. Outgoing traffic
-msgid "ff_splash_traffic"
+msgid "Traffic (down/up)"
 msgstr "Ausgehender Verkehr"
 
 #. Policy
-msgid "ff_splash_policy"
+msgid "Policy"
 msgstr "Zugriffsberechtigung"
 
 #. unknown
-msgid "ff_splash_unknown"
+msgid "unknown"
 msgstr "unbekannt"
 
 #. expired
-msgid "ff_splash_expired"
+msgid "expired"
 msgstr "abgelaufen"
 
 #. whitelisted
-msgid "ff_splash_whitelisted"
+msgid "whitelisted"
 msgstr "dauerhaft freigeschaltet"
 
 #. splashed
-msgid "ff_splash_splashed"
+msgid "splashed"
 msgstr "normal splashen"
 
 #. blacklisted
-msgid "ff_splash_blacklisted"
+msgid "blacklisted"
 msgstr "dauerhaft gesperrt"
 
 #. temporarily blocked
-msgid "ff_splash_tempblock"
+msgid "temporarily blocked"
 msgstr "vorübergehend gesperrt"
 
 #. No clients connected
-msgid "ff_splash_noclients"
+msgid "No clients connected"
 msgstr "Keine Clients verbunden"
 
 #. P2P-Block
-msgid "ff_p2pblock"
+msgid "P2P-Block"
 msgstr "P2P-Sperre"
 
 #. P2P-Block is a greylisting mechanism to block various peer-to-peer protocols for non-whitelisted clients.
-msgid "ff_p2pblock_desc"
+msgid "P2P-Block is a greylisting mechanism to block various peer-to-peer protocols for non-whitelisted clients."
 msgstr ""
 "P2P-Block ist ein Mechanismus zum vorrübergehendem Sperren von Peer-to-Peer "
 "Protokollen für nicht auf der Whitelist stehende Clients. "
 
 #. Enable P2P-Block
-msgid "ff_p2pblock_enabled"
+msgid "Enable P2P-Block"
 msgstr "P2P-Sperr-Mechanismus aktivieren"
 
 #. Portrange
-msgid "ff_p2pblock_portrange"
+msgid "Portrange"
 msgstr "Überwachter Port-Bereich"
 
 #. Block Time
-msgid "ff_p2pblock_blocktime"
+msgid "Block Time"
 msgstr "Sperr-Zeitraum"
 
 #. seconds
-msgid "ff_p2pblock_blocktime_desc"
+msgid "seconds"
 msgstr "Angabe in Sekunden"
 
 #. Whitelisted IPs
-msgid "ff_p2pblock_whitelist"
+msgid "Whitelisted IPs"
 msgstr "Freigeschaltete IP-Adressen"
 
 #. Layer7-Protokolle
-msgid "ff_p2pblock_layer7"
+msgid "Layer7-Protocols"
 msgstr "Layer7-Protokolle"
 
 #. IP-P2P
-msgid "ff_p2pblock_ipp2p"
+msgid "IP-P2P"
 msgstr "IPP2P"
 
 #. Freifunk Remote Update
-msgid "ff_remote_update"
+msgid "Freifunk Remote Update"
 msgstr "Freifunk Fernupdate"
 
 #. Check for new firmware versions and perform automatic updates.
-msgid "ff_remote_update_desc"
+msgid "Check for new firmware versions and perform automatic updates."
 msgstr ""
 "Der Fernupdate-Mechanismus prüft nach neuen Firmware-Versionen und führt "
 "automatisierte Updates durch."
 
 #. Update available!
-msgid "ff_remote_update_available"
+msgid "Update available!"
 msgstr "Update verfügbar!"
 
 #. The installed firmware is the most recent version.
-msgid "ff_remote_update_uptodate"
+msgid "The installed firmware is the most recent version."
 msgstr "Die installierte Firmware ist bereits die neueste Version."
 
 #. Start Upgrade
-msgid "ff_remote_update_install"
+msgid "Start Upgrade"
 msgstr "Updatevorgang starten"
 
 #. Update Settings
-msgid "ff_remote_update_settings"
+msgid "Update Settings"
 msgstr "Einstellungen zum Update"
 
 #. Keep configuration
-msgid "ff_remote_update_keepcfg"
+msgid "Keep configuration"
 msgstr "Konfigurationsdateien wiederherstellen"
 
 #. Verify downloaded images
-msgid "ff_remote_update_verify"
+msgid "Verify downloaded images"
 msgstr "Heruntergeladene Images verifizieren"
 
 #. Confirm Upgrade
diff --git a/po/de/hd_idle.po b/po/de/hd_idle.po
index b2e05c810..e8c23899a 100644
--- a/po/de/hd_idle.po
+++ b/po/de/hd_idle.po
@@ -14,37 +14,37 @@ msgstr ""
 
 #. Disk
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:1
-msgid "disk"
+msgid "Disk"
 msgstr "Festplatte"
 
 #. Enable debug
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:2
-msgid "enable_debug"
+msgid "Enable debug"
 msgstr "Debug-Ausgaben aktivieren"
 
 #. hd-idle
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:3
-msgid "hd_idle"
+msgid "hd-idle"
 msgstr "hd-idle"
 
 #. hd-idle is a utility program for spinning-down external disks after a period of idle time.
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:4
-msgid "hd_idle_desc"
+msgid "hd-idle is a utility program for spinning-down external disks after a period of idle time."
 msgstr ""
 "hd-idle ist ein Hilfsprogramm um externe Festplatten nach einer festgelegten "
 "Leerlaufzeit herunter zu fahren."
 
 #. Idle-Time
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:5
-msgid "idle_time_interval"
+msgid "Idle-Time"
 msgstr "Leerlaufzeit"
 
 #. Idle-Time unit
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:6
-msgid "idle_time_unit"
+msgid "Idle-Time unit"
 msgstr "Leerlaufzeiteinheit"
 
 #. Settings
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:7
-msgid "settings"
+msgid "Settings"
 msgstr "Einstellungen"
diff --git a/po/de/initmgr.po b/po/de/initmgr.po
index dea77145d..1039ca2ae 100644
--- a/po/de/initmgr.po
+++ b/po/de/initmgr.po
@@ -14,12 +14,12 @@ msgstr ""
 
 #. Initscripts
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:1
-msgid "initmgr"
+msgid "Initscripts"
 msgstr "Startscripte"
 
 #. You can enable or disable installed init scripts here. Changes will applied after a device reboot.<br /><strong>Warning: If you disable essential init scripts like &quot;network&quot;, your device might become inaccesable!</strong>
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:2
-msgid "initmgr_desc"
+msgid "You can enable or disable installed init scripts here. Changes will applied after a device reboot.<br /><strong>Warning: If you disable essential init scripts like \"network\", your device might become inaccesable!</strong>"
 msgstr ""
 "Hier können installierte Startscripte aktiviert oder deaktiviert werden. "
 "Änderungen werden erst mit einem Geräteneustart angewendet.<br "
@@ -28,12 +28,12 @@ msgstr ""
 
 #. Start priority
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:3
-msgid "initmgr_index"
+msgid "Start priority"
 msgstr "Startpriorität"
 
 #. Initscript
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:4
-msgid "initmgr_name"
+msgid "Initscript"
 msgstr "Startscript"
 
 #. Enable/Disable
diff --git a/po/de/livestats.po b/po/de/livestats.po
index 3db6a15cd..28b43187e 100644
--- a/po/de/livestats.po
+++ b/po/de/livestats.po
@@ -14,32 +14,32 @@ msgstr ""
 
 #. incoming
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:1
-msgid "livestats_incoming"
+msgid "incoming"
 msgstr "eingehend"
 
 #. outgoing
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:2
-msgid "livestats_outgoing"
+msgid "outgoing"
 msgstr "ausgehend"
 
 #. traffic on
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:3
-msgid "livestats_traffic"
+msgid "traffic on"
 msgstr "Netzverkehr auf"
 
 #. signal-to-noise ratio for
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:4
-msgid "livestats_wifi"
+msgid "signal-to-noise ratio for"
 msgstr "Signal-Rauschabstand für"
 
 #. load average
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:5
-msgid "livestats_loadavg"
+msgid "load average"
 msgstr "Durchschnittliche Systemlast"
 
 #. Realtime Wireless Status
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:6
-msgid "livestats_stat_wireless"
+msgid "Realtime Wireless Status"
 msgstr "Echtzeit-Drahtlosstatus"
 
 #. Realtime Network Traffic
diff --git a/po/de/luci-fw.po b/po/de/luci-fw.po
index eecc30e7e..e336b633d 100644
--- a/po/de/luci-fw.po
+++ b/po/de/luci-fw.po
@@ -14,60 +14,60 @@ msgstr ""
 
 #. Port forwarding
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:1
-msgid "fw_portfw"
+msgid "Port forwarding"
 msgstr "Portweiterleitung"
 
 #. Traffic Redirection
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:2
-msgid "fw_redirect"
+msgid "Traffic Redirection"
 msgstr "Umleitungen"
 
 #. Traffic redirection allows you to change the destination address of forwarded packets.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:3
-msgid "fw_redirect_desc"
+msgid "Traffic redirection allows you to change the destination address of forwarded packets."
 msgstr ""
 "Umleitungen erlauben es das Ziel von weitergeleiteten Paketen zu verändern."
 
 #. Zone-to-Zone traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:4
-msgid "fw_forwarding"
+msgid "Zone-to-Zone traffic"
 msgstr "Zone-zu-Zone Verkehr"
 
 #. Firewall
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:5
-msgid "fw_fw"
+msgid "Firewall"
 msgstr "Firewall"
 
 #. Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:6
-msgid "fw_zone"
+msgid "Zone"
 msgstr "Zone"
 
 #. Zones
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:7
-msgid "fw_zones"
+msgid "Zones"
 msgstr "Zonen"
 
 #. Custom forwarding
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:8
-msgid "fw_custfwd"
+msgid "Custom forwarding"
 msgstr "Erweiterte Weiterleitung"
 
 #. The firewall creates zones over your network interfaces to control network traffic flow.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:9
-msgid "fw_fw1"
+msgid "The firewall creates zones over your network interfaces to control network traffic flow."
 msgstr ""
 "Die Firewall erstellt Netzwerkzonen über bestimmte Netzwerkschnittstellen um "
 "den Netzverkehr zu trennen."
 
 #. Advanced Rules
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:10
-msgid "firewall_rule"
+msgid "Advanced Rules"
 msgstr "Erweiterte Regeln"
 
 #. Advanced rules let you customize the firewall to your needs. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:11
-msgid "firewall_rule_desc"
+msgid "Advanced rules let you customize the firewall to your needs. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall."
 msgstr ""
 "Mit erweiterten Regeln kann die Firewall an die eigenen Bedürfnisse "
 "angepasst werden. Es werden nur neue Verbindungen betrachtet. Pakete, die zu "
@@ -75,139 +75,139 @@ msgstr ""
 
 #. Input Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:12
-msgid "firewall_rule_src"
+msgid "Input Zone"
 msgstr "Eingangszone"
 
 #. Output Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:13
-msgid "firewall_rule_dest"
+msgid "Output Zone"
 msgstr "Ausgangszone"
 
 #. Source address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:14
-msgid "firewall_rule_srcip"
+msgid "Source address"
 msgstr "Quelladresse"
 
 #. Destination address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:15
-msgid "firewall_rule_destip"
+msgid "Destination address"
 msgstr "Zieladresse"
 
 #. Source MAC-Address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:16
-msgid "firewall_rule_srcmac"
+msgid "Source MAC-Address"
 msgstr "Quell-MAC-Adresse"
 
 #. Source port
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:17
-msgid "firewall_rule_srcport"
+msgid "Source port"
 msgstr "Quellport"
 
 #. Destination port
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:18
-msgid "firewall_rule_destport"
+msgid "Destination port"
 msgstr "Zielport"
 
 #. Action
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:19
-msgid "firewall_rule_target"
+msgid "Action"
 msgstr "Aktion"
 
 #. accept
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:20
-msgid "fw_accept"
+msgid "accept"
 msgstr "annehmen"
 
 #. reject
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:21
-msgid "fw_reject"
+msgid "reject"
 msgstr "zurückweisen"
 
 #. drop
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:22
-msgid "fw_drop"
+msgid "drop"
 msgstr "verwerfen"
 
 #. Source
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:23
-msgid "fw_src"
+msgid "Source"
 msgstr "Quelle"
 
 #. Destination
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:24
-msgid "fw_dest"
+msgid "Destination"
 msgstr "Ziel"
 
 #. Traffic Control
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:25
-msgid "fw_traffic"
+msgid "Traffic Control"
 msgstr "Verkehrskontrolle"
 
 #. MSS Clamping
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:26
-msgid "fw_mtufix"
+msgid "MSS Clamping"
 msgstr "MSS Clamping"
 
 #. Drop invalid packets
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:27
-msgid "fw_dropinvalid"
+msgid "Drop invalid packets"
 msgstr "Ungültige Pakete verwerfen"
 
 #. Port forwarding allows to provide network services in the internal network to an external network.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:28
-msgid "fw_portfw1"
+msgid "Port forwarding allows to provide network services in the internal network to an external network."
 msgstr ""
 "Portweiterleitungen ermöglichen es interne Netzwerkdienste aus einem "
 "externen Netzwerk heraus erreichbar zu machen."
 
 #. External Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:29
-msgid "firewall_redirect_src_desc"
+msgid "External Zone"
 msgstr "Externe Zone"
 
 #. External port
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:30
-msgid "firewall_redirect_srcdport"
+msgid "External port"
 msgstr "Externer Port"
 
 #. port or range as first-last
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:31
-msgid "firewall_redirect_srcdport_desc"
+msgid "port or range as first-last"
 msgstr "Port od. Erster-Letzter Port"
 
 #. Source address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:32
-msgid "firewall_redirect_srcip"
+msgid "Source address"
 msgstr "Quelladresse"
 
 #. Source MAC
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:33
-msgid "firewall_redirect_srcmac"
+msgid "Source MAC"
 msgstr "Quell-MAC-Adresse"
 
 #. Internal address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:34
-msgid "firewall_redirect_destip"
+msgid "Internal address"
 msgstr "Interne Adresse"
 
 #. IP-Address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:35
-msgid "firewall_redirect_destip_desc"
+msgid "IP-Address"
 msgstr "IP-Adresse"
 
 #. Internal port (optional)
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:36
-msgid "firewall_redirect_destport"
+msgid "Internal port (optional)"
 msgstr "Interner Port (optional)"
 
 #. port or range as first-last
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:37
-msgid "firewall_redirect_destport_desc"
+msgid "port or range as first-last"
 msgstr "Port od. Erster-Letzter Port"
 
 #. Here you can specify which network traffic is allowed to flow between network zones. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall. If you experience occasional connection problems try enabling MSS Clamping otherwise disable it for performance reasons.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:38
-msgid "fw_forwarding1"
+msgid "Here you can specify which network traffic is allowed to flow between network zones. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall. If you experience occasional connection problems try enabling MSS Clamping otherwise disable it for performance reasons."
 msgstr ""
 "An dieser Stelle kann festgelegt zwischen welchen Zonen Netzverkehr hin und "
 "her fließen kann. Es werden nur neue Verbindungen betrachtet. Pakete, die zu "
@@ -217,49 +217,49 @@ msgstr ""
 
 #. Input
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:39
-msgid "firewall_forwarding_src"
+msgid "Input"
 msgstr "Eingang"
 
 #. Output
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:40
-msgid "firewall_forwarding_dest"
+msgid "Output"
 msgstr "Ausgang"
 
 #. Defaults
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:41
-msgid "firewall_defaults"
+msgid "Defaults"
 msgstr "Grundeinstellungen"
 
 #. These are the default settings that are used if no other rules match.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:42
-msgid "firewall_defaults_desc"
+msgid "These are the default settings that are used if no other rules match."
 msgstr ""
 "Grundeinstellungen die verwendet werden, wenn keine andere Regel angewandt "
 "werden kann."
 
 #. SYN-flood protection
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:43
-msgid "firewall_defaults_synflood"
+msgid "SYN-flood protection"
 msgstr "Schutz vor SYN-flood-Attacken"
 
 #. Incoming Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:44
-msgid "firewall_defaults_input"
+msgid "Incoming Traffic"
 msgstr "Eingehender Verkehr"
 
 #. Outgoing Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:45
-msgid "firewall_defaults_output"
+msgid "Outgoing Traffic"
 msgstr "Ausgehender Verkehr"
 
 #. Forwarded Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:46
-msgid "firewall_defaults_forward"
+msgid "Forwarded Traffic"
 msgstr "Weitergeleiteter Verkehr"
 
 #. Zones part the network interfaces into certain isolated areas to separate network traffic. One or more networks can belong to a zone. The MASQ-flag enables NAT masquerading for all outgoing traffic on this zone.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:47
-msgid "firewall_zone_desc"
+msgid "Zones part the network interfaces into certain isolated areas to separate network traffic. One or more networks can belong to a zone. The MASQ-flag enables NAT masquerading for all outgoing traffic on this zone."
 msgstr ""
 "Zonen teilen das Netzwerk in mehrere Bereiche ein um Netzverkehr sicher zu "
 "trennen. Ein oder mehrere Netzwerke gehören zu einer Zone. Das MASQ-Flag "
@@ -267,42 +267,42 @@ msgstr ""
 
 #. Incoming Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:48
-msgid "firewall_zone_input"
+msgid "Incoming Traffic"
 msgstr "Eingehender Verkehr"
 
 #. Default Policy
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:49
-msgid "firewall_zone_input_desc"
+msgid "Default Policy"
 msgstr "Standardaktion"
 
 #. Outgoing Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:50
-msgid "firewall_zone_output"
+msgid "Outgoing Traffic"
 msgstr "Ausgehender Verkehr"
 
 #. Default Policy
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:51
-msgid "firewall_zone_output_desc"
+msgid "Default Policy"
 msgstr "Standardaktion"
 
 #. Forwarded Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:52
-msgid "firewall_zone_forward"
+msgid "Forwarded Traffic"
 msgstr "Weitergeleiteter Verkehr"
 
 #. Default Policy
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:53
-msgid "firewall_zone_forward_desc"
+msgid "Default Policy"
 msgstr "Standardaktion"
 
 #. MASQ
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:54
-msgid "firewall_zone_masq"
+msgid "MASQ"
 msgstr "MASQ"
 
 #. Networks
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:55
-msgid "firewall_zone_network"
+msgid "Networks"
 msgstr "Netzwerke"
 
 #. contained networks
diff --git a/po/de/mmc_over_gpio.po b/po/de/mmc_over_gpio.po
index f27cea357..c5b8dfac0 100644
--- a/po/de/mmc_over_gpio.po
+++ b/po/de/mmc_over_gpio.po
@@ -14,15 +14,15 @@ msgstr ""
 
 #. MMC/SD driver configuration
 #: applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua:1
-msgid "mmc_over_gpio"
+msgid "MMC/SD driver configuration"
 msgstr "MMC/SD Treiberkonfiguration"
 
 #. MMC/SD driver configuration
 #: applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua:2
-msgid "mmc_over_gpio_desc"
+msgid "MMC/SD driver configuration"
 msgstr "Konfiguriert die Einstellungen des MMC/SD Karten Treibers"
 
 #. Settings
 #: applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua:3
-msgid "settings"
+msgid "Settings"
 msgstr "Einstellungen"
diff --git a/po/de/ntpc.po b/po/de/ntpc.po
index 4c08a4e69..c03afdaac 100644
--- a/po/de/ntpc.po
+++ b/po/de/ntpc.po
@@ -14,42 +14,42 @@ msgstr ""
 
 #. Time Synchronisation
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:1
-msgid "ntpc"
+msgid "Time Synchronisation"
 msgstr "Zeitsynchronisation"
 
 #. Synchronizes the system time
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:2
-msgid "ntpc_desc"
+msgid "Synchronizes the system time"
 msgstr "Synchronisiert die Systemzeit"
 
 #. Time Server
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:3
-msgid "ntpc_timeserver"
+msgid "Time Server"
 msgstr "Zeitserver"
 
 #. Update Interval (in s)
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:4
-msgid "ntpc_interval"
+msgid "Update Interval (in s)"
 msgstr "Aktualisierungsintervall (in s)"
 
 #. Count of Time Measurements
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:5
-msgid "ntpc_count"
+msgid "Count of Time Measurements"
 msgstr "Anzahl der Zeitmessungen"
 
 #. empty = infinite
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:6
-msgid "ntpc_count_desc"
+msgid "empty = infinite"
 msgstr "leer = unendlich"
 
 #. Clock Adjustment
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:7
-msgid "ntpc_drift"
+msgid "Clock Adjustment"
 msgstr "Zeitgeberjustierung"
 
 #. Offset Frequency
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:8
-msgid "ntpc_drift_freq"
+msgid "Offset Frequency"
 msgstr "Frequenzabweichung"
 
 #. Current system time
diff --git a/po/de/olsr.po b/po/de/olsr.po
index f15c2d3ad..92759f281 100644
--- a/po/de/olsr.po
+++ b/po/de/olsr.po
@@ -14,657 +14,657 @@ msgstr ""
 
 #. OLSR Daemon
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:1
-msgid "olsrd"
+msgid "OLSR Daemon"
 msgstr "OLSR Daemon"
 
 #. Neighbour IP
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:2
-msgid "olsrd_neighbour_ip"
+msgid "Neighbour IP"
 msgstr "Nachbar-IP"
 
 #. Local interface IP
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:3
-msgid "olsrd_local_ip"
+msgid "Local interface IP"
 msgstr "Lokale Interface-IP"
 
 #. Announced network
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:4
-msgid "olsrd_network"
+msgid "Announced network"
 msgstr "Angekündigtes Netzwerk"
 
 #. OLSR gateway
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:5
-msgid "olsrd_gateway"
+msgid "OLSR gateway"
 msgstr "OLSR-Gateway"
 
 #. OLSR node
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:6
-msgid "olsrd_node"
+msgid "OLSR node"
 msgstr "OLSR-Knoten"
 
 #. Unable to connect to the OLSR daemon!
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:7
-msgid "olsrd_error"
+msgid "Unable to connect to the OLSR daemon!"
 msgstr "Es konnte keine Verbindung zum OLSR-Daemon hergestellt werden!"
 
 #. Make sure that OLSRd is running, the &quot;txtinfo&quot; plugin is loaded, configured on port 2006 and accepts connections from &quot;127.0.0.1&quot;.
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:8
-msgid "olsrd_error_desc"
+msgid "Make sure that OLSRd is running, the \"txtinfo\" plugin is loaded, configured on port 2006 and accepts connections from \"127.0.0.1\"."
 msgstr ""
 "Stellen Sie sicher das OLSRd läuft und das &quot;txtinfo&quot; Plugin auf "
 "Port 2006 geladen und &quot;127.0.0.1&quot; als Accept-Host gesetzt ist."
 
 #. OLSR - HNA-Announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:9
-msgid "olsrd_hna"
+msgid "OLSR - HNA-Announcements"
 msgstr "OLSR - HNA-Ankündigungen"
 
 #. OLSR - Plugins
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:10
-msgid "olsrd_plugins"
+msgid "OLSR - Plugins"
 msgstr "OLSR - Plugins"
 
 #. OLSR connections
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:11
-msgid "olsrd_links"
+msgid "OLSR connections"
 msgstr "OLSR-Verbindungen"
 
 #. Overview of currently established OLSR connections
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:12
-msgid "olsrd_links_desc"
+msgid "Overview of currently established OLSR connections"
 msgstr "Übersicht über aktuell bestehende OLSR-Verbindungen"
 
 #. Expected retransmission count
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:13
-msgid "olsrd_links_etx_desc"
+msgid "Expected retransmission count"
 msgstr "Zu erwartende Sendeversuche pro Paket"
 
 #. Success rate of sent packages
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:14
-msgid "olsrd_links_lq_desc"
+msgid "Success rate of sent packages"
 msgstr "Erfolgsquote gesendeter Pakete"
 
 #. Success rate of received packages
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:15
-msgid "olsrd_links_nlq_desc"
+msgid "Success rate of received packages"
 msgstr "Erfolgsquote empfangener Pakete"
 
 #. Known OLSR routes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:16
-msgid "olsrd_routes"
+msgid "Known OLSR routes"
 msgstr "Bekannte OLSR-Routen"
 
 #. Overview of currently known routes to other OLSR nodes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:17
-msgid "olsrd_routes_desc"
+msgid "Overview of currently known routes to other OLSR nodes"
 msgstr "Übersicht über zur Zeit bekannte Routen zu anderen OLSR-Knoten"
 
 #. Active OLSR nodes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:18
-msgid "olsrd_topology"
+msgid "Active OLSR nodes"
 msgstr "Aktive OLSR-Knoten"
 
 #. Overview of currently known OLSR nodes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:19
-msgid "olsrd_topology_desc"
+msgid "Overview of currently known OLSR nodes"
 msgstr "Übersicht über zur Zeit bekannte andere OLSR-Knoten"
 
 #. Last hop
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:20
-msgid "olsrd_topology_lasthop"
+msgid "Last hop"
 msgstr "letzter Hop"
 
 #. Active host net announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:21
-msgid "olsrd_hna2"
+msgid "Active host net announcements"
 msgstr "Aktive HNA-Ankündigungen"
 
 #. Overview of currently active OLSR host net announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:22
-msgid "olsrd_hna_desc"
+msgid "Overview of currently active OLSR host net announcements"
 msgstr "Übersicht über zur Zeit aktive OLSR-Netzwerk-Ankündigungen"
 
 #. Active MID announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:23
-msgid "olsrd_mid"
+msgid "Active MID announcements"
 msgstr "Aktive MID-Ankündigungen"
 
 #. Overview of known multiple interface announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:24
-msgid "olsrd_mid_desc"
+msgid "Overview of known multiple interface announcements"
 msgstr "Übersicht über bekannte Mehrfachschnittstellenmeldungen"
 
 #. Secondary OLSR interfaces
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:25
-msgid "olsrd_mid_aliases"
+msgid "Secondary OLSR interfaces"
 msgstr "Sekundäre OLSR Schnittstellen"
 
 #. Freifunk
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:26
-msgid "olsrd_etx_ff"
+msgid "Freifunk"
 msgstr "Freifunk"
 
 #. floating point
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:27
-msgid "olsrd_etx_float"
+msgid "floating point"
 msgstr "Gleitkomma"
 
 #. fixed point math
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:28
-msgid "olsrd_etx_fpm"
+msgid "fixed point math"
 msgstr "Festkomma"
 
 #. General settings
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:29
-msgid "olsrd_olsrd"
+msgid "General settings"
 msgstr "Allgemeine Einstellungen"
 
 #. Start without network
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:30
-msgid "olsrd_olsrd_allownoint"
+msgid "Start without network"
 msgstr "Start ohne Netzwerk"
 
 #. Clear screen
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:31
-msgid "olsrd_olsrd_clearscreen"
+msgid "Clear screen"
 msgstr "Ansicht zurücksetzen"
 
 #. Debugmode
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:32
-msgid "olsrd_olsrd_debuglevel"
+msgid "Debugmode"
 msgstr "Debugmodus"
 
 #. FIB metric
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:33
-msgid "olsrd_olsrd_fibmetric"
+msgid "FIB metric"
 msgstr "FIB-Metrik"
 
 #. Internet protocol
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:34
-msgid "olsrd_olsrd_ipversion"
+msgid "Internet protocol"
 msgstr "Internet Protokoll"
 
 #. LQ aging
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:35
-msgid "olsrd_olsrd_linkqualityaging"
+msgid "LQ aging"
 msgstr "VQ-Alterung"
 
 #. LQ algorithm
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:36
-msgid "olsrd_olsrd_linkqualityalgorithm"
+msgid "LQ algorithm"
 msgstr "VQ-Algorithmus"
 
 #. LQ Dijkstra limit
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:37
-msgid "olsrd_olsrd_linkqualitydijkstralimit"
+msgid "LQ Dijkstra limit"
 msgstr "VQ-Dijkstralimit"
 
 #. LQ fisheye
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:38
-msgid "olsrd_olsrd_linkqualityfisheye"
+msgid "LQ fisheye"
 msgstr "VQ-Fisheye"
 
 #. LQ level
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:39
-msgid "olsrd_olsrd_linkqualitylevel"
+msgid "LQ level"
 msgstr "VQ-Level"
 
 #. MPR selection
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:40
-msgid "olsrd_olsrd_linkqualitylevel_1"
+msgid "MPR selection"
 msgstr "MPR-Auswahl"
 
 #. MPR selection and routing
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:41
-msgid "olsrd_olsrd_linkqualitylevel_2"
+msgid "MPR selection and routing"
 msgstr "MPR-Auswahl und Routing"
 
 #. LQ window size
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:42
-msgid "olsrd_olsrd_linkqualitywinsize"
+msgid "LQ window size"
 msgstr "VQ-Fenstergröße"
 
 #. MPR coverage
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:43
-msgid "olsrd_olsrd_mprcoverage"
+msgid "MPR coverage"
 msgstr "MPR-Erfassung"
 
 #. Pollrate
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:44
-msgid "olsrd_olsrd_pollrate"
+msgid "Pollrate"
 msgstr "Abfragerate"
 
 #. TC redundancy
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:45
-msgid "olsrd_olsrd_tcredundancy"
+msgid "TC redundancy"
 msgstr "TC-Redundanz"
 
 #. MPR selectors
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:46
-msgid "olsrd_olsrd_tcredundancy_0"
+msgid "MPR selectors"
 msgstr "MPR-Selektoren"
 
 #. MPR selectors and MPR
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:47
-msgid "olsrd_olsrd_tcredundancy_1"
+msgid "MPR selectors and MPR"
 msgstr "MPR-Selektoren und MPR"
 
 #. all neighbours
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:48
-msgid "olsrd_olsrd_tcredundancy_2"
+msgid "all neighbours"
 msgstr "Alle Nachbarn"
 
 #. Use hysteresis
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:49
-msgid "olsrd_olsrd_usehysteresis"
+msgid "Use hysteresis"
 msgstr "Hysterese aktivieren"
 
 #. Willingness
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:50
-msgid "olsrd_olsrd_willingness"
+msgid "Willingness"
 msgstr "Bereitschaft"
 
 #. Hello interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:51
-msgid "olsrd_interface_hellointerval"
+msgid "Hello interval"
 msgstr "Hello-Intervall"
 
 #. Hello validity time
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:52
-msgid "olsrd_interface_hellovaliditytime"
+msgid "Hello validity time"
 msgstr "Hello-Gültigkeit"
 
 #. HNA interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:53
-msgid "olsrd_interface_hnainterval"
+msgid "HNA interval"
 msgstr "HNA-Intervall"
 
 #. HNA validity time
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:54
-msgid "olsrd_interface_hnavaliditytime"
+msgid "HNA validity time"
 msgstr "HNA-Gültigkeit"
 
 #. IPv4 broadcast
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:55
-msgid "olsrd_interface_ip4broadcast"
+msgid "IPv4 broadcast"
 msgstr "IPv4 Broadcast"
 
 #. MID interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:56
-msgid "olsrd_interface_midinterval"
+msgid "MID interval"
 msgstr "MID-Intervall"
 
 #. MID validity time
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:57
-msgid "olsrd_interface_midvaliditytime"
+msgid "MID validity time"
 msgstr "MID-Gültigkeit"
 
 #. TC interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:58
-msgid "olsrd_interface_tcinterval"
+msgid "TC interval"
 msgstr "TC-Intervall"
 
 #. TC validity time
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:59
-msgid "olsrd_interface_tcvaliditytime"
+msgid "TC validity time"
 msgstr "TC-Gültigkeit"
 
 #. IPv6 address type
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:60
-msgid "olsrd_interface_ip6addrtype"
+msgid "IPv6 address type"
 msgstr "IPv6 Adresstyp"
 
 #. IPC settings
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:61
-msgid "olsrd_ipcconnect"
+msgid "IPC settings"
 msgstr "IPC-Einstellungen"
 
 #. IPC connections enable you to remote-control the local OLSRd instance using external programs
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:62
-msgid "olsrd_ipcconnect_desc"
+msgid "IPC connections enable you to remote-control the local OLSRd instance using external programs"
 msgstr ""
 "IPC-Verbindungen ermöglichen die Fernsteuerung des lokalen OLSR-Prozesses "
 "durch externe Programme"
 
 #. Allowed host addresses
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:63
-msgid "olsrd_ipcconnect_host"
+msgid "Allowed host addresses"
 msgstr "Erlaubte Hostadressen"
 
 #. Multiple separated by spaces
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:64
-msgid "olsrd_ipcconnect_host_desc"
+msgid "Multiple separated by spaces"
 msgstr "Mehrere mit Leerzeichen trennen"
 
 #. Maxmimum connection count
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:65
-msgid "olsrd_ipcconnect_maxconnections"
+msgid "Maxmimum connection count"
 msgstr "Maximale Anzahl von Verbindungen"
 
 #. Set to 0 to disable IPC
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:66
-msgid "olsrd_ipcconnect_maxconnections_desc"
+msgid "Set to 0 to disable IPC"
 msgstr "0 deaktiviert IPC"
 
 #. Allowed subnets
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:67
-msgid "olsrd_ipcconnect_net"
+msgid "Allowed subnets"
 msgstr "Erlaubte Netzbereiche"
 
 #. Address Mask; multiple separated by space
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:68
-msgid "olsrd_ipcconnect_net_desc"
+msgid "Address Mask; multiple separated by space"
 msgstr "Adresse Maske; mehrere mit Leerzeichen"
 
 #. IPv4 HNA announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:69
-msgid "olsrd_hna4"
+msgid "IPv4 HNA announcements"
 msgstr "IPv4 HNA-Ankündigungen"
 
 #. Hna4 entries allow you to propagate local IPv4 host- and network-routes into the mesh network
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:70
-msgid "olsrd_hna4_desc"
+msgid "Hna4 entries allow you to propagate local IPv4 host- and network-routes into the mesh network"
 msgstr ""
 "Hna4-Entries ermöglichen die Ankündigung von lokalen IPv4 Host- und Netz-"
 "Routen im Mesh-Netzwerk"
 
 #. Network address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:71
-msgid "olsrd_hna4_netaddr"
+msgid "Network address"
 msgstr "Netzwerk-Adresse"
 
 #. IPv4 address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:72
-msgid "olsrd_hna4_netaddr_desc"
+msgid "IPv4 address"
 msgstr "IPv4 Adresse"
 
 #. Netmask
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:73
-msgid "olsrd_hna4_netmask"
+msgid "Netmask"
 msgstr "Netzmaske"
 
 #. IPv4 address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:74
-msgid "olsrd_hna4_netmask_desc"
+msgid "IPv4 address"
 msgstr "IPv4 Adresse"
 
 #. IPv6 HNA announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:75
-msgid "olsrd_hna6"
+msgid "IPv6 HNA announcements"
 msgstr "IPv6 HNA-Ankündigungen"
 
 #. Hna6 entries allow you to propagate local IPv6 host- and network-routes into the mesh network
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:76
-msgid "olsrd_hna6_desc"
+msgid "Hna6 entries allow you to propagate local IPv6 host- and network-routes into the mesh network"
 msgstr ""
 "Hna6-Entries ermöglichen die Ankündigung von lokalen IPv6 Host- und Netz-"
 "Routen im Mesh-Netzwerk"
 
 #. Network address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:77
-msgid "olsrd_hna6_netaddr"
+msgid "Network address"
 msgstr "Netzwerk-Adresse"
 
 #. IPv6 address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:78
-msgid "olsrd_hna6_netaddr_desc"
+msgid "IPv6 address"
 msgstr "IPv6 Adresse"
 
 #. Prefix
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:79
-msgid "olsrd_hna6_prefix"
+msgid "Prefix"
 msgstr "Prefix"
 
 #. IPv6 prefix
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:80
-msgid "olsrd_hna6_prefix_desc"
+msgid "IPv6 prefix"
 msgstr "IPv6 Prefix"
 
 #. Plugin configuration
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:81
-msgid "olsrd_loadplugin"
+msgid "Plugin configuration"
 msgstr "Pluginkonfiguration"
 
 #. Enable plugin
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:82
-msgid "olsrd_loadplugin_ignore"
+msgid "Enable plugin"
 msgstr "Plugin aktivieren"
 
 #. Library
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:83
-msgid "olsrd_loadplugin_library"
+msgid "Library"
 msgstr "Bibliothek"
 
 #. Allow connections from this hosts
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:84
-msgid "olsrd_loadplugin_accept"
+msgid "Allow connections from this hosts"
 msgstr "Verbindungsaufbau von Addressen zulassen"
 
 #. Ping test addresses
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:85
-msgid "olsrd_loadplugin_ping"
+msgid "Ping test addresses"
 msgstr "Pingtest Adressen"
 
 #. Interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:86
-msgid "olsrd_loadplugin_interval"
+msgid "Refresh interval in seconds"
 msgstr "Aktualisierungsinterval in Sekunden"
 
 #. HNA announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:87
-msgid "olsrd_loadplugin_hna"
+msgid "HNA announcements"
 msgstr "HNA Ankündigungen"
 
 #. Format: IP-Address Netmask / OLSR will announce this network once it is reachable
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:88
-msgid "olsrd_loadplugin_hna_desc"
+msgid "Format: IP-Address Netmask / OLSR will announce this network once it is reachable"
 msgstr ""
 "Format: IP-Adresse Netzmaske / OLSR kündigt dieses Netzwerk an sobald das "
 "Gateway erreichbar ist"
 
 #. Alternative \"hosts\" file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:89
-msgid "olsrd_loadplugin_addhosts"
+msgid "Alternative \"hosts\" file"
 msgstr "Alternative \"hosts\" Datei"
 
 #. The contents of this file will be appended to the autogenerated \"hosts\" file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:90
-msgid "olsrd_loadplugin_addhosts_desc"
+msgid "The contents of this file will be appended to the autogenerated \"hosts\" file"
 msgstr ""
 "Der Inhalt dieser Datei wird mit in die autogenerierte \"hosts\" Datei "
 "übernommen"
 
 #. DNS server
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:91
-msgid "olsrd_loadplugin_dnsserver"
+msgid "DNS server"
 msgstr "DNS-Server"
 
 #. Alternative hostnames
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:92
-msgid "olsrd_loadplugin_hosts"
+msgid "Alternative hostnames"
 msgstr "Alternative Hostnamen"
 
 #. Format: Interface-IP Hostname
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:93
-msgid "olsrd_loadplugin_hosts_desc"
+msgid "Format: Interface-IP Hostname"
 msgstr "Format: Interface-IP Hostname"
 
 #. Path to the \"hosts\" file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:94
-msgid "olsrd_loadplugin_hostsfile"
+msgid "Path to the \"hosts\" file"
 msgstr "Pfad zur \"hosts\" Datei"
 
 #. Latitude
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:95
-msgid "olsrd_loadplugin_lat"
+msgid "Latitude"
 msgstr "Latitude"
 
 #. Output file for coordinates
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:96
-msgid "olsrd_loadplugin_latlonfile"
+msgid "Output file for coordinates"
 msgstr "Ausgabedatei für Koordinaten"
 
 #. OLSR will write received coordinates of other nodes to this file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:97
-msgid "olsrd_loadplugin_latlonfile_desc"
+msgid "OLSR will write received coordinates of other nodes to this file"
 msgstr ""
 "OLSR schreibt alle empfangenen Koordinaten anderer Knoten in diese Datei"
 
 #. Input file for coordinates
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:98
-msgid "olsrd_loadplugin_latloninfile"
+msgid "Input file for coordinates"
 msgstr "Eingabedatei für Koordinaten"
 
 #. OLSR periodically checks this file for new coordinates and propagates them
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:99
-msgid "olsrd_loadplugin_latloninfile_desc"
+msgid "OLSR periodically checks this file for new coordinates and propagates them"
 msgstr ""
 "OLSR prüft diese Datei periodisch auf neue Koordinaten und propagiert diese"
 
 #. Longitude
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:100
-msgid "olsrd_loadplugin_lon"
+msgid "Longitude"
 msgstr "Longitude"
 
 #. Hostnames
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:101
-msgid "olsrd_loadplugin_name"
+msgid "Hostnames"
 msgstr "Hostnamen"
 
 #. Command for name changes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:102
-msgid "olsrd_loadplugin_namechangescript"
+msgid "Command for name changes"
 msgstr "Kommando bei Namensänderungen"
 
 #. OLSR executes this command once entries in the \"hosts\" are changed
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:103
-msgid "olsrd_loadplugin_namechangescript_desc"
+msgid "OLSR executes this command once entries in the \"hosts\" are changed"
 msgstr ""
 "OLSR ruft dieses Kommando auf sobald sich Einträge in der \"hosts\" Datei "
 "ändern"
 
 #. Path to the \"resolv\" file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:104
-msgid "olsrd_loadplugin_resolvfile"
+msgid "Path to the \"resolv\" file"
 msgstr "Pfad zur \"resolv\" Datei"
 
 #. Command for service changes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:105
-msgid "olsrd_loadplugin_serviceschangescript"
+msgid "Command for service changes"
 msgstr "Kommando bei Serviceänderungen"
 
 #. OLSR excutes this command once new service announcements are received
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:106
-msgid "olsrd_loadplugin_serviceschangescript_desc"
+msgid "OLSR excutes this command once new service announcements are received"
 msgstr ""
 "OLSR ruft dieses Kommando auf sobald neue Service-Ankündigungen empfangen "
 "werden"
 
 #. PID file for SIGHUP signals
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:107
-msgid "olsrd_loadplugin_sighuppidfile"
+msgid "PID file for SIGHUP signals"
 msgstr "PID-Datei für SIGHUP Signale"
 
 #. OLSR sends a HUP signal to this PID once the \"hosts\" oder \"resolv\" file is changed
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:108
-msgid "olsrd_loadplugin_sighuppidfile_desc"
+msgid "OLSR sends a HUP signal to this PID once the \"hosts\" oder \"resolv\" file is changed"
 msgstr ""
 "OLSR sendet ein HUP Signal an den in der PID Datei angegebenen Prozess "
 "sobald sich die \"hosts\" oder \"resolv\" Datei ändert"
 
 #. Domain suffix
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:109
-msgid "olsrd_loadplugin_suffix"
+msgid "Domain suffix"
 msgstr "Domain-Suffix"
 
 #. Timeout
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:110
-msgid "olsrd_loadplugin_timeout"
+msgid "Timeout"
 msgstr "Timeout"
 
 #. Name of the BMF interface
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:111
-msgid "olsrd_loadplugin_bmfinterface"
+msgid "Name of the BMF interface"
 msgstr "Name für die BMF-Schnittstelle"
 
 #. IP address of the BMF interface
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:112
-msgid "olsrd_loadplugin_bmfinterfaceid"
+msgid "IP address of the BMF interface"
 msgstr "IP-Adresse für die BMF-Schnittstelle"
 
 #. Redirect local broadcasts
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:113
-msgid "olsrd_loadplugin_dolocalbroadcast"
+msgid "Redirect local broadcasts"
 msgstr "Lokale Broadcasts weiterleiten"
 
 #. Also redirect broadcasts from OLSR interfaces
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:114
-msgid "olsrd_loadplugin_capturepacketsonolsrinterfaces"
+msgid "Also redirect broadcasts from OLSR interfaces"
 msgstr "Broadcasts von OLSR-Schnittstellen weiterleiten"
 
 #. Propagation mechanism
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:115
-msgid "olsrd_loadplugin_bmfmechanism"
+msgid "Propagation mechanism"
 msgstr "Verteilungsmechanismus"
 
 #. Number of retransmissions per package
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:116
-msgid "olsrd_loadplugin_broadcastretransmitcount"
+msgid "Number of retransmissions per package"
 msgstr "Anzahl der Neuversendungen pro Paket"
 
 #. Minimum number of neighbours for broadcast redirection
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:117
-msgid "olsrd_loadplugin_fanoutlimit"
+msgid "Minimum number of neighbours for broadcast redirection"
 msgstr "Mindestanzahl der Nachbarn für Broadcastweiterleitung"
 
 #. Non-OLSR interfaces
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:118
-msgid "olsrd_loadplugin_nonolsrif"
+msgid "Non-OLSR interfaces"
 msgstr "Nicht-OLSR-Interfaces"
 
 #. Used port
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:119
-msgid "olsrd_loadplugin_port"
+msgid "Used port"
 msgstr "Verwendeter Port"
 
 #. Allow connections from hosts
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:120
-msgid "olsrd_loadplugin_host"
+msgid "Allow connections from hosts"
 msgstr "Verbindungsaufbau von Hosts zulassen"
 
 #. Allow connections from subnets
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:121
-msgid "olsrd_loadplugin_net"
+msgid "Allow connections from subnets"
 msgstr "Verbindungsaufbau von Subnetzen zulassen"
 
 #. Format: IP-AddresseNetmask
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:122
-msgid "olsrd_loadplugin_net_desc"
+msgid "Format: IP-AddresseNetmask"
 msgstr "Format: IP-Adresse Netzmaske"
 
 #. Used protocols
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:123
-msgid "olsrd_loadplugin_redistribute"
+msgid "Used protocols"
 msgstr "Verwendete Protokolle"
 
 #. Only export routes to Quagga or to kernel too
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:124
-msgid "olsrd_loadplugin_exportroutes"
+msgid "Only export routes to Quagga or to kernel too"
 msgstr "Routen nur an Quagga oder auch an Kernel exportieren"
 
 #. Always prefer local routes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:125
-msgid "olsrd_loadplugin_localpref"
+msgid "Always prefer local routes"
 msgstr "Lokale Routen immer bevorzugen"
 
 #. Distance of exported routes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:126
-msgid "olsrd_loadplugin_distance"
+msgid "Distance of exported routes"
 msgstr "Distanz für exportierte Routen"
 
 #. Key file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:127
-msgid "olsrd_loadplugin_keyfile"
+msgid "Key file"
 msgstr "Schlüsseldatei"
 
 #. Watchdog timestamp file
diff --git a/po/de/openvpn.po b/po/de/openvpn.po
index 68000a24e..91a1318b1 100644
--- a/po/de/openvpn.po
+++ b/po/de/openvpn.po
@@ -13,469 +13,469 @@ msgstr ""
 
 #. OpenVPN
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:1
-msgid "openvpn"
+msgid "OpenVPN"
 msgstr "OpenVPN"
 
 #. Switch to basic configuration
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:3
-msgid "openvpn_switch_basic"
+msgid "« Switch to basic configuration"
 msgstr "« Zur vereinfachten Konfiguration wechseln"
 
 #. Switch to advanced configuration
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:4
-msgid "openvpn_switch_advanced"
+msgid "Switch to advanced configuration »"
 msgstr "Erweiterte Einstellungen"
 
 #. Enabled
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:6
-msgid "openvpn_enable"
+msgid "Enabled"
 msgstr "Einschalten"
 
 #. Started
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:7
-msgid "openvpn_active"
+msgid "Started"
 msgstr "Gestartet"
 
 #. no
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:8
-msgid "openvpn_active_no"
+msgid "no"
 msgstr "Nicht gestartet"
 
 #. yes (%i)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:9
-msgid "openvpn_active_yes"
+msgid "yes (%i)"
 msgstr "Gestartet (%s)"
 
 #. Port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:10
-msgid "openvpn_port"
+msgid "Port"
 msgstr "Netzwerkport"
 
 #. Protocol
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:11
-msgid "openvpn_proto"
+msgid "Protocol"
 msgstr "Protokoll"
 
 #. Instance \"%s\"
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:13
-msgid "openvpn_instance"
+msgid "Instance \"%s\""
 msgstr "Instanz \"%s\""
 
 #. OpenVPN instances
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:15
-msgid "openvpn_overview"
+msgid "OpenVPN instances"
 msgstr "OpenVPN Instanzen"
 
 #. Below is a list of configured OpenVPN instances and their current state
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:16
-msgid "openvpn_overview_desc"
+msgid "Below is a list of configured OpenVPN instances and their current state"
 msgstr "Liste der konfigurierten OpenVPN Instanzen und ihr momentaner Status"
 
 #. Daemon configuration
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:18
-msgid "openvpn_service"
+msgid "Daemon configuration"
 msgstr "Konfiguration des Dämons"
 
 #. Networking options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:19
-msgid "openvpn_networking"
+msgid "Networking options"
 msgstr "Netzwerk Optionen"
 
 #. VPN options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:20
-msgid "openvpn_vpn"
+msgid "VPN options"
 msgstr "VPN Optionen"
 
 #. Cryptography settings
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:21
-msgid "openvpn_cryptography"
+msgid "Cryptography settings"
 msgstr "Verschlüsselungseinstellungen"
 
 #. Read configuration options from file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:23
-msgid "openvpn_param_config"
+msgid "Read configuration options from file"
 msgstr "Konfiguration aus einer Datei lesen"
 
 #. Local host name or ip address
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:24
-msgid "openvpn_param_local"
+msgid "Local host name or ip address"
 msgstr "Lokaler Rechnername oder IP Adresse"
 
 #. Remote host name or ip address
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:25
-msgid "openvpn_param_remote"
+msgid "Remote host name or ip address"
 msgstr "Entfernter Rechnername oder IP-Adresse"
 
 #. Randomly choose remote server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:26
-msgid "openvpn_param_remote_random"
+msgid "Randomly choose remote server"
 msgstr "Entfernten Server zufällig wählen"
 
 #. Major mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:27
-msgid "openvpn_param_mode"
+msgid "Major mode"
 msgstr "Betriebsmodus"
 
 #. Use protocol
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:28
-msgid "openvpn_param_proto"
+msgid "Use protocol"
 msgstr "Netzwerkprotokoll"
 
 #. Connection retry interval
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:29
-msgid "openvpn_param_connect_retry"
+msgid "Connection retry interval"
 msgstr "Wiederholrate für Verbindungversuche"
 
 #. Connection timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:30
-msgid "openvpn_param_connect_timeout"
+msgid "Connection timeout"
 msgstr "Maximale Dauer für Verbindungsversuche"
 
 #. Maximum connection attempt retries
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:31
-msgid "openvpn_param_connect_retry_max"
+msgid "Maximum connection attempt retries"
 msgstr "Maximale Anzahl von Verbindungsversuchen"
 
 #. Try to sense proxy settings automatically
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:32
-msgid "openvpn_param_auto_proxy"
+msgid "Try to sense proxy settings automatically"
 msgstr "Versuchen, die Proxyeinstellung automatisch zu beziehen"
 
 #. Connect to remote host
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:33
-msgid "openvpn_param_http_proxy"
+msgid "Connect to remote host"
 msgstr "Verbindung über einen HTTP-Proxy"
 
 #. Retry indefinitely on HTTP proxy errors
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:34
-msgid "openvpn_param_http_proxy_retry"
+msgid "Retry indefinitely on HTTP proxy errors"
 msgstr "Neue Verbindung bei Proxy-Fehlern aufbauen"
 
 #. Proxy timeout in seconds
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:35
 #, fuzzy
-msgid "openvpn_param_http_proxy_timeout"
+msgid "Proxy timeout in seconds"
 msgstr "Maximaler Timeout für Proxy-Verbindungen"
 
 #. Set extended HTTP proxy options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:36
-msgid "openvpn_param_http_proxy_option"
+msgid "Set extended HTTP proxy options"
 msgstr "Erweiterte HTTP-Proxy Einstellungen vornehmen"
 
 #. Connect through Socks5 proxy
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:37
-msgid "openvpn_param_socks_proxy"
+msgid "Connect through Socks5 proxy"
 msgstr "Verbindung über einen Socks 5 - Proxy"
 
 #. Retry indefinitely on Socks proxy errors
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:38
-msgid "openvpn_param_socks_proxy_retry"
+msgid "Retry indefinitely on Socks proxy errors"
 msgstr "Neue Verbindung bei Proxy-Fehlern aufbauen"
 
 #. If hostname resolve fails, retry
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:39
-msgid "openvpn_param_resolv_retry"
+msgid "If hostname resolve fails, retry"
 msgstr "Neuer Verbindungsversuch wenn Namensauflösung fehlschlägt"
 
 #. Allow remote to change its IP or port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:40
 #, fuzzy
-msgid "openvpn_param_float"
+msgid "Allow remote to change its IP or port"
 msgstr "Address- und Port-Änderungen der Gegenstelle zulassen"
 
 #. Execute shell command on remote ip change
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:41
-msgid "openvpn_param_ipchange"
+msgid "Execute shell command on remote ip change"
 msgstr "Programm bei Adressänderung der Gegenstelle aufrufen"
 
 #. TCP/UDP port # for both local and remote
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:42
-msgid "openvpn_param_port"
+msgid "TCP/UDP port # for both local and remote"
 msgstr "Benutzter TCP oder UDP Port"
 
 #. TCP/UDP port # for local (default=1194)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:43
-msgid "openvpn_param_lport"
+msgid "TCP/UDP port # for local (default=1194)"
 msgstr "Lokaler TCP oder UDP Port"
 
 #. TCP/UDP port # for remote (default=1194)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:44
-msgid "openvpn_param_rport"
+msgid "TCP/UDP port # for remote (default=1194)"
 msgstr "TCP oder UDP Port der Gegenstelle"
 
 #. Bind to local address and port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:45
-msgid "openvpn_param_bind"
+msgid "Bind to local address and port"
 msgstr "An lokale Adresse und Port binden"
 
 #. Do not bind to local address and port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:46
 #, fuzzy
-msgid "openvpn_param_nobind"
+msgid "Do not bind to local address and port"
 msgstr "An keine spezielle Adresse binden"
 
 #. tun/tap device
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:47
-msgid "openvpn_param_dev"
+msgid "tun/tap device"
 msgstr "TUN/TAP Schnittstelle"
 
 #. Type of used device
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:48
-msgid "openvpn_param_dev_type"
+msgid "Type of used device"
 msgstr "Schnittstellentyp"
 
 #. Use tun/tap device node
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:49
-msgid "openvpn_param_dev_node"
+msgid "Use tun/tap device node"
 msgstr "TUN/TAP Gerätedatei"
 
 #. Set the link layer address of the tap device
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:50
 #, fuzzy
-msgid "openvpn_param_lladdr"
+msgid "Set the link layer address of the tap device"
 msgstr "Lokale Link-Adresse der TAP Schnittstelle"
 
 #. 'net30', 'p2p', or 'subnet'
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:51
 #, fuzzy
-msgid "openvpn_param_topology"
+msgid "'net30', 'p2p', or 'subnet'"
 msgstr "Topologietyp"
 
 #. Make tun device IPv6 capable
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:52
 #, fuzzy
-msgid "openvpn_param_tun_ipv6"
+msgid "Make tun device IPv6 capable"
 msgstr "IPv6 auf TUN Schnittstellen aktivieren"
 
 #. Configure device to use IP address
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:53
 #, fuzzy
-msgid "openvpn_param_ifconfig"
+msgid "Configure device to use IP address"
 msgstr "IP-Adresskonfiguration für Schnittstelle"
 
 #. Don't actually execute ifconfig
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:54
 #, fuzzy
-msgid "openvpn_param_ifconfig_noexec"
+msgid "Don't actually execute ifconfig"
 msgstr "Schnittstellenkonfiguration nicht durchführen"
 
 #. Don't warn on ifconfig inconsistencies
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:55
 #, fuzzy
-msgid "openvpn_param_ifconfig_nowarn"
+msgid "Don't warn on ifconfig inconsistencies"
 msgstr "Keine Warnung bei inkonsistenter Schnittstellenkonfiguration"
 
 #. Add route after establishing connection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:56
 #, fuzzy
-msgid "openvpn_param_route"
+msgid "Add route after establishing connection"
 msgstr "Netzwerkrouten nach Verbindungsaufbau einrichten"
 
 #. Specify a default gateway for routes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:57
-msgid "openvpn_param_route_gateway"
+msgid "Specify a default gateway for routes"
 msgstr "Standard-Gateway für Netzwerkrouten"
 
 #. Specify a default metric for routes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:58
-msgid "openvpn_param_route_metric"
+msgid "Specify a default metric for routes"
 msgstr "Standard-Metrik für Netzwerkrouten"
 
 #. Delay n seconds after connection 
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:59
 #, fuzzy
-msgid "openvpn_param_route_delay"
+msgid "Delay n seconds after connection "
 msgstr "Verzögere Routen-Einrichtung nach Verbindungsaufbau"
 
 #. Execute shell cmd after routes are added
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:60
 #, fuzzy
-msgid "openvpn_param_route_up"
+msgid "Execute shell cmd after routes are added"
 msgstr "Shell-Befehl nach Routen-Einrichtung ausführen"
 
 #. Don't add routes automatically
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:61
 #, fuzzy
-msgid "openvpn_param_route_noexec"
+msgid "Don't add routes automatically"
 msgstr "Netzwerkrouten nicht automatisch einrichten"
 
 #. Don't pull options from server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:62
-msgid "openvpn_param_route_nopull"
+msgid "Don't pull options from server"
 msgstr "Keine Konfigurationsoptionen vom Server beziehen"
 
 #. Automatically redirect default route
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:63
-msgid "openvpn_param_redirect_gateway"
+msgid "Automatically redirect default route"
 msgstr "Automatisch die Standard-Route umleiten"
 
 #. Pass environment variables to script
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:64
 #, fuzzy
-msgid "openvpn_param_setenv"
+msgid "Pass environment variables to script"
 msgstr "Umgebungsvariablen für Shell-Befehle"
 
 #. Shaping for peer bandwidth
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:65
 #, fuzzy
-msgid "openvpn_param_shaper"
+msgid "Shaping for peer bandwidth"
 msgstr "Verbindungsrate von Gegenstellen limitieren"
 
 #. Set timeouts in server mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:66
 #, fuzzy
-msgid "openvpn_param_keepalive"
+msgid "Set timeouts in server mode"
 msgstr "Allgemeine Timeouts im Server-Modus"
 
 #. tun/tap inactivity timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:67
-msgid "openvpn_param_inactive"
+msgid "tun/tap inactivity timeout"
 msgstr "Inaktivitäts-Timeout für TUN/TAP Schnittstellen"
 
 #. Remote ping timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:68
-msgid "openvpn_param_ping_exit"
+msgid "Remote ping timeout"
 msgstr "Ping-Timeout für Gegenstellen"
 
 #. Restart after remote ping timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:69
 #, fuzzy
-msgid "openvpn_param_ping_restart"
+msgid "Restart after remote ping timeout"
 msgstr "Neu Starten nach Ping-Timeout an Gegenstellen"
 
 #. Only process ping timeouts if routes exist
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:70
-msgid "openvpn_param_ping_timer_rem"
+msgid "Only process ping timeouts if routes exist"
 msgstr "Ping-Timeouts nur bei vorhandenen Routen auslösen"
 
 #. Ping remote every n seconds over TCP/UDP port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:71
 #, fuzzy
-msgid "openvpn_param_ping"
+msgid "Ping remote every n seconds over TCP/UDP port"
 msgstr "Ping-Intervall für Gegenstellen"
 
 #. Configure a multi-homed UDP server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:72
 #, fuzzy
-msgid "openvpn_param_multihome"
+msgid "Configure a multi-homed UDP server"
 msgstr "UDP-Server mit mehreren Schnittstellen"
 
 #. Optimize TUN/TAP/UDP writes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:73
 #, fuzzy
-msgid "openvpn_param_fast_io"
+msgid "Optimize TUN/TAP/UDP writes"
 msgstr "TUN-, TAP- und UDP-Schreibvorgänge optimieren"
 
 # Umleiten? Ignorieren? Behandeln?
 #. Remap SIGUSR1 signals
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:74
 #, fuzzy
-msgid "openvpn_param_remap_usr1"
+msgid "Remap SIGUSR1 signals"
 msgstr "\"USR1\" Systemsignal umleiten"
 
 #. Keep tun/tap device open on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:75
-msgid "openvpn_param_persist_tun"
+msgid "Keep tun/tap device open on restart"
 msgstr "TUN/TAP Schnittelle bei Neustarts offen halten"
 
 #. Keep remote IP address on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:76
-msgid "openvpn_param_persist_remote_ip"
+msgid "Keep remote IP address on restart"
 msgstr "IP-Adresse der Gegenstelle bei Neustarts beibehalten"
 
 #. Keep local IP address on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:77
-msgid "openvpn_param_persist_local_ip"
+msgid "Keep local IP address on restart"
 msgstr "Lokale IP-Adresse bei Neustarts beibehalten"
 
 #. Don't re-read key on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:78
-msgid "openvpn_param_persist_key"
+msgid "Don't re-read key on restart"
 msgstr "Schlüssel bei Neustarts beibehalten"
 
 #. TOS passthrough (applies to IPv4 only)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:79
 #, fuzzy
-msgid "openvpn_param_passtos"
+msgid "TOS passthrough (applies to IPv4 only)"
 msgstr "\"TOS\" Durchleitung (nur für IPv4)"
 
 #. Set tun/tap device MTU
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:80
-msgid "openvpn_param_tun_mtu"
+msgid "Set tun/tap device MTU"
 msgstr "MTU für TUN/TAP Schnittstelle festlegen"
 
 #. Set tun/tap device overhead
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:81
-msgid "openvpn_param_tun_mtu_extra"
+msgid "Set tun/tap device overhead"
 msgstr "Overhead für TUN/TAP Schnittstelle festlegen"
 
 #. Set TCP/UDP MTU
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:82
-msgid "openvpn_param_link_mtu"
+msgid "Set TCP/UDP MTU"
 msgstr "MTU für TCP/UDP Protokoll festlegen"
 
 #. Enable Path MTU discovery
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:83
 #, fuzzy
-msgid "openvpn_param_mtu_disc"
+msgid "Enable Path MTU discovery"
 msgstr "MTU-Erkennung aktivieren"
 
 #. Empirically measure MTU
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:84
 #, fuzzy
-msgid "openvpn_param_mtu_test"
+msgid "Empirically measure MTU"
 msgstr "MTU regelmäßig testen"
 
 #. Enable internal datagram fragmentation
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:85
-msgid "openvpn_param_fragment"
+msgid "Enable internal datagram fragmentation"
 msgstr "Datenpakete bei Bedarf fragmentieren"
 
 #. Set upper bound on TCP MSS
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:86
 #, fuzzy
-msgid "openvpn_param_mssfix"
+msgid "Set upper bound on TCP MSS"
 msgstr "Maximale TCP-MSS erzwingen"
 
 #. Set the TCP/UDP send buffer size
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:87
 #, fuzzy
-msgid "openvpn_param_sndbuf"
+msgid "Set the TCP/UDP send buffer size"
 msgstr "Größe des TCP/UDP Sende-Puffers"
 
 #. Set the TCP/UDP receive buffer size
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:88
 #, fuzzy
-msgid "openvpn_param_rcvbuf"
+msgid "Set the TCP/UDP receive buffer size"
 msgstr "Größe des TCP/UDP Empfangs-Puffers"
 
 #. Set tun/tap TX queue length
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:89
-msgid "openvpn_param_txqueuelen"
+msgid "Set tun/tap TX queue length"
 msgstr "Größe der Sende-Warteschlange"
 
 #. Disable Paging
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:90
 #, fuzzy
-msgid "openvpn_param_mlock"
+msgid "Disable Paging"
 msgstr "Benutzen Arbeitsspeicher sperren"
 
 #. Shell cmd to execute after tun device open
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:91
 #, fuzzy
-msgid "openvpn_param_up"
+msgid "Shell cmd to execute after tun device open"
 msgstr "Shell-Kommando nach Einrichtung von TUN/TAP Schnittstelle ausführen"
 
 #. Delay tun/tap open and up script execution
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:92
 #, fuzzy
-msgid "openvpn_param_up_delay"
+msgid "Delay tun/tap open and up script execution"
 msgstr "Shell-Kommando nach Schnittstelleneinrichtung verzögern"
 
 #. Shell cmd to run after tun device close
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:93
 #, fuzzy
-msgid "openvpn_param_down"
+msgid "Shell cmd to run after tun device close"
 msgstr ""
 "Shell-Kommando <em>nach</em> Deaktivierung der TUN/TAP Schnittstelle "
 "ausführen"
@@ -483,7 +483,7 @@ msgstr ""
 #. Call down cmd/script before TUN/TAP close
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:94
 #, fuzzy
-msgid "openvpn_param_down_pre"
+msgid "Call down cmd/script before TUN/TAP close"
 msgstr ""
 "Shell-Kommando <em>vor</em> Deaktivierung der TUN/TAP Schnittstelle "
 "ausführen"
@@ -491,158 +491,158 @@ msgstr ""
 #. Run up/down scripts for all restarts
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:95
 #, fuzzy
-msgid "openvpn_param_up_restart"
+msgid "Run up/down scripts for all restarts"
 msgstr "Shell-Kommandos bei jedem Neustart ausführen"
 
 #. Set UID to user
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:96
-msgid "openvpn_param_user"
+msgid "Set UID to user"
 msgstr "Dienst als Benutzer laufen lassen"
 
 #. Set GID to group
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:97
-msgid "openvpn_param_group"
+msgid "Set GID to group"
 msgstr "Dienst mit Benutzergruppe laufen lassen"
 
 #. Chroot to directory after initialization
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:98
-msgid "openvpn_param_chroot"
+msgid "Chroot to directory after initialization"
 msgstr "<em>Nach</em> der Initialisierung in Verzeichnis wechseln"
 
 #. Change to directory before initialization
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:99
-msgid "openvpn_param_cd"
+msgid "Change to directory before initialization"
 msgstr "<em>Vor</em> der Initialisierung in Verzeichnis wechseln"
 
 #. Daemonize after initialization
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:100
-msgid "openvpn_param_daemon"
+msgid "Daemonize after initialization"
 msgstr "Nach der Initialisierung als Hintergrundprozess ausführen"
 
 #. Output to syslog and do not daemonize
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:101
-msgid "openvpn_param_syslog"
+msgid "Output to syslog and do not daemonize"
 msgstr "Ausgaben ins Systemprotokoll umleiten und im Vordergrund ausführen"
 
 #. Run as an inetd or xinetd server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:102
 #, fuzzy
-msgid "openvpn_param_inetd"
+msgid "Run as an inetd or xinetd server"
 msgstr "Als <em>inetd</em> oder <em>xinetd</em> Server laufen"
 
 #. Write log to file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:103
-msgid "openvpn_param_log"
+msgid "Write log to file"
 msgstr "In Protokolldatei schreiben"
 
 #. Append log to file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:104
-msgid "openvpn_param_log_append"
+msgid "Append log to file"
 msgstr "An Protokolldatei anfügen"
 
 #. Don't log timestamps
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:105
-msgid "openvpn_param_suppress_timestamps"
+msgid "Don't log timestamps"
 msgstr "Keine Zeitangaben protokollieren"
 
 #. Write process ID to file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:106
-msgid "openvpn_param_writepid"
+msgid "Write process ID to file"
 msgstr "Prozess-Nummer in Datei schreiben"
 
 #. Change process priority
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:107
-msgid "openvpn_param_nice"
+msgid "Change process priority"
 msgstr "Prozess-Priorität anpassen"
 
 # Was für Parameter?
 #. Echo parameters to log
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:108
 #, fuzzy
-msgid "openvpn_param_echo"
+msgid "Echo parameters to log"
 msgstr "Parameter in Protokolldatei speichern"
 
 # Detailstufe passt nicht ganz
 #. Set output verbosity
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:109
 #, fuzzy
-msgid "openvpn_param_verb"
+msgid "Set output verbosity"
 msgstr "Detailstufe für Protokolle"
 
 #. Limit repeated log messages
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:110
-msgid "openvpn_param_mute"
+msgid "Limit repeated log messages"
 msgstr "Wiederholende Protokollmeldungen unterdrücken"
 
 #. Write status to file every n seconds
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:111
 #, fuzzy
-msgid "openvpn_param_status"
+msgid "Write status to file every n seconds"
 msgstr "Status-Datei schreiben"
 
 #. Status file format version
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:112
 #, fuzzy
-msgid "openvpn_param_status_version"
+msgid "Status file format version"
 msgstr "Format für Status-Datei"
 
 #. Disable options consistency check
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:113
 #, fuzzy
-msgid "openvpn_param_disable_occ"
+msgid "Disable options consistency check"
 msgstr "Konsistenzprüfungen für Optionen durchführen"
 
 #. Special stress testing mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:114
 #, fuzzy
-msgid "openvpn_param_gremlin"
+msgid "Special stress testing mode"
 msgstr "Stresstest-Modus"
 
 #. Use fast LZO compression
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:115
 #, fuzzy
-msgid "openvpn_param_comp_lzo"
+msgid "Use fast LZO compression"
 msgstr "Schnelle LZO-Kompression benutzen"
 
 #. Don't use adaptive lzo compression
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:116
-msgid "openvpn_param_comp_noadapt"
+msgid "Don't use adaptive lzo compression"
 msgstr "Adaptive LZO-Kompression deaktivieren"
 
 #. Enable management interface on <em>IP</em> <em>port</em>
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:117
 #, fuzzy
-msgid "openvpn_param_management"
+msgid "Enable management interface on <em>IP</em> <em>port</em>"
 msgstr "Administratorschnittstelle aktivieren"
 
 #. Management interface will connect as a TCP client
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:118
 #, fuzzy
-msgid "openvpn_param_management_client"
+msgid "Management interface will connect as a TCP client"
 msgstr "Administratorschnittstelle als TCP-Client verbinden"
 
 #. Query management channel for private key
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:119
 #, fuzzy
-msgid "openvpn_param_management_query_passwords"
+msgid "Query management channel for private key"
 msgstr "Privaten Schlüssel über Management-Kanal abfragen"
 
 #. Start OpenVPN in a hibernating state
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:120
 #, fuzzy
-msgid "openvpn_param_management_hold"
+msgid "Start OpenVPN in a hibernating state"
 msgstr "OpenVPN im Schlafmodus starten"
 
 #. Issue SIGUSR1 on management disconnect
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:121
 #, fuzzy
-msgid "openvpn_param_management_signal"
+msgid "Issue SIGUSR1 on management disconnect"
 msgstr "\"SIGUSR1\" Signal beim Trennen vom Management-Interface auslösen"
 
 #. Forget passwords on management disconnect
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:122
 #, fuzzy
-msgid "openvpn_param_management_forget_disconnect"
+msgid "Forget passwords on management disconnect"
 msgstr ""
 "Zwischengespeicherte Passwörter beim Trennen vom Management-Interface "
 "verwerfen"
@@ -650,296 +650,296 @@ msgstr ""
 #. Number of lines for log file history
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:123
 #, fuzzy
-msgid "openvpn_param_management_log_cache"
+msgid "Number of lines for log file history"
 msgstr "Anzahl der Zeilen im Protokoll-Zwischenspeicher"
 
 #. Load plug-in module
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:124
 #, fuzzy
-msgid "openvpn_param_plugin"
+msgid "Load plug-in module"
 msgstr "Plugin-Modul laden"
 
 #. Configure server mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:125
-msgid "openvpn_param_server"
+msgid "Configure server mode"
 msgstr "Server-Modus"
 
 #. Configure server bridge
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:126
 #, fuzzy
-msgid "openvpn_param_server_bridge"
+msgid "Configure server bridge"
 msgstr "Server-zu-Server Netzwerkbrücke"
 
 #. Push options to peer
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:127
 #, fuzzy
-msgid "openvpn_param_push"
+msgid "Push options to peer"
 msgstr "Optionen an Teilnehmer übertragen"
 
 #. Don't inherit global push options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:128
 #, fuzzy
-msgid "openvpn_param_push_reset"
+msgid "Don't inherit global push options"
 msgstr "Nur teilnehmerspezifische Optionen übertragen"
 
 #. Set aside a pool of subnets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:129
-msgid "openvpn_param_ifconfig_pool"
+msgid "Set aside a pool of subnets"
 msgstr "IP-Adressbereich für zu vergebende Subnetze"
 
 #. Use individual addresses rather than /30 subnets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:130
 #, fuzzy
-msgid "openvpn_param_ifconfig_pool_linear"
+msgid "Use individual addresses rather than /30 subnets"
 msgstr "Einzeladressen statt /30 Subnetze vergeben"
 
 #. Persist/unpersist ifconfig-pool
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:131
 #, fuzzy
-msgid "openvpn_param_ifconfig_pool_persist"
+msgid "Persist/unpersist ifconfig-pool"
 msgstr "Persistenten IP-Adressbereich nutzen"
 
 #. Push an ifconfig option to remote
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:132
 #, fuzzy
-msgid "openvpn_param_ifconfig_push"
+msgid "Push an ifconfig option to remote"
 msgstr "IP-Adresskonfiguration an Teilnehmer übertragen"
 
 #. Route subnet to client
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:133
 #, fuzzy
-msgid "openvpn_param_iroute"
+msgid "Route subnet to client"
 msgstr "Subnetz an Teilnehmer routen"
 
 #. Client is disabled
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:134
 #, fuzzy
-msgid "openvpn_param_disable"
+msgid "Client is disabled"
 msgstr "Teilnehmer-Konto deaktivieren"
 
 #. Don't require client certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:135
 #, fuzzy
-msgid "openvpn_param_client_cert_not_required"
+msgid "Don't require client certificate"
 msgstr "Verbindung ohne Teilnehmerzertifikat erlauben"
 
 #. Use username as common name
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:136
 #, fuzzy
-msgid "openvpn_param_username_as_common_name"
+msgid "Use username as common name"
 msgstr "Benutzernamen als Common-Name benutzen"
 
 #. Script to verify interactive authentication
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:137
 #, fuzzy
-msgid "openvpn_param_auth_user_pass_verify"
+msgid "Script to verify interactive authentication"
 msgstr "Shell-Kommando zum Überprüfen der interaktiven Authentifikation"
 
 #. Allow client-to-client traffic
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:138
 #, fuzzy
-msgid "openvpn_param_client_to_client"
+msgid "Allow client-to-client traffic"
 msgstr "Netzwerkverkehr zwischen Teilnehmern zulassen"
 
 #. Allow multiple clients with same certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:139
 #, fuzzy
-msgid "openvpn_param_duplicate_cn"
+msgid "Allow multiple clients with same certificate"
 msgstr "Mehrere Teilnehmer mit selbem Zertifikat erlauben"
 
 #. Run script cmd on client connection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:140
 #, fuzzy
-msgid "openvpn_param_client_connect"
+msgid "Run script cmd on client connection"
 msgstr "Shell-Kommando bei neuer Teilnehmer-Verbindung ausführen"
 
 #. Run script cmd on client disconnection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:141
 #, fuzzy
-msgid "openvpn_param_client_disconnect"
+msgid "Run script cmd on client disconnection"
 msgstr "Shell-Kommando beim Trennen von Teilnehmer-Verbindungen ausführen"
 
 #. Directory for custom client config files
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:142
-msgid "openvpn_param_client_config_dir"
+msgid "Directory for custom client config files"
 msgstr "Verzeichnis für eigene Konfigurationsdateien"
 
 #. Refuse connection if no custom client config
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:143
 #, fuzzy
-msgid "openvpn_param_ccd_exclusive"
+msgid "Refuse connection if no custom client config"
 msgstr "Teilnehmer-Verbindung verweigern wenn Teilnehmer-Konfiguration fehlt"
 
 # Was soll das eigtl. bedeuten?
 #. Temporary directory for client-connect return file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:144
 #, fuzzy
-msgid "openvpn_param_tmp_dir"
+msgid "Temporary directory for client-connect return file"
 msgstr "Temporäres Verzeichnis für Teilnehmer-Verbindungen"
 
 #. Set size of real and virtual address hash tables
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:145
 #, fuzzy
-msgid "openvpn_param_hash_size"
+msgid "Set size of real and virtual address hash tables"
 msgstr "Größe für interne Adresstabellen"
 
 #. Number of allocated broadcast buffers
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:146
-msgid "openvpn_param_bcast_buffers"
+msgid "Number of allocated broadcast buffers"
 msgstr "Anzahl der benutzten Broadcast-Puffer"
 
 #. Maximum number of queued TCP output packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:147
-msgid "openvpn_param_tcp_queue_limit"
+msgid "Maximum number of queued TCP output packets"
 msgstr "Maximale Anzahl an TCP-Paketen in der Warteschlange"
 
 #. Script to validate client virtual addresses
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:148
-msgid "openvpn_param_learn_address"
+msgid "Script to validate client virtual addresses"
 msgstr "Shell-Kommando zum Erlernen neuer Teilnehmer-Adressen"
 
 #. Allowed maximum of new connections
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:149
 #, fuzzy
-msgid "openvpn_param_connect_freq"
+msgid "Allowed maximum of new connections"
 msgstr "Wiederholrate für Verbindungversuche"
 
 #. Allowed maximum of connected clients
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:150
 #, fuzzy
-msgid "openvpn_param_max_clients"
+msgid "Allowed maximum of connected clients"
 msgstr "Betriebsmodus"
 
 #. Allowed maximum of internal
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:151
-msgid "openvpn_param_max_routes_per_client"
+msgid "Allowed maximum of internal"
 msgstr "Maximal erlaubte Anzahl an Netzwerkrouten pro Teilnehmer"
 
 #. Proxy incoming HTTPS sessions
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:152
 #, fuzzy
-msgid "openvpn_param_port_share"
+msgid "Proxy incoming HTTPS sessions"
 msgstr "Netzwerk-Port mit HTTPS-Server teilen"
 
 #. Configure client mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:153
-msgid "openvpn_param_client"
+msgid "Configure client mode"
 msgstr "Clientmodus"
 
 #. Authenticate using username/password
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:154
-msgid "openvpn_param_auth_user_pass"
+msgid "Authenticate using username/password"
 msgstr "Authentifikation mittels Benutzername und Passwort"
 
 #. Accept options pushed from server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:155
 #, fuzzy
-msgid "openvpn_param_pull"
+msgid "Accept options pushed from server"
 msgstr "Vom Server übertragene Optionen lokal akzeptieren"
 
 #. Handling of authentication failures
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:156
 #, fuzzy
-msgid "openvpn_param_auth_retry"
+msgid "Handling of authentication failures"
 msgstr "Behandlung von Authentifikationsfehlern"
 
 #. Send notification to peer on disconnect
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:157
-msgid "openvpn_param_explicit_exit_notify"
+msgid "Send notification to peer on disconnect"
 msgstr "Teilnehmer über Verbindungstrennung informieren"
 
 #. Enable Static Key encryption mode (non-TLS)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:158
 #, fuzzy
-msgid "openvpn_param_secret"
+msgid "Enable Static Key encryption mode (non-TLS)"
 msgstr "Verschlüsselung mittels statischer Schlüssel (kein TLS)"
 
 #. HMAC authentication for packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:159
 #, fuzzy
-msgid "openvpn_param_auth"
+msgid "HMAC authentication for packets"
 msgstr "HMAC-Authentifizierung für Pakete"
 
 #. Encryption cipher for packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:160
 #, fuzzy
-msgid "openvpn_param_cipher"
+msgid "Encryption cipher for packets"
 msgstr "Verschlüsselungsalgorithmus für Pakete"
 
 #. Size of cipher key
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:161
 #, fuzzy
-msgid "openvpn_param_keysize"
+msgid "Size of cipher key"
 msgstr "Größe des Schlüssels"
 
 #. Enable OpenSSL hardware crypto engines
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:162
 #, fuzzy
-msgid "openvpn_param_engine"
+msgid "Enable OpenSSL hardware crypto engines"
 msgstr "OpenSSL-Unterstützung für Kryptographie-Hardware benutzen"
 
 #. Disable replay protection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:163
 #, fuzzy
-msgid "openvpn_param_no_replay"
+msgid "Disable replay protection"
 msgstr "\"Replay\"-Schutz deaktivieren"
 
 #. Silence the output of replay warnings
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:164
 #, fuzzy
-msgid "openvpn_param_mute_replay_warnings"
+msgid "Silence the output of replay warnings"
 msgstr "\"Replay\"-Warnungen unterdrücken"
 
 #. Replay protection sliding window size
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:165
 #, fuzzy
-msgid "openvpn_param_replay_window"
+msgid "Replay protection sliding window size"
 msgstr "Fenstergröße für \"Replay\"-Schutz"
 
 #. Disable cipher initialisation vector
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:166
 #, fuzzy
-msgid "openvpn_param_no_iv"
+msgid "Disable cipher initialisation vector"
 msgstr "Initialisierungsvektor für Verschlüsselung deaktivieren"
 
 #. Persist replay-protection state
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:167
 #, fuzzy
-msgid "openvpn_param_replay_persist"
+msgid "Persist replay-protection state"
 msgstr "Persistenter Status für \"Replay\"-Schutz"
 
 #. Run a self-test of crypto features
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:168
-msgid "openvpn_param_test_crypto"
+msgid "Run a self-test of crypto features"
 msgstr "Kryptographie-Selbsttest durchführen"
 
 #. Enable TLS and assume server role
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:169
 #, fuzzy
-msgid "openvpn_param_tls_server"
+msgid "Enable TLS and assume server role"
 msgstr "TLS im Server-Betriebsmodus aktivieren"
 
 #. Enable TLS and assume client role
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:170
 #, fuzzy
-msgid "openvpn_param_tls_client"
+msgid "Enable TLS and assume client role"
 msgstr "TLS im Client-Betriebsmodus aktivieren"
 
 #. Data channel key exchange method
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:171
-msgid "openvpn_param_key_method"
+msgid "Data channel key exchange method"
 msgstr "Schlüsselaustauschprotokoll für den Datenkanal"
 
 #. Certificate authority
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:172
 #, fuzzy
-msgid "openvpn_param_ca"
+msgid "Certificate authority"
 msgstr "Zertifikat der Zertifizierungsstelle"
 
 #. Directory of trusted certificates (CAs and CRLs)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:173
 #, fuzzy
-msgid "openvpn_param_capath"
+msgid "Directory of trusted certificates (CAs and CRLs)"
 msgstr ""
 "Verzeichnis mit vertrauenswürdigen Zertifizierungsstellen (Schlüssel und "
 "Sperrlisten)"
@@ -947,121 +947,121 @@ msgstr ""
 #. Diffie Hellman parameters
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:174
 #, fuzzy
-msgid "openvpn_param_dh"
+msgid "Diffie Hellman parameters"
 msgstr "Diffie-Hellman-Parameter"
 
 #. Local certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:175
 #, fuzzy
-msgid "openvpn_param_cert"
+msgid "Local certificate"
 msgstr "Lokales Zertifikat"
 
 #. Local private key
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:176
 #, fuzzy
-msgid "openvpn_param_key"
+msgid "Local private key"
 msgstr "Lokaler privater Schlüssel"
 
 #. PKCS#12 file containing keys
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:177
-msgid "openvpn_param_pkcs12"
+msgid "PKCS#12 file containing keys"
 msgstr "PKCS#12 Schlüsselarchiv"
 
 #. TLS cipher
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:178
-msgid "openvpn_param_tls_cipher"
+msgid "TLS cipher"
 msgstr "TLS Verschlüsselungsalgorithmus"
 
 #. Retransmit timeout on TLS control channel
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:179
-msgid "openvpn_param_tls_timeout"
+msgid "Retransmit timeout on TLS control channel"
 msgstr "TLS Timeout"
 
 #. Renegotiate data chan. key after bytes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:180
 #, fuzzy
-msgid "openvpn_param_reneg_bytes"
+msgid "Renegotiate data chan. key after bytes"
 msgstr "Schlüssel nach maximale Verkehrsmenge neu aushandeln"
 
 #. Renegotiate data chan. key after packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:181
 #, fuzzy
-msgid "openvpn_param_reneg_pkts"
+msgid "Renegotiate data chan. key after packets"
 msgstr "Schlüssel nach maximaler Anzahl von Paketen neu aushandeln"
 
 #. Renegotiate data chan. key after seconds
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:182
 #, fuzzy
-msgid "openvpn_param_reneg_sec"
+msgid "Renegotiate data chan. key after seconds"
 msgstr "Schlüssel nach maximaler Verbindungsdauer neu aushandeln"
 
 #. Timeframe for key exchange
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:183
-msgid "openvpn_param_hand_window"
+msgid "Timeframe for key exchange"
 msgstr "Maximaler Zeitraum für Schlüsselaustausch"
 
 #. Key transition window
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:184
-msgid "openvpn_param_tran_window"
+msgid "Key transition window"
 msgstr "Maximaler Zeitraum für Schlüsselwechsel"
 
 #. Allow only one session
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:185
-msgid "openvpn_param_single_session"
+msgid "Allow only one session"
 msgstr "Nur eine einzige Verbindung zulassen"
 
 # Was exited da?
 #. Exit on TLS negotiation failure
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:186
 #, fuzzy
-msgid "openvpn_param_tls_exit"
+msgid "Exit on TLS negotiation failure"
 msgstr "Terminieren nach fehlgeschlagenem Schlüsselaustausch"
 
 #. Additional authentication over TLS
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:187
-msgid "openvpn_param_tls_auth"
+msgid "Additional authentication over TLS"
 msgstr "Erweiterte Authentifikation über TLS"
 
 #. Get PEM password from controlling tty before we daemonize
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:188
-msgid "openvpn_param_askpass"
+msgid "Get PEM password from controlling tty before we daemonize"
 msgstr "PEM-Passwort von Konsole abfragen"
 
 #. Don't cache --askpass or --auth-user-pass passwords
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:189
-msgid "openvpn_param_auth_nocache"
+msgid "Don't cache --askpass or --auth-user-pass passwords"
 msgstr "Authentifikationsdaten nicht zwischenspeichern"
 
 #. Check peer certificate against a CRL
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:190
-msgid "openvpn_param_crl_verify"
+msgid "Check peer certificate against a CRL"
 msgstr "Teilnehmerzertifikat mit Sperrliste abgleichen"
 
 #. Shell command to verify X509 name
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:191
 #, fuzzy
-msgid "openvpn_param_tls_verify"
+msgid "Shell command to verify X509 name"
 msgstr "Shell-Kommando zum Überprüfen das X.509 Namens"
 
 #. Only accept connections from given X509 name
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:192
 #, fuzzy
-msgid "openvpn_param_tls_remote"
+msgid "Only accept connections from given X509 name"
 msgstr "Nur Verbindungen vom angegebenem X.509 Name zulassen"
 
 #. Require explicit designation on certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:193
-msgid "openvpn_param_ns_cert_type"
+msgid "Require explicit designation on certificate"
 msgstr "Verwendungszweck von Zertifikaten überprüfen"
 
 #. Require explicit key usage on certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:194
-msgid "openvpn_param_remote_cert_ku"
+msgid "Require explicit key usage on certificate"
 msgstr "Zertifikat explizit auf einfachen Verwendungszweck prüfen"
 
 #. Require extended explicit key usage on certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:195
-msgid "openvpn_param_remote_cert_eku"
+msgid "Require extended explicit key usage on certificate"
 msgstr "Zertifikat explizit auf erweiterten Verwendungszweck prüfen"
 
 #. Require normal and extended key usage on certificate
diff --git a/po/de/p910nd.po b/po/de/p910nd.po
index 1c3692ff0..450f62fed 100644
--- a/po/de/p910nd.po
+++ b/po/de/p910nd.po
@@ -14,19 +14,19 @@ msgstr ""
 
 #. p910nd - Printer server
 #: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:1
-msgid "p910nd"
+msgid "p910nd - Printer server"
 msgstr "p910nd - Drucker server"
 
 #. First you have to install the packages to get support for USB (kmod-usb-printer) or parallel port (kmod-lp).
 #: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:2
-msgid "p910nd_desc"
+msgid "First you have to install the packages to get support for USB (kmod-usb-printer) or parallel port (kmod-lp)."
 msgstr ""
 "Bevor p910nd verwendet werden kann muessen Pakete fuer USB (kmod-usb-"
 "printer) und Parallelport (kmod-lp) Support installiert werden."
 
 #. Bidirectional mode
 #: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:3
-msgid "bidirectional"
+msgid "Bidirectional mode"
 msgstr "Bidirektionaler Modus"
 
 #. p910nd listens on port 910+N. E.g. 9100 for the first printer.
diff --git a/po/de/polipo.po b/po/de/polipo.po
index 0c66333dc..7c9100d99 100644
--- a/po/de/polipo.po
+++ b/po/de/polipo.po
@@ -13,41 +13,41 @@ msgstr ""
 
 #. Polipo
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:1
-msgid "polipo"
+msgid "Polipo"
 msgstr "Polipo"
 
 #. On-Disk Cache
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:2
-msgid "polipo_cache"
+msgid "On-Disk Cache"
 msgstr "Festplatten-Cache"
 
 # Verteilt? Gemeinsam?
 #. Shared cache
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:3
 #, fuzzy
-msgid "polipo_cache_cacheisshared"
+msgid "Shared cache"
 msgstr "Verteilter Cache"
 
 # Klingt komisch
 #. Enable if cache (proxy) is shared by multiple users.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:4
 #, fuzzy
-msgid "polipo_cache_cacheisshared_desc"
+msgid "Enable if cache (proxy) is shared by multiple users."
 msgstr "Cache hat mehrere Benutzer"
 
 #. To enable polipo on-disk cache cleaning (highly recommended), you should add a cron job in Scheduled Tasks services that will execute /usr/sbin/polipo_purge script. For example to perform disk cache cleanup every day at 6:00 in the morning you should add the following line in Scheduled Tasks &quot;0 6 * * *	/usr/sbin/polipo_purge&quot; (without quotes).
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:5
-msgid "polipo_cache_desc"
+msgid "To enable polipo on-disk cache cleaning (highly recommended), you should add a cron job in Scheduled Tasks services that will execute /usr/sbin/polipo_purge script. For example to perform disk cache cleanup every day at 6:00 in the morning you should add the following line in Scheduled Tasks \"0 6 * * *\\t/usr/sbin/polipo_purge\" (without quotes)."
 msgstr ""
 
 #. Disk cache location
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:6
-msgid "polipo_cache_diskcacheroot"
+msgid "Disk cache location"
 msgstr "Cache-Verzeichnis"
 
 #. Location where polipo will cache files permanently. Use of external storage devices is recommended, because the cache can grow considerably. Leave it empty to disable on-disk cache.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:7
-msgid "polipo_cache_diskcacheroot_desc"
+msgid "Location where polipo will cache files permanently. Use of external storage devices is recommended, because the cache can grow considerably. Leave it empty to disable on-disk cache."
 msgstr ""
 "Speicherort für permanent gespeicherte Dateien. Es wird die Benutzung von "
 "externen Datenträgern empfohlen, da der Cache sehr groß werden kann. Lassen "
@@ -55,33 +55,33 @@ msgstr ""
 
 #. Truncate cache files size (in bytes)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:8
-msgid "polipo_cache_diskcachetruncatesize"
+msgid "Truncate cache files size (in bytes)"
 msgstr ""
 
 #. Size to which cached files should be truncated. (default value: 1048576)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:9
-msgid "polipo_cache_diskcachetruncatesize_desc"
+msgid "Size to which cached files should be truncated. (default value: 1048576)"
 msgstr ""
 
 #. Truncate cache files time
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:10
-msgid "polipo_cache_diskcachetruncatetime"
+msgid "Truncate cache files time"
 msgstr ""
 
 #. Time after which cached files will be truncated. (default value: 4d12h)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:11
-msgid "polipo_cache_diskcachetruncatetime_desc"
+msgid "Time after which cached files will be truncated. (default value: 4d12h)"
 msgstr ""
 
 #. Delete cache files time
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:12
-msgid "polipo_cache_diskcacheunlinktime"
+msgid "Delete cache files time"
 msgstr ""
 
 #. Time after which cached files will be deleted. (default value: 32d)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:13
 #, fuzzy
-msgid "polipo_cache_diskcacheunlinktime_desc"
+msgid "Time after which cached files will be deleted. (default value: 32d)"
 msgstr ""
 "Speicherort für permanent gespeicherte Dateien. Es wird die Benutzung von "
 "externen Datenträgern empfohlen, da der Cache sehr groß werden kann. Lassen "
@@ -89,24 +89,24 @@ msgstr ""
 
 #. Polipo is a small and fast caching web proxy.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:14
-msgid "polipo_desc"
+msgid "Polipo is a small and fast caching web proxy."
 msgstr "Polipo ist ein kleiner und schneller Webproxy."
 
 #. General
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:15
-msgid "polipo_general"
+msgid "General"
 msgstr "Allgemein"
 
 #. Allowed clients
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:16
 #, fuzzy
-msgid "polipo_general_allowedclients"
+msgid "Allowed clients"
 msgstr "Zugelassene Endgeräte"
 
 #. When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients that are allowed to connect. The format is IP address or network address (192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6)).
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:17
 #, fuzzy
-msgid "polipo_general_allowedclients_desc"
+msgid "When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients that are allowed to connect. The format is IP address or network address (192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))."
 msgstr ""
 "Wenn der Server auf alle Anfragen (0.0.0.0 bzw. ::) hört, dann müssen die "
 "zugelassenen Gegenpunkte, die berechtig sind eine Verbindung aufzubauen, "
@@ -117,24 +117,24 @@ msgstr ""
 #. In RAM cache size (in bytes)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:18
 #, fuzzy
-msgid "polipo_general_chunkhighmark"
+msgid "In RAM cache size (in bytes)"
 msgstr "Größe des Pufferspeichers im Arbeitsspeicher (bytes)"
 
 #. How much RAM should Polipo use for its cache.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:19
 #, fuzzy
-msgid "polipo_general_chunkhighmark_desc"
+msgid "How much RAM should Polipo use for its cache."
 msgstr "Wie viel Arbeitsspeicher Polipo für den Puffer benutzen soll."
 
 #. DNS server address
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:20
-msgid "polipo_general_dnsnameserver"
+msgid "DNS server address"
 msgstr "Adresse des DNS-Servers"
 
 #. Set the DNS server address to use, if you want Polipo to use different DNS server than the host system.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:21
 #, fuzzy
-msgid "polipo_general_dnsnameserver_desc"
+msgid "Set the DNS server address to use, if you want Polipo to use different DNS server than the host system."
 msgstr ""
 "Geben Sie einen DNS-Server an, wenn Polipo diesen Server statt den DNS-"
 "Server für das System verwenden soll."
@@ -142,13 +142,13 @@ msgstr ""
 #. Query DNS for IPv6
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:22
 #, fuzzy
-msgid "polipo_general_dnsqueryipv6"
+msgid "Query DNS for IPv6"
 msgstr "DNS-Anfragen für IPv6"
 
 #. false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = Query both, prefer IPv6; true = Query only IPv6
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:23
 #, fuzzy
-msgid "polipo_general_dnsqueryipv6_desc"
+msgid "false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = Query both, prefer IPv6; true = Query only IPv6"
 msgstr ""
 "false = Beachtet IPv6 nicht, nur IPv4 möglich; reluctantly = Beachtet sowohl "
 "IPv4 als auch IPv6, IPv4 wird bevorzugt; happily = Beachtet sowohl IPv4 als "
@@ -157,30 +157,30 @@ msgstr ""
 
 #. Query DNS by hostname
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:24
-msgid "polipo_general_dnsusegethostbyname"
+msgid "Query DNS by hostname"
 msgstr ""
 
 #. false = Never use system DNS resolver; reluctantly = Query DNS directly, if DNS server is unavailable fail to system DNS resolver; happily = Query DNS directly, if host could not be found fallback to system DNS resolver; true = Always use system DNS resolver
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:25
-msgid "polipo_general_dnsusegethostbyname_desc"
+msgid "false = Never use system DNS resolver; reluctantly = Query DNS directly, if DNS server is unavailable fail to system DNS resolver; happily = Query DNS directly, if host could not be found fallback to system DNS resolver; true = Always use system DNS resolver"
 msgstr ""
 
 #. Syslog facility
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:26
 #, fuzzy
-msgid "polipo_general_logfacility"
+msgid "Syslog facility"
 msgstr "Einstellungen zur Protokollierungsdatei"
 
 #. Log file location
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:27
 #, fuzzy
-msgid "polipo_general_logfile"
+msgid "Log file location"
 msgstr "Ort der Protokollierungsdatei"
 
 #. Use of external storage device is recommended, because the log file is written frequently and can grow considerably.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:28
 #, fuzzy
-msgid "polipo_general_logfile_desc"
+msgid "Use of external storage device is recommended, because the log file is written frequently and can grow considerably."
 msgstr ""
 "Es sollte ein Externes Speichermedium verwendet werden, da die "
 "Protokolldatei regelmäßig geschrieben wird und dadurch sehr groß werden "
@@ -189,19 +189,19 @@ msgstr ""
 #. Log to syslog
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:29
 #, fuzzy
-msgid "polipo_general_logsyslog"
+msgid "Log to syslog"
 msgstr "Protokoll im Systemprotokoll (syslog) speichern"
 
 #. Parent proxy authentication
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:30
 #, fuzzy
-msgid "polipo_general_parentauthcredentials"
+msgid "Parent proxy authentication"
 msgstr "Authentifizierung für übergeordneten Proxyserver"
 
 #. Basic HTTP authentication supported. Provide username and password in username:password format.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:31
 #, fuzzy
-msgid "polipo_general_parentauthcredentials_desc"
+msgid "Basic HTTP authentication supported. Provide username and password in username:password format."
 msgstr ""
 "Grund-Authentifizierung mittels Benutzernamen und Passwort über HTTP im "
 "Format benutzername:passwort"
@@ -209,13 +209,13 @@ msgstr ""
 #. Parent proxy address
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:32
 #, fuzzy
-msgid "polipo_general_parentproxy"
+msgid "Parent proxy address"
 msgstr "Adresse des Übergeordneten Proxyservers"
 
 #. Parent proxy address (in host:port format), to which Polipo will forward the requests.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:33
 #, fuzzy
-msgid "polipo_general_parentproxy_desc"
+msgid "Parent proxy address (in host:port format), to which Polipo will forward the requests."
 msgstr ""
 "Adresse des Übergeordneten Proxyservers (in host:port Format), zu dem Polipo "
 "die Anfragen weiterleiten soll"
@@ -223,13 +223,13 @@ msgstr ""
 #. Listen address
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:34
 #, fuzzy
-msgid "polipo_general_proxyaddress"
+msgid "Listen address"
 msgstr "Aktivierte Adressen/ Schnittstellen"
 
 #. The interface on which Polipo will listen. To listen on all interfaces use 0.0.0.0 or :: (IPv6).
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:35
 #, fuzzy
-msgid "polipo_general_proxyaddress_desc"
+msgid "The interface on which Polipo will listen. To listen on all interfaces use 0.0.0.0 or :: (IPv6)."
 msgstr ""
 "Auf diesen Schnittstellen soll Polipo aktiviert sein. Um Polipo auf allen "
 "Schnittstellen zu aktivieren bitte 0.0.0.0 bzw. :: (IPv6) angeben"
@@ -237,42 +237,42 @@ msgstr ""
 #. Listen port
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:36
 #, fuzzy
-msgid "polipo_general_proxyport"
+msgid "Listen port"
 msgstr "Aktiver Port"
 
 #. Port on which Polipo will listen. (default value: 8123)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:37
 #, fuzzy
-msgid "polipo_general_proxyport_desc"
+msgid "Port on which Polipo will listen. (default value: 8123)"
 msgstr ""
 "Beschreibt, welcher Port von Polipo genutzt werden soll. Grundeinstellung: "
 "Port 8123"
 
 #. Poor Man&#39;s Multiplexing
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:38
-msgid "polipo_pmm"
+msgid "Poor Man's Multiplexing"
 msgstr "<abbr title=\"Poor Mans Multiplexing\">PMM</abbr>"
 
 #. Poor Man&#39;s Multiplexing (PMM) is a technique that simulates multiplexing by requesting an instance in multiple segments. It tries to lower the latency caused by the weakness of HTTP protocol. NOTE: some sites may not work with PMM enabled.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:39
-msgid "polipo_pmm_desc"
+msgid "Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by requesting an instance in multiple segments. It tries to lower the latency caused by the weakness of HTTP protocol. NOTE: some sites may not work with PMM enabled."
 msgstr ""
 
 #. First PMM segment size (in bytes)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:40
-msgid "polipo_pmm_pmmfirstsize"
+msgid "First PMM segment size (in bytes)"
 msgstr "Größe des ersten PMM - Segment in bytes"
 
 #. Size of the first PMM segment. If not defined, it defaults to twice the PMM segment size.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:41
-msgid "polipo_pmm_pmmfirstsize_desc"
+msgid "Size of the first PMM segment. If not defined, it defaults to twice the PMM segment size."
 msgstr ""
 "Größe des ersten Segments. Wenn diese Option leer ist, wird hierfür die "
 "Doppelte Größe des PMM-Segments angenommen"
 
 #. PMM segments size (in bytes)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:42
-msgid "polipo_pmm_pmmsize"
+msgid "PMM segments size (in bytes)"
 msgstr "Größe des normalen PMM - Segment in bytes"
 
 #. To enable PMM, PMM segment size must be set to some positive value.
diff --git a/po/de/qos.po b/po/de/qos.po
index 8bf1133dd..79145b522 100644
--- a/po/de/qos.po
+++ b/po/de/qos.po
@@ -15,89 +15,89 @@ msgstr ""
 
 #. Quality of Service
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:1
-msgid "qos"
+msgid "Quality of Service"
 msgstr "Quality of Service"
 
 #. With QoS you can priorize network traffic selected by adresses, ports or services.
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:2
-msgid "qos_desc"
+msgid "With QoS you can priorize network traffic selected by adresses, ports or services."
 msgstr ""
 "Mit Hilfe von QoS kann Netzwerkverkehr anhand von Adressen, Ports und "
 "verwendeten Protokollen priorisiert werden."
 
 #. Classification
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:3
-msgid "qos_interface_classgroup"
+msgid "Classification"
 msgstr "Klassifizierung"
 
 #. Calculate Overhead
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:4
-msgid "qos_interface_overhead"
+msgid "Calculate Overhead"
 msgstr "Overheadberechnung"
 
 #. Downlink
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:5
-msgid "qos_interface_download"
+msgid "Downlink"
 msgstr "Downlink"
 
 #. Uplink
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:6
-msgid "qos_interface_upload"
+msgid "Uplink"
 msgstr "Uplink"
 
 #. Prioritization
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:7
-msgid "qos_classify"
+msgid "Prioritization"
 msgstr "Priorisierung"
 
 #. Priority
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:8
-msgid "qos_classify_target"
+msgid "Priority"
 msgstr "Priorität"
 
 #. Source address
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:9
-msgid "qos_classify_srchost"
+msgid "Source address"
 msgstr "Quelladresse"
 
 #. source network / source host
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:10
-msgid "qos_classify_srchost_dest"
+msgid "source network / source host"
 msgstr "Quellnetz / Quellhost"
 
 #. Target address
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:11
-msgid "qos_classify_dsthost"
+msgid "Target address"
 msgstr "Zieladresse"
 
 #. target network / target host
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:12
-msgid "qos_classify_dsthost_dest"
+msgid "target network / target host"
 msgstr "Zielnetz / Zielhost"
 
 #. portrange
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:13
-msgid "qos_classify_portrange"
+msgid "portrange"
 msgstr "Portbereich"
 
 #. low
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:14
-msgid "qos_bulk"
+msgid "low"
 msgstr "niedrig"
 
 #. normal
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:15
-msgid "qos_normal"
+msgid "normal"
 msgstr "normal"
 
 #. express
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:16
-msgid "qos_express"
+msgid "express"
 msgstr "express"
 
 #. priority
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:17
-msgid "qos_priority"
+msgid "priority"
 msgstr "priorisiert"
 
 #. Bytes sent
@@ -105,5 +105,5 @@ msgstr "priorisiert"
 msgid "qos_connbytes"
 msgstr "Bytes gesendet"
 
-#~ msgid "qos_interface_halfduplex"
+#~ msgid "Half-Duplex"
 #~ msgstr "Halb-Duplex"
diff --git a/po/de/rrdtool.po b/po/de/rrdtool.po
index 390fd2e6c..ecb23da34 100644
--- a/po/de/rrdtool.po
+++ b/po/de/rrdtool.po
@@ -13,342 +13,342 @@ msgstr ""
 
 #. %H: Wireless - Signal Noise Ratio
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:1
-msgid "stat_dg_title_wireless__signal_noise"
+msgid "%H: Wireless - Signal Noise Ratio"
 msgstr "%H: Drahtlos - Signal-Noise-Verhältnis"
 
 #. dBm
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:2
-msgid "stat_dg_label_wireless__signal_noise"
+msgid "dBm"
 msgstr "dBm"
 
 #. Noise Level
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:3
-msgid "stat_ds_signal_noise"
+msgid "Noise Level"
 msgstr "Noise-Level"
 
 #. Signal Strength
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:4
-msgid "stat_ds_signal_power"
+msgid "Signal Strength"
 msgstr "Signalstärke"
 
 #. %H: Wireless - Signal Quality
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:5
-msgid "stat_dg_title_wireless__signal_quality"
+msgid "%H: Wireless - Signal Quality"
 msgstr "%H: Drahtlos - Signalqualität"
 
 #. n
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:6
-msgid "stat_dg_label_wireless__signal_quality"
+msgid "n"
 msgstr "n"
 
 #. Signal Quality
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:7
-msgid "stat_ds_signal_quality"
+msgid "Signal Quality"
 msgstr "Signalqualität"
 
 #. %H: ICMP Roundtrip Times
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:8
-msgid "stat_dg_title_ping"
+msgid "%H: ICMP Roundtrip Times"
 msgstr "%H: ICMP Antwortzeiten"
 
 #. ms
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:9
-msgid "stat_dg_label_ping"
+msgid "ms"
 msgstr "ms"
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:10
-msgid "stat_ds_ping"
+msgid "%di"
 msgstr "%di"
 
 #. %H: Firewall - Processed Packets
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:11
-msgid "stat_dg_title_iptables__ipt_packets"
+msgid "%H: Firewall - Processed Packets"
 msgstr "%H: Firewall - Verarbeitete Pakete"
 
 #. Packets/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:12
-msgid "stat_dg_label_iptables__ipt_packets"
+msgid "Packets/s"
 msgstr "Pakete/s"
 
 #. Chain \"%di\"
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:13
-msgid "stat_ds_ipt_packets"
+msgid "Chain \"%di\""
 msgstr "Kette \"%di\""
 
 #. %H: Netlink - Transfer on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:14
-msgid "stat_dg_title_netlink__if_octets"
+msgid "%H: Netlink - Transfer on %pi"
 msgstr "%H: Netlink - Transfer auf %pi"
 
 #. Bytes/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:15
-msgid "stat_dg_label_netlink__if_octets"
+msgid "Bytes/s"
 msgstr "Bytes/s"
 
 #. Bytes (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:16
-msgid "stat_ds_if_octets"
+msgid "Bytes (%ds)"
 msgstr "Bytes (%ds)"
 
 #. %H: Netlink - Packets on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:17
-msgid "stat_dg_title_netlink__if_packets"
+msgid "%H: Netlink - Packets on %pi"
 msgstr "%H: Netlink - Pakete auf %pi"
 
 #. Packets/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:18
-msgid "stat_dg_label_netlink__if_packets"
+msgid "Packets/s"
 msgstr "Pakete/s"
 
 #. Processed (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:19
-msgid "stat_ds_if_packets"
+msgid "Processed (%ds)"
 msgstr "Verarbeitet (%ds)"
 
 #. Dropped   (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:20
-msgid "stat_ds_if_dropped"
+msgid "Dropped (%ds)"
 msgstr "Verworfen   (%ds)"
 
 #. Errors    (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:21
-msgid "stat_ds_if_errors"
+msgid "Errors (%ds)"
 msgstr "Fehler      (%ds)"
 
 #. %H: Netlink - Multicast on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:22
-msgid "stat_dg_title_netlink__if_multicast"
+msgid "%H: Netlink - Multicast on %pi"
 msgstr "%H: Netlink - Multicast auf %pi"
 
 #. Packets/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:23
-msgid "stat_dg_label_netlink__if_multicast"
+msgid "Packets/s"
 msgstr "Pakete/s"
 
 #. Packets
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:24
-msgid "stat_ds_if_multicast"
+msgid "Packets"
 msgstr "Pakete"
 
 #. %H: Netlink - Collisions on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:25
-msgid "stat_dg_title_netlink__if_collisions"
+msgid "%H: Netlink - Collisions on %pi"
 msgstr "%H: Netlink - Kollisionen auf %pi"
 
 #. Collisions/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:26
-msgid "stat_dg_label_netlink__if_collisions"
+msgid "Collisions/s"
 msgstr "Kollisionen/s"
 
 #. Collisions
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:27
-msgid "stat_ds_if_collisions"
+msgid "Collisions"
 msgstr "Kollisionen"
 
 #. %H: Netlink - Errors on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:28
-msgid "stat_dg_title_netlink__if_tx_errors"
+msgid "%H: Netlink - Errors on %pi"
 msgstr "%H: Netlink - Fehler auf %pi"
 
 #. Errors/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:29
-msgid "stat_dg_label_netlink__if_tx_errors"
+msgid "Errors/s"
 msgstr "Fehler/s"
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:30
-msgid "stat_ds_if_tx_errors"
+msgid "%di"
 msgstr "%di"
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:31
-msgid "stat_ds_if_rx_errors"
+msgid "%di"
 msgstr "%di"
 
 #. %H: Processes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:32
-msgid "stat_dg_title_processes"
+msgid "%H: Processes"
 msgstr "%H: Prozesse"
 
 #. Processes/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:33
-msgid "stat_dg_label_processes"
+msgid "Processes/s"
 msgstr "Prozesse/s"
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:34
-msgid "stat_ds_ps_state"
+msgid "%di"
 msgstr "%di"
 
 #. %H: Process %pi - used cpu time
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:35
-msgid "stat_dg_title_processes__ps_cputime"
+msgid "%H: Process %pi - used cpu time"
 msgstr "%H: Prozess %pi - Verbrauchte CPU Zeit"
 
 #. Jiffies
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:36
-msgid "stat_dg_label_processes__ps_cputime"
+msgid "Jiffies"
 msgstr "Jiffies"
 
 #. system
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:37
-msgid "stat_ds_ps_cputime__syst"
+msgid "System"
 msgstr "System"
 
 #. user
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:38
-msgid "stat_ds_ps_cputime__user"
+msgid "user"
 msgstr "User"
 
 #. %H: Process %pi - threads and processes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:39
-msgid "stat_dg_title_processes__ps_count"
+msgid "%H: Process %pi - threads and processes"
 msgstr "%H: Prozess %pi - Threads und Prozesse"
 
 #. Count
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:40
-msgid "stat_dg_label_processes__ps_count"
+msgid "Count"
 msgstr "Anzahl"
 
 #. %ds
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:41
-msgid "stat_ds_ps_count"
+msgid "%ds"
 msgstr "%ds"
 
 #. %H: Process %pi - page faults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:42
-msgid "stat_dg_title_processes__ps_pagefaults"
+msgid "%H: Process %pi - page faults"
 msgstr "%H: Prozess %pi - Speicherzugriffsfehler"
 
 #. Pagefaults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:43
-msgid "stat_dg_label_processes__ps_pagefaults"
+msgid "Pagefaults"
 msgstr "Zugriffsfehler"
 
 #. page faults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:44
-msgid "stat_ds_ps_pagefaults"
+msgid "page faults"
 msgstr "Zugriffsfehler"
 
 #. %H: Process %pi - virtual memory size
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:45
-msgid "stat_dg_title_processes__ps_rss"
+msgid "%H: Process %pi - virtual memory size"
 msgstr "%H: Process %pi - Virtueller Speicher"
 
 #. Bytes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:46
-msgid "stat_dg_label_processes__ps_rss"
+msgid "Bytes"
 msgstr "Bytes"
 
 #. virtual memory
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:47
-msgid "stat_ds_ps_rss"
+msgid "virtual memory"
 msgstr "virtueller Speicher"
 
 #. %H: Usage on Processor #%pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:48
-msgid "stat_dg_title_cpu"
+msgid "%H: Usage on Processor #%pi"
 msgstr "%H: Auslastung auf Prozessor #%pi"
 
 #. %
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:49
-msgid "stat_dg_label_cpu"
+msgid "%"
 msgstr "%"
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:50
-msgid "stat_ds_cpu"
+msgid "%di"
 msgstr "%di"
 
 #. %H: Transfer on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:51
-msgid "stat_dg_title_interface__if_octets"
+msgid "%H: Transfer on %di"
 msgstr "%H: Transfer auf %di"
 
 #. Bytes/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:52
-msgid "stat_dg_label_interface__if_octets"
+msgid "Bytes/s"
 msgstr "Bytes/s"
 
 #. %H: Packets on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:53
-msgid "stat_dg_title_interface__if_packets"
+msgid "%H: Packets on %di"
 msgstr "%H: Pakete auf %di"
 
 #. Packets/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:54
-msgid "stat_dg_label_interface__if_packets"
+msgid "Packets/s"
 msgstr "Pakete/s"
 
 #. %H: TCP-Connections to Port %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:55
-msgid "stat_dg_title_tcpconns"
+msgid "%H: TCP-Connections to Port %pi"
 msgstr "%H: TCP-Verbindungen auf Port %pi"
 
 #. Connections/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:56
-msgid "stat_dg_label_tcpconns"
+msgid "Connections/s"
 msgstr "Verbindungen/s"
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:57
-msgid "stat_ds_tcp_connections"
+msgid "%di"
 msgstr "%di"
 
 #. %H: Disk Space Usage on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:58
-msgid "stat_dg_title_df"
+msgid "%H: Disk Space Usage on %di"
 msgstr "%H: Speicherverbrauch auf %di"
 
 #. Bytes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:59
-msgid "stat_dg_label_df"
+msgid "Bytes"
 msgstr "Bytes"
 
 #. %ds
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:60
-msgid "stat_ds_df__free"
+msgid "%ds"
 msgstr "verfügbar"
 
 #. %ds
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:61
-msgid "stat_ds_df__used"
+msgid "%ds"
 msgstr "belegt   "
 
 #. %H: Interrupts
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:62
-msgid "stat_dg_title_irq"
+msgid "%H: Interrupts"
 msgstr "%H: Interrupts"
 
 #. Issues/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:63
-msgid "stat_dg_label_irq"
+msgid "Issues/s"
 msgstr "Aufrufe/s"
 
 #. IRQ %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:64
-msgid "stat_ds_irq"
+msgid "IRQ %di"
 msgstr "IRQ %di"
 
 #. %H: System Load
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:65
-msgid "stat_dg_title_load"
+msgid "%H: System Load"
 msgstr "%H: Systemlast"
 
 #. Load
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:66
-msgid "stat_dg_label_load"
+msgid "Load"
 msgstr "Last"
 
 #. 1 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:67
-msgid "stat_ds_load__shortterm"
+msgid "1 min"
 msgstr "1 Minute"
 
 #. 5 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:68
-msgid "stat_ds_load__midterm"
+msgid "5 min"
 msgstr "5 Minuten"
 
 #. 15 min
diff --git a/po/de/samba.po b/po/de/samba.po
index e0f38a7fd..5a6487684 100644
--- a/po/de/samba.po
+++ b/po/de/samba.po
@@ -14,84 +14,84 @@ msgstr ""
 
 #. Network Shares
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:1
-msgid "samba"
+msgid "Network Shares"
 msgstr "Netzwerkfreigaben"
 
 #. Hostname
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:2
-msgid "samba_samba_name"
+msgid "Hostname"
 msgstr "Hostname"
 
 #. Description
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:3
-msgid "samba_samba_description"
+msgid "Description"
 msgstr "Beschreibung"
 
 #. Workgroup
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:4
-msgid "samba_samba_workgroup"
+msgid "Workgroup"
 msgstr "Arbeitsgruppe"
 
 #. Share home-directories
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:5
-msgid "samba_samba_homes"
+msgid "Share home-directories"
 msgstr "Heimatverzeichnisse freigeben"
 
 #. System users can reach their home directories via network shares.
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:6
-msgid "samba_samba_homes_desc"
+msgid "System users can reach their home directories via network shares."
 msgstr ""
 "Systembenutzer können ihre Heimatverzeichnis über Netzwerkfreigaben "
 "erreichen."
 
 #. Shared Directories
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:7
-msgid "samba_sambashare"
+msgid "Shared Directories"
 msgstr "Dateifreigaben"
 
 #. Shared Directory
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:8
-msgid "samba_sambashare_path"
+msgid "Shared Directory"
 msgstr "Freigabepfad"
 
 #. Physical Path
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:9
-msgid "samba_sambashare_path_desc"
+msgid "Physical Path"
 msgstr "Physischer Pfad"
 
 #. Allowed Users
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:10
-msgid "samba_sambashare_users"
+msgid "Allowed Users"
 msgstr "Erlaubte Benutzer"
 
 #. optional
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:11
-msgid "samba_sambashare_users_desc"
+msgid "optional"
 msgstr "optional"
 
 #. Read Only
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:12
-msgid "samba_sambashare_readonly"
+msgid "Read Only"
 msgstr "Nur Lesen"
 
 #. Allow Guests
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:13
-msgid "samba_sambashare_guestok"
+msgid "Allow Guests"
 msgstr "Gäste erlauben"
 
 #. Create Mask
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:14
-msgid "samba_sambashare_createmask"
+msgid "Create Mask"
 msgstr "Anlegemaske"
 
 #. Mask for new files
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:15
-msgid "samba_sambashare_createmask_desc"
+msgid "Mask for new files"
 msgstr "Maske für neue Dateien"
 
 #. Directory Mask
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:16
-msgid "samba_sambashare_dirmask"
+msgid "Directory Mask"
 msgstr "Verzeichnismaske"
 
 #. Mask for new directories
diff --git a/po/de/statistics.po b/po/de/statistics.po
index 13cd8f869..d51c45f4f 100644
--- a/po/de/statistics.po
+++ b/po/de/statistics.po
@@ -13,12 +13,12 @@ msgstr ""
 
 #. Statistics
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:1
-msgid "stat_statistics"
+msgid "Statistics"
 msgstr "Statistiken"
 
 #. The statistics package is based on <a href=\"http://collectd.org/index.shtml\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD Tool</a> to render diagram images from collected data.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:2
-msgid "stat_desc"
+msgid "The statistics package is based on <a href=\"http://collectd.org/index.shtml\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD Tool</a> to render diagram images from collected data."
 msgstr ""
 "Das Statistik-Paket basiert auf <a "
 "href=\"http://collectd.org/index.shtml\">Collectd</a> und nutzt <a "
@@ -27,142 +27,142 @@ msgstr ""
 
 #. System plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:3
-msgid "stat_systemplugins"
+msgid "System plugins"
 msgstr "Systemplugins"
 
 #. Network plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:4
-msgid "stat_networkplugins"
+msgid "Network plugins"
 msgstr "Netzwerkplugins"
 
 #. Output plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:5
-msgid "stat_outputplugins"
+msgid "Output plugins"
 msgstr "Ausgabeplugins"
 
 #. Display timespan
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:6
-msgid "stat_showtimespan"
+msgid "Display timespan »"
 msgstr "Zeitspanne zeigen »"
 
 #. Graphs
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:7
-msgid "stat_graphs"
+msgid "Graphs"
 msgstr "Diagramme"
 
 #. Collectd
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:8
-msgid "stat_collectd"
+msgid "Collectd"
 msgstr "Collectd"
 
 #. Processor
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:9
-msgid "stat_cpu"
+msgid "Processor"
 msgstr "Prozessor"
 
 #. Ping
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:10
-msgid "stat_ping"
+msgid "Ping"
 msgstr "Ping"
 
 #. Firewall
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:11
-msgid "stat_iptables"
+msgid "Firewall"
 msgstr "Firewall"
 
 #. Netlink
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:12
-msgid "stat_netlink"
+msgid "Netlink"
 msgstr "Netlink"
 
 #. Processes
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:13
-msgid "stat_processes"
+msgid "Processes"
 msgstr "Prozesse"
 
 #. Wireless
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:14
-msgid "stat_wireless"
+msgid "Wireless"
 msgstr "Drahtlos"
 
 #. TCP Connections
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:15
-msgid "stat_tcpconns"
+msgid "TCP Connections"
 msgstr "TCP-Verbindungen"
 
 #. Interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:16
-msgid "stat_interface"
+msgid "Interfaces"
 msgstr "Schnittstellen"
 
 #. Disk Space Usage
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:17
-msgid "stat_df"
+msgid "Disk Space Usage"
 msgstr "Plattenspeicher"
 
 #. Interrupts
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:18
-msgid "stat_irq"
+msgid "Interrupts"
 msgstr "Interrupts"
 
 #. Disk Usage
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:19
-msgid "stat_disk"
+msgid "Disk Usage"
 msgstr "Plattenauslastung"
 
 #. Exec
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:20
-msgid "stat_exec"
+msgid "Exec"
 msgstr "Exec"
 
 #. RRDTool
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:21
-msgid "stat_rrdtool"
+msgid "RRDTool"
 msgstr "RRDTool"
 
 #. Network
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:22
-msgid "stat_network"
+msgid "Network"
 msgstr "Netzwerk"
 
 #. CSV Output
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:23
-msgid "stat_csv"
+msgid "CSV Output"
 msgstr "CSV Ausgabe"
 
 #. System Load
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:24
-msgid "stat_load"
+msgid "System Load"
 msgstr "Systemlast"
 
 #. DNS
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:25
-msgid "stat_dns"
+msgid "DNS"
 msgstr "DNS"
 
 #. Email
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:26
-msgid "stat_email"
+msgid "Email"
 msgstr "Email"
 
 #. UnixSock
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:27
-msgid "stat_unixsock"
+msgid "UnixSock"
 msgstr "UnixSock"
 
 #. Statistics
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:28
-msgid "lucistatistics"
+msgid "Statistics"
 msgstr "Statistiken"
 
 #. Collectd Settings
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:29
-msgid "lucistatistics_collectd"
+msgid "Collectd Settings"
 msgstr "Collectd Einstellungen"
 
 #. Collectd is a small daeomon for collecting data from various sources through different plugins. On this page you can change general settings for the collectd daemon.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:30
-msgid "lucistatistics_collectd_desc"
+msgid "Collectd is a small daeomon for collecting data from various sources through different plugins. On this page you can change general settings for the collectd daemon."
 msgstr ""
 "Collectd ist ein schlankes Dienstprogramm zum Sammeln von Systemdaten aus "
 "verschiedenen Quellen mittels diverser Plugins. Auf dieser Seite können "
@@ -170,227 +170,227 @@ msgstr ""
 
 #. Hostname
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:31
-msgid "lucistatistics_collectd_hostname"
+msgid "Hostname"
 msgstr "Hostname"
 
 #. Base Directory
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:32
-msgid "lucistatistics_collectd_basedir"
+msgid "Base Directory"
 msgstr "Basisverzeichnis"
 
 #. Directory for sub-configurations
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:33
-msgid "lucistatistics_collectd_include"
+msgid "Directory for sub-configurations"
 msgstr "Verzeichnis für Unterkonfigurationen"
 
 #. Directory for collectd plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:34
-msgid "lucistatistics_collectd_plugindir"
+msgid "Directory for collectd plugins"
 msgstr "Verzeichnis für Collectd-Plugins"
 
 #. Used PID file
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:35
-msgid "lucistatistics_collectd_pidfile"
+msgid "Used PID file"
 msgstr "Pfad zu PID-Datei"
 
 #. Datasets definition file
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:36
-msgid "lucistatistics_collectd_typesdb"
+msgid "Datasets definition file"
 msgstr "Dataset-Definitionen"
 
 #. Data collection interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:37
-msgid "lucistatistics_collectd_interval"
+msgid "Data collection interval"
 msgstr "Daten-Sammelintervall"
 
 #. Seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:38
-msgid "lucistatistics_collectd_interval_desc"
+msgid "Seconds"
 msgstr "Sekunden"
 
 #. Number of threads for data collection
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:39
-msgid "lucistatistics_collectd_readthreads"
+msgid "Number of threads for data collection"
 msgstr "Anzahl paralleler Sammelprozesse"
 
 #. Try to lookup fully qualified hostname
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:40
-msgid "lucistatistics_collectd_fqdnlookup"
+msgid "Try to lookup fully qualified hostname"
 msgstr "automatisch vollen Hostnamen herausfinden"
 
 #. CPU Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:41
-msgid "lucistatistics_collectdcpu"
+msgid "CPU Plugin Configuration"
 msgstr "CPU Plugin Konfiguration"
 
 #. The cpu plugin collects basic statistics about the processor usage.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:42
-msgid "lucistatistics_collectdcpu_desc"
+msgid "The cpu plugin collects basic statistics about the processor usage."
 msgstr ""
 "Das CPU-Plugin sammelt grundlegende Statistiken über die "
 "Prozessorauslastung."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:43
-msgid "lucistatistics_collectdcpu_enable"
+msgid "Enable this plugin"
 msgstr "Plugin aktivieren"
 
 #. CSV Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:44
-msgid "lucistatistics_collectdcsv"
+msgid "CSV Plugin Configuration"
 msgstr "CSV Plugin Konfiguration"
 
 #. The csv plugin stores collected data in csv file format for further processing by external programs.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:45
-msgid "lucistatistics_collectdcsv_desc"
+msgid "The csv plugin stores collected data in csv file format for further processing by external programs."
 msgstr ""
 "Das CSV-Plugin speichert die gesammelten Daten im CSV-Format, geeignet für "
 "die Weiterverarbeitung durch externe Programme."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:46
-msgid "lucistatistics_collectdcsv_enable"
+msgid "Enable this plugin"
 msgstr "Plugin aktivieren"
 
 #. Storage directory for the csv files
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:47
-msgid "lucistatistics_collectdcsv_datadir"
+msgid "Storage directory for the csv files"
 msgstr "Speicherverzeichnis für die CSV-Dateien"
 
 #. Store data values as rates instead of absolute values
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:48
-msgid "lucistatistics_collectdcsv_storerates"
+msgid "Store data values as rates instead of absolute values"
 msgstr "Werte nicht absolut sondern als Raten speichern"
 
 #. DF Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:49
-msgid "lucistatistics_collectddf"
+msgid "DF Plugin Configuration"
 msgstr "DF Plugin Konfiguration"
 
 #. The df plugin collects statistics about the disk space usage on different devices, mount points or filesystem types.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:50
-msgid "lucistatistics_collectddf_desc"
+msgid "The df plugin collects statistics about the disk space usage on different devices, mount points or filesystem types."
 msgstr ""
 "Das DF-Plugin sammelt Statistiken über den Speicherverbrauch auf "
 "verschiedenen Geräten, Mount-Punkten oder Dateisystemtypen."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:51
-msgid "lucistatistics_collectddf_enable"
+msgid "Enable this plugin"
 msgstr "Plugin aktivieren"
 
 #. Monitor devices
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:52
-msgid "lucistatistics_collectddf_devices"
+msgid "Monitor devices"
 msgstr "Geräte überwachen"
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:53
-msgid "lucistatistics_collectddf_devices_desc"
+msgid "multiple separated by space"
 msgstr "mehrere mit Leerzeichen trennen"
 
 #. Monitor mount points
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:54
-msgid "lucistatistics_collectddf_mountpoints"
+msgid "Monitor mount points"
 msgstr "Mount-Punkte überwachen"
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:55
-msgid "lucistatistics_collectddf_mountpoints_desc"
+msgid "multiple separated by space"
 msgstr "mehrere mit Leerzeichen trennen"
 
 #. Monitor filesystem types
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:56
-msgid "lucistatistics_collectddf_fstypes"
+msgid "Monitor filesystem types"
 msgstr "Datesystemtypen überwachen"
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:57
-msgid "lucistatistics_collectddf_fstypes_desc"
+msgid "multiple separated by space"
 msgstr "mehrere mit Leerzeichen trennen"
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:58
-msgid "lucistatistics_collectddf_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr "Alle außer Ausgewählte überwachen"
 
 #. Disk Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:59
-msgid "lucistatistics_collectddisk"
+msgid "Disk Plugin Configuration"
 msgstr "Disk Plugin Konfiguration"
 
 #. The disk plugin collects detailled usage statistics for selected partitions or whole disks.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:60
-msgid "lucistatistics_collectddisk_desc"
+msgid "The disk plugin collects detailled usage statistics for selected partitions or whole disks."
 msgstr ""
 "Das Disk-Plugin sammelt detaillierte Statistiken über die Auslastung auf "
 "ausgewählten Festplatten und Partitionen."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:61
-msgid "lucistatistics_collectddisk_enable"
+msgid "Enable this plugin"
 msgstr "Plugin aktivieren"
 
 #. Monitor disks and partitions
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:62
-msgid "lucistatistics_collectddisk_disks"
+msgid "Monitor disks and partitions"
 msgstr "Geräte und Partitionen überwachen"
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:63
-msgid "lucistatistics_collectddisk_disks_desc"
+msgid "multiple separated by space"
 msgstr "mehrere mit Leerzeichen trennen"
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:64
-msgid "lucistatistics_collectddisk_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr "Alle außer Ausgewählte überwachen"
 
 #. DNS Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:65
-msgid "lucistatistics_collectddns"
+msgid "DNS Plugin Configuration"
 msgstr "DNS Plugin Konfiguration"
 
 #. The dns plugin collects detailled statistics about dns related traffic on selected interfaces.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:66
-msgid "lucistatistics_collectddns_desc"
+msgid "The dns plugin collects detailled statistics about dns related traffic on selected interfaces."
 msgstr ""
 "Das DNS-Plugin sammelt detaillierte Statistiken über DNS-bezogenen Verkehr "
 "auf ausgewählten Schnittstellen."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:67
-msgid "lucistatistics_collectddns_enable"
+msgid "Enable this plugin"
 msgstr "Plugin aktivieren"
 
 #. Monitor interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:68
-msgid "lucistatistics_collectddns_interfaces"
+msgid "Monitor interfaces"
 msgstr "Schnittstellen überwachen"
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:69
-msgid "lucistatistics_collectddns_interfaces_desc"
+msgid "multiple separated by space"
 msgstr "mehrere mit Leerzeichen trennen"
 
 #. Ignore source addresses
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:70
-msgid "lucistatistics_collectddns_ignoresources"
+msgid "Ignore source addresses"
 msgstr "Quelladressen ignorieren"
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:71
-msgid "lucistatistics_collectddns_ignoresources_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr "mehrere mit Leerzeichen trennen"
 
 #. E-Mail Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:72
-msgid "lucistatistics_collectdemail"
+msgid "E-Mail Plugin Configuration"
 msgstr "E-Mail Plugin Konfiguration"
 
 #. The email plugin creates a unix socket which can be used to transmit email-statistics to a running collectd daemon. This plugin is primarily intended to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can be used in other ways as well.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:73
-msgid "lucistatistics_collectdemail_desc"
+msgid "The email plugin creates a unix socket which can be used to transmit email-statistics to a running collectd daemon. This plugin is primarily intended to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can be used in other ways as well."
 msgstr ""
 "Das E-Mail Plugin erstellt einen Unix-Socket welcher benutzt werden kann um "
 "E-Mail-Statistiken an den laufenden Collectd-Daemon zu übermitteln. Dieses "
@@ -400,64 +400,64 @@ msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:74
-msgid "lucistatistics_collectdemail_enable"
+msgid "Enable this plugin"
 msgstr "Plugin aktivieren"
 
 #. Filepath of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:75
-msgid "lucistatistics_collectdemail_socketfile"
+msgid "Filepath of the unix socket"
 msgstr "Dateipfad des Unix-Sockets"
 
 #. Group ownership of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:76
-msgid "lucistatistics_collectdemail_socketgroup"
+msgid "Group ownership of the unix socket"
 msgstr "Gruppenbesitzer festlegen"
 
 #. group name
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:77
-msgid "lucistatistics_collectdemail_socketgroup_desc"
+msgid "group name"
 msgstr "Gruppenname"
 
 #. File permissions of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:78
-msgid "lucistatistics_collectdemail_socketperms"
+msgid "File permissions of the unix socket"
 msgstr "Dateiberechtigungen des Unix-Sockets"
 
 #. octal
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:79
-msgid "lucistatistics_collectdemail_socketperms_desc"
+msgid "octal"
 msgstr "oktal"
 
 #. Maximum allowed connections
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:80
-msgid "lucistatistics_collectdemail_maxconns"
+msgid "Maximum allowed connections"
 msgstr "Maximale Anzahl erlaubter Verbindungen"
 
 #. Exec Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:81
-msgid "lucistatistics_collectdexec"
+msgid "Exec Plugin Configuration"
 msgstr "Exec Plugin Konfiguration"
 
 #. The exec plugin starts external commands to read values from or to notify external processes when certain threshold values have been reached.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:82
-msgid "lucistatistics_collectdexec_desc"
+msgid "The exec plugin starts external commands to read values from or to notify external processes when certain threshold values have been reached."
 msgstr ""
 "Das Exec-Plugin startet externe Kommandos um Werte einzulesen oder um "
 "Benachrichtigungen auszulösen falls bestimmte Grenzwerte erreicht werden."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:83
-msgid "lucistatistics_collectdexec_enable"
+msgid "Enable this plugin"
 msgstr "Plugin aktivieren"
 
 #. Add command for reading values
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:84
-msgid "lucistatistics_collectdexecinput"
+msgid "Add command for reading values"
 msgstr "Kommando zum Werte einlesen hinzufügen"
 
 #. Here you can define external commands which will be started by collectd in order to read certain values. The values will be read from stdout.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:85
-msgid "lucistatistics_collectdexecinput_desc"
+msgid "Here you can define external commands which will be started by collectd in order to read certain values. The values will be read from stdout."
 msgstr ""
 "Hier können externe Kommandos definiert werden, welche durch Collectd "
 "gestartet werden um Statistik-Werte einzulesen. Die Werte werden dabei vom "
@@ -465,27 +465,27 @@ msgstr ""
 
 #. Commandline
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:86
-msgid "lucistatistics_collectdexecinput_cmdline"
+msgid "Commandline"
 msgstr "Kommandozeile"
 
 #. Run as user
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:87
-msgid "lucistatistics_collectdexecinput_cmduser"
+msgid "Run as user"
 msgstr "Als Benutzer ausführen"
 
 #. Run as group
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:88
-msgid "lucistatistics_collectdexecinput_cmdgroup"
+msgid "Run as group"
 msgstr "Als Gruppe ausführen"
 
 #. Add notification command
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:89
-msgid "lucistatistics_collectdexecnotify"
+msgid "Add notification command"
 msgstr "Benachrichtigungskommando hinzufügen"
 
 #. Here you can define external commands which will be started by collectd when certain threshold values have been reached. The values leading to invokation will be feeded to the the called programs stdin.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:90
-msgid "lucistatistics_collectdexecnotify_desc"
+msgid "Here you can define external commands which will be started by collectd when certain threshold values have been reached. The values leading to invokation will be feeded to the the called programs stdin."
 msgstr ""
 "Hier können externe Kommandos definiert werden, welche durch Collectd "
 "gestartet werden sobald konfigurierte Grenzwerte erreicht werden. Die Werte "
@@ -494,168 +494,168 @@ msgstr ""
 
 #. Commandline
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:91
-msgid "lucistatistics_collectdexecnotify_cmdline"
+msgid "Commandline"
 msgstr "Kommandozeile"
 
 #. Run as user
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:92
-msgid "lucistatistics_collectdexecnotify_cmduser"
+msgid "Run as user"
 msgstr "Als Benutzer ausführen"
 
 #. Run as group
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:93
-msgid "lucistatistics_collectdexecnotify_cmdgroup"
+msgid "Run as group"
 msgstr "Als Gruppe ausführen"
 
 #. Interface Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:94
-msgid "lucistatistics_collectdinterface"
+msgid "Interface Plugin Configuration"
 msgstr "Interface Plugin Konfiguration"
 
 #. The interface plugin collects traffic statistics on selected interfaces.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:95
-msgid "lucistatistics_collectdinterface_desc"
+msgid "The interface plugin collects traffic statistics on selected interfaces."
 msgstr ""
 "Das Interface-Plugin sammelt allgemeine Verkehrsstatistiken auf ausgewählten "
 "Schnittstellen."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:96
-msgid "lucistatistics_collectdinterface_enable"
+msgid "Enable this plugin"
 msgstr "Plugin aktivieren"
 
 #. Monitor interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:97
-msgid "lucistatistics_collectdinterface_interfaces"
+msgid "Monitor interfaces"
 msgstr "Schnittstellen überwachen"
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:98
-msgid "lucistatistics_collectdinterface_interfaces_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr "Strg gedrückt halten um mehrere Schnittstellen zu wählen"
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:99
-msgid "lucistatistics_collectdinterface_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr "Alle außer Ausgewählte überwachen"
 
 #. Iptables Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:100
-msgid "lucistatistics_collectdiptables"
+msgid "Iptables Plugin Configuration"
 msgstr "Iptables Plugin Konfiguration"
 
 #. The iptables plugin will monitor selected firewall rules and collect informations about processed bytes and packets per rule.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:101
-msgid "lucistatistics_collectdiptables_desc"
+msgid "The iptables plugin will monitor selected firewall rules and collect informations about processed bytes and packets per rule."
 msgstr ""
 "Das Iptables-Plugin überwacht ausgewählte Firewall-Regeln und sammelt Werte "
 "über die Anzahl der verarbeiteten Pakete und Bytes."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:102
-msgid "lucistatistics_collectdiptables_enable"
+msgid "Enable this plugin"
 msgstr "Plugin aktivieren"
 
 #. Add matching rule
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:103
-msgid "lucistatistics_collectdiptablesmatch"
+msgid "Add matching rule"
 msgstr "Auswahlregel hinzufügen"
 
 #. Here you can define various criteria by which the monitored iptables rules are selected.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:104
-msgid "lucistatistics_collectdiptablesmatch_desc"
+msgid "Here you can define various criteria by which the monitored iptables rules are selected."
 msgstr ""
 "Hier werden die Kriterien festgelegt nach welchen die zu überwachenden "
 "Firewall-Regeln ausgewählt werden."
 
 #. Name of the rule
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:105
-msgid "lucistatistics_collectdiptablesmatch_name"
+msgid "Name of the rule"
 msgstr "Name der Regel"
 
 #. max. 16 chars
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:106
-msgid "lucistatistics_collectdiptablesmatch_name_desc"
+msgid "max. 16 chars"
 msgstr "max. 16 Buchstaben"
 
 #. Table
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:107
-msgid "lucistatistics_collectdiptablesmatch_table"
+msgid "Table"
 msgstr "Tabelle"
 
 #. Chain
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:108
-msgid "lucistatistics_collectdiptablesmatch_chain"
+msgid "Chain"
 msgstr "Kette (Chain)"
 
 #. Action (target)
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:109
-msgid "lucistatistics_collectdiptablesmatch_target"
+msgid "Action (target)"
 msgstr "Aktion (Target)"
 
 #. Network protocol
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:110
-msgid "lucistatistics_collectdiptablesmatch_protocol"
+msgid "Network protocol"
 msgstr "Netzwerkprotokoll"
 
 #. Source ip range
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:111
-msgid "lucistatistics_collectdiptablesmatch_source"
+msgid "Source ip range"
 msgstr "Quell-IP-Bereich"
 
 #. CIDR notation
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:112
-msgid "lucistatistics_collectdiptablesmatch_source_desc"
+msgid "CIDR notation"
 msgstr "CIDR-Notation"
 
 #. Destination ip range
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:113
-msgid "lucistatistics_collectdiptablesmatch_destination"
+msgid "Destination ip range"
 msgstr "Ziel-IP-Bereich"
 
 #. CIDR notation
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:114
-msgid "lucistatistics_collectdiptablesmatch_destination_desc"
+msgid "CIDR notation"
 msgstr "CIDR-Notation"
 
 #. Incoming interface
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:115
-msgid "lucistatistics_collectdiptablesmatch_inputif"
+msgid "Incoming interface"
 msgstr "eingehende Schnittstelle"
 
 #. e.g. br-lan
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:116
-msgid "lucistatistics_collectdiptablesmatch_inputif_desc"
+msgid "e.g. br-lan"
 msgstr "z.B. br-lan"
 
 #. Outgoing interface
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:117
-msgid "lucistatistics_collectdiptablesmatch_outputif"
+msgid "Outgoing interface"
 msgstr "ausgehende Schnittstelle"
 
 #. e.g. br-ff
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:118
-msgid "lucistatistics_collectdiptablesmatch_outputif_desc"
+msgid "e.g. br-ff"
 msgstr "z.B. br-ff"
 
 #. Options
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:119
-msgid "lucistatistics_collectdiptablesmatch_options"
+msgid "Options"
 msgstr "Optionen"
 
 #. e.g. reject-with tcp-reset
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:120
-msgid "lucistatistics_collectdiptablesmatch_options_desc"
+msgid "e.g. reject-with tcp-reset"
 msgstr "z.B. reject-with tcp-reset"
 
 #. IRQ Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:121
-msgid "lucistatistics_collectdirq"
+msgid "IRQ Plugin Configuration"
 msgstr "IRQ Plugin Konfiguration"
 
 #. The irq plugin will monitor the rate of issues per second for each selected interrupt. If no interrupt is selected then all interrupts are monitored.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:122
-msgid "lucistatistics_collectdirq_desc"
+msgid "The irq plugin will monitor the rate of issues per second for each selected interrupt. If no interrupt is selected then all interrupts are monitored."
 msgstr ""
 "Das IRQ-Plugin überwacht die Anzahl der Aufrufe pro Sekunde für jeden "
 "ausgewählten Interrupt. Wird kein Interrupt ausgewählt überwacht das Plugin "
@@ -663,119 +663,119 @@ msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:123
-msgid "lucistatistics_collectdirq_enable"
+msgid "Enable this plugin"
 msgstr "Plugin aktivieren"
 
 #. Monitor interrupts
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:124
-msgid "lucistatistics_collectdirq_irqs"
+msgid "Monitor interrupts"
 msgstr "Interrups überwachen"
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:125
-msgid "lucistatistics_collectdirq_irqs_desc"
+msgid "multiple separated by space"
 msgstr "mehrere mit Leerzeichen trennen"
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:126
-msgid "lucistatistics_collectdirq_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr "Alle außer Ausgewählte überwachen"
 
 #. Load Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:127
-msgid "lucistatistics_collectdload"
+msgid "Load Plugin Configuration"
 msgstr "Load Plugin Konfiguration"
 
 #. The load plugin collects statistics about the general system load.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:128
-msgid "lucistatistics_collectdload_desc"
+msgid "The load plugin collects statistics about the general system load."
 msgstr "Das Load-Plugin sammelt Informationen über die allgemeine Systemlast."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:129
-msgid "lucistatistics_collectdload_enable"
+msgid "Enable this plugin"
 msgstr "Plugin aktivieren"
 
 #. Netlink Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:130
-msgid "lucistatistics_collectdnetlink"
+msgid "Netlink Plugin Configuration"
 msgstr "Netlink Plugin Konfiguration"
 
 #. The netlink plugin collects extended informations like qdisc-, class- and filter-statistics for selected interfaces.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:131
-msgid "lucistatistics_collectdnetlink_desc"
+msgid "The netlink plugin collects extended informations like qdisc-, class- and filter-statistics for selected interfaces."
 msgstr ""
 "Das Netlink-Plugin sammelt erweiterte QoS-Informationen wie QDisc-, Class- "
 "und Filter-Statistiken auf ausgewählten Schnittstellen."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:132
-msgid "lucistatistics_collectdnetlink_enable"
+msgid "Enable this plugin"
 msgstr "Plugin aktivieren"
 
 #. Basic monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:133
-msgid "lucistatistics_collectdnetlink_interfaces"
+msgid "Basic monitoring"
 msgstr "Schnittstellen einfach überwachen"
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:134
-msgid "lucistatistics_collectdnetlink_interfaces_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr "Strg gedrückt halten um mehrere zu wählen"
 
 #. Verbose monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:135
-msgid "lucistatistics_collectdnetlink_verboseinterfaces"
+msgid "Verbose monitoring"
 msgstr "Schnittstellen detailliert überwachen"
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:136
-msgid "lucistatistics_collectdnetlink_verboseinterfaces_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr "Strg gedrückt halten um mehrere zu wählen"
 
 #. Qdisc monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:137
-msgid "lucistatistics_collectdnetlink_qdiscs"
+msgid "Qdisc monitoring"
 msgstr "Queue Discipline überwachen"
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:138
-msgid "lucistatistics_collectdnetlink_qdiscs_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr "Strg gedrückt halten um mehrere zu wählen"
 
 #. Shaping class monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:139
-msgid "lucistatistics_collectdnetlink_classes"
+msgid "Shaping class monitoring"
 msgstr "Shapingklassen überwachen"
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:140
-msgid "lucistatistics_collectdnetlink_classes_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr "Strg gedrückt halten um mehrere zu wählen"
 
 #. Filter class monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:141
-msgid "lucistatistics_collectdnetlink_filters"
+msgid "Filter class monitoring"
 msgstr "Filterklassen überwachen"
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:142
-msgid "lucistatistics_collectdnetlink_filters_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr "Strg gedrückt halten um mehrere zu wählen"
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:143
-msgid "lucistatistics_collectdnetlink_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr "Alle außer Ausgewählte überwachen"
 
 #. Network Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:144
-msgid "lucistatistics_collectdnetwork"
+msgid "Network Plugin Configuration"
 msgstr "Network Plugin Konfiguration"
 
 #. The network plugin provides network based communication between different collectd instances. Collectd can operate both in client and server mode. In client mode locally collected date is transferred to a collectd server instance, in server mode the local instance receives data from other hosts.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:145
-msgid "lucistatistics_collectdnetwork_desc"
+msgid "The network plugin provides network based communication between different collectd instances. Collectd can operate both in client and server mode. In client mode locally collected date is transferred to a collectd server instance, in server mode the local instance receives data from other hosts."
 msgstr ""
 "Das Network-Plugin ermöglicht die netzwerkgestützte Kommunikation zwischen "
 "verschiedenen Collectd-Instanzen. Collectd kann gleichzeitig im Server- und "
@@ -785,170 +785,170 @@ msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:146
-msgid "lucistatistics_collectdnetwork_enable"
+msgid "Enable this plugin"
 msgstr "Plugin aktivieren"
 
 #. Listener interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:147
-msgid "lucistatistics_collectdnetworklisten"
+msgid "Listener interfaces"
 msgstr "Listen-Schnittstelle"
 
 #. This section defines on which interfaces collectd will wait for incoming connections.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:148
-msgid "lucistatistics_collectdnetworklisten_desc"
+msgid "This section defines on which interfaces collectd will wait for incoming connections."
 msgstr ""
 "Diese Sektion legt fest auf welchen Schnittstellen Collectd auf eingehende "
 "Verbindungen wartet."
 
 #. Listen host
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:149
-msgid "lucistatistics_collectdnetworklisten_host"
+msgid "Listen host"
 msgstr "Listen-Host"
 
 #. host-, ip- or ip6 address
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:150
-msgid "lucistatistics_collectdnetworklisten_host_desc"
+msgid "host-, ip- or ip6 address"
 msgstr "Host-, IP- oder IPv6-Adresse"
 
 #. Listen port
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:151
-msgid "lucistatistics_collectdnetworklisten_port"
+msgid "Listen port"
 msgstr "Listen-Port"
 
 #. 0 - 65535
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:152
-msgid "lucistatistics_collectdnetworklisten_port_desc"
+msgid "0 - 65535"
 msgstr "0 - 65535"
 
 #. server interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:153
-msgid "lucistatistics_collectdnetworkserver"
+msgid "server interfaces"
 msgstr "Server-Schnittstellen"
 
 #. This section defines to which servers the locally collected data is sent to.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:154
-msgid "lucistatistics_collectdnetworkserver_desc"
+msgid "This section defines to which servers the locally collected data is sent to."
 msgstr ""
 "Diese Sektion legt fest zu welchen Collectd-Servern die lokal gesammelten "
 "Daten gesendet werden."
 
 #. Server host
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:155
-msgid "lucistatistics_collectdnetworkserver_host"
+msgid "Server host"
 msgstr "Server-Host"
 
 #. host-, ip- or ip6 address
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:156
-msgid "lucistatistics_collectdnetworkserver_host_desc"
+msgid "host-, ip- or ip6 address"
 msgstr "Host-, IP- oder IPv6-Adresse"
 
 #. Server port
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:157
-msgid "lucistatistics_collectdnetworkserver_port"
+msgid "Server port"
 msgstr "Server-Port"
 
 #. 0 - 65535
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:158
-msgid "lucistatistics_collectdnetworkserver_port_desc"
+msgid "0 - 65535"
 msgstr "0 - 65535"
 
 #. TTL for network packets
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:159
-msgid "lucistatistics_collectdnetwork_timetolive"
+msgid "TTL for network packets"
 msgstr "TTL für Netzwerkpakete"
 
 #. 0 - 255
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:160
-msgid "lucistatistics_collectdnetwork_timetolive_desc"
+msgid "0 - 255"
 msgstr "0 - 255"
 
 #. Forwarding between listen and server addresses
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:161
-msgid "lucistatistics_collectdnetwork_forward"
+msgid "Forwarding between listen and server addresses"
 msgstr "Weiterleitung zwischen Listen- und Server-Adressen"
 
 #. Cache flush interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:162
-msgid "lucistatistics_collectdnetwork_cacheflush"
+msgid "Cache flush interval"
 msgstr "Cache-Leerungsintervall"
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:163
-msgid "lucistatistics_collectdnetwork_cacheflush_desc"
+msgid "seconds"
 msgstr "Sekunden"
 
 #. Ping Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:164
-msgid "lucistatistics_collectdping"
+msgid "Ping Plugin Configuration"
 msgstr "Ping Plugin Konfiguration"
 
 #. The ping plugin will send icmp echo replies to selected hosts and measure the roundtrip time for each host.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:165
-msgid "lucistatistics_collectdping_desc"
+msgid "The ping plugin will send icmp echo replies to selected hosts and measure the roundtrip time for each host."
 msgstr ""
 "Das Ping-Plugin sendet ICMP-Echo-Requests an ausgewählte Hosts und misst die "
 "Antwortzeiten für jede Adresse."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:166
-msgid "lucistatistics_collectdping_enable"
+msgid "Enable this plugin"
 msgstr "Plugin aktivieren"
 
 #. Monitor hosts
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:167
-msgid "lucistatistics_collectdping_hosts"
+msgid "Monitor hosts"
 msgstr "Hosts überwachen"
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:168
-msgid "lucistatistics_collectdping_hosts_desc"
+msgid "multiple separated by space"
 msgstr "mehrere mit Leerzeichen trennen"
 
 #. TTL for ping packets
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:169
-msgid "lucistatistics_collectdping_ttl"
+msgid "TTL for ping packets"
 msgstr "TTL für Ping Pakete"
 
 #. 0 - 255
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:170
-msgid "lucistatistics_collectdping_ttl_desc"
+msgid "0 - 255"
 msgstr "0 - 255"
 
 #. Processes Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:171
-msgid "lucistatistics_collectdprocesses"
+msgid "Processes Plugin Configuration"
 msgstr "Prozess Plugin Konfiguration"
 
 #. The processes plugin collects informations like cpu time, page faults and memory usage of selected processes.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:172
-msgid "lucistatistics_collectdprocesses_desc"
+msgid "The processes plugin collects informations like cpu time, page faults and memory usage of selected processes."
 msgstr ""
 "Das Prozess-Plugin sammelt Statistiken über Prozess-Zeit, Speicher-Fehler "
 "und Speicher-Verbrauch ausgewählter Prozesse"
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:173
-msgid "lucistatistics_collectdprocesses_enable"
+msgid "Enable this plugin"
 msgstr "Plugin aktivieren"
 
 #. Monitor processes
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:174
-msgid "lucistatistics_collectdprocesses_processes"
+msgid "Monitor processes"
 msgstr "Überwachte Prozesse"
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:175
-msgid "lucistatistics_collectdprocesses_processes_desc"
+msgid "multiple separated by space"
 msgstr "mehrere mit Leerzeichen trennen"
 
 #. RRDTool Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:176
-msgid "lucistatistics_collectdrrdtool"
+msgid "RRDTool Plugin Configuration"
 msgstr "RRDTool Plugin Konfiguration"
 
 #. The rrdtool plugin stores the collected data in rrd database files, the foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong values will result in a very high memory consumption in the temporary directory. This can render the device unusable!</strong>
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:177
-msgid "lucistatistics_collectdrrdtool_desc"
+msgid "The rrdtool plugin stores the collected data in rrd database files, the foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong values will result in a very high memory consumption in the temporary directory. This can render the device unusable!</strong>"
 msgstr ""
 "Das RRDTool-Plugin speichert die gesammelten Daten in sogenannten RRD-"
 "Datenbanken, der Grundlage für die Diagramm-Bilder.<br /><br "
@@ -958,176 +958,176 @@ msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:178
-msgid "lucistatistics_collectdrrdtool_enable"
+msgid "Enable this plugin"
 msgstr "Plugin aktivieren"
 
 #. Storage directory
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:179
-msgid "lucistatistics_collectdrrdtool_datadir"
+msgid "Storage directory"
 msgstr "Speicherverzeichnis"
 
 #. RRD step interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:180
-msgid "lucistatistics_collectdrrdtool_stepsize"
+msgid "RRD step interval"
 msgstr "RRD Schrittintervall"
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:181
-msgid "lucistatistics_collectdrrdtool_stepsize_desc"
+msgid "seconds"
 msgstr "Sekunden"
 
 #. RRD heart beat interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:182
-msgid "lucistatistics_collectdrrdtool_heartbeat"
+msgid "RRD heart beat interval"
 msgstr "RRD Heartbeatintervall"
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:183
-msgid "lucistatistics_collectdrrdtool_heartbeat_desc"
+msgid "seconds"
 msgstr "Sekunden"
 
 #. Only create average RRAs
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:184
-msgid "lucistatistics_collectdrrdtool_rrasingle"
+msgid "Only create average RRAs"
 msgstr "Nur &#39;average&#39; RRAs erzeugen"
 
 #. reduces rrd size
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:185
-msgid "lucistatistics_collectdrrdtool_rrasingle_desc"
+msgid "reduces rrd size"
 msgstr "reduziert die RRD Größe"
 
 #. Stored timespans
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:186
-msgid "lucistatistics_collectdrrdtool_rratimespans"
+msgid "Stored timespans"
 msgstr "gespeicherte Zeitspannen"
 
 #. seconds; multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:187
-msgid "lucistatistics_collectdrrdtool_rratimespans_desc"
+msgid "seconds; multiple separated by space"
 msgstr "mehrere mit Leerzeichen trennen"
 
 #. Rows per RRA
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:188
-msgid "lucistatistics_collectdrrdtool_rrarows"
+msgid "Rows per RRA"
 msgstr "Spalten pro RRA"
 
 #. RRD XFiles Factor
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:189
-msgid "lucistatistics_collectdrrdtool_xff"
+msgid "RRD XFiles Factor"
 msgstr "RRD XFiles Faktor"
 
 #. Cache collected data for
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:190
-msgid "lucistatistics_collectdrrdtool_cachetimeout"
+msgid "Cache collected data for"
 msgstr "Zwischenspeicherzeit für gesammelte Daten"
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:191
-msgid "lucistatistics_collectdrrdtool_cachetimeout_desc"
+msgid "seconds"
 msgstr "Sekunden"
 
 #. Flush cache after
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:192
-msgid "lucistatistics_collectdrrdtool_cacheflush"
+msgid "Flush cache after"
 msgstr "Leerungsintervall für Zwischenspeicher"
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:193
-msgid "lucistatistics_collectdrrdtool_cacheflush_desc"
+msgid "seconds"
 msgstr "Sekunden"
 
 #. TCPConns Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:194
-msgid "lucistatistics_collectdtcpconns"
+msgid "TCPConns Plugin Configuration"
 msgstr "TCPConns Plugin Konfiguration"
 
 #. The tcpconns plugin collects informations about open tcp connections on selected ports.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:195
-msgid "lucistatistics_collectdtcpconns_desc"
+msgid "The tcpconns plugin collects informations about open tcp connections on selected ports."
 msgstr ""
 "Das TCPConns-Plugin sammelt Informationen über offene TCP-Verbindungen auf "
 "ausgewählten Ports."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:196
-msgid "lucistatistics_collectdtcpconns_enable"
+msgid "Enable this plugin"
 msgstr "Plugin aktivieren"
 
 #. Monitor all local listen ports
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:197
-msgid "lucistatistics_collectdtcpconns_listeningports"
+msgid "Monitor all local listen ports"
 msgstr "Alle durch lokale Dienste genutzten Ports überwachen"
 
 #. Monitor local ports
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:198
-msgid "lucistatistics_collectdtcpconns_localports"
+msgid "Monitor local ports"
 msgstr "lokale Ports überwachen"
 
 #. 0 - 65535; multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:199
-msgid "lucistatistics_collectdtcpconns_localports_desc"
+msgid "0 - 65535; multiple separated by space"
 msgstr "0 - 65535; mehrere mit Leerzeichen trennen"
 
 #. Monitor remote ports
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:200
-msgid "lucistatistics_collectdtcpconns_remoteports"
+msgid "Monitor remote ports"
 msgstr "entfernte Ports überwachen"
 
 #. 0 - 65535; multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:201
-msgid "lucistatistics_collectdtcpconns_remoteports_desc"
+msgid "0 - 65535; multiple separated by space"
 msgstr "0 - 65535; mehrere mit Leerzeichen trennen"
 
 #. Unixsock Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:202
-msgid "lucistatistics_collectdunixsock"
+msgid "Unixsock Plugin Configuration"
 msgstr "Unixsock Plugin Konfiguration"
 
 #. The unixsock plugin creates a unix socket which can be used to read collected data from a running collectd instance.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:203
-msgid "lucistatistics_collectdunixsock_desc"
+msgid "The unixsock plugin creates a unix socket which can be used to read collected data from a running collectd instance."
 msgstr ""
 "Das Unixsock-Plugin erstellt einen Unix-Socket über welchen gesammelte Werte "
 "aus der laufenden Collectd-Instanz ausgelesen werden können."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:204
-msgid "lucistatistics_collectdunixsock_enable"
+msgid "Enable this plugin"
 msgstr "Plugin aktivieren"
 
 #. Filepath of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:205
-msgid "lucistatistics_collectdunixsock_socketfile"
+msgid "Filepath of the unix socket"
 msgstr "Dateipfad des Unix-Sockets"
 
 #. Group ownership of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:206
-msgid "lucistatistics_collectdunixsock_socketgroup"
+msgid "Group ownership of the unix socket"
 msgstr "Gruppenbesitzer festlegen"
 
 #. group name
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:207
-msgid "lucistatistics_collectdunixsock_socketgroup_desc"
+msgid "group name"
 msgstr "Gruppenname"
 
 #. File permissions of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:208
-msgid "lucistatistics_collectdunixsock_socketperms"
+msgid "File permissions of the unix socket"
 msgstr "Dateiberechtigungen des Unix-Sockets"
 
 #. octal
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:209
-msgid "lucistatistics_collectdunixsock_socketperms_desc"
+msgid "octal"
 msgstr "oktal"
 
 #. Wireless Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:210
-msgid "lucistatistics_collectdwireless"
+msgid "Wireless Plugin Configuration"
 msgstr "Wireless Plugin Konfiguration"
 
 #. The wireless plugin collects statistics about wireless signal strength, noise and quality.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:211
-msgid "lucistatistics_collectdwireless_desc"
+msgid "The wireless plugin collects statistics about wireless signal strength, noise and quality."
 msgstr ""
 "Das Wireless-Plugin sammelt Statistiken über die drahtlose Signalstärke, den "
 "Störpegel und die Signalqualität."
diff --git a/po/de/sysauth.po b/po/de/sysauth.po
index 8f6bff68c..99a7fddf7 100644
--- a/po/de/sysauth.po
+++ b/po/de/sysauth.po
@@ -14,12 +14,12 @@ msgstr ""
 
 #. Authorization Required
 #: i18n/english/luasrc/i18n/sysauth.en.lua:1
-msgid "sysauth_head"
+msgid "Authorization Required"
 msgstr "Autorisation benötigt"
 
 #. Please enter your username and password.
 #: i18n/english/luasrc/i18n/sysauth.en.lua:2
-msgid "sysauth_prompt"
+msgid "Please enter your username and password."
 msgstr "Bitte Benutzernamen und Passwort eingeben."
 
 #. Invalid username and/or password! Please try again.
diff --git a/po/de/tinyproxy.po b/po/de/tinyproxy.po
index 0c36e1cbb..6d9672b6e 100644
--- a/po/de/tinyproxy.po
+++ b/po/de/tinyproxy.po
@@ -14,157 +14,157 @@ msgstr ""
 
 #. Tinyproxy
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:1
-msgid "tinyproxy"
+msgid "Tinyproxy"
 msgstr "Tinyproxy"
 
 #. Tinyproxy is a small and fast non-caching HTTP(S)-Proxy
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:2
-msgid "tinyproxy_desc"
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
 msgstr "Tinyproxy ist ein schlanker HTTP(S)-Proxy ohne Zwischenspeicher"
 
 #. Allow access from
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:3
-msgid "tinyproxy_tinyproxy_allow"
+msgid "Allow access from"
 msgstr "Proxyzugang erlauben von"
 
 #. Allowed headers for anonymous proxy
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:4
-msgid "tinyproxy_tinyproxy_anonymous"
+msgid "Allowed headers for anonymous proxy"
 msgstr "Erlaube Header für anonymen Proxy"
 
 #. Bind outgoing traffic to address
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:5
-msgid "tinyproxy_tinyproxy_bind"
+msgid "Bind outgoing traffic to address"
 msgstr "Ausgehendenden Verkehr an Adresse binden"
 
 #. Ports allowed for CONNECT method
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:6
-msgid "tinyproxy_tinyproxy_connectport"
+msgid "Ports allowed for CONNECT method"
 msgstr "Ports für CONNECT-Methode"
 
 #. 0 = disabled, empty = all
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:7
-msgid "tinyproxy_tinyproxy_connectport_desc"
+msgid "0 = disabled, empty = all"
 msgstr "0 = deaktiviert, leer = alle"
 
 #. Error document
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:8
-msgid "tinyproxy_tinyproxy_defaulterrorfile"
+msgid "Error document"
 msgstr "Fehlerseite"
 
 #. Filter list
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:9
-msgid "tinyproxy_tinyproxy_filter"
+msgid "Filter list"
 msgstr "Filterliste"
 
 #. Case sensitive filters
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:10
-msgid "tinyproxy_tinyproxy_filtercasesensitive"
+msgid "Case sensitive filters"
 msgstr "Filter unterscheiden Groß-/Kleinschreibung"
 
 #. Filter list is a whitelist
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:11
-msgid "tinyproxy_tinyproxy_filterdefaultdeny"
+msgid "Filter list is a whitelist"
 msgstr "Filterliste ist eine Whitelist"
 
 #. Extended regular expression filters
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:12
-msgid "tinyproxy_tinyproxy_filterextended"
+msgid "Extended regular expression filters"
 msgstr "Erweiterte reguläre Ausdrücke für Filter"
 
 #. Filter URLs instead of domains
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:13
-msgid "tinyproxy_tinyproxy_filterurls"
+msgid "Filter URLs instead of domains"
 msgstr "Filtere URLs statt Domains"
 
 #. Listen on address
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:14
-msgid "tinyproxy_tinyproxy_listen"
+msgid "Listen on address"
 msgstr "An Adresse binden"
 
 #. Logfile
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:15
-msgid "tinyproxy_tinyproxy_logfile"
+msgid "Logfile"
 msgstr "Protokolldatei"
 
 #. Log level
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:16
-msgid "tinyproxy_tinyproxy_loglevel"
+msgid "Log level"
 msgstr "Protokolllevel"
 
 #. Maximum number of clients
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:17
-msgid "tinyproxy_tinyproxy_maxclients"
+msgid "Maximum number of clients"
 msgstr "Maximale Anzahl an Clients"
 
 #. Maximum requests per thread
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:18
-msgid "tinyproxy_tinyproxy_maxrequestsperchild"
+msgid "Maximum requests per thread"
 msgstr "Maximale Anfragen pro Prozess"
 
 #. Max. spare servers
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:19
-msgid "tinyproxy_tinyproxy_maxspareservers"
+msgid "Max. spare servers"
 msgstr "Max. Prozesszahl"
 
 #. Min. spare servers
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:20
-msgid "tinyproxy_tinyproxy_minspareservers"
+msgid "Min. spare servers"
 msgstr "Min. Prozesszahl"
 
 #. Spare servers to start with
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:21
-msgid "tinyproxy_tinyproxy_startservers"
+msgid "Spare servers to start with"
 msgstr "Anfängliche Prozesszahl"
 
 #. Statistic document
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:22
-msgid "tinyproxy_tinyproxy_statfile"
+msgid "Statistic document"
 msgstr "Statistikseite"
 
 #. Write to syslog
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:23
-msgid "tinyproxy_tinyproxy_syslog"
+msgid "Write to syslog"
 msgstr "In Systemprotokoll schreiben"
 
 #. Connection Timeout
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:24
-msgid "tinyproxy_tinyproxy_timeout"
+msgid "Connection Timeout"
 msgstr "Verbindungstimeout"
 
 #. Value of Via-Header
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:25
-msgid "tinyproxy_tinyproxy_viaproxyname"
+msgid "Value of Via-Header"
 msgstr "Wert des Via-Headers"
 
 #. Include client IP
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:26
-msgid "tinyproxy_tinyproxy_xtinyproxy"
+msgid "Include client IP"
 msgstr "Client-IP übertragen"
 
 #. Via proxy
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:27
-msgid "tinyproxy_type_proxy"
+msgid "Via proxy"
 msgstr "Über Proxy"
 
 #. Reject access
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:28
-msgid "tinyproxy_type_reject"
+msgid "Reject access"
 msgstr "Verbiete Zugriff"
 
 #. Upstream Control
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:29
-msgid "tinyproxy_upstream"
+msgid "Upstream Control"
 msgstr "Zugangskontrolle"
 
 #. Target host
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:30
-msgid "tinyproxy_upstream_target"
+msgid "Target host"
 msgstr "Zielhost"
 
 #. Type
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:31
-msgid "tinyproxy_upstream_type"
+msgid "Type"
 msgstr "Methode"
 
 #. Upstream Proxy
diff --git a/po/de/upnp.po b/po/de/upnp.po
index 2eaa24619..29fff9747 100644
--- a/po/de/upnp.po
+++ b/po/de/upnp.po
@@ -14,36 +14,36 @@ msgstr ""
 
 #. Universal Plug &amp; Play
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:1
-msgid "upnpd"
+msgid "Universal Plug & Play"
 msgstr "Universal Plug &amp; Play"
 
 #. UPNP allows clients in the local network to automatically configure the router.
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:2
-msgid "upnpd_desc"
+msgid "UPNP allows clients in the local network to automatically configure the router."
 msgstr ""
 "UPNP ermöglicht die automatische Konfiguration des Routers durch Clients im "
 "lokalen Netzwerk."
 
 #. UPNP should only be enabled if absolutely necessary as it can result in high security risks for your network.
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:3
-msgid "upnpd_config_desc"
+msgid "UPNP should only be enabled if absolutely necessary as it can result in high security risks for your network."
 msgstr ""
 "UPNP sollte nur wenn unbedingt nötig aktiviert werden, da es ein "
 "Sicherheitsrisiko für das Netzwerk darstellen kann."
 
 #. Enable secure mode
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:4
-msgid "upnpd_config_securemode"
+msgid "Enable secure mode"
 msgstr "Sicheren Modus aktivieren"
 
 #. Log output
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:5
-msgid "upnpd_config_logoutput"
+msgid "Log output"
 msgstr "Ausgabe protokollieren"
 
 #. Downlink
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:6
-msgid "upnpd_config_download"
+msgid "Downlink"
 msgstr "Downlink"
 
 #. Uplink
diff --git a/po/de/ushare.po b/po/de/ushare.po
index 55f6668ca..526280991 100644
--- a/po/de/ushare.po
+++ b/po/de/ushare.po
@@ -14,37 +14,37 @@ msgstr ""
 
 #. Content directories
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:1
-msgid "content_directories"
+msgid "Content directories"
 msgstr "Freigabeverzeichnisse"
 
 #. Disable telnet console
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:2
-msgid "disable_telnet"
+msgid "Disable telnet console"
 msgstr "Telnet-Konsole deaktivieren"
 
 #. Disable webinterface
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:3
-msgid "disable_webif"
+msgid "Disable webinterface"
 msgstr "Webinterface deaktivieren"
 
 #. Options
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:4
-msgid "options"
+msgid "Options"
 msgstr "Optionen"
 
 #. Servername
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:5
-msgid "servername"
+msgid "Servername"
 msgstr "Servername"
 
 #. Settings
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:6
-msgid "settings"
+msgid "Settings"
 msgstr "Einstellungen"
 
 #. uShare
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:7
-msgid "ushare"
+msgid "uShare"
 msgstr "uShare"
 
 #. uShare
diff --git a/po/de/uvc_streamer.po b/po/de/uvc_streamer.po
index a7a032d96..5634582d4 100644
--- a/po/de/uvc_streamer.po
+++ b/po/de/uvc_streamer.po
@@ -14,22 +14,22 @@ msgstr ""
 
 #. Frames per second
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
-msgid "framespersecond"
+msgid "Frames per second"
 msgstr "Bilder pro Sekunde"
 
 #. Resolution
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
-msgid "resolution"
+msgid "Resolution"
 msgstr "Auflösung"
 
 #. Settings
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
-msgid "settings"
+msgid "Settings"
 msgstr "Konfiguration"
 
 #. Webcam streaming
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
-msgid "uvc_streamer"
+msgid "Webcam streaming"
 msgstr "Webcam Stream"
 
 #. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
diff --git a/po/de/uvl.po b/po/de/uvl.po
index 8df58719d..4ab5faf7c 100644
--- a/po/de/uvl.po
+++ b/po/de/uvl.po
@@ -14,216 +14,216 @@ msgstr ""
 
 #. Unable to load config \"%p\": %1
 #: libs/uvl/luasrc/i18n/uvl.en.lua:1
-msgid "uvl_err_uciload"
+msgid "Unable to load config \"%p\": %1"
 msgstr "Fehler beim Laden der Konfiguration \"%p\": %1"
 
 #. Error in scheme \"%p\":\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:2
-msgid "uvl_err_scheme"
+msgid "Error in scheme \"%p\":\\n%c"
 msgstr ""
 "Fehler in Schema \"%p\":\n"
 "%c"
 
 #. Error in config \"%p\":\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:3
-msgid "uvl_err_config"
+msgid "Error in config \"%p\":\\n%c"
 msgstr ""
 "Fehler in Konfiguration \"%p\":\n"
 "%c"
 
 #. Error in section \"%i\" (%I):\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:4
-msgid "uvl_err_section"
+msgid "Error in section \"%i\" (%I):\\n%c"
 msgstr ""
 "Fehler in Sektion \"%i\" (%I):\n"
 "%c"
 
 #. Error in option \"%i\" (%I):\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:5
-msgid "uvl_err_option"
+msgid "Error in option \"%i\" (%I):\\n%c"
 msgstr ""
 "Fehler in Option \"%i\" (%I):\n"
 "%c"
 
 #. Option \"%i\" has invalid reference specification %1:\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:6
-msgid "uvl_err_reference"
+msgid "Option \"%i\" has invalid reference specification %1:\\n%c"
 msgstr ""
 "Option \"%i\" hat eine ungültige Referenz-Spezifikation %1:\n"
 "%c"
 
 #. In dependency check for %t \"%i\":\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:7
-msgid "uvl_err_dependency"
+msgid "In dependency check for %t \"%i\":\\n%c"
 msgstr ""
 "Nicht erfüllte Abhängigkeiten in %t \"%i\":\n"
 "%c"
 
 #. Can not find scheme \"%p\" in \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:8
-msgid "uvl_err_sme_find"
+msgid "Can not find scheme \"%p\" in \"%1\""
 msgstr "Schema \"%p\" nicht in Verzeichnis \"%1\" gefunden"
 
 #. Can not access file \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:9
-msgid "uvl_err_sme_read"
+msgid "Can not access file \"%1\""
 msgstr "Fehlende Dateizugriffsrechte auf \"%1\""
 
 #. Missing required scheme field \"%1\" in \"%i\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:10
-msgid "uvl_err_sme_reqfld"
+msgid "Missing required scheme field \"%1\" in \"%i\""
 msgstr "Notwendiges Feld \"%1\" fehlt in Schema \"%i\""
 
 #. Illegal reference \"%1\" to an anonymous section
 #: libs/uvl/luasrc/i18n/uvl.en.lua:11
-msgid "uvl_err_sme_invref"
+msgid "Illegal reference \"%1\" to an anonymous section"
 msgstr "Ungültige Referenz \"%1\" verweist auf eine anonyme Sektion"
 
 #. Malformed reference in \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:12
-msgid "uvl_err_sme_badref"
+msgid "Malformed reference in \"%1\""
 msgstr "Syntaxfehler in Referenzspezifikation \"%1\""
 
 #. Malformed dependency specification \"%1\" in \"%i\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:13
-msgid "uvl_err_sme_baddep"
+msgid "Malformed dependency specification \"%1\" in \"%i\""
 msgstr "Syntaxfehler in Abhängigkeitsbeschreibung \"%1\" von \"%i\""
 
 #. Malformed validator specification \"%1\" in \"%i\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:14
-msgid "uvl_err_sme_badval"
+msgid "Malformed validator specification \"%1\" in \"%i\""
 msgstr "Syntaxfehler in Validatorspezifikation \"%1\" von \"%i\""
 
 #. External validator \"%1\" failed: %2
 #: libs/uvl/luasrc/i18n/uvl.en.lua:15
-msgid "uvl_err_sme_errval"
+msgid "External validator \"%1\" failed: %2"
 msgstr "Fehler in externem Validator \"%1\": %2"
 
 #. Variable \"%o\" in scheme \"%p\" references unknown package \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:16
-msgid "uvl_err_sme_vbadpack"
+msgid "Variable \"%o\" in scheme \"%p\" references unknown package \"%1\""
 msgstr "Option \"%o\" in Schema \"%p\" referenziert unbekanntes Paket \"%1\""
 
 #. Variable \"%o\" in scheme \"%p\" references unknown section \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:17
-msgid "uvl_err_sme_vbadsect"
+msgid "Variable \"%o\" in scheme \"%p\" references unknown section \"%1\""
 msgstr "Option \"%o\" in Schema \"%p\" referenziert unbekannte Sektion \"%1\""
 
 #. Enum \"%v\" in scheme \"%p\" references unknown package \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:18
-msgid "uvl_err_sme_ebadpack"
+msgid "Enum \"%v\" in scheme \"%p\" references unknown package \"%1\""
 msgstr "Aufzählung \"%v\" in Schema \"%p\" referenziert unbekanntes Paket \"%1\""
 
 #. Enum \"%v\" in scheme \"%p\" references unknown section \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:19
-msgid "uvl_err_sme_ebadsect"
+msgid "Enum \"%v\" in scheme \"%p\" references unknown section \"%1\""
 msgstr "Aufzählung \"%v\" in Schema \"%p\" referenziert unbekannte Sektion \"%1\""
 
 #. Enum \"%v\" in scheme \"%p\" references unknown option \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:20
-msgid "uvl_err_sme_ebadopt"
+msgid "Enum \"%v\" in scheme \"%p\" references unknown option \"%1\""
 msgstr "Aufzählung \"%v\" in Schema \"%p\" referenziert unbekannte Option \"%1\""
 
 #. Enum \"%v\" in scheme \"%p\" references non-enum option \"%p.%s.%o\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:21
-msgid "uvl_err_sme_ebadtype"
+msgid "Enum \"%v\" in scheme \"%p\" references non-enum option \"%p.%s.%o\""
 msgstr ""
 "Aufzählung \"%v\" in Schema \"%p\" referenziert Nicht-Aufzählungs-Option "
 "\"%p.%s.%o\""
 
 #. Enum \"%v\" in scheme \"%p\" redeclares the default value of \"%p.%s.%o\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:22
-msgid "uvl_err_sme_ebaddef"
+msgid "Enum \"%v\" in scheme \"%p\" redeclares the default value of \"%p.%s.%o\""
 msgstr ""
 "Aufzählung \"%v\" in Schema \"%p\" überschreibt den Standardwert von \"%p.%s.%o\""
 
 #. Section \"%i\" (%I) not found in scheme
 #: libs/uvl/luasrc/i18n/uvl.en.lua:23
-msgid "uvl_err_sect_unknown"
+msgid "Section \"%i\" (%I) not found in scheme"
 msgstr "Sektion \"%i\" (%I) nicht in Schema gefunden"
 
 #. Required section \"%p.%s\" not found in config
 #: libs/uvl/luasrc/i18n/uvl.en.lua:24
-msgid "uvl_err_sect_required"
+msgid "Required section \"%p.%s\" not found in config"
 msgstr "Benötigte Sektion vom Typ \"%I\" nicht in Konfiguration gefunden"
 
 #. Unique section \"%p.%s\" occurs multiple times in config
 #: libs/uvl/luasrc/i18n/uvl.en.lua:25
-msgid "uvl_err_sect_unique"
+msgid "Unique section \"%p.%s\" occurs multiple times in config"
 msgstr "Einzigartige Sektion \"%i\" (%I) kommt mehrfach in der Konfiguration vor"
 
 #. The section of type \"%p.%s\" is stored anonymously in config but must be named
 #: libs/uvl/luasrc/i18n/uvl.en.lua:26
-msgid "uvl_err_sect_named"
+msgid "The section of type \"%p.%s\" is stored anonymously in config but must be named"
 msgstr ""
 "Die Sektion vom Typ \"%I\" ist anonym in der Konfiguration gespeichert, muss "
 "aber einen Namen haben"
 
 #. Section \"%p.%s\" not found in config
 #: libs/uvl/luasrc/i18n/uvl.en.lua:27
-msgid "uvl_err_sect_notfound"
+msgid "Section \"%p.%s\" not found in config"
 msgstr "Sektion vom Typ \"%I\" nicht in der Konfiguration gefunden"
 
 #. Option \"%i\" (%I) not found in scheme
 #: libs/uvl/luasrc/i18n/uvl.en.lua:28
-msgid "uvl_err_opt_unknown"
+msgid "Option \"%i\" (%I) not found in scheme"
 msgstr "Option \"%i\" (%I) nicht im Schema gefunden"
 
 #. Required option \"%i\" has no value
 #: libs/uvl/luasrc/i18n/uvl.en.lua:29
-msgid "uvl_err_opt_required"
+msgid "Required option \"%i\" has no value"
 msgstr "Die benötigte Option \"%i\" hat keinen Wert gesetzt"
 
 #. Value \"%1\" of option \"%i\" is not defined in enum %2
 #: libs/uvl/luasrc/i18n/uvl.en.lua:30
-msgid "uvl_err_opt_badvalue"
+msgid "Value \"%1\" of option \"%i\" is not defined in enum %2"
 msgstr "Der Wert \"%1\" von Option \"%i\" ist nicht in der Aufzählung %2 definiert"
 
 #. Value \"%1\" of option \"%i\" does not validate as datatype \"%2\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:31
-msgid "uvl_err_opt_invvalue"
+msgid "Value \"%1\" of option \"%i\" does not validate as datatype \"%2\""
 msgstr "Der Wert \"%1\" von Option \"%i\" ist kein gültiger \"%2\" Datentyp"
 
 #. Option \"%i\" is defined as list but stored as plain value
 #: libs/uvl/luasrc/i18n/uvl.en.lua:32
-msgid "uvl_err_opt_notlist"
+msgid "Option \"%i\" is defined as list but stored as plain value"
 msgstr ""
 "Option \"%i\" ist als Liste definiert aber als einfache Option gespeichert"
 
 #. Option \"%i\" has unknown datatype \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:33
-msgid "uvl_err_opt_datatype"
+msgid "Option \"%i\" has unknown datatype \"%1\""
 msgstr "Option \"%i\" hat unbekannten Datentyp \"%1\""
 
 #. Option \"%p.%s.%o\" not found in config
 #: libs/uvl/luasrc/i18n/uvl.en.lua:34
-msgid "uvl_err_opt_notfound"
+msgid "Option \"%p.%s.%o\" not found in config"
 msgstr "Option \"%i\" nicht in der Konfiguration gefunden"
 
 #. Dependency (%1) failed:\noption \"%i\" is not eqal \"%2\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:35
-msgid "uvl_err_dep_notequal"
+msgid "Dependency (%1) failed:\\noption \"%i\" is not eqal \"%2\""
 msgstr ""
 "Abhängigkeit (%1) nicht erfüllt:\n"
 "Option \"%i\" ist nicht \"%2\""
 
 #. Dependency (%1) failed:\noption \"%i\" has no value
 #: libs/uvl/luasrc/i18n/uvl.en.lua:36
-msgid "uvl_err_dep_novalue"
+msgid "Dependency (%1) failed:\\noption \"%i\" has no value"
 msgstr ""
 "Abhängigkeit (%1) nicht erfüllt:\n"
 "Option \"%i\" hat keinen Wert gesetzt"
 
 #. Dependency (%1) failed:\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:37
-msgid "uvl_err_dep_notvalid"
+msgid "Dependency (%1) failed:\\n%c"
 msgstr ""
 "Abhängigkeit (%1) nicht erfüllt:\n"
 "%c"
 
 #. Recursive dependency for option \"%i\" detected
 #: libs/uvl/luasrc/i18n/uvl.en.lua:38
-msgid "uvl_err_dep_recursive"
+msgid "Recursive dependency for option \"%i\" detected"
 msgstr "Rekursive Abhängkeit in Option \"%i\" gefunden"
 
 #. In dependency check for enum value \"%i\":\n%c
diff --git a/po/de/wifi.po b/po/de/wifi.po
index fd0712791..8e2349373 100644
--- a/po/de/wifi.po
+++ b/po/de/wifi.po
@@ -13,192 +13,192 @@ msgstr ""
 
 #. auto
 #: i18n/english/luasrc/i18n/wifi.en.lua:1
-msgid "wifi_auto"
+msgid "auto"
 msgstr "auto"
 
 #. Frequency Hopping
 #: i18n/english/luasrc/i18n/wifi.en.lua:2
-msgid "wifi_fh"
+msgid "Frequency Hopping"
 msgstr "Frequenzsprung"
 
 #. Diversity
 #: i18n/english/luasrc/i18n/wifi.en.lua:3
-msgid "wifi_diversity"
+msgid "Diversity"
 msgstr "Diversität"
 
 #. Transmitter Antenna
 #: i18n/english/luasrc/i18n/wifi.en.lua:4
-msgid "wifi_txantenna"
+msgid "Transmitter Antenna"
 msgstr "Sendeantenne"
 
 #. Receiver Antenna
 #: i18n/english/luasrc/i18n/wifi.en.lua:5
-msgid "wifi_rxantenna"
+msgid "Receiver Antenna"
 msgstr "Empfangsantenne"
 
 #. Distance Optimization
 #: i18n/english/luasrc/i18n/wifi.en.lua:6
-msgid "wifi_distance"
+msgid "Distance Optimization"
 msgstr "Distanzoptimierung"
 
 #. Distance to farthest network member in meters.
 #: i18n/english/luasrc/i18n/wifi.en.lua:7
-msgid "wifi_distance_desc"
+msgid "Distance to farthest network member in meters."
 msgstr "Distanz zum am weitesten entfernten Funkpartner in Meter."
 
 #. MAC-Address Filter
 #: i18n/english/luasrc/i18n/wifi.en.lua:8
-msgid "wifi_macpolicy"
+msgid "MAC-Address Filter"
 msgstr "MAC-Adressfilter"
 
 #. Allow listed only
 #: i18n/english/luasrc/i18n/wifi.en.lua:9
-msgid "wifi_whitelist"
+msgid "Allow listed only"
 msgstr "Nur gelistete erlauben"
 
 #. Allow all except listed
 #: i18n/english/luasrc/i18n/wifi.en.lua:10
-msgid "wifi_blacklist"
+msgid "Allow all except listed"
 msgstr "Alle außer gelistete erlauben"
 
 #. MAC-List
 #: i18n/english/luasrc/i18n/wifi.en.lua:11
-msgid "wifi_maclist"
+msgid "MAC-List"
 msgstr "MAC-Adressliste"
 
 #. Frame Bursting
 #: i18n/english/luasrc/i18n/wifi.en.lua:12
-msgid "wifi_bursting"
+msgid "Frame Bursting"
 msgstr "Frame Bursting"
 
 #. Regulatory Domain
 #: i18n/english/luasrc/i18n/wifi.en.lua:13
-msgid "wifi_regdomain"
+msgid "Regulatory Domain"
 msgstr "Geltungsbereich (Regulatory Domain)"
 
 #. Country Code
 #: i18n/english/luasrc/i18n/wifi.en.lua:14
-msgid "wifi_country"
+msgid "Country Code"
 msgstr "Ländercode"
 
 #. Outdoor Channels
 #: i18n/english/luasrc/i18n/wifi.en.lua:15
-msgid "wifi_outdoor"
+msgid "Outdoor Channels"
 msgstr "Funkkanal für den Ausseneinsatz"
 
 #. Connection Limit
 #: i18n/english/luasrc/i18n/wifi.en.lua:16
-msgid "wifi_maxassoc"
+msgid "Connection Limit"
 msgstr "Verbindungsbegrenzung"
 
 #. <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:17
-msgid "wifi_essid"
+msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
 #. <abbr title=\"Basic Service Set Identifier\">BSSID</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:18
-msgid "wifi_bssid"
+msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 
 #. Fragmentation Threshold
 #: i18n/english/luasrc/i18n/wifi.en.lua:19
-msgid "wifi_frag"
+msgid "Fragmentation Threshold"
 msgstr "Fragmentierungsschwelle"
 
 #. RTS/CTS Threshold
 #: i18n/english/luasrc/i18n/wifi.en.lua:20
-msgid "wifi_rts"
+msgid "RTS/CTS Threshold"
 msgstr "RTS/CTS-Schwelle"
 
 #. <abbr title=\"Wireless Distribution System\">WDS</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:21
-msgid "wifi_wds"
+msgid "<abbr title=\"Wireless Distribution System\">WDS</abbr>"
 msgstr "<abbr title=\"Wireless Distribution System\">WDS</abbr>"
 
 #. Separate WDS
 #: i18n/english/luasrc/i18n/wifi.en.lua:22
-msgid "wifi_wdssep"
+msgid "Separate WDS"
 msgstr "Separates WDS"
 
 #. Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:23
-msgid "wifi_hidden"
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr> verstecken"
 
 #. Isolate Clients
 #: i18n/english/luasrc/i18n/wifi.en.lua:24
-msgid "wifi_isloate"
+msgid "Isolate Clients"
 msgstr "Clients isolieren"
 
 #. Prevent Client to Client Communication
 #: i18n/english/luasrc/i18n/wifi.en.lua:25
-msgid "wifi_isloate_desc"
+msgid "Prevent Client to Client Communication"
 msgstr "Verhindert Client zu Client Kommunikation"
 
 #. Background Scan
 #: i18n/english/luasrc/i18n/wifi.en.lua:26
-msgid "wifi_bgscan"
+msgid "Background Scan"
 msgstr "Hintergrundscan"
 
 #. Transmission Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:27
-msgid "wifi_rate"
+msgid "Transmission Rate"
 msgstr "Übertragungsrate"
 
 #. Multicast Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:28
-msgid "wifi_mcast_rate"
+msgid "Multicast Rate"
 msgstr "Multicastrate"
 
 #. Minimum Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:29
-msgid "wifi_minrate"
+msgid "Minimum Rate"
 msgstr "Mindestübertragungsrate"
 
 #. Maximum Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:30
-msgid "wifi_maxrate"
+msgid "Maximum Rate"
 msgstr "Höchstübertragungsrate"
 
 #. Compression
 #: i18n/english/luasrc/i18n/wifi.en.lua:31
-msgid "wifi_compression"
+msgid "Compression"
 msgstr "Kompression"
 
 #. Turbo Mode
 #: i18n/english/luasrc/i18n/wifi.en.lua:32
-msgid "wifi_turbo"
+msgid "Turbo Mode"
 msgstr "Turbo Modus"
 
 #. Fast Frames
 #: i18n/english/luasrc/i18n/wifi.en.lua:33
-msgid "wifi_ff"
+msgid "Fast Frames"
 msgstr "Schnelle Frames"
 
 #. WMM Mode
 #: i18n/english/luasrc/i18n/wifi.en.lua:34
-msgid "wifi_wmm"
+msgid "WMM Mode"
 msgstr "WMM Modus"
 
 #. XR Support
 #: i18n/english/luasrc/i18n/wifi.en.lua:35
-msgid "wifi_xr"
+msgid "XR Support"
 msgstr "XR-Unterstützung"
 
 #. AR Support
 #: i18n/english/luasrc/i18n/wifi.en.lua:36
-msgid "wifi_ar"
+msgid "AR Support"
 msgstr "AR-Unterstützung"
 
 #. Disable HW-Beacon timer
 #: i18n/english/luasrc/i18n/wifi.en.lua:37
-msgid "wifi_nosbeacon"
+msgid "Disable HW-Beacon timer"
 msgstr "Deaktiviere Hardware-Beacon Zeitgeber"
 
 #. Do not send probe responses
 #: i18n/english/luasrc/i18n/wifi.en.lua:38
-msgid "wifi_noprobereq"
+msgid "Do not send probe responses"
 msgstr "Scan-Anforderungen nicht beantworten"
 
 #. WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP and ad-hoc mode) to be installed.
diff --git a/po/el/admin-core.po b/po/el/admin-core.po
index 84a10393d..6019e69f6 100644
--- a/po/el/admin-core.po
+++ b/po/el/admin-core.po
@@ -14,22 +14,22 @@ msgstr ""
 
 #. The following changes have been applied
 #: i18n/english/luasrc/i18n/admin-core.en.lua:1
-msgid "uci_applied"
+msgid "The following changes have been applied"
 msgstr "Οι παρακάτω αλλαγές έχουν εφαρμοστεί"
 
 #. The following changes have been reverted
 #: i18n/english/luasrc/i18n/admin-core.en.lua:2
-msgid "uci_reverted"
+msgid "The following changes have been reverted"
 msgstr "Οι παρακάτω αλλαγές έχουν αναιρεθεί"
 
 #. User Interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:3
-msgid "a_i_ui"
+msgid "User Interface"
 msgstr "Περιβάλλον Χρήστη"
 
 #. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a collection of free Lua software including an <abbr title=\"Model-View-Controller\">MVC</abbr>-Webframework and webinterface for embedded devices. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is licensed under the Apache-License.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:4
-msgid "c_lucidesc"
+msgid "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a collection of free Lua software including an <abbr title=\"Model-View-Controller\">MVC</abbr>-Webframework and webinterface for embedded devices. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is licensed under the Apache-License."
 msgstr ""
 "Το <abbr title=\"Lua Configuration Interface\">LuCI</abbr> είναι μία συλλογή "
 "από ελεύθερο λογισμικό Lua που συμπεριλαμβάνει ένα <abbr title=\"Model-View-"
@@ -39,39 +39,39 @@ msgstr ""
 
 #. Project Homepage
 #: i18n/english/luasrc/i18n/admin-core.en.lua:5
-msgid "c_projecthome"
+msgid "Project Homepage"
 msgstr "Ιστοσελίδα του Πρότζεκτ"
 
 #. Lead Development
 #: i18n/english/luasrc/i18n/admin-core.en.lua:6
-msgid "c_leaddev"
+msgid "Lead Development"
 msgstr "Επικεφαλής Ανάπτυξης"
 
 #. Contributing Developers
 #: i18n/english/luasrc/i18n/admin-core.en.lua:7
-msgid "c_contributors"
+msgid "Contributing Developers"
 msgstr "Συνεισφορές στην Ανάπτυξη"
 
 #. Thanks To
 #: i18n/english/luasrc/i18n/admin-core.en.lua:8
-msgid "c_thanksto"
+msgid "Thanks To"
 msgstr "Ευχαριστίες"
 
 #. Hello!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:9
-msgid "a_i_i_hello"
+msgid "Hello!"
 msgstr "Γεια σας!"
 
 #. This is the administration area of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:10
-msgid "a_i_i_admin1"
+msgid "This is the administration area of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>."
 msgstr ""
 "Αυτός είναι ο χώρος διαχείρισης του <abbr title=\"Lua Configuration "
 "Interface\">LuCI</abbr>."
 
 #. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a free, flexible, and user friendly graphical interface for configuring OpenWrt Kamikaze.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:11
-msgid "a_i_i_admin2"
+msgid "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a free, flexible, and user friendly graphical interface for configuring OpenWrt Kamikaze."
 msgstr ""
 "Το <abbr title=\"Lua Configuration Interface\">LuCI</abbr> είναι ένα ελεύθερο, "
 "ευέλικτο, και φιλικό προς το χρήστη γραφικό περιβάλλον για την "
@@ -79,14 +79,14 @@ msgstr ""
 
 #. On the following pages you can adjust all important settings of your router.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:12
-msgid "a_i_i_admin3"
+msgid "On the following pages you can adjust all important settings of your router."
 msgstr ""
 "Στις επόμενες σελίδες μπορείτε να προσαρμόζετε τις πιο σημαντικές ρυθμίσεις "
 "του δρομολογητή σας."
 
 #. Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> changes have to be confirmed by clicking Changes - Save &amp; Apply before being applied.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:13
-msgid "a_i_i_admin4"
+msgid "Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> changes have to be confirmed by clicking Changes - Save & Apply before being applied."
 msgstr ""
 "Σημείωση: Πριν εφαρμοστούν οι αλλαγές στο <abbr title=\"Lua Configuration "
 "Interface\">LuCI</abbr> πρέπει να επιβεβαιωθούν κλικάροντας το Αλλαγές - "
@@ -94,36 +94,36 @@ msgstr ""
 
 #. As we always want to improve this interface we are looking forward to your feedback and suggestions.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:14
-msgid "a_i_i_admin5"
+msgid "As we always want to improve this interface we are looking forward to your feedback and suggestions."
 msgstr ""
 "Θέλοντας πάντα να βελτιώνουμε αυτό το περιβάλλον, περιμένουμε την ανάδραση "
 "και τις προτάσεις σας."
 
 #. And now have fun with your router!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:15
-msgid "a_i_i_admin6"
+msgid "And now have fun with your router!"
 msgstr "Και τώρα διασκεδάστε με τον δρομολογητή σας!"
 
 #. The <abbr title=\"Lua Configuration Interface\">LuCI</abbr> Team
 #: i18n/english/luasrc/i18n/admin-core.en.lua:16
-msgid "a_i_i_team"
+msgid "The <abbr title=\"Lua Configuration Interface\">LuCI</abbr> Team"
 msgstr "Η ομάδα του <abbr title=\"Lua Configuration Interface\">LuCI</abbr>"
 
 #. Here you can customize the settings and the functionality of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:17
-msgid "a_i_luci1"
+msgid "Here you can customize the settings and the functionality of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>."
 msgstr ""
 "Εδώ μπορείτε να προσαρμόσετε τις ρυθμίσεις και την λειτουργία του <abbr "
 "title=\"Lua Configuration Interface\">LuCI</abbr>."
 
 #. Post-commit actions
 #: i18n/english/luasrc/i18n/admin-core.en.lua:18
-msgid "a_i_ucicommit"
+msgid "Post-commit actions"
 msgstr "Ενέργειες μετά το commit"
 
 #. These commands will be executed automatically when a given <abbr title=\"Unified Configuration Interface\">UCI</abbr> configuration is committed allowing changes to be applied instantly.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:19
-msgid "a_i_ucicommit1"
+msgid "These commands will be executed automatically when a given <abbr title=\"Unified Configuration Interface\">UCI</abbr> configuration is committed allowing changes to be applied instantly."
 msgstr ""
 "Αυτές οι εντολές θα εκτελεστούν αυτόματα όταν μία ρύθμιση <abbr "
 "title=\"Unified Configuration Interface\">UCI</abbr> γίνει commit επιτρέποντας "
@@ -131,19 +131,19 @@ msgstr ""
 
 #. Files to be kept when flashing a new firmware
 #: i18n/english/luasrc/i18n/admin-core.en.lua:20
-msgid "a_i_keepflash"
+msgid "Files to be kept when flashing a new firmware"
 msgstr "Αρχεία που θα διατηρηθούν κατά το φλασάρισμα του firmware"
 
 #. When flashing a new firmware with <abbr title=\"Lua Configuration Interface\">LuCI</abbr> these files will be added to the new firmware installation.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:21
-msgid "a_i_keepflash1"
+msgid "When flashing a new firmware with <abbr title=\"Lua Configuration Interface\">LuCI</abbr> these files will be added to the new firmware installation."
 msgstr ""
 "Τα παρακάτω αρχεία θα διατηρούνται όταν φλασάρεται το firmware μέσω του "
 "<abbr title=\"Lua Configuration Interface\">LuCI</abbr>."
 
 #. Here you can find information about the current system status like <abbr title=\"Central Processing Unit\">CPU</abbr> clock frequency, memory usage or network interface data.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:22
-msgid "a_st_i_status1"
+msgid "Here you can find information about the current system status like <abbr title=\"Central Processing Unit\">CPU</abbr> clock frequency, memory usage or network interface data."
 msgstr ""
 "Εδώ μπορείτε να βρείτε πληροφορίες για την τρέχουσα κατάσταση του συστήματος "
 "όπως την συχνότητα της <abbr title=\"Central Processing Unit\">CPU</abbr>, τη "
@@ -151,108 +151,108 @@ msgstr ""
 
 #. Also kernel or service logfiles can be viewed here to get an overview over their current state.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:23
-msgid "a_st_i_status2"
+msgid "Also kernel or service logfiles can be viewed here to get an overview over their current state."
 msgstr ""
 "Επίσης εδώ μπορείτε να δείτε τα αρχεία καταγραφής του πυρήνα ή των υπηρεσιών "
 "ώστε να έχετε μια εικόνα για την τρέχουσα κατάσταση."
 
 #. <abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan
 #: i18n/english/luasrc/i18n/admin-core.en.lua:24
-msgid "iwscan"
+msgid "<abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan"
 msgstr "Σάρωση <abbr title=\"Wireless Local Area Network\">WLAN</abbr>"
 
 #. Wifi networks in your local environment
 #: i18n/english/luasrc/i18n/admin-core.en.lua:25
-msgid "iwscan1"
+msgid "Wifi networks in your local environment"
 msgstr "Τοπικά Ασύρματα δίκτυα"
 
 #. <abbr title=\"Encrypted\">Encr.</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:26
-msgid "iwscan_encr"
+msgid "<abbr title=\"Encrypted\">Encr.</abbr>"
 msgstr "<abbr title=\"Encrypted\">Κρυπτ.</abbr>"
 
 #. Link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:27
-msgid "iwscan_link"
+msgid "Link"
 msgstr "Ποιότητα"
 
 #. Signal
 #: i18n/english/luasrc/i18n/admin-core.en.lua:28
-msgid "iwscan_signal"
+msgid "Signal"
 msgstr "Σήμα"
 
 #. Noise
 #: i18n/english/luasrc/i18n/admin-core.en.lua:29
-msgid "iwscan_noise"
+msgid "Noise"
 msgstr "Θόρυβος"
 
 #. Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:30
-msgid "routes"
+msgid "Routes"
 msgstr "Διαδρομές"
 
 #. Netmask
 #: i18n/english/luasrc/i18n/admin-core.en.lua:31
-msgid "routes_netmask"
+msgid "Netmask"
 msgstr "Μάσκα δικτύου"
 
 #. Gateway
 #: i18n/english/luasrc/i18n/admin-core.en.lua:32
-msgid "routes_gateway"
+msgid "Gateway"
 msgstr "Πύλη"
 
 #. Metric
 #: i18n/english/luasrc/i18n/admin-core.en.lua:33
-msgid "routes_metric"
+msgid "Metric"
 msgstr "Μέτρο"
 
 #. Here you can configure the basic aspects of your device like its hostname or the timezone.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:34
-msgid "a_s_desc"
+msgid "Here you can configure the basic aspects of your device like its hostname or the timezone."
 msgstr ""
 "Εδώ μπορείτε να παραμετροποιήσετε βασικές πλευρές της συσκευής σας όπως το "
 "όνομα υπολογιστή ή τη ζώνη ώρας."
 
 #. Software
 #: i18n/english/luasrc/i18n/admin-core.en.lua:35
-msgid "a_s_packages"
+msgid "Software"
 msgstr "Λογισμικό"
 
 #. Admin Password
 #: i18n/english/luasrc/i18n/admin-core.en.lua:36
-msgid "a_s_changepw"
+msgid "Admin Password"
 msgstr "Κωδικός Διαχειριστή"
 
 #. OPKG-Configuration
 #: i18n/english/luasrc/i18n/admin-core.en.lua:37
-msgid "a_s_p_ipkg"
+msgid "OPKG-Configuration"
 msgstr "Παραμετροποίηση OPKG"
 
 #. <abbr title=\"Secure Shell\">SSH</abbr>-Keys
 #: i18n/english/luasrc/i18n/admin-core.en.lua:38
-msgid "a_s_sshkeys"
+msgid "<abbr title=\"Secure Shell\">SSH</abbr>-Keys"
 msgstr "Κλειδιά <abbr title=\"Secure Shell\">SSH</abbr>"
 
 #. Mount Points
 #: i18n/english/luasrc/i18n/admin-core.en.lua:39
-msgid "a_s_fstab"
+msgid "Mount Points"
 msgstr "Σημεία Προσάρτησης"
 
 #. Change settings related to the system itself, its identification, installed hard- and software, authentication or mount points.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:40
-msgid "a_s_i_system1"
+msgid "Change settings related to the system itself, its identification, installed hard- and software, authentication or mount points."
 msgstr ""
 "Αλλαγή ρυθμίσεων σχετικών με το σύστημα, την ταυτότητά του, το εγκατεστημένο "
 "υλικό και λογισμικό, την εξουσιοδότηση ή τα σημεία προσάρτησης."
 
 #. These settings define the base of your system.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:41
-msgid "a_s_i_system2"
+msgid "These settings define the base of your system."
 msgstr "Αυτές οι ρυθμίσεις ορίζουν τη βάση του συστήματος."
 
 #. Pay attention as any misconfiguration here may prevent your device from booting or may lock yourself out of it.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:42
-msgid "a_s_i_system3"
+msgid "Pay attention as any misconfiguration here may prevent your device from booting or may lock yourself out of it."
 msgstr ""
 "Δώστε ιδιαίτερη προσοχή γιατί οποιαδήποτε λάθος ρύθμιση εδώ μπορεί να "
 "αποτρέψει την συσκευή σας από το να εκκινήσει ή μπορεί να κλειδώσετε τον "
@@ -260,474 +260,474 @@ msgstr ""
 
 #. Interfaces
 #: i18n/english/luasrc/i18n/admin-core.en.lua:43
-msgid "a_s_if"
+msgid "Interfaces"
 msgstr "Διεπαφές"
 
 #. Bridge
 #: i18n/english/luasrc/i18n/admin-core.en.lua:44
-msgid "a_s_if_bridge"
+msgid "Bridge"
 msgstr "Γέφυρα"
 
 #. ID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:45
-msgid "a_s_if_bridge_id"
+msgid "ID"
 msgstr "ID"
 
 #. Bridge Port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:46
-msgid "a_s_if_bridge_port"
+msgid "Bridge Port"
 msgstr "Πόρτα Γέφυρας"
 
 #. STP
 #: i18n/english/luasrc/i18n/admin-core.en.lua:47
-msgid "a_s_if_bridge_stp"
+msgid "STP"
 msgstr "STP"
 
 #. Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:48
-msgid "a_s_if_device"
+msgid "Device"
 msgstr "Συσκευή"
 
 #. Ethernet Bridge
 #: i18n/english/luasrc/i18n/admin-core.en.lua:49
-msgid "a_s_if_ethbridge"
+msgid "Ethernet Bridge"
 msgstr "Γέφυρα Ethernet"
 
 #. Ethernet Adapter
 #: i18n/english/luasrc/i18n/admin-core.en.lua:50
-msgid "a_s_if_ethdev"
+msgid "Ethernet Adapter"
 msgstr "Προσαρμογέας Ethernet"
 
 #. Ethernet Switch
 #: i18n/english/luasrc/i18n/admin-core.en.lua:51
-msgid "a_s_if_ethswitch"
+msgid "Ethernet Switch"
 msgstr "Ethernet Switch"
 
 #. Interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:52
-msgid "a_s_if_interface"
+msgid "Interface"
 msgstr "Διεπαφή"
 
 #. IP Configuration
 #: i18n/english/luasrc/i18n/admin-core.en.lua:53
-msgid "a_s_if_ipconfig"
+msgid "IP Configuration"
 msgstr "Ρυθμίσεις IP"
 
 #. Alias
 #: i18n/english/luasrc/i18n/admin-core.en.lua:54
-msgid "a_s_if_ipconfig_alias"
+msgid "Alias"
 msgstr "Ψευδώνυμο"
 
 #. DHCP assigned
 #: i18n/english/luasrc/i18n/admin-core.en.lua:55
-msgid "a_s_if_ipconfig_dhcp"
+msgid "DHCP assigned"
 msgstr "Ανάθεση από DHCP"
 
 #. IPv6
 #: i18n/english/luasrc/i18n/admin-core.en.lua:56
-msgid "a_s_if_ipconfig_ipv6"
+msgid "IPv6"
 msgstr "IPv6"
 
 #. Not configured
 #: i18n/english/luasrc/i18n/admin-core.en.lua:57
-msgid "a_s_if_ipconfig_none"
+msgid "Not configured"
 msgstr "Μη-ρυθμισμένο"
 
 #. Primary
 #: i18n/english/luasrc/i18n/admin-core.en.lua:58
-msgid "a_s_if_ipconfig_primary"
+msgid "Primary"
 msgstr "Κύριο"
 
 #. Channel
 #: i18n/english/luasrc/i18n/admin-core.en.lua:59
-msgid "a_s_if_iwchannel"
+msgid "Channel"
 msgstr "Κανάλι"
 
 #. Mode
 #: i18n/english/luasrc/i18n/admin-core.en.lua:60
-msgid "a_s_if_iwmode"
+msgid "Mode"
 msgstr "Λειτουργία"
 
 #. Ad-Hoc
 #: i18n/english/luasrc/i18n/admin-core.en.lua:61
-msgid "a_s_if_iwmode_adhoc"
+msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
 #. Pseudo Ad-Hoc
 #: i18n/english/luasrc/i18n/admin-core.en.lua:62
-msgid "a_s_if_iwmode_ahdemo"
+msgid "Pseudo Ad-Hoc"
 msgstr "Ψευδό Ad-Hoc"
 
 #. Master
 #: i18n/english/luasrc/i18n/admin-core.en.lua:63
-msgid "a_s_if_iwmode_ap"
+msgid "Master"
 msgstr "Σημείο Πρόσβασης"
 
 #. Master + WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:64
-msgid "a_s_if_iwmode_apwds"
+msgid "Master + WDS"
 msgstr "Σημείο Πρόσβασης + WDS"
 
 #. Client
 #: i18n/english/luasrc/i18n/admin-core.en.lua:65
-msgid "a_s_if_iwmode_sta"
+msgid "Client"
 msgstr "Πελάτης"
 
 #. Client + WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:66
-msgid "a_s_if_iwmode_stawds"
+msgid "Client + WDS"
 msgstr "Πελάτης + WDS"
 
 #. WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:67
-msgid "a_s_if_iwmode_wds"
+msgid "WDS"
 msgstr "WDS"
 
 #. SSID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:68
-msgid "a_s_if_iwssid"
+msgid "SSID"
 msgstr "SSID"
 
 #. MAC
 #: i18n/english/luasrc/i18n/admin-core.en.lua:69
-msgid "a_s_if_mac"
+msgid "MAC"
 msgstr "MAC"
 
 #. Pkts.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:70
-msgid "a_s_if_pkts"
+msgid "Pkts."
 msgstr "Πακέτ."
 
 #. Interface Status
 #: i18n/english/luasrc/i18n/admin-core.en.lua:71
-msgid "a_s_if_status"
+msgid "Interface Status"
 msgstr "Κατάσταση Διεπαφής"
 
 #. Transfer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:72
-msgid "a_s_if_transfer"
+msgid "Transfer"
 msgstr "Μεταφέρθηκαν"
 
 #. RX
 #: i18n/english/luasrc/i18n/admin-core.en.lua:73
-msgid "a_s_if_transfer_rx"
+msgid "RX"
 msgstr "RX"
 
 #. TX
 #: i18n/english/luasrc/i18n/admin-core.en.lua:74
-msgid "a_s_if_transfer_tx"
+msgid "TX"
 msgstr "TX"
 
 #. Type
 #: i18n/english/luasrc/i18n/admin-core.en.lua:75
-msgid "a_s_if_type"
+msgid "Type"
 msgstr "Τύπος"
 
 #. VLAN
 #: i18n/english/luasrc/i18n/admin-core.en.lua:76
-msgid "a_s_if_vlan"
+msgid "VLAN"
 msgstr "VLAN"
 
 #. Ports
 #: i18n/english/luasrc/i18n/admin-core.en.lua:77
-msgid "a_s_if_vlanports"
+msgid "Ports"
 msgstr "Θύρες"
 
 #. Wireless Adapter
 #: i18n/english/luasrc/i18n/admin-core.en.lua:78
-msgid "a_s_if_wifidev"
+msgid "Wireless Adapter"
 msgstr "Ασύρματος Προσαρμογές"
 
 #. Firewall
 #: i18n/english/luasrc/i18n/admin-core.en.lua:79
-msgid "a_s_ipt"
+msgid "Firewall"
 msgstr "Τείχος Προστασίας"
 
 #. Actions
 #: i18n/english/luasrc/i18n/admin-core.en.lua:80
-msgid "a_s_ipt_actions"
+msgid "Actions"
 msgstr "Ενέργειες"
 
 #. Traffic
 #: i18n/english/luasrc/i18n/admin-core.en.lua:81
-msgid "a_s_ipt_bytes"
+msgid "Traffic"
 msgstr "Κίνηση"
 
 #. Chain
 #: i18n/english/luasrc/i18n/admin-core.en.lua:82
-msgid "a_s_ipt_chain"
+msgid "Chain"
 msgstr "Αλυσίδα"
 
 #. Destination
 #: i18n/english/luasrc/i18n/admin-core.en.lua:83
-msgid "a_s_ipt_destination"
+msgid "Destination"
 msgstr "Προορισμός"
 
 #. Flags
 #: i18n/english/luasrc/i18n/admin-core.en.lua:84
-msgid "a_s_ipt_flags"
+msgid "Flags"
 msgstr "Σημαίες"
 
 #. In
 #: i18n/english/luasrc/i18n/admin-core.en.lua:85
-msgid "a_s_ipt_inputif"
+msgid "In"
 msgstr "Είσοδος"
 
 #. No chains in this table
 #: i18n/english/luasrc/i18n/admin-core.en.lua:86
-msgid "a_s_ipt_nochains"
+msgid "No chains in this table"
 msgstr "Δεν υπάρχουν αλυσίδες σε αυτόν τον πίνακα"
 
 #. No Rules in this chain
 #: i18n/english/luasrc/i18n/admin-core.en.lua:87
-msgid "a_s_ipt_norules"
+msgid "No Rules in this chain"
 msgstr "Δεν υπάρχουν κανόνες σε αυτή την αλυσίδα"
 
 #. Options
 #: i18n/english/luasrc/i18n/admin-core.en.lua:88
-msgid "a_s_ipt_options"
+msgid "Options"
 msgstr "Επιλογές"
 
 #. Out
 #: i18n/english/luasrc/i18n/admin-core.en.lua:89
-msgid "a_s_ipt_outputif"
+msgid "Out"
 msgstr "Έξοδος"
 
 #. Packets
 #: i18n/english/luasrc/i18n/admin-core.en.lua:90
-msgid "a_s_ipt_packets"
+msgid "Packets"
 msgstr "Πακέτα"
 
 #. Pkts.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:91
-msgid "a_s_ipt_pkts"
+msgid "Pkts."
 msgstr "Πακέτ."
 
 #. Policy
 #: i18n/english/luasrc/i18n/admin-core.en.lua:92
-msgid "a_s_ipt_policy"
+msgid "Policy"
 msgstr "Πολιτική"
 
 #. Prot.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:93
-msgid "a_s_ipt_prot"
+msgid "Prot."
 msgstr "Πρωτ."
 
 #. References
 #: i18n/english/luasrc/i18n/admin-core.en.lua:94
-msgid "a_s_ipt_references"
+msgid "References"
 msgstr "Αναφορές"
 
 #. Reset Counters
 #: i18n/english/luasrc/i18n/admin-core.en.lua:95
-msgid "a_s_ipt_reset"
+msgid "Reset Counters"
 msgstr "Μηδενισμός Μετρητών"
 
 #. Restart Firewall
 #: i18n/english/luasrc/i18n/admin-core.en.lua:96
-msgid "a_s_ipt_restart"
+msgid "Restart Firewall"
 msgstr "Επανεκκίνηση Τείχους Προστασίας"
 
 #. #
 #: i18n/english/luasrc/i18n/admin-core.en.lua:97
-msgid "a_s_ipt_rulenum"
+msgid "#"
 msgstr "#"
 
 #. Source
 #: i18n/english/luasrc/i18n/admin-core.en.lua:98
-msgid "a_s_ipt_source"
+msgid "Source"
 msgstr "Πηγή"
 
 #. Firewall Status
 #: i18n/english/luasrc/i18n/admin-core.en.lua:99
-msgid "a_s_ipt_status"
+msgid "Firewall Status"
 msgstr "Κατάσταση Τείχους Προστασίας"
 
 #. Table
 #: i18n/english/luasrc/i18n/admin-core.en.lua:100
-msgid "a_s_ipt_table"
+msgid "Table"
 msgstr "Πίνακας"
 
 #. Target
 #: i18n/english/luasrc/i18n/admin-core.en.lua:101
-msgid "a_s_ipt_target"
+msgid "Target"
 msgstr "Προορισμός"
 
 #. Perform Actions
 #: i18n/english/luasrc/i18n/admin-core.en.lua:102
-msgid "a_s_packages_do"
+msgid "Perform Actions"
 msgstr "Εκτέλεση Ενεργειών"
 
 #. Install
 #: i18n/english/luasrc/i18n/admin-core.en.lua:103
-msgid "a_s_packages_install"
+msgid "Install"
 msgstr "Εγκατάσταση"
 
 #. Download and install package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:104
-msgid "a_s_packages_installurl"
+msgid "Download and install package"
 msgstr "Κατέβασμα και εγκατάσταση πακέτου"
 
 #. Edit package lists and installation targets
 #: i18n/english/luasrc/i18n/admin-core.en.lua:105
-msgid "a_s_packages_ipkg"
+msgid "Edit package lists and installation targets"
 msgstr "Επεξεργασία λίστας πακέτων και προορισμών εγκατάστασης"
 
 #. Package name
 #: i18n/english/luasrc/i18n/admin-core.en.lua:106
-msgid "a_s_packages_name"
+msgid "Package name"
 msgstr "Όνομα πακέτου"
 
 #. Remove
 #: i18n/english/luasrc/i18n/admin-core.en.lua:107
-msgid "a_s_packages_remove"
+msgid "Remove"
 msgstr "Αφαίρεση"
 
 #. Find package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:108
-msgid "a_s_packages_search"
+msgid "Find package"
 msgstr "Εύρεση πακέτου"
 
 #. Package lists updated
 #: i18n/english/luasrc/i18n/admin-core.en.lua:109
-msgid "a_s_packages_update"
+msgid "Package lists updated"
 msgstr "Η λίστα πακέτων ενημερώθηκε"
 
 #. Update package lists
 #: i18n/english/luasrc/i18n/admin-core.en.lua:110
-msgid "a_s_packages_updatelist"
+msgid "Update package lists"
 msgstr "Ενημέρωση λίστας πακέτων"
 
 #. Upgrade installed packages
 #: i18n/english/luasrc/i18n/admin-core.en.lua:111
-msgid "a_s_packages_upgrade"
+msgid "Upgrade installed packages"
 msgstr "Αναβάθμιση εγκατεστημένων πακέτων"
 
 #. Could not set default destination
 #: i18n/english/luasrc/i18n/admin-core.en.lua:112
-msgid "a_s_packages_code1"
+msgid "Could not set default destination"
 msgstr "Αδυναμία χρήσης προεπιλεγμένου προορισμού"
 
 #. Error parsing config file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:113
-msgid "a_s_packages_code2"
+msgid "Error parsing config file"
 msgstr "Σφάλμα κατά την ανάλυση του αρχείου ρυθμίσεων"
 
 #. Could not create temporary directory (ran out of space?)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:114
-msgid "a_s_packages_code3"
+msgid "Could not create temporary directory (ran out of space?)"
 msgstr "Αδυναμία δημιουργίας προσωρινού φακέλου (δεν υπάρχει χώρος;)"
 
 #. Could not get adminstrative lock (ran out of space?)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:115
-msgid "a_s_packages_code4"
+msgid "Could not get adminstrative lock (ran out of space?)"
 msgstr "Αδυναμία κλειδώματος διαχειριστή (δεν υπάρχει χώρος;)"
 
 #. Unsatisfied Dependencies
 #: i18n/english/luasrc/i18n/admin-core.en.lua:116
-msgid "a_s_packages_code5"
+msgid "Unsatisfied Dependencies"
 msgstr "Μη-ικανοποιημένες Εξαρτήσεις"
 
 #. Refused to remove essential package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:117
-msgid "a_s_packages_code6"
+msgid "Refused to remove essential package"
 msgstr "Άρνηση αφαίρεσης απαραίτητου πακέτου"
 
 #. Package has dependents
 #: i18n/english/luasrc/i18n/admin-core.en.lua:118
-msgid "a_s_packages_code7"
+msgid "Package has dependents"
 msgstr "Το πακέτο έχει εξαρτημένα πακέτα"
 
 #. Package has no installation candidate (wrong name?)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:119
-msgid "a_s_packages_code8"
+msgid "Package has no installation candidate (wrong name?)"
 msgstr "Το πακέτο δεν έχει υποψήφιο εγκατάστασης (λάθος όνομα;)"
 
 #. Package has no available architecture 
 #: i18n/english/luasrc/i18n/admin-core.en.lua:120
-msgid "a_s_packages_code9"
+msgid "Package has no available architecture "
 msgstr "Το πακέτο δεν έχει διαθέσιμη αρχιτεκτονική "
 
 #. Package is not trusted
 #: i18n/english/luasrc/i18n/admin-core.en.lua:121
-msgid "a_s_packages_code10"
+msgid "Package is not trusted"
 msgstr "Το πακέτο δεν είναι έμπιστο"
 
 #. Error while downloading
 #: i18n/english/luasrc/i18n/admin-core.en.lua:122
-msgid "a_s_packages_code11"
+msgid "Error while downloading"
 msgstr "Σφάλμα κατά το κατέβασμα"
 
 #. Conflicts with other packages
 #: i18n/english/luasrc/i18n/admin-core.en.lua:123
-msgid "a_s_packages_code12"
+msgid "Conflicts with other packages"
 msgstr "Συγκρούεται με άλλα πακέτα"
 
 #. Package is already installed
 #: i18n/english/luasrc/i18n/admin-core.en.lua:124
-msgid "a_s_packages_code13"
+msgid "Package is already installed"
 msgstr "Το πακέτο είναι ήδη εγκατεστημένο"
 
 #. Package has unresolved dependencies
 #: i18n/english/luasrc/i18n/admin-core.en.lua:125
-msgid "a_s_packages_code14"
+msgid "Package has unresolved dependencies"
 msgstr "Το πακέτο έχει ανεπίλυτες εξαρτήσεις"
 
 #. Refused to downgrade package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:126
-msgid "a_s_packages_code15"
+msgid "Refused to downgrade package"
 msgstr "Άρνηση υποβάθμισης πακέτου"
 
 #. Package manager ran out of space
 #: i18n/english/luasrc/i18n/admin-core.en.lua:127
-msgid "a_s_packages_code16"
+msgid "Package manager ran out of space"
 msgstr "Ο διαχειριστής πακέτων δεν έχει χώρο"
 
 #. Bad signature while verifiying package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:128
-msgid "a_s_packages_code17"
+msgid "Bad signature while verifiying package"
 msgstr "Λάθος υπογραφή κατά την επιβεβαίωση του πακέτου"
 
 #. MD5 error while verifiying package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:129
-msgid "a_s_packages_code18"
+msgid "MD5 error while verifiying package"
 msgstr "Σφάλμα MD5 κατά την επιβεβαίωση του πακέτου"
 
 #. Internal error occured
 #: i18n/english/luasrc/i18n/admin-core.en.lua:130
-msgid "a_s_packages_code19"
+msgid "Internal error occured"
 msgstr "Εσωτερικό σφάλμα"
 
 #. Package lists
 #: i18n/english/luasrc/i18n/admin-core.en.lua:131
-msgid "a_s_p_ipkg_pkglists"
+msgid "Package lists"
 msgstr "Λίστες Πακέτων"
 
 #. Installation targets
 #: i18n/english/luasrc/i18n/admin-core.en.lua:132
-msgid "a_s_p_ipkg_targets"
+msgid "Installation targets"
 msgstr "Προορισμοί εγκατάστασης"
 
 #. Change the password of the system administrator (User <code>root</code>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:133
-msgid "a_s_changepw1"
+msgid "Change the password of the system administrator (User <code>root</code>)"
 msgstr ""
 "Αλλαγή κωδικού πρόσβασης του διαχειριστή του συστήματος (Χρήστης "
 "<code>root</code>)"
 
 #. Password successfully changed
 #: i18n/english/luasrc/i18n/admin-core.en.lua:134
-msgid "a_s_changepw_changed"
+msgid "Password successfully changed"
 msgstr "Ο κωδικός πρόσβασης αλλάχτηκε επιτυχώς"
 
 #. Error: Passwords do not match
 #: i18n/english/luasrc/i18n/admin-core.en.lua:135
-msgid "a_s_changepw_nomatch"
+msgid "Error: Passwords do not match"
 msgstr "Σφάλμα: Οι κωδικοί πρόσβασης δε συμπίπτουν"
 
 #. Here you can paste public <abbr title=\"Secure Shell\">SSH</abbr>-Keys (one per line) for <abbr title=\"Secure Shell\">SSH</abbr> public-key authentication.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:136
-msgid "a_s_sshkeys1"
+msgid "Here you can paste public <abbr title=\"Secure Shell\">SSH</abbr>-Keys (one per line) for <abbr title=\"Secure Shell\">SSH</abbr> public-key authentication."
 msgstr ""
 "Εδώ μπορείτε να επικολλήσετε δημόσια <abbr title=\"Secure "
 "Shell\">SSH</abbr>-κλειδιά (ένα ανά γραμμή) για εξουσιοδότηση "
@@ -735,46 +735,46 @@ msgstr ""
 
 #. Mount Points
 #: i18n/english/luasrc/i18n/admin-core.en.lua:137
-msgid "a_s_fstab_mountpoints"
+msgid "Mount Points"
 msgstr "Σημεία Προσάρτησης"
 
 #. Mount Points define at which point a memory device will be attached to the filesystem
 #: i18n/english/luasrc/i18n/admin-core.en.lua:138
-msgid "a_s_fstab_mountpoints1"
+msgid "Mount Points define at which point a memory device will be attached to the filesystem"
 msgstr ""
 "Τα σημεία προσάρτησης ορίζουν σε ποιο σημείο στο σύστημα αρχείων θα "
 "προσαρτηθεί μία συσκευή μνήμης"
 
 #. Mounted file systems
 #: i18n/english/luasrc/i18n/admin-core.en.lua:139
-msgid "a_s_fstab_active"
+msgid "Mounted file systems"
 msgstr "Προσαρτημένα συστήματα αρχείων"
 
 #. Used
 #: i18n/english/luasrc/i18n/admin-core.en.lua:140
-msgid "a_s_fstab_used"
+msgid "Used"
 msgstr "Σε χρήση"
 
 #. Available
 #: i18n/english/luasrc/i18n/admin-core.en.lua:141
-msgid "a_s_fstab_avail"
+msgid "Available"
 msgstr "Διαθέσιμο"
 
 #. Mount Point
 #: i18n/english/luasrc/i18n/admin-core.en.lua:142
-msgid "a_s_fstab_mountpoint"
+msgid "Mount Point"
 msgstr "Σημείο Προσάρτησης"
 
 #. The device file of the memory or partition (<abbr title=\"for example\">e.g.</abbr> <code>/dev/sda1</code>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:143
-msgid "a_s_fstab_device1"
+msgid "The device file of the memory or partition (<abbr title=\"for example\">e.g.</abbr> <code>/dev/sda1</code>)"
 msgstr ""
 "Το αρχείο συσκευής της μνήμης ή του διαμέρισματος (<abbr "
 "title=\"παραδείγματος χάρην\">π.χ.</abbr> <code>/dev/sda1</code>)"
 
 #. The filesystem that was used to format the memory (<abbr title=\"for example\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></samp>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:144
-msgid "a_s_fstab_fs1"
+msgid "The filesystem that was used to format the memory (<abbr title=\"for example\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></samp>)"
 msgstr ""
 "Το σύστημα αρχείων που χρησιμοποιήθηκε για διαμόρφωση (<abbr "
 "title=\"παραδείγματος χάρην\">π.χ.</abbr> <samp><abbr title=\"Third Extended "
@@ -782,7 +782,7 @@ msgstr ""
 
 #. If your physical memory is insufficient unused data can be temporarily swapped to a swap-device resulting in a higher amount of usable <abbr title=\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very slow process as the swap-device cannot be accessed with the high datarates of the <abbr title=\"Random Access Memory\">RAM</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:145
-msgid "a_s_fstab_swap1"
+msgid "If your physical memory is insufficient unused data can be temporarily swapped to a swap-device resulting in a higher amount of usable <abbr title=\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very slow process as the swap-device cannot be accessed with the high datarates of the <abbr title=\"Random Access Memory\">RAM</abbr>."
 msgstr ""
 "Αν η φυσική μνήμη δεν είναι αρκετή, μη-χρησιμοποιούμενα δεδομένα μπορούν "
 "προσωρινά να εναλλάσσονται σε μία συσκευή swap με αποτέλεσμα περισσότερη "
@@ -793,66 +793,66 @@ msgstr ""
 
 #. Reboots the operating system of your device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:146
-msgid "a_s_reboot1"
+msgid "Reboots the operating system of your device"
 msgstr "Επανεκκίνηση του λειτουργικού συστήματος της συσκευής σας"
 
 #. Perform reboot
 #: i18n/english/luasrc/i18n/admin-core.en.lua:147
-msgid "a_s_reboot_do"
+msgid "Perform reboot"
 msgstr "Εκτέλεση επανεκκίνησης"
 
 #. Please wait: Device rebooting...
 #: i18n/english/luasrc/i18n/admin-core.en.lua:148
-msgid "a_s_reboot_running"
+msgid "Please wait: Device rebooting..."
 msgstr "Παρακαλώ περιμένετε: Η συσκευή επανεκκινεί..."
 
 #. Warning: There are unsaved changes that will be lost while rebooting!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:149
-msgid "a_s_reboot_u"
+msgid "Warning: There are unsaved changes that will be lost while rebooting!"
 msgstr ""
 "Προειδοποίηση: Υπάρχουν μη-αποθηκευμένες αλλαγές που θα χαθούν κατά την "
 "επανεκκίνηση!"
 
 #. Changes applied.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:150
-msgid "a_s_applyreboot1"
+msgid "Changes applied."
 msgstr "Αλλαγές εφαρμόστηκαν."
 
 #. Backup / Restore
 #: i18n/english/luasrc/i18n/admin-core.en.lua:151
-msgid "a_s_backup"
+msgid "Backup / Restore"
 msgstr "Αντίγραφα Ασφαλείας"
 
 #. Create backup
 #: i18n/english/luasrc/i18n/admin-core.en.lua:152
-msgid "a_s_backup_backup"
+msgid "Create backup"
 msgstr "Δημιουργία αντίγραφου ασφαλείας"
 
 #. Backup Archive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:153
-msgid "a_s_backup_archive"
+msgid "Backup Archive"
 msgstr "Αρχείο αντιγράφων ασφαλείας"
 
 #. Reset router to defaults
 #: i18n/english/luasrc/i18n/admin-core.en.lua:154
-msgid "a_s_backup_reset"
+msgid "Reset router to defaults"
 msgstr "Επαναφορά δρομολογητή στα προεπιλεγμένα"
 
 #. Proceed reverting all settings and resetting to firmware defaults?
 #: i18n/english/luasrc/i18n/admin-core.en.lua:155
-msgid "a_s_backup_reset1"
+msgid "Proceed reverting all settings and resetting to firmware defaults?"
 msgstr ""
 "Θέλετε να προχωρήσετε στην αναίρεση όλων των ρυθμίσεων και την επαναφορά "
 "στις προεπιλεγμένες για το firmware;"
 
 #. Restore backup
 #: i18n/english/luasrc/i18n/admin-core.en.lua:156
-msgid "a_s_backup_restore"
+msgid "Restore backup"
 msgstr "Επαναφορά αντιγράφου ασφαλείας"
 
 #. Here you can backup and restore your router configuration and - if possible - reset the router to the default settings.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:157
-msgid "a_s_backup1"
+msgid "Here you can backup and restore your router configuration and - if possible - reset the router to the default settings."
 msgstr ""
 "Εδώ μπορείτε να κρατήσετε και να επαναφέρετε αντίγραφα ασφαλείας των "
 "παραμέτρων του δρομολογητή σας και - αν είναι δυνατόν - να επαναφέρετε τον "
@@ -860,24 +860,24 @@ msgstr ""
 
 #. <abbr title=\"Hypertext Transfer Protocol\">HTTP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:158
-msgid "a_srv_http"
+msgid "<abbr title=\"Hypertext Transfer Protocol\">HTTP</abbr>-Server"
 msgstr "Εξυπηρετητής <abbr title=\"Hypertext Transfer Protocol\">HTTP</abbr>"
 
 #. <abbr title=\"Secure Shell\">SSH</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:159
-msgid "a_srv_ssh"
+msgid "<abbr title=\"Secure Shell\">SSH</abbr>-Server"
 msgstr "Εξυπηρετητής <abbr title=\"Secure Shell\">SSH</abbr>"
 
 #. Services and daemons perform certain tasks on your device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:160
-msgid "a_srv_services1"
+msgid "Services and daemons perform certain tasks on your device."
 msgstr ""
 "Οι υπηρεσίες και οι δαίμονες εκτελούν κάποιες συγκεκριμένες εργασίες στην "
 "συσκευή σας."
 
 #. Most of them are network servers, that offer a certain service for your device or network like shell access, serving webpages like <abbr title=\"Lua Configuration Interface\">LuCI</abbr>, doing mesh routing, sending e-mails, ...
 #: i18n/english/luasrc/i18n/admin-core.en.lua:161
-msgid "a_srv_services2"
+msgid "Most of them are network servers, that offer a certain service for your device or network like shell access, serving webpages like <abbr title=\"Lua Configuration Interface\">LuCI</abbr>, doing mesh routing, sending e-mails, ..."
 msgstr ""
 "Οι περισσότεροι είναι εξυπηρετητές δικτύου που προσφέρουν κάποιες "
 "συγκεκριμένες υπηρεσίες για την συσκευή ή το δίκτυο σας όπως πρόσβαση στο "
@@ -886,58 +886,58 @@ msgstr ""
 
 #. A small webserver which can be used to serve <abbr title=\"Lua Configuration Interface\">LuCI</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:162
-msgid "a_srv_http1"
+msgid "A small webserver which can be used to serve <abbr title=\"Lua Configuration Interface\">LuCI</abbr>."
 msgstr ""
 "Ένας μικρός εξυπηρετητής web που μπορεί να χρησιμοποιηθεί για να εξυπηρετεί "
 "το <abbr title=\"Lua Configuration Interface\">LuCI</abbr>."
 
 #. Authentication Realm
 #: i18n/english/luasrc/i18n/admin-core.en.lua:163
-msgid "a_srv_http_authrealm"
+msgid "Authentication Realm"
 msgstr "Realm Εξουσιοδότησης"
 
 #. The realm which will be displayed at the authentication prompt for protected pages.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:164
-msgid "a_srv_http_authrealm1"
+msgid "The realm which will be displayed at the authentication prompt for protected pages."
 msgstr ""
 "Το realm που θα εμφανίζεται κατά την προτροπή για εξουσιοδότηση για τις "
 "προστατευμένες σελίδες."
 
 #. defaults to <code>/etc/httpd.conf</code>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:165
-msgid "a_srv_http_config1"
+msgid "defaults to <code>/etc/httpd.conf</code>"
 msgstr "προεπιλεγμένο <code>/etc/httpd.conf</code>"
 
 #. Document root
 #: i18n/english/luasrc/i18n/admin-core.en.lua:166
-msgid "a_srv_http_root"
+msgid "Document root"
 msgstr "Ρίζα εγγράφων"
 
 #. Enable Keep-Alive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:167
-msgid "a_srv_http_keepalive"
+msgid "Enable Keep-Alive"
 msgstr "Ενεργοποίηση Keep-Alive"
 
 #. Connection timeout
 #: i18n/english/luasrc/i18n/admin-core.en.lua:168
-msgid "a_srv_http_timeout"
+msgid "Connection timeout"
 msgstr "Χρόνος λήξης σύνδεσης"
 
 #. Plugin path
 #: i18n/english/luasrc/i18n/admin-core.en.lua:169
-msgid "a_srv_http_path"
+msgid "Plugin path"
 msgstr "Διαδρομή προσθέτων"
 
 #. A lightweight HTTP/1.1 webserver written in C and Lua designed to serve LuCI
 #: i18n/english/luasrc/i18n/admin-core.en.lua:170
-msgid "a_srv_lucittpd"
+msgid "A lightweight HTTP/1.1 webserver written in C and Lua designed to serve LuCI"
 msgstr ""
 "Ένας ελαφρύς εξυπηρετητής web HTTP/1.1 webserver γραμμένος σε C και Lua και "
 "σχεδιασμένος να εξυπηρετεί το LuCI"
 
 #. Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:171
-msgid "a_srv_dropbear1"
+msgid "Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
 msgstr ""
 "Το Dropbear προσφέρει πρόσβαση σε <abbr title=\"Secure Shell\">SSH</abbr> "
 "κέλυφος μέσω δικτύου και έναν ενσωματωμένο εξυπηρετητή <abbr title=\"Secure "
@@ -945,31 +945,31 @@ msgstr ""
 
 #. Password authentication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:172
-msgid "a_srv_d_pwauth"
+msgid "Password authentication"
 msgstr "Εξουσιοδότηση με κωδικό πρόσβασης"
 
 #. Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:173
-msgid "a_srv_d_pwauth1"
+msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
 msgstr ""
 "Επιτρέπει την εξουσιοδότηση <abbr title=\"Secure Shell\">SSH</abbr> με κωδικό "
 "πρόσβασης"
 
 #. Channel
 #: i18n/english/luasrc/i18n/admin-core.en.lua:174
-msgid "a_w_channel"
+msgid "Channel"
 msgstr "Κανάλι"
 
 #. On this pages you can find configuration options for <abbr title=\"Wireless Local Area Network\">WLAN</abbr> based wireless networks.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:175
-msgid "a_w_wifi1"
+msgid "On this pages you can find configuration options for <abbr title=\"Wireless Local Area Network\">WLAN</abbr> based wireless networks."
 msgstr ""
 "Σε αυτές τις σελίδες μπορείτε να βρείτε επιλογές για ασύρματα δίκτυα <abbr "
 "title=\"Wireless Local Area Network\">WLAN</abbr>."
 
 #. You can easily integrate your 802.11a/b/g/n-devices into your physical network and use the virtual adapter support to build wireless repeaters or offer several networks with one device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:176
-msgid "a_w_wifi2"
+msgid "You can easily integrate your 802.11a/b/g/n-devices into your physical network and use the virtual adapter support to build wireless repeaters or offer several networks with one device."
 msgstr ""
 "Μπορείτε εύκολα να ενσωματώσετε τις 802.11a/b/g/n συσκευές στο φυσικό σας "
 "δίκτυο και να χρησιμοποιήσετε την υποστήριξη για εικονικούς προσαρμογείς για "
@@ -978,7 +978,7 @@ msgstr ""
 
 #. There is support for Managed, Client, Ad-Hoc and <abbr title=\"Wireless Distribution System\">WDS</abbr> operating modes as well as <abbr title=\"Wi-Fi Protected Access\">WPA</abbr> and <abbr title=\"Wi-Fi Protected Access 2\">WPA2</abbr> encryption for secure communnication.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:177
-msgid "a_w_wifi3"
+msgid "There is support for Managed, Client, Ad-Hoc and <abbr title=\"Wireless Distribution System\">WDS</abbr> operating modes as well as <abbr title=\"Wi-Fi Protected Access\">WPA</abbr> and <abbr title=\"Wi-Fi Protected Access 2\">WPA2</abbr> encryption for secure communnication."
 msgstr ""
 "Υπάρχει υποστήριξη για λειτουργίες Σημείου Πρόσβασης, Πελάτη, Ad-Hoc και "
 "<abbr title=\"Wireless Distribution System\">WDS</abbr> όπως επίσης και "
@@ -987,42 +987,42 @@ msgstr ""
 
 #. Here you can configure installed wifi devices.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:178
-msgid "a_w_devices1"
+msgid "Here you can configure installed wifi devices."
 msgstr "Εδώ μπορείτε να ρυθμίσετε τις εγκατεστημένες ασύρματες συσκευές."
 
 #. Transmit Antenna
 #: i18n/english/luasrc/i18n/admin-core.en.lua:179
-msgid "a_w_txantenna"
+msgid "Transmit Antenna"
 msgstr "Κεραία Εκπομπής"
 
 #. Receive Antenna
 #: i18n/english/luasrc/i18n/admin-core.en.lua:180
-msgid "a_w_rxantenna"
+msgid "Receive Antenna"
 msgstr "Κεραία Λήψης"
 
 #. Distance to furthest station (in meter)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:181
-msgid "a_w_distance1"
+msgid "Distance to furthest station (in meter)"
 msgstr "Απόσταση από μακρινότερο σταθμό (σε μέτρα)"
 
 #. Diversity
 #: i18n/english/luasrc/i18n/admin-core.en.lua:182
-msgid "a_w_diversity"
+msgid "Diversity"
 msgstr "Διαφορική Λήψη"
 
 #. Country Code
 #: i18n/english/luasrc/i18n/admin-core.en.lua:183
-msgid "a_w_countrycode"
+msgid "Country Code"
 msgstr "Κωδικός Χώρας"
 
 #. Connection Limit
 #: i18n/english/luasrc/i18n/admin-core.en.lua:184
-msgid "a_w_connlimit"
+msgid "Connection Limit"
 msgstr "Όριο Συνδέσεων"
 
 #. You can run several wifi networks with one device. Be aware that there are certain hardware and driverspecific restrictions. Normally you can operate 1 Ad-Hoc or up to 3 Master-Mode and 1 Client-Mode network simultaneously.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:185
-msgid "a_w_networks1"
+msgid "You can run several wifi networks with one device. Be aware that there are certain hardware and driverspecific restrictions. Normally you can operate 1 Ad-Hoc or up to 3 Master-Mode and 1 Client-Mode network simultaneously."
 msgstr ""
 "Μια συσκευή μπορεί να λειτουργεί σε πολλά ασύρματα δίκτυα. Προσοχή όμως "
 "γιατί υπάρχουν κάποιοι περιορισμοί από το υλικό και τον οδηγό. Κανονικά, "
@@ -1031,93 +1031,93 @@ msgstr ""
 
 #. Network Name (<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:186
-msgid "a_w_netid"
+msgid "Network Name (<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>)"
 msgstr ""
 "Όνομα Δικτύου (<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>)"
 
 #. Add the Wifi network to physical network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:187
-msgid "a_w_network1"
+msgid "Add the Wifi network to physical network"
 msgstr "Προσθήκη Ασύρματου δικτύου σε φυσικό δίκτυο"
 
 #.  - Create new Network - 
 #: i18n/english/luasrc/i18n/admin-core.en.lua:188
-msgid "a_w_netmanual"
+msgid " - Create new Network - "
 msgstr " - Δημιουργία νέου Δικτύου - "
 
 #. Transmit Power
 #: i18n/english/luasrc/i18n/admin-core.en.lua:189
-msgid "a_w_txpwr"
+msgid "Transmit Power"
 msgstr "Ισχύς Εκπομπής"
 
 #. Broadcom Frameburst
 #: i18n/english/luasrc/i18n/admin-core.en.lua:190
-msgid "a_w_brcmburst"
+msgid "Broadcom Frameburst"
 msgstr "Broadcom Burst πλαισίων"
 
 #. Atheros Frameburst
 #: i18n/english/luasrc/i18n/admin-core.en.lua:191
-msgid "a_w_athburst"
+msgid "Atheros Frameburst"
 msgstr "Atheros Burst πλαισίων"
 
 #. RadiusServer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:192
-msgid "a_w_radiussrv"
+msgid "RadiusServer"
 msgstr "Εξυπηρετητής Radius"
 
 #. Radius-Port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:193
-msgid "a_w_radiusport"
+msgid "Radius-Port"
 msgstr "Θύρα Radius"
 
 #. AP-Isolation
 #: i18n/english/luasrc/i18n/admin-core.en.lua:194
-msgid "a_w_apisolation"
+msgid "AP-Isolation"
 msgstr "Απομόνωση AP"
 
 #. Prevents Client to Client communication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:195
-msgid "a_w_apisolation1"
+msgid "Prevents Client to Client communication"
 msgstr "Αποτρέπει την επικοινωνία μεταξύ Πελατών"
 
 #. Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:196
-msgid "a_w_hideessid"
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "Κρυφό <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
 #. Access Point
 #: i18n/english/luasrc/i18n/admin-core.en.lua:197
-msgid "a_w_ap"
+msgid "Access Point"
 msgstr "Σημείο Πρόσβασης"
 
 #. Ad-Hoc
 #: i18n/english/luasrc/i18n/admin-core.en.lua:198
-msgid "a_w_adhoc"
+msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
 #. Pseudo Ad-Hoc (ahdemo)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:199
-msgid "a_w_ahdemo"
+msgid "Pseudo Ad-Hoc (ahdemo)"
 msgstr "Ψευδό Ad-Hoc (ahdemo)"
 
 #. Client
 #: i18n/english/luasrc/i18n/admin-core.en.lua:200
-msgid "a_w_client"
+msgid "Client"
 msgstr "Πελάτης"
 
 #. WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:201
-msgid "a_w_wds"
+msgid "WDS"
 msgstr "WDS"
 
 #. Monitor
 #: i18n/english/luasrc/i18n/admin-core.en.lua:202
-msgid "a_w_monitor"
+msgid "Monitor"
 msgstr "Παρακολούθηση"
 
 #. Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> firewalls
 #: i18n/english/luasrc/i18n/admin-core.en.lua:203
-msgid "dhcp_dnsmasq_desc"
+msgid "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> firewalls"
 msgstr ""
 "Ο Dnsmasq είναι ένα συνδυασμός εξυπηρετητή <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr> και <abbr title=\"Domain Name "
@@ -1126,241 +1126,241 @@ msgstr ""
 
 #. Domain required
 #: i18n/english/luasrc/i18n/admin-core.en.lua:204
-msgid "dhcp_dnsmasq_domainneeded"
+msgid "Domain required"
 msgstr "Απαίτηση για όνομα τομέα"
 
 #. Don&#39;t forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without <abbr title=\"Domain Name System\">DNS</abbr>-Name
 #: i18n/english/luasrc/i18n/admin-core.en.lua:205
-msgid "dhcp_dnsmasq_domainneeded_desc"
+msgid "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without <abbr title=\"Domain Name System\">DNS</abbr>-Name"
 msgstr ""
 "Να μην προωθούνται ερωτήματα <abbr title=\"Domain Name System\">DNS</abbr> "
 "χωρίς όνομα τομέα <abbr title=\"Domain Name System\">DNS</abbr>"
 
 #. Authoritative
 #: i18n/english/luasrc/i18n/admin-core.en.lua:206
-msgid "dhcp_dnsmasq_authoritative"
+msgid "Authoritative"
 msgstr "Κύριος"
 
 #. This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> in the local network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:207
-msgid "dhcp_dnsmasq_authoritative_desc"
+msgid "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> in the local network"
 msgstr ""
 "Αυτός είναι ο μόνος <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> στο τοπικό δίκτυο"
 
 #. Filter private
 #: i18n/english/luasrc/i18n/admin-core.en.lua:208
-msgid "dhcp_dnsmasq_boguspriv"
+msgid "Filter private"
 msgstr "Φιλτράρισμα ιδιωτικών"
 
 #. Don&#39;t forward reverse lookups for local networks
 #: i18n/english/luasrc/i18n/admin-core.en.lua:209
-msgid "dhcp_dnsmasq_boguspriv_desc"
+msgid "Don't forward reverse lookups for local networks"
 msgstr "Να μην προωθούνται αντίστροφες αναζητήσεις για τοπικά δίκτυα"
 
 #. Filter useless
 #: i18n/english/luasrc/i18n/admin-core.en.lua:210
-msgid "dhcp_dnsmasq_filterwin2k"
+msgid "Filter useless"
 msgstr "Φιλτράρισμα άχρηστων"
 
 #. filter useless <abbr title=\"Domain Name System\">DNS</abbr>-queries of Windows-systems
 #: i18n/english/luasrc/i18n/admin-core.en.lua:211
-msgid "dhcp_dnsmasq_filterwin2k_desc"
+msgid "filter useless <abbr title=\"Domain Name System\">DNS</abbr>-queries of Windows-systems"
 msgstr ""
 "φιλτράρισμα άχρηστων ερωτημάτων <abbr title=\"Domain Name System\">DNS</abbr> "
 "των συστημάτων Windows"
 
 #. Localise queries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:212
-msgid "dhcp_dnsmasq_localisequeries"
+msgid "Localise queries"
 msgstr "Τοπικά ερωτήματα"
 
 #. localises the hostname depending on its subnet
 #: i18n/english/luasrc/i18n/admin-core.en.lua:213
-msgid "dhcp_dnsmasq_localisequeries_desc"
+msgid "localises the hostname depending on its subnet"
 msgstr "επιτρέπει τοπικό όνομα υπολογιστή με βάση το υποδίκτυο του"
 
 #. Local Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:214
-msgid "dhcp_dnsmasq_local"
+msgid "Local Server"
 msgstr "Τοπικός Διακομιστής"
 
 #. Local Domain
 #: i18n/english/luasrc/i18n/admin-core.en.lua:215
-msgid "dhcp_dnsmasq_domain"
+msgid "Local Domain"
 msgstr "Τοπικό Όνομα Τομέα"
 
 #. Expand Hosts
 #: i18n/english/luasrc/i18n/admin-core.en.lua:216
-msgid "dhcp_dnsmasq_expandhosts"
+msgid "Expand Hosts"
 msgstr "Ανάπτυξη ονομάτων υπολογιστών"
 
 #. adds domain names to hostentries in the resolv file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:217
-msgid "dhcp_dnsmasq_expandhosts_desc"
+msgid "adds domain names to hostentries in the resolv file"
 msgstr "προσθέτει τα ονόματα τομέα στις καταχωρήσεις του αρχείου resolv"
 
 #. don&#39;t cache unknown
 #: i18n/english/luasrc/i18n/admin-core.en.lua:218
-msgid "dhcp_dnsmasq_nonegcache"
+msgid "don't cache unknown"
 msgstr "να μην διατηρούνται στην λανθάνουσα μνήμη τα άγνωστα"
 
 #. prevents caching of negative <abbr title=\"Domain Name System\">DNS</abbr>-replies
 #: i18n/english/luasrc/i18n/admin-core.en.lua:219
-msgid "dhcp_dnsmasq_nonegcache_desc"
+msgid "prevents caching of negative <abbr title=\"Domain Name System\">DNS</abbr>-replies"
 msgstr ""
 "αποτρέπει τη διατήρηση των αρνητικών απαντήσεων <abbr title=\"Domain Name "
 "System\">DNS</abbr> στην λανθάνουσα μνήμη"
 
 #. Use <code>/etc/ethers</code>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:220
-msgid "dhcp_dnsmasq_readethers"
+msgid "Use <code>/etc/ethers</code>"
 msgstr "Χρήση <code>/etc/ethers</code>"
 
 #. Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:221
-msgid "dhcp_dnsmasq_readethers_desc"
+msgid "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server"
 msgstr ""
 "Διάβασμα του <code>/etc/ethers</code> για την παραμετροποίηση του "
 "εξυπηρετητή <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 
 #. Leasefile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:222
-msgid "dhcp_dnsmasq_leasefile"
+msgid "Leasefile"
 msgstr "Αρχείο Leases"
 
 #. file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-leases will be stored
 #: i18n/english/luasrc/i18n/admin-core.en.lua:223
-msgid "dhcp_dnsmasq_leasefile_desc"
+msgid "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-leases will be stored"
 msgstr ""
 "αρχείο όπου θα αποθηκεύονται τα Leases του <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>"
 
 #. Resolvfile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:224
-msgid "dhcp_dnsmasq_resolvfile"
+msgid "Resolvfile"
 msgstr "Αρχείο Resolv"
 
 #. local <abbr title=\"Domain Name System\">DNS</abbr> file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:225
-msgid "dhcp_dnsmasq_resolvfile_desc"
+msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "τοπικό αρχείο <abbr title=\"Domain Name System\">DNS</abbr>"
 
 #. Ignore <code>/etc/hosts</code>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:226
-msgid "dhcp_dnsmasq_nohosts"
+msgid "Ignore <code>/etc/hosts</code>"
 msgstr "Αγνόησε <code>/etc/hosts</code>"
 
 #. Strict order
 #: i18n/english/luasrc/i18n/admin-core.en.lua:227
-msgid "dhcp_dnsmasq_strictorder"
+msgid "Strict order"
 msgstr "Αυστηρή σειρά"
 
 #. <abbr title=\"Domain Name System\">DNS</abbr>-Server will be queried in the order of the resolvfile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:228
-msgid "dhcp_dnsmasq_strictorder_desc"
+msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Server will be queried in the order of the resolvfile"
 msgstr ""
 "Ο εξυπηρετητής <abbr title=\"Domain Name System\">DNS</abbr> θα ερωτάται με "
 "την σειρά που δηλώνεται στο αρχείο resolv"
 
 #. Log queries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:229
-msgid "dhcp_dnsmasq_logqueries"
+msgid "Log queries"
 msgstr "Καταγραφή ερωτημάτων"
 
 #. Ignore resolve file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:230
-msgid "dhcp_dnsmasq_noresolv"
+msgid "Ignore resolve file"
 msgstr "Αγνόησε αρχείου resolve"
 
 #. concurrent queries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:231
-msgid "dhcp_dnsmasq_dnsforwardmax"
+msgid "concurrent queries"
 msgstr "ταυτόχρονα ερωτήματα"
 
 #. <abbr title=\"Domain Name System\">DNS</abbr>-Port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:232
-msgid "dhcp_dnsmasq_port"
+msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Port"
 msgstr "Θύρα <abbr title=\"Domain Name System\">DNS</abbr>"
 
 #. <abbr title=\"maximal\">max.</abbr> <abbr title=\"Extension Mechanisms for Domain Name System\">EDNS0</abbr> paket size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:233
-msgid "dhcp_dnsmasq_ednspacket_max"
+msgid "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Extension Mechanisms for Domain Name System\">EDNS0</abbr> paket size"
 msgstr ""
 "<abbr title=\"μέγιστο\">μεγ.</abbr> μέγεθος πακέτου <abbr title=\"Extension "
 "Mechanisms for Domain Name System\">EDNS0</abbr>"
 
 #. <abbr title=\"maximal\">max.</abbr> <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:234
-msgid "dhcp_dnsmasq_dhcpleasemax"
+msgid "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Leases"
 msgstr ""
 "<abbr title=\"μέγιστα\">μεγ.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr>-Leases"
 
 #. additional hostfile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:235
-msgid "dhcp_dnsmasq_addnhosts"
+msgid "additional hostfile"
 msgstr "επιπλέον αρχείο ονομάτων υπολογιστών"
 
 #. query port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:236
-msgid "dhcp_dnsmasq_queryport"
+msgid "query port"
 msgstr "θύρα ερωτημάτων"
 
 #. Enable TFTP-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:237
-msgid "dhcp_dnsmasq_enabletftp"
+msgid "Enable TFTP-Server"
 msgstr "Ενεργός εξυπηρετητής TFTP"
 
 #. TFTP-Server Root
 #: i18n/english/luasrc/i18n/admin-core.en.lua:238
-msgid "dhcp_dnsmasq_tftproot"
+msgid "TFTP-Server Root"
 msgstr "Ρίζα εξυπηρετητή TFTP"
 
 #. Network Boot Image
 #: i18n/english/luasrc/i18n/admin-core.en.lua:239
-msgid "dhcp_dnsmasq_dhcpboot"
+msgid "Network Boot Image"
 msgstr "Εικόνα Εκκίνησης Δικτύου"
 
 #. Switch
 #: i18n/english/luasrc/i18n/admin-core.en.lua:240
-msgid "a_n_switch"
+msgid "Switch"
 msgstr "Switch"
 
 #. Active Connections
 #: i18n/english/luasrc/i18n/admin-core.en.lua:241
-msgid "a_n_conntrack"
+msgid "Active Connections"
 msgstr "Ενεργές Συνδέσεις"
 
 #. This page gives an overview over currently active network connections.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:242
-msgid "a_n_conntrack_desc"
+msgid "This page gives an overview over currently active network connections."
 msgstr ""
 "Αυτή η σελίδα δίνει μία εικόνα για τις τρέχουσες ενεργές συνδέσεις δικτύου."
 
 #. Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:243
-msgid "a_n_routes"
+msgid "Routes"
 msgstr "Διαδρομές"
 
 #. IPv4 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:244
-msgid "a_n_routes4"
+msgid "IPv4 Routes"
 msgstr "Διαδρομές IPv4"
 
 #. IPv6 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:245
-msgid "a_n_routes6"
+msgid "IPv6 Routes"
 msgstr "Διαδρομές IPv6"
 
 #. In this area you find all network-related settings.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:246
-msgid "a_network1"
+msgid "In this area you find all network-related settings."
 msgstr "Σε αυτή την περιοχή θα βρείτε όλες τις σχετικές με το δίκτυο ρυθμίσεις."
 
 #. On most routers the network switch can be freely configured and splitted up into several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:247
-msgid "a_network2"
+msgid "On most routers the network switch can be freely configured and splitted up into several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s."
 msgstr ""
 "Στους περισσότερους δρομολογητές το switch δικτύου μπορεί ελεύθερα να "
 "ρυθμιστεί και να χωριστεί σε πολλά <abbr title=\"Virtual Local Area "
@@ -1368,7 +1368,7 @@ msgstr ""
 
 #. Interfaces and <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> / <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Settings allow a custom organisation of the network and connections to other networks like the internet.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:248
-msgid "a_network3"
+msgid "Interfaces and <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> / <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Settings allow a custom organisation of the network and connections to other networks like the internet."
 msgstr ""
 "Διεπαφές και ρυθμίσεις <abbr title=\"Point-to-Point Protocol over "
 "Ethernet\">PPPoE</abbr> / <abbr title=\"Point-to-Point Tunneling "
@@ -1377,7 +1377,7 @@ msgstr ""
 
 #. With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> devices in your local network can be automatically configured for network communication.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:249
-msgid "a_network4"
+msgid "With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> devices in your local network can be automatically configured for network communication."
 msgstr ""
 "Με τον <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>, "
 "συσκευές στο τοπικό σας δίκτυο μπορούν να ρυθμιστούν αυτόματα για δικτυακή "
@@ -1385,7 +1385,7 @@ msgstr ""
 
 #. Firewall and portforwarding can be used to secure your network while providing services to external networks.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:250
-msgid "a_network5"
+msgid "Firewall and portforwarding can be used to secure your network while providing services to external networks."
 msgstr ""
 "Το Τείχος Προστασίας και η προώθηση θυρών μπορούν να χρησιμοποιηθούν για να "
 "ασφαλίσουν το δίκτυο σας ενώ ταυτόχρονα προσφέρουν υπηρεσίες σε εξωτερικά "
@@ -1393,7 +1393,7 @@ msgstr ""
 
 #. The network ports on your router can be combined to several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s in which computers can communicate directly with each other. <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s are often used to separate different network segments. Often there is by default one Uplink port for a connection to the next greater network like the internet and other ports for a local network.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:251
-msgid "a_n_switch1"
+msgid "The network ports on your router can be combined to several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s in which computers can communicate directly with each other. <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s are often used to separate different network segments. Often there is by default one Uplink port for a connection to the next greater network like the internet and other ports for a local network."
 msgstr ""
 "Οι πόρτες δικτύου του δρομολογητή σας μπορούν να συνδυαστούν σε πολλά <abbr "
 "title=\"Virtual Local Area Network\">VLAN</abbr>s όπου οι υπολογιστές να "
@@ -1405,7 +1405,7 @@ msgstr ""
 
 #. Ports belonging to a <abbr title=\"Virtual Local Area Network\">VLAN</abbr> are separated with spaces. The port with the highest number (usually 5) is oftern the connection to the internal network interface of the router. On devices with 5 ports often the one with the lowest number (0) is the predefined Uplink port.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:252
-msgid "network_switch_desc"
+msgid "Ports belonging to a <abbr title=\"Virtual Local Area Network\">VLAN</abbr> are separated with spaces. The port with the highest number (usually 5) is oftern the connection to the internal network interface of the router. On devices with 5 ports often the one with the lowest number (0) is the predefined Uplink port."
 msgstr ""
 "Οι πόρτες που ανήκουν σε ένα <abbr title=\"Virtual Local Area "
 "Network\">VLAN</abbr> χωρίζονται με κενό. Η πόρτα με το μεγαλύτερο αριθμό "
@@ -1415,7 +1415,7 @@ msgstr ""
 
 #. On this page you can configure the network interfaces. You can bridge several interfaces by ticking the &quot;bridge interfaces&quot; field and enter the names of several network interfaces separated by spaces. You can also use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation <samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: <samp>eth0.1</samp>).
 #: i18n/english/luasrc/i18n/admin-core.en.lua:253
-msgid "a_n_ifaces1"
+msgid "On this page you can configure the network interfaces. You can bridge several interfaces by ticking the \"bridge interfaces\" field and enter the names of several network interfaces separated by spaces. You can also use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation <samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: <samp>eth0.1</samp>)."
 msgstr ""
 "Σε αυτή τη σελίδα μπορείτε να ρυθμίσετε τις διεπαφές δικτύου. Μπορείτε να "
 "γεφυρώσετε πολλαπλές διεπαφές τικάροντας το πεδίο &quot;γεφύρωμα "
@@ -1426,25 +1426,25 @@ msgstr ""
 
 #. Bridge interfaces
 #: i18n/english/luasrc/i18n/admin-core.en.lua:254
-msgid "a_n_i_bridge"
+msgid "Bridge interfaces"
 msgstr "Γεφύρωμα διεπαφών"
 
 #. creates a bridge over specified interface(s)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:255
-msgid "a_n_i_bridge1"
+msgid "creates a bridge over specified interface(s)"
 msgstr "δημιουργεί μία γέφυρα μεταξύ των ορισμένων διεπαφών"
 
 #. Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>
-msgid "a_n_i_stp"
+msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 msgstr ""
 
 #. Enables the Spanning Tree Protocol on this bridge
-msgid "a_n_i_stp1"
+msgid "Enables the Spanning Tree Protocol on this bridge"
 msgstr ""
 
 #. With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> network members can automatically receive their network settings (<abbr title=\"Internet Protocol\">IP</abbr>-address, netmask, <abbr title=\"Domain Name System\">DNS</abbr>-server, ...).
 #: i18n/english/luasrc/i18n/admin-core.en.lua:256
-msgid "dhcp_desc"
+msgid "With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> network members can automatically receive their network settings (<abbr title=\"Internet Protocol\">IP</abbr>-address, netmask, <abbr title=\"Domain Name System\">DNS</abbr>-server, ...)."
 msgstr ""
 "Με τον <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> τα μέλη "
 "του δικτύου μπορούν αυτόματα να λάβουν τις ρυθμίσεις δικτύου τους "
@@ -1453,81 +1453,81 @@ msgstr ""
 
 #. Leasetime
 #: i18n/english/luasrc/i18n/admin-core.en.lua:257
-msgid "dhcp_dhcp_leasetime"
+msgid "Leasetime"
 msgstr "Χρόνος Lease"
 
 #. Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:258
-msgid "dhcp_dhcp_dynamicdhcp"
+msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 msgstr "Δυναμικό <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 
 #. Ignore interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:259
-msgid "dhcp_dhcp_ignore"
+msgid "Ignore interface"
 msgstr "Αγνόησε διεπαφή"
 
 #. disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for this interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:260
-msgid "dhcp_dhcp_ignore_desc"
+msgid "disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for this interface"
 msgstr ""
 "απενεργοποίηση <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
 "για αυτή τη διεπαφή"
 
 #. Force
 #: i18n/english/luasrc/i18n/admin-core.en.lua:261
-msgid "dhcp_dhcp_force"
+msgid "Force"
 msgstr "Επιβολή"
 
 #. first address (last octet)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:262
-msgid "dhcp_dhcp_start_desc"
+msgid "first address (last octet)"
 msgstr "πρώτη διεύθυνση (τελευταίο octet)"
 
 #. number of leased addresses -1
 #: i18n/english/luasrc/i18n/admin-core.en.lua:263
-msgid "dhcp_dhcp_limit_desc"
+msgid "number of leased addresses -1"
 msgstr "αριθμός διευθύνσεων lease -1"
 
 #. DHCP-Options
 #: i18n/english/luasrc/i18n/admin-core.en.lua:264
-msgid "dhcp_dhcp_dhcpoption"
+msgid "DHCP-Options"
 msgstr "Επιλογές DHCP"
 
 #. See &quot;dnsmasq --help dhcp&quot; for a list of available options.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:265
-msgid "dhcp_dhcp_dhcpoption_desc"
+msgid "See \"dnsmasq --help dhcp\" for a list of available options."
 msgstr ""
 "Βλέπε &quot;dnsmasq --help dhcp&quot; για τη λίστα με τις διαθέσιμες "
 "επιλογές."
 
 #. Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:266
-msgid "dhcp_leases"
+msgid "Leases"
 msgstr "Leases"
 
 #. Static Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:267
-msgid "luci_ethers"
+msgid "Static Leases"
 msgstr "Στατικά Leases"
 
 #. Leasetime remaining
 #: i18n/english/luasrc/i18n/admin-core.en.lua:268
-msgid "dhcp_timeremain"
+msgid "Leasetime remaining"
 msgstr "Υπόλοιπο χρόνου Lease"
 
 #. Active Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:269
-msgid "dhcp_leases_active"
+msgid "Active Leases"
 msgstr "Ενεργά Leases"
 
 #. Point-to-Point Connections
 #: i18n/english/luasrc/i18n/admin-core.en.lua:270
-msgid "a_n_ptp"
+msgid "Point-to-Point Connections"
 msgstr "Συνδέσεις Σημείου-προς-Σημείο"
 
 #. Point-to-Point connections with <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> or <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr> are often used to connect a device over <abbr title=\"Digital Subscriber Line\">DSL</abbr> or similar technologies to an internet access point.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:271
-msgid "a_n_ptp1"
+msgid "Point-to-Point connections with <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> or <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr> are often used to connect a device over <abbr title=\"Digital Subscriber Line\">DSL</abbr> or similar technologies to an internet access point."
 msgstr ""
 "Οι συνδέσεις Σημείου-προς-Σημείο με <abbr title=\"Point-to-Point Protocol "
 "over Ethernet\">PPPoE</abbr> ή <abbr title=\"Point-to-Point Tunneling "
@@ -1537,7 +1537,7 @@ msgstr ""
 
 #. You need to install &quot;comgt&quot; for UMTS/GPRS, &quot;ppp-mod-pppoe&quot; for PPPoE, &quot;ppp-mod-pppoa&quot; for PPPoA or &quot;pptp&quot; for PPtP support
 #: i18n/english/luasrc/i18n/admin-core.en.lua:272
-msgid "network_interface_prereq"
+msgid "You need to install \"comgt\" for UMTS/GPRS, \"ppp-mod-pppoe\" for PPPoE, \"ppp-mod-pppoa\" for PPPoA or \"pptp\" for PPtP support"
 msgstr ""
 "Θα πρέπει να εγκαταστήσετε το &quot;comgt&quot; για υποστήριξη UMTS/GPRS, το "
 "&quot;ppp-mod-pppoe&quot; για PPPoE, το &quot;ppp-mod-pppoa&quot; για PPPoA "
@@ -1545,717 +1545,717 @@ msgstr ""
 
 #. You need to install &quot;ppp-mod-pppoe&quot; for PPPoE or &quot;pptp&quot; for PPtP support
 #: i18n/english/luasrc/i18n/admin-core.en.lua:273
-msgid "network_interface_prereq_mini"
+msgid "You need to install \"ppp-mod-pppoe\" for PPPoE or \"pptp\" for PPtP support"
 msgstr ""
 "Χρειάζεται να εγκαταστήσετε το &quot;ppp-mod-pppoe&quot; για υποστήριξη "
 "PPPoE ή το &quot;pptp&quot; για υποστήριξη PPtP"
 
 #. <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:274
-msgid "network_interface_server"
+msgid "<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"
 msgstr ""
 "Εξυπηρετητής <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>"
 
 #. Automatic Disconnect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:275
-msgid "network_interface_demand"
+msgid "Automatic Disconnect"
 msgstr "Αυτόματη Αποσύνδεση"
 
 #. Time (in seconds) after which an unused connection will be closed
 #: i18n/english/luasrc/i18n/admin-core.en.lua:276
-msgid "network_interface_demand_desc"
+msgid "Time (in seconds) after which an unused connection will be closed"
 msgstr ""
 "Χρόνος (σε δευτερόλεπτα) ύστερα από τον οποίο οι αχρησιμοποίητες συνδέσεις "
 "θα κλείνουν"
 
 #. Keep-Alive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:277
-msgid "network_interface_keepalive"
+msgid "Keep-Alive"
 msgstr "Keep-Alive"
 
 #. Number of failed connection tests to initiate automatic reconnect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:278
-msgid "network_interface_keepalive_desc"
+msgid "Number of failed connection tests to initiate automatic reconnect"
 msgstr ""
 "Αριθμός αποτυχημένων δοκιμών για την εφαρμογή της αυτόματης επανασύνδεσης"
 
 #. Modem device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:279
-msgid "network_interface_device"
+msgid "Modem device"
 msgstr "Συσκευή Modem"
 
 #. The device node of your modem, e.g. /dev/ttyUSB0
 #: i18n/english/luasrc/i18n/admin-core.en.lua:280
-msgid "network_interface_device_desc"
+msgid "The device node of your modem, e.g. /dev/ttyUSB0"
 msgstr "Ο κόμβος συσκευής του modem σας, π.χ. /dev/ttyUSB0"
 
 #. Replace default route
 #: i18n/english/luasrc/i18n/admin-core.en.lua:281
-msgid "network_interface_defaultroute"
+msgid "Replace default route"
 msgstr "Αντικατάσταση προεπιλεγμένης διαδρομής"
 
 #. Let pppd replace the current default route to use the PPP interface after successful connect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:282
-msgid "network_interface_defaultroute_desc"
+msgid "Let pppd replace the current default route to use the PPP interface after successful connect"
 msgstr ""
 "Το pppd να αντικαθιστά την τρέχουσα προεπιλεγμένη διαδρομή για να "
 "χρησιμοποιείται η διεπαφή PPP μετά από επιτυχημένη σύνδεση"
 
 #. Use peer DNS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:283
-msgid "network_interface_peerdns"
+msgid "Use peer DNS"
 msgstr "Χρήση DNS ομότιμου"
 
 #. Configure the local DNS server to use the name servers adverticed by the PPP peer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:284
-msgid "network_interface_peerdns_desc"
+msgid "Configure the local DNS server to use the name servers adverticed by the PPP peer"
 msgstr ""
 "Ρύθμιση του τοπικού εξυπηρετητή DNS να χρησιμοποιεί τους εξυπηρετητές "
 "ονόματος που διαφημίζει ο ομότιμος PPP"
 
 #. Enable IPv6 on PPP link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:285
-msgid "network_interface_ipv6"
+msgid "Enable IPv6 on PPP link"
 msgstr "Ενεργοποίηση IPv6 σε ζεύξη PPP"
 
 #. Connect script
 #: i18n/english/luasrc/i18n/admin-core.en.lua:286
-msgid "network_interface_connect"
+msgid "Connect script"
 msgstr "Σενάριο σύνδεσης"
 
 #. Let pppd run this script after establishing the PPP link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:287
-msgid "network_interface_connect_desc"
+msgid "Let pppd run this script after establishing the PPP link"
 msgstr "Το pppd να τρέχει αυτό το σενάριο όταν η ζεύξη PPP εγκαθιδρύεται"
 
 #. Disconnect script
 #: i18n/english/luasrc/i18n/admin-core.en.lua:288
-msgid "network_interface_disconnect"
+msgid "Disconnect script"
 msgstr "Σενάριο αποσύνδεσης"
 
 #. Let pppd run this script before tearing down the PPP link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:289
-msgid "network_interface_disconnect_desc"
+msgid "Let pppd run this script before tearing down the PPP link"
 msgstr "Το pppd να τρέχει αυτό το σενάριο πριν η ζεύξη PPP κλείσει"
 
 #. Additional pppd options
 #: i18n/english/luasrc/i18n/admin-core.en.lua:290
-msgid "network_interface_pppd_options"
+msgid "Additional pppd options"
 msgstr "Επιπλέον επιλογές pppd"
 
 #. Specify additional command line arguments for pppd here
 #: i18n/english/luasrc/i18n/admin-core.en.lua:291
-msgid "network_interface_pppd_options_desc"
+msgid "Specify additional command line arguments for pppd here"
 msgstr "Ορισμός επιπλέον επιλογών pppd στην γραμμή εντολών"
 
 #. Access point (APN)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:292
-msgid "network_interface_apn"
+msgid "Access point (APN)"
 msgstr "Σημείο πρόσβασης (APN)"
 
 #. PIN code
 #: i18n/english/luasrc/i18n/admin-core.en.lua:293
-msgid "network_interface_pincode"
+msgid "PIN code"
 msgstr "Κωδικός PIN"
 
 #. Make sure that you provide the correct pin code here or you might lock your sim card!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:294
-msgid "network_interface_pincode_desc"
+msgid "Make sure that you provide the correct pin code here or you might lock your sim card!"
 msgstr ""
 "Εξασφαλίστε ότι δηλώνετε το σωστό κωδικό pin εδώ αλλιώς μπορεί να κλειδώσετε "
 "την κάρτα sim σας!"
 
 #. Service type
 #: i18n/english/luasrc/i18n/admin-core.en.lua:295
-msgid "network_interface_service"
+msgid "Service type"
 msgstr "Τύπος υπηρεσίες"
 
 #. Setup wait time
 #: i18n/english/luasrc/i18n/admin-core.en.lua:296
-msgid "network_interface_maxwait"
+msgid "Setup wait time"
 msgstr "Καθορισμός χρόνου αναμονής"
 
 #. Seconds to wait for the modem to become ready before attempting to connect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:297
-msgid "network_interface_maxwait_desc"
+msgid "Seconds to wait for the modem to become ready before attempting to connect"
 msgstr ""
 "Δευτερόλεπτα αναμονής ώστε το modem να προετοιμαστεί πριν την προσπάθεια για "
 "σύνδεση"
 
 #. PPPoA Encapsulation
 #: i18n/english/luasrc/i18n/admin-core.en.lua:298
-msgid "network_interface_encaps"
+msgid "PPPoA Encapsulation"
 msgstr "Ενθυλάκωση PPPoA"
 
 #. Routes specify over which interface and gateway a certain host or network can be reached.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:299
-msgid "a_n_r_routes1"
+msgid "Routes specify over which interface and gateway a certain host or network can be reached."
 msgstr ""
 "Οι διαδρομές ορίζουν τη διεπαφή και πύλη από την οποία κάποιος υπολογιστής ή "
 "δίκτυο μπορεί να είναι προσβάσιμο/ς."
 
 #. Static Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:300
-msgid "a_n_routes_static"
+msgid "Static Routes"
 msgstr "Στατικές Διαδρομές"
 
 #. Static IPv4 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:301
-msgid "a_n_routes_static4"
+msgid "Static IPv4 Routes"
 msgstr "Στατικές Διαδρομές IPv4"
 
 #. Static IPv6 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:302
-msgid "a_n_routes_static6"
+msgid "Static IPv6 Routes"
 msgstr "Στατικές Διαδρομές IPv6"
 
 #. Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:303
-msgid "a_n_routes_kernel4"
+msgid "Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes"
 msgstr "Ενεργές Διαδρομές <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
 
 #. Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:304
-msgid "a_n_routes_kernel6"
+msgid "Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes"
 msgstr "Ενεργές Διαδρομές <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>"
 
 #. Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:305
-msgid "a_n_r_target1"
+msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
 msgstr "<abbr title=\"Internet Protocol Address\">IP</abbr> Υπολογιστή ή Δικτύου"
 
 #. <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network (CIDR)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:306
-msgid "a_n_r_target6"
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network (CIDR)"
 msgstr ""
 "Διεύθυνση <abbr title=\"Internet Protocol Version 6\">IPv6</abbr> ή Δίκτυο "
 "(CIDR)"
 
 #. if target is a network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:307
-msgid "a_n_r_netmask1"
+msgid "if target is a network"
 msgstr "αν ο στόχος είναι ένα δίκτυο"
 
 #. Internet Connection
 #: i18n/english/luasrc/i18n/admin-core.en.lua:308
-msgid "m_n_inet"
+msgid "Internet Connection"
 msgstr "Σύνδεση με Διαδίκτυο"
 
 #. Local Network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:309
-msgid "m_n_local"
+msgid "Local Network"
 msgstr "Τοπικό Δίκτυο"
 
 #. Route
 #: i18n/english/luasrc/i18n/admin-core.en.lua:310
-msgid "m_n_route"
+msgid "Route"
 msgstr "Διαδρομή"
 
 #. Bridge
 #: i18n/english/luasrc/i18n/admin-core.en.lua:311
-msgid "m_n_brdige"
+msgid "Bridge"
 msgstr "Γέφυρα"
 
 #. Provide (Access Point)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:312
-msgid "m_w_ap"
+msgid "Provide (Access Point)"
 msgstr "Παροχή (Σημείο Πρόσβασης)"
 
 #. Independent (Ad-Hoc)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:313
-msgid "m_w_adhoc"
+msgid "Independent (Ad-Hoc)"
 msgstr "Ανεξάρτητο (Ad-Hoc)"
 
 #. Join (Client)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:314
-msgid "m_w_client"
+msgid "Join (Client)"
 msgstr "Συμμετοχή (Πελάτης)"
 
 #. Distributed (<abbr title=\"Wireless Distribution System\">WDS</abbr>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:315
-msgid "m_w_wds"
+msgid "Distributed (<abbr title=\"Wireless Distribution System\">WDS</abbr>)"
 msgstr "Κατανεμημένο (<abbr title=\"Wireless Distribution System\">WDS</abbr>)"
 
 #. Clientmode
 #: i18n/english/luasrc/i18n/admin-core.en.lua:316
-msgid "m_w_clientmode"
+msgid "Clientmode"
 msgstr "Λειτουργία Πελάτη"
 
 #. System log buffer size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:317
-msgid "system_system_logsize"
+msgid "System log buffer size"
 msgstr "Μέγεθος αρχείου καταγραφής Συστήματος"
 
 #. External system log server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:318
-msgid "system_system_logip"
+msgid "External system log server"
 msgstr "Εξωτερικός εξυπηρετητής καταγραφής συστήματος"
 
 #. Log output level
 #: i18n/english/luasrc/i18n/admin-core.en.lua:319
-msgid "system_system_conloglevel"
+msgid "Log output level"
 msgstr "Επίπεδο εξόδου καταγραφής"
 
 #. Level of log messages on the console
 #: i18n/english/luasrc/i18n/admin-core.en.lua:320
-msgid "system_system_conloglevel_desc"
+msgid "Level of log messages on the console"
 msgstr "Επίπεδο των μηνυμάτων καταγραφής στην κονσόλα"
 
 #. Processor
 #: i18n/english/luasrc/i18n/admin-core.en.lua:321
-msgid "m_i_processor"
+msgid "Processor"
 msgstr "Επεξεργαστής"
 
 #. Memory
 #: i18n/english/luasrc/i18n/admin-core.en.lua:322
-msgid "m_i_memory"
+msgid "Memory"
 msgstr "Μνήμη"
 
 #. Local Time
 #: i18n/english/luasrc/i18n/admin-core.en.lua:323
-msgid "m_i_systemtime"
+msgid "Local Time"
 msgstr "Τοπική Ώρα"
 
 #. Uptime
 #: i18n/english/luasrc/i18n/admin-core.en.lua:324
-msgid "m_i_uptime"
+msgid "Uptime"
 msgstr "Χρόνος εν λειτουργία"
 
 #. First leased address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:325
-msgid "m_n_d_firstaddress"
+msgid "First leased address"
 msgstr "Πρώτη διεύθυνση lease"
 
 #. Number of leased addresses
 #: i18n/english/luasrc/i18n/admin-core.en.lua:326
-msgid "m_n_d_numleases"
+msgid "Number of leased addresses"
 msgstr "Αριθμός διευθύνσεων lease"
 
 #. Routing table
 #: i18n/english/luasrc/i18n/admin-core.en.lua:327
-msgid "routingtable"
+msgid "Routing table"
 msgstr "Πίνακα δρομολόγησης"
 
 #. Wifi scan
 #: i18n/english/luasrc/i18n/admin-core.en.lua:328
-msgid "wlanscan"
+msgid "Wifi scan"
 msgstr "Ασύρματη σάρωση"
 
 #. Frequency
 #: i18n/english/luasrc/i18n/admin-core.en.lua:329
-msgid "frequency"
+msgid "Frequency"
 msgstr "Συχνότητα"
 
 #. Power
 #: i18n/english/luasrc/i18n/admin-core.en.lua:330
-msgid "power"
+msgid "Power"
 msgstr "Ισχύς"
 
 #. Noise
 #: i18n/english/luasrc/i18n/admin-core.en.lua:331
-msgid "noise"
+msgid "Noise"
 msgstr "Θόρυβος"
 
 #. Signal
 #: i18n/english/luasrc/i18n/admin-core.en.lua:332
-msgid "signal"
+msgid "Signal"
 msgstr "Σήμα"
 
 #. Link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:333
-msgid "link"
+msgid "Link"
 msgstr "Ζεύξη"
 
 #. <abbr title=\"Fragmentation\">Frag.</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:334
-msgid "frag"
+msgid "<abbr title=\"Fragmentation\">Frag.</abbr>"
 msgstr "<abbr title=\"Κατακερματισμός\">Κατακ.</abbr>"
 
 #. <abbr title=\"Request To Send\">RTS</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:335
-msgid "rts"
+msgid "<abbr title=\"Request To Send\">RTS</abbr>"
 msgstr "<abbr title=\"Request To Send\">RTS</abbr>"
 
 #. Bitrate
 #: i18n/english/luasrc/i18n/admin-core.en.lua:336
-msgid "bitrate"
+msgid "Bitrate"
 msgstr "Ρυθμός Bit"
 
 #. automatically reconnect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:337
-msgid "m_n_keepalive"
+msgid "automatically reconnect"
 msgstr "αυτόματη επανασύνδεση"
 
 #. disconnect when idle for
 #: i18n/english/luasrc/i18n/admin-core.en.lua:338
-msgid "m_n_dialondemand"
+msgid "disconnect when idle for"
 msgstr "αποσύνδεση όταν είναι αδρανές για"
 
 #. <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:339
-msgid "m_n_pptp_server"
+msgid "<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"
 msgstr ""
 "Εξυπηρετητής <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>"
 
 #. <abbr title=\"Light Emitting Diode\">LED</abbr> Configuration
 #: i18n/english/luasrc/i18n/admin-core.en.lua:340
-msgid "leds"
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "Παραμετροποίηση <abbr title=\"Light Emitting Diode\">LED</abbr>"
 
 #. Customizes the behaviour of the device <abbr title=\"Light Emitting Diode\">LED</abbr>s if possible.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:341
-msgid "leds_desc"
+msgid "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode\">LED</abbr>s if possible."
 msgstr ""
 "Ρυθμίζει, αν είναι δυνατόν, την συμπεριφορά των <abbr title=\"Light Emitting "
 "Diode\">LED</abbr> της συσκευής."
 
 #. <abbr title=\"Light Emitting Diode\">LED</abbr> Name
 #: i18n/english/luasrc/i18n/admin-core.en.lua:342
-msgid "system_led_name"
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr "Όνομα <abbr title=\"Light Emitting Diode\">LED</abbr>"
 
 #. <abbr title=\"Light Emitting Diode\">LED</abbr> Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:343
-msgid "system_led_sysfs"
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Device"
 msgstr "Συσκευή <abbr title=\"Light Emitting Diode\">LED</abbr>"
 
 #. Default state
 #: i18n/english/luasrc/i18n/admin-core.en.lua:344
-msgid "system_led_default"
+msgid "Default state"
 msgstr "Προεπιλεγμένη κατάσταση"
 
 #. ticked = on
 #: i18n/english/luasrc/i18n/admin-core.en.lua:345
-msgid "system_led_default_desc"
+msgid "ticked = on"
 msgstr "τικαρισμένο = αναμμένο"
 
 #. Trigger
 #: i18n/english/luasrc/i18n/admin-core.en.lua:346
-msgid "system_led_trigger"
+msgid "Trigger"
 msgstr "Πυροδότηση"
 
 #. None
 #: i18n/english/luasrc/i18n/admin-core.en.lua:347
-msgid "system_led_trigger_none"
+msgid "None"
 msgstr "Καμία"
 
 #. Default On
 #: i18n/english/luasrc/i18n/admin-core.en.lua:348
-msgid "system_led_trigger_defaulton"
+msgid "Default On"
 msgstr "Προεπιλεγμένο Αναμμένο"
 
 #. Timer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:349
-msgid "system_led_trigger_timer"
+msgid "Timer"
 msgstr "Χρονιστής"
 
 #. Heartbeat (Load Average)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:350
-msgid "system_led_trigger_heartbeat"
+msgid "Heartbeat (Load Average)"
 msgstr "Παλμός (Μέσος Όρος Φόρτου)"
 
 #. Network Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:351
-msgid "system_led_trigger_netdev"
+msgid "Network Device"
 msgstr "Συσκευή Δικτύου"
 
 #. Off-State Delay
 #: i18n/english/luasrc/i18n/admin-core.en.lua:352
-msgid "system_led_delayoff"
+msgid "Off-State Delay"
 msgstr "Καθυστέρηση Κατάστασης Σβηστού"
 
 #. Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is off
 #: i18n/english/luasrc/i18n/admin-core.en.lua:353
-msgid "system_led_delayoff_desc"
+msgid "Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is off"
 msgstr ""
 "Χρόνος (σε ms) όπου το <abbr title=\"Light Emitting Diode\">LED</abbr> είναι "
 "σβηστό"
 
 #. On-State Delay
 #: i18n/english/luasrc/i18n/admin-core.en.lua:354
-msgid "system_led_delayon"
+msgid "On-State Delay"
 msgstr "Καθυστέρηση Κατάστασης Αναμμένου"
 
 #. Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is on
 #: i18n/english/luasrc/i18n/admin-core.en.lua:355
-msgid "system_led_delayon_desc"
+msgid "Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is on"
 msgstr ""
 "Χρόνος (σε ms) όπου το <abbr title=\"Light Emitting Diode\">LED</abbr> είναι "
 "αναμμένο"
 
 #. Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:356
-msgid "system_led_dev"
+msgid "Device"
 msgstr "Συσκευή"
 
 #. Trigger Mode
 #: i18n/english/luasrc/i18n/admin-core.en.lua:357
-msgid "system_led_mode"
+msgid "Trigger Mode"
 msgstr "Λειτουργία Πυροδότησης"
 
 #. Link On
 #: i18n/english/luasrc/i18n/admin-core.en.lua:358
-msgid "system_led_mode_link"
+msgid "Link On"
 msgstr "Αναμμένο με Ζεύξη"
 
 #. Transmit
 #: i18n/english/luasrc/i18n/admin-core.en.lua:359
-msgid "system_led_mode_tx"
+msgid "Transmit"
 msgstr "Εκπομπή"
 
 #. Receive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:360
-msgid "system_led_mode_rx"
+msgid "Receive"
 msgstr "Λήψη"
 
 #. Active
 #: i18n/english/luasrc/i18n/admin-core.en.lua:361
-msgid "network_interface_up"
+msgid "Active"
 msgstr "Ενεργό"
 
 #. <abbr title=\"Media Access Control\">MAC</abbr>-Address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:362
-msgid "network_interface_hwaddr"
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr "Διεύθυνση <abbr title=\"Media Access Control\">MAC</abbr>"
 
 #. Hardware Address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:363
-msgid "network_interface_hwaddr_desc"
+msgid "Hardware Address"
 msgstr "Διεύθυνση Υλικού"
 
 #. Traffic
 #: i18n/english/luasrc/i18n/admin-core.en.lua:364
-msgid "network_interface_txrx"
+msgid "Traffic"
 msgstr "Κίνηση"
 
 #. transmitted / received
 #: i18n/english/luasrc/i18n/admin-core.en.lua:365
-msgid "network_interface_txrx_desc"
+msgid "transmitted / received"
 msgstr "απεσταλμένα / ληφθέντα"
 
 #. Errors
 #: i18n/english/luasrc/i18n/admin-core.en.lua:366
-msgid "network_interface_err"
+msgid "Errors"
 msgstr "Λάθη"
 
 #. TX / RX
 #: i18n/english/luasrc/i18n/admin-core.en.lua:367
-msgid "network_interface_err_desc"
+msgid "TX / RX"
 msgstr "TX / RX"
 
 #. Create / Assign firewall-zone
 #: i18n/english/luasrc/i18n/admin-core.en.lua:368
-msgid "network_interface_fwzone"
+msgid "Create / Assign firewall-zone"
 msgstr "Δημιουργία / Ανάθεση ζώνης τείχους προστασίας"
 
 #. This interface does not belong to any firewall zone yet.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:369
-msgid "network_interface_fwzone_desc"
+msgid "Choose the firewall zone you want to assign to this interface. Select <em>unspecified</em> to remove the interface from the associated zone or fill out the <em>create</em> field to define a new zone and attach the interface to it."
 msgstr "Αυτή η διεπαφή δεν ανήκει ακόμη σε καμία ζώνη τείχους προστασίας."
 
 #. Processes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:370
-msgid "process_head"
+msgid "Processes"
 msgstr "Εργασίες"
 
 #. This list gives an overview over currently running system processes and their status.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:371
-msgid "process_descr"
+msgid "This list gives an overview over currently running system processes and their status."
 msgstr ""
 "Αυτή η λίστα δίνει μία εικόνα των τρέχοντων εργασιών συστήματος και της "
 "κατάστασής τους."
 
 #. PID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:372
-msgid "process_pid"
+msgid "PID"
 msgstr "PID"
 
 #. Owner
 #: i18n/english/luasrc/i18n/admin-core.en.lua:373
-msgid "process_owner"
+msgid "Owner"
 msgstr "Κάτοχος"
 
 #. Command
 #: i18n/english/luasrc/i18n/admin-core.en.lua:374
-msgid "process_command"
+msgid "Command"
 msgstr "Εντολή"
 
 #. CPU usage (%)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:375
-msgid "process_cpu"
+msgid "CPU usage (%)"
 msgstr "Χρήση CPU (%)"
 
 #. Memory usage (%)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:376
-msgid "process_mem"
+msgid "Memory usage (%)"
 msgstr "Χρήση Μνήμης (%)"
 
 #. Hang Up
 #: i18n/english/luasrc/i18n/admin-core.en.lua:377
-msgid "process_hup"
+msgid "Hang Up"
 msgstr "Κρέμασμα"
 
 #. Terminate
 #: i18n/english/luasrc/i18n/admin-core.en.lua:378
-msgid "process_term"
+msgid "Terminate"
 msgstr "Τερματισμός"
 
 #. Kill
 #: i18n/english/luasrc/i18n/admin-core.en.lua:379
-msgid "process_kill"
+msgid "Kill"
 msgstr "Σκότωμα"
 
 #. cached
 #: i18n/english/luasrc/i18n/admin-core.en.lua:380
-msgid "mem_cached"
+msgid "cached"
 msgstr "λανθάνουσα"
 
 #. buffered
 #: i18n/english/luasrc/i18n/admin-core.en.lua:381
-msgid "mem_buffered"
+msgid "buffered"
 msgstr "ενδιάμεση"
 
 #. free
 #: i18n/english/luasrc/i18n/admin-core.en.lua:382
-msgid "mem_free"
+msgid "free"
 msgstr "ελεύθερη"
 
 #. Scheduled Tasks
 #: i18n/english/luasrc/i18n/admin-core.en.lua:383
-msgid "a_s_crontab"
+msgid "Scheduled Tasks"
 msgstr "Προγραμματισμένες Εργασίες"
 
 #. This is the system crontab in which scheduled tasks can be defined.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:384
-msgid "a_s_crontab1"
+msgid "This is the system crontab in which scheduled tasks can be defined."
 msgstr ""
 "Αυτό είναι το crontab του συστήματος στο οποίο μπορούν να οριστούν "
 "προγραμματισμένες εργασίες."
 
 #. NAS ID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:385
-msgid "a_w_nasid"
+msgid "NAS ID"
 msgstr "NAS ID"
 
 #. Path to CA-Certificate
 #: i18n/english/luasrc/i18n/admin-core.en.lua:386
-msgid "a_w_cacert"
+msgid "Path to CA-Certificate"
 msgstr "Διαδρομή για Πιστοποιητικό CA"
 
 #. EAP-Method
 #: i18n/english/luasrc/i18n/admin-core.en.lua:387
-msgid "a_w_eaptype"
+msgid "EAP-Method"
 msgstr "Μέθοδος EAP"
 
 #. Path to Private Key
 #: i18n/english/luasrc/i18n/admin-core.en.lua:388
-msgid "a_w_tlsprivkey"
+msgid "Path to Private Key"
 msgstr "Διαδρομή για Ιδιωτικό Κλειδί"
 
 #. Password of Private Key
 #: i18n/english/luasrc/i18n/admin-core.en.lua:389
-msgid "a_w_tlsprivkeypwd"
+msgid "Password of Private Key"
 msgstr "Κωδικός Πρόσβασης του Ιδιωτικού Κλειδιού"
 
 #. Authentication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:390
-msgid "a_w_peapauth"
+msgid "Authentication"
 msgstr "Εξουσιοδότηση"
 
 #. Identity
 #: i18n/english/luasrc/i18n/admin-core.en.lua:391
-msgid "a_w_peapidentity"
+msgid "Identity"
 msgstr "Ταυτότητα"
 
 #. Password
 #: i18n/english/luasrc/i18n/admin-core.en.lua:392
-msgid "a_w_peappassword"
+msgid "Password"
 msgstr "Κωδικός Πρόσβασης"
 
 #. Create Network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:393
-msgid "a_w_create"
+msgid "Create Network"
 msgstr "Δημιουργία Δικτύου"
 
 #. Hostnames
 #: i18n/english/luasrc/i18n/admin-core.en.lua:394
-msgid "hostnames"
+msgid "Hostnames"
 msgstr "Ονόματα Υπολογιστών"
 
 #. Host entries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:395
-msgid "hostnames_entries"
+msgid "Host entries"
 msgstr "Καταχωρήσεις Υπολογιστών"
 
 #. Hostname
 #: i18n/english/luasrc/i18n/admin-core.en.lua:396
-msgid "hostnames_hostname"
+msgid "Hostname"
 msgstr "Όνομα Υπολογιστή"
 
 #. IP address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:397
-msgid "hostnames_address"
+msgid "IP address"
 msgstr "Διεύθυνση IP"
 
 #. Clamp Segment Size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:398
-msgid "m_n_mssfix"
+msgid "Clamp Segment Size"
 msgstr "Μέγεθος Τμήματος Τεμαχισμού"
 
 #. Fixes problems with unreachable websites, submitting forms or other unexpected behaviour for some ISPs.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:399
-msgid "m_n_mssfix_desc"
+msgid "Fixes problems with unreachable websites, submitting forms or other unexpected behaviour for some ISPs."
 msgstr ""
 "Επιλύει προβλήματα με μη-προσβάσιμους ιστοχώρους, την υποβολή φορμών ή άλλες "
 "απροσδόκητες συμπεριφορές κάποιων ISP."
 
 #. Flash Firmware
 #: i18n/english/luasrc/i18n/admin-core.en.lua:400
-msgid "admin_upgrade"
+msgid "Flash Firmware"
 msgstr "Φλασάρισμα Firmware"
 
 #. The uploaded image file does not contain a supported format. Make sure that you choose the generic image format for your platform.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:401
-msgid "admin_upgrade_badimage"
+msgid "The uploaded image file does not contain a supported format. Make sure that you choose the generic image format for your platform."
 msgstr ""
 "Η εικόνα που ανεβάσατε δεν περιέχει κάποια υποστηριζόμενη μορφή. Βεβαιωθείτε "
 "ότι επιλέξατε την γενική μορφή εικόνας για την πλατφόρμα σας."
 
 #. Checksum
 #: i18n/english/luasrc/i18n/admin-core.en.lua:402
-msgid "admin_upgrade_checksum"
+msgid "Checksum"
 msgstr "Άθροισμα Ελέγχου"
 
 #. Upload an OpenWrt image file to reflash the device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:403
-msgid "admin_upgrade_desc"
+msgid "Upload an OpenWrt image file to reflash the device."
 msgstr "Ανεβάστε ένα αρχείο εικόνας OpenWrt για να φλασάρετε τη συσκευή."
 
 #. Size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:404
-msgid "admin_upgrade_filesize"
+msgid "Size"
 msgstr "Μέγεθος"
 
 #. Firmware image
 #: i18n/english/luasrc/i18n/admin-core.en.lua:405
-msgid "admin_upgrade_fwimage"
+msgid "Firmware image"
 msgstr "Εικόνα firmware"
 
 #. Keep configuration files
 #: i18n/english/luasrc/i18n/admin-core.en.lua:406
-msgid "admin_upgrade_keepcfg"
+msgid "Keep configuration files"
 msgstr "Διατήρηση αρχείων παραμετροποίησης"
 
 #. Sorry. OpenWrt does not support a system upgrade on this platform.<br /> You need to manually flash your device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:407
-msgid "admin_upgrade_nosupport"
+msgid "Sorry. OpenWrt does not support a system upgrade on this platform.<br /> You need to manually flash your device."
 msgstr ""
 "Συγνώμη. Το OpenWrt δεν υποστηρίζει αναβάθμιση συστήματος σε αυτή την "
 "πλατφόρμα.<br /> Χρειάζεται να φλασάρετε την συσκευή σας χειροκίνητα."
 
 #. The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a few minutes until you try to reconnect. It might be necessary to renew the address of your computer to reach the device again, depending on your settings.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:408
-msgid "admin_upgrade_running"
+msgid "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a few minutes until you try to reconnect. It might be necessary to renew the address of your computer to reach the device again, depending on your settings."
 msgstr ""
 "Το σύστημα φλασάρετε τώρα.<br /> ΜΗ ΣΒΗΣΕΤΕ ΤΗΝ ΣΥΣΚΕΥΗ!<br /> Περιμένετε "
 "λίγα λεπτά για να δοκιμάσετε επανασύνδεση. Ανάλογα με τις ρυθμίσεις σας, "
@@ -2264,19 +2264,19 @@ msgstr ""
 
 #.  (%s available)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:409
-msgid "admin_upgrade_spaceavail"
+msgid " (%s available)"
 msgstr " (%s διαθέσιμα)"
 
 #. It appears that you try to flash an image that does not fit into the flash memory, please verify the image file!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:410
-msgid "admin_upgrade_toolarge"
+msgid "It appears that you try to flash an image that does not fit into the flash memory, please verify the image file!"
 msgstr ""
 "Φαίνεται πως προσπαθείτε να φλασάρετε μια εικόνα που δεν χωράει στην μνήμη "
 "flash, παρακαλώ επιβεβαιώστε το αρχείο εικόνας!"
 
 #. Upload image
 #: i18n/english/luasrc/i18n/admin-core.en.lua:411
-msgid "admin_upgrade_upload"
+msgid "Upload image"
 msgstr "Ανέβασμα εικόνας"
 
 #. The flash image was uploaded. Below is the checksum and file size listed, compare them with the original file to ensure data integrity.<br /> Click \"Proceed\" below to start the flash procedure.
diff --git a/po/el/asterisk.po b/po/el/asterisk.po
index 9af630f92..b47d78179 100644
--- a/po/el/asterisk.po
+++ b/po/el/asterisk.po
@@ -14,1252 +14,1252 @@ msgstr ""
 
 #. Asterisk General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:1
-msgid "asterisk_asterisk"
+msgid "Asterisk General Options"
 msgstr ""
 
 #. AGI directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:2
-msgid "asterisk_asterisk_agidir"
+msgid "AGI directory"
 msgstr ""
 
 #. Cache recorded sound files during recording
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:3
-msgid "asterisk_asterisk_cacherecordfiles"
+msgid "Cache recorded sound files during recording"
 msgstr ""
 
 #. Debug Level
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:4
-msgid "asterisk_asterisk_debug"
+msgid "Debug Level"
 msgstr ""
 
 #. Disable some warnings
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:5
-msgid "asterisk_asterisk_dontwarn"
+msgid "Disable some warnings"
 msgstr ""
 
 #. Dump core on crash
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:6
-msgid "asterisk_asterisk_dumpcore"
+msgid "Dump core on crash"
 msgstr ""
 
 #. High Priority
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:7
-msgid "asterisk_asterisk_highpriority"
+msgid "High Priority"
 msgstr ""
 
 #. Initialise Crypto
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:8
-msgid "asterisk_asterisk_initcrypto"
+msgid "Initialise Crypto"
 msgstr ""
 
 #. Use Internal Timing
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:9
-msgid "asterisk_asterisk_internaltiming"
+msgid "Use Internal Timing"
 msgstr ""
 
 #. Log directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:10
-msgid "asterisk_asterisk_logdir"
+msgid "Log directory"
 msgstr ""
 
 #. Maximum number of calls allowed
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:11
-msgid "asterisk_asterisk_maxcalls"
+msgid "Maximum number of calls allowed"
 msgstr ""
 
 #. Maximum load to stop accepting new calls
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:12
-msgid "asterisk_asterisk_maxload"
+msgid "Maximum load to stop accepting new calls"
 msgstr ""
 
 #. Disable console colors
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:13
-msgid "asterisk_asterisk_nocolor"
+msgid "Disable console colors"
 msgstr ""
 
 #. Sound files Cache directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:14
-msgid "asterisk_asterisk_recordcachedir"
+msgid "Sound files Cache directory"
 msgstr ""
 
 #. The Group to run as
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:15
-msgid "asterisk_asterisk_rungroup"
+msgid "The Group to run as"
 msgstr ""
 
 #. The User to run as
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:16
-msgid "asterisk_asterisk_runuser"
+msgid "The User to run as"
 msgstr ""
 
 #. Voicemail Spool directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:17
-msgid "asterisk_asterisk_spooldir"
+msgid "Voicemail Spool directory"
 msgstr ""
 
 #. Prefix UniquID with system name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:18
-msgid "asterisk_asterisk_systemname"
+msgid "Prefix UniquID with system name"
 msgstr ""
 
 #. Build transcode paths via SLINEAR, not directly
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:19
-msgid "asterisk_asterisk_transcodeviasln"
+msgid "Build transcode paths via SLINEAR, not directly"
 msgstr ""
 
 #. Transmit SLINEAR silence while recording a channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:20
-msgid "asterisk_asterisk_transmitsilenceduringrecord"
+msgid "Transmit SLINEAR silence while recording a channel"
 msgstr ""
 
 #. Verbose Level
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:21
-msgid "asterisk_asterisk_verbose"
+msgid "Verbose Level"
 msgstr ""
 
 #. Time Zone
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:22
-msgid "asterisk_asterisk_zone"
+msgid "Time Zone"
 msgstr ""
 
 #. Section dialplan
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:23
-msgid "asterisk_dialplan"
+msgid "Section dialplan"
 msgstr ""
 
 #. include
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:24
-msgid "asterisk_dialplan_include"
+msgid "include"
 msgstr ""
 
 #. Dialplan Extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:25
-msgid "asterisk_dialplanexten"
+msgid "Dialplan Extension"
 msgstr ""
 
 #. Dialplan General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:26
-msgid "asterisk_dialplangeneral"
+msgid "Dialplan General Options"
 msgstr ""
 
 #. Allow transfer
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:27
-msgid "asterisk_dialplangeneral_allowtransfer"
+msgid "Allow transfer"
 msgstr ""
 
 #. Reinvite/redirect media connections
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:28
-msgid "asterisk_dialplangeneral_canreinvite"
+msgid "Reinvite/redirect media connections"
 msgstr ""
 
 #. Clear global vars
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:29
-msgid "asterisk_dialplangeneral_clearglobalvars"
+msgid "Clear global vars"
 msgstr ""
 
 #. Dialplan Goto
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:30
-msgid "asterisk_dialplangoto"
+msgid "Dialplan Goto"
 msgstr ""
 
 #. Dialplan Conference
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:31
-msgid "asterisk_dialplanmeetme"
+msgid "Dialplan Conference"
 msgstr ""
 
 #. Dialplan Time
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:32
-msgid "asterisk_dialplansaytime"
+msgid "Dialplan Time"
 msgstr ""
 
 #. Dialplan Voicemail
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:33
-msgid "asterisk_dialplanvoice"
+msgid "Dialplan Voicemail"
 msgstr ""
 
 #. Dial Zones for Dialplan
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:34
-msgid "asterisk_dialzone"
+msgid "Dial Zones for Dialplan"
 msgstr ""
 
 #. Prefix to add matching dialplans
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:35
-msgid "asterisk_dialzone_addprefix"
+msgid "Prefix to add matching dialplans"
 msgstr ""
 
 #. Match International prefix
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:36
-msgid "asterisk_dialzone_international"
+msgid "Match International prefix"
 msgstr ""
 
 #. Prefix (0) to add/remove to/from international numbers
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:37
-msgid "asterisk_dialzone_localprefix"
+msgid "Prefix (0) to add/remove to/from international numbers"
 msgstr ""
 
 #. localzone
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:38
-msgid "asterisk_dialzone_localzone"
+msgid "localzone"
 msgstr ""
 
 #. Match plan
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:39
-msgid "asterisk_dialzone_match"
+msgid "Match plan"
 msgstr ""
 
 #. Connection to use
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:40
-msgid "asterisk_dialzone_uses"
+msgid "Connection to use"
 msgstr ""
 
 #. Feature Key maps
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:41
-msgid "asterisk_featuremap"
+msgid "Feature Key maps"
 msgstr ""
 
 #. Attended transfer key
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:42
-msgid "asterisk_featuremap_atxfer"
+msgid "Attended transfer key"
 msgstr ""
 
 #. Blind transfer key
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:43
-msgid "asterisk_featuremap_blindxfer"
+msgid "Blind transfer key"
 msgstr ""
 
 #. Key to Disconnect call
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:44
-msgid "asterisk_featuremap_disconnect"
+msgid "Key to Disconnect call"
 msgstr ""
 
 #. Key to Park call
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:45
-msgid "asterisk_featuremap_parkcall"
+msgid "Key to Park call"
 msgstr ""
 
 #. Parking Feature
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:46
-msgid "asterisk_featurepark"
+msgid "Parking Feature"
 msgstr ""
 
 #. ADSI Park
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:47
-msgid "asterisk_featurepark_adsipark"
+msgid "ADSI Park"
 msgstr ""
 
 #. Attended transfer timeout (sec)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:48
-msgid "asterisk_featurepark_atxfernoanswertimeout"
+msgid "Attended transfer timeout (sec)"
 msgstr ""
 
 #. One touch record key
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:49
-msgid "asterisk_featurepark_automon"
+msgid "One touch record key"
 msgstr ""
 
 #. Name of call context for parking
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:50
-msgid "asterisk_featurepark_context"
+msgid "Name of call context for parking"
 msgstr ""
 
 #. Sound file to play to parked caller
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:51
-msgid "asterisk_featurepark_courtesytone"
+msgid "Sound file to play to parked caller"
 msgstr ""
 
 #. Max time (ms) between digits for feature activation
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:52
-msgid "asterisk_featurepark_featuredigittimeout"
+msgid "Max time (ms) between digits for feature activation"
 msgstr ""
 
 #. Method to Find Parking slot
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:53
-msgid "asterisk_featurepark_findslot"
+msgid "Method to Find Parking slot"
 msgstr ""
 
 #. parkedmusicclass
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:54
-msgid "asterisk_featurepark_parkedmusicclass"
+msgid "parkedmusicclass"
 msgstr ""
 
 #. Play courtesy tone to
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:55
-msgid "asterisk_featurepark_parkedplay"
+msgid "Play courtesy tone to"
 msgstr ""
 
 #. Enable Parking
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:56
-msgid "asterisk_featurepark_parkenabled"
+msgid "Enable Parking"
 msgstr ""
 
 #. Extension to dial to park
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:57
-msgid "asterisk_featurepark_parkext"
+msgid "Extension to dial to park"
 msgstr ""
 
 #. Parking time (secs)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:58
-msgid "asterisk_featurepark_parkingtime"
+msgid "Parking time (secs)"
 msgstr ""
 
 #. Range of extensions for call parking
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:59
-msgid "asterisk_featurepark_parkpos"
+msgid "Range of extensions for call parking"
 msgstr ""
 
 #. Pickup extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:60
-msgid "asterisk_featurepark_pickupexten"
+msgid "Pickup extension"
 msgstr ""
 
 #. Seconds to wait bewteen digits when transferring
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:61
-msgid "asterisk_featurepark_transferdigittimeout"
+msgid "Seconds to wait bewteen digits when transferring"
 msgstr ""
 
 #. sound when attended transfer is complete
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:62
-msgid "asterisk_featurepark_xferfailsound"
+msgid "sound when attended transfer is complete"
 msgstr ""
 
 #. Sound when attended transfer fails
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:63
-msgid "asterisk_featurepark_xfersound"
+msgid "Sound when attended transfer fails"
 msgstr ""
 
 #. Reload Hardware Config
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:64
-msgid "asterisk_hardwarereboot"
+msgid "Reload Hardware Config"
 msgstr ""
 
 #. Reboot Method
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:65
-msgid "asterisk_hardwarereboot_method"
+msgid "Reboot Method"
 msgstr ""
 
 #. Parameter
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:66
-msgid "asterisk_hardwarereboot_param"
+msgid "Parameter"
 msgstr ""
 
 #. SIP Connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:67
-msgid "asterisk_iax"
+msgid "SIP Connection"
 msgstr ""
 
 #. Always Dial International
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:68
-msgid "asterisk_iax_alwaysinternational"
+msgid "Always Dial International"
 msgstr ""
 
 #. context
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:69
-msgid "asterisk_iax_context"
+msgid "context"
 msgstr ""
 
 #. Country Code for connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:70
-msgid "asterisk_iax_countrycode"
+msgid "Country Code for connection"
 msgstr ""
 
 #. Add as Extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:71
-msgid "asterisk_iax_extension"
+msgid "Add as Extension"
 msgstr ""
 
 #. Host name (or blank)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:72
-msgid "asterisk_iax_host"
+msgid "Host name (or blank)"
 msgstr ""
 
 #. International Dial Prefix
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:73
-msgid "asterisk_iax_internationalprefix"
+msgid "International Dial Prefix"
 msgstr ""
 
 #. Dial Prefix (for external line)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:74
-msgid "asterisk_iax_prefix"
+msgid "Dial Prefix (for external line)"
 msgstr ""
 
 #. Secret
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:75
-msgid "asterisk_iax_secret"
+msgid "Secret"
 msgstr ""
 
 #. Dial Timeout (sec)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:76
-msgid "asterisk_iax_timeout"
+msgid "Dial Timeout (sec)"
 msgstr ""
 
 #. Option type
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:77
-msgid "asterisk_iax_type"
+msgid "Option type"
 msgstr ""
 
 #. User name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:78
-msgid "asterisk_iax_username"
+msgid "User name"
 msgstr ""
 
 #. IAX General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:79
-msgid "asterisk_iaxgeneral"
+msgid "IAX General Options"
 msgstr ""
 
 #. Allow Codecs
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:80
-msgid "asterisk_iaxgeneral_allow"
+msgid "Allow Codecs"
 msgstr ""
 
 #. Reinvite/redirect media connections
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:81
-msgid "asterisk_iaxgeneral_canreinvite"
+msgid "Reinvite/redirect media connections"
 msgstr ""
 
 #. Static
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:82
-msgid "asterisk_iaxgeneral_static"
+msgid "Static"
 msgstr ""
 
 #. Write Protect
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:83
-msgid "asterisk_iaxgeneral_writeprotect"
+msgid "Write Protect"
 msgstr ""
 
 #. Meetme Conference
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:84
-msgid "asterisk_meetme"
+msgid "Meetme Conference"
 msgstr ""
 
 #. Admin PIN
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:85
-msgid "asterisk_meetme_adminpin"
+msgid "Admin PIN"
 msgstr ""
 
 #. Meeting PIN
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:86
-msgid "asterisk_meetme_pin"
+msgid "Meeting PIN"
 msgstr ""
 
 #. Meetme Conference General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:87
-msgid "asterisk_meetmegeneral"
+msgid "Meetme Conference General Options"
 msgstr ""
 
 #. Number of 20ms audio buffers to be used
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:88
-msgid "asterisk_meetmegeneral_audiobuffers"
+msgid "Number of 20ms audio buffers to be used"
 msgstr ""
 
 #. Modules
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:89
-msgid "asterisk_module"
+msgid "Modules"
 msgstr ""
 
 #. Alarm Receiver Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:90
-msgid "asterisk_module_appalarmreceiver"
+msgid "Alarm Receiver Application"
 msgstr ""
 
 #. Authentication Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:91
-msgid "asterisk_module_appauthenticate"
+msgid "Authentication Application"
 msgstr ""
 
 #. Make sure asterisk doesnt save CDR
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:92
-msgid "asterisk_module_appcdr"
+msgid "Make sure asterisk doesnt save CDR"
 msgstr ""
 
 #. Check if channel is available
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:93
-msgid "asterisk_module_appchanisavail"
+msgid "Check if channel is available"
 msgstr ""
 
 #. Listen in on any channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:94
-msgid "asterisk_module_appchanspy"
+msgid "Listen in on any channel"
 msgstr ""
 
 #. Control Playback Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:95
-msgid "asterisk_module_appcontrolplayback"
+msgid "Control Playback Application"
 msgstr ""
 
 #. Cuts up variables
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:96
-msgid "asterisk_module_appcut"
+msgid "Cuts up variables"
 msgstr ""
 
 #. Database access functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:97
-msgid "asterisk_module_appdb"
+msgid "Database access functions"
 msgstr ""
 
 #. Dialing Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:98
-msgid "asterisk_module_appdial"
+msgid "Dialing Application"
 msgstr ""
 
 #. Virtual Dictation Machine Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:99
-msgid "asterisk_module_appdictate"
+msgid "Virtual Dictation Machine Application"
 msgstr ""
 
 #. Directed Call Pickup Support
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:100
-msgid "asterisk_module_appdirectedpickup"
+msgid "Directed Call Pickup Support"
 msgstr ""
 
 #. Extension Directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:101
-msgid "asterisk_module_appdirectory"
+msgid "Extension Directory"
 msgstr ""
 
 #. DISA (Direct Inward System Access) Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:102
-msgid "asterisk_module_appdisa"
+msgid "DISA (Direct Inward System Access) Application"
 msgstr ""
 
 #. Dump channel variables Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:103
-msgid "asterisk_module_appdumpchan"
+msgid "Dump channel variables Application"
 msgstr ""
 
 #. Simple Echo Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:104
-msgid "asterisk_module_appecho"
+msgid "Simple Echo Application"
 msgstr ""
 
 #. ENUM Lookup
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:105
-msgid "asterisk_module_appenumlookup"
+msgid "ENUM Lookup"
 msgstr ""
 
 #. Reevaluates strings
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:106
-msgid "asterisk_module_appeval"
+msgid "Reevaluates strings"
 msgstr ""
 
 #. Executes applications
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:107
-msgid "asterisk_module_appexec"
+msgid "Executes applications"
 msgstr ""
 
 #. External IVR application interface
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:108
-msgid "asterisk_module_appexternalivr"
+msgid "External IVR application interface"
 msgstr ""
 
 #. Fork The CDR into 2 seperate entities
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:109
-msgid "asterisk_module_appforkcdr"
+msgid "Fork The CDR into 2 seperate entities"
 msgstr ""
 
 #. Get ADSI CPE ID
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:110
-msgid "asterisk_module_appgetcpeid"
+msgid "Get ADSI CPE ID"
 msgstr ""
 
 #. Group Management Routines
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:111
-msgid "asterisk_module_appgroupcount"
+msgid "Group Management Routines"
 msgstr ""
 
 #. Encode and Stream via icecast and ices
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:112
-msgid "asterisk_module_appices"
+msgid "Encode and Stream via icecast and ices"
 msgstr ""
 
 #. Image Transmission Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:113
-msgid "asterisk_module_appimage"
+msgid "Image Transmission Application"
 msgstr ""
 
 #. Look up Caller*ID name/number from black
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:114
-msgid "asterisk_module_applookupblacklist"
+msgid "Look up Caller*ID name/number from black"
 msgstr ""
 
 #. Look up CallerID Name from local databas
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:115
-msgid "asterisk_module_applookupcidname"
+msgid "Look up CallerID Name from local databas"
 msgstr ""
 
 #. Extension Macros
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:116
-msgid "asterisk_module_appmacro"
+msgid "Extension Macros"
 msgstr ""
 
 #. A simple math Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:117
-msgid "asterisk_module_appmath"
+msgid "A simple math Application"
 msgstr ""
 
 #. MD5 checksum Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:118
-msgid "asterisk_module_appmd5"
+msgid "MD5 checksum Application"
 msgstr ""
 
 #. Digital Milliwatt (mu-law) Test Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:119
-msgid "asterisk_module_appmilliwatt"
+msgid "Digital Milliwatt (mu-law) Test Application"
 msgstr ""
 
 #. Record a call and mix the audio during the recording
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:120
-msgid "asterisk_module_appmixmonitor"
+msgid "Record a call and mix the audio during the recording"
 msgstr ""
 
 #. Call Parking and Announce Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:121
-msgid "asterisk_module_appparkandannounce"
+msgid "Call Parking and Announce Application"
 msgstr ""
 
 #. Trivial Playback Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:122
-msgid "asterisk_module_appplayback"
+msgid "Trivial Playback Application"
 msgstr ""
 
 #. Require phone number to be entered
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:123
-msgid "asterisk_module_appprivacy"
+msgid "Require phone number to be entered"
 msgstr ""
 
 #. True Call Queueing
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:124
-msgid "asterisk_module_appqueue"
+msgid "True Call Queueing"
 msgstr ""
 
 #. Random goto
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:125
-msgid "asterisk_module_apprandom"
+msgid "Random goto"
 msgstr ""
 
 #. Read Variable Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:126
-msgid "asterisk_module_appread"
+msgid "Read Variable Application"
 msgstr ""
 
 #. Read in a file
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:127
-msgid "asterisk_module_appreadfile"
+msgid "Read in a file"
 msgstr ""
 
 #. Realtime Data Lookup/Rewrite
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:128
-msgid "asterisk_module_apprealtime"
+msgid "Realtime Data Lookup/Rewrite"
 msgstr ""
 
 #. Trivial Record Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:129
-msgid "asterisk_module_apprecord"
+msgid "Trivial Record Application"
 msgstr ""
 
 #. Say time
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:130
-msgid "asterisk_module_appsayunixtime"
+msgid "Say time"
 msgstr ""
 
 #. Send DTMF digits Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:131
-msgid "asterisk_module_appsenddtmf"
+msgid "Send DTMF digits Application"
 msgstr ""
 
 #. Send Text Applications
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:132
-msgid "asterisk_module_appsendtext"
+msgid "Send Text Applications"
 msgstr ""
 
 #. Set CallerID Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:133
-msgid "asterisk_module_appsetcallerid"
+msgid "Set CallerID Application"
 msgstr ""
 
 #. CDR user field apps
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:134
-msgid "asterisk_module_appsetcdruserfield"
+msgid "CDR user field apps"
 msgstr ""
 
 #. load =&gt; .so ; Set CallerID Name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:135
-msgid "asterisk_module_appsetcidname"
+msgid "load => .so ; Set CallerID Name"
 msgstr ""
 
 #. load =&gt; .so ; Set CallerID Number
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:136
-msgid "asterisk_module_appsetcidnum"
+msgid "load => .so ; Set CallerID Number"
 msgstr ""
 
 #. Set RDNIS Number
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:137
-msgid "asterisk_module_appsetrdnis"
+msgid "Set RDNIS Number"
 msgstr ""
 
 #. Set ISDN Transfer Capability
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:138
-msgid "asterisk_module_appsettransfercapability"
+msgid "Set ISDN Transfer Capability"
 msgstr ""
 
 #. SMS/PSTN handler
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:139
-msgid "asterisk_module_appsms"
+msgid "SMS/PSTN handler"
 msgstr ""
 
 #. Hangs up the requested channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:140
-msgid "asterisk_module_appsofthangup"
+msgid "Hangs up the requested channel"
 msgstr ""
 
 #. Stack Routines
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:141
-msgid "asterisk_module_appstack"
+msgid "Stack Routines"
 msgstr ""
 
 #. Generic System() application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:142
-msgid "asterisk_module_appsystem"
+msgid "Generic System() application"
 msgstr ""
 
 #. Playback with Talk Detection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:143
-msgid "asterisk_module_apptalkdetect"
+msgid "Playback with Talk Detection"
 msgstr ""
 
 #. Interface Test Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:144
-msgid "asterisk_module_apptest"
+msgid "Interface Test Application"
 msgstr ""
 
 #. Transfer
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:145
-msgid "asterisk_module_apptransfer"
+msgid "Transfer"
 msgstr ""
 
 #. TXTCIDName
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:146
-msgid "asterisk_module_apptxtcidname"
+msgid "TXTCIDName"
 msgstr ""
 
 #. Send URL Applications
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:147
-msgid "asterisk_module_appurl"
+msgid "Send URL Applications"
 msgstr ""
 
 #. Custom User Event Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:148
-msgid "asterisk_module_appuserevent"
+msgid "Custom User Event Application"
 msgstr ""
 
 #. Send verbose output
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:149
-msgid "asterisk_module_appverbose"
+msgid "Send verbose output"
 msgstr ""
 
 #. Voicemail
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:150
-msgid "asterisk_module_appvoicemail"
+msgid "Voicemail"
 msgstr ""
 
 #. Waits until first ring after time
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:151
-msgid "asterisk_module_appwaitforring"
+msgid "Waits until first ring after time"
 msgstr ""
 
 #. Wait For Silence Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:152
-msgid "asterisk_module_appwaitforsilence"
+msgid "Wait For Silence Application"
 msgstr ""
 
 #. While Loops and Conditional Execution
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:153
-msgid "asterisk_module_appwhile"
+msgid "While Loops and Conditional Execution"
 msgstr ""
 
 #. Comma Separated Values CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:154
-msgid "asterisk_module_cdrcsv"
+msgid "Comma Separated Values CDR Backend"
 msgstr ""
 
 #. Customizable Comma Separated Values CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:155
-msgid "asterisk_module_cdrcustom"
+msgid "Customizable Comma Separated Values CDR Backend"
 msgstr ""
 
 #. Asterisk Call Manager CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:156
-msgid "asterisk_module_cdrmanager"
+msgid "Asterisk Call Manager CDR Backend"
 msgstr ""
 
 #. MySQL CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:157
-msgid "asterisk_module_cdrmysql"
+msgid "MySQL CDR Backend"
 msgstr ""
 
 #. PostgreSQL CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:158
-msgid "asterisk_module_cdrpgsql"
+msgid "PostgreSQL CDR Backend"
 msgstr ""
 
 #. SQLite CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:159
-msgid "asterisk_module_cdrsqlite"
+msgid "SQLite CDR Backend"
 msgstr ""
 
 #. Agent Proxy Channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:160
-msgid "asterisk_module_chanagent"
+msgid "Agent Proxy Channel"
 msgstr ""
 
 #. Channel driver for GTalk
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:161
-msgid "asterisk_module_chanalsa"
+msgid "Channel driver for GTalk"
 msgstr ""
 
 #. Channel driver for GTalk
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:162
-msgid "asterisk_module_changtalk"
+msgid "Channel driver for GTalk"
 msgstr ""
 
 #. Option chan_iax2
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:163
-msgid "asterisk_module_chaniax2"
+msgid "Option chan_iax2"
 msgstr ""
 
 #. Local Proxy Channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:164
-msgid "asterisk_module_chanlocal"
+msgid "Local Proxy Channel"
 msgstr ""
 
 #. Session Initiation Protocol (SIP)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:165
-msgid "asterisk_module_chansip"
+msgid "Session Initiation Protocol (SIP)"
 msgstr ""
 
 #. Adaptive Differential PCM Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:166
-msgid "asterisk_module_codecadpcm"
+msgid "Adaptive Differential PCM Coder/Decoder"
 msgstr ""
 
 #. A-law Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:167
-msgid "asterisk_module_codecalaw"
+msgid "A-law Coder/Decoder"
 msgstr ""
 
 #. A-law and Mulaw direct Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:168
-msgid "asterisk_module_codecamu"
+msgid "A-law and Mulaw direct Coder/Decoder"
 msgstr ""
 
 #. ITU G.726-32kbps G726 Transcoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:169
-msgid "asterisk_module_codecg726"
+msgid "ITU G.726-32kbps G726 Transcoder"
 msgstr ""
 
 #. GSM/PCM16 (signed linear) Codec Translation
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:170
-msgid "asterisk_module_codecgsm"
+msgid "GSM/PCM16 (signed linear) Codec Translation"
 msgstr ""
 
 #. Speex/PCM16 (signed linear) Codec Translator
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:171
-msgid "asterisk_module_codecspeex"
+msgid "Speex/PCM16 (signed linear) Codec Translator"
 msgstr ""
 
 #. Mu-law Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:172
-msgid "asterisk_module_codeculaw"
+msgid "Mu-law Coder/Decoder"
 msgstr ""
 
 #. Sun Microsystems AU format (signed linear)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:173
-msgid "asterisk_module_formatau"
+msgid "Sun Microsystems AU format (signed linear)"
 msgstr ""
 
 #. G.723.1 Simple Timestamp File Format
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:174
-msgid "asterisk_module_formatg723"
+msgid "G.723.1 Simple Timestamp File Format"
 msgstr ""
 
 #. Raw G.726 (16/24/32/40kbps) data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:175
-msgid "asterisk_module_formatg726"
+msgid "Raw G.726 (16/24/32/40kbps) data"
 msgstr ""
 
 #. Raw G729 data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:176
-msgid "asterisk_module_formatg729"
+msgid "Raw G729 data"
 msgstr ""
 
 #. Raw GSM data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:177
-msgid "asterisk_module_formatgsm"
+msgid "Raw GSM data"
 msgstr ""
 
 #. Raw h263 data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:178
-msgid "asterisk_module_formath263"
+msgid "Raw h263 data"
 msgstr ""
 
 #. JPEG (Joint Picture Experts Group) Image
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:179
-msgid "asterisk_module_formatjpeg"
+msgid "JPEG (Joint Picture Experts Group) Image"
 msgstr ""
 
 #. Raw uLaw 8khz Audio support (PCM)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:180
-msgid "asterisk_module_formatpcm"
+msgid "Raw uLaw 8khz Audio support (PCM)"
 msgstr ""
 
 #. load =&gt; .so ; Raw aLaw 8khz PCM Audio support
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:181
-msgid "asterisk_module_formatpcmalaw"
+msgid "load => .so ; Raw aLaw 8khz PCM Audio support"
 msgstr ""
 
 #. Raw Signed Linear Audio support (SLN)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:182
-msgid "asterisk_module_formatsln"
+msgid "Raw Signed Linear Audio support (SLN)"
 msgstr ""
 
 #. Dialogic VOX (ADPCM) File Format
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:183
-msgid "asterisk_module_formatvox"
+msgid "Dialogic VOX (ADPCM) File Format"
 msgstr ""
 
 #. Microsoft WAV format (8000hz Signed Line
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:184
-msgid "asterisk_module_formatwav"
+msgid "Microsoft WAV format (8000hz Signed Line"
 msgstr ""
 
 #. Microsoft WAV format (Proprietary GSM)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:185
-msgid "asterisk_module_formatwavgsm"
+msgid "Microsoft WAV format (Proprietary GSM)"
 msgstr ""
 
 #. Caller ID related dialplan functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:186
-msgid "asterisk_module_funccallerid"
+msgid "Caller ID related dialplan functions"
 msgstr ""
 
 #. ENUM Functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:187
-msgid "asterisk_module_funcenum"
+msgid "ENUM Functions"
 msgstr ""
 
 #. URI encoding / decoding functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:188
-msgid "asterisk_module_funcuri"
+msgid "URI encoding / decoding functions"
 msgstr ""
 
 #. Asterisk Extension Language Compiler
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:189
-msgid "asterisk_module_pbxael"
+msgid "Asterisk Extension Language Compiler"
 msgstr ""
 
 #. Text Extension Configuration
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:190
-msgid "asterisk_module_pbxconfig"
+msgid "Text Extension Configuration"
 msgstr ""
 
 #. load =&gt; .so ; Builtin dialplan functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:191
-msgid "asterisk_module_pbxfunctions"
+msgid "load => .so ; Builtin dialplan functions"
 msgstr ""
 
 #. Loopback Switch
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:192
-msgid "asterisk_module_pbxloopback"
+msgid "Loopback Switch"
 msgstr ""
 
 #. Realtime Switch
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:193
-msgid "asterisk_module_pbxrealtime"
+msgid "Realtime Switch"
 msgstr ""
 
 #. Outgoing Spool Support
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:194
-msgid "asterisk_module_pbxspool"
+msgid "Outgoing Spool Support"
 msgstr ""
 
 #. Wil Cal U (Auto Dialer)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:195
-msgid "asterisk_module_pbxwilcalu"
+msgid "Wil Cal U (Auto Dialer)"
 msgstr ""
 
 #. MySQL Config Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:196
-msgid "asterisk_module_resconfigmysql"
+msgid "MySQL Config Resource"
 msgstr ""
 
 #. ODBC Config Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:197
-msgid "asterisk_module_resconfigodbc"
+msgid "ODBC Config Resource"
 msgstr ""
 
 #. PGSQL Module
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:198
-msgid "asterisk_module_resconfigpgsql"
+msgid "PGSQL Module"
 msgstr ""
 
 #. Cryptographic Digital Signatures
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:199
-msgid "asterisk_module_rescrypto"
+msgid "Cryptographic Digital Signatures"
 msgstr ""
 
 #. Call Parking Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:200
-msgid "asterisk_module_resfeatures"
+msgid "Call Parking Resource"
 msgstr ""
 
 #. Indications Configuration
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:201
-msgid "asterisk_module_resindications"
+msgid "Indications Configuration"
 msgstr ""
 
 #. Call Monitoring Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:202
-msgid "asterisk_module_resmonitor"
+msgid "Call Monitoring Resource"
 msgstr ""
 
 #. Music On Hold Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:203
-msgid "asterisk_module_resmusiconhold"
+msgid "Music On Hold Resource"
 msgstr ""
 
 #. ODBC Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:204
-msgid "asterisk_module_resodbc"
+msgid "ODBC Resource"
 msgstr ""
 
 #. SMDI Module
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:205
-msgid "asterisk_module_ressmdi"
+msgid "SMDI Module"
 msgstr ""
 
 #. SNMP Module
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:206
-msgid "asterisk_module_ressnmp"
+msgid "SNMP Module"
 msgstr ""
 
 #. Music On Hold
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:207
-msgid "asterisk_moh"
+msgid "Music On Hold"
 msgstr ""
 
 #. Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:208
-msgid "asterisk_moh_application"
+msgid "Application"
 msgstr ""
 
 #. Directory of Music
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:209
-msgid "asterisk_moh_directory"
+msgid "Directory of Music"
 msgstr ""
 
 #. Option mode
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:210
-msgid "asterisk_moh_mode"
+msgid "Option mode"
 msgstr ""
 
 #. Random Play
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:211
-msgid "asterisk_moh_random"
+msgid "Random Play"
 msgstr ""
 
 #. SIP Connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:212
-msgid "asterisk_sip"
+msgid "SIP Connection"
 msgstr ""
 
 #. Always Dial International
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:213
-msgid "asterisk_sip_alwaysinternational"
+msgid "Always Dial International"
 msgstr ""
 
 #. Reinvite/redirect media connections
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:214
-msgid "asterisk_sip_canreinvite"
+msgid "Reinvite/redirect media connections"
 msgstr ""
 
 #. context
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:215
-msgid "asterisk_sip_context"
+msgid "context"
 msgstr ""
 
 #. Country Code for connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:216
-msgid "asterisk_sip_countrycode"
+msgid "Country Code for connection"
 msgstr ""
 
 #. DTMF mode
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:217
-msgid "asterisk_sip_dtmfmode"
+msgid "DTMF mode"
 msgstr ""
 
 #. Add as Extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:218
-msgid "asterisk_sip_extension"
+msgid "Add as Extension"
 msgstr ""
 
 #. Primary domain identity for From: headers
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:219
-msgid "asterisk_sip_fromdomain"
+msgid "Primary domain identity for From: headers"
 msgstr ""
 
 #. From user (required by many SIP providers)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:220
-msgid "asterisk_sip_fromuser"
+msgid "From user (required by many SIP providers)"
 msgstr ""
 
 #. Host name (or blank)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:221
-msgid "asterisk_sip_host"
+msgid "Host name (or blank)"
 msgstr ""
 
 #. Ring on incoming dialplan contexts
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:222
-msgid "asterisk_sip_incoming"
+msgid "Ring on incoming dialplan contexts"
 msgstr ""
 
 #. Allow Insecure for
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:223
-msgid "asterisk_sip_insecure"
+msgid "Allow Insecure for"
 msgstr ""
 
 #. International Dial Prefix
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:224
-msgid "asterisk_sip_internationalprefix"
+msgid "International Dial Prefix"
 msgstr ""
 
 #. Mailbox for MWI
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:225
-msgid "asterisk_sip_mailbox"
+msgid "Mailbox for MWI"
 msgstr ""
 
 #. NAT between phone and Asterisk
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:226
-msgid "asterisk_sip_nat"
+msgid "NAT between phone and Asterisk"
 msgstr ""
 
 #. Check tags in headers
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:227
-msgid "asterisk_sip_pedantic"
+msgid "Check tags in headers"
 msgstr ""
 
 #. SIP Port
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:228
-msgid "asterisk_sip_port"
+msgid "SIP Port"
 msgstr ""
 
 #. Dial Prefix (for external line)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:229
-msgid "asterisk_sip_prefix"
+msgid "Dial Prefix (for external line)"
 msgstr ""
 
 #. Reply Timeout (ms) for down connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:230
-msgid "asterisk_sip_qualify"
+msgid "Reply Timeout (ms) for down connection"
 msgstr ""
 
 #. Register connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:231
-msgid "asterisk_sip_register"
+msgid "Register connection"
 msgstr ""
 
 #. Secret
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:232
-msgid "asterisk_sip_secret"
+msgid "Secret"
 msgstr ""
 
 #. Dial own extension for mailbox
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:233
-msgid "asterisk_sip_selfmailbox"
+msgid "Dial own extension for mailbox"
 msgstr ""
 
 #. Dial Timeout (sec)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:234
-msgid "asterisk_sip_timeout"
+msgid "Dial Timeout (sec)"
 msgstr ""
 
 #. Client Type
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:235
-msgid "asterisk_sip_type"
+msgid "Client Type"
 msgstr ""
 
 #. Username
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:236
-msgid "asterisk_sip_username"
+msgid "Username"
 msgstr ""
 
 #. Section sipgeneral
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:237
-msgid "asterisk_sipgeneral"
+msgid "Section sipgeneral"
 msgstr ""
 
 #. Allow codecs
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:238
-msgid "asterisk_sipgeneral_allow"
+msgid "Allow codecs"
 msgstr ""
 
 #. SIP Port
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:239
-msgid "asterisk_sipgeneral_port"
+msgid "SIP Port"
 msgstr ""
 
 #. SIP realm
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:240
-msgid "asterisk_sipgeneral_realm"
+msgid "SIP realm"
 msgstr ""
 
 #. Voicemail general options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:241
-msgid "asterisk_voicegeneral"
+msgid "Voicemail general options"
 msgstr ""
 
 #. From Email address of server
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:242
-msgid "asterisk_voicegeneral_serveremail"
+msgid "From Email address of server"
 msgstr ""
 
 #. Voice Mail boxes
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:243
-msgid "asterisk_voicemail"
+msgid "Voice Mail boxes"
 msgstr ""
 
 #. Email contains attachment
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:244
-msgid "asterisk_voicemail_attach"
+msgid "Email contains attachment"
 msgstr ""
 
 #. Email
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:245
-msgid "asterisk_voicemail_email"
+msgid "Email"
 msgstr ""
 
 #. Display Name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:246
-msgid "asterisk_voicemail_name"
+msgid "Display Name"
 msgstr ""
 
 #. Password
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:247
-msgid "asterisk_voicemail_password"
+msgid "Password"
 msgstr ""
 
 #. zone
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:248
-msgid "asterisk_voicemail_zone"
+msgid "zone"
 msgstr ""
 
 #. Voice Zone settings
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:249
-msgid "asterisk_voicezone"
+msgid "Voice Zone settings"
 msgstr ""
 
 #. Message Format
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:250
-msgid "asterisk_voicezone_message"
+msgid "Message Format"
 msgstr ""
 
 #. Time Zone
diff --git a/po/el/cbi.po b/po/el/cbi.po
index 4001011f2..fe20c5cd8 100644
--- a/po/el/cbi.po
+++ b/po/el/cbi.po
@@ -14,86 +14,86 @@ msgstr ""
 
 #. Add entry
 #: i18n/english/luasrc/i18n/cbi.en.lua:1
-msgid "cbi_add"
+msgid "Add"
 msgstr "Προσθήκη καταχώρησης"
 
 #. Remove entry
 #: i18n/english/luasrc/i18n/cbi.en.lua:2
-msgid "cbi_del"
+msgid "Delete"
 msgstr "Διαγραφή καταχώρησης"
 
 #. Replace entry
 #: i18n/english/luasrc/i18n/cbi.en.lua:3
-msgid "cbi_replace"
+msgid "Replace entry"
 msgstr "Αντικατάσταση καταχώρησης"
 
 #. Invalid input value
 #: i18n/english/luasrc/i18n/cbi.en.lua:4
-msgid "cbi_invalid"
+msgid "Invalid"
 msgstr "Άκυρη τιμή εισόδου"
 
 #. <strong>Validation failed:</strong> Please check any input fields for mistakes.
 #: i18n/english/luasrc/i18n/cbi.en.lua:5
-msgid "cbi_invalid_section"
+msgid "<strong>Validation failed:</strong> Please check any input fields for mistakes."
 msgstr ""
 "<strong>Αποτυχία επικύρωσης:</strong> Παρακαλώ ελέγξτε τα πεδία εισαγωγής "
 "για σφάλματα."
 
 #. This field is mandatory
 #: i18n/english/luasrc/i18n/cbi.en.lua:6
-msgid "cbi_missing"
+msgid "This field is mandatory"
 msgstr "Αυτό το πεδίο είναι υποχρεωτικό"
 
 #. <strong>Validation failed:</strong> At least one mandatory field has no or an invalid value
 #: i18n/english/luasrc/i18n/cbi.en.lua:7
-msgid "cbi_deperror"
+msgid "<strong>Validation failed:</strong> At least one mandatory field has no or an invalid value"
 msgstr ""
 "<strong>Αποτυχία επικύρωσης:</strong> Τουλάχιστον ένα πεδίο δεν έχει τιμή ή "
 "έχει άκυρη τιμή"
 
 #. A requirement for this option was not met
 #: i18n/english/luasrc/i18n/cbi.en.lua:8
-msgid "cbi_reqerror"
+msgid "A requirement for this option was not met"
 msgstr "Ένα προαπαιτούμενο για αυτή την επιλογή δεν ικανοποιείται"
 
 #. -- Additional Field --
 #: i18n/english/luasrc/i18n/cbi.en.lua:9
-msgid "cbi_addopt"
+msgid "-- Additional Field --"
 msgstr "-- Επιπλέον Πεδίο --"
 
 #.  (optional)
 #: i18n/english/luasrc/i18n/cbi.en.lua:10
-msgid "cbi_optional"
+msgid " (optional)"
 msgstr " (προαιρετικό)"
 
 #. This section contains no values yet
 #: i18n/english/luasrc/i18n/cbi.en.lua:11
-msgid "cbi_sectempty"
+msgid "This section contains no values yet"
 msgstr "Αυτό το τμήμα δεν περιέχει τιμές ακόμη"
 
 #. -- custom --
 #: i18n/english/luasrc/i18n/cbi.en.lua:12
-msgid "cbi_manual"
+msgid "-- custom --"
 msgstr "-- ειδικό --"
 
 #. -- Please choose --
 #: i18n/english/luasrc/i18n/cbi.en.lua:13
-msgid "cbi_select"
+msgid "-- Please choose --"
 msgstr "-- Παρακαλώ επιλέξτε --"
 
 #. Go to relevant configuration page
 #: i18n/english/luasrc/i18n/cbi.en.lua:14
-msgid "cbi_gorel"
+msgid " "
 msgstr "Μετάβαση στη σχετική σελίδα ρυθμίσεων"
 
 #. Applying changes
 #: i18n/english/luasrc/i18n/cbi.en.lua:15
-msgid "cbi_applying"
+msgid "Applying changes"
 msgstr "Εφαρμογή αλλαγών"
 
 #. Uploaded File
 #: i18n/english/luasrc/i18n/cbi.en.lua:16
-msgid "cbi_upload"
+msgid "Uploaded File"
 msgstr "Το Αρχείο Ανέβηκε"
 
 #. Search file...
diff --git a/po/el/coovachilli.po b/po/el/coovachilli.po
index 4a1cfd9f7..efaf2c7e6 100644
--- a/po/el/coovachilli.po
+++ b/po/el/coovachilli.po
@@ -14,882 +14,882 @@ msgstr ""
 
 #. CoovaChilli
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:1
-msgid "coovachilli"
+msgid "CoovaChilli"
 msgstr ""
 
 #. General configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:2
-msgid "coovachilli_general"
+msgid "General configuration"
 msgstr ""
 
 #. General CoovaChilli settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:3
-msgid "coovachilli_general_desc"
+msgid "General CoovaChilli settings"
 msgstr ""
 
 #. Command socket
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:4
-msgid "coovachilli_general_cmdsock"
+msgid "Command socket"
 msgstr ""
 
 #. UNIX socket used for communication with chilli_query
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:5
-msgid "coovachilli_general_cmdsock_desc"
+msgid "UNIX socket used for communication with chilli_query"
 msgstr ""
 
 #. Config refresh interval
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:6
-msgid "coovachilli_general_interval"
+msgid "Config refresh interval"
 msgstr ""
 
 #. Re-read configuration file and do DNS lookups every interval seconds. This has the same effect as sending the HUP signal. If interval is 0 (zero) this feature is disabled. 
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:7
-msgid "coovachilli_general_interval_desc"
+msgid "Re-read configuration file and do DNS lookups every interval seconds. This has the same effect as sending the HUP signal. If interval is 0 (zero) this feature is disabled. "
 msgstr ""
 
 #. Pid file
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:8
-msgid "coovachilli_general_pidfile"
+msgid "Pid file"
 msgstr ""
 
 #. Filename to put the process id
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:9
-msgid "coovachilli_general_pidfile_desc"
+msgid "Filename to put the process id"
 msgstr ""
 
 #. State directory
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:10
-msgid "coovachilli_general_statedir"
+msgid "State directory"
 msgstr ""
 
 #. Directory of non-volatile data
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:11
-msgid "coovachilli_general_statedir_desc"
+msgid "Directory of non-volatile data"
 msgstr ""
 
 #. TUN/TAP configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:12
-msgid "coovachilli_tun"
+msgid "TUN/TAP configuration"
 msgstr ""
 
 #. Network/Tun configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:13
-msgid "coovachilli_tun_desc"
+msgid "Network/Tun configuration"
 msgstr ""
 
 #. Network down script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:14
-msgid "coovachilli_tun_condown"
+msgid "Network down script"
 msgstr ""
 
 #. Script executed after a session has moved from authorized state to unauthorized
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:15
-msgid "coovachilli_tun_condown_desc"
+msgid "Script executed after a session has moved from authorized state to unauthorized"
 msgstr ""
 
 #. Network up script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:16
-msgid "coovachilli_tun_conup"
+msgid "Network up script"
 msgstr ""
 
 #. Script executed after the tun network interface has been brought up
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:17
-msgid "coovachilli_tun_conup_desc"
+msgid "Script executed after the tun network interface has been brought up"
 msgstr ""
 
 #. Primary DNS Server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:18
-msgid "coovachilli_tun_dns1"
+msgid "Primary DNS Server"
 msgstr ""
 
 #. Is used to inform the client about the DNS address to use for host name resolution
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:19
-msgid "coovachilli_tun_dns1_desc"
+msgid "Is used to inform the client about the DNS address to use for host name resolution"
 msgstr ""
 
 #. Secondary DNS Server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:20
-msgid "coovachilli_tun_dns2"
+msgid "Secondary DNS Server"
 msgstr ""
 
 #. Is used to inform the client about the DNS address to use for host name resolution
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:21
-msgid "coovachilli_tun_dns2_desc"
+msgid "Is used to inform the client about the DNS address to use for host name resolution"
 msgstr ""
 
 #. Domain name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:22
-msgid "coovachilli_tun_domain"
+msgid "Domain name"
 msgstr ""
 
 #. Is used to inform the client about the domain name to use for DNS lookups
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:23
-msgid "coovachilli_tun_domain_desc"
+msgid "Is used to inform the client about the domain name to use for DNS lookups"
 msgstr ""
 
 #. Dynamic IP address pool
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:24
-msgid "coovachilli_tun_dynip"
+msgid "Dynamic IP address pool"
 msgstr ""
 
 #. Specifies a pool of dynamic IP addresses
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:25
-msgid "coovachilli_tun_dynip_desc"
+msgid "Specifies a pool of dynamic IP addresses"
 msgstr ""
 
 #. IP down script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:26
-msgid "coovachilli_tun_ipdown"
+msgid "IP down script"
 msgstr ""
 
 #. Script executed after the tun network interface has been taken down
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:27
-msgid "coovachilli_tun_ipdown_desc"
+msgid "Script executed after the tun network interface has been taken down"
 msgstr ""
 
 #. IP up script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:28
-msgid "coovachilli_tun_ipup"
+msgid "IP up script"
 msgstr ""
 
 #. Script executed after the TUN/TAP network interface has been brought up
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:29
-msgid "coovachilli_tun_ipup_desc"
+msgid "Script executed after the TUN/TAP network interface has been brought up"
 msgstr ""
 
 #. Uplink subnet
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:30
-msgid "coovachilli_tun_net"
+msgid "Uplink subnet"
 msgstr ""
 
 #. Network address of the uplink interface (CIDR notation)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:31
-msgid "coovachilli_tun_net_desc"
+msgid "Network address of the uplink interface (CIDR notation)"
 msgstr ""
 
 #. Static IP address pool
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:32
-msgid "coovachilli_tun_statip"
+msgid "Static IP address pool"
 msgstr ""
 
 #. Specifies a pool of static IP addresses
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:33
-msgid "coovachilli_tun_statip_desc"
+msgid "Specifies a pool of static IP addresses"
 msgstr ""
 
 #. TUN/TAP device
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:34
-msgid "coovachilli_tun_tundev"
+msgid "TUN/TAP device"
 msgstr ""
 
 #. The specific device to use for the TUN/TAP interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:35
-msgid "coovachilli_tun_tundev_desc"
+msgid "The specific device to use for the TUN/TAP interface"
 msgstr ""
 
 #. TX queue length
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:36
-msgid "coovachilli_tun_txqlen"
+msgid "TX queue length"
 msgstr ""
 
 #. The TX queue length to set on the TUN/TAP interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:37
-msgid "coovachilli_tun_txqlen_desc"
+msgid "The TX queue length to set on the TUN/TAP interface"
 msgstr ""
 
 #. Use TAP device
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:38
-msgid "coovachilli_tun_usetap"
+msgid "Use TAP device"
 msgstr ""
 
 #. Use the TAP interface instead of TUN
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:39
-msgid "coovachilli_tun_usetap_desc"
+msgid "Use the TAP interface instead of TUN"
 msgstr ""
 
 #. DHCP configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:40
-msgid "coovachilli_dhcp"
+msgid "DHCP configuration"
 msgstr ""
 
 #. Set DHCP options for connecting clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:41
-msgid "coovachilli_dhcp_desc"
+msgid "Set DHCP options for connecting clients"
 msgstr ""
 
 #. DHCP end number
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:42
-msgid "coovachilli_dhcp_dhcpend"
+msgid "DHCP end number"
 msgstr ""
 
 #. Where to stop assigning IP addresses (default 254)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:43
-msgid "coovachilli_dhcp_dhcpend_desc"
+msgid "Where to stop assigning IP addresses (default 254)"
 msgstr ""
 
 #. DHCP interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:44
-msgid "coovachilli_dhcp_dhcpif"
+msgid "DHCP interface"
 msgstr ""
 
 #. Ethernet interface to listen to for the downlink interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:45
-msgid "coovachilli_dhcp_dhcpif_desc"
+msgid "Ethernet interface to listen to for the downlink interface"
 msgstr ""
 
 #. Listen MAC address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:46
-msgid "coovachilli_dhcp_dhcpmac"
+msgid "Listen MAC address"
 msgstr ""
 
 #. MAC address to listen to. If not specified the MAC address of the interface will be used
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:47
-msgid "coovachilli_dhcp_dhcpmac_desc"
+msgid "MAC address to listen to. If not specified the MAC address of the interface will be used"
 msgstr ""
 
 #. DHCP start number
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:48
-msgid "coovachilli_dhcp_dhcpstart"
+msgid "DHCP start number"
 msgstr ""
 
 #. Where to start assigning IP addresses (default 10)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:49
-msgid "coovachilli_dhcp_dhcpstart_desc"
+msgid "Where to start assigning IP addresses (default 10)"
 msgstr ""
 
 #. Enable IEEE 802.1x
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:50
-msgid "coovachilli_dhcp_eapolenable"
+msgid "Enable IEEE 802.1x"
 msgstr ""
 
 #. Enable IEEE 802.1x authentication and listen for EAP requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:51
-msgid "coovachilli_dhcp_eapolenable_desc"
+msgid "Enable IEEE 802.1x authentication and listen for EAP requests"
 msgstr ""
 
 #. Leasetime
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:52
-msgid "coovachilli_dhcp_lease"
+msgid "Leasetime"
 msgstr ""
 
 #. Use a DHCP lease of seconds (default 600)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:53
-msgid "coovachilli_dhcp_lease_desc"
+msgid "Use a DHCP lease of seconds (default 600)"
 msgstr ""
 
 #. RADIUS configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:54
-msgid "coovachilli_radius"
+msgid "RADIUS configuration"
 msgstr ""
 
 #. RADIUS configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:55
-msgid "coovachilli_radius_desc"
+msgid "RADIUS configuration"
 msgstr ""
 
 #. Allow session update through RADIUS
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:56
-msgid "coovachilli_radius_acctupdate"
+msgid "Allow session update through RADIUS"
 msgstr ""
 
 #. Allow updating of session parameters with RADIUS attributes sent in Accounting-Response
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:57
-msgid "coovachilli_radius_acctupdate_desc"
+msgid "Allow updating of session parameters with RADIUS attributes sent in Accounting-Response"
 msgstr ""
 
 #. Admin password
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:58
-msgid "coovachilli_radius_adminpasswd"
+msgid "Admin password"
 msgstr ""
 
 #. Password to use for Administrative-User authentication in order to pick up chilli configurations and establish a device &quot;system&quot; session
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:59
-msgid "coovachilli_radius_adminpasswd_desc"
+msgid "Password to use for Administrative-User authentication in order to pick up chilli configurations and establish a device \"system\" session"
 msgstr ""
 
 #. Admin user
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:60
-msgid "coovachilli_radius_adminuser"
+msgid "Admin user"
 msgstr ""
 
 #. User-name to use for Administrative-User authentication in order to pick up chilli configurations and establish a device &quot;system&quot; session
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:61
-msgid "coovachilli_radius_adminuser_desc"
+msgid "User-name to use for Administrative-User authentication in order to pick up chilli configurations and establish a device \"system\" session"
 msgstr ""
 
 #. Do not check disconnection requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:62
-msgid "coovachilli_radius_coanoipcheck"
+msgid "Do not check disconnection requests"
 msgstr ""
 
 #. Do not check the source IP address of radius disconnect requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:63
-msgid "coovachilli_radius_coanoipcheck_desc"
+msgid "Do not check the source IP address of radius disconnect requests"
 msgstr ""
 
 #. RADIUS disconnect port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:64
-msgid "coovachilli_radius_coaport"
+msgid "RADIUS disconnect port"
 msgstr ""
 
 #. UDP port to listen to for accepting radius disconnect requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:65
-msgid "coovachilli_radius_coaport_desc"
+msgid "UDP port to listen to for accepting radius disconnect requests"
 msgstr ""
 
 #. NAS IP
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:66
-msgid "coovachilli_radius_nasip"
+msgid "NAS IP"
 msgstr ""
 
 #. Value to use in RADIUS NAS-IP-Address attribute
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:67
-msgid "coovachilli_radius_nasip_desc"
+msgid "Value to use in RADIUS NAS-IP-Address attribute"
 msgstr ""
 
 #. NAS MAC
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:68
-msgid "coovachilli_radius_nasmac"
+msgid "NAS MAC"
 msgstr ""
 
 #. MAC address value to use in RADIUS Called-Station-ID attribute
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:69
-msgid "coovachilli_radius_nasmac_desc"
+msgid "MAC address value to use in RADIUS Called-Station-ID attribute"
 msgstr ""
 
 #. Allow OpenID authentication
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:70
-msgid "coovachilli_radius_openidauth"
+msgid "Allow OpenID authentication"
 msgstr ""
 
 #. Allows OpenID authentication by sending ChilliSpot-Config=allow-openidauth in RADIUS Access-Requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:71
-msgid "coovachilli_radius_openidauth_desc"
+msgid "Allows OpenID authentication by sending ChilliSpot-Config=allow-openidauth in RADIUS Access-Requests"
 msgstr ""
 
 #. RADIUS accounting port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:72
-msgid "coovachilli_radius_radiusacctport"
+msgid "RADIUS accounting port"
 msgstr ""
 
 #. The UDP port number to use for radius accounting requests (default 1813)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:73
-msgid "coovachilli_radius_radiusacctport_desc"
+msgid "The UDP port number to use for radius accounting requests (default 1813)"
 msgstr ""
 
 #. RADIUS authentication port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:74
-msgid "coovachilli_radius_radiusauthport"
+msgid "RADIUS authentication port"
 msgstr ""
 
 #. The UDP port number to use for radius authentication requests (default 1812)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:75
-msgid "coovachilli_radius_radiusauthport_desc"
+msgid "The UDP port number to use for radius authentication requests (default 1812)"
 msgstr ""
 
 #. Option radiuscalled
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:76
-msgid "coovachilli_radius_radiuscalled"
+msgid "Option radiuscalled"
 msgstr ""
 
 #. RADIUS listen address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:77
-msgid "coovachilli_radius_radiuslisten"
+msgid "RADIUS listen address"
 msgstr ""
 
 #. Local interface IP address to use for the radius interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:78
-msgid "coovachilli_radius_radiuslisten_desc"
+msgid "Local interface IP address to use for the radius interface"
 msgstr ""
 
 #. RADIUS location ID
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:79
-msgid "coovachilli_radius_radiuslocationid"
+msgid "RADIUS location ID"
 msgstr ""
 
 #. WISPr Location ID
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:80
-msgid "coovachilli_radius_radiuslocationid_desc"
+msgid "WISPr Location ID"
 msgstr ""
 
 #. RADIUS location name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:81
-msgid "coovachilli_radius_radiuslocationname"
+msgid "RADIUS location name"
 msgstr ""
 
 #. WISPr Location Name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:82
-msgid "coovachilli_radius_radiuslocationname_desc"
+msgid "WISPr Location Name"
 msgstr ""
 
 #. NAS ID
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:83
-msgid "coovachilli_radius_radiusnasid"
+msgid "NAS ID"
 msgstr ""
 
 #. Network access server identifier
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:84
-msgid "coovachilli_radius_radiusnasid_desc"
+msgid "Network access server identifier"
 msgstr ""
 
 #. Option radiusnasip
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:85
-msgid "coovachilli_radius_radiusnasip"
+msgid "Option radiusnasip"
 msgstr ""
 
 #. NAS port type
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:86
-msgid "coovachilli_radius_radiusnasporttype"
+msgid "NAS port type"
 msgstr ""
 
 #. Value of NAS-Port-Type attribute. Defaults to 19 (Wireless-IEEE-802.11)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:87
-msgid "coovachilli_radius_radiusnasporttype_desc"
+msgid "Value of NAS-Port-Type attribute. Defaults to 19 (Wireless-IEEE-802.11)"
 msgstr ""
 
 #. Send RADIUS VSA
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:88
-msgid "coovachilli_radius_radiusoriginalurl"
+msgid "Send RADIUS VSA"
 msgstr ""
 
 #. Send the ChilliSpot-OriginalURL RADIUS VSA in Access-Request
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:89
-msgid "coovachilli_radius_radiusoriginalurl_desc"
+msgid "Send the ChilliSpot-OriginalURL RADIUS VSA in Access-Request"
 msgstr ""
 
 #. RADIUS secret
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:90
-msgid "coovachilli_radius_radiussecret"
+msgid "RADIUS secret"
 msgstr ""
 
 #. Radius shared secret for both servers
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:91
-msgid "coovachilli_radius_radiussecret_desc"
+msgid "Radius shared secret for both servers"
 msgstr ""
 
 #. RADIUS server 1
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:92
-msgid "coovachilli_radius_radiusserver1"
+msgid "RADIUS server 1"
 msgstr ""
 
 #. The IP address of radius server 1
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:93
-msgid "coovachilli_radius_radiusserver1_desc"
+msgid "The IP address of radius server 1"
 msgstr ""
 
 #. RADIUS server 2
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:94
-msgid "coovachilli_radius_radiusserver2"
+msgid "RADIUS server 2"
 msgstr ""
 
 #. The IP address of radius server 2
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:95
-msgid "coovachilli_radius_radiusserver2_desc"
+msgid "The IP address of radius server 2"
 msgstr ""
 
 #. Swap octets
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:96
-msgid "coovachilli_radius_swapoctets"
+msgid "Swap octets"
 msgstr ""
 
 #. Swap the meaning of &quot;input octets&quot; and &quot;output octets&quot; as it related to RADIUS attribtues
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:97
-msgid "coovachilli_radius_swapoctets_desc"
+msgid "Swap the meaning of \"input octets\" and \"output octets\" as it related to RADIUS attribtues"
 msgstr ""
 
 #. Allow WPA guests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:98
-msgid "coovachilli_radius_wpaguests"
+msgid "Allow WPA guests"
 msgstr ""
 
 #. Allows WPA Guest authentication by sending ChilliSpot-Config=allow-wpa-guests in RADIUS Access-Requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:99
-msgid "coovachilli_radius_wpaguests_desc"
+msgid "Allows WPA Guest authentication by sending ChilliSpot-Config=allow-wpa-guests in RADIUS Access-Requests"
 msgstr ""
 
 #. RADIUS proxy settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:100
-msgid "coovachilli_proxy"
+msgid "RADIUS proxy settings"
 msgstr ""
 
 #. RADIUS proxy settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:101
-msgid "coovachilli_proxy_desc"
+msgid "RADIUS proxy settings"
 msgstr ""
 
 #. Proxy client
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:102
-msgid "coovachilli_proxy_proxyclient"
+msgid "Proxy client"
 msgstr ""
 
 #. IP address from which radius requests are accepted. If omitted the server will not accept radius requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:103
-msgid "coovachilli_proxy_proxyclient_desc"
+msgid "IP address from which radius requests are accepted. If omitted the server will not accept radius requests"
 msgstr ""
 
 #. Proxy listen address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:104
-msgid "coovachilli_proxy_proxylisten"
+msgid "Proxy listen address"
 msgstr ""
 
 #. Local interface IP address to use for accepting radius requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:105
-msgid "coovachilli_proxy_proxylisten_desc"
+msgid "Local interface IP address to use for accepting radius requests"
 msgstr ""
 
 #. Proxy port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:106
-msgid "coovachilli_proxy_proxyport"
+msgid "Proxy port"
 msgstr ""
 
 #. UDP Port to listen to for accepting radius requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:107
-msgid "coovachilli_proxy_proxyport_desc"
+msgid "UDP Port to listen to for accepting radius requests"
 msgstr ""
 
 #. Proxy secret
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:108
-msgid "coovachilli_proxy_proxysecret"
+msgid "Proxy secret"
 msgstr ""
 
 #. Radius shared secret for clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:109
-msgid "coovachilli_proxy_proxysecret_desc"
+msgid "Radius shared secret for clients"
 msgstr ""
 
 #. UAM configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:110
-msgid "coovachilli_uam"
+msgid "UAM configuration"
 msgstr ""
 
 #. Unified Configuration Method settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:111
-msgid "coovachilli_uam_desc"
+msgid "Unified Configuration Method settings"
 msgstr ""
 
 #. Use Chilli XML
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:112
-msgid "coovachilli_uam_chillixml"
+msgid "Use Chilli XML"
 msgstr ""
 
 #. Return the so-called Chilli XML along with WISPr XML
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:113
-msgid "coovachilli_uam_chillixml_desc"
+msgid "Return the so-called Chilli XML along with WISPr XML"
 msgstr ""
 
 #. Default idle timeout
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:114
-msgid "coovachilli_uam_defidletimeout"
+msgid "Default idle timeout"
 msgstr ""
 
 #. Default idle timeout unless otherwise set by RADIUS (defaults to 0)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:115
-msgid "coovachilli_uam_defidletimeout_desc"
+msgid "Default idle timeout unless otherwise set by RADIUS (defaults to 0)"
 msgstr ""
 
 #. Default interim interval
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:116
-msgid "coovachilli_uam_definteriminterval"
+msgid "Default interim interval"
 msgstr ""
 
 #. Default interim-interval for RADIUS accounting unless otherwise set by RADIUS (defaults to 0)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:117
-msgid "coovachilli_uam_definteriminterval_desc"
+msgid "Default interim-interval for RADIUS accounting unless otherwise set by RADIUS (defaults to 0)"
 msgstr ""
 
 #. Default session timeout
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:118
-msgid "coovachilli_uam_defsessiontimeout"
+msgid "Default session timeout"
 msgstr ""
 
 #. Default session timeout unless otherwise set by RADIUS (defaults to 0)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:119
-msgid "coovachilli_uam_defsessiontimeout_desc"
+msgid "Default session timeout unless otherwise set by RADIUS (defaults to 0)"
 msgstr ""
 
 #. Inspect DNS traffic
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:120
-msgid "coovachilli_uam_dnsparanoia"
+msgid "Inspect DNS traffic"
 msgstr ""
 
 #. Inspect DNS packets and drop responses with any non- A, CNAME, SOA, or MX records to prevent dns tunnels (experimental)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:121
-msgid "coovachilli_uam_dnsparanoia_desc"
+msgid "Inspect DNS packets and drop responses with any non- A, CNAME, SOA, or MX records to prevent dns tunnels (experimental)"
 msgstr ""
 
 #. Local users file
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:122
-msgid "coovachilli_uam_localusers"
+msgid "Local users file"
 msgstr ""
 
 #. A colon seperated file containing usernames and passwords of locally authenticated users
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:123
-msgid "coovachilli_uam_localusers_desc"
+msgid "A colon seperated file containing usernames and passwords of locally authenticated users"
 msgstr ""
 
 #. Location name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:124
-msgid "coovachilli_uam_locationname"
+msgid "Location name"
 msgstr ""
 
 #. Human readable location name used in JSON interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:125
-msgid "coovachilli_uam_locationname_desc"
+msgid "Human readable location name used in JSON interface"
 msgstr ""
 
 #. Do not redirect to UAM server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:126
-msgid "coovachilli_uam_nouamsuccess"
+msgid "Do not redirect to UAM server"
 msgstr ""
 
 #. Do not return to UAM server on login success, just redirect to original URL
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:127
-msgid "coovachilli_uam_nouamsuccess_desc"
+msgid "Do not return to UAM server on login success, just redirect to original URL"
 msgstr ""
 
 #. Do not do WISPr
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:128
-msgid "coovachilli_uam_nouamwispr"
+msgid "Do not do WISPr"
 msgstr ""
 
 #. Do not do any WISPr XML, assume the back-end is doing this instead
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:129
-msgid "coovachilli_uam_nouamwispr_desc"
+msgid "Do not do any WISPr XML, assume the back-end is doing this instead"
 msgstr ""
 
 #. Post auth proxy
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:130
-msgid "coovachilli_uam_postauthproxy"
+msgid "Post auth proxy"
 msgstr ""
 
 #. Used with postauthproxyport to define a post authentication HTTP proxy server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:131
-msgid "coovachilli_uam_postauthproxy_desc"
+msgid "Used with postauthproxyport to define a post authentication HTTP proxy server"
 msgstr ""
 
 #. Post auth proxy port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:132
-msgid "coovachilli_uam_postauthproxyport"
+msgid "Post auth proxy port"
 msgstr ""
 
 #. Used with postauthproxy to define a post authentication HTTP proxy server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:133
-msgid "coovachilli_uam_postauthproxyport_desc"
+msgid "Used with postauthproxy to define a post authentication HTTP proxy server"
 msgstr ""
 
 #. Allowed resources
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:134
-msgid "coovachilli_uam_uamallowed"
+msgid "Allowed resources"
 msgstr ""
 
 #. List of resources the client can access without first authenticating
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:135
-msgid "coovachilli_uam_uamallowed_desc"
+msgid "List of resources the client can access without first authenticating"
 msgstr ""
 
 #. Allow any DNS server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:136
-msgid "coovachilli_uam_uamanydns"
+msgid "Allow any DNS server"
 msgstr ""
 
 #. Allow any DNS server for unauthenticated clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:137
-msgid "coovachilli_uam_uamanydns_desc"
+msgid "Allow any DNS server for unauthenticated clients"
 msgstr ""
 
 #. Allow any IP address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:138
-msgid "coovachilli_uam_uamanyip"
+msgid "Allow any IP address"
 msgstr ""
 
 #. Allow clients to use any IP settings they wish by spoofing ARP (experimental)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:139
-msgid "coovachilli_uam_uamanyip_desc"
+msgid "Allow clients to use any IP settings they wish by spoofing ARP (experimental)"
 msgstr ""
 
 #. Allowed domains
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:140
-msgid "coovachilli_uam_uamdomain"
+msgid "Allowed domains"
 msgstr ""
 
 #. Defines a list of domain names to automatically add to the walled garden
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:141
-msgid "coovachilli_uam_uamdomain_desc"
+msgid "Defines a list of domain names to automatically add to the walled garden"
 msgstr ""
 
 #. UAM homepage
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:142
-msgid "coovachilli_uam_uamhomepage"
+msgid "UAM homepage"
 msgstr ""
 
 #. URL of homepage to redirect unauthenticated users to
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:143
-msgid "coovachilli_uam_uamhomepage_desc"
+msgid "URL of homepage to redirect unauthenticated users to"
 msgstr ""
 
 #. UAM static content port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:144
-msgid "coovachilli_uam_uamiport"
+msgid "UAM static content port"
 msgstr ""
 
 #. TCP port to bind to for only serving embedded content
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:145
-msgid "coovachilli_uam_uamiport_desc"
+msgid "TCP port to bind to for only serving embedded content"
 msgstr ""
 
 #. UAM listening address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:146
-msgid "coovachilli_uam_uamlisten"
+msgid "UAM listening address"
 msgstr ""
 
 #. IP address to listen to for authentication of clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:147
-msgid "coovachilli_uam_uamlisten_desc"
+msgid "IP address to listen to for authentication of clients"
 msgstr ""
 
 #. UAM logout IP
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:148
-msgid "coovachilli_uam_uamlogoutip"
+msgid "UAM logout IP"
 msgstr ""
 
 #. Use this IP address to instantly logout a client accessing it (defaults to 1.1.1.1)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:149
-msgid "coovachilli_uam_uamlogoutip_desc"
+msgid "Use this IP address to instantly logout a client accessing it (defaults to 1.1.1.1)"
 msgstr ""
 
 #. UAM listening port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:150
-msgid "coovachilli_uam_uamport"
+msgid "UAM listening port"
 msgstr ""
 
 #. TCP port to bind to for authenticating clients (default 3990)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:151
-msgid "coovachilli_uam_uamport_desc"
+msgid "TCP port to bind to for authenticating clients (default 3990)"
 msgstr ""
 
 #. UAM secret
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:152
-msgid "coovachilli_uam_uamsecret"
+msgid "UAM secret"
 msgstr ""
 
 #. Shared secret between uamserver and chilli
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:153
-msgid "coovachilli_uam_uamsecret_desc"
+msgid "Shared secret between uamserver and chilli"
 msgstr ""
 
 #. UAM server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:154
-msgid "coovachilli_uam_uamserver"
+msgid "UAM server"
 msgstr ""
 
 #. URL of web server to use for authenticating clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:155
-msgid "coovachilli_uam_uamserver_desc"
+msgid "URL of web server to use for authenticating clients"
 msgstr ""
 
 #. UAM user interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:156
-msgid "coovachilli_uam_uamui"
+msgid "UAM user interface"
 msgstr ""
 
 #. An init.d style program to handle local content on the uamuiport web server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:157
-msgid "coovachilli_uam_uamui_desc"
+msgid "An init.d style program to handle local content on the uamuiport web server"
 msgstr ""
 
 #. Use status file
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:158
-msgid "coovachilli_uam_usestatusfile"
+msgid "Use status file"
 msgstr ""
 
 #. Write the status of clients in a non-volatile state file (experimental)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:159
-msgid "coovachilli_uam_usestatusfile_desc"
+msgid "Write the status of clients in a non-volatile state file (experimental)"
 msgstr ""
 
 #. WISPr login url
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:160
-msgid "coovachilli_uam_wisprlogin"
+msgid "WISPr login url"
 msgstr ""
 
 #. Specific URL to be given in WISPr XML LoginURL
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:161
-msgid "coovachilli_uam_wisprlogin_desc"
+msgid "Specific URL to be given in WISPr XML LoginURL"
 msgstr ""
 
 #. CGI program
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:162
-msgid "coovachilli_uam_wwwbin"
+msgid "CGI program"
 msgstr ""
 
 #. Executable to run as a CGI type program (like haserl) for URLs with extention .chi
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:163
-msgid "coovachilli_uam_wwwbin_desc"
+msgid "Executable to run as a CGI type program (like haserl) for URLs with extention .chi"
 msgstr ""
 
 #. Web content directory
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:164
-msgid "coovachilli_uam_wwwdir"
+msgid "Web content directory"
 msgstr ""
 
 #. Directory where embedded local web content is placed
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:165
-msgid "coovachilli_uam_wwwdir_desc"
+msgid "Directory where embedded local web content is placed"
 msgstr ""
 
 #. MAC configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:166
-msgid "coovachilli_macauth"
+msgid "MAC configuration"
 msgstr ""
 
 #. Configure MAC authentication
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:167
-msgid "coovachilli_macauth_desc"
+msgid "Configure MAC authentication"
 msgstr ""
 
 #. Allowed MAC addresses
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:168
-msgid "coovachilli_macauth_macallowed"
+msgid "Allowed MAC addresses"
 msgstr ""
 
 #. List of MAC addresses for which MAC authentication will be performed
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:169
-msgid "coovachilli_macauth_macallowed_desc"
+msgid "List of MAC addresses for which MAC authentication will be performed"
 msgstr ""
 
 #. Authenticate locally allowed MACs
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:170
-msgid "coovachilli_macauth_macallowlocal"
+msgid "Authenticate locally allowed MACs"
 msgstr ""
 
 #. Authenticate allowed MAC addresses without the use of RADIUS
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:171
-msgid "coovachilli_macauth_macallowlocal_desc"
+msgid "Authenticate allowed MAC addresses without the use of RADIUS"
 msgstr ""
 
 #. Enable MAC authentification
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:172
-msgid "coovachilli_macauth_macauth"
+msgid "Enable MAC authentification"
 msgstr ""
 
 #. Try to authenticate all users based on their mac address alone
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:173
-msgid "coovachilli_macauth_macauth_desc"
+msgid "Try to authenticate all users based on their mac address alone"
 msgstr ""
 
 #. Password
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:174
-msgid "coovachilli_macauth_macpasswd"
+msgid "Password"
 msgstr ""
 
 #. Password used when performing MAC authentication
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:175
-msgid "coovachilli_macauth_macpasswd_desc"
+msgid "Password used when performing MAC authentication"
 msgstr ""
 
 #. Suffix
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:176
-msgid "coovachilli_macauth_macsuffix"
+msgid "Suffix"
 msgstr ""
 
 #. Suffix to add to the MAC address in order to form the User-Name, which is sent to the radius server
diff --git a/po/el/ddns.po b/po/el/ddns.po
index 98a5a1c8a..390fe9b1b 100644
--- a/po/el/ddns.po
+++ b/po/el/ddns.po
@@ -13,41 +13,41 @@ msgstr ""
 
 #. Dynamic DNS
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:1
-msgid "ddns"
+msgid "Dynamic DNS"
 msgstr "Δυναμικό DNS"
 
 #. Dynamic DNS allows that your router can be reached with a fixed hostname while having a dynamically changing IP-Address.
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:2
-msgid "ddns_desc"
+msgid "Dynamic DNS allows that your router can be reached with a fixed hostname while having a dynamically changing IP-Address."
 msgstr ""
 "Το Δυναμικό DNS επιτρέπει την πρόσβαση στον router σας έχοντας ένα σταθερό "
 "όνομα υπολογιστή παρόλο που η διεύθυνση IP του μπορεί να αλλάζει δυναμικά."
 
 #. Source of IP-Address
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:3
-msgid "ddns_service_ipsource"
+msgid "Source of IP-Address"
 msgstr "Πηγή διεύθυνσης IP"
 
 #. Check for changed IP every
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:4
-msgid "ddns_service_checkinterval"
+msgid "Check for changed IP every"
 msgstr "Έλεγχος για αλλαγή IP κάθε"
 
 #. Check-Time unit
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:5
 #, fuzzy
-msgid "ddns_service_checkunit"
+msgid "Check-Time unit"
 msgstr "Μονάδα ώρας για έλεγχο"
 
 #. Force update every
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:6
-msgid "ddns_service_forceinterval"
+msgid "Force update every"
 msgstr "Εξαναγκασμός ενημέρωσης κάθε"
 
 #. Force-Time unit
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:7
 #, fuzzy
-msgid "ddns_service_forceunit"
+msgid "Force-Time unit"
 msgstr "Μόναδα ώρας για εξαναγκασμό"
 
 #. Custom Update-URL
diff --git a/po/el/default.po b/po/el/default.po
index 7848dbbaf..b074f64c4 100644
--- a/po/el/default.po
+++ b/po/el/default.po
@@ -14,37 +14,37 @@ msgstr ""
 
 #. Skip to navigation
 #: i18n/english/luasrc/i18n/default.en.lua:1
-msgid "skiplink1"
+msgid "Skip to navigation"
 msgstr "Παράκαμψη σε πλοήγηση"
 
 #. Skip to content
 #: i18n/english/luasrc/i18n/default.en.lua:2
-msgid "skiplink2"
+msgid "Skip to content"
 msgstr "Παράκαμψη σε περιεχόμενο"
 
 #. Navigation
 #: i18n/english/luasrc/i18n/default.en.lua:3
-msgid "navigation"
+msgid "Navigation"
 msgstr "Πλοήγηση"
 
 #. About
 #: i18n/english/luasrc/i18n/default.en.lua:4
-msgid "about"
+msgid "About"
 msgstr "Περί"
 
 #. Add
 #: i18n/english/luasrc/i18n/default.en.lua:5
-msgid "add"
+msgid "Add"
 msgstr "Προσθήκη"
 
 #. Addresses
 #: i18n/english/luasrc/i18n/default.en.lua:6
-msgid "addresses"
+msgid "Addresses"
 msgstr "Διευθύνσεις"
 
 #. Aliases
 #: i18n/english/luasrc/i18n/default.en.lua:7
-msgid "aliases"
+msgid "Aliases"
 msgstr "Ψευδώνυμα"
 
 #. all
@@ -59,99 +59,99 @@ msgstr "πίσω"
 
 #. Administration
 #: i18n/english/luasrc/i18n/default.en.lua:10
-msgid "administration"
+msgid "Administration"
 msgstr "Διαχείριση"
 
 #. Essentials
 #: i18n/english/luasrc/i18n/default.en.lua:11
-msgid "essentials"
+msgid "Essentials"
 msgstr "Βασικά"
 
 #. Apply
 #: i18n/english/luasrc/i18n/default.en.lua:12
-msgid "apply"
+msgid "Apply"
 msgstr "Εφαρμογή"
 
 #. Basic Settings
 #: i18n/english/luasrc/i18n/default.en.lua:13
-msgid "basicsettings"
+msgid "Basic Settings"
 msgstr "Βασικές Ρυθμίσεις"
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast
 #: i18n/english/luasrc/i18n/default.en.lua:14
-msgid "broadcast"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"
 msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"
 
 #. Cancel
 #: i18n/english/luasrc/i18n/default.en.lua:15
-msgid "cancel"
+msgid "Cancel"
 msgstr "Ακύρωση"
 
 #. Changes
 #: i18n/english/luasrc/i18n/default.en.lua:16
-msgid "changes"
+msgid "Changes"
 msgstr "Αλλαγές"
 
 #. Channel
 #: i18n/english/luasrc/i18n/default.en.lua:17
-msgid "channel"
+msgid "Channel"
 msgstr "Κανάλι"
 
 #. <abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/prefix
 #: i18n/english/luasrc/i18n/default.en.lua:18
-msgid "cidr6"
+msgid "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/prefix"
 msgstr ""
 "Παράσταση <abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>: "
 "διεύθυνση/πρόθεμα"
 
 #. Code
 #: i18n/english/luasrc/i18n/default.en.lua:19
-msgid "code"
+msgid "Code"
 msgstr "Κωδικός"
 
 #. Configuration
 #: i18n/english/luasrc/i18n/default.en.lua:20
-msgid "config"
+msgid "Configuration"
 msgstr "Παραμετροποίηση"
 
 #. Configuration file
 #: i18n/english/luasrc/i18n/default.en.lua:21
-msgid "configfile"
+msgid "Configuration file"
 msgstr "Αρχείο Παραμετροποίησης"
 
 #. Confirmation
 #: i18n/english/luasrc/i18n/default.en.lua:22
-msgid "confirmation"
+msgid "Confirmation"
 msgstr "Επιβεβαίωση"
 
 #. Delete
 #: i18n/english/luasrc/i18n/default.en.lua:23
-msgid "delete"
+msgid "Delete"
 msgstr "Διαγραφή"
 
 #. Description
 #: i18n/english/luasrc/i18n/default.en.lua:24
-msgid "descr"
+msgid "Description"
 msgstr "Περιγραφή"
 
 #. Design
 #: i18n/english/luasrc/i18n/default.en.lua:25
-msgid "design"
+msgid "Design"
 msgstr "Εμφάνιση"
 
 #. Destination
 #: i18n/english/luasrc/i18n/default.en.lua:26
-msgid "destination"
+msgid "Destination"
 msgstr "Προορισμός"
 
 #. Device
 #: i18n/english/luasrc/i18n/default.en.lua:27
-msgid "device"
+msgid "Device"
 msgstr "Συσκευή"
 
 #. Devices
 #: i18n/english/luasrc/i18n/default.en.lua:28
-msgid "devices"
+msgid "Devices"
 msgstr "Συσκευές"
 
 #. disable
@@ -161,22 +161,22 @@ msgstr "ανενεργό"
 
 #. Distance
 #: i18n/english/luasrc/i18n/default.en.lua:30
-msgid "distance"
+msgid "Distance"
 msgstr "Απόσταση"
 
 #. Kernel Log
 #: i18n/english/luasrc/i18n/default.en.lua:31
-msgid "dmesg"
+msgid "Kernel Log"
 msgstr "Καταγραφή Πυρήνα"
 
 #. <abbr title=\"Domain Name System\">DNS</abbr>-Server
 #: i18n/english/luasrc/i18n/default.en.lua:32
-msgid "dnsserver"
+msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Server"
 msgstr "Εξυπηρετητής <abbr title=\"Domain Name System\">DNS</abbr>"
 
 #. Edit
 #: i18n/english/luasrc/i18n/default.en.lua:33
-msgid "edit"
+msgid "Edit"
 msgstr "Επεξεργασία"
 
 #. enable
@@ -186,47 +186,47 @@ msgstr "ενεργό"
 
 #. Encryption
 #: i18n/english/luasrc/i18n/default.en.lua:35
-msgid "encryption"
+msgid "Encryption"
 msgstr "Κρυπτογράφηση"
 
 #. Error
 #: i18n/english/luasrc/i18n/default.en.lua:36
-msgid "error"
+msgid "Error"
 msgstr "Σφάλμα"
 
 #. Filesystem
 #: i18n/english/luasrc/i18n/default.en.lua:37
-msgid "filesystem"
+msgid "Filesystem"
 msgstr "Σύστημα Αρχείων"
 
 #. Filter
 #: i18n/english/luasrc/i18n/default.en.lua:38
-msgid "filter"
+msgid "Filter"
 msgstr "Φίλτρο"
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway
 #: i18n/english/luasrc/i18n/default.en.lua:39
-msgid "gateway"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
 msgstr "Πύλη <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
 
 #. <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway
 #: i18n/english/luasrc/i18n/default.en.lua:40
-msgid "gateway6"
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 msgstr "Πύλη <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>"
 
 #. General
 #: i18n/english/luasrc/i18n/default.en.lua:41
-msgid "general"
+msgid "General"
 msgstr "Γενικά"
 
 #. Hostname
 #: i18n/english/luasrc/i18n/default.en.lua:42
-msgid "hostname"
+msgid "Hostname"
 msgstr "Όνομα Υπολογιστή"
 
 #. Install
 #: i18n/english/luasrc/i18n/default.en.lua:43
-msgid "install"
+msgid "Install"
 msgstr "Εγκατάσταση"
 
 #. installed
@@ -236,102 +236,102 @@ msgstr "εγκατεστημένο"
 
 #. Interface
 #: i18n/english/luasrc/i18n/default.en.lua:45
-msgid "interface"
+msgid "Interface"
 msgstr "Διεπαφή"
 
 #. Interfaces
 #: i18n/english/luasrc/i18n/default.en.lua:46
-msgid "interfaces"
+msgid "Interfaces"
 msgstr "Διεπαφές"
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address
 #: i18n/english/luasrc/i18n/default.en.lua:47
-msgid "ipaddress"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
 msgstr "Διεύθυνση <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
 
 #. <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address
 #: i18n/english/luasrc/i18n/default.en.lua:48
-msgid "ip6address"
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address"
 msgstr "Διεύθυνση <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>"
 
 #. Legend
 #: i18n/english/luasrc/i18n/default.en.lua:49
-msgid "legend"
+msgid "Legend"
 msgstr "Υπόμνημα"
 
 #. Library
 #: i18n/english/luasrc/i18n/default.en.lua:50
-msgid "library"
+msgid "Library"
 msgstr "Βιβλιοθήκη"
 
 #. Logout
 #: i18n/english/luasrc/i18n/default.en.lua:51
-msgid "logout"
+msgid "Logout"
 msgstr "Αποσύνδεση"
 
 #. Key
 #: i18n/english/luasrc/i18n/default.en.lua:52
-msgid "key"
+msgid "Key"
 msgstr "Κλειδί"
 
 #. Language
 #: i18n/english/luasrc/i18n/default.en.lua:53
-msgid "language"
+msgid "Language"
 msgstr "Γλώσσα"
 
 #. Limit
 #: i18n/english/luasrc/i18n/default.en.lua:54
-msgid "limit"
+msgid "Limit"
 msgstr "Όριο"
 
 #. Load
 #: i18n/english/luasrc/i18n/default.en.lua:55
-msgid "load"
+msgid "Load"
 msgstr "Φόρτος"
 
 #. Login
 #: i18n/english/luasrc/i18n/default.en.lua:56
-msgid "login"
+msgid "Login"
 msgstr "Σύνδεση"
 
 #. <abbr title=\"Media Access Control\">MAC</abbr>-Address
 #: i18n/english/luasrc/i18n/default.en.lua:57
-msgid "macaddress"
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr "Διεύθυνση <abbr title=\"Media Access Control\">MAC</abbr>"
 
 #. see &#39;%s&#39; manpage
 #: i18n/english/luasrc/i18n/default.en.lua:58
-msgid "manpage"
+msgid "see '%s' manpage"
 msgstr "βλέπε &#39;%s&#39; manpage"
 
 #. Metric
 #: i18n/english/luasrc/i18n/default.en.lua:59
-msgid "metric"
+msgid "Metric"
 msgstr "Μέτρο"
 
 #. Mode
 #: i18n/english/luasrc/i18n/default.en.lua:60
-msgid "mode"
+msgid "Mode"
 msgstr "Λειτουργία"
 
 #. Name
 #: i18n/english/luasrc/i18n/default.en.lua:61
-msgid "name"
+msgid "Name"
 msgstr "Όνομα"
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask
 #: i18n/english/luasrc/i18n/default.en.lua:62
-msgid "netmask"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr "Μάσκα <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
 
 #. Network
 #: i18n/english/luasrc/i18n/default.en.lua:63
-msgid "network"
+msgid "Network"
 msgstr "Δίκτυο"
 
 #. Networks
 #: i18n/english/luasrc/i18n/default.en.lua:64
-msgid "networks"
+msgid "Networks"
 msgstr "Δίκτυα"
 
 #. none
@@ -341,117 +341,117 @@ msgstr "κανένα"
 
 #. not installed
 #: i18n/english/luasrc/i18n/default.en.lua:66
-msgid "notinstalled"
+msgid "not installed"
 msgstr "μη-εγκατεστημένο"
 
 #. OK
 #: i18n/english/luasrc/i18n/default.en.lua:67
-msgid "ok"
+msgid "OK"
 msgstr "Εντάξει"
 
 #. Options
 #: i18n/english/luasrc/i18n/default.en.lua:68
-msgid "options"
+msgid "Options"
 msgstr "Επιλογές"
 
 #. Overview
 #: i18n/english/luasrc/i18n/default.en.lua:69
-msgid "overview"
+msgid "Overview"
 msgstr "Επισκόπηση"
 
 #. Package Manager
 #: i18n/english/luasrc/i18n/default.en.lua:70
-msgid "packagemanager"
+msgid "Package Manager"
 msgstr "Διαχειριστής Πακέτων"
 
 #. Password
 #: i18n/english/luasrc/i18n/default.en.lua:71
-msgid "password"
+msgid "Password"
 msgstr "Κωδικός Πρόσβασης"
 
 #. Path
 #: i18n/english/luasrc/i18n/default.en.lua:72
-msgid "path"
+msgid "Path"
 msgstr "Διαδρομή"
 
 #. Port
 #: i18n/english/luasrc/i18n/default.en.lua:73
-msgid "port"
+msgid "Port"
 msgstr "Θύρα"
 
 #. Ports
 #: i18n/english/luasrc/i18n/default.en.lua:74
-msgid "ports"
+msgid "Ports"
 msgstr "Θύρες"
 
 #. Proceed
 #: i18n/english/luasrc/i18n/default.en.lua:75
-msgid "proceed"
+msgid "Proceed"
 msgstr "Συνέχεια"
 
 #. Protocol
 #: i18n/english/luasrc/i18n/default.en.lua:76
-msgid "protocol"
+msgid "Protocol"
 msgstr "Πρωτόκολλο"
 
 #. Reboot
 #: i18n/english/luasrc/i18n/default.en.lua:77
-msgid "reboot"
+msgid "Reboot"
 msgstr "Επανεκκίνηση"
 
 #. Reset
 #: i18n/english/luasrc/i18n/default.en.lua:78
-msgid "reset"
+msgid "Reset"
 msgstr "Ακύρωση"
 
 #. Revert
 #: i18n/english/luasrc/i18n/default.en.lua:79
-msgid "revert"
+msgid "Revert"
 msgstr "Αναίρεση"
 
 #. Save
 #: i18n/english/luasrc/i18n/default.en.lua:80
-msgid "save"
+msgid "Save"
 msgstr "Αποθήκευση"
 
 #. Save &amp; Apply
 #: i18n/english/luasrc/i18n/default.en.lua:81
-msgid "saveapply"
+msgid "Save & Apply"
 msgstr "Αποθήκευση &amp; Εφαρμογή"
 
 #. Scan
 #: i18n/english/luasrc/i18n/default.en.lua:82
-msgid "scan"
+msgid "Scan"
 msgstr "Σάρωση"
 
 #. Service
 #: i18n/english/luasrc/i18n/default.en.lua:83
-msgid "service"
+msgid "Service"
 msgstr "Υπηρεσία"
 
 #. Services
 #: i18n/english/luasrc/i18n/default.en.lua:84
-msgid "services"
+msgid "Services"
 msgstr "Υπηρεσίες"
 
 #. Settings
 #: i18n/english/luasrc/i18n/default.en.lua:85
-msgid "settings"
+msgid "Settings"
 msgstr "Ρυθμίσεις"
 
 #. Size
 #: i18n/english/luasrc/i18n/default.en.lua:86
-msgid "size"
+msgid "Size"
 msgstr "Μέγεθος"
 
 #. Source
 #: i18n/english/luasrc/i18n/default.en.lua:87
-msgid "source"
+msgid "Source"
 msgstr "Πηγή"
 
 #. Start
 #: i18n/english/luasrc/i18n/default.en.lua:88
-msgid "start"
+msgid "Start"
 msgstr "Αρχή"
 
 #. static
@@ -461,72 +461,72 @@ msgstr "στατικό"
 
 #. Status
 #: i18n/english/luasrc/i18n/default.en.lua:90
-msgid "status"
+msgid "Status"
 msgstr "Κατάσταση"
 
 #. Statistics
 #: i18n/english/luasrc/i18n/default.en.lua:91
-msgid "statistics"
+msgid "Statistics"
 msgstr "Στατιστικά"
 
 #. Submit
 #: i18n/english/luasrc/i18n/default.en.lua:92
-msgid "submit"
+msgid "Submit"
 msgstr "Υποβολή"
 
 #. System Log
 #: i18n/english/luasrc/i18n/default.en.lua:93
-msgid "syslog"
+msgid "System Log"
 msgstr "Καταγραφή Συστήματος"
 
 #. System
 #: i18n/english/luasrc/i18n/default.en.lua:94
-msgid "system"
+msgid "System"
 msgstr "Σύστημα"
 
 #. Target
 #: i18n/english/luasrc/i18n/default.en.lua:95
-msgid "target"
+msgid "Target"
 msgstr "Στόχος"
 
 #. Timezone
 #: i18n/english/luasrc/i18n/default.en.lua:96
-msgid "timezone"
+msgid "Timezone"
 msgstr "Ζώνη ώρας"
 
 #. Type
 #: i18n/english/luasrc/i18n/default.en.lua:97
-msgid "type"
+msgid "Type"
 msgstr "Τύπος"
 
 #. Unknown Error
 #: i18n/english/luasrc/i18n/default.en.lua:98
-msgid "unknownerror"
+msgid "Unknown Error"
 msgstr "Άγνωστο Σφάλμα"
 
 #. Unsaved Changes
 #: i18n/english/luasrc/i18n/default.en.lua:99
-msgid "unsavedchanges"
+msgid "Unsaved Changes"
 msgstr "Μη-αποθηκευμένες Αλλαγές"
 
 #. Username
 #: i18n/english/luasrc/i18n/default.en.lua:100
-msgid "username"
+msgid "Username"
 msgstr "Όνομα Χρήστη"
 
 #. Version
 #: i18n/english/luasrc/i18n/default.en.lua:101
-msgid "version"
+msgid "Version"
 msgstr "Έκδοση"
 
 #. Web <abbr title=\"User Interface\">UI</abbr>
 #: i18n/english/luasrc/i18n/default.en.lua:102
-msgid "webui"
+msgid "Web <abbr title=\"User Interface\">UI</abbr>"
 msgstr "Web <abbr title=\"User Interface\">UI</abbr>"
 
 #. Wifi
 #: i18n/english/luasrc/i18n/default.en.lua:103
-msgid "wifi"
+msgid "Wifi"
 msgstr "Ασύρματο"
 
 #. Zone
diff --git a/po/el/freifunk.po b/po/el/freifunk.po
index 76d0e4785..578dca28f 100644
--- a/po/el/freifunk.po
+++ b/po/el/freifunk.po
@@ -14,105 +14,105 @@ msgstr ""
 
 #. Hello and welcome in the network of
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:1
-msgid "ff_hellonet"
+msgid "Hello and welcome in the network of"
 msgstr ""
 
 #. We are an initiative to establish a free, independent and open wireless mesh network.
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:2
-msgid "ff_public1"
+msgid "We are an initiative to establish a free, independent and open wireless mesh network."
 msgstr ""
 
 #. This is the access point
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:3
-msgid "ff_public2"
+msgid "This is the access point"
 msgstr ""
 
 #. It is operated by
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:4
-msgid "ff_public3"
+msgid "It is operated by"
 msgstr ""
 
 #. You can find further information about the global Freifunk initiative at
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:5
-msgid "ff_public4"
+msgid "You can find further information about the global Freifunk initiative at"
 msgstr ""
 
 #. If you are interested in our project then contact the local community
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:6
-msgid "ff_public5"
+msgid "If you are interested in our project then contact the local community"
 msgstr ""
 
 #. Internet access depends on technical and organisational conditions and may or may not work for you.
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:7
-msgid "ff_public6"
+msgid "Internet access depends on technical and organisational conditions and may or may not work for you."
 msgstr ""
 
 #. Location
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:8
-msgid "ff_location"
+msgid "Location"
 msgstr ""
 
 #. E-Mail
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:9
-msgid "ff_mail"
+msgid "E-Mail"
 msgstr ""
 
 #. You really should provide your address here!
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:10
-msgid "ff_mail1"
+msgid "You really should provide your address here!"
 msgstr ""
 
 #. Nickname
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:11
-msgid "ff_nickname"
+msgid "Nickname"
 msgstr ""
 
 #. Realname
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:12
-msgid "ff_name"
+msgid "Realname"
 msgstr ""
 
 #. Node
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:13
-msgid "ff_node"
+msgid "Node"
 msgstr ""
 
 #. Notice
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:14
-msgid "ff_note"
+msgid "Notice"
 msgstr ""
 
 #. Phone
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:15
-msgid "ff_phone"
+msgid "Phone"
 msgstr ""
 
 #. Memory
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:16
-msgid "ff_ram"
+msgid "Memory"
 msgstr ""
 
 #. Free
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:17
-msgid "ff_free"
+msgid "Free"
 msgstr ""
 
 #. Buffers
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:18
-msgid "ff_buffers"
+msgid "Buffers"
 msgstr ""
 
 #. Cached
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:19
-msgid "ff_cached"
+msgid "Cached"
 msgstr ""
 
 #. Total
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:20
-msgid "ff_total"
+msgid "Total"
 msgstr ""
 
 #. Coordinates
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:21
-msgid "ff_geocoord"
+msgid "Coordinates"
 msgstr ""
diff --git a/po/el/hd_idle.po b/po/el/hd_idle.po
index f6d3a0969..3ab7332a1 100644
--- a/po/el/hd_idle.po
+++ b/po/el/hd_idle.po
@@ -14,35 +14,35 @@ msgstr ""
 
 #. Disk
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:1
-msgid "disk"
+msgid "Disk"
 msgstr ""
 
 #. Enable debug
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:2
-msgid "enable_debug"
+msgid "Enable debug"
 msgstr ""
 
 #. hd-idle
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:3
-msgid "hd_idle"
+msgid "hd-idle"
 msgstr ""
 
 #. hd-idle is a utility program for spinning-down external disks after a period of idle time.
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:4
-msgid "hd_idle_desc"
+msgid "hd-idle is a utility program for spinning-down external disks after a period of idle time."
 msgstr ""
 
 #. Idle-Time
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:5
-msgid "idle_time_interval"
+msgid "Idle-Time"
 msgstr ""
 
 #. Idle-Time unit
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:6
-msgid "idle_time_unit"
+msgid "Idle-Time unit"
 msgstr ""
 
 #. Settings
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:7
-msgid "settings"
+msgid "Settings"
 msgstr ""
diff --git a/po/el/initmgr.po b/po/el/initmgr.po
index a7c647cba..b047e51f3 100644
--- a/po/el/initmgr.po
+++ b/po/el/initmgr.po
@@ -14,12 +14,12 @@ msgstr ""
 
 #. Initscripts
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:1
-msgid "initmgr"
+msgid "Initscripts"
 msgstr "Σενάρια Εκκίνησης"
 
 #. You can enable or disable installed init scripts here. Changes will applied after a device reboot.<br /><strong>Warning: If you disable essential init scripts like &quot;network&quot;, your device might become inaccesable!</strong>
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:2
-msgid "initmgr_desc"
+msgid "You can enable or disable installed init scripts here. Changes will applied after a device reboot.<br /><strong>Warning: If you disable essential init scripts like \"network\", your device might become inaccesable!</strong>"
 msgstr ""
 "Μπορείτε να ενεργοποιήσετε ή να απενεργοποιήσετε σενάρια εκκίνησης εδώ. Οι "
 "αλλαγές θα εφαρμοστούν αφού επανεκκινήσετε τη συσκευή.<br "
@@ -29,12 +29,12 @@ msgstr ""
 
 #. Start priority
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:3
-msgid "initmgr_index"
+msgid "Start priority"
 msgstr "Προτεραιότητα εκκίνησης"
 
 #. Initscript
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:4
-msgid "initmgr_name"
+msgid "Initscript"
 msgstr "Σενάριο εκκίνησης"
 
 #. Enable/Disable
diff --git a/po/el/livestats.po b/po/el/livestats.po
index 3be1fa111..c48e02286 100644
--- a/po/el/livestats.po
+++ b/po/el/livestats.po
@@ -14,32 +14,32 @@ msgstr ""
 
 #. incoming
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:1
-msgid "livestats_incoming"
+msgid "incoming"
 msgstr "εισερχόμενα"
 
 #. outgoing
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:2
-msgid "livestats_outgoing"
+msgid "outgoing"
 msgstr "εξερχόμενα"
 
 #. traffic on
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:3
-msgid "livestats_traffic"
+msgid "traffic on"
 msgstr "κίνηση σε"
 
 #. signal-to-noise ratio for
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:4
-msgid "livestats_wifi"
+msgid "signal-to-noise ratio for"
 msgstr "σηματοθορυβικός λόγος για"
 
 #. load average
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:5
-msgid "livestats_loadavg"
+msgid "load average"
 msgstr "μέσος όρος φόρτου"
 
 #. Realtime Wireless Status
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:6
-msgid "livestats_stat_wireless"
+msgid "Realtime Wireless Status"
 msgstr "Στατιστικά Ασύρματου σε Πραγμ. Χρόνο"
 
 #. Realtime Network Traffic
diff --git a/po/el/luci-fw.po b/po/el/luci-fw.po
index 75d325c57..fed1617ba 100644
--- a/po/el/luci-fw.po
+++ b/po/el/luci-fw.po
@@ -14,277 +14,277 @@ msgstr ""
 
 #. Port forwarding
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:1
-msgid "fw_portfw"
+msgid "Port forwarding"
 msgstr ""
 
 #. Traffic Redirection
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:2
-msgid "fw_redirect"
+msgid "Traffic Redirection"
 msgstr ""
 
 #. Traffic redirection allows you to change the destination address of forwarded packets.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:3
-msgid "fw_redirect_desc"
+msgid "Traffic redirection allows you to change the destination address of forwarded packets."
 msgstr ""
 
 #. Zone-to-Zone traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:4
-msgid "fw_forwarding"
+msgid "Zone-to-Zone traffic"
 msgstr ""
 
 #. Firewall
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:5
-msgid "fw_fw"
+msgid "Firewall"
 msgstr ""
 
 #. Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:6
-msgid "fw_zone"
+msgid "Zone"
 msgstr ""
 
 #. Zones
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:7
-msgid "fw_zones"
+msgid "Zones"
 msgstr ""
 
 #. Custom forwarding
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:8
-msgid "fw_custfwd"
+msgid "Custom forwarding"
 msgstr ""
 
 #. The firewall creates zones over your network interfaces to control network traffic flow.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:9
-msgid "fw_fw1"
+msgid "The firewall creates zones over your network interfaces to control network traffic flow."
 msgstr ""
 
 #. Advanced Rules
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:10
-msgid "firewall_rule"
+msgid "Advanced Rules"
 msgstr ""
 
 #. Advanced rules let you customize the firewall to your needs. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:11
-msgid "firewall_rule_desc"
+msgid "Advanced rules let you customize the firewall to your needs. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall."
 msgstr ""
 
 #. Input Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:12
-msgid "firewall_rule_src"
+msgid "Input Zone"
 msgstr ""
 
 #. Output Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:13
-msgid "firewall_rule_dest"
+msgid "Output Zone"
 msgstr ""
 
 #. Source address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:14
-msgid "firewall_rule_srcip"
+msgid "Source address"
 msgstr ""
 
 #. Destination address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:15
-msgid "firewall_rule_destip"
+msgid "Destination address"
 msgstr ""
 
 #. Source MAC-Address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:16
-msgid "firewall_rule_srcmac"
+msgid "Source MAC-Address"
 msgstr ""
 
 #. Source port
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:17
-msgid "firewall_rule_srcport"
+msgid "Source port"
 msgstr ""
 
 #. Destination port
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:18
-msgid "firewall_rule_destport"
+msgid "Destination port"
 msgstr ""
 
 #. Action
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:19
-msgid "firewall_rule_target"
+msgid "Action"
 msgstr ""
 
 #. accept
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:20
-msgid "fw_accept"
+msgid "accept"
 msgstr ""
 
 #. reject
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:21
-msgid "fw_reject"
+msgid "reject"
 msgstr ""
 
 #. drop
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:22
-msgid "fw_drop"
+msgid "drop"
 msgstr ""
 
 #. Source
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:23
-msgid "fw_src"
+msgid "Source"
 msgstr ""
 
 #. Destination
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:24
-msgid "fw_dest"
+msgid "Destination"
 msgstr ""
 
 #. Traffic Control
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:25
-msgid "fw_traffic"
+msgid "Traffic Control"
 msgstr ""
 
 #. MSS Clamping
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:26
-msgid "fw_mtufix"
+msgid "MSS Clamping"
 msgstr ""
 
 #. Drop invalid packets
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:27
-msgid "fw_dropinvalid"
+msgid "Drop invalid packets"
 msgstr ""
 
 #. Port forwarding allows to provide network services in the internal network to an external network.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:28
-msgid "fw_portfw1"
+msgid "Port forwarding allows to provide network services in the internal network to an external network."
 msgstr ""
 
 #. External Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:29
-msgid "firewall_redirect_src_desc"
+msgid "External Zone"
 msgstr ""
 
 #. External port
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:30
-msgid "firewall_redirect_srcdport"
+msgid "External port"
 msgstr ""
 
 #. port or range as first-last
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:31
-msgid "firewall_redirect_srcdport_desc"
+msgid "port or range as first-last"
 msgstr ""
 
 #. Source address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:32
-msgid "firewall_redirect_srcip"
+msgid "Source address"
 msgstr ""
 
 #. Source MAC
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:33
-msgid "firewall_redirect_srcmac"
+msgid "Source MAC"
 msgstr ""
 
 #. Internal address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:34
-msgid "firewall_redirect_destip"
+msgid "Internal address"
 msgstr ""
 
 #. IP-Address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:35
-msgid "firewall_redirect_destip_desc"
+msgid "IP-Address"
 msgstr ""
 
 #. Internal port (optional)
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:36
-msgid "firewall_redirect_destport"
+msgid "Internal port (optional)"
 msgstr ""
 
 #. port or range as first-last
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:37
-msgid "firewall_redirect_destport_desc"
+msgid "port or range as first-last"
 msgstr ""
 
 #. Here you can specify which network traffic is allowed to flow between network zones. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall. If you experience occasional connection problems try enabling MSS Clamping otherwise disable it for performance reasons.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:38
-msgid "fw_forwarding1"
+msgid "Here you can specify which network traffic is allowed to flow between network zones. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall. If you experience occasional connection problems try enabling MSS Clamping otherwise disable it for performance reasons."
 msgstr ""
 
 #. Input
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:39
-msgid "firewall_forwarding_src"
+msgid "Input"
 msgstr ""
 
 #. Output
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:40
-msgid "firewall_forwarding_dest"
+msgid "Output"
 msgstr ""
 
 #. Defaults
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:41
-msgid "firewall_defaults"
+msgid "Defaults"
 msgstr ""
 
 #. These are the default settings that are used if no other rules match.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:42
-msgid "firewall_defaults_desc"
+msgid "These are the default settings that are used if no other rules match."
 msgstr ""
 
 #. SYN-flood protection
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:43
-msgid "firewall_defaults_synflood"
+msgid "SYN-flood protection"
 msgstr ""
 
 #. Incoming Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:44
-msgid "firewall_defaults_input"
+msgid "Incoming Traffic"
 msgstr ""
 
 #. Outgoing Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:45
-msgid "firewall_defaults_output"
+msgid "Outgoing Traffic"
 msgstr ""
 
 #. Forwarded Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:46
-msgid "firewall_defaults_forward"
+msgid "Forwarded Traffic"
 msgstr ""
 
 #. Zones part the network interfaces into certain isolated areas to separate network traffic. One or more networks can belong to a zone. The MASQ-flag enables NAT masquerading for all outgoing traffic on this zone.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:47
-msgid "firewall_zone_desc"
+msgid "Zones part the network interfaces into certain isolated areas to separate network traffic. One or more networks can belong to a zone. The MASQ-flag enables NAT masquerading for all outgoing traffic on this zone."
 msgstr ""
 
 #. Incoming Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:48
-msgid "firewall_zone_input"
+msgid "Incoming Traffic"
 msgstr ""
 
 #. Default Policy
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:49
-msgid "firewall_zone_input_desc"
+msgid "Default Policy"
 msgstr ""
 
 #. Outgoing Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:50
-msgid "firewall_zone_output"
+msgid "Outgoing Traffic"
 msgstr ""
 
 #. Default Policy
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:51
-msgid "firewall_zone_output_desc"
+msgid "Default Policy"
 msgstr ""
 
 #. Forwarded Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:52
-msgid "firewall_zone_forward"
+msgid "Forwarded Traffic"
 msgstr ""
 
 #. Default Policy
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:53
-msgid "firewall_zone_forward_desc"
+msgid "Default Policy"
 msgstr ""
 
 #. MASQ
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:54
-msgid "firewall_zone_masq"
+msgid "MASQ"
 msgstr ""
 
 #. Networks
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:55
-msgid "firewall_zone_network"
+msgid "Networks"
 msgstr ""
 
 #. contained networks
diff --git a/po/el/mmc_over_gpio.po b/po/el/mmc_over_gpio.po
index f2de52fd3..8fe537800 100644
--- a/po/el/mmc_over_gpio.po
+++ b/po/el/mmc_over_gpio.po
@@ -14,15 +14,15 @@ msgstr ""
 
 #. MMC/SD driver configuration
 #: applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua:1
-msgid "mmc_over_gpio"
+msgid "MMC/SD driver configuration"
 msgstr ""
 
 #. MMC/SD driver configuration
 #: applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua:2
-msgid "mmc_over_gpio_desc"
+msgid "MMC/SD driver configuration"
 msgstr ""
 
 #. Settings
 #: applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua:3
-msgid "settings"
+msgid "Settings"
 msgstr ""
diff --git a/po/el/ntpc.po b/po/el/ntpc.po
index f342fbc96..803364494 100644
--- a/po/el/ntpc.po
+++ b/po/el/ntpc.po
@@ -14,42 +14,42 @@ msgstr ""
 
 #. Time Synchronisation
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:1
-msgid "ntpc"
+msgid "Time Synchronisation"
 msgstr "Συγχρονισμός Ώρας"
 
 #. Synchronizes the system time
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:2
-msgid "ntpc_desc"
+msgid "Synchronizes the system time"
 msgstr "Συγχρονίζει την ώρα του συστήματος"
 
 #. Time Server
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:3
-msgid "ntpc_timeserver"
+msgid "Time Server"
 msgstr "Εξυπηρετητής Ώρας"
 
 #. Update Interval (in s)
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:4
-msgid "ntpc_interval"
+msgid "Update Interval (in s)"
 msgstr "Περίοδος Ενημέρωσης (σε s)"
 
 #. Count of Time Measurements
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:5
-msgid "ntpc_count"
+msgid "Count of Time Measurements"
 msgstr "Αριθμός Μετρήσεων Ώρας"
 
 #. empty = infinite
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:6
-msgid "ntpc_count_desc"
+msgid "empty = infinite"
 msgstr "άδειο = άπειρος"
 
 #. Clock Adjustment
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:7
-msgid "ntpc_drift"
+msgid "Clock Adjustment"
 msgstr "Ρύθμιση Ρολογιού"
 
 #. Offset Frequency
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:8
-msgid "ntpc_drift_freq"
+msgid "Offset Frequency"
 msgstr "Συχνότητα Μετάθεσης"
 
 #. Current system time
diff --git a/po/el/olsr.po b/po/el/olsr.po
index 9f7cd6511..a303d92fe 100644
--- a/po/el/olsr.po
+++ b/po/el/olsr.po
@@ -14,637 +14,637 @@ msgstr ""
 
 #. OLSR Daemon
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:1
-msgid "olsrd"
+msgid "OLSR Daemon"
 msgstr ""
 
 #. Neighbour IP
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:2
-msgid "olsrd_neighbour_ip"
+msgid "Neighbour IP"
 msgstr ""
 
 #. Local interface IP
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:3
-msgid "olsrd_local_ip"
+msgid "Local interface IP"
 msgstr ""
 
 #. Announced network
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:4
-msgid "olsrd_network"
+msgid "Announced network"
 msgstr ""
 
 #. OLSR gateway
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:5
-msgid "olsrd_gateway"
+msgid "OLSR gateway"
 msgstr ""
 
 #. OLSR node
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:6
-msgid "olsrd_node"
+msgid "OLSR node"
 msgstr ""
 
 #. Unable to connect to the OLSR daemon!
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:7
-msgid "olsrd_error"
+msgid "Unable to connect to the OLSR daemon!"
 msgstr ""
 
 #. Make sure that OLSRd is running, the &quot;txtinfo&quot; plugin is loaded, configured on port 2006 and accepts connections from &quot;127.0.0.1&quot;.
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:8
-msgid "olsrd_error_desc"
+msgid "Make sure that OLSRd is running, the \"txtinfo\" plugin is loaded, configured on port 2006 and accepts connections from \"127.0.0.1\"."
 msgstr ""
 
 #. OLSR - HNA-Announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:9
-msgid "olsrd_hna"
+msgid "OLSR - HNA-Announcements"
 msgstr ""
 
 #. OLSR - Plugins
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:10
-msgid "olsrd_plugins"
+msgid "OLSR - Plugins"
 msgstr ""
 
 #. OLSR connections
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:11
-msgid "olsrd_links"
+msgid "OLSR connections"
 msgstr ""
 
 #. Overview of currently established OLSR connections
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:12
-msgid "olsrd_links_desc"
+msgid "Overview of currently established OLSR connections"
 msgstr ""
 
 #. Expected retransmission count
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:13
-msgid "olsrd_links_etx_desc"
+msgid "Expected retransmission count"
 msgstr ""
 
 #. Success rate of sent packages
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:14
-msgid "olsrd_links_lq_desc"
+msgid "Success rate of sent packages"
 msgstr ""
 
 #. Success rate of received packages
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:15
-msgid "olsrd_links_nlq_desc"
+msgid "Success rate of received packages"
 msgstr ""
 
 #. Known OLSR routes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:16
-msgid "olsrd_routes"
+msgid "Known OLSR routes"
 msgstr ""
 
 #. Overview of currently known routes to other OLSR nodes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:17
-msgid "olsrd_routes_desc"
+msgid "Overview of currently known routes to other OLSR nodes"
 msgstr ""
 
 #. Active OLSR nodes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:18
-msgid "olsrd_topology"
+msgid "Active OLSR nodes"
 msgstr ""
 
 #. Overview of currently known OLSR nodes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:19
-msgid "olsrd_topology_desc"
+msgid "Overview of currently known OLSR nodes"
 msgstr ""
 
 #. Last hop
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:20
-msgid "olsrd_topology_lasthop"
+msgid "Last hop"
 msgstr ""
 
 #. Active host net announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:21
-msgid "olsrd_hna2"
+msgid "Active host net announcements"
 msgstr ""
 
 #. Overview of currently active OLSR host net announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:22
-msgid "olsrd_hna_desc"
+msgid "Overview of currently active OLSR host net announcements"
 msgstr ""
 
 #. Active MID announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:23
-msgid "olsrd_mid"
+msgid "Active MID announcements"
 msgstr ""
 
 #. Overview of known multiple interface announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:24
-msgid "olsrd_mid_desc"
+msgid "Overview of known multiple interface announcements"
 msgstr ""
 
 #. Secondary OLSR interfaces
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:25
-msgid "olsrd_mid_aliases"
+msgid "Secondary OLSR interfaces"
 msgstr ""
 
 #. Freifunk
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:26
-msgid "olsrd_etx_ff"
+msgid "Freifunk"
 msgstr ""
 
 #. floating point
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:27
-msgid "olsrd_etx_float"
+msgid "floating point"
 msgstr ""
 
 #. fixed point math
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:28
-msgid "olsrd_etx_fpm"
+msgid "fixed point math"
 msgstr ""
 
 #. General settings
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:29
-msgid "olsrd_olsrd"
+msgid "General settings"
 msgstr ""
 
 #. Start without network
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:30
-msgid "olsrd_olsrd_allownoint"
+msgid "Start without network"
 msgstr ""
 
 #. Clear screen
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:31
-msgid "olsrd_olsrd_clearscreen"
+msgid "Clear screen"
 msgstr ""
 
 #. Debugmode
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:32
-msgid "olsrd_olsrd_debuglevel"
+msgid "Debugmode"
 msgstr ""
 
 #. FIB metric
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:33
-msgid "olsrd_olsrd_fibmetric"
+msgid "FIB metric"
 msgstr ""
 
 #. Internet protocol
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:34
-msgid "olsrd_olsrd_ipversion"
+msgid "Internet protocol"
 msgstr ""
 
 #. LQ aging
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:35
-msgid "olsrd_olsrd_linkqualityaging"
+msgid "LQ aging"
 msgstr ""
 
 #. LQ algorithm
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:36
-msgid "olsrd_olsrd_linkqualityalgorithm"
+msgid "LQ algorithm"
 msgstr ""
 
 #. LQ Dijkstra limit
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:37
-msgid "olsrd_olsrd_linkqualitydijkstralimit"
+msgid "LQ Dijkstra limit"
 msgstr ""
 
 #. LQ fisheye
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:38
-msgid "olsrd_olsrd_linkqualityfisheye"
+msgid "LQ fisheye"
 msgstr ""
 
 #. LQ level
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:39
-msgid "olsrd_olsrd_linkqualitylevel"
+msgid "LQ level"
 msgstr ""
 
 #. MPR selection
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:40
-msgid "olsrd_olsrd_linkqualitylevel_1"
+msgid "MPR selection"
 msgstr ""
 
 #. MPR selection and routing
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:41
-msgid "olsrd_olsrd_linkqualitylevel_2"
+msgid "MPR selection and routing"
 msgstr ""
 
 #. LQ window size
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:42
-msgid "olsrd_olsrd_linkqualitywinsize"
+msgid "LQ window size"
 msgstr ""
 
 #. MPR coverage
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:43
-msgid "olsrd_olsrd_mprcoverage"
+msgid "MPR coverage"
 msgstr ""
 
 #. Pollrate
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:44
-msgid "olsrd_olsrd_pollrate"
+msgid "Pollrate"
 msgstr ""
 
 #. TC redundancy
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:45
-msgid "olsrd_olsrd_tcredundancy"
+msgid "TC redundancy"
 msgstr ""
 
 #. MPR selectors
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:46
-msgid "olsrd_olsrd_tcredundancy_0"
+msgid "MPR selectors"
 msgstr ""
 
 #. MPR selectors and MPR
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:47
-msgid "olsrd_olsrd_tcredundancy_1"
+msgid "MPR selectors and MPR"
 msgstr ""
 
 #. all neighbours
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:48
-msgid "olsrd_olsrd_tcredundancy_2"
+msgid "all neighbours"
 msgstr ""
 
 #. Use hysteresis
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:49
-msgid "olsrd_olsrd_usehysteresis"
+msgid "Use hysteresis"
 msgstr ""
 
 #. Willingness
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:50
-msgid "olsrd_olsrd_willingness"
+msgid "Willingness"
 msgstr ""
 
 #. Hello interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:51
-msgid "olsrd_interface_hellointerval"
+msgid "Hello interval"
 msgstr ""
 
 #. Hello validity time
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:52
-msgid "olsrd_interface_hellovaliditytime"
+msgid "Hello validity time"
 msgstr ""
 
 #. HNA interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:53
-msgid "olsrd_interface_hnainterval"
+msgid "HNA interval"
 msgstr ""
 
 #. HNA validity time
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:54
-msgid "olsrd_interface_hnavaliditytime"
+msgid "HNA validity time"
 msgstr ""
 
 #. IPv4 broadcast
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:55
-msgid "olsrd_interface_ip4broadcast"
+msgid "IPv4 broadcast"
 msgstr ""
 
 #. MID interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:56
-msgid "olsrd_interface_midinterval"
+msgid "MID interval"
 msgstr ""
 
 #. MID validity time
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:57
-msgid "olsrd_interface_midvaliditytime"
+msgid "MID validity time"
 msgstr ""
 
 #. TC interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:58
-msgid "olsrd_interface_tcinterval"
+msgid "TC interval"
 msgstr ""
 
 #. TC validity time
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:59
-msgid "olsrd_interface_tcvaliditytime"
+msgid "TC validity time"
 msgstr ""
 
 #. IPv6 address type
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:60
-msgid "olsrd_interface_ip6addrtype"
+msgid "IPv6 address type"
 msgstr ""
 
 #. IPC settings
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:61
-msgid "olsrd_ipcconnect"
+msgid "IPC settings"
 msgstr ""
 
 #. IPC connections enable you to remote-control the local OLSRd instance using external programs
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:62
-msgid "olsrd_ipcconnect_desc"
+msgid "IPC connections enable you to remote-control the local OLSRd instance using external programs"
 msgstr ""
 
 #. Allowed host addresses
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:63
-msgid "olsrd_ipcconnect_host"
+msgid "Allowed host addresses"
 msgstr ""
 
 #. Multiple separated by spaces
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:64
-msgid "olsrd_ipcconnect_host_desc"
+msgid "Multiple separated by spaces"
 msgstr ""
 
 #. Maxmimum connection count
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:65
-msgid "olsrd_ipcconnect_maxconnections"
+msgid "Maxmimum connection count"
 msgstr ""
 
 #. Set to 0 to disable IPC
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:66
-msgid "olsrd_ipcconnect_maxconnections_desc"
+msgid "Set to 0 to disable IPC"
 msgstr ""
 
 #. Allowed subnets
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:67
-msgid "olsrd_ipcconnect_net"
+msgid "Allowed subnets"
 msgstr ""
 
 #. Address Mask; multiple separated by space
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:68
-msgid "olsrd_ipcconnect_net_desc"
+msgid "Address Mask; multiple separated by space"
 msgstr ""
 
 #. IPv4 HNA announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:69
-msgid "olsrd_hna4"
+msgid "IPv4 HNA announcements"
 msgstr ""
 
 #. Hna4 entries allow you to propagate local IPv4 host- and network-routes into the mesh network
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:70
-msgid "olsrd_hna4_desc"
+msgid "Hna4 entries allow you to propagate local IPv4 host- and network-routes into the mesh network"
 msgstr ""
 
 #. Network address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:71
-msgid "olsrd_hna4_netaddr"
+msgid "Network address"
 msgstr ""
 
 #. IPv4 address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:72
-msgid "olsrd_hna4_netaddr_desc"
+msgid "IPv4 address"
 msgstr ""
 
 #. Netmask
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:73
-msgid "olsrd_hna4_netmask"
+msgid "Netmask"
 msgstr ""
 
 #. IPv4 address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:74
-msgid "olsrd_hna4_netmask_desc"
+msgid "IPv4 address"
 msgstr ""
 
 #. IPv6 HNA announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:75
-msgid "olsrd_hna6"
+msgid "IPv6 HNA announcements"
 msgstr ""
 
 #. Hna6 entries allow you to propagate local IPv6 host- and network-routes into the mesh network
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:76
-msgid "olsrd_hna6_desc"
+msgid "Hna6 entries allow you to propagate local IPv6 host- and network-routes into the mesh network"
 msgstr ""
 
 #. Network address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:77
-msgid "olsrd_hna6_netaddr"
+msgid "Network address"
 msgstr ""
 
 #. IPv6 address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:78
-msgid "olsrd_hna6_netaddr_desc"
+msgid "IPv6 address"
 msgstr ""
 
 #. Prefix
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:79
-msgid "olsrd_hna6_prefix"
+msgid "Prefix"
 msgstr ""
 
 #. IPv6 prefix
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:80
-msgid "olsrd_hna6_prefix_desc"
+msgid "IPv6 prefix"
 msgstr ""
 
 #. Plugin configuration
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:81
-msgid "olsrd_loadplugin"
+msgid "Plugin configuration"
 msgstr ""
 
 #. Enable plugin
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:82
-msgid "olsrd_loadplugin_ignore"
+msgid "Enable plugin"
 msgstr ""
 
 #. Library
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:83
-msgid "olsrd_loadplugin_library"
+msgid "Library"
 msgstr ""
 
 #. Allow connections from this hosts
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:84
-msgid "olsrd_loadplugin_accept"
+msgid "Allow connections from this hosts"
 msgstr ""
 
 #. Ping test addresses
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:85
-msgid "olsrd_loadplugin_ping"
+msgid "Ping test addresses"
 msgstr ""
 
 #. Interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:86
-msgid "olsrd_loadplugin_interval"
+msgid "Refresh interval in seconds"
 msgstr ""
 
 #. HNA announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:87
-msgid "olsrd_loadplugin_hna"
+msgid "HNA announcements"
 msgstr ""
 
 #. Format: IP-Address Netmask / OLSR will announce this network once it is reachable
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:88
-msgid "olsrd_loadplugin_hna_desc"
+msgid "Format: IP-Address Netmask / OLSR will announce this network once it is reachable"
 msgstr ""
 
 #. Alternative \"hosts\" file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:89
-msgid "olsrd_loadplugin_addhosts"
+msgid "Alternative \"hosts\" file"
 msgstr ""
 
 #. The contents of this file will be appended to the autogenerated \"hosts\" file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:90
-msgid "olsrd_loadplugin_addhosts_desc"
+msgid "The contents of this file will be appended to the autogenerated \"hosts\" file"
 msgstr ""
 
 #. DNS server
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:91
-msgid "olsrd_loadplugin_dnsserver"
+msgid "DNS server"
 msgstr ""
 
 #. Alternative hostnames
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:92
-msgid "olsrd_loadplugin_hosts"
+msgid "Alternative hostnames"
 msgstr ""
 
 #. Format: Interface-IP Hostname
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:93
-msgid "olsrd_loadplugin_hosts_desc"
+msgid "Format: Interface-IP Hostname"
 msgstr ""
 
 #. Path to the \"hosts\" file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:94
-msgid "olsrd_loadplugin_hostsfile"
+msgid "Path to the \"hosts\" file"
 msgstr ""
 
 #. Latitude
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:95
-msgid "olsrd_loadplugin_lat"
+msgid "Latitude"
 msgstr ""
 
 #. Output file for coordinates
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:96
-msgid "olsrd_loadplugin_latlonfile"
+msgid "Output file for coordinates"
 msgstr ""
 
 #. OLSR will write received coordinates of other nodes to this file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:97
-msgid "olsrd_loadplugin_latlonfile_desc"
+msgid "OLSR will write received coordinates of other nodes to this file"
 msgstr ""
 
 #. Input file for coordinates
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:98
-msgid "olsrd_loadplugin_latloninfile"
+msgid "Input file for coordinates"
 msgstr ""
 
 #. OLSR periodically checks this file for new coordinates and propagates them
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:99
-msgid "olsrd_loadplugin_latloninfile_desc"
+msgid "OLSR periodically checks this file for new coordinates and propagates them"
 msgstr ""
 
 #. Longitude
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:100
-msgid "olsrd_loadplugin_lon"
+msgid "Longitude"
 msgstr ""
 
 #. Hostnames
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:101
-msgid "olsrd_loadplugin_name"
+msgid "Hostnames"
 msgstr ""
 
 #. Command for name changes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:102
-msgid "olsrd_loadplugin_namechangescript"
+msgid "Command for name changes"
 msgstr ""
 
 #. OLSR executes this command once entries in the \"hosts\" are changed
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:103
-msgid "olsrd_loadplugin_namechangescript_desc"
+msgid "OLSR executes this command once entries in the \"hosts\" are changed"
 msgstr ""
 
 #. Path to the \"resolv\" file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:104
-msgid "olsrd_loadplugin_resolvfile"
+msgid "Path to the \"resolv\" file"
 msgstr ""
 
 #. Command for service changes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:105
-msgid "olsrd_loadplugin_serviceschangescript"
+msgid "Command for service changes"
 msgstr ""
 
 #. OLSR excutes this command once new service announcements are received
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:106
-msgid "olsrd_loadplugin_serviceschangescript_desc"
+msgid "OLSR excutes this command once new service announcements are received"
 msgstr ""
 
 #. PID file for SIGHUP signals
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:107
-msgid "olsrd_loadplugin_sighuppidfile"
+msgid "PID file for SIGHUP signals"
 msgstr ""
 
 #. OLSR sends a HUP signal to this PID once the \"hosts\" oder \"resolv\" file is changed
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:108
-msgid "olsrd_loadplugin_sighuppidfile_desc"
+msgid "OLSR sends a HUP signal to this PID once the \"hosts\" oder \"resolv\" file is changed"
 msgstr ""
 
 #. Domain suffix
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:109
-msgid "olsrd_loadplugin_suffix"
+msgid "Domain suffix"
 msgstr ""
 
 #. Timeout
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:110
-msgid "olsrd_loadplugin_timeout"
+msgid "Timeout"
 msgstr ""
 
 #. Name of the BMF interface
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:111
-msgid "olsrd_loadplugin_bmfinterface"
+msgid "Name of the BMF interface"
 msgstr ""
 
 #. IP address of the BMF interface
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:112
-msgid "olsrd_loadplugin_bmfinterfaceid"
+msgid "IP address of the BMF interface"
 msgstr ""
 
 #. Redirect local broadcasts
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:113
-msgid "olsrd_loadplugin_dolocalbroadcast"
+msgid "Redirect local broadcasts"
 msgstr ""
 
 #. Also redirect broadcasts from OLSR interfaces
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:114
-msgid "olsrd_loadplugin_capturepacketsonolsrinterfaces"
+msgid "Also redirect broadcasts from OLSR interfaces"
 msgstr ""
 
 #. Propagation mechanism
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:115
-msgid "olsrd_loadplugin_bmfmechanism"
+msgid "Propagation mechanism"
 msgstr ""
 
 #. Number of retransmissions per package
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:116
-msgid "olsrd_loadplugin_broadcastretransmitcount"
+msgid "Number of retransmissions per package"
 msgstr ""
 
 #. Minimum number of neighbours for broadcast redirection
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:117
-msgid "olsrd_loadplugin_fanoutlimit"
+msgid "Minimum number of neighbours for broadcast redirection"
 msgstr ""
 
 #. Non-OLSR interfaces
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:118
-msgid "olsrd_loadplugin_nonolsrif"
+msgid "Non-OLSR interfaces"
 msgstr ""
 
 #. Used port
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:119
-msgid "olsrd_loadplugin_port"
+msgid "Used port"
 msgstr ""
 
 #. Allow connections from hosts
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:120
-msgid "olsrd_loadplugin_host"
+msgid "Allow connections from hosts"
 msgstr ""
 
 #. Allow connections from subnets
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:121
-msgid "olsrd_loadplugin_net"
+msgid "Allow connections from subnets"
 msgstr ""
 
 #. Format: IP-AddresseNetmask
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:122
-msgid "olsrd_loadplugin_net_desc"
+msgid "Format: IP-AddresseNetmask"
 msgstr ""
 
 #. Used protocols
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:123
-msgid "olsrd_loadplugin_redistribute"
+msgid "Used protocols"
 msgstr ""
 
 #. Only export routes to Quagga or to kernel too
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:124
-msgid "olsrd_loadplugin_exportroutes"
+msgid "Only export routes to Quagga or to kernel too"
 msgstr ""
 
 #. Always prefer local routes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:125
-msgid "olsrd_loadplugin_localpref"
+msgid "Always prefer local routes"
 msgstr ""
 
 #. Distance of exported routes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:126
-msgid "olsrd_loadplugin_distance"
+msgid "Distance of exported routes"
 msgstr ""
 
 #. Key file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:127
-msgid "olsrd_loadplugin_keyfile"
+msgid "Key file"
 msgstr ""
 
 #. Watchdog timestamp file
diff --git a/po/el/openvpn.po b/po/el/openvpn.po
index 65e5a82d6..21ee00897 100644
--- a/po/el/openvpn.po
+++ b/po/el/openvpn.po
@@ -14,947 +14,947 @@ msgstr ""
 
 #. OpenVPN
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:1
-msgid "openvpn"
+msgid "OpenVPN"
 msgstr ""
 
 #. Switch to basic configuration
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:3
-msgid "openvpn_switch_basic"
+msgid "« Switch to basic configuration"
 msgstr ""
 
 #. Switch to advanced configuration
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:4
-msgid "openvpn_switch_advanced"
+msgid "Switch to advanced configuration »"
 msgstr ""
 
 #. Enabled
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:6
-msgid "openvpn_enable"
+msgid "Enabled"
 msgstr ""
 
 #. Started
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:7
-msgid "openvpn_active"
+msgid "Started"
 msgstr ""
 
 #. no
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:8
-msgid "openvpn_active_no"
+msgid "no"
 msgstr ""
 
 #. yes (%i)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:9
-msgid "openvpn_active_yes"
+msgid "yes (%i)"
 msgstr ""
 
 #. Port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:10
-msgid "openvpn_port"
+msgid "Port"
 msgstr ""
 
 #. Protocol
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:11
-msgid "openvpn_proto"
+msgid "Protocol"
 msgstr ""
 
 #. Instance \"%s\"
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:13
-msgid "openvpn_instance"
+msgid "Instance \"%s\""
 msgstr ""
 
 #. OpenVPN instances
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:15
-msgid "openvpn_overview"
+msgid "OpenVPN instances"
 msgstr ""
 
 #. Below is a list of configured OpenVPN instances and their current state
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:16
-msgid "openvpn_overview_desc"
+msgid "Below is a list of configured OpenVPN instances and their current state"
 msgstr ""
 
 #. Daemon configuration
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:18
-msgid "openvpn_service"
+msgid "Daemon configuration"
 msgstr ""
 
 #. Networking options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:19
-msgid "openvpn_networking"
+msgid "Networking options"
 msgstr ""
 
 #. VPN options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:20
-msgid "openvpn_vpn"
+msgid "VPN options"
 msgstr ""
 
 #. Cryptography settings
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:21
-msgid "openvpn_cryptography"
+msgid "Cryptography settings"
 msgstr ""
 
 #. Read configuration options from file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:23
-msgid "openvpn_param_config"
+msgid "Read configuration options from file"
 msgstr ""
 
 #. Local host name or ip address
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:24
-msgid "openvpn_param_local"
+msgid "Local host name or ip address"
 msgstr ""
 
 #. Remote host name or ip address
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:25
-msgid "openvpn_param_remote"
+msgid "Remote host name or ip address"
 msgstr ""
 
 #. Randomly choose remote server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:26
-msgid "openvpn_param_remote_random"
+msgid "Randomly choose remote server"
 msgstr ""
 
 #. Major mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:27
-msgid "openvpn_param_mode"
+msgid "Major mode"
 msgstr ""
 
 #. Use protocol
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:28
-msgid "openvpn_param_proto"
+msgid "Use protocol"
 msgstr ""
 
 #. Connection retry interval
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:29
-msgid "openvpn_param_connect_retry"
+msgid "Connection retry interval"
 msgstr ""
 
 #. Connection timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:30
-msgid "openvpn_param_connect_timeout"
+msgid "Connection timeout"
 msgstr ""
 
 #. Maximum connection attempt retries
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:31
-msgid "openvpn_param_connect_retry_max"
+msgid "Maximum connection attempt retries"
 msgstr ""
 
 #. Try to sense proxy settings automatically
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:32
-msgid "openvpn_param_auto_proxy"
+msgid "Try to sense proxy settings automatically"
 msgstr ""
 
 #. Connect to remote host
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:33
-msgid "openvpn_param_http_proxy"
+msgid "Connect to remote host"
 msgstr ""
 
 #. Retry indefinitely on HTTP proxy errors
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:34
-msgid "openvpn_param_http_proxy_retry"
+msgid "Retry indefinitely on HTTP proxy errors"
 msgstr ""
 
 #. Proxy timeout in seconds
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:35
-msgid "openvpn_param_http_proxy_timeout"
+msgid "Proxy timeout in seconds"
 msgstr ""
 
 #. Set extended HTTP proxy options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:36
-msgid "openvpn_param_http_proxy_option"
+msgid "Set extended HTTP proxy options"
 msgstr ""
 
 #. Connect through Socks5 proxy
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:37
-msgid "openvpn_param_socks_proxy"
+msgid "Connect through Socks5 proxy"
 msgstr ""
 
 #. Retry indefinitely on Socks proxy errors
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:38
-msgid "openvpn_param_socks_proxy_retry"
+msgid "Retry indefinitely on Socks proxy errors"
 msgstr ""
 
 #. If hostname resolve fails, retry
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:39
-msgid "openvpn_param_resolv_retry"
+msgid "If hostname resolve fails, retry"
 msgstr ""
 
 #. Allow remote to change its IP or port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:40
-msgid "openvpn_param_float"
+msgid "Allow remote to change its IP or port"
 msgstr ""
 
 #. Execute shell command on remote ip change
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:41
-msgid "openvpn_param_ipchange"
+msgid "Execute shell command on remote ip change"
 msgstr ""
 
 #. TCP/UDP port # for both local and remote
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:42
-msgid "openvpn_param_port"
+msgid "TCP/UDP port # for both local and remote"
 msgstr ""
 
 #. TCP/UDP port # for local (default=1194)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:43
-msgid "openvpn_param_lport"
+msgid "TCP/UDP port # for local (default=1194)"
 msgstr ""
 
 #. TCP/UDP port # for remote (default=1194)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:44
-msgid "openvpn_param_rport"
+msgid "TCP/UDP port # for remote (default=1194)"
 msgstr ""
 
 #. Bind to local address and port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:45
-msgid "openvpn_param_bind"
+msgid "Bind to local address and port"
 msgstr ""
 
 #. Do not bind to local address and port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:46
-msgid "openvpn_param_nobind"
+msgid "Do not bind to local address and port"
 msgstr ""
 
 #. tun/tap device
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:47
-msgid "openvpn_param_dev"
+msgid "tun/tap device"
 msgstr ""
 
 #. Type of used device
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:48
-msgid "openvpn_param_dev_type"
+msgid "Type of used device"
 msgstr ""
 
 #. Use tun/tap device node
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:49
-msgid "openvpn_param_dev_node"
+msgid "Use tun/tap device node"
 msgstr ""
 
 #. Set the link layer address of the tap device
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:50
-msgid "openvpn_param_lladdr"
+msgid "Set the link layer address of the tap device"
 msgstr ""
 
 #. 'net30', 'p2p', or 'subnet'
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:51
-msgid "openvpn_param_topology"
+msgid "'net30', 'p2p', or 'subnet'"
 msgstr ""
 
 #. Make tun device IPv6 capable
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:52
-msgid "openvpn_param_tun_ipv6"
+msgid "Make tun device IPv6 capable"
 msgstr ""
 
 #. Configure device to use IP address
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:53
-msgid "openvpn_param_ifconfig"
+msgid "Configure device to use IP address"
 msgstr ""
 
 #. Don't actually execute ifconfig
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:54
-msgid "openvpn_param_ifconfig_noexec"
+msgid "Don't actually execute ifconfig"
 msgstr ""
 
 #. Don't warn on ifconfig inconsistencies
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:55
-msgid "openvpn_param_ifconfig_nowarn"
+msgid "Don't warn on ifconfig inconsistencies"
 msgstr ""
 
 #. Add route after establishing connection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:56
-msgid "openvpn_param_route"
+msgid "Add route after establishing connection"
 msgstr ""
 
 #. Specify a default gateway for routes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:57
-msgid "openvpn_param_route_gateway"
+msgid "Specify a default gateway for routes"
 msgstr ""
 
 #. Specify a default metric for routes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:58
-msgid "openvpn_param_route_metric"
+msgid "Specify a default metric for routes"
 msgstr ""
 
 #. Delay n seconds after connection 
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:59
-msgid "openvpn_param_route_delay"
+msgid "Delay n seconds after connection "
 msgstr ""
 
 #. Execute shell cmd after routes are added
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:60
-msgid "openvpn_param_route_up"
+msgid "Execute shell cmd after routes are added"
 msgstr ""
 
 #. Don't add routes automatically
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:61
-msgid "openvpn_param_route_noexec"
+msgid "Don't add routes automatically"
 msgstr ""
 
 #. Don't pull options from server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:62
-msgid "openvpn_param_route_nopull"
+msgid "Don't pull options from server"
 msgstr ""
 
 #. Automatically redirect default route
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:63
-msgid "openvpn_param_redirect_gateway"
+msgid "Automatically redirect default route"
 msgstr ""
 
 #. Pass environment variables to script
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:64
-msgid "openvpn_param_setenv"
+msgid "Pass environment variables to script"
 msgstr ""
 
 #. Shaping for peer bandwidth
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:65
-msgid "openvpn_param_shaper"
+msgid "Shaping for peer bandwidth"
 msgstr ""
 
 #. Set timeouts in server mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:66
-msgid "openvpn_param_keepalive"
+msgid "Set timeouts in server mode"
 msgstr ""
 
 #. tun/tap inactivity timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:67
-msgid "openvpn_param_inactive"
+msgid "tun/tap inactivity timeout"
 msgstr ""
 
 #. Remote ping timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:68
-msgid "openvpn_param_ping_exit"
+msgid "Remote ping timeout"
 msgstr ""
 
 #. Restart after remote ping timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:69
-msgid "openvpn_param_ping_restart"
+msgid "Restart after remote ping timeout"
 msgstr ""
 
 #. Only process ping timeouts if routes exist
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:70
-msgid "openvpn_param_ping_timer_rem"
+msgid "Only process ping timeouts if routes exist"
 msgstr ""
 
 #. Ping remote every n seconds over TCP/UDP port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:71
-msgid "openvpn_param_ping"
+msgid "Ping remote every n seconds over TCP/UDP port"
 msgstr ""
 
 #. Configure a multi-homed UDP server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:72
-msgid "openvpn_param_multihome"
+msgid "Configure a multi-homed UDP server"
 msgstr ""
 
 #. Optimize TUN/TAP/UDP writes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:73
-msgid "openvpn_param_fast_io"
+msgid "Optimize TUN/TAP/UDP writes"
 msgstr ""
 
 #. Remap SIGUSR1 signals
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:74
-msgid "openvpn_param_remap_usr1"
+msgid "Remap SIGUSR1 signals"
 msgstr ""
 
 #. Keep tun/tap device open on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:75
-msgid "openvpn_param_persist_tun"
+msgid "Keep tun/tap device open on restart"
 msgstr ""
 
 #. Keep remote IP address on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:76
-msgid "openvpn_param_persist_remote_ip"
+msgid "Keep remote IP address on restart"
 msgstr ""
 
 #. Keep local IP address on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:77
-msgid "openvpn_param_persist_local_ip"
+msgid "Keep local IP address on restart"
 msgstr ""
 
 #. Don't re-read key on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:78
-msgid "openvpn_param_persist_key"
+msgid "Don't re-read key on restart"
 msgstr ""
 
 #. TOS passthrough (applies to IPv4 only)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:79
-msgid "openvpn_param_passtos"
+msgid "TOS passthrough (applies to IPv4 only)"
 msgstr ""
 
 #. Set tun/tap device MTU
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:80
-msgid "openvpn_param_tun_mtu"
+msgid "Set tun/tap device MTU"
 msgstr ""
 
 #. Set tun/tap device overhead
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:81
-msgid "openvpn_param_tun_mtu_extra"
+msgid "Set tun/tap device overhead"
 msgstr ""
 
 #. Set TCP/UDP MTU
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:82
-msgid "openvpn_param_link_mtu"
+msgid "Set TCP/UDP MTU"
 msgstr ""
 
 #. Enable Path MTU discovery
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:83
-msgid "openvpn_param_mtu_disc"
+msgid "Enable Path MTU discovery"
 msgstr ""
 
 #. Empirically measure MTU
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:84
-msgid "openvpn_param_mtu_test"
+msgid "Empirically measure MTU"
 msgstr ""
 
 #. Enable internal datagram fragmentation
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:85
-msgid "openvpn_param_fragment"
+msgid "Enable internal datagram fragmentation"
 msgstr ""
 
 #. Set upper bound on TCP MSS
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:86
-msgid "openvpn_param_mssfix"
+msgid "Set upper bound on TCP MSS"
 msgstr ""
 
 #. Set the TCP/UDP send buffer size
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:87
-msgid "openvpn_param_sndbuf"
+msgid "Set the TCP/UDP send buffer size"
 msgstr ""
 
 #. Set the TCP/UDP receive buffer size
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:88
-msgid "openvpn_param_rcvbuf"
+msgid "Set the TCP/UDP receive buffer size"
 msgstr ""
 
 #. Set tun/tap TX queue length
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:89
-msgid "openvpn_param_txqueuelen"
+msgid "Set tun/tap TX queue length"
 msgstr ""
 
 #. Disable Paging
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:90
-msgid "openvpn_param_mlock"
+msgid "Disable Paging"
 msgstr ""
 
 #. Shell cmd to execute after tun device open
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:91
-msgid "openvpn_param_up"
+msgid "Shell cmd to execute after tun device open"
 msgstr ""
 
 #. Delay tun/tap open and up script execution
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:92
-msgid "openvpn_param_up_delay"
+msgid "Delay tun/tap open and up script execution"
 msgstr ""
 
 #. Shell cmd to run after tun device close
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:93
-msgid "openvpn_param_down"
+msgid "Shell cmd to run after tun device close"
 msgstr ""
 
 #. Call down cmd/script before TUN/TAP close
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:94
-msgid "openvpn_param_down_pre"
+msgid "Call down cmd/script before TUN/TAP close"
 msgstr ""
 
 #. Run up/down scripts for all restarts
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:95
-msgid "openvpn_param_up_restart"
+msgid "Run up/down scripts for all restarts"
 msgstr ""
 
 #. Set UID to user
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:96
-msgid "openvpn_param_user"
+msgid "Set UID to user"
 msgstr ""
 
 #. Set GID to group
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:97
-msgid "openvpn_param_group"
+msgid "Set GID to group"
 msgstr ""
 
 #. Chroot to directory after initialization
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:98
-msgid "openvpn_param_chroot"
+msgid "Chroot to directory after initialization"
 msgstr ""
 
 #. Change to directory before initialization
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:99
-msgid "openvpn_param_cd"
+msgid "Change to directory before initialization"
 msgstr ""
 
 #. Daemonize after initialization
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:100
-msgid "openvpn_param_daemon"
+msgid "Daemonize after initialization"
 msgstr ""
 
 #. Output to syslog and do not daemonize
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:101
-msgid "openvpn_param_syslog"
+msgid "Output to syslog and do not daemonize"
 msgstr ""
 
 #. Run as an inetd or xinetd server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:102
-msgid "openvpn_param_inetd"
+msgid "Run as an inetd or xinetd server"
 msgstr ""
 
 #. Write log to file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:103
-msgid "openvpn_param_log"
+msgid "Write log to file"
 msgstr ""
 
 #. Append log to file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:104
-msgid "openvpn_param_log_append"
+msgid "Append log to file"
 msgstr ""
 
 #. Don't log timestamps
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:105
-msgid "openvpn_param_suppress_timestamps"
+msgid "Don't log timestamps"
 msgstr ""
 
 #. Write process ID to file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:106
-msgid "openvpn_param_writepid"
+msgid "Write process ID to file"
 msgstr ""
 
 #. Change process priority
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:107
-msgid "openvpn_param_nice"
+msgid "Change process priority"
 msgstr ""
 
 #. Echo parameters to log
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:108
-msgid "openvpn_param_echo"
+msgid "Echo parameters to log"
 msgstr ""
 
 #. Set output verbosity
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:109
-msgid "openvpn_param_verb"
+msgid "Set output verbosity"
 msgstr ""
 
 #. Limit repeated log messages
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:110
-msgid "openvpn_param_mute"
+msgid "Limit repeated log messages"
 msgstr ""
 
 #. Write status to file every n seconds
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:111
-msgid "openvpn_param_status"
+msgid "Write status to file every n seconds"
 msgstr ""
 
 #. Status file format version
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:112
-msgid "openvpn_param_status_version"
+msgid "Status file format version"
 msgstr ""
 
 #. Disable options consistency check
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:113
-msgid "openvpn_param_disable_occ"
+msgid "Disable options consistency check"
 msgstr ""
 
 #. Special stress testing mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:114
-msgid "openvpn_param_gremlin"
+msgid "Special stress testing mode"
 msgstr ""
 
 #. Use fast LZO compression
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:115
-msgid "openvpn_param_comp_lzo"
+msgid "Use fast LZO compression"
 msgstr ""
 
 #. Don't use adaptive lzo compression
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:116
-msgid "openvpn_param_comp_noadapt"
+msgid "Don't use adaptive lzo compression"
 msgstr ""
 
 #. Enable management interface on <em>IP</em> <em>port</em>
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:117
-msgid "openvpn_param_management"
+msgid "Enable management interface on <em>IP</em> <em>port</em>"
 msgstr ""
 
 #. Management interface will connect as a TCP client
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:118
-msgid "openvpn_param_management_client"
+msgid "Management interface will connect as a TCP client"
 msgstr ""
 
 #. Query management channel for private key
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:119
-msgid "openvpn_param_management_query_passwords"
+msgid "Query management channel for private key"
 msgstr ""
 
 #. Start OpenVPN in a hibernating state
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:120
-msgid "openvpn_param_management_hold"
+msgid "Start OpenVPN in a hibernating state"
 msgstr ""
 
 #. Issue SIGUSR1 on management disconnect
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:121
-msgid "openvpn_param_management_signal"
+msgid "Issue SIGUSR1 on management disconnect"
 msgstr ""
 
 #. Forget passwords on management disconnect
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:122
-msgid "openvpn_param_management_forget_disconnect"
+msgid "Forget passwords on management disconnect"
 msgstr ""
 
 #. Number of lines for log file history
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:123
-msgid "openvpn_param_management_log_cache"
+msgid "Number of lines for log file history"
 msgstr ""
 
 #. Load plug-in module
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:124
-msgid "openvpn_param_plugin"
+msgid "Load plug-in module"
 msgstr ""
 
 #. Configure server mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:125
-msgid "openvpn_param_server"
+msgid "Configure server mode"
 msgstr ""
 
 #. Configure server bridge
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:126
-msgid "openvpn_param_server_bridge"
+msgid "Configure server bridge"
 msgstr ""
 
 #. Push options to peer
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:127
-msgid "openvpn_param_push"
+msgid "Push options to peer"
 msgstr ""
 
 #. Don't inherit global push options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:128
-msgid "openvpn_param_push_reset"
+msgid "Don't inherit global push options"
 msgstr ""
 
 #. Set aside a pool of subnets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:129
-msgid "openvpn_param_ifconfig_pool"
+msgid "Set aside a pool of subnets"
 msgstr ""
 
 #. Use individual addresses rather than /30 subnets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:130
-msgid "openvpn_param_ifconfig_pool_linear"
+msgid "Use individual addresses rather than /30 subnets"
 msgstr ""
 
 #. Persist/unpersist ifconfig-pool
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:131
-msgid "openvpn_param_ifconfig_pool_persist"
+msgid "Persist/unpersist ifconfig-pool"
 msgstr ""
 
 #. Push an ifconfig option to remote
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:132
-msgid "openvpn_param_ifconfig_push"
+msgid "Push an ifconfig option to remote"
 msgstr ""
 
 #. Route subnet to client
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:133
-msgid "openvpn_param_iroute"
+msgid "Route subnet to client"
 msgstr ""
 
 #. Client is disabled
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:134
-msgid "openvpn_param_disable"
+msgid "Client is disabled"
 msgstr ""
 
 #. Don't require client certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:135
-msgid "openvpn_param_client_cert_not_required"
+msgid "Don't require client certificate"
 msgstr ""
 
 #. Use username as common name
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:136
-msgid "openvpn_param_username_as_common_name"
+msgid "Use username as common name"
 msgstr ""
 
 #. Script to verify interactive authentication
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:137
-msgid "openvpn_param_auth_user_pass_verify"
+msgid "Script to verify interactive authentication"
 msgstr ""
 
 #. Allow client-to-client traffic
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:138
-msgid "openvpn_param_client_to_client"
+msgid "Allow client-to-client traffic"
 msgstr ""
 
 #. Allow multiple clients with same certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:139
-msgid "openvpn_param_duplicate_cn"
+msgid "Allow multiple clients with same certificate"
 msgstr ""
 
 #. Run script cmd on client connection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:140
-msgid "openvpn_param_client_connect"
+msgid "Run script cmd on client connection"
 msgstr ""
 
 #. Run script cmd on client disconnection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:141
-msgid "openvpn_param_client_disconnect"
+msgid "Run script cmd on client disconnection"
 msgstr ""
 
 #. Directory for custom client config files
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:142
-msgid "openvpn_param_client_config_dir"
+msgid "Directory for custom client config files"
 msgstr ""
 
 #. Refuse connection if no custom client config
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:143
-msgid "openvpn_param_ccd_exclusive"
+msgid "Refuse connection if no custom client config"
 msgstr ""
 
 #. Temporary directory for client-connect return file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:144
-msgid "openvpn_param_tmp_dir"
+msgid "Temporary directory for client-connect return file"
 msgstr ""
 
 #. Set size of real and virtual address hash tables
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:145
-msgid "openvpn_param_hash_size"
+msgid "Set size of real and virtual address hash tables"
 msgstr ""
 
 #. Number of allocated broadcast buffers
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:146
-msgid "openvpn_param_bcast_buffers"
+msgid "Number of allocated broadcast buffers"
 msgstr ""
 
 #. Maximum number of queued TCP output packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:147
-msgid "openvpn_param_tcp_queue_limit"
+msgid "Maximum number of queued TCP output packets"
 msgstr ""
 
 #. Script to validate client virtual addresses
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:148
-msgid "openvpn_param_learn_address"
+msgid "Script to validate client virtual addresses"
 msgstr ""
 
 #. Allowed maximum of new connections
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:149
-msgid "openvpn_param_connect_freq"
+msgid "Allowed maximum of new connections"
 msgstr ""
 
 #. Allowed maximum of connected clients
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:150
-msgid "openvpn_param_max_clients"
+msgid "Allowed maximum of connected clients"
 msgstr ""
 
 #. Allowed maximum of internal
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:151
-msgid "openvpn_param_max_routes_per_client"
+msgid "Allowed maximum of internal"
 msgstr ""
 
 #. Proxy incoming HTTPS sessions
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:152
-msgid "openvpn_param_port_share"
+msgid "Proxy incoming HTTPS sessions"
 msgstr ""
 
 #. Configure client mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:153
-msgid "openvpn_param_client"
+msgid "Configure client mode"
 msgstr ""
 
 #. Authenticate using username/password
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:154
-msgid "openvpn_param_auth_user_pass"
+msgid "Authenticate using username/password"
 msgstr ""
 
 #. Accept options pushed from server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:155
-msgid "openvpn_param_pull"
+msgid "Accept options pushed from server"
 msgstr ""
 
 #. Handling of authentication failures
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:156
-msgid "openvpn_param_auth_retry"
+msgid "Handling of authentication failures"
 msgstr ""
 
 #. Send notification to peer on disconnect
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:157
-msgid "openvpn_param_explicit_exit_notify"
+msgid "Send notification to peer on disconnect"
 msgstr ""
 
 #. Enable Static Key encryption mode (non-TLS)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:158
-msgid "openvpn_param_secret"
+msgid "Enable Static Key encryption mode (non-TLS)"
 msgstr ""
 
 #. HMAC authentication for packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:159
-msgid "openvpn_param_auth"
+msgid "HMAC authentication for packets"
 msgstr ""
 
 #. Encryption cipher for packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:160
-msgid "openvpn_param_cipher"
+msgid "Encryption cipher for packets"
 msgstr ""
 
 #. Size of cipher key
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:161
-msgid "openvpn_param_keysize"
+msgid "Size of cipher key"
 msgstr ""
 
 #. Enable OpenSSL hardware crypto engines
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:162
-msgid "openvpn_param_engine"
+msgid "Enable OpenSSL hardware crypto engines"
 msgstr ""
 
 #. Disable replay protection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:163
-msgid "openvpn_param_no_replay"
+msgid "Disable replay protection"
 msgstr ""
 
 #. Silence the output of replay warnings
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:164
-msgid "openvpn_param_mute_replay_warnings"
+msgid "Silence the output of replay warnings"
 msgstr ""
 
 #. Replay protection sliding window size
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:165
-msgid "openvpn_param_replay_window"
+msgid "Replay protection sliding window size"
 msgstr ""
 
 #. Disable cipher initialisation vector
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:166
-msgid "openvpn_param_no_iv"
+msgid "Disable cipher initialisation vector"
 msgstr ""
 
 #. Persist replay-protection state
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:167
-msgid "openvpn_param_replay_persist"
+msgid "Persist replay-protection state"
 msgstr ""
 
 #. Run a self-test of crypto features
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:168
-msgid "openvpn_param_test_crypto"
+msgid "Run a self-test of crypto features"
 msgstr ""
 
 #. Enable TLS and assume server role
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:169
-msgid "openvpn_param_tls_server"
+msgid "Enable TLS and assume server role"
 msgstr ""
 
 #. Enable TLS and assume client role
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:170
-msgid "openvpn_param_tls_client"
+msgid "Enable TLS and assume client role"
 msgstr ""
 
 #. Data channel key exchange method
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:171
-msgid "openvpn_param_key_method"
+msgid "Data channel key exchange method"
 msgstr ""
 
 #. Certificate authority
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:172
-msgid "openvpn_param_ca"
+msgid "Certificate authority"
 msgstr ""
 
 #. Directory of trusted certificates (CAs and CRLs)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:173
-msgid "openvpn_param_capath"
+msgid "Directory of trusted certificates (CAs and CRLs)"
 msgstr ""
 
 #. Diffie Hellman parameters
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:174
-msgid "openvpn_param_dh"
+msgid "Diffie Hellman parameters"
 msgstr ""
 
 #. Local certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:175
-msgid "openvpn_param_cert"
+msgid "Local certificate"
 msgstr ""
 
 #. Local private key
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:176
-msgid "openvpn_param_key"
+msgid "Local private key"
 msgstr ""
 
 #. PKCS#12 file containing keys
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:177
-msgid "openvpn_param_pkcs12"
+msgid "PKCS#12 file containing keys"
 msgstr ""
 
 #. TLS cipher
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:178
-msgid "openvpn_param_tls_cipher"
+msgid "TLS cipher"
 msgstr ""
 
 #. Retransmit timeout on TLS control channel
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:179
-msgid "openvpn_param_tls_timeout"
+msgid "Retransmit timeout on TLS control channel"
 msgstr ""
 
 #. Renegotiate data chan. key after bytes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:180
-msgid "openvpn_param_reneg_bytes"
+msgid "Renegotiate data chan. key after bytes"
 msgstr ""
 
 #. Renegotiate data chan. key after packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:181
-msgid "openvpn_param_reneg_pkts"
+msgid "Renegotiate data chan. key after packets"
 msgstr ""
 
 #. Renegotiate data chan. key after seconds
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:182
-msgid "openvpn_param_reneg_sec"
+msgid "Renegotiate data chan. key after seconds"
 msgstr ""
 
 #. Timeframe for key exchange
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:183
-msgid "openvpn_param_hand_window"
+msgid "Timeframe for key exchange"
 msgstr ""
 
 #. Key transition window
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:184
-msgid "openvpn_param_tran_window"
+msgid "Key transition window"
 msgstr ""
 
 #. Allow only one session
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:185
-msgid "openvpn_param_single_session"
+msgid "Allow only one session"
 msgstr ""
 
 #. Exit on TLS negotiation failure
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:186
-msgid "openvpn_param_tls_exit"
+msgid "Exit on TLS negotiation failure"
 msgstr ""
 
 #. Additional authentication over TLS
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:187
-msgid "openvpn_param_tls_auth"
+msgid "Additional authentication over TLS"
 msgstr ""
 
 #. Get PEM password from controlling tty before we daemonize
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:188
-msgid "openvpn_param_askpass"
+msgid "Get PEM password from controlling tty before we daemonize"
 msgstr ""
 
 #. Don't cache --askpass or --auth-user-pass passwords
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:189
-msgid "openvpn_param_auth_nocache"
+msgid "Don't cache --askpass or --auth-user-pass passwords"
 msgstr ""
 
 #. Check peer certificate against a CRL
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:190
-msgid "openvpn_param_crl_verify"
+msgid "Check peer certificate against a CRL"
 msgstr ""
 
 #. Shell command to verify X509 name
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:191
-msgid "openvpn_param_tls_verify"
+msgid "Shell command to verify X509 name"
 msgstr ""
 
 #. Only accept connections from given X509 name
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:192
-msgid "openvpn_param_tls_remote"
+msgid "Only accept connections from given X509 name"
 msgstr ""
 
 #. Require explicit designation on certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:193
-msgid "openvpn_param_ns_cert_type"
+msgid "Require explicit designation on certificate"
 msgstr ""
 
 #. Require explicit key usage on certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:194
-msgid "openvpn_param_remote_cert_ku"
+msgid "Require explicit key usage on certificate"
 msgstr ""
 
 #. Require extended explicit key usage on certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:195
-msgid "openvpn_param_remote_cert_eku"
+msgid "Require extended explicit key usage on certificate"
 msgstr ""
 
 #. Require normal and extended key usage on certificate
diff --git a/po/el/p910nd.po b/po/el/p910nd.po
index 53e3c928c..44ba637bc 100644
--- a/po/el/p910nd.po
+++ b/po/el/p910nd.po
@@ -14,17 +14,17 @@ msgstr ""
 
 #. p910nd - Printer server
 #: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:1
-msgid "p910nd"
+msgid "p910nd - Printer server"
 msgstr ""
 
 #. First you have to install the packages to get support for USB (kmod-usb-printer) or parallel port (kmod-lp).
 #: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:2
-msgid "p910nd_desc"
+msgid "First you have to install the packages to get support for USB (kmod-usb-printer) or parallel port (kmod-lp)."
 msgstr ""
 
 #. Bidirectional mode
 #: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:3
-msgid "bidirectional"
+msgid "Bidirectional mode"
 msgstr ""
 
 #. p910nd listens on port 910+N. E.g. 9100 for the first printer.
diff --git a/po/el/polipo.po b/po/el/polipo.po
index ffbf4a241..9b92c95e9 100644
--- a/po/el/polipo.po
+++ b/po/el/polipo.po
@@ -14,212 +14,212 @@ msgstr ""
 
 #. Polipo
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:1
-msgid "polipo"
+msgid "Polipo"
 msgstr ""
 
 #. On-Disk Cache
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:2
-msgid "polipo_cache"
+msgid "On-Disk Cache"
 msgstr ""
 
 #. Shared cache
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:3
-msgid "polipo_cache_cacheisshared"
+msgid "Shared cache"
 msgstr ""
 
 #. Enable if cache (proxy) is shared by multiple users.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:4
-msgid "polipo_cache_cacheisshared_desc"
+msgid "Enable if cache (proxy) is shared by multiple users."
 msgstr ""
 
 #. To enable polipo on-disk cache cleaning (highly recommended), you should add a cron job in Scheduled Tasks services that will execute /usr/sbin/polipo_purge script. For example to perform disk cache cleanup every day at 6:00 in the morning you should add the following line in Scheduled Tasks &quot;0 6 * * *	/usr/sbin/polipo_purge&quot; (without quotes).
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:5
-msgid "polipo_cache_desc"
+msgid "To enable polipo on-disk cache cleaning (highly recommended), you should add a cron job in Scheduled Tasks services that will execute /usr/sbin/polipo_purge script. For example to perform disk cache cleanup every day at 6:00 in the morning you should add the following line in Scheduled Tasks \"0 6 * * *\\t/usr/sbin/polipo_purge\" (without quotes)."
 msgstr ""
 
 #. Disk cache location
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:6
-msgid "polipo_cache_diskcacheroot"
+msgid "Disk cache location"
 msgstr ""
 
 #. Location where polipo will cache files permanently. Use of external storage devices is recommended, because the cache can grow considerably. Leave it empty to disable on-disk cache.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:7
-msgid "polipo_cache_diskcacheroot_desc"
+msgid "Location where polipo will cache files permanently. Use of external storage devices is recommended, because the cache can grow considerably. Leave it empty to disable on-disk cache."
 msgstr ""
 
 #. Truncate cache files size (in bytes)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:8
-msgid "polipo_cache_diskcachetruncatesize"
+msgid "Truncate cache files size (in bytes)"
 msgstr ""
 
 #. Size to which cached files should be truncated. (default value: 1048576)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:9
-msgid "polipo_cache_diskcachetruncatesize_desc"
+msgid "Size to which cached files should be truncated. (default value: 1048576)"
 msgstr ""
 
 #. Truncate cache files time
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:10
-msgid "polipo_cache_diskcachetruncatetime"
+msgid "Truncate cache files time"
 msgstr ""
 
 #. Time after which cached files will be truncated. (default value: 4d12h)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:11
-msgid "polipo_cache_diskcachetruncatetime_desc"
+msgid "Time after which cached files will be truncated. (default value: 4d12h)"
 msgstr ""
 
 #. Delete cache files time
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:12
-msgid "polipo_cache_diskcacheunlinktime"
+msgid "Delete cache files time"
 msgstr ""
 
 #. Time after which cached files will be deleted. (default value: 32d)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:13
-msgid "polipo_cache_diskcacheunlinktime_desc"
+msgid "Time after which cached files will be deleted. (default value: 32d)"
 msgstr ""
 
 #. Polipo is a small and fast caching web proxy.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:14
-msgid "polipo_desc"
+msgid "Polipo is a small and fast caching web proxy."
 msgstr ""
 
 #. General
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:15
-msgid "polipo_general"
+msgid "General"
 msgstr ""
 
 #. Allowed clients
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:16
-msgid "polipo_general_allowedclients"
+msgid "Allowed clients"
 msgstr ""
 
 #. When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients that are allowed to connect. The format is IP address or network address (192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6)).
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:17
-msgid "polipo_general_allowedclients_desc"
+msgid "When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients that are allowed to connect. The format is IP address or network address (192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))."
 msgstr ""
 
 #. In RAM cache size (in bytes)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:18
-msgid "polipo_general_chunkhighmark"
+msgid "In RAM cache size (in bytes)"
 msgstr ""
 
 #. How much RAM should Polipo use for its cache.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:19
-msgid "polipo_general_chunkhighmark_desc"
+msgid "How much RAM should Polipo use for its cache."
 msgstr ""
 
 #. DNS server address
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:20
-msgid "polipo_general_dnsnameserver"
+msgid "DNS server address"
 msgstr ""
 
 #. Set the DNS server address to use, if you want Polipo to use different DNS server than the host system.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:21
-msgid "polipo_general_dnsnameserver_desc"
+msgid "Set the DNS server address to use, if you want Polipo to use different DNS server than the host system."
 msgstr ""
 
 #. Query DNS for IPv6
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:22
-msgid "polipo_general_dnsqueryipv6"
+msgid "Query DNS for IPv6"
 msgstr ""
 
 #. false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = Query both, prefer IPv6; true = Query only IPv6
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:23
-msgid "polipo_general_dnsqueryipv6_desc"
+msgid "false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = Query both, prefer IPv6; true = Query only IPv6"
 msgstr ""
 
 #. Query DNS by hostname
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:24
-msgid "polipo_general_dnsusegethostbyname"
+msgid "Query DNS by hostname"
 msgstr ""
 
 #. false = Never use system DNS resolver; reluctantly = Query DNS directly, if DNS server is unavailable fail to system DNS resolver; happily = Query DNS directly, if host could not be found fallback to system DNS resolver; true = Always use system DNS resolver
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:25
-msgid "polipo_general_dnsusegethostbyname_desc"
+msgid "false = Never use system DNS resolver; reluctantly = Query DNS directly, if DNS server is unavailable fail to system DNS resolver; happily = Query DNS directly, if host could not be found fallback to system DNS resolver; true = Always use system DNS resolver"
 msgstr ""
 
 #. Syslog facility
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:26
-msgid "polipo_general_logfacility"
+msgid "Syslog facility"
 msgstr ""
 
 #. Log file location
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:27
-msgid "polipo_general_logfile"
+msgid "Log file location"
 msgstr ""
 
 #. Use of external storage device is recommended, because the log file is written frequently and can grow considerably.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:28
-msgid "polipo_general_logfile_desc"
+msgid "Use of external storage device is recommended, because the log file is written frequently and can grow considerably."
 msgstr ""
 
 #. Log to syslog
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:29
-msgid "polipo_general_logsyslog"
+msgid "Log to syslog"
 msgstr ""
 
 #. Parent proxy authentication
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:30
-msgid "polipo_general_parentauthcredentials"
+msgid "Parent proxy authentication"
 msgstr ""
 
 #. Basic HTTP authentication supported. Provide username and password in username:password format.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:31
-msgid "polipo_general_parentauthcredentials_desc"
+msgid "Basic HTTP authentication supported. Provide username and password in username:password format."
 msgstr ""
 
 #. Parent proxy address
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:32
-msgid "polipo_general_parentproxy"
+msgid "Parent proxy address"
 msgstr ""
 
 #. Parent proxy address (in host:port format), to which Polipo will forward the requests.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:33
-msgid "polipo_general_parentproxy_desc"
+msgid "Parent proxy address (in host:port format), to which Polipo will forward the requests."
 msgstr ""
 
 #. Listen address
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:34
-msgid "polipo_general_proxyaddress"
+msgid "Listen address"
 msgstr ""
 
 #. The interface on which Polipo will listen. To listen on all interfaces use 0.0.0.0 or :: (IPv6).
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:35
-msgid "polipo_general_proxyaddress_desc"
+msgid "The interface on which Polipo will listen. To listen on all interfaces use 0.0.0.0 or :: (IPv6)."
 msgstr ""
 
 #. Listen port
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:36
-msgid "polipo_general_proxyport"
+msgid "Listen port"
 msgstr ""
 
 #. Port on which Polipo will listen. (default value: 8123)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:37
-msgid "polipo_general_proxyport_desc"
+msgid "Port on which Polipo will listen. (default value: 8123)"
 msgstr ""
 
 #. Poor Man&#39;s Multiplexing
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:38
-msgid "polipo_pmm"
+msgid "Poor Man's Multiplexing"
 msgstr ""
 
 #. Poor Man&#39;s Multiplexing (PMM) is a technique that simulates multiplexing by requesting an instance in multiple segments. It tries to lower the latency caused by the weakness of HTTP protocol. NOTE: some sites may not work with PMM enabled.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:39
-msgid "polipo_pmm_desc"
+msgid "Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by requesting an instance in multiple segments. It tries to lower the latency caused by the weakness of HTTP protocol. NOTE: some sites may not work with PMM enabled."
 msgstr ""
 
 #. First PMM segment size (in bytes)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:40
-msgid "polipo_pmm_pmmfirstsize"
+msgid "First PMM segment size (in bytes)"
 msgstr ""
 
 #. Size of the first PMM segment. If not defined, it defaults to twice the PMM segment size.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:41
-msgid "polipo_pmm_pmmfirstsize_desc"
+msgid "Size of the first PMM segment. If not defined, it defaults to twice the PMM segment size."
 msgstr ""
 
 #. PMM segments size (in bytes)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:42
-msgid "polipo_pmm_pmmsize"
+msgid "PMM segments size (in bytes)"
 msgstr ""
 
 #. To enable PMM, PMM segment size must be set to some positive value.
diff --git a/po/el/qos.po b/po/el/qos.po
index 0090d3fc3..878cc0bb2 100644
--- a/po/el/qos.po
+++ b/po/el/qos.po
@@ -13,95 +13,95 @@ msgstr ""
 
 #. Quality of Service
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:1
-msgid "qos"
+msgid "Quality of Service"
 msgstr "Ποιότητα Υπηρεσίας"
 
 #. With QoS you can priorize network traffic selected by adresses, ports or services.
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:2
-msgid "qos_desc"
+msgid "With QoS you can priorize network traffic selected by adresses, ports or services."
 msgstr ""
 "Με το QoS μπορείτε να ορίσετε προτεραιότητες στην κίνηση του δικτύου με βάση "
 "διευθύνσεις, θύρες ή υπηρεσίες."
 
 #. Classification
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:3
-msgid "qos_interface_classgroup"
+msgid "Classification"
 msgstr "Κατηγοριοποίηση"
 
 #. Calculate Overhead
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:4
-msgid "qos_interface_overhead"
+msgid "Calculate Overhead"
 msgstr "Υπολογισμός Overhead"
 
 #. Half-Duplex
-msgid "qos_interface_halfduplex"
+msgid "Half-Duplex"
 msgstr "Μη-ταυτόχρονη αμφίδρομη επικοινωνία"
 
 #. Downlink
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:5
 #, fuzzy
-msgid "qos_interface_download"
+msgid "Downlink"
 msgstr "Ταχύτητα κατεβάσματος"
 
 #. Uplink
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:6
 #, fuzzy
-msgid "qos_interface_upload"
+msgid "Uplink"
 msgstr "Ταχύτητα ανεβάσματος"
 
 #. Prioritization
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:7
-msgid "qos_classify"
+msgid "Prioritization"
 msgstr "Προτεραιότητες"
 
 #. Priority
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:8
-msgid "qos_classify_target"
+msgid "Priority"
 msgstr "Προτεραιότητα"
 
 #. Source address
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:9
-msgid "qos_classify_srchost"
+msgid "Source address"
 msgstr "Διεύθυνση πηγής"
 
 #. source network / source host
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:10
-msgid "qos_classify_srchost_dest"
+msgid "source network / source host"
 msgstr "πηγαίο δίκτυο / πηγαίος υπολογιστής"
 
 #. Target address
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:11
-msgid "qos_classify_dsthost"
+msgid "Target address"
 msgstr "Διεύθυνση στόχου"
 
 #. target network / target host
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:12
-msgid "qos_classify_dsthost_dest"
+msgid "target network / target host"
 msgstr "δίκτυο στόχος / υπολογιστής στόχος"
 
 #. portrange
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:13
-msgid "qos_classify_portrange"
+msgid "portrange"
 msgstr "εύρος θυρών"
 
 #. low
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:14
-msgid "qos_bulk"
+msgid "low"
 msgstr "χαμηλή"
 
 #. normal
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:15
-msgid "qos_normal"
+msgid "normal"
 msgstr "κανονική"
 
 #. express
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:16
-msgid "qos_express"
+msgid "express"
 msgstr "εξπρές"
 
 #. priority
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:17
-msgid "qos_priority"
+msgid "priority"
 msgstr "προτεραιότητα"
 
 #. Bytes sent
diff --git a/po/el/rrdtool.po b/po/el/rrdtool.po
index 1d81166ec..1d4f2251e 100644
--- a/po/el/rrdtool.po
+++ b/po/el/rrdtool.po
@@ -14,342 +14,342 @@ msgstr ""
 
 #. %H: Wireless - Signal Noise Ratio
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:1
-msgid "stat_dg_title_wireless__signal_noise"
+msgid "%H: Wireless - Signal Noise Ratio"
 msgstr ""
 
 #. dBm
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:2
-msgid "stat_dg_label_wireless__signal_noise"
+msgid "dBm"
 msgstr ""
 
 #. Noise Level
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:3
-msgid "stat_ds_signal_noise"
+msgid "Noise Level"
 msgstr ""
 
 #. Signal Strength
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:4
-msgid "stat_ds_signal_power"
+msgid "Signal Strength"
 msgstr ""
 
 #. %H: Wireless - Signal Quality
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:5
-msgid "stat_dg_title_wireless__signal_quality"
+msgid "%H: Wireless - Signal Quality"
 msgstr ""
 
 #. n
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:6
-msgid "stat_dg_label_wireless__signal_quality"
+msgid "n"
 msgstr ""
 
 #. Signal Quality
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:7
-msgid "stat_ds_signal_quality"
+msgid "Signal Quality"
 msgstr ""
 
 #. %H: ICMP Roundtrip Times
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:8
-msgid "stat_dg_title_ping"
+msgid "%H: ICMP Roundtrip Times"
 msgstr ""
 
 #. ms
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:9
-msgid "stat_dg_label_ping"
+msgid "ms"
 msgstr ""
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:10
-msgid "stat_ds_ping"
+msgid "%di"
 msgstr ""
 
 #. %H: Firewall - Processed Packets
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:11
-msgid "stat_dg_title_iptables__ipt_packets"
+msgid "%H: Firewall - Processed Packets"
 msgstr ""
 
 #. Packets/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:12
-msgid "stat_dg_label_iptables__ipt_packets"
+msgid "Packets/s"
 msgstr ""
 
 #. Chain \"%di\"
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:13
-msgid "stat_ds_ipt_packets"
+msgid "Chain \"%di\""
 msgstr ""
 
 #. %H: Netlink - Transfer on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:14
-msgid "stat_dg_title_netlink__if_octets"
+msgid "%H: Netlink - Transfer on %pi"
 msgstr ""
 
 #. Bytes/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:15
-msgid "stat_dg_label_netlink__if_octets"
+msgid "Bytes/s"
 msgstr ""
 
 #. Bytes (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:16
-msgid "stat_ds_if_octets"
+msgid "Bytes (%ds)"
 msgstr ""
 
 #. %H: Netlink - Packets on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:17
-msgid "stat_dg_title_netlink__if_packets"
+msgid "%H: Netlink - Packets on %pi"
 msgstr ""
 
 #. Packets/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:18
-msgid "stat_dg_label_netlink__if_packets"
+msgid "Packets/s"
 msgstr ""
 
 #. Processed (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:19
-msgid "stat_ds_if_packets"
+msgid "Processed (%ds)"
 msgstr ""
 
 #. Dropped   (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:20
-msgid "stat_ds_if_dropped"
+msgid "Dropped (%ds)"
 msgstr ""
 
 #. Errors    (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:21
-msgid "stat_ds_if_errors"
+msgid "Errors (%ds)"
 msgstr ""
 
 #. %H: Netlink - Multicast on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:22
-msgid "stat_dg_title_netlink__if_multicast"
+msgid "%H: Netlink - Multicast on %pi"
 msgstr ""
 
 #. Packets/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:23
-msgid "stat_dg_label_netlink__if_multicast"
+msgid "Packets/s"
 msgstr ""
 
 #. Packets
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:24
-msgid "stat_ds_if_multicast"
+msgid "Packets"
 msgstr ""
 
 #. %H: Netlink - Collisions on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:25
-msgid "stat_dg_title_netlink__if_collisions"
+msgid "%H: Netlink - Collisions on %pi"
 msgstr ""
 
 #. Collisions/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:26
-msgid "stat_dg_label_netlink__if_collisions"
+msgid "Collisions/s"
 msgstr ""
 
 #. Collisions
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:27
-msgid "stat_ds_if_collisions"
+msgid "Collisions"
 msgstr ""
 
 #. %H: Netlink - Errors on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:28
-msgid "stat_dg_title_netlink__if_tx_errors"
+msgid "%H: Netlink - Errors on %pi"
 msgstr ""
 
 #. Errors/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:29
-msgid "stat_dg_label_netlink__if_tx_errors"
+msgid "Errors/s"
 msgstr ""
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:30
-msgid "stat_ds_if_tx_errors"
+msgid "%di"
 msgstr ""
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:31
-msgid "stat_ds_if_rx_errors"
+msgid "%di"
 msgstr ""
 
 #. %H: Processes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:32
-msgid "stat_dg_title_processes"
+msgid "%H: Processes"
 msgstr ""
 
 #. Processes/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:33
-msgid "stat_dg_label_processes"
+msgid "Processes/s"
 msgstr ""
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:34
-msgid "stat_ds_ps_state"
+msgid "%di"
 msgstr ""
 
 #. %H: Process %pi - used cpu time
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:35
-msgid "stat_dg_title_processes__ps_cputime"
+msgid "%H: Process %pi - used cpu time"
 msgstr ""
 
 #. Jiffies
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:36
-msgid "stat_dg_label_processes__ps_cputime"
+msgid "Jiffies"
 msgstr ""
 
 #. system
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:37
-msgid "stat_ds_ps_cputime__syst"
+msgid "System"
 msgstr ""
 
 #. user
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:38
-msgid "stat_ds_ps_cputime__user"
+msgid "user"
 msgstr ""
 
 #. %H: Process %pi - threads and processes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:39
-msgid "stat_dg_title_processes__ps_count"
+msgid "%H: Process %pi - threads and processes"
 msgstr ""
 
 #. Count
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:40
-msgid "stat_dg_label_processes__ps_count"
+msgid "Count"
 msgstr ""
 
 #. %ds
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:41
-msgid "stat_ds_ps_count"
+msgid "%ds"
 msgstr ""
 
 #. %H: Process %pi - page faults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:42
-msgid "stat_dg_title_processes__ps_pagefaults"
+msgid "%H: Process %pi - page faults"
 msgstr ""
 
 #. Pagefaults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:43
-msgid "stat_dg_label_processes__ps_pagefaults"
+msgid "Pagefaults"
 msgstr ""
 
 #. page faults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:44
-msgid "stat_ds_ps_pagefaults"
+msgid "page faults"
 msgstr ""
 
 #. %H: Process %pi - virtual memory size
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:45
-msgid "stat_dg_title_processes__ps_rss"
+msgid "%H: Process %pi - virtual memory size"
 msgstr ""
 
 #. Bytes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:46
-msgid "stat_dg_label_processes__ps_rss"
+msgid "Bytes"
 msgstr ""
 
 #. virtual memory
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:47
-msgid "stat_ds_ps_rss"
+msgid "virtual memory"
 msgstr ""
 
 #. %H: Usage on Processor #%pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:48
-msgid "stat_dg_title_cpu"
+msgid "%H: Usage on Processor #%pi"
 msgstr ""
 
 #. %
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:49
-msgid "stat_dg_label_cpu"
+msgid "%"
 msgstr ""
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:50
-msgid "stat_ds_cpu"
+msgid "%di"
 msgstr ""
 
 #. %H: Transfer on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:51
-msgid "stat_dg_title_interface__if_octets"
+msgid "%H: Transfer on %di"
 msgstr ""
 
 #. Bytes/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:52
-msgid "stat_dg_label_interface__if_octets"
+msgid "Bytes/s"
 msgstr ""
 
 #. %H: Packets on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:53
-msgid "stat_dg_title_interface__if_packets"
+msgid "%H: Packets on %di"
 msgstr ""
 
 #. Packets/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:54
-msgid "stat_dg_label_interface__if_packets"
+msgid "Packets/s"
 msgstr ""
 
 #. %H: TCP-Connections to Port %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:55
-msgid "stat_dg_title_tcpconns"
+msgid "%H: TCP-Connections to Port %pi"
 msgstr ""
 
 #. Connections/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:56
-msgid "stat_dg_label_tcpconns"
+msgid "Connections/s"
 msgstr ""
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:57
-msgid "stat_ds_tcp_connections"
+msgid "%di"
 msgstr ""
 
 #. %H: Disk Space Usage on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:58
-msgid "stat_dg_title_df"
+msgid "%H: Disk Space Usage on %di"
 msgstr ""
 
 #. Bytes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:59
-msgid "stat_dg_label_df"
+msgid "Bytes"
 msgstr ""
 
 #. %ds
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:60
-msgid "stat_ds_df__free"
+msgid "%ds"
 msgstr ""
 
 #. %ds
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:61
-msgid "stat_ds_df__used"
+msgid "%ds"
 msgstr ""
 
 #. %H: Interrupts
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:62
-msgid "stat_dg_title_irq"
+msgid "%H: Interrupts"
 msgstr ""
 
 #. Issues/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:63
-msgid "stat_dg_label_irq"
+msgid "Issues/s"
 msgstr ""
 
 #. IRQ %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:64
-msgid "stat_ds_irq"
+msgid "IRQ %di"
 msgstr ""
 
 #. %H: System Load
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:65
-msgid "stat_dg_title_load"
+msgid "%H: System Load"
 msgstr ""
 
 #. Load
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:66
-msgid "stat_dg_label_load"
+msgid "Load"
 msgstr ""
 
 #. 1 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:67
-msgid "stat_ds_load__shortterm"
+msgid "1 min"
 msgstr ""
 
 #. 5 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:68
-msgid "stat_ds_load__midterm"
+msgid "5 min"
 msgstr ""
 
 #. 15 min
diff --git a/po/el/samba.po b/po/el/samba.po
index 8be69a4a3..8cd83d301 100644
--- a/po/el/samba.po
+++ b/po/el/samba.po
@@ -14,82 +14,82 @@ msgstr ""
 
 #. Network Shares
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:1
-msgid "samba"
+msgid "Network Shares"
 msgstr ""
 
 #. Hostname
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:2
-msgid "samba_samba_name"
+msgid "Hostname"
 msgstr ""
 
 #. Description
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:3
-msgid "samba_samba_description"
+msgid "Description"
 msgstr ""
 
 #. Workgroup
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:4
-msgid "samba_samba_workgroup"
+msgid "Workgroup"
 msgstr ""
 
 #. Share home-directories
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:5
-msgid "samba_samba_homes"
+msgid "Share home-directories"
 msgstr ""
 
 #. System users can reach their home directories via network shares.
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:6
-msgid "samba_samba_homes_desc"
+msgid "System users can reach their home directories via network shares."
 msgstr ""
 
 #. Shared Directories
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:7
-msgid "samba_sambashare"
+msgid "Shared Directories"
 msgstr ""
 
 #. Shared Directory
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:8
-msgid "samba_sambashare_path"
+msgid "Shared Directory"
 msgstr ""
 
 #. Physical Path
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:9
-msgid "samba_sambashare_path_desc"
+msgid "Physical Path"
 msgstr ""
 
 #. Allowed Users
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:10
-msgid "samba_sambashare_users"
+msgid "Allowed Users"
 msgstr ""
 
 #. optional
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:11
-msgid "samba_sambashare_users_desc"
+msgid "optional"
 msgstr ""
 
 #. Read Only
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:12
-msgid "samba_sambashare_readonly"
+msgid "Read Only"
 msgstr ""
 
 #. Allow Guests
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:13
-msgid "samba_sambashare_guestok"
+msgid "Allow Guests"
 msgstr ""
 
 #. Create Mask
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:14
-msgid "samba_sambashare_createmask"
+msgid "Create Mask"
 msgstr ""
 
 #. Mask for new files
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:15
-msgid "samba_sambashare_createmask_desc"
+msgid "Mask for new files"
 msgstr ""
 
 #. Directory Mask
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:16
-msgid "samba_sambashare_dirmask"
+msgid "Directory Mask"
 msgstr ""
 
 #. Mask for new directories
diff --git a/po/el/statistics.po b/po/el/statistics.po
index e85f5f387..3cdc68a87 100644
--- a/po/el/statistics.po
+++ b/po/el/statistics.po
@@ -13,12 +13,12 @@ msgstr ""
 
 #. Statistics
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:1
-msgid "stat_statistics"
+msgid "Statistics"
 msgstr "Στατιστικά"
 
 #. The statistics package is based on <a href=\"http://collectd.org/index.shtml\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD Tool</a> to render diagram images from collected data.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:2
-msgid "stat_desc"
+msgid "The statistics package is based on <a href=\"http://collectd.org/index.shtml\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD Tool</a> to render diagram images from collected data."
 msgstr ""
 "Το πακέτο στατιστικών βασίζεται στο <a "
 "href=\"http://collectd.org/index.shtml\">Collectd</a> και χρησιμοποιεί το <a "
@@ -27,142 +27,142 @@ msgstr ""
 
 #. System plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:3
-msgid "stat_systemplugins"
+msgid "System plugins"
 msgstr "Πρόσθετα συστήματος"
 
 #. Network plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:4
-msgid "stat_networkplugins"
+msgid "Network plugins"
 msgstr "Πρόσθετα δικτύου"
 
 #. Output plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:5
-msgid "stat_outputplugins"
+msgid "Output plugins"
 msgstr "Πρόσθετα εξόδου"
 
 #. Display timespan
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:6
-msgid "stat_showtimespan"
+msgid "Display timespan »"
 msgstr "Εμφάνιση χρονικού εύρους"
 
 #. Graphs
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:7
-msgid "stat_graphs"
+msgid "Graphs"
 msgstr "Γραφήματα"
 
 #. Collectd
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:8
-msgid "stat_collectd"
+msgid "Collectd"
 msgstr "Collectd"
 
 #. Processor
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:9
-msgid "stat_cpu"
+msgid "Processor"
 msgstr "Επεξεργαστής"
 
 #. Ping
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:10
-msgid "stat_ping"
+msgid "Ping"
 msgstr "Ping"
 
 #. Firewall
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:11
-msgid "stat_iptables"
+msgid "Firewall"
 msgstr "Τείχος προστασίας"
 
 #. Netlink
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:12
-msgid "stat_netlink"
+msgid "Netlink"
 msgstr "Netlink"
 
 #. Processes
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:13
-msgid "stat_processes"
+msgid "Processes"
 msgstr "Διεργασίες"
 
 #. Wireless
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:14
-msgid "stat_wireless"
+msgid "Wireless"
 msgstr "Ασύρματο"
 
 #. TCP Connections
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:15
-msgid "stat_tcpconns"
+msgid "TCP Connections"
 msgstr "Συνδέσεις TCP"
 
 #. Interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:16
-msgid "stat_interface"
+msgid "Interfaces"
 msgstr "Διεπαφές"
 
 #. Disk Space Usage
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:17
-msgid "stat_df"
+msgid "Disk Space Usage"
 msgstr "Χρήση Χώρου στον δίσκο"
 
 #. Interrupts
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:18
-msgid "stat_irq"
+msgid "Interrupts"
 msgstr "Διακοπές"
 
 #. Disk Usage
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:19
-msgid "stat_disk"
+msgid "Disk Usage"
 msgstr "Χρήση Δίσκου"
 
 #. Exec
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:20
-msgid "stat_exec"
+msgid "Exec"
 msgstr "Exec"
 
 #. RRDTool
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:21
-msgid "stat_rrdtool"
+msgid "RRDTool"
 msgstr "RRDTool"
 
 #. Network
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:22
-msgid "stat_network"
+msgid "Network"
 msgstr "Δίκτυο"
 
 #. CSV Output
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:23
-msgid "stat_csv"
+msgid "CSV Output"
 msgstr "Έξοδος CSV"
 
 #. System Load
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:24
-msgid "stat_load"
+msgid "System Load"
 msgstr "Φόρτος Συστήματος"
 
 #. DNS
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:25
-msgid "stat_dns"
+msgid "DNS"
 msgstr "DNS"
 
 #. Email
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:26
-msgid "stat_email"
+msgid "Email"
 msgstr "Ηλ. Ταχυδρομείο"
 
 #. UnixSock
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:27
-msgid "stat_unixsock"
+msgid "UnixSock"
 msgstr "UnixSock"
 
 #. Statistics
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:28
-msgid "lucistatistics"
+msgid "Statistics"
 msgstr "Στατιστικά"
 
 #. Collectd Settings
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:29
-msgid "lucistatistics_collectd"
+msgid "Collectd Settings"
 msgstr "Ρυθμίσεις Collectd"
 
 #. Collectd is a small daeomon for collecting data from various sources through different plugins. On this page you can change general settings for the collectd daemon.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:30
-msgid "lucistatistics_collectd_desc"
+msgid "Collectd is a small daeomon for collecting data from various sources through different plugins. On this page you can change general settings for the collectd daemon."
 msgstr ""
 "Το Collectd είναι ένας μικρός δαίμονας για τη συλλογή δεδομένων από διάφορες "
 "πηγές μέσω διάφορων προσθέτων. Σε αυτή τη σελίδα μπορείτε να αλλάξετε τις "
@@ -170,909 +170,909 @@ msgstr ""
 
 #. Hostname
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:31
-msgid "lucistatistics_collectd_hostname"
+msgid "Hostname"
 msgstr "Όνομα υπολογιστή"
 
 #. Base Directory
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:32
 #, fuzzy
-msgid "lucistatistics_collectd_basedir"
+msgid "Base Directory"
 msgstr "Κατάλογος βάσης"
 
 #. Directory for sub-configurations
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:33
 #, fuzzy
-msgid "lucistatistics_collectd_include"
+msgid "Directory for sub-configurations"
 msgstr "Κατάλογος υπο-ρυθμίσεων"
 
 #. Directory for collectd plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:34
-msgid "lucistatistics_collectd_plugindir"
+msgid "Directory for collectd plugins"
 msgstr "Κατάλογος για πρόσθετα collectd"
 
 #. Used PID file
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:35
-msgid "lucistatistics_collectd_pidfile"
+msgid "Used PID file"
 msgstr "Αρχείο PID σε χρήση"
 
 #. Datasets definition file
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:36
-msgid "lucistatistics_collectd_typesdb"
+msgid "Datasets definition file"
 msgstr "Αρχείο ορισμού συνόλων δεδομένων"
 
 #. Data collection interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:37
-msgid "lucistatistics_collectd_interval"
+msgid "Data collection interval"
 msgstr "Περίοδος συλλογής δεδομένων"
 
 #. Seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:38
-msgid "lucistatistics_collectd_interval_desc"
+msgid "Seconds"
 msgstr "Δευτερόλεπτα"
 
 #. Number of threads for data collection
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:39
-msgid "lucistatistics_collectd_readthreads"
+msgid "Number of threads for data collection"
 msgstr "Αριθμός νημάτων για τη συλλογή δεδομένων"
 
 #. Try to lookup fully qualified hostname
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:40
-msgid "lucistatistics_collectd_fqdnlookup"
+msgid "Try to lookup fully qualified hostname"
 msgstr ""
 
 #. CPU Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:41
-msgid "lucistatistics_collectdcpu"
+msgid "CPU Plugin Configuration"
 msgstr ""
 
 #. The cpu plugin collects basic statistics about the processor usage.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:42
-msgid "lucistatistics_collectdcpu_desc"
+msgid "The cpu plugin collects basic statistics about the processor usage."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:43
-msgid "lucistatistics_collectdcpu_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. CSV Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:44
-msgid "lucistatistics_collectdcsv"
+msgid "CSV Plugin Configuration"
 msgstr ""
 
 #. The csv plugin stores collected data in csv file format for further processing by external programs.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:45
-msgid "lucistatistics_collectdcsv_desc"
+msgid "The csv plugin stores collected data in csv file format for further processing by external programs."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:46
-msgid "lucistatistics_collectdcsv_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Storage directory for the csv files
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:47
-msgid "lucistatistics_collectdcsv_datadir"
+msgid "Storage directory for the csv files"
 msgstr ""
 
 #. Store data values as rates instead of absolute values
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:48
-msgid "lucistatistics_collectdcsv_storerates"
+msgid "Store data values as rates instead of absolute values"
 msgstr ""
 
 #. DF Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:49
-msgid "lucistatistics_collectddf"
+msgid "DF Plugin Configuration"
 msgstr ""
 
 #. The df plugin collects statistics about the disk space usage on different devices, mount points or filesystem types.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:50
-msgid "lucistatistics_collectddf_desc"
+msgid "The df plugin collects statistics about the disk space usage on different devices, mount points or filesystem types."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:51
-msgid "lucistatistics_collectddf_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Monitor devices
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:52
-msgid "lucistatistics_collectddf_devices"
+msgid "Monitor devices"
 msgstr ""
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:53
-msgid "lucistatistics_collectddf_devices_desc"
+msgid "multiple separated by space"
 msgstr ""
 
 #. Monitor mount points
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:54
-msgid "lucistatistics_collectddf_mountpoints"
+msgid "Monitor mount points"
 msgstr ""
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:55
-msgid "lucistatistics_collectddf_mountpoints_desc"
+msgid "multiple separated by space"
 msgstr ""
 
 #. Monitor filesystem types
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:56
-msgid "lucistatistics_collectddf_fstypes"
+msgid "Monitor filesystem types"
 msgstr ""
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:57
-msgid "lucistatistics_collectddf_fstypes_desc"
+msgid "multiple separated by space"
 msgstr ""
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:58
-msgid "lucistatistics_collectddf_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr ""
 
 #. Disk Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:59
-msgid "lucistatistics_collectddisk"
+msgid "Disk Plugin Configuration"
 msgstr ""
 
 #. The disk plugin collects detailled usage statistics for selected partitions or whole disks.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:60
-msgid "lucistatistics_collectddisk_desc"
+msgid "The disk plugin collects detailled usage statistics for selected partitions or whole disks."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:61
-msgid "lucistatistics_collectddisk_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Monitor disks and partitions
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:62
-msgid "lucistatistics_collectddisk_disks"
+msgid "Monitor disks and partitions"
 msgstr ""
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:63
-msgid "lucistatistics_collectddisk_disks_desc"
+msgid "multiple separated by space"
 msgstr ""
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:64
-msgid "lucistatistics_collectddisk_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr ""
 
 #. DNS Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:65
-msgid "lucistatistics_collectddns"
+msgid "DNS Plugin Configuration"
 msgstr ""
 
 #. The dns plugin collects detailled statistics about dns related traffic on selected interfaces.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:66
-msgid "lucistatistics_collectddns_desc"
+msgid "The dns plugin collects detailled statistics about dns related traffic on selected interfaces."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:67
-msgid "lucistatistics_collectddns_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Monitor interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:68
-msgid "lucistatistics_collectddns_interfaces"
+msgid "Monitor interfaces"
 msgstr ""
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:69
-msgid "lucistatistics_collectddns_interfaces_desc"
+msgid "multiple separated by space"
 msgstr ""
 
 #. Ignore source addresses
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:70
-msgid "lucistatistics_collectddns_ignoresources"
+msgid "Ignore source addresses"
 msgstr ""
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:71
-msgid "lucistatistics_collectddns_ignoresources_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr ""
 
 #. E-Mail Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:72
-msgid "lucistatistics_collectdemail"
+msgid "E-Mail Plugin Configuration"
 msgstr ""
 
 #. The email plugin creates a unix socket which can be used to transmit email-statistics to a running collectd daemon. This plugin is primarily intended to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can be used in other ways as well.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:73
-msgid "lucistatistics_collectdemail_desc"
+msgid "The email plugin creates a unix socket which can be used to transmit email-statistics to a running collectd daemon. This plugin is primarily intended to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can be used in other ways as well."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:74
-msgid "lucistatistics_collectdemail_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Filepath of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:75
-msgid "lucistatistics_collectdemail_socketfile"
+msgid "Filepath of the unix socket"
 msgstr ""
 
 #. Group ownership of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:76
-msgid "lucistatistics_collectdemail_socketgroup"
+msgid "Group ownership of the unix socket"
 msgstr ""
 
 #. group name
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:77
-msgid "lucistatistics_collectdemail_socketgroup_desc"
+msgid "group name"
 msgstr ""
 
 #. File permissions of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:78
-msgid "lucistatistics_collectdemail_socketperms"
+msgid "File permissions of the unix socket"
 msgstr ""
 
 #. octal
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:79
-msgid "lucistatistics_collectdemail_socketperms_desc"
+msgid "octal"
 msgstr ""
 
 #. Maximum allowed connections
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:80
-msgid "lucistatistics_collectdemail_maxconns"
+msgid "Maximum allowed connections"
 msgstr ""
 
 #. Exec Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:81
-msgid "lucistatistics_collectdexec"
+msgid "Exec Plugin Configuration"
 msgstr ""
 
 #. The exec plugin starts external commands to read values from or to notify external processes when certain threshold values have been reached.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:82
-msgid "lucistatistics_collectdexec_desc"
+msgid "The exec plugin starts external commands to read values from or to notify external processes when certain threshold values have been reached."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:83
-msgid "lucistatistics_collectdexec_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Add command for reading values
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:84
-msgid "lucistatistics_collectdexecinput"
+msgid "Add command for reading values"
 msgstr ""
 
 #. Here you can define external commands which will be started by collectd in order to read certain values. The values will be read from stdout.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:85
-msgid "lucistatistics_collectdexecinput_desc"
+msgid "Here you can define external commands which will be started by collectd in order to read certain values. The values will be read from stdout."
 msgstr ""
 
 #. Commandline
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:86
-msgid "lucistatistics_collectdexecinput_cmdline"
+msgid "Commandline"
 msgstr ""
 
 #. Run as user
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:87
-msgid "lucistatistics_collectdexecinput_cmduser"
+msgid "Run as user"
 msgstr ""
 
 #. Run as group
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:88
-msgid "lucistatistics_collectdexecinput_cmdgroup"
+msgid "Run as group"
 msgstr ""
 
 #. Add notification command
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:89
-msgid "lucistatistics_collectdexecnotify"
+msgid "Add notification command"
 msgstr ""
 
 #. Here you can define external commands which will be started by collectd when certain threshold values have been reached. The values leading to invokation will be feeded to the the called programs stdin.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:90
-msgid "lucistatistics_collectdexecnotify_desc"
+msgid "Here you can define external commands which will be started by collectd when certain threshold values have been reached. The values leading to invokation will be feeded to the the called programs stdin."
 msgstr ""
 
 #. Commandline
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:91
-msgid "lucistatistics_collectdexecnotify_cmdline"
+msgid "Commandline"
 msgstr ""
 
 #. Run as user
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:92
-msgid "lucistatistics_collectdexecnotify_cmduser"
+msgid "Run as user"
 msgstr ""
 
 #. Run as group
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:93
-msgid "lucistatistics_collectdexecnotify_cmdgroup"
+msgid "Run as group"
 msgstr ""
 
 #. Interface Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:94
-msgid "lucistatistics_collectdinterface"
+msgid "Interface Plugin Configuration"
 msgstr ""
 
 #. The interface plugin collects traffic statistics on selected interfaces.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:95
-msgid "lucistatistics_collectdinterface_desc"
+msgid "The interface plugin collects traffic statistics on selected interfaces."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:96
-msgid "lucistatistics_collectdinterface_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Monitor interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:97
-msgid "lucistatistics_collectdinterface_interfaces"
+msgid "Monitor interfaces"
 msgstr ""
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:98
-msgid "lucistatistics_collectdinterface_interfaces_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr ""
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:99
-msgid "lucistatistics_collectdinterface_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr ""
 
 #. Iptables Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:100
-msgid "lucistatistics_collectdiptables"
+msgid "Iptables Plugin Configuration"
 msgstr ""
 
 #. The iptables plugin will monitor selected firewall rules and collect informations about processed bytes and packets per rule.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:101
-msgid "lucistatistics_collectdiptables_desc"
+msgid "The iptables plugin will monitor selected firewall rules and collect informations about processed bytes and packets per rule."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:102
-msgid "lucistatistics_collectdiptables_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Add matching rule
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:103
-msgid "lucistatistics_collectdiptablesmatch"
+msgid "Add matching rule"
 msgstr ""
 
 #. Here you can define various criteria by which the monitored iptables rules are selected.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:104
-msgid "lucistatistics_collectdiptablesmatch_desc"
+msgid "Here you can define various criteria by which the monitored iptables rules are selected."
 msgstr ""
 
 #. Name of the rule
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:105
-msgid "lucistatistics_collectdiptablesmatch_name"
+msgid "Name of the rule"
 msgstr ""
 
 #. max. 16 chars
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:106
-msgid "lucistatistics_collectdiptablesmatch_name_desc"
+msgid "max. 16 chars"
 msgstr ""
 
 #. Table
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:107
-msgid "lucistatistics_collectdiptablesmatch_table"
+msgid "Table"
 msgstr ""
 
 #. Chain
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:108
-msgid "lucistatistics_collectdiptablesmatch_chain"
+msgid "Chain"
 msgstr ""
 
 #. Action (target)
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:109
-msgid "lucistatistics_collectdiptablesmatch_target"
+msgid "Action (target)"
 msgstr ""
 
 #. Network protocol
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:110
-msgid "lucistatistics_collectdiptablesmatch_protocol"
+msgid "Network protocol"
 msgstr ""
 
 #. Source ip range
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:111
-msgid "lucistatistics_collectdiptablesmatch_source"
+msgid "Source ip range"
 msgstr ""
 
 #. CIDR notation
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:112
-msgid "lucistatistics_collectdiptablesmatch_source_desc"
+msgid "CIDR notation"
 msgstr ""
 
 #. Destination ip range
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:113
-msgid "lucistatistics_collectdiptablesmatch_destination"
+msgid "Destination ip range"
 msgstr ""
 
 #. CIDR notation
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:114
-msgid "lucistatistics_collectdiptablesmatch_destination_desc"
+msgid "CIDR notation"
 msgstr ""
 
 #. Incoming interface
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:115
-msgid "lucistatistics_collectdiptablesmatch_inputif"
+msgid "Incoming interface"
 msgstr ""
 
 #. e.g. br-lan
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:116
-msgid "lucistatistics_collectdiptablesmatch_inputif_desc"
+msgid "e.g. br-lan"
 msgstr ""
 
 #. Outgoing interface
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:117
-msgid "lucistatistics_collectdiptablesmatch_outputif"
+msgid "Outgoing interface"
 msgstr ""
 
 #. e.g. br-ff
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:118
-msgid "lucistatistics_collectdiptablesmatch_outputif_desc"
+msgid "e.g. br-ff"
 msgstr ""
 
 #. Options
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:119
-msgid "lucistatistics_collectdiptablesmatch_options"
+msgid "Options"
 msgstr ""
 
 #. e.g. reject-with tcp-reset
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:120
-msgid "lucistatistics_collectdiptablesmatch_options_desc"
+msgid "e.g. reject-with tcp-reset"
 msgstr ""
 
 #. IRQ Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:121
-msgid "lucistatistics_collectdirq"
+msgid "IRQ Plugin Configuration"
 msgstr ""
 
 #. The irq plugin will monitor the rate of issues per second for each selected interrupt. If no interrupt is selected then all interrupts are monitored.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:122
-msgid "lucistatistics_collectdirq_desc"
+msgid "The irq plugin will monitor the rate of issues per second for each selected interrupt. If no interrupt is selected then all interrupts are monitored."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:123
-msgid "lucistatistics_collectdirq_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Monitor interrupts
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:124
-msgid "lucistatistics_collectdirq_irqs"
+msgid "Monitor interrupts"
 msgstr ""
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:125
-msgid "lucistatistics_collectdirq_irqs_desc"
+msgid "multiple separated by space"
 msgstr ""
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:126
-msgid "lucistatistics_collectdirq_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr ""
 
 #. Load Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:127
-msgid "lucistatistics_collectdload"
+msgid "Load Plugin Configuration"
 msgstr ""
 
 #. The load plugin collects statistics about the general system load.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:128
-msgid "lucistatistics_collectdload_desc"
+msgid "The load plugin collects statistics about the general system load."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:129
-msgid "lucistatistics_collectdload_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Netlink Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:130
-msgid "lucistatistics_collectdnetlink"
+msgid "Netlink Plugin Configuration"
 msgstr ""
 
 #. The netlink plugin collects extended informations like qdisc-, class- and filter-statistics for selected interfaces.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:131
-msgid "lucistatistics_collectdnetlink_desc"
+msgid "The netlink plugin collects extended informations like qdisc-, class- and filter-statistics for selected interfaces."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:132
-msgid "lucistatistics_collectdnetlink_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Basic monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:133
-msgid "lucistatistics_collectdnetlink_interfaces"
+msgid "Basic monitoring"
 msgstr ""
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:134
-msgid "lucistatistics_collectdnetlink_interfaces_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr ""
 
 #. Verbose monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:135
-msgid "lucistatistics_collectdnetlink_verboseinterfaces"
+msgid "Verbose monitoring"
 msgstr ""
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:136
-msgid "lucistatistics_collectdnetlink_verboseinterfaces_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr ""
 
 #. Qdisc monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:137
-msgid "lucistatistics_collectdnetlink_qdiscs"
+msgid "Qdisc monitoring"
 msgstr ""
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:138
-msgid "lucistatistics_collectdnetlink_qdiscs_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr ""
 
 #. Shaping class monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:139
-msgid "lucistatistics_collectdnetlink_classes"
+msgid "Shaping class monitoring"
 msgstr ""
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:140
-msgid "lucistatistics_collectdnetlink_classes_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr ""
 
 #. Filter class monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:141
-msgid "lucistatistics_collectdnetlink_filters"
+msgid "Filter class monitoring"
 msgstr ""
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:142
-msgid "lucistatistics_collectdnetlink_filters_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr ""
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:143
-msgid "lucistatistics_collectdnetlink_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr ""
 
 #. Network Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:144
-msgid "lucistatistics_collectdnetwork"
+msgid "Network Plugin Configuration"
 msgstr ""
 
 #. The network plugin provides network based communication between different collectd instances. Collectd can operate both in client and server mode. In client mode locally collected date is transferred to a collectd server instance, in server mode the local instance receives data from other hosts.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:145
-msgid "lucistatistics_collectdnetwork_desc"
+msgid "The network plugin provides network based communication between different collectd instances. Collectd can operate both in client and server mode. In client mode locally collected date is transferred to a collectd server instance, in server mode the local instance receives data from other hosts."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:146
-msgid "lucistatistics_collectdnetwork_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Listener interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:147
-msgid "lucistatistics_collectdnetworklisten"
+msgid "Listener interfaces"
 msgstr ""
 
 #. This section defines on which interfaces collectd will wait for incoming connections.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:148
-msgid "lucistatistics_collectdnetworklisten_desc"
+msgid "This section defines on which interfaces collectd will wait for incoming connections."
 msgstr ""
 
 #. Listen host
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:149
-msgid "lucistatistics_collectdnetworklisten_host"
+msgid "Listen host"
 msgstr ""
 
 #. host-, ip- or ip6 address
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:150
-msgid "lucistatistics_collectdnetworklisten_host_desc"
+msgid "host-, ip- or ip6 address"
 msgstr ""
 
 #. Listen port
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:151
-msgid "lucistatistics_collectdnetworklisten_port"
+msgid "Listen port"
 msgstr ""
 
 #. 0 - 65535
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:152
-msgid "lucistatistics_collectdnetworklisten_port_desc"
+msgid "0 - 65535"
 msgstr ""
 
 #. server interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:153
-msgid "lucistatistics_collectdnetworkserver"
+msgid "server interfaces"
 msgstr ""
 
 #. This section defines to which servers the locally collected data is sent to.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:154
-msgid "lucistatistics_collectdnetworkserver_desc"
+msgid "This section defines to which servers the locally collected data is sent to."
 msgstr ""
 
 #. Server host
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:155
-msgid "lucistatistics_collectdnetworkserver_host"
+msgid "Server host"
 msgstr ""
 
 #. host-, ip- or ip6 address
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:156
-msgid "lucistatistics_collectdnetworkserver_host_desc"
+msgid "host-, ip- or ip6 address"
 msgstr ""
 
 #. Server port
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:157
-msgid "lucistatistics_collectdnetworkserver_port"
+msgid "Server port"
 msgstr ""
 
 #. 0 - 65535
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:158
-msgid "lucistatistics_collectdnetworkserver_port_desc"
+msgid "0 - 65535"
 msgstr ""
 
 #. TTL for network packets
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:159
-msgid "lucistatistics_collectdnetwork_timetolive"
+msgid "TTL for network packets"
 msgstr ""
 
 #. 0 - 255
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:160
-msgid "lucistatistics_collectdnetwork_timetolive_desc"
+msgid "0 - 255"
 msgstr ""
 
 #. Forwarding between listen and server addresses
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:161
-msgid "lucistatistics_collectdnetwork_forward"
+msgid "Forwarding between listen and server addresses"
 msgstr ""
 
 #. Cache flush interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:162
-msgid "lucistatistics_collectdnetwork_cacheflush"
+msgid "Cache flush interval"
 msgstr ""
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:163
-msgid "lucistatistics_collectdnetwork_cacheflush_desc"
+msgid "seconds"
 msgstr ""
 
 #. Ping Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:164
-msgid "lucistatistics_collectdping"
+msgid "Ping Plugin Configuration"
 msgstr ""
 
 #. The ping plugin will send icmp echo replies to selected hosts and measure the roundtrip time for each host.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:165
-msgid "lucistatistics_collectdping_desc"
+msgid "The ping plugin will send icmp echo replies to selected hosts and measure the roundtrip time for each host."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:166
-msgid "lucistatistics_collectdping_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Monitor hosts
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:167
-msgid "lucistatistics_collectdping_hosts"
+msgid "Monitor hosts"
 msgstr ""
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:168
-msgid "lucistatistics_collectdping_hosts_desc"
+msgid "multiple separated by space"
 msgstr ""
 
 #. TTL for ping packets
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:169
-msgid "lucistatistics_collectdping_ttl"
+msgid "TTL for ping packets"
 msgstr ""
 
 #. 0 - 255
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:170
-msgid "lucistatistics_collectdping_ttl_desc"
+msgid "0 - 255"
 msgstr ""
 
 #. Processes Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:171
-msgid "lucistatistics_collectdprocesses"
+msgid "Processes Plugin Configuration"
 msgstr ""
 
 #. The processes plugin collects informations like cpu time, page faults and memory usage of selected processes.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:172
-msgid "lucistatistics_collectdprocesses_desc"
+msgid "The processes plugin collects informations like cpu time, page faults and memory usage of selected processes."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:173
-msgid "lucistatistics_collectdprocesses_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Monitor processes
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:174
-msgid "lucistatistics_collectdprocesses_processes"
+msgid "Monitor processes"
 msgstr ""
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:175
-msgid "lucistatistics_collectdprocesses_processes_desc"
+msgid "multiple separated by space"
 msgstr ""
 
 #. RRDTool Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:176
-msgid "lucistatistics_collectdrrdtool"
+msgid "RRDTool Plugin Configuration"
 msgstr ""
 
 #. The rrdtool plugin stores the collected data in rrd database files, the foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong values will result in a very high memory consumption in the temporary directory. This can render the device unusable!</strong>
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:177
-msgid "lucistatistics_collectdrrdtool_desc"
+msgid "The rrdtool plugin stores the collected data in rrd database files, the foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong values will result in a very high memory consumption in the temporary directory. This can render the device unusable!</strong>"
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:178
-msgid "lucistatistics_collectdrrdtool_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Storage directory
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:179
-msgid "lucistatistics_collectdrrdtool_datadir"
+msgid "Storage directory"
 msgstr ""
 
 #. RRD step interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:180
-msgid "lucistatistics_collectdrrdtool_stepsize"
+msgid "RRD step interval"
 msgstr ""
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:181
-msgid "lucistatistics_collectdrrdtool_stepsize_desc"
+msgid "seconds"
 msgstr ""
 
 #. RRD heart beat interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:182
-msgid "lucistatistics_collectdrrdtool_heartbeat"
+msgid "RRD heart beat interval"
 msgstr ""
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:183
-msgid "lucistatistics_collectdrrdtool_heartbeat_desc"
+msgid "seconds"
 msgstr ""
 
 #. Only create average RRAs
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:184
-msgid "lucistatistics_collectdrrdtool_rrasingle"
+msgid "Only create average RRAs"
 msgstr ""
 
 #. reduces rrd size
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:185
-msgid "lucistatistics_collectdrrdtool_rrasingle_desc"
+msgid "reduces rrd size"
 msgstr ""
 
 #. Stored timespans
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:186
-msgid "lucistatistics_collectdrrdtool_rratimespans"
+msgid "Stored timespans"
 msgstr ""
 
 #. seconds; multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:187
-msgid "lucistatistics_collectdrrdtool_rratimespans_desc"
+msgid "seconds; multiple separated by space"
 msgstr ""
 
 #. Rows per RRA
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:188
-msgid "lucistatistics_collectdrrdtool_rrarows"
+msgid "Rows per RRA"
 msgstr ""
 
 #. RRD XFiles Factor
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:189
-msgid "lucistatistics_collectdrrdtool_xff"
+msgid "RRD XFiles Factor"
 msgstr ""
 
 #. Cache collected data for
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:190
-msgid "lucistatistics_collectdrrdtool_cachetimeout"
+msgid "Cache collected data for"
 msgstr ""
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:191
-msgid "lucistatistics_collectdrrdtool_cachetimeout_desc"
+msgid "seconds"
 msgstr ""
 
 #. Flush cache after
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:192
-msgid "lucistatistics_collectdrrdtool_cacheflush"
+msgid "Flush cache after"
 msgstr ""
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:193
-msgid "lucistatistics_collectdrrdtool_cacheflush_desc"
+msgid "seconds"
 msgstr ""
 
 #. TCPConns Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:194
-msgid "lucistatistics_collectdtcpconns"
+msgid "TCPConns Plugin Configuration"
 msgstr ""
 
 #. The tcpconns plugin collects informations about open tcp connections on selected ports.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:195
-msgid "lucistatistics_collectdtcpconns_desc"
+msgid "The tcpconns plugin collects informations about open tcp connections on selected ports."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:196
-msgid "lucistatistics_collectdtcpconns_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Monitor all local listen ports
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:197
-msgid "lucistatistics_collectdtcpconns_listeningports"
+msgid "Monitor all local listen ports"
 msgstr ""
 
 #. Monitor local ports
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:198
-msgid "lucistatistics_collectdtcpconns_localports"
+msgid "Monitor local ports"
 msgstr ""
 
 #. 0 - 65535; multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:199
-msgid "lucistatistics_collectdtcpconns_localports_desc"
+msgid "0 - 65535; multiple separated by space"
 msgstr ""
 
 #. Monitor remote ports
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:200
-msgid "lucistatistics_collectdtcpconns_remoteports"
+msgid "Monitor remote ports"
 msgstr ""
 
 #. 0 - 65535; multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:201
-msgid "lucistatistics_collectdtcpconns_remoteports_desc"
+msgid "0 - 65535; multiple separated by space"
 msgstr ""
 
 #. Unixsock Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:202
-msgid "lucistatistics_collectdunixsock"
+msgid "Unixsock Plugin Configuration"
 msgstr ""
 
 #. The unixsock plugin creates a unix socket which can be used to read collected data from a running collectd instance.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:203
-msgid "lucistatistics_collectdunixsock_desc"
+msgid "The unixsock plugin creates a unix socket which can be used to read collected data from a running collectd instance."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:204
-msgid "lucistatistics_collectdunixsock_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Filepath of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:205
-msgid "lucistatistics_collectdunixsock_socketfile"
+msgid "Filepath of the unix socket"
 msgstr ""
 
 #. Group ownership of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:206
-msgid "lucistatistics_collectdunixsock_socketgroup"
+msgid "Group ownership of the unix socket"
 msgstr ""
 
 #. group name
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:207
-msgid "lucistatistics_collectdunixsock_socketgroup_desc"
+msgid "group name"
 msgstr ""
 
 #. File permissions of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:208
-msgid "lucistatistics_collectdunixsock_socketperms"
+msgid "File permissions of the unix socket"
 msgstr ""
 
 #. octal
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:209
-msgid "lucistatistics_collectdunixsock_socketperms_desc"
+msgid "octal"
 msgstr ""
 
 #. Wireless Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:210
-msgid "lucistatistics_collectdwireless"
+msgid "Wireless Plugin Configuration"
 msgstr ""
 
 #. The wireless plugin collects statistics about wireless signal strength, noise and quality.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:211
-msgid "lucistatistics_collectdwireless_desc"
+msgid "The wireless plugin collects statistics about wireless signal strength, noise and quality."
 msgstr ""
 
 #. Enable this plugin
diff --git a/po/el/sysauth.po b/po/el/sysauth.po
index 9ad3cb02f..67c09da4d 100644
--- a/po/el/sysauth.po
+++ b/po/el/sysauth.po
@@ -14,12 +14,12 @@ msgstr ""
 
 #. Authorization Required
 #: i18n/english/luasrc/i18n/sysauth.en.lua:1
-msgid "sysauth_head"
+msgid "Authorization Required"
 msgstr "Απαιτείται Εξουσιοδότηση"
 
 #. Please enter your username and password.
 #: i18n/english/luasrc/i18n/sysauth.en.lua:2
-msgid "sysauth_prompt"
+msgid "Please enter your username and password."
 msgstr "Παρακαλώ εισάγετε όνομα χρήστη και κωδικό πρόσβασης."
 
 #. Invalid username and/or password! Please try again.
diff --git a/po/el/tinyproxy.po b/po/el/tinyproxy.po
index e57a0f00d..f964e0c1e 100644
--- a/po/el/tinyproxy.po
+++ b/po/el/tinyproxy.po
@@ -14,157 +14,157 @@ msgstr ""
 
 #. Tinyproxy
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:1
-msgid "tinyproxy"
+msgid "Tinyproxy"
 msgstr ""
 
 #. Tinyproxy is a small and fast non-caching HTTP(S)-Proxy
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:2
-msgid "tinyproxy_desc"
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
 msgstr ""
 
 #. Allow access from
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:3
-msgid "tinyproxy_tinyproxy_allow"
+msgid "Allow access from"
 msgstr ""
 
 #. Allowed headers for anonymous proxy
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:4
-msgid "tinyproxy_tinyproxy_anonymous"
+msgid "Allowed headers for anonymous proxy"
 msgstr ""
 
 #. Bind outgoing traffic to address
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:5
-msgid "tinyproxy_tinyproxy_bind"
+msgid "Bind outgoing traffic to address"
 msgstr ""
 
 #. Ports allowed for CONNECT method
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:6
-msgid "tinyproxy_tinyproxy_connectport"
+msgid "Ports allowed for CONNECT method"
 msgstr ""
 
 #. 0 = disabled, empty = all
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:7
-msgid "tinyproxy_tinyproxy_connectport_desc"
+msgid "0 = disabled, empty = all"
 msgstr ""
 
 #. Error document
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:8
-msgid "tinyproxy_tinyproxy_defaulterrorfile"
+msgid "Error document"
 msgstr ""
 
 #. Filter list
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:9
-msgid "tinyproxy_tinyproxy_filter"
+msgid "Filter list"
 msgstr ""
 
 #. Case sensitive filters
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:10
-msgid "tinyproxy_tinyproxy_filtercasesensitive"
+msgid "Case sensitive filters"
 msgstr ""
 
 #. Filter list is a whitelist
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:11
-msgid "tinyproxy_tinyproxy_filterdefaultdeny"
+msgid "Filter list is a whitelist"
 msgstr ""
 
 #. Extended regular expression filters
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:12
-msgid "tinyproxy_tinyproxy_filterextended"
+msgid "Extended regular expression filters"
 msgstr ""
 
 #. Filter URLs instead of domains
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:13
-msgid "tinyproxy_tinyproxy_filterurls"
+msgid "Filter URLs instead of domains"
 msgstr ""
 
 #. Listen on address
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:14
-msgid "tinyproxy_tinyproxy_listen"
+msgid "Listen on address"
 msgstr ""
 
 #. Logfile
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:15
-msgid "tinyproxy_tinyproxy_logfile"
+msgid "Logfile"
 msgstr ""
 
 #. Log level
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:16
-msgid "tinyproxy_tinyproxy_loglevel"
+msgid "Log level"
 msgstr ""
 
 #. Maximum number of clients
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:17
-msgid "tinyproxy_tinyproxy_maxclients"
+msgid "Maximum number of clients"
 msgstr ""
 
 #. Maximum requests per thread
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:18
-msgid "tinyproxy_tinyproxy_maxrequestsperchild"
+msgid "Maximum requests per thread"
 msgstr ""
 
 #. Max. spare servers
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:19
-msgid "tinyproxy_tinyproxy_maxspareservers"
+msgid "Max. spare servers"
 msgstr ""
 
 #. Min. spare servers
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:20
-msgid "tinyproxy_tinyproxy_minspareservers"
+msgid "Min. spare servers"
 msgstr ""
 
 #. Spare servers to start with
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:21
-msgid "tinyproxy_tinyproxy_startservers"
+msgid "Spare servers to start with"
 msgstr ""
 
 #. Statistic document
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:22
-msgid "tinyproxy_tinyproxy_statfile"
+msgid "Statistic document"
 msgstr ""
 
 #. Write to syslog
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:23
-msgid "tinyproxy_tinyproxy_syslog"
+msgid "Write to syslog"
 msgstr ""
 
 #. Connection Timeout
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:24
-msgid "tinyproxy_tinyproxy_timeout"
+msgid "Connection Timeout"
 msgstr ""
 
 #. Value of Via-Header
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:25
-msgid "tinyproxy_tinyproxy_viaproxyname"
+msgid "Value of Via-Header"
 msgstr ""
 
 #. Include client IP
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:26
-msgid "tinyproxy_tinyproxy_xtinyproxy"
+msgid "Include client IP"
 msgstr ""
 
 #. Via proxy
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:27
-msgid "tinyproxy_type_proxy"
+msgid "Via proxy"
 msgstr ""
 
 #. Reject access
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:28
-msgid "tinyproxy_type_reject"
+msgid "Reject access"
 msgstr ""
 
 #. Upstream Control
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:29
-msgid "tinyproxy_upstream"
+msgid "Upstream Control"
 msgstr ""
 
 #. Target host
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:30
-msgid "tinyproxy_upstream_target"
+msgid "Target host"
 msgstr ""
 
 #. Type
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:31
-msgid "tinyproxy_upstream_type"
+msgid "Type"
 msgstr ""
 
 #. Upstream Proxy
diff --git a/po/el/upnp.po b/po/el/upnp.po
index ad22d64a4..e6ce63866 100644
--- a/po/el/upnp.po
+++ b/po/el/upnp.po
@@ -14,32 +14,32 @@ msgstr ""
 
 #. Universal Plug &amp; Play
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:1
-msgid "upnpd"
+msgid "Universal Plug & Play"
 msgstr ""
 
 #. UPNP allows clients in the local network to automatically configure the router.
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:2
-msgid "upnpd_desc"
+msgid "UPNP allows clients in the local network to automatically configure the router."
 msgstr ""
 
 #. UPNP should only be enabled if absolutely necessary as it can result in high security risks for your network.
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:3
-msgid "upnpd_config_desc"
+msgid "UPNP should only be enabled if absolutely necessary as it can result in high security risks for your network."
 msgstr ""
 
 #. Enable secure mode
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:4
-msgid "upnpd_config_securemode"
+msgid "Enable secure mode"
 msgstr ""
 
 #. Log output
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:5
-msgid "upnpd_config_logoutput"
+msgid "Log output"
 msgstr ""
 
 #. Downlink
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:6
-msgid "upnpd_config_download"
+msgid "Downlink"
 msgstr ""
 
 #. Uplink
diff --git a/po/el/ushare.po b/po/el/ushare.po
index 2e0ffe538..197feca41 100644
--- a/po/el/ushare.po
+++ b/po/el/ushare.po
@@ -14,37 +14,37 @@ msgstr ""
 
 #. Content directories
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:1
-msgid "content_directories"
+msgid "Content directories"
 msgstr ""
 
 #. Disable telnet console
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:2
-msgid "disable_telnet"
+msgid "Disable telnet console"
 msgstr ""
 
 #. Disable webinterface
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:3
-msgid "disable_webif"
+msgid "Disable webinterface"
 msgstr ""
 
 #. Options
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:4
-msgid "options"
+msgid "Options"
 msgstr ""
 
 #. Servername
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:5
-msgid "servername"
+msgid "Servername"
 msgstr ""
 
 #. Settings
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:6
-msgid "settings"
+msgid "Settings"
 msgstr ""
 
 #. uShare
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:7
-msgid "ushare"
+msgid "uShare"
 msgstr ""
 
 #. uShare
diff --git a/po/el/uvc_streamer.po b/po/el/uvc_streamer.po
index feffff257..a6f930698 100644
--- a/po/el/uvc_streamer.po
+++ b/po/el/uvc_streamer.po
@@ -14,22 +14,22 @@ msgstr ""
 
 #. Frames per second
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
-msgid "framespersecond"
+msgid "Frames per second"
 msgstr ""
 
 #. Resolution
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
-msgid "resolution"
+msgid "Resolution"
 msgstr ""
 
 #. Settings
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
-msgid "settings"
+msgid "Settings"
 msgstr ""
 
 #. Webcam streaming
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
-msgid "uvc_streamer"
+msgid "Webcam streaming"
 msgstr ""
 
 #. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
diff --git a/po/el/uvl.po b/po/el/uvl.po
index 8fcc5bc0f..57e9686b6 100644
--- a/po/el/uvl.po
+++ b/po/el/uvl.po
@@ -14,192 +14,192 @@ msgstr ""
 
 #. Unable to load config \"%p\": %1
 #: libs/uvl/luasrc/i18n/uvl.en.lua:1
-msgid "uvl_err_uciload"
+msgid "Unable to load config \"%p\": %1"
 msgstr ""
 
 #. Error in scheme \"%p\":\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:2
-msgid "uvl_err_scheme"
+msgid "Error in scheme \"%p\":\\n%c"
 msgstr ""
 
 #. Error in config \"%p\":\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:3
-msgid "uvl_err_config"
+msgid "Error in config \"%p\":\\n%c"
 msgstr ""
 
 #. Error in section \"%i\" (%I):\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:4
-msgid "uvl_err_section"
+msgid "Error in section \"%i\" (%I):\\n%c"
 msgstr ""
 
 #. Error in option \"%i\" (%I):\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:5
-msgid "uvl_err_option"
+msgid "Error in option \"%i\" (%I):\\n%c"
 msgstr ""
 
 #. Option \"%i\" has invalid reference specification %1:\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:6
-msgid "uvl_err_reference"
+msgid "Option \"%i\" has invalid reference specification %1:\\n%c"
 msgstr ""
 
 #. In dependency check for %t \"%i\":\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:7
-msgid "uvl_err_dependency"
+msgid "In dependency check for %t \"%i\":\\n%c"
 msgstr ""
 
 #. Can not find scheme \"%p\" in \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:8
-msgid "uvl_err_sme_find"
+msgid "Can not find scheme \"%p\" in \"%1\""
 msgstr ""
 
 #. Can not access file \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:9
-msgid "uvl_err_sme_read"
+msgid "Can not access file \"%1\""
 msgstr ""
 
 #. Missing required scheme field \"%1\" in \"%i\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:10
-msgid "uvl_err_sme_reqfld"
+msgid "Missing required scheme field \"%1\" in \"%i\""
 msgstr ""
 
 #. Illegal reference \"%1\" to an anonymous section
 #: libs/uvl/luasrc/i18n/uvl.en.lua:11
-msgid "uvl_err_sme_invref"
+msgid "Illegal reference \"%1\" to an anonymous section"
 msgstr ""
 
 #. Malformed reference in \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:12
-msgid "uvl_err_sme_badref"
+msgid "Malformed reference in \"%1\""
 msgstr ""
 
 #. Malformed dependency specification \"%1\" in \"%i\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:13
-msgid "uvl_err_sme_baddep"
+msgid "Malformed dependency specification \"%1\" in \"%i\""
 msgstr ""
 
 #. Malformed validator specification \"%1\" in \"%i\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:14
-msgid "uvl_err_sme_badval"
+msgid "Malformed validator specification \"%1\" in \"%i\""
 msgstr ""
 
 #. External validator \"%1\" failed: %2
 #: libs/uvl/luasrc/i18n/uvl.en.lua:15
-msgid "uvl_err_sme_errval"
+msgid "External validator \"%1\" failed: %2"
 msgstr ""
 
 #. Variable \"%o\" in scheme \"%p\" references unknown package \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:16
-msgid "uvl_err_sme_vbadpack"
+msgid "Variable \"%o\" in scheme \"%p\" references unknown package \"%1\""
 msgstr ""
 
 #. Variable \"%o\" in scheme \"%p\" references unknown section \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:17
-msgid "uvl_err_sme_vbadsect"
+msgid "Variable \"%o\" in scheme \"%p\" references unknown section \"%1\""
 msgstr ""
 
 #. Enum \"%v\" in scheme \"%p\" references unknown package \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:18
-msgid "uvl_err_sme_ebadpack"
+msgid "Enum \"%v\" in scheme \"%p\" references unknown package \"%1\""
 msgstr ""
 
 #. Enum \"%v\" in scheme \"%p\" references unknown section \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:19
-msgid "uvl_err_sme_ebadsect"
+msgid "Enum \"%v\" in scheme \"%p\" references unknown section \"%1\""
 msgstr ""
 
 #. Enum \"%v\" in scheme \"%p\" references unknown option \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:20
-msgid "uvl_err_sme_ebadopt"
+msgid "Enum \"%v\" in scheme \"%p\" references unknown option \"%1\""
 msgstr ""
 
 #. Enum \"%v\" in scheme \"%p\" references non-enum option \"%p.%s.%o\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:21
-msgid "uvl_err_sme_ebadtype"
+msgid "Enum \"%v\" in scheme \"%p\" references non-enum option \"%p.%s.%o\""
 msgstr ""
 
 #. Enum \"%v\" in scheme \"%p\" redeclares the default value of \"%p.%s.%o\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:22
-msgid "uvl_err_sme_ebaddef"
+msgid "Enum \"%v\" in scheme \"%p\" redeclares the default value of \"%p.%s.%o\""
 msgstr ""
 
 #. Section \"%i\" (%I) not found in scheme
 #: libs/uvl/luasrc/i18n/uvl.en.lua:23
-msgid "uvl_err_sect_unknown"
+msgid "Section \"%i\" (%I) not found in scheme"
 msgstr ""
 
 #. Required section \"%p.%s\" not found in config
 #: libs/uvl/luasrc/i18n/uvl.en.lua:24
-msgid "uvl_err_sect_required"
+msgid "Required section \"%p.%s\" not found in config"
 msgstr ""
 
 #. Unique section \"%p.%s\" occurs multiple times in config
 #: libs/uvl/luasrc/i18n/uvl.en.lua:25
-msgid "uvl_err_sect_unique"
+msgid "Unique section \"%p.%s\" occurs multiple times in config"
 msgstr ""
 
 #. The section of type \"%p.%s\" is stored anonymously in config but must be named
 #: libs/uvl/luasrc/i18n/uvl.en.lua:26
-msgid "uvl_err_sect_named"
+msgid "The section of type \"%p.%s\" is stored anonymously in config but must be named"
 msgstr ""
 
 #. Section \"%p.%s\" not found in config
 #: libs/uvl/luasrc/i18n/uvl.en.lua:27
-msgid "uvl_err_sect_notfound"
+msgid "Section \"%p.%s\" not found in config"
 msgstr ""
 
 #. Option \"%i\" (%I) not found in scheme
 #: libs/uvl/luasrc/i18n/uvl.en.lua:28
-msgid "uvl_err_opt_unknown"
+msgid "Option \"%i\" (%I) not found in scheme"
 msgstr ""
 
 #. Required option \"%i\" has no value
 #: libs/uvl/luasrc/i18n/uvl.en.lua:29
-msgid "uvl_err_opt_required"
+msgid "Required option \"%i\" has no value"
 msgstr ""
 
 #. Value \"%1\" of option \"%i\" is not defined in enum %2
 #: libs/uvl/luasrc/i18n/uvl.en.lua:30
-msgid "uvl_err_opt_badvalue"
+msgid "Value \"%1\" of option \"%i\" is not defined in enum %2"
 msgstr ""
 
 #. Value \"%1\" of option \"%i\" does not validate as datatype \"%2\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:31
-msgid "uvl_err_opt_invvalue"
+msgid "Value \"%1\" of option \"%i\" does not validate as datatype \"%2\""
 msgstr ""
 
 #. Option \"%i\" is defined as list but stored as plain value
 #: libs/uvl/luasrc/i18n/uvl.en.lua:32
-msgid "uvl_err_opt_notlist"
+msgid "Option \"%i\" is defined as list but stored as plain value"
 msgstr ""
 
 #. Option \"%i\" has unknown datatype \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:33
-msgid "uvl_err_opt_datatype"
+msgid "Option \"%i\" has unknown datatype \"%1\""
 msgstr ""
 
 #. Option \"%p.%s.%o\" not found in config
 #: libs/uvl/luasrc/i18n/uvl.en.lua:34
-msgid "uvl_err_opt_notfound"
+msgid "Option \"%p.%s.%o\" not found in config"
 msgstr ""
 
 #. Dependency (%1) failed:\noption \"%i\" is not eqal \"%2\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:35
-msgid "uvl_err_dep_notequal"
+msgid "Dependency (%1) failed:\\noption \"%i\" is not eqal \"%2\""
 msgstr ""
 
 #. Dependency (%1) failed:\noption \"%i\" has no value
 #: libs/uvl/luasrc/i18n/uvl.en.lua:36
-msgid "uvl_err_dep_novalue"
+msgid "Dependency (%1) failed:\\noption \"%i\" has no value"
 msgstr ""
 
 #. Dependency (%1) failed:\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:37
-msgid "uvl_err_dep_notvalid"
+msgid "Dependency (%1) failed:\\n%c"
 msgstr ""
 
 #. Recursive dependency for option \"%i\" detected
 #: libs/uvl/luasrc/i18n/uvl.en.lua:38
-msgid "uvl_err_dep_recursive"
+msgid "Recursive dependency for option \"%i\" detected"
 msgstr ""
 
 #. In dependency check for enum value \"%i\":\n%c
diff --git a/po/el/wifi.po b/po/el/wifi.po
index a66a2e90a..b7c71d339 100644
--- a/po/el/wifi.po
+++ b/po/el/wifi.po
@@ -14,192 +14,192 @@ msgstr ""
 
 #. auto
 #: i18n/english/luasrc/i18n/wifi.en.lua:1
-msgid "wifi_auto"
+msgid "auto"
 msgstr "αυτόματα"
 
 #. Frequency Hopping
 #: i18n/english/luasrc/i18n/wifi.en.lua:2
-msgid "wifi_fh"
+msgid "Frequency Hopping"
 msgstr "Frequency Hopping"
 
 #. Diversity
 #: i18n/english/luasrc/i18n/wifi.en.lua:3
-msgid "wifi_diversity"
+msgid "Diversity"
 msgstr "Διαφορική Λήψη"
 
 #. Transmitter Antenna
 #: i18n/english/luasrc/i18n/wifi.en.lua:4
-msgid "wifi_txantenna"
+msgid "Transmitter Antenna"
 msgstr "Κεραία Εκπομπής"
 
 #. Receiver Antenna
 #: i18n/english/luasrc/i18n/wifi.en.lua:5
-msgid "wifi_rxantenna"
+msgid "Receiver Antenna"
 msgstr "Κεραία Λήψης"
 
 #. Distance Optimization
 #: i18n/english/luasrc/i18n/wifi.en.lua:6
-msgid "wifi_distance"
+msgid "Distance Optimization"
 msgstr "Ρύθμιση Απόστασης"
 
 #. Distance to farthest network member in meters.
 #: i18n/english/luasrc/i18n/wifi.en.lua:7
-msgid "wifi_distance_desc"
+msgid "Distance to farthest network member in meters."
 msgstr "Απόσταση σε μέτρα από το πιο απομακρυσμένο μέλος του δικτύου."
 
 #. MAC-Address Filter
 #: i18n/english/luasrc/i18n/wifi.en.lua:8
-msgid "wifi_macpolicy"
+msgid "MAC-Address Filter"
 msgstr "Φίλτρο MAC Διευθύνσεων"
 
 #. Allow listed only
 #: i18n/english/luasrc/i18n/wifi.en.lua:9
-msgid "wifi_whitelist"
+msgid "Allow listed only"
 msgstr "Να επιτρέπονται μόνο αυτές στην λίστα"
 
 #. Allow all except listed
 #: i18n/english/luasrc/i18n/wifi.en.lua:10
-msgid "wifi_blacklist"
+msgid "Allow all except listed"
 msgstr "Να επιτρέπονται όλες, εκτός από αυτές στη λίστα"
 
 #. MAC-List
 #: i18n/english/luasrc/i18n/wifi.en.lua:11
-msgid "wifi_maclist"
+msgid "MAC-List"
 msgstr "Λίστα MAC"
 
 #. Frame Bursting
 #: i18n/english/luasrc/i18n/wifi.en.lua:12
-msgid "wifi_bursting"
+msgid "Frame Bursting"
 msgstr "Bursting Πλαισίων"
 
 #. Regulatory Domain
 #: i18n/english/luasrc/i18n/wifi.en.lua:13
-msgid "wifi_regdomain"
+msgid "Regulatory Domain"
 msgstr "Ρυθμιστική Περιοχή"
 
 #. Country Code
 #: i18n/english/luasrc/i18n/wifi.en.lua:14
-msgid "wifi_country"
+msgid "Country Code"
 msgstr "Κωδικός Χώρας"
 
 #. Outdoor Channels
 #: i18n/english/luasrc/i18n/wifi.en.lua:15
-msgid "wifi_outdoor"
+msgid "Outdoor Channels"
 msgstr "Εξωτερικά Κανάλια"
 
 #. Connection Limit
 #: i18n/english/luasrc/i18n/wifi.en.lua:16
-msgid "wifi_maxassoc"
+msgid "Connection Limit"
 msgstr "Όριο Συνδέσεων"
 
 #. <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:17
-msgid "wifi_essid"
+msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
 #. <abbr title=\"Basic Service Set Identifier\">BSSID</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:18
-msgid "wifi_bssid"
+msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 
 #. Fragmentation Threshold
 #: i18n/english/luasrc/i18n/wifi.en.lua:19
-msgid "wifi_frag"
+msgid "Fragmentation Threshold"
 msgstr "Όριο Κατακερµατισµού"
 
 #. RTS/CTS Threshold
 #: i18n/english/luasrc/i18n/wifi.en.lua:20
-msgid "wifi_rts"
+msgid "RTS/CTS Threshold"
 msgstr "Όριο RTS/CTS"
 
 #. <abbr title=\"Wireless Distribution System\">WDS</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:21
-msgid "wifi_wds"
+msgid "<abbr title=\"Wireless Distribution System\">WDS</abbr>"
 msgstr "<abbr title=\"Wireless Distribution System\">WDS</abbr>"
 
 #. Separate WDS
 #: i18n/english/luasrc/i18n/wifi.en.lua:22
-msgid "wifi_wdssep"
+msgid "Separate WDS"
 msgstr "Ξεχωριστά WDS"
 
 #. Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:23
-msgid "wifi_hidden"
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "Κρυφό <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
 #. Isolate Clients
 #: i18n/english/luasrc/i18n/wifi.en.lua:24
-msgid "wifi_isloate"
+msgid "Isolate Clients"
 msgstr "Απομόνωση Πελατών"
 
 #. Prevent Client to Client Communication
 #: i18n/english/luasrc/i18n/wifi.en.lua:25
-msgid "wifi_isloate_desc"
+msgid "Prevent Client to Client Communication"
 msgstr "Αποτρέπει την Επικοινωνία μεταξύ πελατών"
 
 #. Background Scan
 #: i18n/english/luasrc/i18n/wifi.en.lua:26
-msgid "wifi_bgscan"
+msgid "Background Scan"
 msgstr "Σάρωση Παρασκηνίου"
 
 #. Transmission Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:27
-msgid "wifi_rate"
+msgid "Transmission Rate"
 msgstr "Ρυθμός Εκπομπής"
 
 #. Multicast Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:28
-msgid "wifi_mcast_rate"
+msgid "Multicast Rate"
 msgstr "Ρυθμός Multicast"
 
 #. Minimum Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:29
-msgid "wifi_minrate"
+msgid "Minimum Rate"
 msgstr "Ελάχιστος Ρυθμός"
 
 #. Maximum Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:30
-msgid "wifi_maxrate"
+msgid "Maximum Rate"
 msgstr "Μέγιστος Ρυθμός"
 
 #. Compression
 #: i18n/english/luasrc/i18n/wifi.en.lua:31
-msgid "wifi_compression"
+msgid "Compression"
 msgstr "Συμπίεση"
 
 #. Turbo Mode
 #: i18n/english/luasrc/i18n/wifi.en.lua:32
-msgid "wifi_turbo"
+msgid "Turbo Mode"
 msgstr "Λειτουργία Turbo"
 
 #. Fast Frames
 #: i18n/english/luasrc/i18n/wifi.en.lua:33
-msgid "wifi_ff"
+msgid "Fast Frames"
 msgstr "Γρήγορα Πλαίσια"
 
 #. WMM Mode
 #: i18n/english/luasrc/i18n/wifi.en.lua:34
-msgid "wifi_wmm"
+msgid "WMM Mode"
 msgstr "Υποστήριξη WMM"
 
 #. XR Support
 #: i18n/english/luasrc/i18n/wifi.en.lua:35
-msgid "wifi_xr"
+msgid "XR Support"
 msgstr "Υποστήριξη XR"
 
 #. AR Support
 #: i18n/english/luasrc/i18n/wifi.en.lua:36
-msgid "wifi_ar"
+msgid "AR Support"
 msgstr "Υποστήριξη AR"
 
 #. Disable HW-Beacon timer
 #: i18n/english/luasrc/i18n/wifi.en.lua:37
-msgid "wifi_nosbeacon"
+msgid "Disable HW-Beacon timer"
 msgstr "Απενεργοποίηση χρονιστή HW-Beacon"
 
 #. Do not send probe responses
 #: i18n/english/luasrc/i18n/wifi.en.lua:38
-msgid "wifi_noprobereq"
+msgid "Do not send probe responses"
 msgstr "Να μην στέλνονται απαντήσεις σε probes"
 
 #. WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP and ad-hoc mode) to be installed.
diff --git a/po/en/admin-core.po b/po/en/admin-core.po
index 3e51e718b..2d4e5c91f 100644
--- a/po/en/admin-core.po
+++ b/po/en/admin-core.po
@@ -13,77 +13,87 @@ msgstr ""
 
 #. The following changes have been applied
 #: i18n/english/luasrc/i18n/admin-core.en.lua:1
-msgid "uci_applied"
+msgid "The following changes have been applied"
 msgstr "The following changes have been applied"
 
 #. The following changes have been reverted
 #: i18n/english/luasrc/i18n/admin-core.en.lua:2
-msgid "uci_reverted"
+msgid "The following changes have been reverted"
 msgstr "The following changes have been reverted"
 
 #. User Interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:3
-msgid "a_i_ui"
+msgid "User Interface"
 msgstr "User Interface"
 
 #. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a collection of free Lua software including an <abbr title=\"Model-View-Controller\">MVC</abbr>-Webframework and webinterface for embedded devices. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is licensed under the Apache-License.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:4
-msgid "c_lucidesc"
+msgid ""
+"<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a collection of "
+"free Lua software including an <abbr title=\"Model-View-Controller\">MVC</"
+"abbr>-Webframework and webinterface for embedded devices. <abbr title=\"Lua "
+"Configuration Interface\">LuCI</abbr> is licensed under the Apache-License."
 msgstr ""
 "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a collection of "
-"free Lua software including an <abbr title=\"Model-View-"
-"Controller\">MVC</abbr>-Webframework and webinterface for embedded devices. "
-"<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is licensed under the "
-"Apache-License."
+"free Lua software including an <abbr title=\"Model-View-Controller\">MVC</"
+"abbr>-Webframework and webinterface for embedded devices. <abbr title=\"Lua "
+"Configuration Interface\">LuCI</abbr> is licensed under the Apache-License."
 
 #. Project Homepage
 #: i18n/english/luasrc/i18n/admin-core.en.lua:5
-msgid "c_projecthome"
+msgid "Project Homepage"
 msgstr "Project Homepage"
 
 #. Lead Development
 #: i18n/english/luasrc/i18n/admin-core.en.lua:6
-msgid "c_leaddev"
+msgid "Lead Development"
 msgstr "Lead Development"
 
 #. Contributing Developers
 #: i18n/english/luasrc/i18n/admin-core.en.lua:7
-msgid "c_contributors"
+msgid "Contributing Developers"
 msgstr "Contributing Developers"
 
 #. Thanks To
 #: i18n/english/luasrc/i18n/admin-core.en.lua:8
-msgid "c_thanksto"
+msgid "Thanks To"
 msgstr "Thanks To"
 
 #. Hello!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:9
-msgid "a_i_i_hello"
+msgid "Hello!"
 msgstr "Hello!"
 
 #. This is the administration area of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:10
-msgid "a_i_i_admin1"
+msgid ""
+"This is the administration area of <abbr title=\"Lua Configuration Interface"
+"\">LuCI</abbr>."
 msgstr ""
-"This is the administration area of <abbr title=\"Lua Configuration "
-"Interface\">LuCI</abbr>."
+"This is the administration area of <abbr title=\"Lua Configuration Interface"
+"\">LuCI</abbr>."
 
 #. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a free, flexible, and user friendly graphical interface for configuring OpenWrt Kamikaze.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:11
-msgid "a_i_i_admin2"
+msgid ""
+"<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a free, flexible, "
+"and user friendly graphical interface for configuring OpenWrt Kamikaze."
 msgstr ""
 "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a free, flexible, "
 "and user friendly graphical interface for configuring OpenWrt Kamikaze."
 
 #. On the following pages you can adjust all important settings of your router.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:12
-msgid "a_i_i_admin3"
+msgid ""
+"On the following pages you can adjust all important settings of your router."
 msgstr ""
 "On the following pages you can adjust all important settings of your router."
 
 #. Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> changes have to be confirmed by clicking Changes - Save &amp; Apply before being applied.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:13
-msgid "a_i_i_admin4"
+msgid ""
+"Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> changes "
+"have to be confirmed by clicking Changes - Save & Apply before being applied."
 msgstr ""
 "Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> changes "
 "have to be confirmed by clicking Changes - Save &amp; Apply before being "
@@ -91,879 +101,852 @@ msgstr ""
 
 #. As we always want to improve this interface we are looking forward to your feedback and suggestions.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:14
-msgid "a_i_i_admin5"
+msgid ""
+"As we always want to improve this interface we are looking forward to your "
+"feedback and suggestions."
 msgstr ""
 "As we always want to improve this interface we are looking forward to your "
 "feedback and suggestions."
 
 #. And now have fun with your router!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:15
-msgid "a_i_i_admin6"
+msgid "And now have fun with your router!"
 msgstr "And now have fun with your router!"
 
 #. The <abbr title=\"Lua Configuration Interface\">LuCI</abbr> Team
 #: i18n/english/luasrc/i18n/admin-core.en.lua:16
-msgid "a_i_i_team"
+msgid "The <abbr title=\"Lua Configuration Interface\">LuCI</abbr> Team"
 msgstr "The <abbr title=\"Lua Configuration Interface\">LuCI</abbr> Team"
 
 #. Here you can customize the settings and the functionality of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:17
-msgid "a_i_luci1"
+msgid ""
+"Here you can customize the settings and the functionality of <abbr title="
+"\"Lua Configuration Interface\">LuCI</abbr>."
 msgstr ""
-"Here you can customize the settings and the functionality of <abbr "
-"title=\"Lua Configuration Interface\">LuCI</abbr>."
+"Here you can customize the settings and the functionality of <abbr title="
+"\"Lua Configuration Interface\">LuCI</abbr>."
 
 #. Post-commit actions
 #: i18n/english/luasrc/i18n/admin-core.en.lua:18
-msgid "a_i_ucicommit"
+msgid "Post-commit actions"
 msgstr "Post-commit actions"
 
 #. These commands will be executed automatically when a given <abbr title=\"Unified Configuration Interface\">UCI</abbr> configuration is committed allowing changes to be applied instantly.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:19
-msgid "a_i_ucicommit1"
+msgid ""
+"These commands will be executed automatically when a given <abbr title="
+"\"Unified Configuration Interface\">UCI</abbr> configuration is committed "
+"allowing changes to be applied instantly."
 msgstr ""
-"These commands will be executed automatically when a given <abbr "
-"title=\"Unified Configuration Interface\">UCI</abbr> configuration is "
-"committed allowing changes to be applied instantly."
+"These commands will be executed automatically when a given <abbr title="
+"\"Unified Configuration Interface\">UCI</abbr> configuration is committed "
+"allowing changes to be applied instantly."
 
 #. Files to be kept when flashing a new firmware
 #: i18n/english/luasrc/i18n/admin-core.en.lua:20
-msgid "a_i_keepflash"
+msgid "Files to be kept when flashing a new firmware"
 msgstr "Files to be kept when flashing a new firmware"
 
 #. When flashing a new firmware with <abbr title=\"Lua Configuration Interface\">LuCI</abbr> these files will be added to the new firmware installation.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:21
-msgid "a_i_keepflash1"
+msgid ""
+"When flashing a new firmware with <abbr title=\"Lua Configuration Interface"
+"\">LuCI</abbr> these files will be added to the new firmware installation."
 msgstr ""
-"When flashing a new firmware with <abbr title=\"Lua Configuration "
-"Interface\">LuCI</abbr> these files will be added to the new firmware "
-"installation."
+"When flashing a new firmware with <abbr title=\"Lua Configuration Interface"
+"\">LuCI</abbr> these files will be added to the new firmware installation."
 
 #. Here you can find information about the current system status like <abbr title=\"Central Processing Unit\">CPU</abbr> clock frequency, memory usage or network interface data.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:22
-msgid "a_st_i_status1"
+msgid ""
+"Here you can find information about the current system status like <abbr "
+"title=\"Central Processing Unit\">CPU</abbr> clock frequency, memory usage "
+"or network interface data."
 msgstr ""
 "Here you can find information about the current system status like <abbr "
-"title=\"Central Processing Unit\">CPU</abbr> clock frequency, memory usage or "
-"network interface data."
+"title=\"Central Processing Unit\">CPU</abbr> clock frequency, memory usage "
+"or network interface data."
 
 #. Also kernel or service logfiles can be viewed here to get an overview over their current state.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:23
-msgid "a_st_i_status2"
+msgid ""
+"Also kernel or service logfiles can be viewed here to get an overview over "
+"their current state."
 msgstr ""
 "Also kernel or service logfiles can be viewed here to get an overview over "
 "their current state."
 
 #. <abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan
 #: i18n/english/luasrc/i18n/admin-core.en.lua:24
-msgid "iwscan"
+msgid "<abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan"
 msgstr "<abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan"
 
 #. Wifi networks in your local environment
 #: i18n/english/luasrc/i18n/admin-core.en.lua:25
-msgid "iwscan1"
+msgid "Wifi networks in your local environment"
 msgstr "Wifi networks in your local environment"
 
 #. <abbr title=\"Encrypted\">Encr.</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:26
-msgid "iwscan_encr"
+msgid "<abbr title=\"Encrypted\">Encr.</abbr>"
 msgstr "<abbr title=\"Encrypted\">Encr.</abbr>"
 
-#. Link
-#: i18n/english/luasrc/i18n/admin-core.en.lua:27
-msgid "iwscan_link"
-msgstr "Link"
-
-#. Signal
-#: i18n/english/luasrc/i18n/admin-core.en.lua:28
-msgid "iwscan_signal"
-msgstr "Signal"
-
-#. Noise
-#: i18n/english/luasrc/i18n/admin-core.en.lua:29
-msgid "iwscan_noise"
-msgstr "Noise"
-
-#. Routes
-#: i18n/english/luasrc/i18n/admin-core.en.lua:30
-msgid "routes"
-msgstr "Routes"
-
 #. Netmask
 #: i18n/english/luasrc/i18n/admin-core.en.lua:31
-msgid "routes_netmask"
+msgid "Netmask"
 msgstr "Netmask"
 
 #. Gateway
 #: i18n/english/luasrc/i18n/admin-core.en.lua:32
-msgid "routes_gateway"
+msgid "Gateway"
 msgstr "Gateway"
 
 #. Metric
 #: i18n/english/luasrc/i18n/admin-core.en.lua:33
-msgid "routes_metric"
+msgid "Metric"
 msgstr "Metric"
 
 #. Here you can configure the basic aspects of your device like its hostname or the timezone.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:34
-msgid "a_s_desc"
+msgid ""
+"Here you can configure the basic aspects of your device like its hostname or "
+"the timezone."
 msgstr ""
 "Here you can configure the basic aspects of your device like its hostname or "
 "the timezone."
 
 #. Software
 #: i18n/english/luasrc/i18n/admin-core.en.lua:35
-msgid "a_s_packages"
+msgid "Software"
 msgstr "Software"
 
 #. Admin Password
 #: i18n/english/luasrc/i18n/admin-core.en.lua:36
-msgid "a_s_changepw"
+msgid "Admin Password"
 msgstr "Admin Password"
 
 #. OPKG-Configuration
 #: i18n/english/luasrc/i18n/admin-core.en.lua:37
-msgid "a_s_p_ipkg"
+msgid "OPKG-Configuration"
 msgstr "OPKG-Configuration"
 
 #. <abbr title=\"Secure Shell\">SSH</abbr>-Keys
 #: i18n/english/luasrc/i18n/admin-core.en.lua:38
-msgid "a_s_sshkeys"
+msgid "<abbr title=\"Secure Shell\">SSH</abbr>-Keys"
 msgstr "<abbr title=\"Secure Shell\">SSH</abbr>-Keys"
 
-#. Mount Points
-#: i18n/english/luasrc/i18n/admin-core.en.lua:39
-msgid "a_s_fstab"
-msgstr "Mount Points"
-
 #. Change settings related to the system itself, its identification, installed hard- and software, authentication or mount points.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:40
-msgid "a_s_i_system1"
+msgid ""
+"Change settings related to the system itself, its identification, installed "
+"hard- and software, authentication or mount points."
 msgstr ""
 "Change settings related to the system itself, its identification, installed "
 "hard- and software, authentication or mount points."
 
 #. These settings define the base of your system.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:41
-msgid "a_s_i_system2"
+msgid "These settings define the base of your system."
 msgstr "These settings define the base of your system."
 
 #. Pay attention as any misconfiguration here may prevent your device from booting or may lock yourself out of it.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:42
-msgid "a_s_i_system3"
+msgid ""
+"Pay attention as any misconfiguration here may prevent your device from "
+"booting or may lock yourself out of it."
 msgstr ""
 "Pay attention as any misconfiguration here may prevent your device from "
 "booting or may lock yourself out of it."
 
 #. Interfaces
 #: i18n/english/luasrc/i18n/admin-core.en.lua:43
-msgid "a_s_if"
+msgid "Interfaces"
 msgstr "Interfaces"
 
-#. Bridge
-#: i18n/english/luasrc/i18n/admin-core.en.lua:44
-msgid "a_s_if_bridge"
-msgstr "Bridge"
-
 #. ID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:45
-msgid "a_s_if_bridge_id"
+msgid "ID"
 msgstr "ID"
 
 #. Bridge Port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:46
-msgid "a_s_if_bridge_port"
+msgid "Bridge Port"
 msgstr "Bridge Port"
 
 #. STP
 #: i18n/english/luasrc/i18n/admin-core.en.lua:47
-msgid "a_s_if_bridge_stp"
+msgid "STP"
 msgstr "STP"
 
-#. Device
-#: i18n/english/luasrc/i18n/admin-core.en.lua:48
-msgid "a_s_if_device"
-msgstr "Device"
-
 #. Ethernet Bridge
 #: i18n/english/luasrc/i18n/admin-core.en.lua:49
-msgid "a_s_if_ethbridge"
+msgid "Ethernet Bridge"
 msgstr "Ethernet Bridge"
 
 #. Ethernet Adapter
 #: i18n/english/luasrc/i18n/admin-core.en.lua:50
-msgid "a_s_if_ethdev"
+msgid "Ethernet Adapter"
 msgstr "Ethernet Adapter"
 
 #. Ethernet Switch
 #: i18n/english/luasrc/i18n/admin-core.en.lua:51
-msgid "a_s_if_ethswitch"
+msgid "Ethernet Switch"
 msgstr "Ethernet Switch"
 
 #. Interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:52
-msgid "a_s_if_interface"
+msgid "Interface"
 msgstr "Interface"
 
 #. IP Configuration
 #: i18n/english/luasrc/i18n/admin-core.en.lua:53
-msgid "a_s_if_ipconfig"
+msgid "IP Configuration"
 msgstr "IP Configuration"
 
 #. Alias
 #: i18n/english/luasrc/i18n/admin-core.en.lua:54
-msgid "a_s_if_ipconfig_alias"
+msgid "Alias"
 msgstr "Alias"
 
 #. DHCP assigned
 #: i18n/english/luasrc/i18n/admin-core.en.lua:55
-msgid "a_s_if_ipconfig_dhcp"
+msgid "DHCP assigned"
 msgstr "DHCP assigned"
 
 #. IPv6
 #: i18n/english/luasrc/i18n/admin-core.en.lua:56
-msgid "a_s_if_ipconfig_ipv6"
+msgid "IPv6"
 msgstr "IPv6"
 
 #. Not configured
 #: i18n/english/luasrc/i18n/admin-core.en.lua:57
-msgid "a_s_if_ipconfig_none"
+msgid "Not configured"
 msgstr "Not configured"
 
 #. Primary
 #: i18n/english/luasrc/i18n/admin-core.en.lua:58
-msgid "a_s_if_ipconfig_primary"
+msgid "Primary"
 msgstr "Primary"
 
-#. Channel
-#: i18n/english/luasrc/i18n/admin-core.en.lua:59
-msgid "a_s_if_iwchannel"
-msgstr "Channel"
-
 #. Mode
 #: i18n/english/luasrc/i18n/admin-core.en.lua:60
-msgid "a_s_if_iwmode"
+msgid "Mode"
 msgstr "Mode"
 
-#. Ad-Hoc
-#: i18n/english/luasrc/i18n/admin-core.en.lua:61
-msgid "a_s_if_iwmode_adhoc"
-msgstr "Ad-Hoc"
-
 #. Pseudo Ad-Hoc
 #: i18n/english/luasrc/i18n/admin-core.en.lua:62
-msgid "a_s_if_iwmode_ahdemo"
+msgid "Pseudo Ad-Hoc"
 msgstr "Pseudo Ad-Hoc"
 
 #. Master
 #: i18n/english/luasrc/i18n/admin-core.en.lua:63
-msgid "a_s_if_iwmode_ap"
+msgid "Master"
 msgstr "Master"
 
 #. Master + WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:64
-msgid "a_s_if_iwmode_apwds"
+msgid "Master + WDS"
 msgstr "Master + WDS"
 
-#. Client
-#: i18n/english/luasrc/i18n/admin-core.en.lua:65
-msgid "a_s_if_iwmode_sta"
-msgstr "Client"
-
 #. Client + WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:66
-msgid "a_s_if_iwmode_stawds"
+msgid "Client + WDS"
 msgstr "Client + WDS"
 
-#. WDS
-#: i18n/english/luasrc/i18n/admin-core.en.lua:67
-msgid "a_s_if_iwmode_wds"
-msgstr "WDS"
-
 #. SSID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:68
-msgid "a_s_if_iwssid"
+msgid "SSID"
 msgstr "SSID"
 
 #. MAC
 #: i18n/english/luasrc/i18n/admin-core.en.lua:69
-msgid "a_s_if_mac"
+msgid "MAC"
 msgstr "MAC"
 
-#. Pkts.
-#: i18n/english/luasrc/i18n/admin-core.en.lua:70
-msgid "a_s_if_pkts"
-msgstr "Pkts."
-
 #. Interface Status
 #: i18n/english/luasrc/i18n/admin-core.en.lua:71
-msgid "a_s_if_status"
+msgid "Interface Status"
 msgstr "Interface Status"
 
 #. Transfer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:72
-msgid "a_s_if_transfer"
+msgid "Transfer"
 msgstr "Transfer"
 
 #. RX
 #: i18n/english/luasrc/i18n/admin-core.en.lua:73
-msgid "a_s_if_transfer_rx"
+msgid "RX"
 msgstr "RX"
 
 #. TX
 #: i18n/english/luasrc/i18n/admin-core.en.lua:74
-msgid "a_s_if_transfer_tx"
+msgid "TX"
 msgstr "TX"
 
 #. Type
 #: i18n/english/luasrc/i18n/admin-core.en.lua:75
-msgid "a_s_if_type"
+msgid "Type"
 msgstr "Type"
 
 #. VLAN
 #: i18n/english/luasrc/i18n/admin-core.en.lua:76
-msgid "a_s_if_vlan"
+msgid "VLAN"
 msgstr "VLAN"
 
 #. Ports
 #: i18n/english/luasrc/i18n/admin-core.en.lua:77
-msgid "a_s_if_vlanports"
+msgid "Ports"
 msgstr "Ports"
 
 #. Wireless Adapter
 #: i18n/english/luasrc/i18n/admin-core.en.lua:78
-msgid "a_s_if_wifidev"
+msgid "Wireless Adapter"
 msgstr "Wireless Adapter"
 
 #. Firewall
 #: i18n/english/luasrc/i18n/admin-core.en.lua:79
-msgid "a_s_ipt"
+msgid "Firewall"
 msgstr "Firewall"
 
 #. Actions
 #: i18n/english/luasrc/i18n/admin-core.en.lua:80
-msgid "a_s_ipt_actions"
+msgid "Actions"
 msgstr "Actions"
 
-#. Traffic
-#: i18n/english/luasrc/i18n/admin-core.en.lua:81
-msgid "a_s_ipt_bytes"
-msgstr "Traffic"
-
 #. Chain
 #: i18n/english/luasrc/i18n/admin-core.en.lua:82
-msgid "a_s_ipt_chain"
+msgid "Chain"
 msgstr "Chain"
 
 #. Destination
 #: i18n/english/luasrc/i18n/admin-core.en.lua:83
-msgid "a_s_ipt_destination"
+msgid "Destination"
 msgstr "Destination"
 
 #. Flags
 #: i18n/english/luasrc/i18n/admin-core.en.lua:84
-msgid "a_s_ipt_flags"
+msgid "Flags"
 msgstr "Flags"
 
 #. In
 #: i18n/english/luasrc/i18n/admin-core.en.lua:85
-msgid "a_s_ipt_inputif"
+msgid "In"
 msgstr "In"
 
 #. No chains in this table
 #: i18n/english/luasrc/i18n/admin-core.en.lua:86
-msgid "a_s_ipt_nochains"
+msgid "No chains in this table"
 msgstr "No chains in this table"
 
 #. No Rules in this chain
 #: i18n/english/luasrc/i18n/admin-core.en.lua:87
-msgid "a_s_ipt_norules"
+msgid "No Rules in this chain"
 msgstr "No Rules in this chain"
 
 #. Options
 #: i18n/english/luasrc/i18n/admin-core.en.lua:88
-msgid "a_s_ipt_options"
+msgid "Options"
 msgstr "Options"
 
 #. Out
 #: i18n/english/luasrc/i18n/admin-core.en.lua:89
-msgid "a_s_ipt_outputif"
+msgid "Out"
 msgstr "Out"
 
 #. Packets
 #: i18n/english/luasrc/i18n/admin-core.en.lua:90
-msgid "a_s_ipt_packets"
+msgid "Packets"
 msgstr "Packets"
 
-#. Pkts.
-#: i18n/english/luasrc/i18n/admin-core.en.lua:91
-msgid "a_s_ipt_pkts"
-msgstr "Pkts."
-
 #. Policy
 #: i18n/english/luasrc/i18n/admin-core.en.lua:92
-msgid "a_s_ipt_policy"
+msgid "Policy"
 msgstr "Policy"
 
 #. Prot.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:93
-msgid "a_s_ipt_prot"
+msgid "Prot."
 msgstr "Prot."
 
 #. References
 #: i18n/english/luasrc/i18n/admin-core.en.lua:94
-msgid "a_s_ipt_references"
+msgid "References"
 msgstr "References"
 
 #. Reset Counters
 #: i18n/english/luasrc/i18n/admin-core.en.lua:95
-msgid "a_s_ipt_reset"
+msgid "Reset Counters"
 msgstr "Reset Counters"
 
 #. Restart Firewall
 #: i18n/english/luasrc/i18n/admin-core.en.lua:96
-msgid "a_s_ipt_restart"
+msgid "Restart Firewall"
 msgstr "Restart Firewall"
 
 #. #
 #: i18n/english/luasrc/i18n/admin-core.en.lua:97
-msgid "a_s_ipt_rulenum"
+msgid "#"
 msgstr "#"
 
 #. Source
 #: i18n/english/luasrc/i18n/admin-core.en.lua:98
-msgid "a_s_ipt_source"
+msgid "Source"
 msgstr "Source"
 
 #. Firewall Status
 #: i18n/english/luasrc/i18n/admin-core.en.lua:99
-msgid "a_s_ipt_status"
+msgid "Firewall Status"
 msgstr "Firewall Status"
 
 #. Table
 #: i18n/english/luasrc/i18n/admin-core.en.lua:100
-msgid "a_s_ipt_table"
+msgid "Table"
 msgstr "Table"
 
 #. Target
 #: i18n/english/luasrc/i18n/admin-core.en.lua:101
-msgid "a_s_ipt_target"
+msgid "Target"
 msgstr "Target"
 
 #. (no interfaces attached)
 #: libs/cbi/luasrc/view/cbi/firewall_zonelist.htm
-msgid "a_s_ipt_zone_empty"
+msgid "(no interfaces attached)"
 msgstr "(no interfaces attached)"
 
 #. unspecified -or- create:
 #: libs/cbi/luasrc/view/cbi/firewall_zonelist.htm
-msgid "a_s_ipt_zone_unspec_create"
+msgid "unspecified -or- create:"
 msgstr "unspecified -or- create:"
 
 #. Perform Actions
 #: i18n/english/luasrc/i18n/admin-core.en.lua:102
-msgid "a_s_packages_do"
+msgid "Perform Actions"
 msgstr "Perform Actions"
 
 #. Install
 #: i18n/english/luasrc/i18n/admin-core.en.lua:103
-msgid "a_s_packages_install"
+msgid "Install"
 msgstr "Install"
 
 #. Download and install package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:104
-msgid "a_s_packages_installurl"
+msgid "Download and install package"
 msgstr "Download and install package"
 
 #. Edit package lists and installation targets
 #: i18n/english/luasrc/i18n/admin-core.en.lua:105
-msgid "a_s_packages_ipkg"
+msgid "Edit package lists and installation targets"
 msgstr "Edit package lists and installation targets"
 
 #. Package name
 #: i18n/english/luasrc/i18n/admin-core.en.lua:106
-msgid "a_s_packages_name"
+msgid "Package name"
 msgstr "Package name"
 
 #. Remove
 #: i18n/english/luasrc/i18n/admin-core.en.lua:107
-msgid "a_s_packages_remove"
+msgid "Remove"
 msgstr "Remove"
 
 #. Find package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:108
-msgid "a_s_packages_search"
+msgid "Find package"
 msgstr "Find package"
 
 #. Package lists updated
 #: i18n/english/luasrc/i18n/admin-core.en.lua:109
-msgid "a_s_packages_update"
+msgid "Package lists updated"
 msgstr "Package lists updated"
 
 #. Update package lists
 #: i18n/english/luasrc/i18n/admin-core.en.lua:110
-msgid "a_s_packages_updatelist"
+msgid "Update package lists"
 msgstr "Update package lists"
 
 #. Upgrade installed packages
 #: i18n/english/luasrc/i18n/admin-core.en.lua:111
-msgid "a_s_packages_upgrade"
+msgid "Upgrade installed packages"
 msgstr "Upgrade installed packages"
 
 #. Could not set default destination
 #: i18n/english/luasrc/i18n/admin-core.en.lua:112
-msgid "a_s_packages_code1"
+msgid "Could not set default destination"
 msgstr "Could not set default destination"
 
 #. Error parsing config file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:113
-msgid "a_s_packages_code2"
+msgid "Error parsing config file"
 msgstr "Error parsing config file"
 
 #. Could not create temporary directory (ran out of space?)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:114
-msgid "a_s_packages_code3"
+msgid "Could not create temporary directory (ran out of space?)"
 msgstr "Could not create temporary directory (ran out of space?)"
 
 #. Could not get adminstrative lock (ran out of space?)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:115
-msgid "a_s_packages_code4"
+msgid "Could not get adminstrative lock (ran out of space?)"
 msgstr "Could not get adminstrative lock (ran out of space?)"
 
 #. Unsatisfied Dependencies
 #: i18n/english/luasrc/i18n/admin-core.en.lua:116
-msgid "a_s_packages_code5"
+msgid "Unsatisfied Dependencies"
 msgstr "Unsatisfied Dependencies"
 
 #. Refused to remove essential package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:117
-msgid "a_s_packages_code6"
+msgid "Refused to remove essential package"
 msgstr "Refused to remove essential package"
 
 #. Package has dependents
 #: i18n/english/luasrc/i18n/admin-core.en.lua:118
-msgid "a_s_packages_code7"
+msgid "Package has dependents"
 msgstr "Package has dependents"
 
 #. Package has no installation candidate (wrong name?)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:119
-msgid "a_s_packages_code8"
+msgid "Package has no installation candidate (wrong name?)"
 msgstr "Package has no installation candidate (wrong name?)"
 
 #. Package has no available architecture 
 #: i18n/english/luasrc/i18n/admin-core.en.lua:120
-msgid "a_s_packages_code9"
+msgid "Package has no available architecture "
 msgstr "Package has no available architecture "
 
 #. Package is not trusted
 #: i18n/english/luasrc/i18n/admin-core.en.lua:121
-msgid "a_s_packages_code10"
+msgid "Package is not trusted"
 msgstr "Package is not trusted"
 
 #. Error while downloading
 #: i18n/english/luasrc/i18n/admin-core.en.lua:122
-msgid "a_s_packages_code11"
+msgid "Error while downloading"
 msgstr "Error while downloading"
 
 #. Conflicts with other packages
 #: i18n/english/luasrc/i18n/admin-core.en.lua:123
-msgid "a_s_packages_code12"
+msgid "Conflicts with other packages"
 msgstr "Conflicts with other packages"
 
 #. Package is already installed
 #: i18n/english/luasrc/i18n/admin-core.en.lua:124
-msgid "a_s_packages_code13"
+msgid "Package is already installed"
 msgstr "Package is already installed"
 
 #. Package has unresolved dependencies
 #: i18n/english/luasrc/i18n/admin-core.en.lua:125
-msgid "a_s_packages_code14"
+msgid "Package has unresolved dependencies"
 msgstr "Package has unresolved dependencies"
 
 #. Refused to downgrade package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:126
-msgid "a_s_packages_code15"
+msgid "Refused to downgrade package"
 msgstr "Refused to downgrade package"
 
 #. Package manager ran out of space
 #: i18n/english/luasrc/i18n/admin-core.en.lua:127
-msgid "a_s_packages_code16"
+msgid "Package manager ran out of space"
 msgstr "Package manager ran out of space"
 
 #. Bad signature while verifiying package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:128
-msgid "a_s_packages_code17"
+msgid "Bad signature while verifiying package"
 msgstr "Bad signature while verifiying package"
 
 #. MD5 error while verifiying package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:129
-msgid "a_s_packages_code18"
+msgid "MD5 error while verifiying package"
 msgstr "MD5 error while verifiying package"
 
 #. Internal error occured
 #: i18n/english/luasrc/i18n/admin-core.en.lua:130
-msgid "a_s_packages_code19"
+msgid "Internal error occured"
 msgstr "Internal error occured"
 
 #. Package lists
 #: i18n/english/luasrc/i18n/admin-core.en.lua:131
-msgid "a_s_p_ipkg_pkglists"
+msgid "Package lists"
 msgstr "Package lists"
 
 #. Installation targets
 #: i18n/english/luasrc/i18n/admin-core.en.lua:132
-msgid "a_s_p_ipkg_targets"
+msgid "Installation targets"
 msgstr "Installation targets"
 
 #. Change the password of the system administrator (User <code>root</code>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:133
-msgid "a_s_changepw1"
+msgid ""
+"Change the password of the system administrator (User <code>root</code>)"
 msgstr ""
 "Change the password of the system administrator (User <code>root</code>)"
 
 #. Password successfully changed
 #: i18n/english/luasrc/i18n/admin-core.en.lua:134
-msgid "a_s_changepw_changed"
+msgid "Password successfully changed"
 msgstr "Password successfully changed"
 
 #. Error: Passwords do not match
 #: i18n/english/luasrc/i18n/admin-core.en.lua:135
-msgid "a_s_changepw_nomatch"
+msgid "Error: Passwords do not match"
 msgstr "Error: Passwords do not match"
 
 #. Here you can paste public <abbr title=\"Secure Shell\">SSH</abbr>-Keys (one per line) for <abbr title=\"Secure Shell\">SSH</abbr> public-key authentication.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:136
-msgid "a_s_sshkeys1"
+msgid ""
+"Here you can paste public <abbr title=\"Secure Shell\">SSH</abbr>-Keys (one "
+"per line) for <abbr title=\"Secure Shell\">SSH</abbr> public-key "
+"authentication."
 msgstr ""
 "Here you can paste public <abbr title=\"Secure Shell\">SSH</abbr>-Keys (one "
 "per line) for <abbr title=\"Secure Shell\">SSH</abbr> public-key "
 "authentication."
 
-#. Mount Points
-#: i18n/english/luasrc/i18n/admin-core.en.lua:137
-msgid "a_s_fstab_mountpoints"
-msgstr "Mount Points"
-
 #. Mount Points define at which point a memory device will be attached to the filesystem
 #: i18n/english/luasrc/i18n/admin-core.en.lua:138
-msgid "a_s_fstab_mountpoints1"
+msgid ""
+"Mount Points define at which point a memory device will be attached to the "
+"filesystem"
 msgstr ""
 "Mount Points define at which point a memory device will be attached to the "
 "filesystem"
 
 #. Mounted file systems
 #: i18n/english/luasrc/i18n/admin-core.en.lua:139
-msgid "a_s_fstab_active"
+msgid "Mounted file systems"
 msgstr "Mounted file systems"
 
 #. Used
 #: i18n/english/luasrc/i18n/admin-core.en.lua:140
-msgid "a_s_fstab_used"
+msgid "Used"
 msgstr "Used"
 
 #. Available
 #: i18n/english/luasrc/i18n/admin-core.en.lua:141
-msgid "a_s_fstab_avail"
+msgid "Available"
 msgstr "Available"
 
 #. Mount Point
 #: i18n/english/luasrc/i18n/admin-core.en.lua:142
-msgid "a_s_fstab_mountpoint"
+msgid "Mount Point"
 msgstr "Mount Point"
 
 #. The device file of the memory or partition (<abbr title=\"for example\">e.g.</abbr> <code>/dev/sda1</code>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:143
-msgid "a_s_fstab_device1"
+msgid ""
+"The device file of the memory or partition (<abbr title=\"for example\">e.g."
+"</abbr> <code>/dev/sda1</code>)"
 msgstr ""
-"The device file of the memory or partition (<abbr title=\"for "
-"example\">e.g.</abbr> <code>/dev/sda1</code>)"
+"The device file of the memory or partition (<abbr title=\"for example\">e.g."
+"</abbr> <code>/dev/sda1</code>)"
 
 #. The filesystem that was used to format the memory (<abbr title=\"for example\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></samp>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:144
-msgid "a_s_fstab_fs1"
+msgid ""
+"The filesystem that was used to format the memory (<abbr title=\"for example"
+"\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></"
+"samp>)"
 msgstr ""
-"The filesystem that was used to format the memory (<abbr title=\"for "
-"example\">e.g.</abbr> <samp><abbr title=\"Third Extended "
-"Filesystem\">ext3</abbr></samp>)"
+"The filesystem that was used to format the memory (<abbr title=\"for example"
+"\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></"
+"samp>)"
 
 #. If your physical memory is insufficient unused data can be temporarily swapped to a swap-device resulting in a higher amount of usable <abbr title=\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very slow process as the swap-device cannot be accessed with the high datarates of the <abbr title=\"Random Access Memory\">RAM</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:145
-msgid "a_s_fstab_swap1"
+msgid ""
+"If your physical memory is insufficient unused data can be temporarily "
+"swapped to a swap-device resulting in a higher amount of usable <abbr title="
+"\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very "
+"slow process as the swap-device cannot be accessed with the high datarates "
+"of the <abbr title=\"Random Access Memory\">RAM</abbr>."
 msgstr ""
 "If your physical memory is insufficient unused data can be temporarily "
-"swapped to a swap-device resulting in a higher amount of usable <abbr "
-"title=\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a "
-"very slow process as the swap-device cannot be accessed with the high "
-"datarates of the <abbr title=\"Random Access Memory\">RAM</abbr>."
+"swapped to a swap-device resulting in a higher amount of usable <abbr title="
+"\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very "
+"slow process as the swap-device cannot be accessed with the high datarates "
+"of the <abbr title=\"Random Access Memory\">RAM</abbr>."
 
 #. Reboots the operating system of your device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:146
-msgid "a_s_reboot1"
+msgid "Reboots the operating system of your device"
 msgstr "Reboots the operating system of your device"
 
 #. Perform reboot
 #: i18n/english/luasrc/i18n/admin-core.en.lua:147
-msgid "a_s_reboot_do"
+msgid "Perform reboot"
 msgstr "Perform reboot"
 
 #. Please wait: Device rebooting...
 #: i18n/english/luasrc/i18n/admin-core.en.lua:148
-msgid "a_s_reboot_running"
+msgid "Please wait: Device rebooting..."
 msgstr "Please wait: Device rebooting..."
 
 #. Warning: There are unsaved changes that will be lost while rebooting!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:149
-msgid "a_s_reboot_u"
+msgid "Warning: There are unsaved changes that will be lost while rebooting!"
 msgstr "Warning: There are unsaved changes that will be lost while rebooting!"
 
 #. Changes applied.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:150
-msgid "a_s_applyreboot1"
+msgid "Changes applied."
 msgstr "Changes applied."
 
 #. Backup / Restore
 #: i18n/english/luasrc/i18n/admin-core.en.lua:151
-msgid "a_s_backup"
+msgid "Backup / Restore"
 msgstr "Backup / Restore"
 
 #. Create backup
 #: i18n/english/luasrc/i18n/admin-core.en.lua:152
-msgid "a_s_backup_backup"
+msgid "Create backup"
 msgstr "Create backup"
 
 #. Backup Archive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:153
-msgid "a_s_backup_archive"
+msgid "Backup Archive"
 msgstr "Backup Archive"
 
 #. Reset router to defaults
 #: i18n/english/luasrc/i18n/admin-core.en.lua:154
-msgid "a_s_backup_reset"
+msgid "Reset router to defaults"
 msgstr "Reset router to defaults"
 
 #. Proceed reverting all settings and resetting to firmware defaults?
 #: i18n/english/luasrc/i18n/admin-core.en.lua:155
-msgid "a_s_backup_reset1"
+msgid "Proceed reverting all settings and resetting to firmware defaults?"
 msgstr "Proceed reverting all settings and resetting to firmware defaults?"
 
 #. Restore backup
 #: i18n/english/luasrc/i18n/admin-core.en.lua:156
-msgid "a_s_backup_restore"
+msgid "Restore backup"
 msgstr "Restore backup"
 
 #. Here you can backup and restore your router configuration and - if possible - reset the router to the default settings.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:157
-msgid "a_s_backup1"
+msgid ""
+"Here you can backup and restore your router configuration and - if possible "
+"- reset the router to the default settings."
 msgstr ""
 "Here you can backup and restore your router configuration and - if possible "
 "- reset the router to the default settings."
 
 #. <abbr title=\"Hypertext Transfer Protocol\">HTTP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:158
-msgid "a_srv_http"
+msgid "<abbr title=\"Hypertext Transfer Protocol\">HTTP</abbr>-Server"
 msgstr "<abbr title=\"Hypertext Transfer Protocol\">HTTP</abbr>-Server"
 
 #. <abbr title=\"Secure Shell\">SSH</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:159
-msgid "a_srv_ssh"
+msgid "<abbr title=\"Secure Shell\">SSH</abbr>-Server"
 msgstr "<abbr title=\"Secure Shell\">SSH</abbr>-Server"
 
 #. Services and daemons perform certain tasks on your device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:160
-msgid "a_srv_services1"
+msgid "Services and daemons perform certain tasks on your device."
 msgstr "Services and daemons perform certain tasks on your device."
 
 #. Most of them are network servers, that offer a certain service for your device or network like shell access, serving webpages like <abbr title=\"Lua Configuration Interface\">LuCI</abbr>, doing mesh routing, sending e-mails, ...
 #: i18n/english/luasrc/i18n/admin-core.en.lua:161
-msgid "a_srv_services2"
+msgid ""
+"Most of them are network servers, that offer a certain service for your "
+"device or network like shell access, serving webpages like <abbr title=\"Lua "
+"Configuration Interface\">LuCI</abbr>, doing mesh routing, sending e-"
+"mails, ..."
 msgstr ""
 "Most of them are network servers, that offer a certain service for your "
 "device or network like shell access, serving webpages like <abbr title=\"Lua "
-"Configuration Interface\">LuCI</abbr>, doing mesh routing, sending e-mails, "
-"..."
+"Configuration Interface\">LuCI</abbr>, doing mesh routing, sending e-"
+"mails, ..."
 
 #. A small webserver which can be used to serve <abbr title=\"Lua Configuration Interface\">LuCI</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:162
-msgid "a_srv_http1"
+msgid ""
+"A small webserver which can be used to serve <abbr title=\"Lua Configuration "
+"Interface\">LuCI</abbr>."
 msgstr ""
 "A small webserver which can be used to serve <abbr title=\"Lua Configuration "
 "Interface\">LuCI</abbr>."
 
 #. Authentication Realm
 #: i18n/english/luasrc/i18n/admin-core.en.lua:163
-msgid "a_srv_http_authrealm"
+msgid "Authentication Realm"
 msgstr "Authentication Realm"
 
 #. The realm which will be displayed at the authentication prompt for protected pages.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:164
-msgid "a_srv_http_authrealm1"
+msgid ""
+"The realm which will be displayed at the authentication prompt for protected "
+"pages."
 msgstr ""
 "The realm which will be displayed at the authentication prompt for protected "
 "pages."
 
 #. defaults to <code>/etc/httpd.conf</code>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:165
-msgid "a_srv_http_config1"
+msgid "defaults to <code>/etc/httpd.conf</code>"
 msgstr "defaults to <code>/etc/httpd.conf</code>"
 
 #. Document root
 #: i18n/english/luasrc/i18n/admin-core.en.lua:166
-msgid "a_srv_http_root"
+msgid "Document root"
 msgstr "Document root"
 
 #. Enable Keep-Alive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:167
-msgid "a_srv_http_keepalive"
+msgid "Enable Keep-Alive"
 msgstr "Enable Keep-Alive"
 
 #. Connection timeout
 #: i18n/english/luasrc/i18n/admin-core.en.lua:168
-msgid "a_srv_http_timeout"
+msgid "Connection timeout"
 msgstr "Connection timeout"
 
 #. Plugin path
 #: i18n/english/luasrc/i18n/admin-core.en.lua:169
-msgid "a_srv_http_path"
+msgid "Plugin path"
 msgstr "Plugin path"
 
 #. A lightweight HTTP/1.1 webserver written in C and Lua designed to serve LuCI
 #: i18n/english/luasrc/i18n/admin-core.en.lua:170
-msgid "a_srv_lucittpd"
+msgid ""
+"A lightweight HTTP/1.1 webserver written in C and Lua designed to serve LuCI"
 msgstr ""
 "A lightweight HTTP/1.1 webserver written in C and Lua designed to serve LuCI"
 
 #. Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:171
-msgid "a_srv_dropbear1"
+msgid ""
+"Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
+"and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
 msgstr ""
 "Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
 "and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
 
 #. Password authentication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:172
-msgid "a_srv_d_pwauth"
+msgid "Password authentication"
 msgstr "Password authentication"
 
 #. Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:173
-msgid "a_srv_d_pwauth1"
+msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
 msgstr "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
 
-#. Channel
-#: i18n/english/luasrc/i18n/admin-core.en.lua:174
-msgid "a_w_channel"
-msgstr "Channel"
-
 #. On this pages you can find configuration options for <abbr title=\"Wireless Local Area Network\">WLAN</abbr> based wireless networks.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:175
-msgid "a_w_wifi1"
+msgid ""
+"On this pages you can find configuration options for <abbr title=\"Wireless "
+"Local Area Network\">WLAN</abbr> based wireless networks."
 msgstr ""
 "On this pages you can find configuration options for <abbr title=\"Wireless "
 "Local Area Network\">WLAN</abbr> based wireless networks."
 
 #. You can easily integrate your 802.11a/b/g/n-devices into your physical network and use the virtual adapter support to build wireless repeaters or offer several networks with one device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:176
-msgid "a_w_wifi2"
+msgid ""
+"You can easily integrate your 802.11a/b/g/n-devices into your physical "
+"network and use the virtual adapter support to build wireless repeaters or "
+"offer several networks with one device."
 msgstr ""
 "You can easily integrate your 802.11a/b/g/n-devices into your physical "
 "network and use the virtual adapter support to build wireless repeaters or "
@@ -971,51 +954,58 @@ msgstr ""
 
 #. There is support for Managed, Client, Ad-Hoc and <abbr title=\"Wireless Distribution System\">WDS</abbr> operating modes as well as <abbr title=\"Wi-Fi Protected Access\">WPA</abbr> and <abbr title=\"Wi-Fi Protected Access 2\">WPA2</abbr> encryption for secure communnication.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:177
-msgid "a_w_wifi3"
+msgid ""
+"There is support for Managed, Client, Ad-Hoc and <abbr title=\"Wireless "
+"Distribution System\">WDS</abbr> operating modes as well as <abbr title=\"Wi-"
+"Fi Protected Access\">WPA</abbr> and <abbr title=\"Wi-Fi Protected Access 2"
+"\">WPA2</abbr> encryption for secure communnication."
 msgstr ""
 "There is support for Managed, Client, Ad-Hoc and <abbr title=\"Wireless "
 "Distribution System\">WDS</abbr> operating modes as well as <abbr title=\"Wi-"
-"Fi Protected Access\">WPA</abbr> and <abbr title=\"Wi-Fi Protected Access "
-"2\">WPA2</abbr> encryption for secure communnication."
+"Fi Protected Access\">WPA</abbr> and <abbr title=\"Wi-Fi Protected Access 2"
+"\">WPA2</abbr> encryption for secure communnication."
 
 #. Here you can configure installed wifi devices.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:178
-msgid "a_w_devices1"
+msgid "Here you can configure installed wifi devices."
 msgstr "Here you can configure installed wifi devices."
 
 #. Transmit Antenna
 #: i18n/english/luasrc/i18n/admin-core.en.lua:179
-msgid "a_w_txantenna"
+msgid "Transmit Antenna"
 msgstr "Transmit Antenna"
 
 #. Receive Antenna
 #: i18n/english/luasrc/i18n/admin-core.en.lua:180
-msgid "a_w_rxantenna"
+msgid "Receive Antenna"
 msgstr "Receive Antenna"
 
 #. Distance to furthest station (in meter)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:181
-msgid "a_w_distance1"
+msgid "Distance to furthest station (in meter)"
 msgstr "Distance to furthest station (in meter)"
 
 #. Diversity
 #: i18n/english/luasrc/i18n/admin-core.en.lua:182
-msgid "a_w_diversity"
+msgid "Diversity"
 msgstr "Diversity"
 
 #. Country Code
 #: i18n/english/luasrc/i18n/admin-core.en.lua:183
-msgid "a_w_countrycode"
+msgid "Country Code"
 msgstr "Country Code"
 
 #. Connection Limit
 #: i18n/english/luasrc/i18n/admin-core.en.lua:184
-msgid "a_w_connlimit"
+msgid "Connection Limit"
 msgstr "Connection Limit"
 
 #. You can run several wifi networks with one device. Be aware that there are certain hardware and driverspecific restrictions. Normally you can operate 1 Ad-Hoc or up to 3 Master-Mode and 1 Client-Mode network simultaneously.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:185
-msgid "a_w_networks1"
+msgid ""
+"You can run several wifi networks with one device. Be aware that there are "
+"certain hardware and driverspecific restrictions. Normally you can operate 1 "
+"Ad-Hoc or up to 3 Master-Mode and 1 Client-Mode network simultaneously."
 msgstr ""
 "You can run several wifi networks with one device. Be aware that there are "
 "certain hardware and driverspecific restrictions. Normally you can operate 1 "
@@ -1023,351 +1013,363 @@ msgstr ""
 
 #. Network Name (<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:186
-msgid "a_w_netid"
+msgid ""
+"Network Name (<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>)"
 msgstr ""
 "Network Name (<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>)"
 
 #. Add the Wifi network to physical network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:187
-msgid "a_w_network1"
+msgid "Add the Wifi network to physical network"
 msgstr "Add the Wifi network to physical network"
 
 #.  - Create new Network - 
 #: i18n/english/luasrc/i18n/admin-core.en.lua:188
-msgid "a_w_netmanual"
+msgid " - Create new Network - "
 msgstr " - Create new Network - "
 
 #. Transmit Power
 #: i18n/english/luasrc/i18n/admin-core.en.lua:189
-msgid "a_w_txpwr"
+msgid "Transmit Power"
 msgstr "Transmit Power"
 
 #. Broadcom Frameburst
 #: i18n/english/luasrc/i18n/admin-core.en.lua:190
-msgid "a_w_brcmburst"
+msgid "Broadcom Frameburst"
 msgstr "Broadcom Frameburst"
 
 #. Atheros Frameburst
 #: i18n/english/luasrc/i18n/admin-core.en.lua:191
-msgid "a_w_athburst"
+msgid "Atheros Frameburst"
 msgstr "Atheros Frameburst"
 
 #. RadiusServer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:192
-msgid "a_w_radiussrv"
+msgid "RadiusServer"
 msgstr "RadiusServer"
 
 #. Radius-Port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:193
-msgid "a_w_radiusport"
+msgid "Radius-Port"
 msgstr "Radius-Port"
 
 #. AP-Isolation
 #: i18n/english/luasrc/i18n/admin-core.en.lua:194
-msgid "a_w_apisolation"
+msgid "AP-Isolation"
 msgstr "AP-Isolation"
 
 #. Prevents Client to Client communication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:195
-msgid "a_w_apisolation1"
+msgid "Prevents Client to Client communication"
 msgstr "Prevents Client to Client communication"
 
 #. Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:196
-msgid "a_w_hideessid"
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
 #. Access Point
 #: i18n/english/luasrc/i18n/admin-core.en.lua:197
-msgid "a_w_ap"
+msgid "Access Point"
 msgstr "Access Point"
 
-#. Ad-Hoc
-#: i18n/english/luasrc/i18n/admin-core.en.lua:198
-msgid "a_w_adhoc"
-msgstr "Ad-Hoc"
-
 #. Pseudo Ad-Hoc (ahdemo)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:199
-msgid "a_w_ahdemo"
+msgid "Pseudo Ad-Hoc (ahdemo)"
 msgstr "Pseudo Ad-Hoc (ahdemo)"
 
-#. Client
-#: i18n/english/luasrc/i18n/admin-core.en.lua:200
-msgid "a_w_client"
-msgstr "Client"
-
-#. WDS
-#: i18n/english/luasrc/i18n/admin-core.en.lua:201
-msgid "a_w_wds"
-msgstr "WDS"
-
 #. Monitor
 #: i18n/english/luasrc/i18n/admin-core.en.lua:202
-msgid "a_w_monitor"
+msgid "Monitor"
 msgstr "Monitor"
 
 #. Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> firewalls
 #: i18n/english/luasrc/i18n/admin-core.en.lua:203
-msgid "dhcp_dnsmasq_desc"
+msgid ""
+"Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
+"\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
+"Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> "
+"firewalls"
 msgstr ""
-"Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration "
-"Protocol\">DHCP</abbr>-Server and <abbr title=\"Domain Name "
-"System\">DNS</abbr>-Forwarder for <abbr title=\"Network Address "
-"Translation\">NAT</abbr> firewalls"
+"Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
+"\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
+"Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> "
+"firewalls"
 
 #. Domain required
 #: i18n/english/luasrc/i18n/admin-core.en.lua:204
-msgid "dhcp_dnsmasq_domainneeded"
+msgid "Domain required"
 msgstr "Domain required"
 
 #. Don&#39;t forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without <abbr title=\"Domain Name System\">DNS</abbr>-Name
 #: i18n/english/luasrc/i18n/admin-core.en.lua:205
-msgid "dhcp_dnsmasq_domainneeded_desc"
+msgid ""
+"Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
+"<abbr title=\"Domain Name System\">DNS</abbr>-Name"
 msgstr ""
 "Don&#39;t forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests "
 "without <abbr title=\"Domain Name System\">DNS</abbr>-Name"
 
 #. Authoritative
 #: i18n/english/luasrc/i18n/admin-core.en.lua:206
-msgid "dhcp_dnsmasq_authoritative"
+msgid "Authoritative"
 msgstr "Authoritative"
 
 #. This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> in the local network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:207
-msgid "dhcp_dnsmasq_authoritative_desc"
+msgid ""
+"This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr> in the local network"
 msgstr ""
-"This is the only <abbr title=\"Dynamic Host Configuration "
-"Protocol\">DHCP</abbr> in the local network"
+"This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr> in the local network"
 
 #. Filter private
 #: i18n/english/luasrc/i18n/admin-core.en.lua:208
-msgid "dhcp_dnsmasq_boguspriv"
+msgid "Filter private"
 msgstr "Filter private"
 
 #. Don&#39;t forward reverse lookups for local networks
 #: i18n/english/luasrc/i18n/admin-core.en.lua:209
-msgid "dhcp_dnsmasq_boguspriv_desc"
+msgid "Don't forward reverse lookups for local networks"
 msgstr "Don&#39;t forward reverse lookups for local networks"
 
 #. Filter useless
 #: i18n/english/luasrc/i18n/admin-core.en.lua:210
-msgid "dhcp_dnsmasq_filterwin2k"
+msgid "Filter useless"
 msgstr "Filter useless"
 
 #. filter useless <abbr title=\"Domain Name System\">DNS</abbr>-queries of Windows-systems
 #: i18n/english/luasrc/i18n/admin-core.en.lua:211
-msgid "dhcp_dnsmasq_filterwin2k_desc"
+msgid ""
+"filter useless <abbr title=\"Domain Name System\">DNS</abbr>-queries of "
+"Windows-systems"
 msgstr ""
 "filter useless <abbr title=\"Domain Name System\">DNS</abbr>-queries of "
 "Windows-systems"
 
 #. Localise queries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:212
-msgid "dhcp_dnsmasq_localisequeries"
+msgid "Localise queries"
 msgstr "Localise queries"
 
 #. localises the hostname depending on its subnet
 #: i18n/english/luasrc/i18n/admin-core.en.lua:213
-msgid "dhcp_dnsmasq_localisequeries_desc"
+msgid "localises the hostname depending on its subnet"
 msgstr "localises the hostname depending on its subnet"
 
 #. Local Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:214
-msgid "dhcp_dnsmasq_local"
+msgid "Local Server"
 msgstr "Local Server"
 
 #. Local Domain
 #: i18n/english/luasrc/i18n/admin-core.en.lua:215
-msgid "dhcp_dnsmasq_domain"
+msgid "Local Domain"
 msgstr "Local Domain"
 
 #. Expand Hosts
 #: i18n/english/luasrc/i18n/admin-core.en.lua:216
-msgid "dhcp_dnsmasq_expandhosts"
+msgid "Expand Hosts"
 msgstr "Expand Hosts"
 
 #. adds domain names to hostentries in the resolv file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:217
-msgid "dhcp_dnsmasq_expandhosts_desc"
+msgid "adds domain names to hostentries in the resolv file"
 msgstr "adds domain names to hostentries in the resolv file"
 
 #. don&#39;t cache unknown
 #: i18n/english/luasrc/i18n/admin-core.en.lua:218
-msgid "dhcp_dnsmasq_nonegcache"
+msgid "don't cache unknown"
 msgstr "don&#39;t cache unknown"
 
 #. prevents caching of negative <abbr title=\"Domain Name System\">DNS</abbr>-replies
 #: i18n/english/luasrc/i18n/admin-core.en.lua:219
-msgid "dhcp_dnsmasq_nonegcache_desc"
+msgid ""
+"prevents caching of negative <abbr title=\"Domain Name System\">DNS</abbr>-"
+"replies"
 msgstr ""
-"prevents caching of negative <abbr title=\"Domain Name "
-"System\">DNS</abbr>-replies"
+"prevents caching of negative <abbr title=\"Domain Name System\">DNS</abbr>-"
+"replies"
 
 #. Use <code>/etc/ethers</code>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:220
-msgid "dhcp_dnsmasq_readethers"
+msgid "Use <code>/etc/ethers</code>"
 msgstr "Use <code>/etc/ethers</code>"
 
 #. Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:221
-msgid "dhcp_dnsmasq_readethers_desc"
+msgid ""
+"Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
+"Configuration Protocol\">DHCP</abbr>-Server"
 msgstr ""
 "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
 
 #. Leasefile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:222
-msgid "dhcp_dnsmasq_leasefile"
+msgid "Leasefile"
 msgstr "Leasefile"
 
 #. file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-leases will be stored
 #: i18n/english/luasrc/i18n/admin-core.en.lua:223
-msgid "dhcp_dnsmasq_leasefile_desc"
+msgid ""
+"file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr>-leases will be stored"
 msgstr ""
-"file where given <abbr title=\"Dynamic Host Configuration "
-"Protocol\">DHCP</abbr>-leases will be stored"
+"file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr>-leases will be stored"
 
 #. Resolvfile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:224
-msgid "dhcp_dnsmasq_resolvfile"
+msgid "Resolvfile"
 msgstr "Resolvfile"
 
 #. local <abbr title=\"Domain Name System\">DNS</abbr> file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:225
-msgid "dhcp_dnsmasq_resolvfile_desc"
+msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 
 #. Ignore <code>/etc/hosts</code>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:226
-msgid "dhcp_dnsmasq_nohosts"
+msgid "Ignore <code>/etc/hosts</code>"
 msgstr "Ignore <code>/etc/hosts</code>"
 
 #. Strict order
 #: i18n/english/luasrc/i18n/admin-core.en.lua:227
-msgid "dhcp_dnsmasq_strictorder"
+msgid "Strict order"
 msgstr "Strict order"
 
 #. <abbr title=\"Domain Name System\">DNS</abbr>-Server will be queried in the order of the resolvfile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:228
-msgid "dhcp_dnsmasq_strictorder_desc"
+msgid ""
+"<abbr title=\"Domain Name System\">DNS</abbr>-Server will be queried in the "
+"order of the resolvfile"
 msgstr ""
 "<abbr title=\"Domain Name System\">DNS</abbr>-Server will be queried in the "
 "order of the resolvfile"
 
 #. Log queries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:229
-msgid "dhcp_dnsmasq_logqueries"
+msgid "Log queries"
 msgstr "Log queries"
 
 #. Ignore resolve file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:230
-msgid "dhcp_dnsmasq_noresolv"
+msgid "Ignore resolve file"
 msgstr "Ignore resolve file"
 
 #. concurrent queries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:231
-msgid "dhcp_dnsmasq_dnsforwardmax"
+msgid "concurrent queries"
 msgstr "concurrent queries"
 
 #. <abbr title=\"Domain Name System\">DNS</abbr>-Port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:232
-msgid "dhcp_dnsmasq_port"
+msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Port"
 msgstr "<abbr title=\"Domain Name System\">DNS</abbr>-Port"
 
 #. <abbr title=\"maximal\">max.</abbr> <abbr title=\"Extension Mechanisms for Domain Name System\">EDNS0</abbr> paket size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:233
-msgid "dhcp_dnsmasq_ednspacket_max"
+msgid ""
+"<abbr title=\"maximal\">max.</abbr> <abbr title=\"Extension Mechanisms for "
+"Domain Name System\">EDNS0</abbr> paket size"
 msgstr ""
 "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> paket size"
 
 #. <abbr title=\"maximal\">max.</abbr> <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:234
-msgid "dhcp_dnsmasq_dhcpleasemax"
+msgid ""
+"<abbr title=\"maximal\">max.</abbr> <abbr title=\"Dynamic Host Configuration "
+"Protocol\">DHCP</abbr>-Leases"
 msgstr ""
 "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr>-Leases"
 
 #. additional hostfile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:235
-msgid "dhcp_dnsmasq_addnhosts"
+msgid "additional hostfile"
 msgstr "additional hostfile"
 
 #. query port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:236
-msgid "dhcp_dnsmasq_queryport"
+msgid "query port"
 msgstr "query port"
 
 #. Enable TFTP-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:237
-msgid "dhcp_dnsmasq_enabletftp"
+msgid "Enable TFTP-Server"
 msgstr "Enable TFTP-Server"
 
 #. TFTP-Server Root
 #: i18n/english/luasrc/i18n/admin-core.en.lua:238
-msgid "dhcp_dnsmasq_tftproot"
+msgid "TFTP-Server Root"
 msgstr "TFTP-Server Root"
 
 #. Network Boot Image
 #: i18n/english/luasrc/i18n/admin-core.en.lua:239
-msgid "dhcp_dnsmasq_dhcpboot"
+msgid "Network Boot Image"
 msgstr "Network Boot Image"
 
 #. Switch
 #: i18n/english/luasrc/i18n/admin-core.en.lua:240
-msgid "a_n_switch"
+msgid "Switch"
 msgstr "Switch"
 
 #. Active Connections
 #: i18n/english/luasrc/i18n/admin-core.en.lua:241
-msgid "a_n_conntrack"
+msgid "Active Connections"
 msgstr "Active Connections"
 
 #. This page gives an overview over currently active network connections.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:242
-msgid "a_n_conntrack_desc"
+msgid "This page gives an overview over currently active network connections."
 msgstr "This page gives an overview over currently active network connections."
 
-#. Routes
-#: i18n/english/luasrc/i18n/admin-core.en.lua:243
-msgid "a_n_routes"
-msgstr "Routes"
-
 #. IPv4 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:244
-msgid "a_n_routes4"
+msgid "IPv4 Routes"
 msgstr "IPv4 Routes"
 
 #. IPv6 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:245
-msgid "a_n_routes6"
+msgid "IPv6 Routes"
 msgstr "IPv6 Routes"
 
 #. In this area you find all network-related settings.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:246
-msgid "a_network1"
+msgid "In this area you find all network-related settings."
 msgstr "In this area you find all network-related settings."
 
 #. On most routers the network switch can be freely configured and splitted up into several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:247
-msgid "a_network2"
+msgid ""
+"On most routers the network switch can be freely configured and splitted up "
+"into several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s."
 msgstr ""
 "On most routers the network switch can be freely configured and splitted up "
 "into several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s."
 
 #. Interfaces and <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> / <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Settings allow a custom organisation of the network and connections to other networks like the internet.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:248
-msgid "a_network3"
+msgid ""
+"Interfaces and <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</"
+"abbr> / <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-"
+"Settings allow a custom organisation of the network and connections to other "
+"networks like the internet."
 msgstr ""
-"Interfaces and <abbr title=\"Point-to-Point Protocol over "
-"Ethernet\">PPPoE</abbr> / <abbr title=\"Point-to-Point Tunneling "
-"Protocol\">PPTP</abbr>-Settings allow a custom organisation of the network "
-"and connections to other networks like the internet."
+"Interfaces and <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</"
+"abbr> / <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-"
+"Settings allow a custom organisation of the network and connections to other "
+"networks like the internet."
 
 #. With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> devices in your local network can be automatically configured for network communication.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:249
-msgid "a_network4"
+msgid ""
+"With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> devices "
+"in your local network can be automatically configured for network "
+"communication."
 msgstr ""
 "With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> devices "
 "in your local network can be automatically configured for network "
@@ -1375,25 +1377,38 @@ msgstr ""
 
 #. Firewall and portforwarding can be used to secure your network while providing services to external networks.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:250
-msgid "a_network5"
+msgid ""
+"Firewall and portforwarding can be used to secure your network while "
+"providing services to external networks."
 msgstr ""
 "Firewall and portforwarding can be used to secure your network while "
 "providing services to external networks."
 
 #. The network ports on your router can be combined to several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s in which computers can communicate directly with each other. <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s are often used to separate different network segments. Often there is by default one Uplink port for a connection to the next greater network like the internet and other ports for a local network.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:251
-msgid "a_n_switch1"
+msgid ""
+"The network ports on your router can be combined to several <abbr title="
+"\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
+"communicate directly with each other. <abbr title=\"Virtual Local Area "
+"Network\">VLAN</abbr>s are often used to separate different network "
+"segments. Often there is by default one Uplink port for a connection to the "
+"next greater network like the internet and other ports for a local network."
 msgstr ""
-"The network ports on your router can be combined to several <abbr "
-"title=\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
+"The network ports on your router can be combined to several <abbr title="
+"\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
 "communicate directly with each other. <abbr title=\"Virtual Local Area "
-"Network\">VLAN</abbr>s are often used to separate different network segments. "
-"Often there is by default one Uplink port for a connection to the next "
-"greater network like the internet and other ports for a local network."
+"Network\">VLAN</abbr>s are often used to separate different network "
+"segments. Often there is by default one Uplink port for a connection to the "
+"next greater network like the internet and other ports for a local network."
 
 #. Ports belonging to a <abbr title=\"Virtual Local Area Network\">VLAN</abbr> are separated with spaces. The port with the highest number (usually 5) is oftern the connection to the internal network interface of the router. On devices with 5 ports often the one with the lowest number (0) is the predefined Uplink port.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:252
-msgid "network_switch_desc"
+msgid ""
+"Ports belonging to a <abbr title=\"Virtual Local Area Network\">VLAN</abbr> "
+"are separated with spaces. The port with the highest number (usually 5) is "
+"oftern the connection to the internal network interface of the router. On "
+"devices with 5 ports often the one with the lowest number (0) is the "
+"predefined Uplink port."
 msgstr ""
 "Ports belonging to a <abbr title=\"Virtual Local Area Network\">VLAN</abbr> "
 "are separated with spaces. The port with the highest number (usually 5) is "
@@ -1403,7 +1418,13 @@ msgstr ""
 
 #. On this page you can configure the network interfaces. You can bridge several interfaces by ticking the &quot;bridge interfaces&quot; field and enter the names of several network interfaces separated by spaces. You can also use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation <samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: <samp>eth0.1</samp>).
 #: i18n/english/luasrc/i18n/admin-core.en.lua:253
-msgid "a_n_ifaces1"
+msgid ""
+"On this page you can configure the network interfaces. You can bridge "
+"several interfaces by ticking the \"bridge interfaces\" field and enter the "
+"names of several network interfaces separated by spaces. You can also use "
+"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
+"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
+"<samp>eth0.1</samp>)."
 msgstr ""
 "On this page you can configure the network interfaces. You can bridge "
 "several interfaces by ticking the &quot;bridge interfaces&quot; field and "
@@ -1414,618 +1435,611 @@ msgstr ""
 
 #. Bridge interfaces
 #: i18n/english/luasrc/i18n/admin-core.en.lua:254
-msgid "a_n_i_bridge"
+msgid "Bridge interfaces"
 msgstr "Bridge interfaces"
 
 #. creates a bridge over specified interface(s)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:255
-msgid "a_n_i_bridge1"
+msgid "creates a bridge over specified interface(s)"
 msgstr "creates a bridge over specified interface(s)"
 
 #. Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>
-msgid "a_n_i_stp"
+msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 msgstr "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 
 #. Enables the Spanning Tree Protocol on this bridge
-msgid "a_n_i_stp1"
+msgid "Enables the Spanning Tree Protocol on this bridge"
 msgstr "Enables the Spanning Tree Protocol on this bridge"
 
 #. With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> network members can automatically receive their network settings (<abbr title=\"Internet Protocol\">IP</abbr>-address, netmask, <abbr title=\"Domain Name System\">DNS</abbr>-server, ...).
 #: i18n/english/luasrc/i18n/admin-core.en.lua:256
-msgid "dhcp_desc"
+msgid ""
+"With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> network "
+"members can automatically receive their network settings (<abbr title="
+"\"Internet Protocol\">IP</abbr>-address, netmask, <abbr title=\"Domain Name "
+"System\">DNS</abbr>-server, ...)."
 msgstr ""
 "With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> network "
-"members can automatically receive their network settings (<abbr "
-"title=\"Internet Protocol\">IP</abbr>-address, netmask, <abbr title=\"Domain "
-"Name System\">DNS</abbr>-server, ...)."
+"members can automatically receive their network settings (<abbr title="
+"\"Internet Protocol\">IP</abbr>-address, netmask, <abbr title=\"Domain Name "
+"System\">DNS</abbr>-server, ...)."
 
 #. Leasetime
 #: i18n/english/luasrc/i18n/admin-core.en.lua:257
-msgid "dhcp_dhcp_leasetime"
+msgid "Leasetime"
 msgstr "Leasetime"
 
 #. Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:258
-msgid "dhcp_dhcp_dynamicdhcp"
-msgstr "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
+msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
+msgstr ""
+"Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 
 #. Ignore interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:259
-msgid "dhcp_dhcp_ignore"
+msgid "Ignore interface"
 msgstr "Ignore interface"
 
 #. disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for this interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:260
-msgid "dhcp_dhcp_ignore_desc"
+msgid ""
+"disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
+"this interface"
 msgstr ""
 "disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
 "this interface"
 
 #. Force
 #: i18n/english/luasrc/i18n/admin-core.en.lua:261
-msgid "dhcp_dhcp_force"
+msgid "Force"
 msgstr "Force"
 
 #. first address (last octet)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:262
-msgid "dhcp_dhcp_start_desc"
+msgid "first address (last octet)"
 msgstr "first address (last octet)"
 
 #. number of leased addresses -1
 #: i18n/english/luasrc/i18n/admin-core.en.lua:263
-msgid "dhcp_dhcp_limit_desc"
+msgid "number of leased addresses -1"
 msgstr "number of leased addresses -1"
 
 #. DHCP-Options
 #: i18n/english/luasrc/i18n/admin-core.en.lua:264
-msgid "dhcp_dhcp_dhcpoption"
+msgid "DHCP-Options"
 msgstr "DHCP-Options"
 
 #. See &quot;dnsmasq --help dhcp&quot; for a list of available options.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:265
-msgid "dhcp_dhcp_dhcpoption_desc"
+msgid "See \"dnsmasq --help dhcp\" for a list of available options."
 msgstr "See &quot;dnsmasq --help dhcp&quot; for a list of available options."
 
 #. Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:266
-msgid "dhcp_leases"
+msgid "Leases"
 msgstr "Leases"
 
 #. Static Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:267
-msgid "luci_ethers"
+msgid "Static Leases"
 msgstr "Static Leases"
 
 #. Leasetime remaining
 #: i18n/english/luasrc/i18n/admin-core.en.lua:268
-msgid "dhcp_timeremain"
+msgid "Leasetime remaining"
 msgstr "Leasetime remaining"
 
 #. Active Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:269
-msgid "dhcp_leases_active"
+msgid "Active Leases"
 msgstr "Active Leases"
 
 #. Point-to-Point Connections
 #: i18n/english/luasrc/i18n/admin-core.en.lua:270
-msgid "a_n_ptp"
+msgid "Point-to-Point Connections"
 msgstr "Point-to-Point Connections"
 
 #. Point-to-Point connections with <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> or <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr> are often used to connect a device over <abbr title=\"Digital Subscriber Line\">DSL</abbr> or similar technologies to an internet access point.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:271
-msgid "a_n_ptp1"
+msgid ""
+"Point-to-Point connections with <abbr title=\"Point-to-Point Protocol over "
+"Ethernet\">PPPoE</abbr> or <abbr title=\"Point-to-Point Tunneling Protocol"
+"\">PPTP</abbr> are often used to connect a device over <abbr title=\"Digital "
+"Subscriber Line\">DSL</abbr> or similar technologies to an internet access "
+"point."
 msgstr ""
 "Point-to-Point connections with <abbr title=\"Point-to-Point Protocol over "
-"Ethernet\">PPPoE</abbr> or <abbr title=\"Point-to-Point Tunneling "
-"Protocol\">PPTP</abbr> are often used to connect a device over <abbr "
-"title=\"Digital Subscriber Line\">DSL</abbr> or similar technologies to an "
-"internet access point."
+"Ethernet\">PPPoE</abbr> or <abbr title=\"Point-to-Point Tunneling Protocol"
+"\">PPTP</abbr> are often used to connect a device over <abbr title=\"Digital "
+"Subscriber Line\">DSL</abbr> or similar technologies to an internet access "
+"point."
 
 #. You need to install &quot;comgt&quot; for UMTS/GPRS, &quot;ppp-mod-pppoe&quot; for PPPoE, &quot;ppp-mod-pppoa&quot; for PPPoA or &quot;pptp&quot; for PPtP support
 #: i18n/english/luasrc/i18n/admin-core.en.lua:272
-msgid "network_interface_prereq"
+msgid ""
+"You need to install \"comgt\" for UMTS/GPRS, \"ppp-mod-pppoe\" for PPPoE, "
+"\"ppp-mod-pppoa\" for PPPoA or \"pptp\" for PPtP support"
 msgstr ""
 "You need to install &quot;comgt&quot; for UMTS/GPRS, &quot;ppp-mod-"
-"pppoe&quot; for PPPoE, &quot;ppp-mod-pppoa&quot; for PPPoA or "
-"&quot;pptp&quot; for PPtP support"
+"pppoe&quot; for PPPoE, &quot;ppp-mod-pppoa&quot; for PPPoA or &quot;"
+"pptp&quot; for PPtP support"
 
 #. You need to install &quot;ppp-mod-pppoe&quot; for PPPoE or &quot;pptp&quot; for PPtP support
 #: i18n/english/luasrc/i18n/admin-core.en.lua:273
-msgid "network_interface_prereq_mini"
+msgid ""
+"You need to install \"ppp-mod-pppoe\" for PPPoE or \"pptp\" for PPtP support"
 msgstr ""
 "You need to install &quot;ppp-mod-pppoe&quot; for PPPoE or &quot;pptp&quot; "
 "for PPtP support"
 
-#. <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server
-#: i18n/english/luasrc/i18n/admin-core.en.lua:274
-msgid "network_interface_server"
-msgstr "<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"
-
 #. Automatic Disconnect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:275
-msgid "network_interface_demand"
+msgid "Automatic Disconnect"
 msgstr "Automatic Disconnect"
 
 #. Time (in seconds) after which an unused connection will be closed
 #: i18n/english/luasrc/i18n/admin-core.en.lua:276
-msgid "network_interface_demand_desc"
+msgid "Time (in seconds) after which an unused connection will be closed"
 msgstr "Time (in seconds) after which an unused connection will be closed"
 
 #. Keep-Alive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:277
-msgid "network_interface_keepalive"
+msgid "Keep-Alive"
 msgstr "Keep-Alive"
 
 #. Number of failed connection tests to initiate automatic reconnect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:278
-msgid "network_interface_keepalive_desc"
+msgid "Number of failed connection tests to initiate automatic reconnect"
 msgstr "Number of failed connection tests to initiate automatic reconnect"
 
 #. Modem device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:279
-msgid "network_interface_device"
+msgid "Modem device"
 msgstr "Modem device"
 
 #. The device node of your modem, e.g. /dev/ttyUSB0
 #: i18n/english/luasrc/i18n/admin-core.en.lua:280
-msgid "network_interface_device_desc"
+msgid "The device node of your modem, e.g. /dev/ttyUSB0"
 msgstr "The device node of your modem, e.g. /dev/ttyUSB0"
 
 #. Replace default route
 #: i18n/english/luasrc/i18n/admin-core.en.lua:281
-msgid "network_interface_defaultroute"
+msgid "Replace default route"
 msgstr "Replace default route"
 
 #. Let pppd replace the current default route to use the PPP interface after successful connect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:282
-msgid "network_interface_defaultroute_desc"
+msgid ""
+"Let pppd replace the current default route to use the PPP interface after "
+"successful connect"
 msgstr ""
 "Let pppd replace the current default route to use the PPP interface after "
 "successful connect"
 
 #. Use peer DNS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:283
-msgid "network_interface_peerdns"
+msgid "Use peer DNS"
 msgstr "Use peer DNS"
 
 #. Configure the local DNS server to use the name servers adverticed by the PPP peer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:284
-msgid "network_interface_peerdns_desc"
+msgid ""
+"Configure the local DNS server to use the name servers adverticed by the PPP "
+"peer"
 msgstr ""
 "Configure the local DNS server to use the name servers adverticed by the PPP "
 "peer"
 
 #. Enable IPv6 on PPP link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:285
-msgid "network_interface_ipv6"
+msgid "Enable IPv6 on PPP link"
 msgstr "Enable IPv6 on PPP link"
 
 #. Connect script
 #: i18n/english/luasrc/i18n/admin-core.en.lua:286
-msgid "network_interface_connect"
+msgid "Connect script"
 msgstr "Connect script"
 
 #. Let pppd run this script after establishing the PPP link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:287
-msgid "network_interface_connect_desc"
+msgid "Let pppd run this script after establishing the PPP link"
 msgstr "Let pppd run this script after establishing the PPP link"
 
 #. Disconnect script
 #: i18n/english/luasrc/i18n/admin-core.en.lua:288
-msgid "network_interface_disconnect"
+msgid "Disconnect script"
 msgstr "Disconnect script"
 
 #. Let pppd run this script before tearing down the PPP link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:289
-msgid "network_interface_disconnect_desc"
+msgid "Let pppd run this script before tearing down the PPP link"
 msgstr "Let pppd run this script before tearing down the PPP link"
 
 #. Additional pppd options
 #: i18n/english/luasrc/i18n/admin-core.en.lua:290
-msgid "network_interface_pppd_options"
+msgid "Additional pppd options"
 msgstr "Additional pppd options"
 
 #. Specify additional command line arguments for pppd here
 #: i18n/english/luasrc/i18n/admin-core.en.lua:291
-msgid "network_interface_pppd_options_desc"
+msgid "Specify additional command line arguments for pppd here"
 msgstr "Specify additional command line arguments for pppd here"
 
 #. Access point (APN)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:292
-msgid "network_interface_apn"
+msgid "Access point (APN)"
 msgstr "Access point (APN)"
 
 #. PIN code
 #: i18n/english/luasrc/i18n/admin-core.en.lua:293
-msgid "network_interface_pincode"
+msgid "PIN code"
 msgstr "PIN code"
 
 #. Make sure that you provide the correct pin code here or you might lock your sim card!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:294
-msgid "network_interface_pincode_desc"
+msgid ""
+"Make sure that you provide the correct pin code here or you might lock your "
+"sim card!"
 msgstr ""
 "Make sure that you provide the correct pin code here or you might lock your "
 "sim card!"
 
 #. Service type
 #: i18n/english/luasrc/i18n/admin-core.en.lua:295
-msgid "network_interface_service"
+msgid "Service type"
 msgstr "Service type"
 
 #. Setup wait time
 #: i18n/english/luasrc/i18n/admin-core.en.lua:296
-msgid "network_interface_maxwait"
+msgid "Setup wait time"
 msgstr "Setup wait time"
 
 #. Seconds to wait for the modem to become ready before attempting to connect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:297
-msgid "network_interface_maxwait_desc"
+msgid ""
+"Seconds to wait for the modem to become ready before attempting to connect"
 msgstr ""
 "Seconds to wait for the modem to become ready before attempting to connect"
 
 #. PPPoA Encapsulation
 #: i18n/english/luasrc/i18n/admin-core.en.lua:298
-msgid "network_interface_encaps"
+msgid "PPPoA Encapsulation"
 msgstr "PPPoA Encapsulation"
 
 #. Routes specify over which interface and gateway a certain host or network can be reached.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:299
-msgid "a_n_r_routes1"
+msgid ""
+"Routes specify over which interface and gateway a certain host or network "
+"can be reached."
 msgstr ""
 "Routes specify over which interface and gateway a certain host or network "
 "can be reached."
 
 #. Static Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:300
-msgid "a_n_routes_static"
+msgid "Static Routes"
 msgstr "Static Routes"
 
 #. Static IPv4 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:301
-msgid "a_n_routes_static4"
+msgid "Static IPv4 Routes"
 msgstr "Static IPv4 Routes"
 
 #. Static IPv6 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:302
-msgid "a_n_routes_static6"
+msgid "Static IPv6 Routes"
 msgstr "Static IPv6 Routes"
 
 #. Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:303
-msgid "a_n_routes_kernel4"
+msgid "Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes"
 msgstr "Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes"
 
 #. Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:304
-msgid "a_n_routes_kernel6"
+msgid "Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes"
 msgstr "Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes"
 
 #. Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:305
-msgid "a_n_r_target1"
+msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
 msgstr "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
 
 #. <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network (CIDR)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:306
-msgid "a_n_r_target6"
+msgid ""
+"<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network "
+"(CIDR)"
 msgstr ""
 "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network "
 "(CIDR)"
 
 #. if target is a network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:307
-msgid "a_n_r_netmask1"
+msgid "if target is a network"
 msgstr "if target is a network"
 
 #. Internet Connection
 #: i18n/english/luasrc/i18n/admin-core.en.lua:308
-msgid "m_n_inet"
+msgid "Internet Connection"
 msgstr "Internet Connection"
 
 #. Local Network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:309
-msgid "m_n_local"
+msgid "Local Network"
 msgstr "Local Network"
 
 #. Route
 #: i18n/english/luasrc/i18n/admin-core.en.lua:310
-msgid "m_n_route"
+msgid "Route"
 msgstr "Route"
 
-#. Bridge
-#: i18n/english/luasrc/i18n/admin-core.en.lua:311
-msgid "m_n_brdige"
-msgstr "Bridge"
-
 #. Provide (Access Point)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:312
-msgid "m_w_ap"
+msgid "Provide (Access Point)"
 msgstr "Provide (Access Point)"
 
 #. Independent (Ad-Hoc)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:313
-msgid "m_w_adhoc"
+msgid "Independent (Ad-Hoc)"
 msgstr "Independent (Ad-Hoc)"
 
 #. Join (Client)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:314
-msgid "m_w_client"
+msgid "Join (Client)"
 msgstr "Join (Client)"
 
 #. Distributed (<abbr title=\"Wireless Distribution System\">WDS</abbr>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:315
-msgid "m_w_wds"
+msgid "Distributed (<abbr title=\"Wireless Distribution System\">WDS</abbr>)"
 msgstr "Distributed (<abbr title=\"Wireless Distribution System\">WDS</abbr>)"
 
 #. Clientmode
 #: i18n/english/luasrc/i18n/admin-core.en.lua:316
-msgid "m_w_clientmode"
+msgid "Clientmode"
 msgstr "Clientmode"
 
 #. System log buffer size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:317
-msgid "system_system_logsize"
+msgid "System log buffer size"
 msgstr "System log buffer size"
 
 #. External system log server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:318
-msgid "system_system_logip"
+msgid "External system log server"
 msgstr "External system log server"
 
 #. Log output level
 #: i18n/english/luasrc/i18n/admin-core.en.lua:319
-msgid "system_system_conloglevel"
+msgid "Log output level"
 msgstr "Log output level"
 
 #. Level of log messages on the console
 #: i18n/english/luasrc/i18n/admin-core.en.lua:320
-msgid "system_system_conloglevel_desc"
+msgid "Level of log messages on the console"
 msgstr "Level of log messages on the console"
 
 #. Processor
 #: i18n/english/luasrc/i18n/admin-core.en.lua:321
-msgid "m_i_processor"
+msgid "Processor"
 msgstr "Processor"
 
 #. Memory
 #: i18n/english/luasrc/i18n/admin-core.en.lua:322
-msgid "m_i_memory"
+msgid "Memory"
 msgstr "Memory"
 
 #. Local Time
 #: i18n/english/luasrc/i18n/admin-core.en.lua:323
-msgid "m_i_systemtime"
+msgid "Local Time"
 msgstr "Local Time"
 
 #. Uptime
 #: i18n/english/luasrc/i18n/admin-core.en.lua:324
-msgid "m_i_uptime"
+msgid "Uptime"
 msgstr "Uptime"
 
 #. First leased address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:325
-msgid "m_n_d_firstaddress"
+msgid "First leased address"
 msgstr "First leased address"
 
 #. Number of leased addresses
 #: i18n/english/luasrc/i18n/admin-core.en.lua:326
-msgid "m_n_d_numleases"
+msgid "Number of leased addresses"
 msgstr "Number of leased addresses"
 
 #. Routing table
 #: i18n/english/luasrc/i18n/admin-core.en.lua:327
-msgid "routingtable"
+msgid "Routing table"
 msgstr "Routing table"
 
 #. Wifi scan
 #: i18n/english/luasrc/i18n/admin-core.en.lua:328
-msgid "wlanscan"
+msgid "Wifi scan"
 msgstr "Wifi scan"
 
 #. Frequency
 #: i18n/english/luasrc/i18n/admin-core.en.lua:329
-msgid "frequency"
+msgid "Frequency"
 msgstr "Frequency"
 
 #. Power
 #: i18n/english/luasrc/i18n/admin-core.en.lua:330
-msgid "power"
+msgid "Power"
 msgstr "Power"
 
-#. Noise
-#: i18n/english/luasrc/i18n/admin-core.en.lua:331
-msgid "noise"
-msgstr "Noise"
-
-#. Signal
-#: i18n/english/luasrc/i18n/admin-core.en.lua:332
-msgid "signal"
-msgstr "Signal"
-
-#. Link
-#: i18n/english/luasrc/i18n/admin-core.en.lua:333
-msgid "link"
-msgstr "Link"
-
 #. <abbr title=\"Fragmentation\">Frag.</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:334
-msgid "frag"
+msgid "<abbr title=\"Fragmentation\">Frag.</abbr>"
 msgstr "<abbr title=\"Fragmentation\">Frag.</abbr>"
 
 #. <abbr title=\"Request To Send\">RTS</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:335
-msgid "rts"
+msgid "<abbr title=\"Request To Send\">RTS</abbr>"
 msgstr "<abbr title=\"Request To Send\">RTS</abbr>"
 
 #. Bitrate
 #: i18n/english/luasrc/i18n/admin-core.en.lua:336
-msgid "bitrate"
+msgid "Bitrate"
 msgstr "Bitrate"
 
 #. automatically reconnect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:337
-msgid "m_n_keepalive"
+msgid "automatically reconnect"
 msgstr "automatically reconnect"
 
 #. disconnect when idle for
 #: i18n/english/luasrc/i18n/admin-core.en.lua:338
-msgid "m_n_dialondemand"
+msgid "disconnect when idle for"
 msgstr "disconnect when idle for"
 
-#. <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server
-#: i18n/english/luasrc/i18n/admin-core.en.lua:339
-msgid "m_n_pptp_server"
-msgstr "<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"
-
 #. <abbr title=\"Light Emitting Diode\">LED</abbr> Configuration
 #: i18n/english/luasrc/i18n/admin-core.en.lua:340
-msgid "leds"
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 
 #. Customizes the behaviour of the device <abbr title=\"Light Emitting Diode\">LED</abbr>s if possible.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:341
-msgid "leds_desc"
+msgid ""
+"Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
+"\">LED</abbr>s if possible."
 msgstr ""
-"Customizes the behaviour of the device <abbr title=\"Light Emitting "
-"Diode\">LED</abbr>s if possible."
+"Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
+"\">LED</abbr>s if possible."
 
 #. <abbr title=\"Light Emitting Diode\">LED</abbr> Name
 #: i18n/english/luasrc/i18n/admin-core.en.lua:342
-msgid "system_led_name"
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 
 #. <abbr title=\"Light Emitting Diode\">LED</abbr> Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:343
-msgid "system_led_sysfs"
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Device"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Device"
 
 #. Default state
 #: i18n/english/luasrc/i18n/admin-core.en.lua:344
-msgid "system_led_default"
+msgid "Default state"
 msgstr "Default state"
 
 #. ticked = on
 #: i18n/english/luasrc/i18n/admin-core.en.lua:345
-msgid "system_led_default_desc"
+msgid "ticked = on"
 msgstr "ticked = on"
 
 #. Trigger
 #: i18n/english/luasrc/i18n/admin-core.en.lua:346
-msgid "system_led_trigger"
+msgid "Trigger"
 msgstr "Trigger"
 
 #. None
 #: i18n/english/luasrc/i18n/admin-core.en.lua:347
-msgid "system_led_trigger_none"
+msgid "None"
 msgstr "None"
 
 #. Default On
 #: i18n/english/luasrc/i18n/admin-core.en.lua:348
-msgid "system_led_trigger_defaulton"
+msgid "Default On"
 msgstr "Default On"
 
 #. Timer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:349
-msgid "system_led_trigger_timer"
+msgid "Timer"
 msgstr "Timer"
 
 #. Heartbeat (Load Average)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:350
-msgid "system_led_trigger_heartbeat"
+msgid "Heartbeat (Load Average)"
 msgstr "Heartbeat (Load Average)"
 
 #. Network Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:351
-msgid "system_led_trigger_netdev"
+msgid "Network Device"
 msgstr "Network Device"
 
 #. Off-State Delay
 #: i18n/english/luasrc/i18n/admin-core.en.lua:352
-msgid "system_led_delayoff"
+msgid "Off-State Delay"
 msgstr "Off-State Delay"
 
 #. Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is off
 #: i18n/english/luasrc/i18n/admin-core.en.lua:353
-msgid "system_led_delayoff_desc"
-msgstr "Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is off"
+msgid "Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is off"
+msgstr ""
+"Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is off"
 
 #. On-State Delay
 #: i18n/english/luasrc/i18n/admin-core.en.lua:354
-msgid "system_led_delayon"
+msgid "On-State Delay"
 msgstr "On-State Delay"
 
 #. Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is on
 #: i18n/english/luasrc/i18n/admin-core.en.lua:355
-msgid "system_led_delayon_desc"
+msgid "Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is on"
 msgstr "Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is on"
 
-#. Device
-#: i18n/english/luasrc/i18n/admin-core.en.lua:356
-msgid "system_led_dev"
-msgstr "Device"
-
 #. Trigger Mode
 #: i18n/english/luasrc/i18n/admin-core.en.lua:357
-msgid "system_led_mode"
+msgid "Trigger Mode"
 msgstr "Trigger Mode"
 
 #. Link On
 #: i18n/english/luasrc/i18n/admin-core.en.lua:358
-msgid "system_led_mode_link"
+msgid "Link On"
 msgstr "Link On"
 
 #. Transmit
 #: i18n/english/luasrc/i18n/admin-core.en.lua:359
-msgid "system_led_mode_tx"
+msgid "Transmit"
 msgstr "Transmit"
 
 #. Receive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:360
-msgid "system_led_mode_rx"
+msgid "Receive"
 msgstr "Receive"
 
 #. Active
 #: i18n/english/luasrc/i18n/admin-core.en.lua:361
-msgid "network_interface_up"
+msgid "Active"
 msgstr "Active"
 
 #. <abbr title=\"Media Access Control\">MAC</abbr>-Address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:362
-msgid "network_interface_hwaddr"
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 
 #. Hardware Address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:363
-msgid "network_interface_hwaddr_desc"
+msgid "Hardware Address"
 msgstr "Hardware Address"
 
-#. Traffic
-#: i18n/english/luasrc/i18n/admin-core.en.lua:364
-msgid "network_interface_txrx"
-msgstr "Traffic"
-
 #. transmitted / received
 #: i18n/english/luasrc/i18n/admin-core.en.lua:365
-msgid "network_interface_txrx_desc"
+msgid "transmitted / received"
 msgstr "transmitted / received"
 
 #. Errors
 #: i18n/english/luasrc/i18n/admin-core.en.lua:366
-msgid "network_interface_err"
+msgid "Errors"
 msgstr "Errors"
 
 #. TX / RX
 #: i18n/english/luasrc/i18n/admin-core.en.lua:367
-msgid "network_interface_err_desc"
+msgid "TX / RX"
 msgstr "TX / RX"
 
 #. Create / Assign firewall-zone
 #: i18n/english/luasrc/i18n/admin-core.en.lua:368
-msgid "network_interface_fwzone"
+msgid "Create / Assign firewall-zone"
 msgstr "Create / Assign firewall-zone"
 
 #. Choose the firewall zone you want to assign to this interface. Select <em>unspecified</em> to remove the interface from the associated zone or fill out the <em>create</em> field to define a new zone and attach the interface to it.
-msgid "network_interface_fwzone_desc"
+msgid ""
+"Choose the firewall zone you want to assign to this interface. Select "
+"<em>unspecified</em> to remove the interface from the associated zone or "
+"fill out the <em>create</em> field to define a new zone and attach the "
+"interface to it."
 msgstr ""
 "Choose the firewall zone you want to assign to this interface. Select "
 "<em>unspecified</em> to remove the interface from the associated zone or "
@@ -2034,205 +2048,217 @@ msgstr ""
 
 #. Processes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:370
-msgid "process_head"
+msgid "Processes"
 msgstr "Processes"
 
 #. This list gives an overview over currently running system processes and their status.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:371
-msgid "process_descr"
+msgid ""
+"This list gives an overview over currently running system processes and "
+"their status."
 msgstr ""
 "This list gives an overview over currently running system processes and "
 "their status."
 
 #. PID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:372
-msgid "process_pid"
+msgid "PID"
 msgstr "PID"
 
 #. Owner
 #: i18n/english/luasrc/i18n/admin-core.en.lua:373
-msgid "process_owner"
+msgid "Owner"
 msgstr "Owner"
 
 #. Command
 #: i18n/english/luasrc/i18n/admin-core.en.lua:374
-msgid "process_command"
+msgid "Command"
 msgstr "Command"
 
 #. CPU usage (%)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:375
-msgid "process_cpu"
+msgid "CPU usage (%)"
 msgstr "CPU usage (%)"
 
 #. Memory usage (%)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:376
-msgid "process_mem"
+msgid "Memory usage (%)"
 msgstr "Memory usage (%)"
 
 #. Hang Up
 #: i18n/english/luasrc/i18n/admin-core.en.lua:377
-msgid "process_hup"
+msgid "Hang Up"
 msgstr "Hang Up"
 
 #. Terminate
 #: i18n/english/luasrc/i18n/admin-core.en.lua:378
-msgid "process_term"
+msgid "Terminate"
 msgstr "Terminate"
 
 #. Kill
 #: i18n/english/luasrc/i18n/admin-core.en.lua:379
-msgid "process_kill"
+msgid "Kill"
 msgstr "Kill"
 
 #. cached
 #: i18n/english/luasrc/i18n/admin-core.en.lua:380
-msgid "mem_cached"
+msgid "cached"
 msgstr "cached"
 
 #. buffered
 #: i18n/english/luasrc/i18n/admin-core.en.lua:381
-msgid "mem_buffered"
+msgid "buffered"
 msgstr "buffered"
 
 #. free
 #: i18n/english/luasrc/i18n/admin-core.en.lua:382
-msgid "mem_free"
+msgid "free"
 msgstr "free"
 
 #. Scheduled Tasks
 #: i18n/english/luasrc/i18n/admin-core.en.lua:383
-msgid "a_s_crontab"
+msgid "Scheduled Tasks"
 msgstr "Scheduled Tasks"
 
 #. This is the system crontab in which scheduled tasks can be defined.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:384
-msgid "a_s_crontab1"
+msgid "This is the system crontab in which scheduled tasks can be defined."
 msgstr "This is the system crontab in which scheduled tasks can be defined."
 
 #. NAS ID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:385
-msgid "a_w_nasid"
+msgid "NAS ID"
 msgstr "NAS ID"
 
 #. Path to CA-Certificate
 #: i18n/english/luasrc/i18n/admin-core.en.lua:386
-msgid "a_w_cacert"
+msgid "Path to CA-Certificate"
 msgstr "Path to CA-Certificate"
 
 #. EAP-Method
 #: i18n/english/luasrc/i18n/admin-core.en.lua:387
-msgid "a_w_eaptype"
+msgid "EAP-Method"
 msgstr "EAP-Method"
 
 #. Path to Private Key
 #: i18n/english/luasrc/i18n/admin-core.en.lua:388
-msgid "a_w_tlsprivkey"
+msgid "Path to Private Key"
 msgstr "Path to Private Key"
 
 #. Password of Private Key
 #: i18n/english/luasrc/i18n/admin-core.en.lua:389
-msgid "a_w_tlsprivkeypwd"
+msgid "Password of Private Key"
 msgstr "Password of Private Key"
 
 #. Authentication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:390
-msgid "a_w_peapauth"
+msgid "Authentication"
 msgstr "Authentication"
 
 #. Identity
 #: i18n/english/luasrc/i18n/admin-core.en.lua:391
-msgid "a_w_peapidentity"
+msgid "Identity"
 msgstr "Identity"
 
 #. Password
 #: i18n/english/luasrc/i18n/admin-core.en.lua:392
-msgid "a_w_peappassword"
+msgid "Password"
 msgstr "Password"
 
 #. Create Network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:393
-msgid "a_w_create"
+msgid "Create Network"
 msgstr "Create Network"
 
 #. Hostnames
 #: i18n/english/luasrc/i18n/admin-core.en.lua:394
-msgid "hostnames"
+msgid "Hostnames"
 msgstr "Hostnames"
 
 #. Host entries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:395
-msgid "hostnames_entries"
+msgid "Host entries"
 msgstr "Host entries"
 
 #. Hostname
 #: i18n/english/luasrc/i18n/admin-core.en.lua:396
-msgid "hostnames_hostname"
+msgid "Hostname"
 msgstr "Hostname"
 
 #. IP address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:397
-msgid "hostnames_address"
+msgid "IP address"
 msgstr "IP address"
 
 #. Clamp Segment Size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:398
-msgid "m_n_mssfix"
+msgid "Clamp Segment Size"
 msgstr "Clamp Segment Size"
 
 #. Fixes problems with unreachable websites, submitting forms or other unexpected behaviour for some ISPs.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:399
-msgid "m_n_mssfix_desc"
+msgid ""
+"Fixes problems with unreachable websites, submitting forms or other "
+"unexpected behaviour for some ISPs."
 msgstr ""
 "Fixes problems with unreachable websites, submitting forms or other "
 "unexpected behaviour for some ISPs."
 
 #. Flash Firmware
 #: i18n/english/luasrc/i18n/admin-core.en.lua:400
-msgid "admin_upgrade"
+msgid "Flash Firmware"
 msgstr "Flash Firmware"
 
 #. The uploaded image file does not contain a supported format. Make sure that you choose the generic image format for your platform.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:401
-msgid "admin_upgrade_badimage"
+msgid ""
+"The uploaded image file does not contain a supported format. Make sure that "
+"you choose the generic image format for your platform."
 msgstr ""
 "The uploaded image file does not contain a supported format. Make sure that "
 "you choose the generic image format for your platform."
 
 #. Checksum
 #: i18n/english/luasrc/i18n/admin-core.en.lua:402
-msgid "admin_upgrade_checksum"
+msgid "Checksum"
 msgstr "Checksum"
 
 #. Upload an OpenWrt image file to reflash the device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:403
-msgid "admin_upgrade_desc"
+msgid "Upload an OpenWrt image file to reflash the device."
 msgstr "Upload an OpenWrt image file to reflash the device."
 
 #. Size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:404
-msgid "admin_upgrade_filesize"
+msgid "Size"
 msgstr "Size"
 
 #. Firmware image
 #: i18n/english/luasrc/i18n/admin-core.en.lua:405
-msgid "admin_upgrade_fwimage"
+msgid "Firmware image"
 msgstr "Firmware image"
 
 #. Keep configuration files
 #: i18n/english/luasrc/i18n/admin-core.en.lua:406
-msgid "admin_upgrade_keepcfg"
+msgid "Keep configuration files"
 msgstr "Keep configuration files"
 
 #. Sorry. OpenWrt does not support a system upgrade on this platform.<br /> You need to manually flash your device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:407
-msgid "admin_upgrade_nosupport"
+msgid ""
+"Sorry. OpenWrt does not support a system upgrade on this platform.<br /> You "
+"need to manually flash your device."
 msgstr ""
 "Sorry. OpenWrt does not support a system upgrade on this platform.<br /> You "
 "need to manually flash your device."
 
 #. The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a few minutes until you try to reconnect. It might be necessary to renew the address of your computer to reach the device again, depending on your settings.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:408
-msgid "admin_upgrade_running"
+msgid ""
+"The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
+"few minutes until you try to reconnect. It might be necessary to renew the "
+"address of your computer to reach the device again, depending on your "
+"settings."
 msgstr ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
 "few minutes until you try to reconnect. It might be necessary to renew the "
@@ -2241,19 +2267,21 @@ msgstr ""
 
 #.  (%s available)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:409
-msgid "admin_upgrade_spaceavail"
+msgid " (%s available)"
 msgstr " (%s available)"
 
 #. It appears that you try to flash an image that does not fit into the flash memory, please verify the image file!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:410
-msgid "admin_upgrade_toolarge"
+msgid ""
+"It appears that you try to flash an image that does not fit into the flash "
+"memory, please verify the image file!"
 msgstr ""
 "It appears that you try to flash an image that does not fit into the flash "
 "memory, please verify the image file!"
 
 #. Upload image
 #: i18n/english/luasrc/i18n/admin-core.en.lua:411
-msgid "admin_upgrade_upload"
+msgid "Upload image"
 msgstr "Upload image"
 
 #. The flash image was uploaded. Below is the checksum and file size listed, compare them with the original file to ensure data integrity.<br /> Click \"Proceed\" below to start the flash procedure.
diff --git a/po/en/asterisk.po b/po/en/asterisk.po
index fa1954550..aa6f26f16 100644
--- a/po/en/asterisk.po
+++ b/po/en/asterisk.po
@@ -14,1252 +14,1252 @@ msgstr ""
 
 #. Asterisk General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:1
-msgid "asterisk_asterisk"
+msgid "Asterisk General Options"
 msgstr "Asterisk General Options"
 
 #. AGI directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:2
-msgid "asterisk_asterisk_agidir"
+msgid "AGI directory"
 msgstr "AGI directory"
 
 #. Cache recorded sound files during recording
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:3
-msgid "asterisk_asterisk_cacherecordfiles"
+msgid "Cache recorded sound files during recording"
 msgstr "Cache recorded sound files during recording"
 
 #. Debug Level
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:4
-msgid "asterisk_asterisk_debug"
+msgid "Debug Level"
 msgstr "Debug Level"
 
 #. Disable some warnings
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:5
-msgid "asterisk_asterisk_dontwarn"
+msgid "Disable some warnings"
 msgstr "Disable some warnings"
 
 #. Dump core on crash
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:6
-msgid "asterisk_asterisk_dumpcore"
+msgid "Dump core on crash"
 msgstr "Dump core on crash"
 
 #. High Priority
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:7
-msgid "asterisk_asterisk_highpriority"
+msgid "High Priority"
 msgstr "High Priority"
 
 #. Initialise Crypto
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:8
-msgid "asterisk_asterisk_initcrypto"
+msgid "Initialise Crypto"
 msgstr "Initialise Crypto"
 
 #. Use Internal Timing
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:9
-msgid "asterisk_asterisk_internaltiming"
+msgid "Use Internal Timing"
 msgstr "Use Internal Timing"
 
 #. Log directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:10
-msgid "asterisk_asterisk_logdir"
+msgid "Log directory"
 msgstr "Log directory"
 
 #. Maximum number of calls allowed
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:11
-msgid "asterisk_asterisk_maxcalls"
+msgid "Maximum number of calls allowed"
 msgstr "Maximum number of calls allowed"
 
 #. Maximum load to stop accepting new calls
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:12
-msgid "asterisk_asterisk_maxload"
+msgid "Maximum load to stop accepting new calls"
 msgstr "Maximum load to stop accepting new calls"
 
 #. Disable console colors
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:13
-msgid "asterisk_asterisk_nocolor"
+msgid "Disable console colors"
 msgstr "Disable console colors"
 
 #. Sound files Cache directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:14
-msgid "asterisk_asterisk_recordcachedir"
+msgid "Sound files Cache directory"
 msgstr "Sound files Cache directory"
 
 #. The Group to run as
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:15
-msgid "asterisk_asterisk_rungroup"
+msgid "The Group to run as"
 msgstr "The Group to run as"
 
 #. The User to run as
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:16
-msgid "asterisk_asterisk_runuser"
+msgid "The User to run as"
 msgstr "The User to run as"
 
 #. Voicemail Spool directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:17
-msgid "asterisk_asterisk_spooldir"
+msgid "Voicemail Spool directory"
 msgstr "Voicemail Spool directory"
 
 #. Prefix UniquID with system name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:18
-msgid "asterisk_asterisk_systemname"
+msgid "Prefix UniquID with system name"
 msgstr "Prefix UniquID with system name"
 
 #. Build transcode paths via SLINEAR, not directly
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:19
-msgid "asterisk_asterisk_transcodeviasln"
+msgid "Build transcode paths via SLINEAR, not directly"
 msgstr "Build transcode paths via SLINEAR, not directly"
 
 #. Transmit SLINEAR silence while recording a channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:20
-msgid "asterisk_asterisk_transmitsilenceduringrecord"
+msgid "Transmit SLINEAR silence while recording a channel"
 msgstr "Transmit SLINEAR silence while recording a channel"
 
 #. Verbose Level
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:21
-msgid "asterisk_asterisk_verbose"
+msgid "Verbose Level"
 msgstr "Verbose Level"
 
 #. Time Zone
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:22
-msgid "asterisk_asterisk_zone"
+msgid "Time Zone"
 msgstr "Time Zone"
 
 #. Section dialplan
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:23
-msgid "asterisk_dialplan"
+msgid "Section dialplan"
 msgstr "Section dialplan"
 
 #. include
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:24
-msgid "asterisk_dialplan_include"
+msgid "include"
 msgstr "include"
 
 #. Dialplan Extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:25
-msgid "asterisk_dialplanexten"
+msgid "Dialplan Extension"
 msgstr "Dialplan Extension"
 
 #. Dialplan General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:26
-msgid "asterisk_dialplangeneral"
+msgid "Dialplan General Options"
 msgstr "Dialplan General Options"
 
 #. Allow transfer
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:27
-msgid "asterisk_dialplangeneral_allowtransfer"
+msgid "Allow transfer"
 msgstr "Allow transfer"
 
 #. Reinvite/redirect media connections
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:28
-msgid "asterisk_dialplangeneral_canreinvite"
+msgid "Reinvite/redirect media connections"
 msgstr "Reinvite/redirect media connections"
 
 #. Clear global vars
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:29
-msgid "asterisk_dialplangeneral_clearglobalvars"
+msgid "Clear global vars"
 msgstr "Clear global vars"
 
 #. Dialplan Goto
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:30
-msgid "asterisk_dialplangoto"
+msgid "Dialplan Goto"
 msgstr "Dialplan Goto"
 
 #. Dialplan Conference
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:31
-msgid "asterisk_dialplanmeetme"
+msgid "Dialplan Conference"
 msgstr "Dialplan Conference"
 
 #. Dialplan Time
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:32
-msgid "asterisk_dialplansaytime"
+msgid "Dialplan Time"
 msgstr "Dialplan Time"
 
 #. Dialplan Voicemail
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:33
-msgid "asterisk_dialplanvoice"
+msgid "Dialplan Voicemail"
 msgstr "Dialplan Voicemail"
 
 #. Dial Zones for Dialplan
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:34
-msgid "asterisk_dialzone"
+msgid "Dial Zones for Dialplan"
 msgstr "Dial Zones for Dialplan"
 
 #. Prefix to add matching dialplans
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:35
-msgid "asterisk_dialzone_addprefix"
+msgid "Prefix to add matching dialplans"
 msgstr "Prefix to add matching dialplans"
 
 #. Match International prefix
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:36
-msgid "asterisk_dialzone_international"
+msgid "Match International prefix"
 msgstr "Match International prefix"
 
 #. Prefix (0) to add/remove to/from international numbers
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:37
-msgid "asterisk_dialzone_localprefix"
+msgid "Prefix (0) to add/remove to/from international numbers"
 msgstr "Prefix (0) to add/remove to/from international numbers"
 
 #. localzone
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:38
-msgid "asterisk_dialzone_localzone"
+msgid "localzone"
 msgstr "localzone"
 
 #. Match plan
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:39
-msgid "asterisk_dialzone_match"
+msgid "Match plan"
 msgstr "Match plan"
 
 #. Connection to use
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:40
-msgid "asterisk_dialzone_uses"
+msgid "Connection to use"
 msgstr "Connection to use"
 
 #. Feature Key maps
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:41
-msgid "asterisk_featuremap"
+msgid "Feature Key maps"
 msgstr "Feature Key maps"
 
 #. Attended transfer key
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:42
-msgid "asterisk_featuremap_atxfer"
+msgid "Attended transfer key"
 msgstr "Attended transfer key"
 
 #. Blind transfer key
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:43
-msgid "asterisk_featuremap_blindxfer"
+msgid "Blind transfer key"
 msgstr "Blind transfer key"
 
 #. Key to Disconnect call
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:44
-msgid "asterisk_featuremap_disconnect"
+msgid "Key to Disconnect call"
 msgstr "Key to Disconnect call"
 
 #. Key to Park call
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:45
-msgid "asterisk_featuremap_parkcall"
+msgid "Key to Park call"
 msgstr "Key to Park call"
 
 #. Parking Feature
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:46
-msgid "asterisk_featurepark"
+msgid "Parking Feature"
 msgstr "Parking Feature"
 
 #. ADSI Park
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:47
-msgid "asterisk_featurepark_adsipark"
+msgid "ADSI Park"
 msgstr "ADSI Park"
 
 #. Attended transfer timeout (sec)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:48
-msgid "asterisk_featurepark_atxfernoanswertimeout"
+msgid "Attended transfer timeout (sec)"
 msgstr "Attended transfer timeout (sec)"
 
 #. One touch record key
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:49
-msgid "asterisk_featurepark_automon"
+msgid "One touch record key"
 msgstr "One touch record key"
 
 #. Name of call context for parking
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:50
-msgid "asterisk_featurepark_context"
+msgid "Name of call context for parking"
 msgstr "Name of call context for parking"
 
 #. Sound file to play to parked caller
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:51
-msgid "asterisk_featurepark_courtesytone"
+msgid "Sound file to play to parked caller"
 msgstr "Sound file to play to parked caller"
 
 #. Max time (ms) between digits for feature activation
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:52
-msgid "asterisk_featurepark_featuredigittimeout"
+msgid "Max time (ms) between digits for feature activation"
 msgstr "Max time (ms) between digits for feature activation"
 
 #. Method to Find Parking slot
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:53
-msgid "asterisk_featurepark_findslot"
+msgid "Method to Find Parking slot"
 msgstr "Method to Find Parking slot"
 
 #. parkedmusicclass
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:54
-msgid "asterisk_featurepark_parkedmusicclass"
+msgid "parkedmusicclass"
 msgstr "parkedmusicclass"
 
 #. Play courtesy tone to
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:55
-msgid "asterisk_featurepark_parkedplay"
+msgid "Play courtesy tone to"
 msgstr "Play courtesy tone to"
 
 #. Enable Parking
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:56
-msgid "asterisk_featurepark_parkenabled"
+msgid "Enable Parking"
 msgstr "Enable Parking"
 
 #. Extension to dial to park
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:57
-msgid "asterisk_featurepark_parkext"
+msgid "Extension to dial to park"
 msgstr "Extension to dial to park"
 
 #. Parking time (secs)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:58
-msgid "asterisk_featurepark_parkingtime"
+msgid "Parking time (secs)"
 msgstr "Parking time (secs)"
 
 #. Range of extensions for call parking
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:59
-msgid "asterisk_featurepark_parkpos"
+msgid "Range of extensions for call parking"
 msgstr "Range of extensions for call parking"
 
 #. Pickup extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:60
-msgid "asterisk_featurepark_pickupexten"
+msgid "Pickup extension"
 msgstr "Pickup extension"
 
 #. Seconds to wait bewteen digits when transferring
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:61
-msgid "asterisk_featurepark_transferdigittimeout"
+msgid "Seconds to wait bewteen digits when transferring"
 msgstr "Seconds to wait bewteen digits when transferring"
 
 #. sound when attended transfer is complete
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:62
-msgid "asterisk_featurepark_xferfailsound"
+msgid "sound when attended transfer is complete"
 msgstr "sound when attended transfer is complete"
 
 #. Sound when attended transfer fails
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:63
-msgid "asterisk_featurepark_xfersound"
+msgid "Sound when attended transfer fails"
 msgstr "Sound when attended transfer fails"
 
 #. Reload Hardware Config
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:64
-msgid "asterisk_hardwarereboot"
+msgid "Reload Hardware Config"
 msgstr "Reload Hardware Config"
 
 #. Reboot Method
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:65
-msgid "asterisk_hardwarereboot_method"
+msgid "Reboot Method"
 msgstr "Reboot Method"
 
 #. Parameter
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:66
-msgid "asterisk_hardwarereboot_param"
+msgid "Parameter"
 msgstr "Parameter"
 
 #. SIP Connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:67
-msgid "asterisk_iax"
+msgid "SIP Connection"
 msgstr "SIP Connection"
 
 #. Always Dial International
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:68
-msgid "asterisk_iax_alwaysinternational"
+msgid "Always Dial International"
 msgstr "Always Dial International"
 
 #. context
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:69
-msgid "asterisk_iax_context"
+msgid "context"
 msgstr "context"
 
 #. Country Code for connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:70
-msgid "asterisk_iax_countrycode"
+msgid "Country Code for connection"
 msgstr "Country Code for connection"
 
 #. Add as Extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:71
-msgid "asterisk_iax_extension"
+msgid "Add as Extension"
 msgstr "Add as Extension"
 
 #. Host name (or blank)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:72
-msgid "asterisk_iax_host"
+msgid "Host name (or blank)"
 msgstr "Host name (or blank)"
 
 #. International Dial Prefix
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:73
-msgid "asterisk_iax_internationalprefix"
+msgid "International Dial Prefix"
 msgstr "International Dial Prefix"
 
 #. Dial Prefix (for external line)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:74
-msgid "asterisk_iax_prefix"
+msgid "Dial Prefix (for external line)"
 msgstr "Dial Prefix (for external line)"
 
 #. Secret
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:75
-msgid "asterisk_iax_secret"
+msgid "Secret"
 msgstr "Secret"
 
 #. Dial Timeout (sec)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:76
-msgid "asterisk_iax_timeout"
+msgid "Dial Timeout (sec)"
 msgstr "Dial Timeout (sec)"
 
 #. Option type
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:77
-msgid "asterisk_iax_type"
+msgid "Option type"
 msgstr "Option type"
 
 #. User name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:78
-msgid "asterisk_iax_username"
+msgid "User name"
 msgstr "User name"
 
 #. IAX General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:79
-msgid "asterisk_iaxgeneral"
+msgid "IAX General Options"
 msgstr "IAX General Options"
 
 #. Allow Codecs
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:80
-msgid "asterisk_iaxgeneral_allow"
+msgid "Allow Codecs"
 msgstr "Allow Codecs"
 
 #. Reinvite/redirect media connections
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:81
-msgid "asterisk_iaxgeneral_canreinvite"
+msgid "Reinvite/redirect media connections"
 msgstr "Reinvite/redirect media connections"
 
 #. Static
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:82
-msgid "asterisk_iaxgeneral_static"
+msgid "Static"
 msgstr "Static"
 
 #. Write Protect
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:83
-msgid "asterisk_iaxgeneral_writeprotect"
+msgid "Write Protect"
 msgstr "Write Protect"
 
 #. Meetme Conference
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:84
-msgid "asterisk_meetme"
+msgid "Meetme Conference"
 msgstr "Meetme Conference"
 
 #. Admin PIN
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:85
-msgid "asterisk_meetme_adminpin"
+msgid "Admin PIN"
 msgstr "Admin PIN"
 
 #. Meeting PIN
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:86
-msgid "asterisk_meetme_pin"
+msgid "Meeting PIN"
 msgstr "Meeting PIN"
 
 #. Meetme Conference General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:87
-msgid "asterisk_meetmegeneral"
+msgid "Meetme Conference General Options"
 msgstr "Meetme Conference General Options"
 
 #. Number of 20ms audio buffers to be used
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:88
-msgid "asterisk_meetmegeneral_audiobuffers"
+msgid "Number of 20ms audio buffers to be used"
 msgstr "Number of 20ms audio buffers to be used"
 
 #. Modules
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:89
-msgid "asterisk_module"
+msgid "Modules"
 msgstr "Modules"
 
 #. Alarm Receiver Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:90
-msgid "asterisk_module_appalarmreceiver"
+msgid "Alarm Receiver Application"
 msgstr "Alarm Receiver Application"
 
 #. Authentication Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:91
-msgid "asterisk_module_appauthenticate"
+msgid "Authentication Application"
 msgstr "Authentication Application"
 
 #. Make sure asterisk doesnt save CDR
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:92
-msgid "asterisk_module_appcdr"
+msgid "Make sure asterisk doesnt save CDR"
 msgstr "Make sure asterisk doesnt save CDR"
 
 #. Check if channel is available
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:93
-msgid "asterisk_module_appchanisavail"
+msgid "Check if channel is available"
 msgstr "Check if channel is available"
 
 #. Listen in on any channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:94
-msgid "asterisk_module_appchanspy"
+msgid "Listen in on any channel"
 msgstr "Listen in on any channel"
 
 #. Control Playback Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:95
-msgid "asterisk_module_appcontrolplayback"
+msgid "Control Playback Application"
 msgstr "Control Playback Application"
 
 #. Cuts up variables
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:96
-msgid "asterisk_module_appcut"
+msgid "Cuts up variables"
 msgstr "Cuts up variables"
 
 #. Database access functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:97
-msgid "asterisk_module_appdb"
+msgid "Database access functions"
 msgstr "Database access functions"
 
 #. Dialing Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:98
-msgid "asterisk_module_appdial"
+msgid "Dialing Application"
 msgstr "Dialing Application"
 
 #. Virtual Dictation Machine Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:99
-msgid "asterisk_module_appdictate"
+msgid "Virtual Dictation Machine Application"
 msgstr "Virtual Dictation Machine Application"
 
 #. Directed Call Pickup Support
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:100
-msgid "asterisk_module_appdirectedpickup"
+msgid "Directed Call Pickup Support"
 msgstr "Directed Call Pickup Support"
 
 #. Extension Directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:101
-msgid "asterisk_module_appdirectory"
+msgid "Extension Directory"
 msgstr "Extension Directory"
 
 #. DISA (Direct Inward System Access) Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:102
-msgid "asterisk_module_appdisa"
+msgid "DISA (Direct Inward System Access) Application"
 msgstr "DISA (Direct Inward System Access) Application"
 
 #. Dump channel variables Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:103
-msgid "asterisk_module_appdumpchan"
+msgid "Dump channel variables Application"
 msgstr "Dump channel variables Application"
 
 #. Simple Echo Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:104
-msgid "asterisk_module_appecho"
+msgid "Simple Echo Application"
 msgstr "Simple Echo Application"
 
 #. ENUM Lookup
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:105
-msgid "asterisk_module_appenumlookup"
+msgid "ENUM Lookup"
 msgstr "ENUM Lookup"
 
 #. Reevaluates strings
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:106
-msgid "asterisk_module_appeval"
+msgid "Reevaluates strings"
 msgstr "Reevaluates strings"
 
 #. Executes applications
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:107
-msgid "asterisk_module_appexec"
+msgid "Executes applications"
 msgstr "Executes applications"
 
 #. External IVR application interface
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:108
-msgid "asterisk_module_appexternalivr"
+msgid "External IVR application interface"
 msgstr "External IVR application interface"
 
 #. Fork The CDR into 2 seperate entities
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:109
-msgid "asterisk_module_appforkcdr"
+msgid "Fork The CDR into 2 seperate entities"
 msgstr "Fork The CDR into 2 seperate entities"
 
 #. Get ADSI CPE ID
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:110
-msgid "asterisk_module_appgetcpeid"
+msgid "Get ADSI CPE ID"
 msgstr "Get ADSI CPE ID"
 
 #. Group Management Routines
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:111
-msgid "asterisk_module_appgroupcount"
+msgid "Group Management Routines"
 msgstr "Group Management Routines"
 
 #. Encode and Stream via icecast and ices
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:112
-msgid "asterisk_module_appices"
+msgid "Encode and Stream via icecast and ices"
 msgstr "Encode and Stream via icecast and ices"
 
 #. Image Transmission Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:113
-msgid "asterisk_module_appimage"
+msgid "Image Transmission Application"
 msgstr "Image Transmission Application"
 
 #. Look up Caller*ID name/number from black
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:114
-msgid "asterisk_module_applookupblacklist"
+msgid "Look up Caller*ID name/number from black"
 msgstr "Look up Caller*ID name/number from black"
 
 #. Look up CallerID Name from local databas
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:115
-msgid "asterisk_module_applookupcidname"
+msgid "Look up CallerID Name from local databas"
 msgstr "Look up CallerID Name from local databas"
 
 #. Extension Macros
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:116
-msgid "asterisk_module_appmacro"
+msgid "Extension Macros"
 msgstr "Extension Macros"
 
 #. A simple math Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:117
-msgid "asterisk_module_appmath"
+msgid "A simple math Application"
 msgstr "A simple math Application"
 
 #. MD5 checksum Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:118
-msgid "asterisk_module_appmd5"
+msgid "MD5 checksum Application"
 msgstr "MD5 checksum Application"
 
 #. Digital Milliwatt (mu-law) Test Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:119
-msgid "asterisk_module_appmilliwatt"
+msgid "Digital Milliwatt (mu-law) Test Application"
 msgstr "Digital Milliwatt (mu-law) Test Application"
 
 #. Record a call and mix the audio during the recording
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:120
-msgid "asterisk_module_appmixmonitor"
+msgid "Record a call and mix the audio during the recording"
 msgstr "Record a call and mix the audio during the recording"
 
 #. Call Parking and Announce Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:121
-msgid "asterisk_module_appparkandannounce"
+msgid "Call Parking and Announce Application"
 msgstr "Call Parking and Announce Application"
 
 #. Trivial Playback Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:122
-msgid "asterisk_module_appplayback"
+msgid "Trivial Playback Application"
 msgstr "Trivial Playback Application"
 
 #. Require phone number to be entered
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:123
-msgid "asterisk_module_appprivacy"
+msgid "Require phone number to be entered"
 msgstr "Require phone number to be entered"
 
 #. True Call Queueing
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:124
-msgid "asterisk_module_appqueue"
+msgid "True Call Queueing"
 msgstr "True Call Queueing"
 
 #. Random goto
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:125
-msgid "asterisk_module_apprandom"
+msgid "Random goto"
 msgstr "Random goto"
 
 #. Read Variable Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:126
-msgid "asterisk_module_appread"
+msgid "Read Variable Application"
 msgstr "Read Variable Application"
 
 #. Read in a file
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:127
-msgid "asterisk_module_appreadfile"
+msgid "Read in a file"
 msgstr "Read in a file"
 
 #. Realtime Data Lookup/Rewrite
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:128
-msgid "asterisk_module_apprealtime"
+msgid "Realtime Data Lookup/Rewrite"
 msgstr "Realtime Data Lookup/Rewrite"
 
 #. Trivial Record Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:129
-msgid "asterisk_module_apprecord"
+msgid "Trivial Record Application"
 msgstr "Trivial Record Application"
 
 #. Say time
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:130
-msgid "asterisk_module_appsayunixtime"
+msgid "Say time"
 msgstr "Say time"
 
 #. Send DTMF digits Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:131
-msgid "asterisk_module_appsenddtmf"
+msgid "Send DTMF digits Application"
 msgstr "Send DTMF digits Application"
 
 #. Send Text Applications
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:132
-msgid "asterisk_module_appsendtext"
+msgid "Send Text Applications"
 msgstr "Send Text Applications"
 
 #. Set CallerID Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:133
-msgid "asterisk_module_appsetcallerid"
+msgid "Set CallerID Application"
 msgstr "Set CallerID Application"
 
 #. CDR user field apps
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:134
-msgid "asterisk_module_appsetcdruserfield"
+msgid "CDR user field apps"
 msgstr "CDR user field apps"
 
 #. load =&gt; .so ; Set CallerID Name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:135
-msgid "asterisk_module_appsetcidname"
+msgid "load => .so ; Set CallerID Name"
 msgstr "load =&gt; .so ; Set CallerID Name"
 
 #. load =&gt; .so ; Set CallerID Number
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:136
-msgid "asterisk_module_appsetcidnum"
+msgid "load => .so ; Set CallerID Number"
 msgstr "load =&gt; .so ; Set CallerID Number"
 
 #. Set RDNIS Number
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:137
-msgid "asterisk_module_appsetrdnis"
+msgid "Set RDNIS Number"
 msgstr "Set RDNIS Number"
 
 #. Set ISDN Transfer Capability
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:138
-msgid "asterisk_module_appsettransfercapability"
+msgid "Set ISDN Transfer Capability"
 msgstr "Set ISDN Transfer Capability"
 
 #. SMS/PSTN handler
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:139
-msgid "asterisk_module_appsms"
+msgid "SMS/PSTN handler"
 msgstr "SMS/PSTN handler"
 
 #. Hangs up the requested channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:140
-msgid "asterisk_module_appsofthangup"
+msgid "Hangs up the requested channel"
 msgstr "Hangs up the requested channel"
 
 #. Stack Routines
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:141
-msgid "asterisk_module_appstack"
+msgid "Stack Routines"
 msgstr "Stack Routines"
 
 #. Generic System() application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:142
-msgid "asterisk_module_appsystem"
+msgid "Generic System() application"
 msgstr "Generic System() application"
 
 #. Playback with Talk Detection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:143
-msgid "asterisk_module_apptalkdetect"
+msgid "Playback with Talk Detection"
 msgstr "Playback with Talk Detection"
 
 #. Interface Test Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:144
-msgid "asterisk_module_apptest"
+msgid "Interface Test Application"
 msgstr "Interface Test Application"
 
 #. Transfer
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:145
-msgid "asterisk_module_apptransfer"
+msgid "Transfer"
 msgstr "Transfer"
 
 #. TXTCIDName
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:146
-msgid "asterisk_module_apptxtcidname"
+msgid "TXTCIDName"
 msgstr "TXTCIDName"
 
 #. Send URL Applications
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:147
-msgid "asterisk_module_appurl"
+msgid "Send URL Applications"
 msgstr "Send URL Applications"
 
 #. Custom User Event Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:148
-msgid "asterisk_module_appuserevent"
+msgid "Custom User Event Application"
 msgstr "Custom User Event Application"
 
 #. Send verbose output
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:149
-msgid "asterisk_module_appverbose"
+msgid "Send verbose output"
 msgstr "Send verbose output"
 
 #. Voicemail
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:150
-msgid "asterisk_module_appvoicemail"
+msgid "Voicemail"
 msgstr "Voicemail"
 
 #. Waits until first ring after time
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:151
-msgid "asterisk_module_appwaitforring"
+msgid "Waits until first ring after time"
 msgstr "Waits until first ring after time"
 
 #. Wait For Silence Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:152
-msgid "asterisk_module_appwaitforsilence"
+msgid "Wait For Silence Application"
 msgstr "Wait For Silence Application"
 
 #. While Loops and Conditional Execution
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:153
-msgid "asterisk_module_appwhile"
+msgid "While Loops and Conditional Execution"
 msgstr "While Loops and Conditional Execution"
 
 #. Comma Separated Values CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:154
-msgid "asterisk_module_cdrcsv"
+msgid "Comma Separated Values CDR Backend"
 msgstr "Comma Separated Values CDR Backend"
 
 #. Customizable Comma Separated Values CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:155
-msgid "asterisk_module_cdrcustom"
+msgid "Customizable Comma Separated Values CDR Backend"
 msgstr "Customizable Comma Separated Values CDR Backend"
 
 #. Asterisk Call Manager CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:156
-msgid "asterisk_module_cdrmanager"
+msgid "Asterisk Call Manager CDR Backend"
 msgstr "Asterisk Call Manager CDR Backend"
 
 #. MySQL CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:157
-msgid "asterisk_module_cdrmysql"
+msgid "MySQL CDR Backend"
 msgstr "MySQL CDR Backend"
 
 #. PostgreSQL CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:158
-msgid "asterisk_module_cdrpgsql"
+msgid "PostgreSQL CDR Backend"
 msgstr "PostgreSQL CDR Backend"
 
 #. SQLite CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:159
-msgid "asterisk_module_cdrsqlite"
+msgid "SQLite CDR Backend"
 msgstr "SQLite CDR Backend"
 
 #. Agent Proxy Channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:160
-msgid "asterisk_module_chanagent"
+msgid "Agent Proxy Channel"
 msgstr "Agent Proxy Channel"
 
 #. Channel driver for GTalk
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:161
-msgid "asterisk_module_chanalsa"
+msgid "Channel driver for GTalk"
 msgstr "Channel driver for GTalk"
 
 #. Channel driver for GTalk
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:162
-msgid "asterisk_module_changtalk"
+msgid "Channel driver for GTalk"
 msgstr "Channel driver for GTalk"
 
 #. Option chan_iax2
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:163
-msgid "asterisk_module_chaniax2"
+msgid "Option chan_iax2"
 msgstr "Option chan_iax2"
 
 #. Local Proxy Channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:164
-msgid "asterisk_module_chanlocal"
+msgid "Local Proxy Channel"
 msgstr "Local Proxy Channel"
 
 #. Session Initiation Protocol (SIP)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:165
-msgid "asterisk_module_chansip"
+msgid "Session Initiation Protocol (SIP)"
 msgstr "Session Initiation Protocol (SIP)"
 
 #. Adaptive Differential PCM Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:166
-msgid "asterisk_module_codecadpcm"
+msgid "Adaptive Differential PCM Coder/Decoder"
 msgstr "Adaptive Differential PCM Coder/Decoder"
 
 #. A-law Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:167
-msgid "asterisk_module_codecalaw"
+msgid "A-law Coder/Decoder"
 msgstr "A-law Coder/Decoder"
 
 #. A-law and Mulaw direct Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:168
-msgid "asterisk_module_codecamu"
+msgid "A-law and Mulaw direct Coder/Decoder"
 msgstr "A-law and Mulaw direct Coder/Decoder"
 
 #. ITU G.726-32kbps G726 Transcoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:169
-msgid "asterisk_module_codecg726"
+msgid "ITU G.726-32kbps G726 Transcoder"
 msgstr "ITU G.726-32kbps G726 Transcoder"
 
 #. GSM/PCM16 (signed linear) Codec Translation
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:170
-msgid "asterisk_module_codecgsm"
+msgid "GSM/PCM16 (signed linear) Codec Translation"
 msgstr "GSM/PCM16 (signed linear) Codec Translation"
 
 #. Speex/PCM16 (signed linear) Codec Translator
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:171
-msgid "asterisk_module_codecspeex"
+msgid "Speex/PCM16 (signed linear) Codec Translator"
 msgstr "Speex/PCM16 (signed linear) Codec Translator"
 
 #. Mu-law Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:172
-msgid "asterisk_module_codeculaw"
+msgid "Mu-law Coder/Decoder"
 msgstr "Mu-law Coder/Decoder"
 
 #. Sun Microsystems AU format (signed linear)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:173
-msgid "asterisk_module_formatau"
+msgid "Sun Microsystems AU format (signed linear)"
 msgstr "Sun Microsystems AU format (signed linear)"
 
 #. G.723.1 Simple Timestamp File Format
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:174
-msgid "asterisk_module_formatg723"
+msgid "G.723.1 Simple Timestamp File Format"
 msgstr "G.723.1 Simple Timestamp File Format"
 
 #. Raw G.726 (16/24/32/40kbps) data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:175
-msgid "asterisk_module_formatg726"
+msgid "Raw G.726 (16/24/32/40kbps) data"
 msgstr "Raw G.726 (16/24/32/40kbps) data"
 
 #. Raw G729 data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:176
-msgid "asterisk_module_formatg729"
+msgid "Raw G729 data"
 msgstr "Raw G729 data"
 
 #. Raw GSM data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:177
-msgid "asterisk_module_formatgsm"
+msgid "Raw GSM data"
 msgstr "Raw GSM data"
 
 #. Raw h263 data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:178
-msgid "asterisk_module_formath263"
+msgid "Raw h263 data"
 msgstr "Raw h263 data"
 
 #. JPEG (Joint Picture Experts Group) Image
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:179
-msgid "asterisk_module_formatjpeg"
+msgid "JPEG (Joint Picture Experts Group) Image"
 msgstr "JPEG (Joint Picture Experts Group) Image"
 
 #. Raw uLaw 8khz Audio support (PCM)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:180
-msgid "asterisk_module_formatpcm"
+msgid "Raw uLaw 8khz Audio support (PCM)"
 msgstr "Raw uLaw 8khz Audio support (PCM)"
 
 #. load =&gt; .so ; Raw aLaw 8khz PCM Audio support
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:181
-msgid "asterisk_module_formatpcmalaw"
+msgid "load => .so ; Raw aLaw 8khz PCM Audio support"
 msgstr "load =&gt; .so ; Raw aLaw 8khz PCM Audio support"
 
 #. Raw Signed Linear Audio support (SLN)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:182
-msgid "asterisk_module_formatsln"
+msgid "Raw Signed Linear Audio support (SLN)"
 msgstr "Raw Signed Linear Audio support (SLN)"
 
 #. Dialogic VOX (ADPCM) File Format
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:183
-msgid "asterisk_module_formatvox"
+msgid "Dialogic VOX (ADPCM) File Format"
 msgstr "Dialogic VOX (ADPCM) File Format"
 
 #. Microsoft WAV format (8000hz Signed Line
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:184
-msgid "asterisk_module_formatwav"
+msgid "Microsoft WAV format (8000hz Signed Line"
 msgstr "Microsoft WAV format (8000hz Signed Line"
 
 #. Microsoft WAV format (Proprietary GSM)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:185
-msgid "asterisk_module_formatwavgsm"
+msgid "Microsoft WAV format (Proprietary GSM)"
 msgstr "Microsoft WAV format (Proprietary GSM)"
 
 #. Caller ID related dialplan functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:186
-msgid "asterisk_module_funccallerid"
+msgid "Caller ID related dialplan functions"
 msgstr "Caller ID related dialplan functions"
 
 #. ENUM Functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:187
-msgid "asterisk_module_funcenum"
+msgid "ENUM Functions"
 msgstr "ENUM Functions"
 
 #. URI encoding / decoding functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:188
-msgid "asterisk_module_funcuri"
+msgid "URI encoding / decoding functions"
 msgstr "URI encoding / decoding functions"
 
 #. Asterisk Extension Language Compiler
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:189
-msgid "asterisk_module_pbxael"
+msgid "Asterisk Extension Language Compiler"
 msgstr "Asterisk Extension Language Compiler"
 
 #. Text Extension Configuration
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:190
-msgid "asterisk_module_pbxconfig"
+msgid "Text Extension Configuration"
 msgstr "Text Extension Configuration"
 
 #. load =&gt; .so ; Builtin dialplan functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:191
-msgid "asterisk_module_pbxfunctions"
+msgid "load => .so ; Builtin dialplan functions"
 msgstr "load =&gt; .so ; Builtin dialplan functions"
 
 #. Loopback Switch
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:192
-msgid "asterisk_module_pbxloopback"
+msgid "Loopback Switch"
 msgstr "Loopback Switch"
 
 #. Realtime Switch
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:193
-msgid "asterisk_module_pbxrealtime"
+msgid "Realtime Switch"
 msgstr "Realtime Switch"
 
 #. Outgoing Spool Support
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:194
-msgid "asterisk_module_pbxspool"
+msgid "Outgoing Spool Support"
 msgstr "Outgoing Spool Support"
 
 #. Wil Cal U (Auto Dialer)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:195
-msgid "asterisk_module_pbxwilcalu"
+msgid "Wil Cal U (Auto Dialer)"
 msgstr "Wil Cal U (Auto Dialer)"
 
 #. MySQL Config Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:196
-msgid "asterisk_module_resconfigmysql"
+msgid "MySQL Config Resource"
 msgstr "MySQL Config Resource"
 
 #. ODBC Config Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:197
-msgid "asterisk_module_resconfigodbc"
+msgid "ODBC Config Resource"
 msgstr "ODBC Config Resource"
 
 #. PGSQL Module
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:198
-msgid "asterisk_module_resconfigpgsql"
+msgid "PGSQL Module"
 msgstr "PGSQL Module"
 
 #. Cryptographic Digital Signatures
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:199
-msgid "asterisk_module_rescrypto"
+msgid "Cryptographic Digital Signatures"
 msgstr "Cryptographic Digital Signatures"
 
 #. Call Parking Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:200
-msgid "asterisk_module_resfeatures"
+msgid "Call Parking Resource"
 msgstr "Call Parking Resource"
 
 #. Indications Configuration
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:201
-msgid "asterisk_module_resindications"
+msgid "Indications Configuration"
 msgstr "Indications Configuration"
 
 #. Call Monitoring Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:202
-msgid "asterisk_module_resmonitor"
+msgid "Call Monitoring Resource"
 msgstr "Call Monitoring Resource"
 
 #. Music On Hold Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:203
-msgid "asterisk_module_resmusiconhold"
+msgid "Music On Hold Resource"
 msgstr "Music On Hold Resource"
 
 #. ODBC Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:204
-msgid "asterisk_module_resodbc"
+msgid "ODBC Resource"
 msgstr "ODBC Resource"
 
 #. SMDI Module
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:205
-msgid "asterisk_module_ressmdi"
+msgid "SMDI Module"
 msgstr "SMDI Module"
 
 #. SNMP Module
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:206
-msgid "asterisk_module_ressnmp"
+msgid "SNMP Module"
 msgstr "SNMP Module"
 
 #. Music On Hold
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:207
-msgid "asterisk_moh"
+msgid "Music On Hold"
 msgstr "Music On Hold"
 
 #. Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:208
-msgid "asterisk_moh_application"
+msgid "Application"
 msgstr "Application"
 
 #. Directory of Music
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:209
-msgid "asterisk_moh_directory"
+msgid "Directory of Music"
 msgstr "Directory of Music"
 
 #. Option mode
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:210
-msgid "asterisk_moh_mode"
+msgid "Option mode"
 msgstr "Option mode"
 
 #. Random Play
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:211
-msgid "asterisk_moh_random"
+msgid "Random Play"
 msgstr "Random Play"
 
 #. SIP Connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:212
-msgid "asterisk_sip"
+msgid "SIP Connection"
 msgstr "SIP Connection"
 
 #. Always Dial International
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:213
-msgid "asterisk_sip_alwaysinternational"
+msgid "Always Dial International"
 msgstr "Always Dial International"
 
 #. Reinvite/redirect media connections
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:214
-msgid "asterisk_sip_canreinvite"
+msgid "Reinvite/redirect media connections"
 msgstr "Reinvite/redirect media connections"
 
 #. context
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:215
-msgid "asterisk_sip_context"
+msgid "context"
 msgstr "context"
 
 #. Country Code for connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:216
-msgid "asterisk_sip_countrycode"
+msgid "Country Code for connection"
 msgstr "Country Code for connection"
 
 #. DTMF mode
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:217
-msgid "asterisk_sip_dtmfmode"
+msgid "DTMF mode"
 msgstr "DTMF mode"
 
 #. Add as Extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:218
-msgid "asterisk_sip_extension"
+msgid "Add as Extension"
 msgstr "Add as Extension"
 
 #. Primary domain identity for From: headers
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:219
-msgid "asterisk_sip_fromdomain"
+msgid "Primary domain identity for From: headers"
 msgstr "Primary domain identity for From: headers"
 
 #. From user (required by many SIP providers)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:220
-msgid "asterisk_sip_fromuser"
+msgid "From user (required by many SIP providers)"
 msgstr "From user (required by many SIP providers)"
 
 #. Host name (or blank)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:221
-msgid "asterisk_sip_host"
+msgid "Host name (or blank)"
 msgstr "Host name (or blank)"
 
 #. Ring on incoming dialplan contexts
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:222
-msgid "asterisk_sip_incoming"
+msgid "Ring on incoming dialplan contexts"
 msgstr "Ring on incoming dialplan contexts"
 
 #. Allow Insecure for
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:223
-msgid "asterisk_sip_insecure"
+msgid "Allow Insecure for"
 msgstr "Allow Insecure for"
 
 #. International Dial Prefix
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:224
-msgid "asterisk_sip_internationalprefix"
+msgid "International Dial Prefix"
 msgstr "International Dial Prefix"
 
 #. Mailbox for MWI
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:225
-msgid "asterisk_sip_mailbox"
+msgid "Mailbox for MWI"
 msgstr "Mailbox for MWI"
 
 #. NAT between phone and Asterisk
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:226
-msgid "asterisk_sip_nat"
+msgid "NAT between phone and Asterisk"
 msgstr "NAT between phone and Asterisk"
 
 #. Check tags in headers
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:227
-msgid "asterisk_sip_pedantic"
+msgid "Check tags in headers"
 msgstr "Check tags in headers"
 
 #. SIP Port
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:228
-msgid "asterisk_sip_port"
+msgid "SIP Port"
 msgstr "SIP Port"
 
 #. Dial Prefix (for external line)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:229
-msgid "asterisk_sip_prefix"
+msgid "Dial Prefix (for external line)"
 msgstr "Dial Prefix (for external line)"
 
 #. Reply Timeout (ms) for down connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:230
-msgid "asterisk_sip_qualify"
+msgid "Reply Timeout (ms) for down connection"
 msgstr "Reply Timeout (ms) for down connection"
 
 #. Register connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:231
-msgid "asterisk_sip_register"
+msgid "Register connection"
 msgstr "Register connection"
 
 #. Secret
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:232
-msgid "asterisk_sip_secret"
+msgid "Secret"
 msgstr "Secret"
 
 #. Dial own extension for mailbox
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:233
-msgid "asterisk_sip_selfmailbox"
+msgid "Dial own extension for mailbox"
 msgstr "Dial own extension for mailbox"
 
 #. Dial Timeout (sec)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:234
-msgid "asterisk_sip_timeout"
+msgid "Dial Timeout (sec)"
 msgstr "Dial Timeout (sec)"
 
 #. Client Type
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:235
-msgid "asterisk_sip_type"
+msgid "Client Type"
 msgstr "Client Type"
 
 #. Username
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:236
-msgid "asterisk_sip_username"
+msgid "Username"
 msgstr "Username"
 
 #. Section sipgeneral
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:237
-msgid "asterisk_sipgeneral"
+msgid "Section sipgeneral"
 msgstr "Section sipgeneral"
 
 #. Allow codecs
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:238
-msgid "asterisk_sipgeneral_allow"
+msgid "Allow codecs"
 msgstr "Allow codecs"
 
 #. SIP Port
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:239
-msgid "asterisk_sipgeneral_port"
+msgid "SIP Port"
 msgstr "SIP Port"
 
 #. SIP realm
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:240
-msgid "asterisk_sipgeneral_realm"
+msgid "SIP realm"
 msgstr "SIP realm"
 
 #. Voicemail general options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:241
-msgid "asterisk_voicegeneral"
+msgid "Voicemail general options"
 msgstr "Voicemail general options"
 
 #. From Email address of server
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:242
-msgid "asterisk_voicegeneral_serveremail"
+msgid "From Email address of server"
 msgstr "From Email address of server"
 
 #. Voice Mail boxes
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:243
-msgid "asterisk_voicemail"
+msgid "Voice Mail boxes"
 msgstr "Voice Mail boxes"
 
 #. Email contains attachment
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:244
-msgid "asterisk_voicemail_attach"
+msgid "Email contains attachment"
 msgstr "Email contains attachment"
 
 #. Email
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:245
-msgid "asterisk_voicemail_email"
+msgid "Email"
 msgstr "Email"
 
 #. Display Name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:246
-msgid "asterisk_voicemail_name"
+msgid "Display Name"
 msgstr "Display Name"
 
 #. Password
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:247
-msgid "asterisk_voicemail_password"
+msgid "Password"
 msgstr "Password"
 
 #. zone
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:248
-msgid "asterisk_voicemail_zone"
+msgid "zone"
 msgstr "zone"
 
 #. Voice Zone settings
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:249
-msgid "asterisk_voicezone"
+msgid "Voice Zone settings"
 msgstr "Voice Zone settings"
 
 #. Message Format
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:250
-msgid "asterisk_voicezone_message"
+msgid "Message Format"
 msgstr "Message Format"
 
 #. Time Zone
diff --git a/po/en/cbi.po b/po/en/cbi.po
index 02577554e..617d25075 100644
--- a/po/en/cbi.po
+++ b/po/en/cbi.po
@@ -14,86 +14,86 @@ msgstr ""
 
 #. Add entry
 #: i18n/english/luasrc/i18n/cbi.en.lua:1
-msgid "cbi_add"
+msgid "Add"
 msgstr "Add entry"
 
 #. Remove entry
 #: i18n/english/luasrc/i18n/cbi.en.lua:2
-msgid "cbi_del"
+msgid "Delete"
 msgstr "Remove entry"
 
 #. Replace entry
 #: i18n/english/luasrc/i18n/cbi.en.lua:3
-msgid "cbi_replace"
+msgid "Replace entry"
 msgstr "Replace entry"
 
 #. Invalid input value
 #: i18n/english/luasrc/i18n/cbi.en.lua:4
-msgid "cbi_invalid"
+msgid "Invalid"
 msgstr "Invalid input value"
 
 #. <strong>Validation failed:</strong> Please check any input fields for mistakes.
 #: i18n/english/luasrc/i18n/cbi.en.lua:5
-msgid "cbi_invalid_section"
+msgid "<strong>Validation failed:</strong> Please check any input fields for mistakes."
 msgstr ""
 "<strong>Validation failed:</strong> Please check any input fields for "
 "mistakes."
 
 #. This field is mandatory
 #: i18n/english/luasrc/i18n/cbi.en.lua:6
-msgid "cbi_missing"
+msgid "This field is mandatory"
 msgstr "This field is mandatory"
 
 #. <strong>Validation failed:</strong> At least one mandatory field has no or an invalid value
 #: i18n/english/luasrc/i18n/cbi.en.lua:7
-msgid "cbi_deperror"
+msgid "<strong>Validation failed:</strong> At least one mandatory field has no or an invalid value"
 msgstr ""
 "<strong>Validation failed:</strong> At least one mandatory field has no or "
 "an invalid value"
 
 #. A requirement for this option was not met
 #: i18n/english/luasrc/i18n/cbi.en.lua:8
-msgid "cbi_reqerror"
+msgid "A requirement for this option was not met"
 msgstr "A requirement for this option was not met"
 
 #. -- Additional Field --
 #: i18n/english/luasrc/i18n/cbi.en.lua:9
-msgid "cbi_addopt"
+msgid "-- Additional Field --"
 msgstr "-- Additional Field --"
 
 #.  (optional)
 #: i18n/english/luasrc/i18n/cbi.en.lua:10
-msgid "cbi_optional"
+msgid " (optional)"
 msgstr " (optional)"
 
 #. This section contains no values yet
 #: i18n/english/luasrc/i18n/cbi.en.lua:11
-msgid "cbi_sectempty"
+msgid "This section contains no values yet"
 msgstr "This section contains no values yet"
 
 #. -- custom --
 #: i18n/english/luasrc/i18n/cbi.en.lua:12
-msgid "cbi_manual"
+msgid "-- custom --"
 msgstr "-- custom --"
 
 #. -- Please choose --
 #: i18n/english/luasrc/i18n/cbi.en.lua:13
-msgid "cbi_select"
+msgid "-- Please choose --"
 msgstr "-- Please choose --"
 
 #. Go to relevant configuration page
 #: i18n/english/luasrc/i18n/cbi.en.lua:14
-msgid "cbi_gorel"
+msgid " "
 msgstr "Go to relevant configuration page"
 
 #. Applying changes
 #: i18n/english/luasrc/i18n/cbi.en.lua:15
-msgid "cbi_applying"
+msgid "Applying changes"
 msgstr "Applying changes"
 
 #. Uploaded File
 #: i18n/english/luasrc/i18n/cbi.en.lua:16
-msgid "cbi_upload"
+msgid "Uploaded File"
 msgstr "Uploaded File"
 
 #. Search file...
diff --git a/po/en/coovachilli.po b/po/en/coovachilli.po
index ae6b9800c..b69d9ed40 100644
--- a/po/en/coovachilli.po
+++ b/po/en/coovachilli.po
@@ -14,37 +14,37 @@ msgstr ""
 
 #. CoovaChilli
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:1
-msgid "coovachilli"
+msgid "CoovaChilli"
 msgstr "CoovaChilli"
 
 #. General configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:2
-msgid "coovachilli_general"
+msgid "General configuration"
 msgstr "General configuration"
 
 #. General CoovaChilli settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:3
-msgid "coovachilli_general_desc"
+msgid "General CoovaChilli settings"
 msgstr "General CoovaChilli settings"
 
 #. Command socket
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:4
-msgid "coovachilli_general_cmdsock"
+msgid "Command socket"
 msgstr "Command socket"
 
 #. UNIX socket used for communication with chilli_query
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:5
-msgid "coovachilli_general_cmdsock_desc"
+msgid "UNIX socket used for communication with chilli_query"
 msgstr "UNIX socket used for communication with chilli_query"
 
 #. Config refresh interval
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:6
-msgid "coovachilli_general_interval"
+msgid "Config refresh interval"
 msgstr "Config refresh interval"
 
 #. Re-read configuration file and do DNS lookups every interval seconds. This has the same effect as sending the HUP signal. If interval is 0 (zero) this feature is disabled. 
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:7
-msgid "coovachilli_general_interval_desc"
+msgid "Re-read configuration file and do DNS lookups every interval seconds. This has the same effect as sending the HUP signal. If interval is 0 (zero) this feature is disabled. "
 msgstr ""
 "Re-read configuration file and do DNS lookups every interval seconds. This "
 "has the same effect as sending the HUP signal. If interval is 0 (zero) this "
@@ -52,890 +52,890 @@ msgstr ""
 
 #. Pid file
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:8
-msgid "coovachilli_general_pidfile"
+msgid "Pid file"
 msgstr "Pid file"
 
 #. Filename to put the process id
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:9
-msgid "coovachilli_general_pidfile_desc"
+msgid "Filename to put the process id"
 msgstr "Filename to put the process id"
 
 #. State directory
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:10
-msgid "coovachilli_general_statedir"
+msgid "State directory"
 msgstr "State directory"
 
 #. Directory of non-volatile data
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:11
-msgid "coovachilli_general_statedir_desc"
+msgid "Directory of non-volatile data"
 msgstr "Directory of non-volatile data"
 
 #. TUN/TAP configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:12
-msgid "coovachilli_tun"
+msgid "TUN/TAP configuration"
 msgstr "TUN/TAP configuration"
 
 #. Network/Tun configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:13
-msgid "coovachilli_tun_desc"
+msgid "Network/Tun configuration"
 msgstr "Network/Tun configuration"
 
 #. Network down script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:14
-msgid "coovachilli_tun_condown"
+msgid "Network down script"
 msgstr "Network down script"
 
 #. Script executed after a session has moved from authorized state to unauthorized
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:15
-msgid "coovachilli_tun_condown_desc"
+msgid "Script executed after a session has moved from authorized state to unauthorized"
 msgstr ""
 "Script executed after a session has moved from authorized state to "
 "unauthorized"
 
 #. Network up script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:16
-msgid "coovachilli_tun_conup"
+msgid "Network up script"
 msgstr "Network up script"
 
 #. Script executed after the tun network interface has been brought up
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:17
-msgid "coovachilli_tun_conup_desc"
+msgid "Script executed after the tun network interface has been brought up"
 msgstr "Script executed after the tun network interface has been brought up"
 
 #. Primary DNS Server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:18
-msgid "coovachilli_tun_dns1"
+msgid "Primary DNS Server"
 msgstr "Primary DNS Server"
 
 #. Is used to inform the client about the DNS address to use for host name resolution
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:19
-msgid "coovachilli_tun_dns1_desc"
+msgid "Is used to inform the client about the DNS address to use for host name resolution"
 msgstr ""
 "Is used to inform the client about the DNS address to use for host name "
 "resolution"
 
 #. Secondary DNS Server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:20
-msgid "coovachilli_tun_dns2"
+msgid "Secondary DNS Server"
 msgstr "Secondary DNS Server"
 
 #. Is used to inform the client about the DNS address to use for host name resolution
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:21
-msgid "coovachilli_tun_dns2_desc"
+msgid "Is used to inform the client about the DNS address to use for host name resolution"
 msgstr ""
 "Is used to inform the client about the DNS address to use for host name "
 "resolution"
 
 #. Domain name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:22
-msgid "coovachilli_tun_domain"
+msgid "Domain name"
 msgstr "Domain name"
 
 #. Is used to inform the client about the domain name to use for DNS lookups
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:23
-msgid "coovachilli_tun_domain_desc"
+msgid "Is used to inform the client about the domain name to use for DNS lookups"
 msgstr ""
 "Is used to inform the client about the domain name to use for DNS lookups"
 
 #. Dynamic IP address pool
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:24
-msgid "coovachilli_tun_dynip"
+msgid "Dynamic IP address pool"
 msgstr "Dynamic IP address pool"
 
 #. Specifies a pool of dynamic IP addresses
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:25
-msgid "coovachilli_tun_dynip_desc"
+msgid "Specifies a pool of dynamic IP addresses"
 msgstr "Specifies a pool of dynamic IP addresses"
 
 #. IP down script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:26
-msgid "coovachilli_tun_ipdown"
+msgid "IP down script"
 msgstr "IP down script"
 
 #. Script executed after the tun network interface has been taken down
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:27
-msgid "coovachilli_tun_ipdown_desc"
+msgid "Script executed after the tun network interface has been taken down"
 msgstr "Script executed after the tun network interface has been taken down"
 
 #. IP up script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:28
-msgid "coovachilli_tun_ipup"
+msgid "IP up script"
 msgstr "IP up script"
 
 #. Script executed after the TUN/TAP network interface has been brought up
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:29
-msgid "coovachilli_tun_ipup_desc"
+msgid "Script executed after the TUN/TAP network interface has been brought up"
 msgstr "Script executed after the TUN/TAP network interface has been brought up"
 
 #. Uplink subnet
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:30
-msgid "coovachilli_tun_net"
+msgid "Uplink subnet"
 msgstr "Uplink subnet"
 
 #. Network address of the uplink interface (CIDR notation)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:31
-msgid "coovachilli_tun_net_desc"
+msgid "Network address of the uplink interface (CIDR notation)"
 msgstr "Network address of the uplink interface (CIDR notation)"
 
 #. Static IP address pool
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:32
-msgid "coovachilli_tun_statip"
+msgid "Static IP address pool"
 msgstr "Static IP address pool"
 
 #. Specifies a pool of static IP addresses
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:33
-msgid "coovachilli_tun_statip_desc"
+msgid "Specifies a pool of static IP addresses"
 msgstr "Specifies a pool of static IP addresses"
 
 #. TUN/TAP device
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:34
-msgid "coovachilli_tun_tundev"
+msgid "TUN/TAP device"
 msgstr "TUN/TAP device"
 
 #. The specific device to use for the TUN/TAP interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:35
-msgid "coovachilli_tun_tundev_desc"
+msgid "The specific device to use for the TUN/TAP interface"
 msgstr "The specific device to use for the TUN/TAP interface"
 
 #. TX queue length
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:36
-msgid "coovachilli_tun_txqlen"
+msgid "TX queue length"
 msgstr "TX queue length"
 
 #. The TX queue length to set on the TUN/TAP interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:37
-msgid "coovachilli_tun_txqlen_desc"
+msgid "The TX queue length to set on the TUN/TAP interface"
 msgstr "The TX queue length to set on the TUN/TAP interface"
 
 #. Use TAP device
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:38
-msgid "coovachilli_tun_usetap"
+msgid "Use TAP device"
 msgstr "Use TAP device"
 
 #. Use the TAP interface instead of TUN
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:39
-msgid "coovachilli_tun_usetap_desc"
+msgid "Use the TAP interface instead of TUN"
 msgstr "Use the TAP interface instead of TUN"
 
 #. DHCP configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:40
-msgid "coovachilli_dhcp"
+msgid "DHCP configuration"
 msgstr "DHCP configuration"
 
 #. Set DHCP options for connecting clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:41
-msgid "coovachilli_dhcp_desc"
+msgid "Set DHCP options for connecting clients"
 msgstr "Set DHCP options for connecting clients"
 
 #. DHCP end number
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:42
-msgid "coovachilli_dhcp_dhcpend"
+msgid "DHCP end number"
 msgstr "DHCP end number"
 
 #. Where to stop assigning IP addresses (default 254)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:43
-msgid "coovachilli_dhcp_dhcpend_desc"
+msgid "Where to stop assigning IP addresses (default 254)"
 msgstr "Where to stop assigning IP addresses (default 254)"
 
 #. DHCP interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:44
-msgid "coovachilli_dhcp_dhcpif"
+msgid "DHCP interface"
 msgstr "DHCP interface"
 
 #. Ethernet interface to listen to for the downlink interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:45
-msgid "coovachilli_dhcp_dhcpif_desc"
+msgid "Ethernet interface to listen to for the downlink interface"
 msgstr "Ethernet interface to listen to for the downlink interface"
 
 #. Listen MAC address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:46
-msgid "coovachilli_dhcp_dhcpmac"
+msgid "Listen MAC address"
 msgstr "Listen MAC address"
 
 #. MAC address to listen to. If not specified the MAC address of the interface will be used
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:47
-msgid "coovachilli_dhcp_dhcpmac_desc"
+msgid "MAC address to listen to. If not specified the MAC address of the interface will be used"
 msgstr ""
 "MAC address to listen to. If not specified the MAC address of the interface "
 "will be used"
 
 #. DHCP start number
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:48
-msgid "coovachilli_dhcp_dhcpstart"
+msgid "DHCP start number"
 msgstr "DHCP start number"
 
 #. Where to start assigning IP addresses (default 10)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:49
-msgid "coovachilli_dhcp_dhcpstart_desc"
+msgid "Where to start assigning IP addresses (default 10)"
 msgstr "Where to start assigning IP addresses (default 10)"
 
 #. Enable IEEE 802.1x
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:50
-msgid "coovachilli_dhcp_eapolenable"
+msgid "Enable IEEE 802.1x"
 msgstr "Enable IEEE 802.1x"
 
 #. Enable IEEE 802.1x authentication and listen for EAP requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:51
-msgid "coovachilli_dhcp_eapolenable_desc"
+msgid "Enable IEEE 802.1x authentication and listen for EAP requests"
 msgstr "Enable IEEE 802.1x authentication and listen for EAP requests"
 
 #. Leasetime
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:52
-msgid "coovachilli_dhcp_lease"
+msgid "Leasetime"
 msgstr "Leasetime"
 
 #. Use a DHCP lease of seconds (default 600)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:53
-msgid "coovachilli_dhcp_lease_desc"
+msgid "Use a DHCP lease of seconds (default 600)"
 msgstr "Use a DHCP lease of seconds (default 600)"
 
 #. RADIUS configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:54
-msgid "coovachilli_radius"
+msgid "RADIUS configuration"
 msgstr "RADIUS configuration"
 
 #. RADIUS configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:55
-msgid "coovachilli_radius_desc"
+msgid "RADIUS configuration"
 msgstr "RADIUS configuration"
 
 #. Allow session update through RADIUS
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:56
-msgid "coovachilli_radius_acctupdate"
+msgid "Allow session update through RADIUS"
 msgstr "Allow session update through RADIUS"
 
 #. Allow updating of session parameters with RADIUS attributes sent in Accounting-Response
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:57
-msgid "coovachilli_radius_acctupdate_desc"
+msgid "Allow updating of session parameters with RADIUS attributes sent in Accounting-Response"
 msgstr ""
 "Allow updating of session parameters with RADIUS attributes sent in "
 "Accounting-Response"
 
 #. Admin password
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:58
-msgid "coovachilli_radius_adminpasswd"
+msgid "Admin password"
 msgstr "Admin password"
 
 #. Password to use for Administrative-User authentication in order to pick up chilli configurations and establish a device &quot;system&quot; session
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:59
-msgid "coovachilli_radius_adminpasswd_desc"
+msgid "Password to use for Administrative-User authentication in order to pick up chilli configurations and establish a device \"system\" session"
 msgstr ""
 "Password to use for Administrative-User authentication in order to pick up "
 "chilli configurations and establish a device &quot;system&quot; session"
 
 #. Admin user
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:60
-msgid "coovachilli_radius_adminuser"
+msgid "Admin user"
 msgstr "Admin user"
 
 #. User-name to use for Administrative-User authentication in order to pick up chilli configurations and establish a device &quot;system&quot; session
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:61
-msgid "coovachilli_radius_adminuser_desc"
+msgid "User-name to use for Administrative-User authentication in order to pick up chilli configurations and establish a device \"system\" session"
 msgstr ""
 "User-name to use for Administrative-User authentication in order to pick up "
 "chilli configurations and establish a device &quot;system&quot; session"
 
 #. Do not check disconnection requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:62
-msgid "coovachilli_radius_coanoipcheck"
+msgid "Do not check disconnection requests"
 msgstr "Do not check disconnection requests"
 
 #. Do not check the source IP address of radius disconnect requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:63
-msgid "coovachilli_radius_coanoipcheck_desc"
+msgid "Do not check the source IP address of radius disconnect requests"
 msgstr "Do not check the source IP address of radius disconnect requests"
 
 #. RADIUS disconnect port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:64
-msgid "coovachilli_radius_coaport"
+msgid "RADIUS disconnect port"
 msgstr "RADIUS disconnect port"
 
 #. UDP port to listen to for accepting radius disconnect requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:65
-msgid "coovachilli_radius_coaport_desc"
+msgid "UDP port to listen to for accepting radius disconnect requests"
 msgstr "UDP port to listen to for accepting radius disconnect requests"
 
 #. NAS IP
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:66
-msgid "coovachilli_radius_nasip"
+msgid "NAS IP"
 msgstr "NAS IP"
 
 #. Value to use in RADIUS NAS-IP-Address attribute
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:67
-msgid "coovachilli_radius_nasip_desc"
+msgid "Value to use in RADIUS NAS-IP-Address attribute"
 msgstr "Value to use in RADIUS NAS-IP-Address attribute"
 
 #. NAS MAC
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:68
-msgid "coovachilli_radius_nasmac"
+msgid "NAS MAC"
 msgstr "NAS MAC"
 
 #. MAC address value to use in RADIUS Called-Station-ID attribute
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:69
-msgid "coovachilli_radius_nasmac_desc"
+msgid "MAC address value to use in RADIUS Called-Station-ID attribute"
 msgstr "MAC address value to use in RADIUS Called-Station-ID attribute"
 
 #. Allow OpenID authentication
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:70
-msgid "coovachilli_radius_openidauth"
+msgid "Allow OpenID authentication"
 msgstr "Allow OpenID authentication"
 
 #. Allows OpenID authentication by sending ChilliSpot-Config=allow-openidauth in RADIUS Access-Requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:71
-msgid "coovachilli_radius_openidauth_desc"
+msgid "Allows OpenID authentication by sending ChilliSpot-Config=allow-openidauth in RADIUS Access-Requests"
 msgstr ""
 "Allows OpenID authentication by sending ChilliSpot-Config=allow-openidauth "
 "in RADIUS Access-Requests"
 
 #. RADIUS accounting port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:72
-msgid "coovachilli_radius_radiusacctport"
+msgid "RADIUS accounting port"
 msgstr "RADIUS accounting port"
 
 #. The UDP port number to use for radius accounting requests (default 1813)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:73
-msgid "coovachilli_radius_radiusacctport_desc"
+msgid "The UDP port number to use for radius accounting requests (default 1813)"
 msgstr ""
 "The UDP port number to use for radius accounting requests (default 1813)"
 
 #. RADIUS authentication port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:74
-msgid "coovachilli_radius_radiusauthport"
+msgid "RADIUS authentication port"
 msgstr "RADIUS authentication port"
 
 #. The UDP port number to use for radius authentication requests (default 1812)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:75
-msgid "coovachilli_radius_radiusauthport_desc"
+msgid "The UDP port number to use for radius authentication requests (default 1812)"
 msgstr ""
 "The UDP port number to use for radius authentication requests (default 1812)"
 
 #. Option radiuscalled
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:76
-msgid "coovachilli_radius_radiuscalled"
+msgid "Option radiuscalled"
 msgstr "Option radiuscalled"
 
 #. RADIUS listen address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:77
-msgid "coovachilli_radius_radiuslisten"
+msgid "RADIUS listen address"
 msgstr "RADIUS listen address"
 
 #. Local interface IP address to use for the radius interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:78
-msgid "coovachilli_radius_radiuslisten_desc"
+msgid "Local interface IP address to use for the radius interface"
 msgstr "Local interface IP address to use for the radius interface"
 
 #. RADIUS location ID
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:79
-msgid "coovachilli_radius_radiuslocationid"
+msgid "RADIUS location ID"
 msgstr "RADIUS location ID"
 
 #. WISPr Location ID
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:80
-msgid "coovachilli_radius_radiuslocationid_desc"
+msgid "WISPr Location ID"
 msgstr "WISPr Location ID"
 
 #. RADIUS location name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:81
-msgid "coovachilli_radius_radiuslocationname"
+msgid "RADIUS location name"
 msgstr "RADIUS location name"
 
 #. WISPr Location Name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:82
-msgid "coovachilli_radius_radiuslocationname_desc"
+msgid "WISPr Location Name"
 msgstr "WISPr Location Name"
 
 #. NAS ID
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:83
-msgid "coovachilli_radius_radiusnasid"
+msgid "NAS ID"
 msgstr "NAS ID"
 
 #. Network access server identifier
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:84
-msgid "coovachilli_radius_radiusnasid_desc"
+msgid "Network access server identifier"
 msgstr "Network access server identifier"
 
 #. Option radiusnasip
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:85
-msgid "coovachilli_radius_radiusnasip"
+msgid "Option radiusnasip"
 msgstr "Option radiusnasip"
 
 #. NAS port type
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:86
-msgid "coovachilli_radius_radiusnasporttype"
+msgid "NAS port type"
 msgstr "NAS port type"
 
 #. Value of NAS-Port-Type attribute. Defaults to 19 (Wireless-IEEE-802.11)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:87
-msgid "coovachilli_radius_radiusnasporttype_desc"
+msgid "Value of NAS-Port-Type attribute. Defaults to 19 (Wireless-IEEE-802.11)"
 msgstr "Value of NAS-Port-Type attribute. Defaults to 19 (Wireless-IEEE-802.11)"
 
 #. Send RADIUS VSA
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:88
-msgid "coovachilli_radius_radiusoriginalurl"
+msgid "Send RADIUS VSA"
 msgstr "Send RADIUS VSA"
 
 #. Send the ChilliSpot-OriginalURL RADIUS VSA in Access-Request
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:89
-msgid "coovachilli_radius_radiusoriginalurl_desc"
+msgid "Send the ChilliSpot-OriginalURL RADIUS VSA in Access-Request"
 msgstr "Send the ChilliSpot-OriginalURL RADIUS VSA in Access-Request"
 
 #. RADIUS secret
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:90
-msgid "coovachilli_radius_radiussecret"
+msgid "RADIUS secret"
 msgstr "RADIUS secret"
 
 #. Radius shared secret for both servers
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:91
-msgid "coovachilli_radius_radiussecret_desc"
+msgid "Radius shared secret for both servers"
 msgstr "Radius shared secret for both servers"
 
 #. RADIUS server 1
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:92
-msgid "coovachilli_radius_radiusserver1"
+msgid "RADIUS server 1"
 msgstr "RADIUS server 1"
 
 #. The IP address of radius server 1
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:93
-msgid "coovachilli_radius_radiusserver1_desc"
+msgid "The IP address of radius server 1"
 msgstr "The IP address of radius server 1"
 
 #. RADIUS server 2
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:94
-msgid "coovachilli_radius_radiusserver2"
+msgid "RADIUS server 2"
 msgstr "RADIUS server 2"
 
 #. The IP address of radius server 2
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:95
-msgid "coovachilli_radius_radiusserver2_desc"
+msgid "The IP address of radius server 2"
 msgstr "The IP address of radius server 2"
 
 #. Swap octets
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:96
-msgid "coovachilli_radius_swapoctets"
+msgid "Swap octets"
 msgstr "Swap octets"
 
 #. Swap the meaning of &quot;input octets&quot; and &quot;output octets&quot; as it related to RADIUS attribtues
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:97
-msgid "coovachilli_radius_swapoctets_desc"
+msgid "Swap the meaning of \"input octets\" and \"output octets\" as it related to RADIUS attribtues"
 msgstr ""
 "Swap the meaning of &quot;input octets&quot; and &quot;output octets&quot; "
 "as it related to RADIUS attribtues"
 
 #. Allow WPA guests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:98
-msgid "coovachilli_radius_wpaguests"
+msgid "Allow WPA guests"
 msgstr "Allow WPA guests"
 
 #. Allows WPA Guest authentication by sending ChilliSpot-Config=allow-wpa-guests in RADIUS Access-Requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:99
-msgid "coovachilli_radius_wpaguests_desc"
+msgid "Allows WPA Guest authentication by sending ChilliSpot-Config=allow-wpa-guests in RADIUS Access-Requests"
 msgstr ""
 "Allows WPA Guest authentication by sending ChilliSpot-Config=allow-wpa-"
 "guests in RADIUS Access-Requests"
 
 #. RADIUS proxy settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:100
-msgid "coovachilli_proxy"
+msgid "RADIUS proxy settings"
 msgstr "RADIUS proxy settings"
 
 #. RADIUS proxy settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:101
-msgid "coovachilli_proxy_desc"
+msgid "RADIUS proxy settings"
 msgstr "RADIUS proxy settings"
 
 #. Proxy client
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:102
-msgid "coovachilli_proxy_proxyclient"
+msgid "Proxy client"
 msgstr "Proxy client"
 
 #. IP address from which radius requests are accepted. If omitted the server will not accept radius requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:103
-msgid "coovachilli_proxy_proxyclient_desc"
+msgid "IP address from which radius requests are accepted. If omitted the server will not accept radius requests"
 msgstr ""
 "IP address from which radius requests are accepted. If omitted the server "
 "will not accept radius requests"
 
 #. Proxy listen address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:104
-msgid "coovachilli_proxy_proxylisten"
+msgid "Proxy listen address"
 msgstr "Proxy listen address"
 
 #. Local interface IP address to use for accepting radius requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:105
-msgid "coovachilli_proxy_proxylisten_desc"
+msgid "Local interface IP address to use for accepting radius requests"
 msgstr "Local interface IP address to use for accepting radius requests"
 
 #. Proxy port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:106
-msgid "coovachilli_proxy_proxyport"
+msgid "Proxy port"
 msgstr "Proxy port"
 
 #. UDP Port to listen to for accepting radius requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:107
-msgid "coovachilli_proxy_proxyport_desc"
+msgid "UDP Port to listen to for accepting radius requests"
 msgstr "UDP Port to listen to for accepting radius requests"
 
 #. Proxy secret
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:108
-msgid "coovachilli_proxy_proxysecret"
+msgid "Proxy secret"
 msgstr "Proxy secret"
 
 #. Radius shared secret for clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:109
-msgid "coovachilli_proxy_proxysecret_desc"
+msgid "Radius shared secret for clients"
 msgstr "Radius shared secret for clients"
 
 #. UAM configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:110
-msgid "coovachilli_uam"
+msgid "UAM configuration"
 msgstr "UAM configuration"
 
 #. Unified Configuration Method settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:111
-msgid "coovachilli_uam_desc"
+msgid "Unified Configuration Method settings"
 msgstr "Unified Configuration Method settings"
 
 #. Use Chilli XML
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:112
-msgid "coovachilli_uam_chillixml"
+msgid "Use Chilli XML"
 msgstr "Use Chilli XML"
 
 #. Return the so-called Chilli XML along with WISPr XML
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:113
-msgid "coovachilli_uam_chillixml_desc"
+msgid "Return the so-called Chilli XML along with WISPr XML"
 msgstr "Return the so-called Chilli XML along with WISPr XML"
 
 #. Default idle timeout
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:114
-msgid "coovachilli_uam_defidletimeout"
+msgid "Default idle timeout"
 msgstr "Default idle timeout"
 
 #. Default idle timeout unless otherwise set by RADIUS (defaults to 0)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:115
-msgid "coovachilli_uam_defidletimeout_desc"
+msgid "Default idle timeout unless otherwise set by RADIUS (defaults to 0)"
 msgstr "Default idle timeout unless otherwise set by RADIUS (defaults to 0)"
 
 #. Default interim interval
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:116
-msgid "coovachilli_uam_definteriminterval"
+msgid "Default interim interval"
 msgstr "Default interim interval"
 
 #. Default interim-interval for RADIUS accounting unless otherwise set by RADIUS (defaults to 0)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:117
-msgid "coovachilli_uam_definteriminterval_desc"
+msgid "Default interim-interval for RADIUS accounting unless otherwise set by RADIUS (defaults to 0)"
 msgstr ""
 "Default interim-interval for RADIUS accounting unless otherwise set by "
 "RADIUS (defaults to 0)"
 
 #. Default session timeout
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:118
-msgid "coovachilli_uam_defsessiontimeout"
+msgid "Default session timeout"
 msgstr "Default session timeout"
 
 #. Default session timeout unless otherwise set by RADIUS (defaults to 0)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:119
-msgid "coovachilli_uam_defsessiontimeout_desc"
+msgid "Default session timeout unless otherwise set by RADIUS (defaults to 0)"
 msgstr "Default session timeout unless otherwise set by RADIUS (defaults to 0)"
 
 #. Inspect DNS traffic
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:120
-msgid "coovachilli_uam_dnsparanoia"
+msgid "Inspect DNS traffic"
 msgstr "Inspect DNS traffic"
 
 #. Inspect DNS packets and drop responses with any non- A, CNAME, SOA, or MX records to prevent dns tunnels (experimental)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:121
-msgid "coovachilli_uam_dnsparanoia_desc"
+msgid "Inspect DNS packets and drop responses with any non- A, CNAME, SOA, or MX records to prevent dns tunnels (experimental)"
 msgstr ""
 "Inspect DNS packets and drop responses with any non- A, CNAME, SOA, or MX "
 "records to prevent dns tunnels (experimental)"
 
 #. Local users file
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:122
-msgid "coovachilli_uam_localusers"
+msgid "Local users file"
 msgstr "Local users file"
 
 #. A colon seperated file containing usernames and passwords of locally authenticated users
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:123
-msgid "coovachilli_uam_localusers_desc"
+msgid "A colon seperated file containing usernames and passwords of locally authenticated users"
 msgstr ""
 "A colon seperated file containing usernames and passwords of locally "
 "authenticated users"
 
 #. Location name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:124
-msgid "coovachilli_uam_locationname"
+msgid "Location name"
 msgstr "Location name"
 
 #. Human readable location name used in JSON interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:125
-msgid "coovachilli_uam_locationname_desc"
+msgid "Human readable location name used in JSON interface"
 msgstr "Human readable location name used in JSON interface"
 
 #. Do not redirect to UAM server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:126
-msgid "coovachilli_uam_nouamsuccess"
+msgid "Do not redirect to UAM server"
 msgstr "Do not redirect to UAM server"
 
 #. Do not return to UAM server on login success, just redirect to original URL
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:127
-msgid "coovachilli_uam_nouamsuccess_desc"
+msgid "Do not return to UAM server on login success, just redirect to original URL"
 msgstr ""
 "Do not return to UAM server on login success, just redirect to original URL"
 
 #. Do not do WISPr
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:128
-msgid "coovachilli_uam_nouamwispr"
+msgid "Do not do WISPr"
 msgstr "Do not do WISPr"
 
 #. Do not do any WISPr XML, assume the back-end is doing this instead
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:129
-msgid "coovachilli_uam_nouamwispr_desc"
+msgid "Do not do any WISPr XML, assume the back-end is doing this instead"
 msgstr "Do not do any WISPr XML, assume the back-end is doing this instead"
 
 #. Post auth proxy
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:130
-msgid "coovachilli_uam_postauthproxy"
+msgid "Post auth proxy"
 msgstr "Post auth proxy"
 
 #. Used with postauthproxyport to define a post authentication HTTP proxy server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:131
-msgid "coovachilli_uam_postauthproxy_desc"
+msgid "Used with postauthproxyport to define a post authentication HTTP proxy server"
 msgstr ""
 "Used with postauthproxyport to define a post authentication HTTP proxy "
 "server"
 
 #. Post auth proxy port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:132
-msgid "coovachilli_uam_postauthproxyport"
+msgid "Post auth proxy port"
 msgstr "Post auth proxy port"
 
 #. Used with postauthproxy to define a post authentication HTTP proxy server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:133
-msgid "coovachilli_uam_postauthproxyport_desc"
+msgid "Used with postauthproxy to define a post authentication HTTP proxy server"
 msgstr ""
 "Used with postauthproxy to define a post authentication HTTP proxy server"
 
 #. Allowed resources
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:134
-msgid "coovachilli_uam_uamallowed"
+msgid "Allowed resources"
 msgstr "Allowed resources"
 
 #. List of resources the client can access without first authenticating
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:135
-msgid "coovachilli_uam_uamallowed_desc"
+msgid "List of resources the client can access without first authenticating"
 msgstr "List of resources the client can access without first authenticating"
 
 #. Allow any DNS server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:136
-msgid "coovachilli_uam_uamanydns"
+msgid "Allow any DNS server"
 msgstr "Allow any DNS server"
 
 #. Allow any DNS server for unauthenticated clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:137
-msgid "coovachilli_uam_uamanydns_desc"
+msgid "Allow any DNS server for unauthenticated clients"
 msgstr "Allow any DNS server for unauthenticated clients"
 
 #. Allow any IP address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:138
-msgid "coovachilli_uam_uamanyip"
+msgid "Allow any IP address"
 msgstr "Allow any IP address"
 
 #. Allow clients to use any IP settings they wish by spoofing ARP (experimental)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:139
-msgid "coovachilli_uam_uamanyip_desc"
+msgid "Allow clients to use any IP settings they wish by spoofing ARP (experimental)"
 msgstr ""
 "Allow clients to use any IP settings they wish by spoofing ARP "
 "(experimental)"
 
 #. Allowed domains
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:140
-msgid "coovachilli_uam_uamdomain"
+msgid "Allowed domains"
 msgstr "Allowed domains"
 
 #. Defines a list of domain names to automatically add to the walled garden
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:141
-msgid "coovachilli_uam_uamdomain_desc"
+msgid "Defines a list of domain names to automatically add to the walled garden"
 msgstr ""
 "Defines a list of domain names to automatically add to the walled garden"
 
 #. UAM homepage
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:142
-msgid "coovachilli_uam_uamhomepage"
+msgid "UAM homepage"
 msgstr "UAM homepage"
 
 #. URL of homepage to redirect unauthenticated users to
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:143
-msgid "coovachilli_uam_uamhomepage_desc"
+msgid "URL of homepage to redirect unauthenticated users to"
 msgstr "URL of homepage to redirect unauthenticated users to"
 
 #. UAM static content port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:144
-msgid "coovachilli_uam_uamiport"
+msgid "UAM static content port"
 msgstr "UAM static content port"
 
 #. TCP port to bind to for only serving embedded content
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:145
-msgid "coovachilli_uam_uamiport_desc"
+msgid "TCP port to bind to for only serving embedded content"
 msgstr "TCP port to bind to for only serving embedded content"
 
 #. UAM listening address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:146
-msgid "coovachilli_uam_uamlisten"
+msgid "UAM listening address"
 msgstr "UAM listening address"
 
 #. IP address to listen to for authentication of clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:147
-msgid "coovachilli_uam_uamlisten_desc"
+msgid "IP address to listen to for authentication of clients"
 msgstr "IP address to listen to for authentication of clients"
 
 #. UAM logout IP
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:148
-msgid "coovachilli_uam_uamlogoutip"
+msgid "UAM logout IP"
 msgstr "UAM logout IP"
 
 #. Use this IP address to instantly logout a client accessing it (defaults to 1.1.1.1)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:149
-msgid "coovachilli_uam_uamlogoutip_desc"
+msgid "Use this IP address to instantly logout a client accessing it (defaults to 1.1.1.1)"
 msgstr ""
 "Use this IP address to instantly logout a client accessing it (defaults to "
 "1.1.1.1)"
 
 #. UAM listening port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:150
-msgid "coovachilli_uam_uamport"
+msgid "UAM listening port"
 msgstr "UAM listening port"
 
 #. TCP port to bind to for authenticating clients (default 3990)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:151
-msgid "coovachilli_uam_uamport_desc"
+msgid "TCP port to bind to for authenticating clients (default 3990)"
 msgstr "TCP port to bind to for authenticating clients (default 3990)"
 
 #. UAM secret
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:152
-msgid "coovachilli_uam_uamsecret"
+msgid "UAM secret"
 msgstr "UAM secret"
 
 #. Shared secret between uamserver and chilli
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:153
-msgid "coovachilli_uam_uamsecret_desc"
+msgid "Shared secret between uamserver and chilli"
 msgstr "Shared secret between uamserver and chilli"
 
 #. UAM server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:154
-msgid "coovachilli_uam_uamserver"
+msgid "UAM server"
 msgstr "UAM server"
 
 #. URL of web server to use for authenticating clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:155
-msgid "coovachilli_uam_uamserver_desc"
+msgid "URL of web server to use for authenticating clients"
 msgstr "URL of web server to use for authenticating clients"
 
 #. UAM user interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:156
-msgid "coovachilli_uam_uamui"
+msgid "UAM user interface"
 msgstr "UAM user interface"
 
 #. An init.d style program to handle local content on the uamuiport web server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:157
-msgid "coovachilli_uam_uamui_desc"
+msgid "An init.d style program to handle local content on the uamuiport web server"
 msgstr ""
 "An init.d style program to handle local content on the uamuiport web server"
 
 #. Use status file
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:158
-msgid "coovachilli_uam_usestatusfile"
+msgid "Use status file"
 msgstr "Use status file"
 
 #. Write the status of clients in a non-volatile state file (experimental)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:159
-msgid "coovachilli_uam_usestatusfile_desc"
+msgid "Write the status of clients in a non-volatile state file (experimental)"
 msgstr "Write the status of clients in a non-volatile state file (experimental)"
 
 #. WISPr login url
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:160
-msgid "coovachilli_uam_wisprlogin"
+msgid "WISPr login url"
 msgstr "WISPr login url"
 
 #. Specific URL to be given in WISPr XML LoginURL
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:161
-msgid "coovachilli_uam_wisprlogin_desc"
+msgid "Specific URL to be given in WISPr XML LoginURL"
 msgstr "Specific URL to be given in WISPr XML LoginURL"
 
 #. CGI program
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:162
-msgid "coovachilli_uam_wwwbin"
+msgid "CGI program"
 msgstr "CGI program"
 
 #. Executable to run as a CGI type program (like haserl) for URLs with extention .chi
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:163
-msgid "coovachilli_uam_wwwbin_desc"
+msgid "Executable to run as a CGI type program (like haserl) for URLs with extention .chi"
 msgstr ""
 "Executable to run as a CGI type program (like haserl) for URLs with "
 "extention .chi"
 
 #. Web content directory
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:164
-msgid "coovachilli_uam_wwwdir"
+msgid "Web content directory"
 msgstr "Web content directory"
 
 #. Directory where embedded local web content is placed
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:165
-msgid "coovachilli_uam_wwwdir_desc"
+msgid "Directory where embedded local web content is placed"
 msgstr "Directory where embedded local web content is placed"
 
 #. MAC configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:166
-msgid "coovachilli_macauth"
+msgid "MAC configuration"
 msgstr "MAC configuration"
 
 #. Configure MAC authentication
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:167
-msgid "coovachilli_macauth_desc"
+msgid "Configure MAC authentication"
 msgstr "Configure MAC authentication"
 
 #. Allowed MAC addresses
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:168
-msgid "coovachilli_macauth_macallowed"
+msgid "Allowed MAC addresses"
 msgstr "Allowed MAC addresses"
 
 #. List of MAC addresses for which MAC authentication will be performed
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:169
-msgid "coovachilli_macauth_macallowed_desc"
+msgid "List of MAC addresses for which MAC authentication will be performed"
 msgstr "List of MAC addresses for which MAC authentication will be performed"
 
 #. Authenticate locally allowed MACs
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:170
-msgid "coovachilli_macauth_macallowlocal"
+msgid "Authenticate locally allowed MACs"
 msgstr "Authenticate locally allowed MACs"
 
 #. Authenticate allowed MAC addresses without the use of RADIUS
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:171
-msgid "coovachilli_macauth_macallowlocal_desc"
+msgid "Authenticate allowed MAC addresses without the use of RADIUS"
 msgstr "Authenticate allowed MAC addresses without the use of RADIUS"
 
 #. Enable MAC authentification
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:172
-msgid "coovachilli_macauth_macauth"
+msgid "Enable MAC authentification"
 msgstr "Enable MAC authentification"
 
 #. Try to authenticate all users based on their mac address alone
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:173
-msgid "coovachilli_macauth_macauth_desc"
+msgid "Try to authenticate all users based on their mac address alone"
 msgstr "Try to authenticate all users based on their mac address alone"
 
 #. Password
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:174
-msgid "coovachilli_macauth_macpasswd"
+msgid "Password"
 msgstr "Password"
 
 #. Password used when performing MAC authentication
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:175
-msgid "coovachilli_macauth_macpasswd_desc"
+msgid "Password used when performing MAC authentication"
 msgstr "Password used when performing MAC authentication"
 
 #. Suffix
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:176
-msgid "coovachilli_macauth_macsuffix"
+msgid "Suffix"
 msgstr "Suffix"
 
 #. Suffix to add to the MAC address in order to form the User-Name, which is sent to the radius server
diff --git a/po/en/ddns.po b/po/en/ddns.po
index 65daa13a2..c4876ceb5 100644
--- a/po/en/ddns.po
+++ b/po/en/ddns.po
@@ -14,39 +14,39 @@ msgstr ""
 
 #. Dynamic DNS
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:1
-msgid "ddns"
+msgid "Dynamic DNS"
 msgstr "Dynamic DNS"
 
 #. Dynamic DNS allows that your router can be reached with a fixed hostname while having a dynamically changing IP-Address.
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:2
-msgid "ddns_desc"
+msgid "Dynamic DNS allows that your router can be reached with a fixed hostname while having a dynamically changing IP-Address."
 msgstr ""
 "Dynamic DNS allows that your router can be reached with a fixed hostname "
 "while having a dynamically changing IP-Address."
 
 #. Source of IP-Address
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:3
-msgid "ddns_service_ipsource"
+msgid "Source of IP-Address"
 msgstr "Source of IP-Address"
 
 #. Check for changed IP every
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:4
-msgid "ddns_service_checkinterval"
+msgid "Check for changed IP every"
 msgstr "Check for changed IP every"
 
 #. Check-Time unit
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:5
-msgid "ddns_service_checkunit"
+msgid "Check-Time unit"
 msgstr "Check-Time unit"
 
 #. Force update every
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:6
-msgid "ddns_service_forceinterval"
+msgid "Force update every"
 msgstr "Force update every"
 
 #. Force-Time unit
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:7
-msgid "ddns_service_forceunit"
+msgid "Force-Time unit"
 msgstr "Force-Time unit"
 
 #. Custom Update-URL
diff --git a/po/en/default.po b/po/en/default.po
index e436e818d..4eed48457 100644
--- a/po/en/default.po
+++ b/po/en/default.po
@@ -14,37 +14,37 @@ msgstr ""
 
 #. Skip to navigation
 #: i18n/english/luasrc/i18n/default.en.lua:1
-msgid "skiplink1"
+msgid "Skip to navigation"
 msgstr "Skip to navigation"
 
 #. Skip to content
 #: i18n/english/luasrc/i18n/default.en.lua:2
-msgid "skiplink2"
+msgid "Skip to content"
 msgstr "Skip to content"
 
 #. Navigation
 #: i18n/english/luasrc/i18n/default.en.lua:3
-msgid "navigation"
+msgid "Navigation"
 msgstr "Navigation"
 
 #. About
 #: i18n/english/luasrc/i18n/default.en.lua:4
-msgid "about"
+msgid "About"
 msgstr "About"
 
 #. Add
 #: i18n/english/luasrc/i18n/default.en.lua:5
-msgid "add"
+msgid "Add"
 msgstr "Add"
 
 #. Addresses
 #: i18n/english/luasrc/i18n/default.en.lua:6
-msgid "addresses"
+msgid "Addresses"
 msgstr "Addresses"
 
 #. Aliases
 #: i18n/english/luasrc/i18n/default.en.lua:7
-msgid "aliases"
+msgid "Aliases"
 msgstr "Aliases"
 
 #. all
@@ -59,99 +59,99 @@ msgstr "back"
 
 #. Administration
 #: i18n/english/luasrc/i18n/default.en.lua:10
-msgid "administration"
+msgid "Administration"
 msgstr "Administration"
 
 #. Essentials
 #: i18n/english/luasrc/i18n/default.en.lua:11
-msgid "essentials"
+msgid "Essentials"
 msgstr "Essentials"
 
 #. Apply
 #: i18n/english/luasrc/i18n/default.en.lua:12
-msgid "apply"
+msgid "Apply"
 msgstr "Apply"
 
 #. Basic Settings
 #: i18n/english/luasrc/i18n/default.en.lua:13
-msgid "basicsettings"
+msgid "Basic Settings"
 msgstr "Basic Settings"
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast
 #: i18n/english/luasrc/i18n/default.en.lua:14
-msgid "broadcast"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"
 msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"
 
 #. Cancel
 #: i18n/english/luasrc/i18n/default.en.lua:15
-msgid "cancel"
+msgid "Cancel"
 msgstr "Cancel"
 
 #. Changes
 #: i18n/english/luasrc/i18n/default.en.lua:16
-msgid "changes"
+msgid "Changes"
 msgstr "Changes"
 
 #. Channel
 #: i18n/english/luasrc/i18n/default.en.lua:17
-msgid "channel"
+msgid "Channel"
 msgstr "Channel"
 
 #. <abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/prefix
 #: i18n/english/luasrc/i18n/default.en.lua:18
-msgid "cidr6"
+msgid "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/prefix"
 msgstr ""
 "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: "
 "address/prefix"
 
 #. Code
 #: i18n/english/luasrc/i18n/default.en.lua:19
-msgid "code"
+msgid "Code"
 msgstr "Code"
 
 #. Configuration
 #: i18n/english/luasrc/i18n/default.en.lua:20
-msgid "config"
+msgid "Configuration"
 msgstr "Configuration"
 
 #. Configuration file
 #: i18n/english/luasrc/i18n/default.en.lua:21
-msgid "configfile"
+msgid "Configuration file"
 msgstr "Configuration file"
 
 #. Confirmation
 #: i18n/english/luasrc/i18n/default.en.lua:22
-msgid "confirmation"
+msgid "Confirmation"
 msgstr "Confirmation"
 
 #. Delete
 #: i18n/english/luasrc/i18n/default.en.lua:23
-msgid "delete"
+msgid "Delete"
 msgstr "Delete"
 
 #. Description
 #: i18n/english/luasrc/i18n/default.en.lua:24
-msgid "descr"
+msgid "Description"
 msgstr "Description"
 
 #. Design
 #: i18n/english/luasrc/i18n/default.en.lua:25
-msgid "design"
+msgid "Design"
 msgstr "Design"
 
 #. Destination
 #: i18n/english/luasrc/i18n/default.en.lua:26
-msgid "destination"
+msgid "Destination"
 msgstr "Destination"
 
 #. Device
 #: i18n/english/luasrc/i18n/default.en.lua:27
-msgid "device"
+msgid "Device"
 msgstr "Device"
 
 #. Devices
 #: i18n/english/luasrc/i18n/default.en.lua:28
-msgid "devices"
+msgid "Devices"
 msgstr "Devices"
 
 #. disable
@@ -161,22 +161,22 @@ msgstr "disable"
 
 #. Distance
 #: i18n/english/luasrc/i18n/default.en.lua:30
-msgid "distance"
+msgid "Distance"
 msgstr "Distance"
 
 #. Kernel Log
 #: i18n/english/luasrc/i18n/default.en.lua:31
-msgid "dmesg"
+msgid "Kernel Log"
 msgstr "Kernel Log"
 
 #. <abbr title=\"Domain Name System\">DNS</abbr>-Server
 #: i18n/english/luasrc/i18n/default.en.lua:32
-msgid "dnsserver"
+msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Server"
 msgstr "<abbr title=\"Domain Name System\">DNS</abbr>-Server"
 
 #. Edit
 #: i18n/english/luasrc/i18n/default.en.lua:33
-msgid "edit"
+msgid "Edit"
 msgstr "Edit"
 
 #. enable
@@ -186,47 +186,47 @@ msgstr "enable"
 
 #. Encryption
 #: i18n/english/luasrc/i18n/default.en.lua:35
-msgid "encryption"
+msgid "Encryption"
 msgstr "Encryption"
 
 #. Error
 #: i18n/english/luasrc/i18n/default.en.lua:36
-msgid "error"
+msgid "Error"
 msgstr "Error"
 
 #. Filesystem
 #: i18n/english/luasrc/i18n/default.en.lua:37
-msgid "filesystem"
+msgid "Filesystem"
 msgstr "Filesystem"
 
 #. Filter
 #: i18n/english/luasrc/i18n/default.en.lua:38
-msgid "filter"
+msgid "Filter"
 msgstr "Filter"
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway
 #: i18n/english/luasrc/i18n/default.en.lua:39
-msgid "gateway"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
 msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
 
 #. <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway
 #: i18n/english/luasrc/i18n/default.en.lua:40
-msgid "gateway6"
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 msgstr "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 
 #. General
 #: i18n/english/luasrc/i18n/default.en.lua:41
-msgid "general"
+msgid "General"
 msgstr "General"
 
 #. Hostname
 #: i18n/english/luasrc/i18n/default.en.lua:42
-msgid "hostname"
+msgid "Hostname"
 msgstr "Hostname"
 
 #. Install
 #: i18n/english/luasrc/i18n/default.en.lua:43
-msgid "install"
+msgid "Install"
 msgstr "Install"
 
 #. installed
@@ -236,102 +236,102 @@ msgstr "installed"
 
 #. Interface
 #: i18n/english/luasrc/i18n/default.en.lua:45
-msgid "interface"
+msgid "Interface"
 msgstr "Interface"
 
 #. Interfaces
 #: i18n/english/luasrc/i18n/default.en.lua:46
-msgid "interfaces"
+msgid "Interfaces"
 msgstr "Interfaces"
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address
 #: i18n/english/luasrc/i18n/default.en.lua:47
-msgid "ipaddress"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
 msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
 
 #. <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address
 #: i18n/english/luasrc/i18n/default.en.lua:48
-msgid "ip6address"
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address"
 msgstr "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address"
 
 #. Legend
 #: i18n/english/luasrc/i18n/default.en.lua:49
-msgid "legend"
+msgid "Legend"
 msgstr "Legend"
 
 #. Library
 #: i18n/english/luasrc/i18n/default.en.lua:50
-msgid "library"
+msgid "Library"
 msgstr "Library"
 
 #. Logout
 #: i18n/english/luasrc/i18n/default.en.lua:51
-msgid "logout"
+msgid "Logout"
 msgstr "Logout"
 
 #. Key
 #: i18n/english/luasrc/i18n/default.en.lua:52
-msgid "key"
+msgid "Key"
 msgstr "Key"
 
 #. Language
 #: i18n/english/luasrc/i18n/default.en.lua:53
-msgid "language"
+msgid "Language"
 msgstr "Language"
 
 #. Limit
 #: i18n/english/luasrc/i18n/default.en.lua:54
-msgid "limit"
+msgid "Limit"
 msgstr "Limit"
 
 #. Load
 #: i18n/english/luasrc/i18n/default.en.lua:55
-msgid "load"
+msgid "Load"
 msgstr "Load"
 
 #. Login
 #: i18n/english/luasrc/i18n/default.en.lua:56
-msgid "login"
+msgid "Login"
 msgstr "Login"
 
 #. <abbr title=\"Media Access Control\">MAC</abbr>-Address
 #: i18n/english/luasrc/i18n/default.en.lua:57
-msgid "macaddress"
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 
 #. see &#39;%s&#39; manpage
 #: i18n/english/luasrc/i18n/default.en.lua:58
-msgid "manpage"
+msgid "see '%s' manpage"
 msgstr "see &#39;%s&#39; manpage"
 
 #. Metric
 #: i18n/english/luasrc/i18n/default.en.lua:59
-msgid "metric"
+msgid "Metric"
 msgstr "Metric"
 
 #. Mode
 #: i18n/english/luasrc/i18n/default.en.lua:60
-msgid "mode"
+msgid "Mode"
 msgstr "Mode"
 
 #. Name
 #: i18n/english/luasrc/i18n/default.en.lua:61
-msgid "name"
+msgid "Name"
 msgstr "Name"
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask
 #: i18n/english/luasrc/i18n/default.en.lua:62
-msgid "netmask"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 
 #. Network
 #: i18n/english/luasrc/i18n/default.en.lua:63
-msgid "network"
+msgid "Network"
 msgstr "Network"
 
 #. Networks
 #: i18n/english/luasrc/i18n/default.en.lua:64
-msgid "networks"
+msgid "Networks"
 msgstr "Networks"
 
 #. none
@@ -341,117 +341,117 @@ msgstr "none"
 
 #. not installed
 #: i18n/english/luasrc/i18n/default.en.lua:66
-msgid "notinstalled"
+msgid "not installed"
 msgstr "not installed"
 
 #. OK
 #: i18n/english/luasrc/i18n/default.en.lua:67
-msgid "ok"
+msgid "OK"
 msgstr "OK"
 
 #. Options
 #: i18n/english/luasrc/i18n/default.en.lua:68
-msgid "options"
+msgid "Options"
 msgstr "Options"
 
 #. Overview
 #: i18n/english/luasrc/i18n/default.en.lua:69
-msgid "overview"
+msgid "Overview"
 msgstr "Overview"
 
 #. Package Manager
 #: i18n/english/luasrc/i18n/default.en.lua:70
-msgid "packagemanager"
+msgid "Package Manager"
 msgstr "Package Manager"
 
 #. Password
 #: i18n/english/luasrc/i18n/default.en.lua:71
-msgid "password"
+msgid "Password"
 msgstr "Password"
 
 #. Path
 #: i18n/english/luasrc/i18n/default.en.lua:72
-msgid "path"
+msgid "Path"
 msgstr "Path"
 
 #. Port
 #: i18n/english/luasrc/i18n/default.en.lua:73
-msgid "port"
+msgid "Port"
 msgstr "Port"
 
 #. Ports
 #: i18n/english/luasrc/i18n/default.en.lua:74
-msgid "ports"
+msgid "Ports"
 msgstr "Ports"
 
 #. Proceed
 #: i18n/english/luasrc/i18n/default.en.lua:75
-msgid "proceed"
+msgid "Proceed"
 msgstr "Proceed"
 
 #. Protocol
 #: i18n/english/luasrc/i18n/default.en.lua:76
-msgid "protocol"
+msgid "Protocol"
 msgstr "Protocol"
 
 #. Reboot
 #: i18n/english/luasrc/i18n/default.en.lua:77
-msgid "reboot"
+msgid "Reboot"
 msgstr "Reboot"
 
 #. Reset
 #: i18n/english/luasrc/i18n/default.en.lua:78
-msgid "reset"
+msgid "Reset"
 msgstr "Reset"
 
 #. Revert
 #: i18n/english/luasrc/i18n/default.en.lua:79
-msgid "revert"
+msgid "Revert"
 msgstr "Revert"
 
 #. Save
 #: i18n/english/luasrc/i18n/default.en.lua:80
-msgid "save"
+msgid "Save"
 msgstr "Save"
 
 #. Save &amp; Apply
 #: i18n/english/luasrc/i18n/default.en.lua:81
-msgid "saveapply"
+msgid "Save & Apply"
 msgstr "Save &amp; Apply"
 
 #. Scan
 #: i18n/english/luasrc/i18n/default.en.lua:82
-msgid "scan"
+msgid "Scan"
 msgstr "Scan"
 
 #. Service
 #: i18n/english/luasrc/i18n/default.en.lua:83
-msgid "service"
+msgid "Service"
 msgstr "Service"
 
 #. Services
 #: i18n/english/luasrc/i18n/default.en.lua:84
-msgid "services"
+msgid "Services"
 msgstr "Services"
 
 #. Settings
 #: i18n/english/luasrc/i18n/default.en.lua:85
-msgid "settings"
+msgid "Settings"
 msgstr "Settings"
 
 #. Size
 #: i18n/english/luasrc/i18n/default.en.lua:86
-msgid "size"
+msgid "Size"
 msgstr "Size"
 
 #. Source
 #: i18n/english/luasrc/i18n/default.en.lua:87
-msgid "source"
+msgid "Source"
 msgstr "Source"
 
 #. Start
 #: i18n/english/luasrc/i18n/default.en.lua:88
-msgid "start"
+msgid "Start"
 msgstr "Start"
 
 #. static
@@ -461,72 +461,72 @@ msgstr "static"
 
 #. Status
 #: i18n/english/luasrc/i18n/default.en.lua:90
-msgid "status"
+msgid "Status"
 msgstr "Status"
 
 #. Statistics
 #: i18n/english/luasrc/i18n/default.en.lua:91
-msgid "statistics"
+msgid "Statistics"
 msgstr "Statistics"
 
 #. Submit
 #: i18n/english/luasrc/i18n/default.en.lua:92
-msgid "submit"
+msgid "Submit"
 msgstr "Submit"
 
 #. System Log
 #: i18n/english/luasrc/i18n/default.en.lua:93
-msgid "syslog"
+msgid "System Log"
 msgstr "System Log"
 
 #. System
 #: i18n/english/luasrc/i18n/default.en.lua:94
-msgid "system"
+msgid "System"
 msgstr "System"
 
 #. Target
 #: i18n/english/luasrc/i18n/default.en.lua:95
-msgid "target"
+msgid "Target"
 msgstr "Target"
 
 #. Timezone
 #: i18n/english/luasrc/i18n/default.en.lua:96
-msgid "timezone"
+msgid "Timezone"
 msgstr "Timezone"
 
 #. Type
 #: i18n/english/luasrc/i18n/default.en.lua:97
-msgid "type"
+msgid "Type"
 msgstr "Type"
 
 #. Unknown Error
 #: i18n/english/luasrc/i18n/default.en.lua:98
-msgid "unknownerror"
+msgid "Unknown Error"
 msgstr "Unknown Error"
 
 #. Unsaved Changes
 #: i18n/english/luasrc/i18n/default.en.lua:99
-msgid "unsavedchanges"
+msgid "Unsaved Changes"
 msgstr "Unsaved Changes"
 
 #. Username
 #: i18n/english/luasrc/i18n/default.en.lua:100
-msgid "username"
+msgid "Username"
 msgstr "Username"
 
 #. Version
 #: i18n/english/luasrc/i18n/default.en.lua:101
-msgid "version"
+msgid "Version"
 msgstr "Version"
 
 #. Web <abbr title=\"User Interface\">UI</abbr>
 #: i18n/english/luasrc/i18n/default.en.lua:102
-msgid "webui"
+msgid "Web <abbr title=\"User Interface\">UI</abbr>"
 msgstr "Web <abbr title=\"User Interface\">UI</abbr>"
 
 #. Wifi
 #: i18n/english/luasrc/i18n/default.en.lua:103
-msgid "wifi"
+msgid "Wifi"
 msgstr "Wifi"
 
 #. Zone
diff --git a/po/en/diag_core.po b/po/en/diag_core.po
index d8e194340..c42270fac 100644
--- a/po/en/diag_core.po
+++ b/po/en/diag_core.po
@@ -13,33 +13,33 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-msgid "l_d_c_nci_diag"
+msgid "Diagnostics"
 msgstr "Diagnostics"
 
-msgid "l_d_c_nci_diag1"
+msgid "With this menu you can configure network diagnostics, such as network device scans and ping tests."
 msgstr ""
 "With this menu you can configure network diagnostics, such as network device "
 "scans and ping tests."
 
-msgid "l_d_c_nci_diag2"
+msgid "The diagnostics available under this menu depend on what modules you have installed on your device."
 msgstr ""
 "The diagnostics available under this menu depend on what modules you have "
 "installed on your device."
 
-msgid "l_d_c_i_diag"
+msgid "Diagnostics"
 msgstr "Diagnostics"
 
-msgid "l_d_c_i_diag1"
+msgid "The entries in the menu allow you to perform diagnostic tests on your system to aid in troubleshooting."
 msgstr ""
 "The entries in the menu allow you to perform diagnostic tests on your system "
 "to aid in troubleshooting."
 
-msgid "l_d_c_i_diag2"
+msgid "The diagnostics available under this menu depend on what modules you have installed on your device."
 msgstr ""
 "The diagnostics available under this menu depend on what modules you have "
 "installed on your device."
 
-msgid "l_d_diag_config"
+msgid "Configure Diagnostics"
 msgstr "Configure Diagnostics"
 
 msgid "l_d_diag"
diff --git a/po/en/diag_devinfo.po b/po/en/diag_devinfo.po
index 231c7dc5c..60aaffaed 100644
--- a/po/en/diag_devinfo.po
+++ b/po/en/diag_devinfo.po
@@ -13,289 +13,289 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-msgid "cbi_gorel"
+msgid " "
 msgstr " "
 
-msgid "edit"
+msgid "Edit"
 msgstr "Edit"
 
-msgid "cbi_del"
+msgid "Delete"
 msgstr "Delete"
 
-msgid "sectempty"
+msgid " "
 msgstr " "
 
-msgid "cbi_add"
+msgid "Add"
 msgstr "Add"
 
-msgid "cbi_invalid"
+msgid "Invalid"
 msgstr "Invalid"
 
-msgid "l_d_d_dc_nosipdev"
+msgid "No SIP devices"
 msgstr "No SIP devices"
 
-msgid "l_d_d_dc_nodev"
+msgid "No devices detected"
 msgstr "No devices detected"
 
-msgid "l_d_d_dc_checkothernet"
+msgid "check other networks"
 msgstr "check other networks"
 
-msgid "l_d_d_dc_sipdev_found_mini"
+msgid "SIP devices discovered for"
 msgstr "SIP devices discovered for"
 
-msgid "l_d_d_dc_sipdev_found_admin"
+msgid "SIP devices discovered for"
 msgstr "SIP devices discovered for"
 
-msgid "l_dd_dc_netdev_found_mini"
+msgid "Devices discovered for"
 msgstr "Devices discovered for"
 
 #. Devices discovered for
-msgid "l_d_d_dc_netdev_found_admin"
+msgid "Devices discovered for"
 msgstr "Devices discovered for"
 
-msgid "l_d_d_dc_mac_ip"
+msgid "IP Address"
 msgstr "IP Address"
 
-msgid "l_d_d_dc_mac_address"
+msgid "MAC Address"
 msgstr "MAC Address"
 
-msgid "l_d_d_dc_mac_vendor"
+msgid "Vendor"
 msgstr "Vendor"
 
-msgid "l_d_d_dc_mac_device_type"
+msgid "Device Type"
 msgstr "Device Type"
 
-msgid "l_d_d_dc_mac_model"
+msgid "Model"
 msgstr "Model"
 
-msgid "l_d_d_dc_config_page"
+msgid "Link to Device"
 msgstr "Link to Device"
 
-msgid "l_d_d_dc_raw"
+msgid "Raw"
 msgstr "Raw"
 
-msgid "l_d_d_dc_enable"
+msgid "Enable"
 msgstr "Enable"
 
-msgid "l_d_d_dc_interface"
+msgid "Interface"
 msgstr "Interface"
 
-msgid "l_d_d_dc_subnet"
+msgid "Subnet"
 msgstr "Subnet"
 
-msgid "l_d_d_dc_timeout"
+msgid "Timeout"
 msgstr "Timeout"
 
-msgid "l_d_d_dc_timeout_descr"
+msgid "Time to wait for responses in seconds (default 10)"
 msgstr "Time to wait for responses in seconds (default 10)"
 
-msgid "l_d_d_dc_repeat_count"
+msgid "Repeat Count"
 msgstr "Repeat Count"
 
-msgid "l_d_d_dc_repeat_count_descr"
+msgid "Number of times to send requests (default 1)"
 msgstr "Number of times to send requests (default 1)"
 
-msgid "l_d_d_dc_sleep"
+msgid "Sleep Between Requests"
 msgstr "Sleep Between Requests"
 
-msgid "l_d_d_dc_sleep_desc"
+msgid "Milliseconds to sleep between requests (default 100)"
 msgstr "Milliseconds to sleep between requests (default 100)"
 
-msgid "l_d_d_nc_netdiscover_actions"
+msgid "Actions"
 msgstr "Actions"
 
-msgid "l_d_d_nc_config_scan"
+msgid "Configure Scans"
 msgstr "Configure Scans"
 
-msgid "l_d_d_nc_redo_scans"
+msgid "Repeat Scans (this can take a few minutes)"
 msgstr "Repeat Scans (this can take a few minutes)"
 
-msgid "l_d_d_ldd_diag_smap_devinfo"
+msgid "Phones"
 msgstr "Phones"
 
-msgid "l_d_d_ldd_config"
+msgid "Configure"
 msgstr "Configure"
 
-msgid "l_d_d_ldd_smap_devinfo_config"
+msgid "SIP Devices on Network"
 msgstr "SIP Devices on Network"
 
-msgid "l_d_d_ldd_netdiscover_devinfo_scan"
+msgid "Network Device Scan"
 msgstr "Network Device Scan"
 
-msgid "l_d_d_ldd_smap_devinfo_scan_config"
+msgid "SIP Device Scan"
 msgstr "SIP Device Scan"
 
-msgid "l_d_d_ldd_netdiscover_devinfo"
+msgid "Devices on Network"
 msgstr "Devices on Network"
 
-msgid "l_d_d_ldd_mac_to_devinfo_overrides"
+msgid "MAC Device Info Overrides"
 msgstr "MAC Device Info Overrides"
 
-msgid "l_d_d_ldd_diag_smap_devinfo_scan_mini"
+msgid "Phone Scan"
 msgstr "Phone Scan"
 
-msgid "l_d_d_ldd_smap_devinfo_config_scan_miini"
+msgid "Config Phone Scan"
 msgstr "Config Phone Scan"
 
-msgid "l_d_d_ldd_diag_netdiscover_devinfo_scan_mini"
+msgid "Network Device Scan"
 msgstr "Network Device Scan"
 
-msgid "l_d_d_ldd_netdiscover_devinfo_scan_config_mini"
+msgid "Device Scan Config"
 msgstr "Device Scan Config"
 
-msgid "l_d_d_sc_smap_actions"
+msgid "Actions"
 msgstr "Actions"
 
-msgid "l_d_d_sc_config_scan"
+msgid "Configure Scans"
 msgstr "Configure Scans"
 
-msgid "l_d_d_sc_redo_scans"
+msgid "Repeat Scans (this can take a few minutes)"
 msgstr "Repeat Scans (this can take a few minutes)"
 
-msgid "l_d_d_ndc_netdiscover_to_devinfo_config"
+msgid "Network Device Scanning Configuration"
 msgstr "Network Device Scanning Configuration"
 
-msgid "l_d_d_ndc_netdiscover_to_devinfo_config_descr"
+msgid "Configure scanning for devices on specified networks. Decreasing 'Timeout', 'Repeat Count', and/or 'Sleep Between Requests' may speed up scans, but also may fail to find some devices."
 msgstr ""
 "Configure scanning for devices on specified networks. Decreasing 'Timeout', "
 "'Repeat Count', and/or 'Sleep Between Requests' may speed up scans, but also "
 "may fail to find some devices."
 
-msgid "l_d_d_ndc_use_config"
+msgid "Use Configuration"
 msgstr "Use Configuration"
 
-msgid "l_d_d_ndc_do_scans"
+msgid "Perform Scans (this can take a few minutes)"
 msgstr "Perform Scans (this can take a few minutes)"
 
-msgid "l_d_d_ndc_netdiscover_scannet"
+msgid "Scanning Configuration"
 msgstr "Scanning Configuration"
 
-msgid "l_d_d_ndc_netdiscover_scannet_descr"
+msgid "Networks to scan for devices"
 msgstr "Networks to scan for devices"
 
-msgid "l_d_d_sdc_smap_to_devinfo_config"
+msgid "SIP Device Scanning Configuration"
 msgstr "SIP Device Scanning Configuration"
 
-msgid "l_d_d_sdc_smap_to_devinfo_config_descr"
+msgid "Configure scanning for supported SIP devices on specified networks. Decreasing 'Timeout', 'Repeat Count', and/or 'Sleep Between Requests' may speed up scans, but also may fail to find some devices."
 msgstr ""
 "Configure scanning for supported SIP devices on specified networks. "
 "Decreasing 'Timeout', 'Repeat Count', and/or 'Sleep Between Requests' may "
 "speed up scans, but also may fail to find some devices."
 
-msgid "l_d_d_sdc_use_config"
+msgid "Use Configuration"
 msgstr "Use Configuration"
 
-msgid "l_d_d_sdc_do_scans"
+msgid "Perform Scans (this can take a few minutes)"
 msgstr "Perform Scans (this can take a few minutes)"
 
-msgid "l_d_d_sdc_smap_scannet"
+msgid "Scanning Configuration"
 msgstr "Scanning Configuration"
 
-msgid "smap_scannet_descr"
+msgid "Networks to scan for supported devices"
 msgstr "Networks to scan for supported devices"
 
-msgid "l_d_d_sdc_ports"
+msgid "Ports"
 msgstr "Ports"
 
-msgid "l_d_d_ndc_netdiscover_to_devinfo_config_mini"
+msgid "Network Device Scanning Configuration"
 msgstr "Network Device Scanning Configuration"
 
-msgid "l_d_d_ndc_mini_netdiscover_to_devinfo_config_descr"
+msgid "Configure scanning for devices on specified networks. Decreasing 'Timeout', 'Repeat Count', and/or 'Sleep Between Requests' may speed up scans, but also may fail to find some devices."
 msgstr ""
 "Configure scanning for devices on specified networks. Decreasing 'Timeout', "
 "'Repeat Count', and/or 'Sleep Between Requests' may speed up scans, but also "
 "may fail to find some devices."
 
-msgid "l_d_d_ndc_mini_use_config"
+msgid "Use Configuration"
 msgstr "Use Configuration"
 
-msgid "l_d_d_ndc_mini_do_scans"
+msgid "Perform Scans (this can take a few minutes)"
 msgstr "Perform Scans (this can take a few minutes)"
 
-msgid "l_d_d_ndc_mini_netdiscover_scannet"
+msgid "Scanning Configuration"
 msgstr "Scanning Configuration"
 
-msgid "l_d_d_ndc_mini_netdiscover_scannet_descr"
+msgid "Networks to scan for devices"
 msgstr "Networks to scan for devices"
 
-msgid "l_d_d_sd_smap_to_devinfo"
+msgid "SIP Device Information"
 msgstr "SIP Device Information"
 
-msgid "l_d_d_sd_smap_to_devinfo_descr"
+msgid "Scan for supported SIP devices on specified networks."
 msgstr "Scan for supported SIP devices on specified networks."
 
-msgid "l_d_d_sd_mini_smap_to_devinfo"
+msgid "Phone Information"
 msgstr "Phone Information"
 
-msgid "l_d_d_sd_mini_smap_to_devinfo_descr"
+msgid "Scan for supported SIP devices on specified networks."
 msgstr "Scan for supported SIP devices on specified networks."
 
-msgid "l_d_d_m_mac_to_devinfo_override"
+msgid "MAC Device Info Overrides"
 msgstr "MAC Device Info Overrides"
 
-msgid "l_d_d_m_mac_to_devinfo_override_descr"
+msgid "Override the information returned by the MAC to Device Info Script (mac-to-devinfo) for a specified range of MAC Addresses"
 msgstr ""
 "Override the information returned by the MAC to Device Info Script (mac-to-"
 "devinfo) for a specified range of MAC Addresses"
 
-msgid "l_d_d_m_mac_to_devinfo_section"
+msgid "MAC Device Override"
 msgstr "MAC Device Override"
 
-msgid "l_d_d_m_mac_to_devinfo_section_descr"
+msgid "MAC range and information used to override system and IEEE databases"
 msgstr "MAC range and information used to override system and IEEE databases"
 
-msgid "l_d_d_m_name"
+msgid "Name"
 msgstr "Name"
 
-msgid "l_d_d_m_maclow"
+msgid "Beginning of MAC address range"
 msgstr "Beginning of MAC address range"
 
-msgid "l_d_d_m_machigh"
+msgid "End of MAC address range"
 msgstr "End of MAC address range"
 
-msgid "l_d_d_m_vendor"
+msgid "Vendor"
 msgstr "Vendor"
 
-msgid "l_d_d_m_mactodevinfo_devtype"
+msgid "Device Type"
 msgstr "Device Type"
 
-msgid "l_d_d_m_model"
+msgid "Model"
 msgstr "Model"
 
-msgid "l_d_d_m_ouiowneroverride"
+msgid "OUI Owner"
 msgstr "OUI Owner"
 
-msgid "l_d_d_nd_mini_netdiscover_to_devinfo"
+msgid "Network Device Scan"
 msgstr "Network Device Scan"
 
-msgid "l_d_d_nd_mini_netdiscover_to_devinfo_descr"
+msgid "Scan for devices on specified networks."
 msgstr "Scan for devices on specified networks."
 
-msgid "l_d_d_sdc_mini_smap_to_devinfo_config"
+msgid "Phone Scanning Configuration"
 msgstr "Phone Scanning Configuration"
 
-msgid "l_d_d_sdc_mini_smap_to_devinfo_config_descr"
+msgid "Configure scanning for supported SIP devices on specified networks. Decreasing 'Timeout', 'Repeat Count', and/or 'Sleep Between Requests' may speed up scans, but also may fail to find some devices."
 msgstr ""
 "Configure scanning for supported SIP devices on specified networks. "
 "Decreasing 'Timeout', 'Repeat Count', and/or 'Sleep Between Requests' may "
 "speed up scans, but also may fail to find some devices."
 
-msgid "l_d_d_sdc_mini_use_config"
+msgid "Use Configuration"
 msgstr "Use Configuration"
 
-msgid "l_d_d_sdc_mini_do_scans"
+msgid "Perform Scans (this can take a few minutes)"
 msgstr "Perform Scans (this can take a few minutes)"
 
-msgid "l_d_d_sdc_mini_smap_scannet"
+msgid "Scanning Configuration"
 msgstr "Scanning Configuration"
 
-msgid "l_d_d_sdc_mini_smap_scannet_descr"
+msgid "Networks to scan for supported devices"
 msgstr "Networks to scan for supported devices"
 
-msgid "l_d_d_sdc_mini_ports"
+msgid "Ports"
 msgstr "Ports"
 
-msgid "l_d_d_nd_netdiscover_to_devinfo"
+msgid "Network Device Scan"
 msgstr "Network Device Scan"
 
 msgid "l_d_d_nd_netdiscover_to_devinfo_descr"
diff --git a/po/en/freifunk.po b/po/en/freifunk.po
index 297eb9302..4a984493f 100644
--- a/po/en/freifunk.po
+++ b/po/en/freifunk.po
@@ -13,242 +13,242 @@ msgstr ""
 
 #. Hello and welcome in the network of
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:1
-msgid "ff_hellonet"
+msgid "Hello and welcome in the network of"
 msgstr "Hello and welcome in the network of"
 
 #. We are an initiative to establish a free, independent and open wireless mesh network.
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:2
-msgid "ff_public1"
+msgid "We are an initiative to establish a free, independent and open wireless mesh network."
 msgstr ""
 "We are an initiative to establish a free, independent and open wireless mesh "
 "network."
 
 #. This is the access point
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:3
-msgid "ff_public2"
+msgid "This is the access point"
 msgstr "This is the access point"
 
 #. It is operated by
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:4
-msgid "ff_public3"
+msgid "It is operated by"
 msgstr "It is operated by"
 
 #. You can find further information about the global Freifunk initiative at
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:5
-msgid "ff_public4"
+msgid "You can find further information about the global Freifunk initiative at"
 msgstr ""
 "You can find further information about the global Freifunk initiative at"
 
 #. If you are interested in our project then contact the local community
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:6
-msgid "ff_public5"
+msgid "If you are interested in our project then contact the local community"
 msgstr "If you are interested in our project then contact the local community"
 
 #. Internet access depends on technical and organisational conditions and may or may not work for you.
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:7
-msgid "ff_public6"
+msgid "Internet access depends on technical and organisational conditions and may or may not work for you."
 msgstr ""
 "Internet access depends on technical and organisational conditions and may "
 "or may not work for you."
 
 #. Location
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:8
-msgid "ff_location"
+msgid "Location"
 msgstr "Location"
 
 #. E-Mail
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:9
-msgid "ff_mail"
+msgid "E-Mail"
 msgstr "E-Mail"
 
 #. You really should provide your address here!
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:10
-msgid "ff_mail1"
+msgid "You really should provide your address here!"
 msgstr "You really should provide your address here!"
 
 #. Nickname
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:11
-msgid "ff_nickname"
+msgid "Nickname"
 msgstr "Nickname"
 
 #. Realname
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:12
-msgid "ff_name"
+msgid "Realname"
 msgstr "Realname"
 
 #. Node
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:13
-msgid "ff_node"
+msgid "Node"
 msgstr "Node"
 
 #. Notice
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:14
-msgid "ff_note"
+msgid "Notice"
 msgstr "Notice"
 
 #. Phone
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:15
-msgid "ff_phone"
+msgid "Phone"
 msgstr "Phone"
 
 #. Memory
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:16
-msgid "ff_ram"
+msgid "Memory"
 msgstr "Memory"
 
 #. Free
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:17
-msgid "ff_free"
+msgid "Free"
 msgstr "Free"
 
 #. Buffers
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:18
-msgid "ff_buffers"
+msgid "Buffers"
 msgstr "Buffers"
 
 #. Cached
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:19
-msgid "ff_cached"
+msgid "Cached"
 msgstr "Cached"
 
 #. Total
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:20
-msgid "ff_total"
+msgid "Total"
 msgstr "Total"
 
 #. Coordinates
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:21
-msgid "ff_geocoord"
+msgid "Coordinates"
 msgstr "Coordinates"
 
 #. Client-Splash
-msgid "ff_splash"
+msgid "Client-Splash"
 msgstr "Client-Splash"
 
 #. Active Clients
-msgid "ff_splash_clients"
+msgid "Active Clients"
 msgstr "Active Clients"
 
 #. Hostname
-msgid "ff_splash_hostname"
+msgid "Hostname"
 msgstr "Hostname"
 
 #. IP Address
-msgid "ff_splash_ip"
+msgid "IP Address"
 msgstr "IP Address"
 
 #. MAC Address
-msgid "ff_splash_mac"
+msgid "MAC Address"
 msgstr "MAC Address"
 
 #. Time remaining
-msgid "ff_splash_timeleft"
+msgid "Time remaining"
 msgstr "Time remaining"
 
 #. Outgoing traffic
-msgid "ff_splash_traffic"
+msgid "Traffic (down/up)"
 msgstr "Traffic (down/up)"
 
 #. Policy
-msgid "ff_splash_policy"
+msgid "Policy"
 msgstr "Policy"
 
 #. unknown
-msgid "ff_splash_unknown"
+msgid "unknown"
 msgstr "unknown"
 
 #. expired
-msgid "ff_splash_expired"
+msgid "expired"
 msgstr "expired"
 
 #. whitelisted
-msgid "ff_splash_whitelisted"
+msgid "whitelisted"
 msgstr "whitelisted"
 
 #. splashed
-msgid "ff_splash_splashed"
+msgid "splashed"
 msgstr "splashed"
 
 #. blacklisted
-msgid "ff_splash_blacklisted"
+msgid "blacklisted"
 msgstr "blacklisted"
 
 #. temporarily blocked
-msgid "ff_splash_tempblock"
+msgid "temporarily blocked"
 msgstr "temporarily blocked"
 
 #. No clients connected
-msgid "ff_splash_noclients"
+msgid "No clients connected"
 msgstr "No clients connected"
 
 #. P2P-Block
-msgid "ff_p2pblock"
+msgid "P2P-Block"
 msgstr "P2P-Block"
 
 #. P2P-Block is a greylisting mechanism to block various peer-to-peer protocols for non-whitelisted clients.
-msgid "ff_p2pblock_desc"
+msgid "P2P-Block is a greylisting mechanism to block various peer-to-peer protocols for non-whitelisted clients."
 msgstr ""
 "P2P-Block is a greylisting mechanism to block various peer-to-peer protocols "
 "for non-whitelisted clients."
 
 #. Enable P2P-Block
-msgid "ff_p2pblock_enabled"
+msgid "Enable P2P-Block"
 msgstr "Enable P2P-Block"
 
 #. Portrange
-msgid "ff_p2pblock_portrange"
+msgid "Portrange"
 msgstr "Portrange"
 
 #. Block Time
-msgid "ff_p2pblock_blocktime"
+msgid "Block Time"
 msgstr "Block Time"
 
 #. seconds
-msgid "ff_p2pblock_blocktime_desc"
+msgid "seconds"
 msgstr "seconds"
 
 #. Whitelisted IPs
-msgid "ff_p2pblock_whitelist"
+msgid "Whitelisted IPs"
 msgstr "Whitelisted IPs"
 
 #. Layer7-Protokolle
-msgid "ff_p2pblock_layer7"
+msgid "Layer7-Protocols"
 msgstr "Layer7-Protocols"
 
 #. IP-P2P
-msgid "ff_p2pblock_ipp2p"
+msgid "IP-P2P"
 msgstr "IP-P2P"
 
 #. Freifunk Remote Update
-msgid "ff_remote_update"
+msgid "Freifunk Remote Update"
 msgstr "Freifunk Remote Update"
 
 #. Check for new firmware versions and perform automatic updates.
-msgid "ff_remote_update_desc"
+msgid "Check for new firmware versions and perform automatic updates."
 msgstr "Check for new firmware versions and perform automatic updates."
 
 #. Update available!
-msgid "ff_remote_update_available"
+msgid "Update available!"
 msgstr "Update available!"
 
 #. The installed firmware is the most recent version.
-msgid "ff_remote_update_uptodate"
+msgid "The installed firmware is the most recent version."
 msgstr "The installed firmware is the most recent version."
 
 #. Start Upgrade
-msgid "ff_remote_update_install"
+msgid "Start Upgrade"
 msgstr "Start Upgrade"
 
 #. Update Settings
-msgid "ff_remote_update_settings"
+msgid "Update Settings"
 msgstr "Update Settings"
 
 #. Keep configuration
-msgid "ff_remote_update_keepcfg"
+msgid "Keep configuration"
 msgstr "Keep configuration"
 
 #. Verify downloaded images
-msgid "ff_remote_update_verify"
+msgid "Verify downloaded images"
 msgstr "Verify downloaded images"
 
 #. Confirm Upgrade
diff --git a/po/en/hd_idle.po b/po/en/hd_idle.po
index 7dfc14b50..7180df0a3 100644
--- a/po/en/hd_idle.po
+++ b/po/en/hd_idle.po
@@ -14,37 +14,37 @@ msgstr ""
 
 #. Disk
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:1
-msgid "disk"
+msgid "Disk"
 msgstr "Disk"
 
 #. Enable debug
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:2
-msgid "enable_debug"
+msgid "Enable debug"
 msgstr "Enable debug"
 
 #. hd-idle
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:3
-msgid "hd_idle"
+msgid "hd-idle"
 msgstr "hd-idle"
 
 #. hd-idle is a utility program for spinning-down external disks after a period of idle time.
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:4
-msgid "hd_idle_desc"
+msgid "hd-idle is a utility program for spinning-down external disks after a period of idle time."
 msgstr ""
 "hd-idle is a utility program for spinning-down external disks after a period "
 "of idle time."
 
 #. Idle-Time
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:5
-msgid "idle_time_interval"
+msgid "Idle-Time"
 msgstr "Idle-Time"
 
 #. Idle-Time unit
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:6
-msgid "idle_time_unit"
+msgid "Idle-Time unit"
 msgstr "Idle-Time unit"
 
 #. Settings
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:7
-msgid "settings"
+msgid "Settings"
 msgstr "Settings"
diff --git a/po/en/initmgr.po b/po/en/initmgr.po
index 3183647ca..c6499536f 100644
--- a/po/en/initmgr.po
+++ b/po/en/initmgr.po
@@ -14,12 +14,12 @@ msgstr ""
 
 #. Initscripts
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:1
-msgid "initmgr"
+msgid "Initscripts"
 msgstr "Initscripts"
 
 #. You can enable or disable installed init scripts here. Changes will applied after a device reboot.<br /><strong>Warning: If you disable essential init scripts like &quot;network&quot;, your device might become inaccesable!</strong>
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:2
-msgid "initmgr_desc"
+msgid "You can enable or disable installed init scripts here. Changes will applied after a device reboot.<br /><strong>Warning: If you disable essential init scripts like \"network\", your device might become inaccesable!</strong>"
 msgstr ""
 "You can enable or disable installed init scripts here. Changes will applied "
 "after a device reboot.<br /><strong>Warning: If you disable essential init "
@@ -28,12 +28,12 @@ msgstr ""
 
 #. Start priority
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:3
-msgid "initmgr_index"
+msgid "Start priority"
 msgstr "Start priority"
 
 #. Initscript
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:4
-msgid "initmgr_name"
+msgid "Initscript"
 msgstr "Initscript"
 
 #. Enable/Disable
diff --git a/po/en/livestats.po b/po/en/livestats.po
index a3e6da249..573709da1 100644
--- a/po/en/livestats.po
+++ b/po/en/livestats.po
@@ -14,32 +14,32 @@ msgstr ""
 
 #. incoming
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:1
-msgid "livestats_incoming"
+msgid "incoming"
 msgstr "incoming"
 
 #. outgoing
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:2
-msgid "livestats_outgoing"
+msgid "outgoing"
 msgstr "outgoing"
 
 #. traffic on
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:3
-msgid "livestats_traffic"
+msgid "traffic on"
 msgstr "traffic on"
 
 #. signal-to-noise ratio for
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:4
-msgid "livestats_wifi"
+msgid "signal-to-noise ratio for"
 msgstr "signal-to-noise ratio for"
 
 #. load average
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:5
-msgid "livestats_loadavg"
+msgid "load average"
 msgstr "load average"
 
 #. Realtime Wireless Status
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:6
-msgid "livestats_stat_wireless"
+msgid "Realtime Wireless Status"
 msgstr "Realtime Wireless Status"
 
 #. Realtime Network Traffic
diff --git a/po/en/luci-fw.po b/po/en/luci-fw.po
index 70847a404..e892bb962 100644
--- a/po/en/luci-fw.po
+++ b/po/en/luci-fw.po
@@ -14,61 +14,61 @@ msgstr ""
 
 #. Port forwarding
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:1
-msgid "fw_portfw"
+msgid "Port forwarding"
 msgstr "Port forwarding"
 
 #. Traffic Redirection
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:2
-msgid "fw_redirect"
+msgid "Traffic Redirection"
 msgstr "Traffic Redirection"
 
 #. Traffic redirection allows you to change the destination address of forwarded packets.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:3
-msgid "fw_redirect_desc"
+msgid "Traffic redirection allows you to change the destination address of forwarded packets."
 msgstr ""
 "Traffic redirection allows you to change the destination address of "
 "forwarded packets."
 
 #. Zone-to-Zone traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:4
-msgid "fw_forwarding"
+msgid "Zone-to-Zone traffic"
 msgstr "Zone-to-Zone traffic"
 
 #. Firewall
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:5
-msgid "fw_fw"
+msgid "Firewall"
 msgstr "Firewall"
 
 #. Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:6
-msgid "fw_zone"
+msgid "Zone"
 msgstr "Zone"
 
 #. Zones
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:7
-msgid "fw_zones"
+msgid "Zones"
 msgstr "Zones"
 
 #. Custom forwarding
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:8
-msgid "fw_custfwd"
+msgid "Custom forwarding"
 msgstr "Custom forwarding"
 
 #. The firewall creates zones over your network interfaces to control network traffic flow.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:9
-msgid "fw_fw1"
+msgid "The firewall creates zones over your network interfaces to control network traffic flow."
 msgstr ""
 "The firewall creates zones over your network interfaces to control network "
 "traffic flow."
 
 #. Advanced Rules
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:10
-msgid "firewall_rule"
+msgid "Advanced Rules"
 msgstr "Advanced Rules"
 
 #. Advanced rules let you customize the firewall to your needs. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:11
-msgid "firewall_rule_desc"
+msgid "Advanced rules let you customize the firewall to your needs. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall."
 msgstr ""
 "Advanced rules let you customize the firewall to your needs. Only new "
 "connections will be matched. Packets belonging to already open connections "
@@ -76,139 +76,139 @@ msgstr ""
 
 #. Input Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:12
-msgid "firewall_rule_src"
+msgid "Input Zone"
 msgstr "Input Zone"
 
 #. Output Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:13
-msgid "firewall_rule_dest"
+msgid "Output Zone"
 msgstr "Output Zone"
 
 #. Source address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:14
-msgid "firewall_rule_srcip"
+msgid "Source address"
 msgstr "Source address"
 
 #. Destination address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:15
-msgid "firewall_rule_destip"
+msgid "Destination address"
 msgstr "Destination address"
 
 #. Source MAC-Address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:16
-msgid "firewall_rule_srcmac"
+msgid "Source MAC-Address"
 msgstr "Source MAC-Address"
 
 #. Source port
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:17
-msgid "firewall_rule_srcport"
+msgid "Source port"
 msgstr "Source port"
 
 #. Destination port
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:18
-msgid "firewall_rule_destport"
+msgid "Destination port"
 msgstr "Destination port"
 
 #. Action
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:19
-msgid "firewall_rule_target"
+msgid "Action"
 msgstr "Action"
 
 #. accept
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:20
-msgid "fw_accept"
+msgid "accept"
 msgstr "accept"
 
 #. reject
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:21
-msgid "fw_reject"
+msgid "reject"
 msgstr "reject"
 
 #. drop
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:22
-msgid "fw_drop"
+msgid "drop"
 msgstr "drop"
 
 #. Source
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:23
-msgid "fw_src"
+msgid "Source"
 msgstr "Source"
 
 #. Destination
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:24
-msgid "fw_dest"
+msgid "Destination"
 msgstr "Destination"
 
 #. Traffic Control
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:25
-msgid "fw_traffic"
+msgid "Traffic Control"
 msgstr "Traffic Control"
 
 #. MSS Clamping
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:26
-msgid "fw_mtufix"
+msgid "MSS Clamping"
 msgstr "MSS Clamping"
 
 #. Drop invalid packets
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:27
-msgid "fw_dropinvalid"
+msgid "Drop invalid packets"
 msgstr "Drop invalid packets"
 
 #. Port forwarding allows to provide network services in the internal network to an external network.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:28
-msgid "fw_portfw1"
+msgid "Port forwarding allows to provide network services in the internal network to an external network."
 msgstr ""
 "Port forwarding allows to provide network services in the internal network "
 "to an external network."
 
 #. External Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:29
-msgid "firewall_redirect_src_desc"
+msgid "External Zone"
 msgstr "External Zone"
 
 #. External port
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:30
-msgid "firewall_redirect_srcdport"
+msgid "External port"
 msgstr "External port"
 
 #. port or range as first-last
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:31
-msgid "firewall_redirect_srcdport_desc"
+msgid "port or range as first-last"
 msgstr "port or range as first-last"
 
 #. Source address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:32
-msgid "firewall_redirect_srcip"
+msgid "Source address"
 msgstr "Source address"
 
 #. Source MAC
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:33
-msgid "firewall_redirect_srcmac"
+msgid "Source MAC"
 msgstr "Source MAC"
 
 #. Internal address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:34
-msgid "firewall_redirect_destip"
+msgid "Internal address"
 msgstr "Internal address"
 
 #. IP-Address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:35
-msgid "firewall_redirect_destip_desc"
+msgid "IP-Address"
 msgstr "IP-Address"
 
 #. Internal port (optional)
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:36
-msgid "firewall_redirect_destport"
+msgid "Internal port (optional)"
 msgstr "Internal port (optional)"
 
 #. port or range as first-last
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:37
-msgid "firewall_redirect_destport_desc"
+msgid "port or range as first-last"
 msgstr "port or range as first-last"
 
 #. Here you can specify which network traffic is allowed to flow between network zones. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall. If you experience occasional connection problems try enabling MSS Clamping otherwise disable it for performance reasons.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:38
-msgid "fw_forwarding1"
+msgid "Here you can specify which network traffic is allowed to flow between network zones. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall. If you experience occasional connection problems try enabling MSS Clamping otherwise disable it for performance reasons."
 msgstr ""
 "Here you can specify which network traffic is allowed to flow between "
 "network zones. Only new connections will be matched. Packets belonging to "
@@ -218,47 +218,47 @@ msgstr ""
 
 #. Input
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:39
-msgid "firewall_forwarding_src"
+msgid "Input"
 msgstr "Input"
 
 #. Output
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:40
-msgid "firewall_forwarding_dest"
+msgid "Output"
 msgstr "Output"
 
 #. Defaults
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:41
-msgid "firewall_defaults"
+msgid "Defaults"
 msgstr "Defaults"
 
 #. These are the default settings that are used if no other rules match.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:42
-msgid "firewall_defaults_desc"
+msgid "These are the default settings that are used if no other rules match."
 msgstr "These are the default settings that are used if no other rules match."
 
 #. SYN-flood protection
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:43
-msgid "firewall_defaults_synflood"
+msgid "SYN-flood protection"
 msgstr "SYN-flood protection"
 
 #. Incoming Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:44
-msgid "firewall_defaults_input"
+msgid "Incoming Traffic"
 msgstr "Incoming Traffic"
 
 #. Outgoing Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:45
-msgid "firewall_defaults_output"
+msgid "Outgoing Traffic"
 msgstr "Outgoing Traffic"
 
 #. Forwarded Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:46
-msgid "firewall_defaults_forward"
+msgid "Forwarded Traffic"
 msgstr "Forwarded Traffic"
 
 #. Zones part the network interfaces into certain isolated areas to separate network traffic. One or more networks can belong to a zone. The MASQ-flag enables NAT masquerading for all outgoing traffic on this zone.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:47
-msgid "firewall_zone_desc"
+msgid "Zones part the network interfaces into certain isolated areas to separate network traffic. One or more networks can belong to a zone. The MASQ-flag enables NAT masquerading for all outgoing traffic on this zone."
 msgstr ""
 "Zones part the network interfaces into certain isolated areas to separate "
 "network traffic. One or more networks can belong to a zone. The MASQ-flag "
@@ -266,42 +266,42 @@ msgstr ""
 
 #. Incoming Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:48
-msgid "firewall_zone_input"
+msgid "Incoming Traffic"
 msgstr "Incoming Traffic"
 
 #. Default Policy
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:49
-msgid "firewall_zone_input_desc"
+msgid "Default Policy"
 msgstr "Default Policy"
 
 #. Outgoing Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:50
-msgid "firewall_zone_output"
+msgid "Outgoing Traffic"
 msgstr "Outgoing Traffic"
 
 #. Default Policy
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:51
-msgid "firewall_zone_output_desc"
+msgid "Default Policy"
 msgstr "Default Policy"
 
 #. Forwarded Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:52
-msgid "firewall_zone_forward"
+msgid "Forwarded Traffic"
 msgstr "Forwarded Traffic"
 
 #. Default Policy
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:53
-msgid "firewall_zone_forward_desc"
+msgid "Default Policy"
 msgstr "Default Policy"
 
 #. MASQ
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:54
-msgid "firewall_zone_masq"
+msgid "MASQ"
 msgstr "MASQ"
 
 #. Networks
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:55
-msgid "firewall_zone_network"
+msgid "Networks"
 msgstr "Networks"
 
 #. contained networks
diff --git a/po/en/mmc_over_gpio.po b/po/en/mmc_over_gpio.po
index bdd813f4c..08a2246bd 100644
--- a/po/en/mmc_over_gpio.po
+++ b/po/en/mmc_over_gpio.po
@@ -14,15 +14,15 @@ msgstr ""
 
 #. MMC/SD driver configuration
 #: applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua:1
-msgid "mmc_over_gpio"
+msgid "MMC/SD driver configuration"
 msgstr "MMC/SD driver configuration"
 
 #. MMC/SD driver configuration
 #: applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua:2
-msgid "mmc_over_gpio_desc"
+msgid "MMC/SD driver configuration"
 msgstr "MMC/SD driver configuration"
 
 #. Settings
 #: applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua:3
-msgid "settings"
+msgid "Settings"
 msgstr "Settings"
diff --git a/po/en/ntpc.po b/po/en/ntpc.po
index 3930b7c66..06088b2a7 100644
--- a/po/en/ntpc.po
+++ b/po/en/ntpc.po
@@ -14,42 +14,42 @@ msgstr ""
 
 #. Time Synchronisation
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:1
-msgid "ntpc"
+msgid "Time Synchronisation"
 msgstr "Time Synchronisation"
 
 #. Synchronizes the system time
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:2
-msgid "ntpc_desc"
+msgid "Synchronizes the system time"
 msgstr "Synchronizes the system time"
 
 #. Time Server
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:3
-msgid "ntpc_timeserver"
+msgid "Time Server"
 msgstr "Time Server"
 
 #. Update Interval (in s)
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:4
-msgid "ntpc_interval"
+msgid "Update Interval (in s)"
 msgstr "Update Interval (in s)"
 
 #. Count of Time Measurements
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:5
-msgid "ntpc_count"
+msgid "Count of Time Measurements"
 msgstr "Count of Time Measurements"
 
 #. empty = infinite
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:6
-msgid "ntpc_count_desc"
+msgid "empty = infinite"
 msgstr "empty = infinite"
 
 #. Clock Adjustment
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:7
-msgid "ntpc_drift"
+msgid "Clock Adjustment"
 msgstr "Clock Adjustment"
 
 #. Offset Frequency
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:8
-msgid "ntpc_drift_freq"
+msgid "Offset Frequency"
 msgstr "Offset Frequency"
 
 #. Current system time
diff --git a/po/en/olsr.po b/po/en/olsr.po
index 3451008be..6ebbd25d4 100644
--- a/po/en/olsr.po
+++ b/po/en/olsr.po
@@ -14,651 +14,651 @@ msgstr ""
 
 #. OLSR Daemon
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:1
-msgid "olsrd"
+msgid "OLSR Daemon"
 msgstr "OLSR Daemon"
 
 #. Neighbour IP
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:2
-msgid "olsrd_neighbour_ip"
+msgid "Neighbour IP"
 msgstr "Neighbour IP"
 
 #. Local interface IP
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:3
-msgid "olsrd_local_ip"
+msgid "Local interface IP"
 msgstr "Local interface IP"
 
 #. Announced network
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:4
-msgid "olsrd_network"
+msgid "Announced network"
 msgstr "Announced network"
 
 #. OLSR gateway
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:5
-msgid "olsrd_gateway"
+msgid "OLSR gateway"
 msgstr "OLSR gateway"
 
 #. OLSR node
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:6
-msgid "olsrd_node"
+msgid "OLSR node"
 msgstr "OLSR node"
 
 #. Unable to connect to the OLSR daemon!
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:7
-msgid "olsrd_error"
+msgid "Unable to connect to the OLSR daemon!"
 msgstr "Unable to connect to the OLSR daemon!"
 
 #. Make sure that OLSRd is running, the &quot;txtinfo&quot; plugin is loaded, configured on port 2006 and accepts connections from &quot;127.0.0.1&quot;.
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:8
-msgid "olsrd_error_desc"
+msgid "Make sure that OLSRd is running, the \"txtinfo\" plugin is loaded, configured on port 2006 and accepts connections from \"127.0.0.1\"."
 msgstr ""
 "Make sure that OLSRd is running, the &quot;txtinfo&quot; plugin is loaded, "
 "configured on port 2006 and accepts connections from &quot;127.0.0.1&quot;."
 
 #. OLSR - HNA-Announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:9
-msgid "olsrd_hna"
+msgid "OLSR - HNA-Announcements"
 msgstr "OLSR - HNA-Announcements"
 
 #. OLSR - Plugins
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:10
-msgid "olsrd_plugins"
+msgid "OLSR - Plugins"
 msgstr "OLSR - Plugins"
 
 #. OLSR connections
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:11
-msgid "olsrd_links"
+msgid "OLSR connections"
 msgstr "OLSR connections"
 
 #. Overview of currently established OLSR connections
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:12
-msgid "olsrd_links_desc"
+msgid "Overview of currently established OLSR connections"
 msgstr "Overview of currently established OLSR connections"
 
 #. Expected retransmission count
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:13
-msgid "olsrd_links_etx_desc"
+msgid "Expected retransmission count"
 msgstr "Expected retransmission count"
 
 #. Success rate of sent packages
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:14
-msgid "olsrd_links_lq_desc"
+msgid "Success rate of sent packages"
 msgstr "Success rate of sent packages"
 
 #. Success rate of received packages
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:15
-msgid "olsrd_links_nlq_desc"
+msgid "Success rate of received packages"
 msgstr "Success rate of received packages"
 
 #. Known OLSR routes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:16
-msgid "olsrd_routes"
+msgid "Known OLSR routes"
 msgstr "Known OLSR routes"
 
 #. Overview of currently known routes to other OLSR nodes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:17
-msgid "olsrd_routes_desc"
+msgid "Overview of currently known routes to other OLSR nodes"
 msgstr "Overview of currently known routes to other OLSR nodes"
 
 #. Active OLSR nodes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:18
-msgid "olsrd_topology"
+msgid "Active OLSR nodes"
 msgstr "Active OLSR nodes"
 
 #. Overview of currently known OLSR nodes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:19
-msgid "olsrd_topology_desc"
+msgid "Overview of currently known OLSR nodes"
 msgstr "Overview of currently known OLSR nodes"
 
 #. Last hop
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:20
-msgid "olsrd_topology_lasthop"
+msgid "Last hop"
 msgstr "Last hop"
 
 #. Active host net announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:21
-msgid "olsrd_hna2"
+msgid "Active host net announcements"
 msgstr "Active host net announcements"
 
 #. Overview of currently active OLSR host net announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:22
-msgid "olsrd_hna_desc"
+msgid "Overview of currently active OLSR host net announcements"
 msgstr "Overview of currently active OLSR host net announcements"
 
 #. Active MID announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:23
-msgid "olsrd_mid"
+msgid "Active MID announcements"
 msgstr "Active MID announcements"
 
 #. Overview of known multiple interface announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:24
-msgid "olsrd_mid_desc"
+msgid "Overview of known multiple interface announcements"
 msgstr "Overview of known multiple interface announcements"
 
 #. Secondary OLSR interfaces
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:25
-msgid "olsrd_mid_aliases"
+msgid "Secondary OLSR interfaces"
 msgstr "Secondary OLSR interfaces"
 
 #. Freifunk
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:26
-msgid "olsrd_etx_ff"
+msgid "Freifunk"
 msgstr "Freifunk"
 
 #. floating point
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:27
-msgid "olsrd_etx_float"
+msgid "floating point"
 msgstr "floating point"
 
 #. fixed point math
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:28
-msgid "olsrd_etx_fpm"
+msgid "fixed point math"
 msgstr "fixed point math"
 
 #. General settings
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:29
-msgid "olsrd_olsrd"
+msgid "General settings"
 msgstr "General settings"
 
 #. Start without network
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:30
-msgid "olsrd_olsrd_allownoint"
+msgid "Start without network"
 msgstr "Start without network"
 
 #. Clear screen
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:31
-msgid "olsrd_olsrd_clearscreen"
+msgid "Clear screen"
 msgstr "Clear screen"
 
 #. Debugmode
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:32
-msgid "olsrd_olsrd_debuglevel"
+msgid "Debugmode"
 msgstr "Debugmode"
 
 #. FIB metric
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:33
-msgid "olsrd_olsrd_fibmetric"
+msgid "FIB metric"
 msgstr "FIB metric"
 
 #. Internet protocol
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:34
-msgid "olsrd_olsrd_ipversion"
+msgid "Internet protocol"
 msgstr "Internet protocol"
 
 #. LQ aging
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:35
-msgid "olsrd_olsrd_linkqualityaging"
+msgid "LQ aging"
 msgstr "LQ aging"
 
 #. LQ algorithm
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:36
-msgid "olsrd_olsrd_linkqualityalgorithm"
+msgid "LQ algorithm"
 msgstr "LQ algorithm"
 
 #. LQ Dijkstra limit
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:37
-msgid "olsrd_olsrd_linkqualitydijkstralimit"
+msgid "LQ Dijkstra limit"
 msgstr "LQ Dijkstra limit"
 
 #. LQ fisheye
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:38
-msgid "olsrd_olsrd_linkqualityfisheye"
+msgid "LQ fisheye"
 msgstr "LQ fisheye"
 
 #. LQ level
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:39
-msgid "olsrd_olsrd_linkqualitylevel"
+msgid "LQ level"
 msgstr "LQ level"
 
 #. MPR selection
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:40
-msgid "olsrd_olsrd_linkqualitylevel_1"
+msgid "MPR selection"
 msgstr "MPR selection"
 
 #. MPR selection and routing
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:41
-msgid "olsrd_olsrd_linkqualitylevel_2"
+msgid "MPR selection and routing"
 msgstr "MPR selection and routing"
 
 #. LQ window size
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:42
-msgid "olsrd_olsrd_linkqualitywinsize"
+msgid "LQ window size"
 msgstr "LQ window size"
 
 #. MPR coverage
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:43
-msgid "olsrd_olsrd_mprcoverage"
+msgid "MPR coverage"
 msgstr "MPR coverage"
 
 #. Pollrate
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:44
-msgid "olsrd_olsrd_pollrate"
+msgid "Pollrate"
 msgstr "Pollrate"
 
 #. TC redundancy
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:45
-msgid "olsrd_olsrd_tcredundancy"
+msgid "TC redundancy"
 msgstr "TC redundancy"
 
 #. MPR selectors
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:46
-msgid "olsrd_olsrd_tcredundancy_0"
+msgid "MPR selectors"
 msgstr "MPR selectors"
 
 #. MPR selectors and MPR
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:47
-msgid "olsrd_olsrd_tcredundancy_1"
+msgid "MPR selectors and MPR"
 msgstr "MPR selectors and MPR"
 
 #. all neighbours
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:48
-msgid "olsrd_olsrd_tcredundancy_2"
+msgid "all neighbours"
 msgstr "all neighbours"
 
 #. Use hysteresis
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:49
-msgid "olsrd_olsrd_usehysteresis"
+msgid "Use hysteresis"
 msgstr "Use hysteresis"
 
 #. Willingness
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:50
-msgid "olsrd_olsrd_willingness"
+msgid "Willingness"
 msgstr "Willingness"
 
 #. Hello interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:51
-msgid "olsrd_interface_hellointerval"
+msgid "Hello interval"
 msgstr "Hello interval"
 
 #. Hello validity time
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:52
-msgid "olsrd_interface_hellovaliditytime"
+msgid "Hello validity time"
 msgstr "Hello validity time"
 
 #. HNA interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:53
-msgid "olsrd_interface_hnainterval"
+msgid "HNA interval"
 msgstr "HNA interval"
 
 #. HNA validity time
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:54
-msgid "olsrd_interface_hnavaliditytime"
+msgid "HNA validity time"
 msgstr "HNA validity time"
 
 #. IPv4 broadcast
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:55
-msgid "olsrd_interface_ip4broadcast"
+msgid "IPv4 broadcast"
 msgstr "IPv4 broadcast"
 
 #. MID interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:56
-msgid "olsrd_interface_midinterval"
+msgid "MID interval"
 msgstr "MID interval"
 
 #. MID validity time
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:57
-msgid "olsrd_interface_midvaliditytime"
+msgid "MID validity time"
 msgstr "MID validity time"
 
 #. TC interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:58
-msgid "olsrd_interface_tcinterval"
+msgid "TC interval"
 msgstr "TC interval"
 
 #. TC validity time
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:59
-msgid "olsrd_interface_tcvaliditytime"
+msgid "TC validity time"
 msgstr "TC validity time"
 
 #. IPv6 address type
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:60
-msgid "olsrd_interface_ip6addrtype"
+msgid "IPv6 address type"
 msgstr "IPv6 address type"
 
 #. IPC settings
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:61
-msgid "olsrd_ipcconnect"
+msgid "IPC settings"
 msgstr "IPC settings"
 
 #. IPC connections enable you to remote-control the local OLSRd instance using external programs
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:62
-msgid "olsrd_ipcconnect_desc"
+msgid "IPC connections enable you to remote-control the local OLSRd instance using external programs"
 msgstr ""
 "IPC connections enable you to remote-control the local OLSRd instance using "
 "external programs"
 
 #. Allowed host addresses
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:63
-msgid "olsrd_ipcconnect_host"
+msgid "Allowed host addresses"
 msgstr "Allowed host addresses"
 
 #. Multiple separated by spaces
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:64
-msgid "olsrd_ipcconnect_host_desc"
+msgid "Multiple separated by spaces"
 msgstr "Multiple separated by spaces"
 
 #. Maxmimum connection count
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:65
-msgid "olsrd_ipcconnect_maxconnections"
+msgid "Maxmimum connection count"
 msgstr "Maxmimum connection count"
 
 #. Set to 0 to disable IPC
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:66
-msgid "olsrd_ipcconnect_maxconnections_desc"
+msgid "Set to 0 to disable IPC"
 msgstr "Set to 0 to disable IPC"
 
 #. Allowed subnets
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:67
-msgid "olsrd_ipcconnect_net"
+msgid "Allowed subnets"
 msgstr "Allowed subnets"
 
 #. Address Mask; multiple separated by space
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:68
-msgid "olsrd_ipcconnect_net_desc"
+msgid "Address Mask; multiple separated by space"
 msgstr "Address Mask; multiple separated by space"
 
 #. IPv4 HNA announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:69
-msgid "olsrd_hna4"
+msgid "IPv4 HNA announcements"
 msgstr "IPv4 HNA announcements"
 
 #. Hna4 entries allow you to propagate local IPv4 host- and network-routes into the mesh network
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:70
-msgid "olsrd_hna4_desc"
+msgid "Hna4 entries allow you to propagate local IPv4 host- and network-routes into the mesh network"
 msgstr ""
 "Hna4 entries allow you to propagate local IPv4 host- and network-routes into "
 "the mesh network"
 
 #. Network address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:71
-msgid "olsrd_hna4_netaddr"
+msgid "Network address"
 msgstr "Network address"
 
 #. IPv4 address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:72
-msgid "olsrd_hna4_netaddr_desc"
+msgid "IPv4 address"
 msgstr "IPv4 address"
 
 #. Netmask
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:73
-msgid "olsrd_hna4_netmask"
+msgid "Netmask"
 msgstr "Netmask"
 
 #. IPv4 address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:74
-msgid "olsrd_hna4_netmask_desc"
+msgid "IPv4 address"
 msgstr "IPv4 address"
 
 #. IPv6 HNA announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:75
-msgid "olsrd_hna6"
+msgid "IPv6 HNA announcements"
 msgstr "IPv6 HNA announcements"
 
 #. Hna6 entries allow you to propagate local IPv6 host- and network-routes into the mesh network
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:76
-msgid "olsrd_hna6_desc"
+msgid "Hna6 entries allow you to propagate local IPv6 host- and network-routes into the mesh network"
 msgstr ""
 "Hna6 entries allow you to propagate local IPv6 host- and network-routes into "
 "the mesh network"
 
 #. Network address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:77
-msgid "olsrd_hna6_netaddr"
+msgid "Network address"
 msgstr "Network address"
 
 #. IPv6 address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:78
-msgid "olsrd_hna6_netaddr_desc"
+msgid "IPv6 address"
 msgstr "IPv6 address"
 
 #. Prefix
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:79
-msgid "olsrd_hna6_prefix"
+msgid "Prefix"
 msgstr "Prefix"
 
 #. IPv6 prefix
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:80
-msgid "olsrd_hna6_prefix_desc"
+msgid "IPv6 prefix"
 msgstr "IPv6 prefix"
 
 #. Plugin configuration
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:81
-msgid "olsrd_loadplugin"
+msgid "Plugin configuration"
 msgstr "Plugin configuration"
 
 #. Enable plugin
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:82
-msgid "olsrd_loadplugin_ignore"
+msgid "Enable plugin"
 msgstr "Enable plugin"
 
 #. Library
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:83
-msgid "olsrd_loadplugin_library"
+msgid "Library"
 msgstr "Library"
 
 #. Allow connections from this hosts
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:84
-msgid "olsrd_loadplugin_accept"
+msgid "Allow connections from this hosts"
 msgstr "Allow connections from this hosts"
 
 #. Ping test addresses
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:85
-msgid "olsrd_loadplugin_ping"
+msgid "Ping test addresses"
 msgstr "Ping test addresses"
 
 #. Interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:86
-msgid "olsrd_loadplugin_interval"
+msgid "Refresh interval in seconds"
 msgstr "Refresh interval in seconds"
 
 #. HNA announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:87
-msgid "olsrd_loadplugin_hna"
+msgid "HNA announcements"
 msgstr "HNA announcements"
 
 #. Format: IP-Address Netmask / OLSR will announce this network once it is reachable
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:88
-msgid "olsrd_loadplugin_hna_desc"
+msgid "Format: IP-Address Netmask / OLSR will announce this network once it is reachable"
 msgstr ""
 "Format: IP-Address Netmask / OLSR will announce this network once it is "
 "reachable"
 
 #. Alternative \"hosts\" file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:89
-msgid "olsrd_loadplugin_addhosts"
+msgid "Alternative \"hosts\" file"
 msgstr "Alternative \"hosts\" file"
 
 #. The contents of this file will be appended to the autogenerated \"hosts\" file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:90
-msgid "olsrd_loadplugin_addhosts_desc"
+msgid "The contents of this file will be appended to the autogenerated \"hosts\" file"
 msgstr ""
 "The contents of this file will be appended to the autogenerated \"hosts\" file"
 
 #. DNS server
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:91
-msgid "olsrd_loadplugin_dnsserver"
+msgid "DNS server"
 msgstr "DNS server"
 
 #. Alternative hostnames
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:92
-msgid "olsrd_loadplugin_hosts"
+msgid "Alternative hostnames"
 msgstr "Alternative hostnames"
 
 #. Format: Interface-IP Hostname
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:93
-msgid "olsrd_loadplugin_hosts_desc"
+msgid "Format: Interface-IP Hostname"
 msgstr "Format: Interface-IP Hostname"
 
 #. Path to the \"hosts\" file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:94
-msgid "olsrd_loadplugin_hostsfile"
+msgid "Path to the \"hosts\" file"
 msgstr "Path to the \"hosts\" file"
 
 #. Latitude
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:95
-msgid "olsrd_loadplugin_lat"
+msgid "Latitude"
 msgstr "Latitude"
 
 #. Output file for coordinates
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:96
-msgid "olsrd_loadplugin_latlonfile"
+msgid "Output file for coordinates"
 msgstr "Output file for coordinates"
 
 #. OLSR will write received coordinates of other nodes to this file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:97
-msgid "olsrd_loadplugin_latlonfile_desc"
+msgid "OLSR will write received coordinates of other nodes to this file"
 msgstr "OLSR will write received coordinates of other nodes to this file"
 
 #. Input file for coordinates
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:98
-msgid "olsrd_loadplugin_latloninfile"
+msgid "Input file for coordinates"
 msgstr "Input file for coordinates"
 
 #. OLSR periodically checks this file for new coordinates and propagates them
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:99
-msgid "olsrd_loadplugin_latloninfile_desc"
+msgid "OLSR periodically checks this file for new coordinates and propagates them"
 msgstr ""
 "OLSR periodically checks this file for new coordinates and propagates them"
 
 #. Longitude
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:100
-msgid "olsrd_loadplugin_lon"
+msgid "Longitude"
 msgstr "Longitude"
 
 #. Hostnames
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:101
-msgid "olsrd_loadplugin_name"
+msgid "Hostnames"
 msgstr "Hostnames"
 
 #. Command for name changes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:102
-msgid "olsrd_loadplugin_namechangescript"
+msgid "Command for name changes"
 msgstr "Command for name changes"
 
 #. OLSR executes this command once entries in the \"hosts\" are changed
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:103
-msgid "olsrd_loadplugin_namechangescript_desc"
+msgid "OLSR executes this command once entries in the \"hosts\" are changed"
 msgstr "OLSR executes this command once entries in the \"hosts\" are changed"
 
 #. Path to the \"resolv\" file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:104
-msgid "olsrd_loadplugin_resolvfile"
+msgid "Path to the \"resolv\" file"
 msgstr "Path to the \"resolv\" file"
 
 #. Command for service changes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:105
-msgid "olsrd_loadplugin_serviceschangescript"
+msgid "Command for service changes"
 msgstr "Command for service changes"
 
 #. OLSR excutes this command once new service announcements are received
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:106
-msgid "olsrd_loadplugin_serviceschangescript_desc"
+msgid "OLSR excutes this command once new service announcements are received"
 msgstr "OLSR excutes this command once new service announcements are received"
 
 #. PID file for SIGHUP signals
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:107
-msgid "olsrd_loadplugin_sighuppidfile"
+msgid "PID file for SIGHUP signals"
 msgstr "PID file for SIGHUP signals"
 
 #. OLSR sends a HUP signal to this PID once the \"hosts\" oder \"resolv\" file is changed
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:108
-msgid "olsrd_loadplugin_sighuppidfile_desc"
+msgid "OLSR sends a HUP signal to this PID once the \"hosts\" oder \"resolv\" file is changed"
 msgstr ""
 "OLSR sends a HUP signal to this PID once the \"hosts\" oder \"resolv\" file is "
 "changed"
 
 #. Domain suffix
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:109
-msgid "olsrd_loadplugin_suffix"
+msgid "Domain suffix"
 msgstr "Domain suffix"
 
 #. Timeout
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:110
-msgid "olsrd_loadplugin_timeout"
+msgid "Timeout"
 msgstr "Timeout"
 
 #. Name of the BMF interface
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:111
-msgid "olsrd_loadplugin_bmfinterface"
+msgid "Name of the BMF interface"
 msgstr "Name of the BMF interface"
 
 #. IP address of the BMF interface
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:112
-msgid "olsrd_loadplugin_bmfinterfaceid"
+msgid "IP address of the BMF interface"
 msgstr "IP address of the BMF interface"
 
 #. Redirect local broadcasts
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:113
-msgid "olsrd_loadplugin_dolocalbroadcast"
+msgid "Redirect local broadcasts"
 msgstr "Redirect local broadcasts"
 
 #. Also redirect broadcasts from OLSR interfaces
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:114
-msgid "olsrd_loadplugin_capturepacketsonolsrinterfaces"
+msgid "Also redirect broadcasts from OLSR interfaces"
 msgstr "Also redirect broadcasts from OLSR interfaces"
 
 #. Propagation mechanism
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:115
-msgid "olsrd_loadplugin_bmfmechanism"
+msgid "Propagation mechanism"
 msgstr "Propagation mechanism"
 
 #. Number of retransmissions per package
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:116
-msgid "olsrd_loadplugin_broadcastretransmitcount"
+msgid "Number of retransmissions per package"
 msgstr "Number of retransmissions per package"
 
 #. Minimum number of neighbours for broadcast redirection
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:117
-msgid "olsrd_loadplugin_fanoutlimit"
+msgid "Minimum number of neighbours for broadcast redirection"
 msgstr "Minimum number of neighbours for broadcast redirection"
 
 #. Non-OLSR interfaces
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:118
-msgid "olsrd_loadplugin_nonolsrif"
+msgid "Non-OLSR interfaces"
 msgstr "Non-OLSR interfaces"
 
 #. Used port
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:119
-msgid "olsrd_loadplugin_port"
+msgid "Used port"
 msgstr "Used port"
 
 #. Allow connections from hosts
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:120
-msgid "olsrd_loadplugin_host"
+msgid "Allow connections from hosts"
 msgstr "Allow connections from hosts"
 
 #. Allow connections from subnets
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:121
-msgid "olsrd_loadplugin_net"
+msgid "Allow connections from subnets"
 msgstr "Allow connections from subnets"
 
 #. Format: IP-AddresseNetmask
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:122
-msgid "olsrd_loadplugin_net_desc"
+msgid "Format: IP-AddresseNetmask"
 msgstr "Format: IP-AddresseNetmask"
 
 #. Used protocols
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:123
-msgid "olsrd_loadplugin_redistribute"
+msgid "Used protocols"
 msgstr "Used protocols"
 
 #. Only export routes to Quagga or to kernel too
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:124
-msgid "olsrd_loadplugin_exportroutes"
+msgid "Only export routes to Quagga or to kernel too"
 msgstr "Only export routes to Quagga or to kernel too"
 
 #. Always prefer local routes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:125
-msgid "olsrd_loadplugin_localpref"
+msgid "Always prefer local routes"
 msgstr "Always prefer local routes"
 
 #. Distance of exported routes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:126
-msgid "olsrd_loadplugin_distance"
+msgid "Distance of exported routes"
 msgstr "Distance of exported routes"
 
 #. Key file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:127
-msgid "olsrd_loadplugin_keyfile"
+msgid "Key file"
 msgstr "Key file"
 
 #. Watchdog timestamp file
diff --git a/po/en/openvpn.po b/po/en/openvpn.po
index 08de509f9..bfea52f0d 100644
--- a/po/en/openvpn.po
+++ b/po/en/openvpn.po
@@ -14,947 +14,947 @@ msgstr ""
 
 #. OpenVPN
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:1
-msgid "openvpn"
+msgid "OpenVPN"
 msgstr "OpenVPN"
 
 #. Switch to basic configuration
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:3
-msgid "openvpn_switch_basic"
+msgid "« Switch to basic configuration"
 msgstr "« Switch to basic configuration"
 
 #. Switch to advanced configuration
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:4
-msgid "openvpn_switch_advanced"
+msgid "Switch to advanced configuration »"
 msgstr "Switch to advanced configuration »"
 
 #. Enabled
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:6
-msgid "openvpn_enable"
+msgid "Enabled"
 msgstr "Enabled"
 
 #. Started
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:7
-msgid "openvpn_active"
+msgid "Started"
 msgstr "Started"
 
 #. no
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:8
-msgid "openvpn_active_no"
+msgid "no"
 msgstr "no"
 
 #. yes (%i)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:9
-msgid "openvpn_active_yes"
+msgid "yes (%i)"
 msgstr "yes (%i)"
 
 #. Port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:10
-msgid "openvpn_port"
+msgid "Port"
 msgstr "Port"
 
 #. Protocol
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:11
-msgid "openvpn_proto"
+msgid "Protocol"
 msgstr "Protocol"
 
 #. Instance \"%s\"
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:13
-msgid "openvpn_instance"
+msgid "Instance \"%s\""
 msgstr "Instance \"%s\""
 
 #. OpenVPN instances
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:15
-msgid "openvpn_overview"
+msgid "OpenVPN instances"
 msgstr "OpenVPN instances"
 
 #. Below is a list of configured OpenVPN instances and their current state
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:16
-msgid "openvpn_overview_desc"
+msgid "Below is a list of configured OpenVPN instances and their current state"
 msgstr "Below is a list of configured OpenVPN instances and their current state"
 
 #. Daemon configuration
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:18
-msgid "openvpn_service"
+msgid "Daemon configuration"
 msgstr "Daemon configuration"
 
 #. Networking options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:19
-msgid "openvpn_networking"
+msgid "Networking options"
 msgstr "Networking options"
 
 #. VPN options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:20
-msgid "openvpn_vpn"
+msgid "VPN options"
 msgstr "VPN options"
 
 #. Cryptography settings
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:21
-msgid "openvpn_cryptography"
+msgid "Cryptography settings"
 msgstr "Cryptography settings"
 
 #. Read configuration options from file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:23
-msgid "openvpn_param_config"
+msgid "Read configuration options from file"
 msgstr "Read configuration options from file"
 
 #. Local host name or ip address
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:24
-msgid "openvpn_param_local"
+msgid "Local host name or ip address"
 msgstr "Local host name or ip address"
 
 #. Remote host name or ip address
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:25
-msgid "openvpn_param_remote"
+msgid "Remote host name or ip address"
 msgstr "Remote host name or ip address"
 
 #. Randomly choose remote server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:26
-msgid "openvpn_param_remote_random"
+msgid "Randomly choose remote server"
 msgstr "Randomly choose remote server"
 
 #. Major mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:27
-msgid "openvpn_param_mode"
+msgid "Major mode"
 msgstr "Major mode"
 
 #. Use protocol
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:28
-msgid "openvpn_param_proto"
+msgid "Use protocol"
 msgstr "Use protocol"
 
 #. Connection retry interval
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:29
-msgid "openvpn_param_connect_retry"
+msgid "Connection retry interval"
 msgstr "Connection retry interval"
 
 #. Connection timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:30
-msgid "openvpn_param_connect_timeout"
+msgid "Connection timeout"
 msgstr "Connection timeout"
 
 #. Maximum connection attempt retries
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:31
-msgid "openvpn_param_connect_retry_max"
+msgid "Maximum connection attempt retries"
 msgstr "Maximum connection attempt retries"
 
 #. Try to sense proxy settings automatically
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:32
-msgid "openvpn_param_auto_proxy"
+msgid "Try to sense proxy settings automatically"
 msgstr "Try to sense proxy settings automatically"
 
 #. Connect to remote host
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:33
-msgid "openvpn_param_http_proxy"
+msgid "Connect to remote host"
 msgstr "Connect to remote host"
 
 #. Retry indefinitely on HTTP proxy errors
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:34
-msgid "openvpn_param_http_proxy_retry"
+msgid "Retry indefinitely on HTTP proxy errors"
 msgstr "Retry indefinitely on HTTP proxy errors"
 
 #. Proxy timeout in seconds
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:35
-msgid "openvpn_param_http_proxy_timeout"
+msgid "Proxy timeout in seconds"
 msgstr "Proxy timeout in seconds"
 
 #. Set extended HTTP proxy options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:36
-msgid "openvpn_param_http_proxy_option"
+msgid "Set extended HTTP proxy options"
 msgstr "Set extended HTTP proxy options"
 
 #. Connect through Socks5 proxy
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:37
-msgid "openvpn_param_socks_proxy"
+msgid "Connect through Socks5 proxy"
 msgstr "Connect through Socks5 proxy"
 
 #. Retry indefinitely on Socks proxy errors
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:38
-msgid "openvpn_param_socks_proxy_retry"
+msgid "Retry indefinitely on Socks proxy errors"
 msgstr "Retry indefinitely on Socks proxy errors"
 
 #. If hostname resolve fails, retry
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:39
-msgid "openvpn_param_resolv_retry"
+msgid "If hostname resolve fails, retry"
 msgstr "If hostname resolve fails, retry"
 
 #. Allow remote to change its IP or port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:40
-msgid "openvpn_param_float"
+msgid "Allow remote to change its IP or port"
 msgstr "Allow remote to change its IP or port"
 
 #. Execute shell command on remote ip change
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:41
-msgid "openvpn_param_ipchange"
+msgid "Execute shell command on remote ip change"
 msgstr "Execute shell command on remote ip change"
 
 #. TCP/UDP port # for both local and remote
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:42
-msgid "openvpn_param_port"
+msgid "TCP/UDP port # for both local and remote"
 msgstr "TCP/UDP port # for both local and remote"
 
 #. TCP/UDP port # for local (default=1194)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:43
-msgid "openvpn_param_lport"
+msgid "TCP/UDP port # for local (default=1194)"
 msgstr "TCP/UDP port # for local (default=1194)"
 
 #. TCP/UDP port # for remote (default=1194)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:44
-msgid "openvpn_param_rport"
+msgid "TCP/UDP port # for remote (default=1194)"
 msgstr "TCP/UDP port # for remote (default=1194)"
 
 #. Bind to local address and port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:45
-msgid "openvpn_param_bind"
+msgid "Bind to local address and port"
 msgstr "Bind to local address and port"
 
 #. Do not bind to local address and port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:46
-msgid "openvpn_param_nobind"
+msgid "Do not bind to local address and port"
 msgstr "Do not bind to local address and port"
 
 #. tun/tap device
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:47
-msgid "openvpn_param_dev"
+msgid "tun/tap device"
 msgstr "tun/tap device"
 
 #. Type of used device
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:48
-msgid "openvpn_param_dev_type"
+msgid "Type of used device"
 msgstr "Type of used device"
 
 #. Use tun/tap device node
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:49
-msgid "openvpn_param_dev_node"
+msgid "Use tun/tap device node"
 msgstr "Use tun/tap device node"
 
 #. Set the link layer address of the tap device
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:50
-msgid "openvpn_param_lladdr"
+msgid "Set the link layer address of the tap device"
 msgstr "Set the link layer address of the tap device"
 
 #. 'net30', 'p2p', or 'subnet'
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:51
-msgid "openvpn_param_topology"
+msgid "'net30', 'p2p', or 'subnet'"
 msgstr "'net30', 'p2p', or 'subnet'"
 
 #. Make tun device IPv6 capable
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:52
-msgid "openvpn_param_tun_ipv6"
+msgid "Make tun device IPv6 capable"
 msgstr "Make tun device IPv6 capable"
 
 #. Configure device to use IP address
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:53
-msgid "openvpn_param_ifconfig"
+msgid "Configure device to use IP address"
 msgstr "Configure device to use IP address"
 
 #. Don't actually execute ifconfig
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:54
-msgid "openvpn_param_ifconfig_noexec"
+msgid "Don't actually execute ifconfig"
 msgstr "Don't actually execute ifconfig"
 
 #. Don't warn on ifconfig inconsistencies
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:55
-msgid "openvpn_param_ifconfig_nowarn"
+msgid "Don't warn on ifconfig inconsistencies"
 msgstr "Don't warn on ifconfig inconsistencies"
 
 #. Add route after establishing connection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:56
-msgid "openvpn_param_route"
+msgid "Add route after establishing connection"
 msgstr "Add route after establishing connection"
 
 #. Specify a default gateway for routes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:57
-msgid "openvpn_param_route_gateway"
+msgid "Specify a default gateway for routes"
 msgstr "Specify a default gateway for routes"
 
 #. Specify a default metric for routes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:58
-msgid "openvpn_param_route_metric"
+msgid "Specify a default metric for routes"
 msgstr "Specify a default metric for routes"
 
 #. Delay n seconds after connection 
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:59
-msgid "openvpn_param_route_delay"
+msgid "Delay n seconds after connection "
 msgstr "Delay n seconds after connection "
 
 #. Execute shell cmd after routes are added
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:60
-msgid "openvpn_param_route_up"
+msgid "Execute shell cmd after routes are added"
 msgstr "Execute shell cmd after routes are added"
 
 #. Don't add routes automatically
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:61
-msgid "openvpn_param_route_noexec"
+msgid "Don't add routes automatically"
 msgstr "Don't add routes automatically"
 
 #. Don't pull options from server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:62
-msgid "openvpn_param_route_nopull"
+msgid "Don't pull options from server"
 msgstr "Don't pull options from server"
 
 #. Automatically redirect default route
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:63
-msgid "openvpn_param_redirect_gateway"
+msgid "Automatically redirect default route"
 msgstr "Automatically redirect default route"
 
 #. Pass environment variables to script
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:64
-msgid "openvpn_param_setenv"
+msgid "Pass environment variables to script"
 msgstr "Pass environment variables to script"
 
 #. Shaping for peer bandwidth
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:65
-msgid "openvpn_param_shaper"
+msgid "Shaping for peer bandwidth"
 msgstr "Shaping for peer bandwidth"
 
 #. Set timeouts in server mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:66
-msgid "openvpn_param_keepalive"
+msgid "Set timeouts in server mode"
 msgstr "Set timeouts in server mode"
 
 #. tun/tap inactivity timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:67
-msgid "openvpn_param_inactive"
+msgid "tun/tap inactivity timeout"
 msgstr "tun/tap inactivity timeout"
 
 #. Remote ping timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:68
-msgid "openvpn_param_ping_exit"
+msgid "Remote ping timeout"
 msgstr "Remote ping timeout"
 
 #. Restart after remote ping timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:69
-msgid "openvpn_param_ping_restart"
+msgid "Restart after remote ping timeout"
 msgstr "Restart after remote ping timeout"
 
 #. Only process ping timeouts if routes exist
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:70
-msgid "openvpn_param_ping_timer_rem"
+msgid "Only process ping timeouts if routes exist"
 msgstr "Only process ping timeouts if routes exist"
 
 #. Ping remote every n seconds over TCP/UDP port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:71
-msgid "openvpn_param_ping"
+msgid "Ping remote every n seconds over TCP/UDP port"
 msgstr "Ping remote every n seconds over TCP/UDP port"
 
 #. Configure a multi-homed UDP server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:72
-msgid "openvpn_param_multihome"
+msgid "Configure a multi-homed UDP server"
 msgstr "Configure a multi-homed UDP server"
 
 #. Optimize TUN/TAP/UDP writes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:73
-msgid "openvpn_param_fast_io"
+msgid "Optimize TUN/TAP/UDP writes"
 msgstr "Optimize TUN/TAP/UDP writes"
 
 #. Remap SIGUSR1 signals
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:74
-msgid "openvpn_param_remap_usr1"
+msgid "Remap SIGUSR1 signals"
 msgstr "Remap SIGUSR1 signals"
 
 #. Keep tun/tap device open on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:75
-msgid "openvpn_param_persist_tun"
+msgid "Keep tun/tap device open on restart"
 msgstr "Keep tun/tap device open on restart"
 
 #. Keep remote IP address on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:76
-msgid "openvpn_param_persist_remote_ip"
+msgid "Keep remote IP address on restart"
 msgstr "Keep remote IP address on restart"
 
 #. Keep local IP address on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:77
-msgid "openvpn_param_persist_local_ip"
+msgid "Keep local IP address on restart"
 msgstr "Keep local IP address on restart"
 
 #. Don't re-read key on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:78
-msgid "openvpn_param_persist_key"
+msgid "Don't re-read key on restart"
 msgstr "Don't re-read key on restart"
 
 #. TOS passthrough (applies to IPv4 only)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:79
-msgid "openvpn_param_passtos"
+msgid "TOS passthrough (applies to IPv4 only)"
 msgstr "TOS passthrough (applies to IPv4 only)"
 
 #. Set tun/tap device MTU
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:80
-msgid "openvpn_param_tun_mtu"
+msgid "Set tun/tap device MTU"
 msgstr "Set tun/tap device MTU"
 
 #. Set tun/tap device overhead
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:81
-msgid "openvpn_param_tun_mtu_extra"
+msgid "Set tun/tap device overhead"
 msgstr "Set tun/tap device overhead"
 
 #. Set TCP/UDP MTU
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:82
-msgid "openvpn_param_link_mtu"
+msgid "Set TCP/UDP MTU"
 msgstr "Set TCP/UDP MTU"
 
 #. Enable Path MTU discovery
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:83
-msgid "openvpn_param_mtu_disc"
+msgid "Enable Path MTU discovery"
 msgstr "Enable Path MTU discovery"
 
 #. Empirically measure MTU
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:84
-msgid "openvpn_param_mtu_test"
+msgid "Empirically measure MTU"
 msgstr "Empirically measure MTU"
 
 #. Enable internal datagram fragmentation
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:85
-msgid "openvpn_param_fragment"
+msgid "Enable internal datagram fragmentation"
 msgstr "Enable internal datagram fragmentation"
 
 #. Set upper bound on TCP MSS
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:86
-msgid "openvpn_param_mssfix"
+msgid "Set upper bound on TCP MSS"
 msgstr "Set upper bound on TCP MSS"
 
 #. Set the TCP/UDP send buffer size
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:87
-msgid "openvpn_param_sndbuf"
+msgid "Set the TCP/UDP send buffer size"
 msgstr "Set the TCP/UDP send buffer size"
 
 #. Set the TCP/UDP receive buffer size
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:88
-msgid "openvpn_param_rcvbuf"
+msgid "Set the TCP/UDP receive buffer size"
 msgstr "Set the TCP/UDP receive buffer size"
 
 #. Set tun/tap TX queue length
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:89
-msgid "openvpn_param_txqueuelen"
+msgid "Set tun/tap TX queue length"
 msgstr "Set tun/tap TX queue length"
 
 #. Disable Paging
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:90
-msgid "openvpn_param_mlock"
+msgid "Disable Paging"
 msgstr "Disable Paging"
 
 #. Shell cmd to execute after tun device open
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:91
-msgid "openvpn_param_up"
+msgid "Shell cmd to execute after tun device open"
 msgstr "Shell cmd to execute after tun device open"
 
 #. Delay tun/tap open and up script execution
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:92
-msgid "openvpn_param_up_delay"
+msgid "Delay tun/tap open and up script execution"
 msgstr "Delay tun/tap open and up script execution"
 
 #. Shell cmd to run after tun device close
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:93
-msgid "openvpn_param_down"
+msgid "Shell cmd to run after tun device close"
 msgstr "Shell cmd to run after tun device close"
 
 #. Call down cmd/script before TUN/TAP close
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:94
-msgid "openvpn_param_down_pre"
+msgid "Call down cmd/script before TUN/TAP close"
 msgstr "Call down cmd/script before TUN/TAP close"
 
 #. Run up/down scripts for all restarts
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:95
-msgid "openvpn_param_up_restart"
+msgid "Run up/down scripts for all restarts"
 msgstr "Run up/down scripts for all restarts"
 
 #. Set UID to user
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:96
-msgid "openvpn_param_user"
+msgid "Set UID to user"
 msgstr "Set UID to user"
 
 #. Set GID to group
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:97
-msgid "openvpn_param_group"
+msgid "Set GID to group"
 msgstr "Set GID to group"
 
 #. Chroot to directory after initialization
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:98
-msgid "openvpn_param_chroot"
+msgid "Chroot to directory after initialization"
 msgstr "Chroot to directory after initialization"
 
 #. Change to directory before initialization
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:99
-msgid "openvpn_param_cd"
+msgid "Change to directory before initialization"
 msgstr "Change to directory before initialization"
 
 #. Daemonize after initialization
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:100
-msgid "openvpn_param_daemon"
+msgid "Daemonize after initialization"
 msgstr "Daemonize after initialization"
 
 #. Output to syslog and do not daemonize
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:101
-msgid "openvpn_param_syslog"
+msgid "Output to syslog and do not daemonize"
 msgstr "Output to syslog and do not daemonize"
 
 #. Run as an inetd or xinetd server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:102
-msgid "openvpn_param_inetd"
+msgid "Run as an inetd or xinetd server"
 msgstr "Run as an inetd or xinetd server"
 
 #. Write log to file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:103
-msgid "openvpn_param_log"
+msgid "Write log to file"
 msgstr "Write log to file"
 
 #. Append log to file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:104
-msgid "openvpn_param_log_append"
+msgid "Append log to file"
 msgstr "Append log to file"
 
 #. Don't log timestamps
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:105
-msgid "openvpn_param_suppress_timestamps"
+msgid "Don't log timestamps"
 msgstr "Don't log timestamps"
 
 #. Write process ID to file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:106
-msgid "openvpn_param_writepid"
+msgid "Write process ID to file"
 msgstr "Write process ID to file"
 
 #. Change process priority
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:107
-msgid "openvpn_param_nice"
+msgid "Change process priority"
 msgstr "Change process priority"
 
 #. Echo parameters to log
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:108
-msgid "openvpn_param_echo"
+msgid "Echo parameters to log"
 msgstr "Echo parameters to log"
 
 #. Set output verbosity
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:109
-msgid "openvpn_param_verb"
+msgid "Set output verbosity"
 msgstr "Set output verbosity"
 
 #. Limit repeated log messages
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:110
-msgid "openvpn_param_mute"
+msgid "Limit repeated log messages"
 msgstr "Limit repeated log messages"
 
 #. Write status to file every n seconds
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:111
-msgid "openvpn_param_status"
+msgid "Write status to file every n seconds"
 msgstr "Write status to file every n seconds"
 
 #. Status file format version
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:112
-msgid "openvpn_param_status_version"
+msgid "Status file format version"
 msgstr "Status file format version"
 
 #. Disable options consistency check
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:113
-msgid "openvpn_param_disable_occ"
+msgid "Disable options consistency check"
 msgstr "Disable options consistency check"
 
 #. Special stress testing mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:114
-msgid "openvpn_param_gremlin"
+msgid "Special stress testing mode"
 msgstr "Special stress testing mode"
 
 #. Use fast LZO compression
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:115
-msgid "openvpn_param_comp_lzo"
+msgid "Use fast LZO compression"
 msgstr "Use fast LZO compression"
 
 #. Don't use adaptive lzo compression
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:116
-msgid "openvpn_param_comp_noadapt"
+msgid "Don't use adaptive lzo compression"
 msgstr "Don't use adaptive lzo compression"
 
 #. Enable management interface on <em>IP</em> <em>port</em>
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:117
-msgid "openvpn_param_management"
+msgid "Enable management interface on <em>IP</em> <em>port</em>"
 msgstr "Enable management interface on <em>IP</em> <em>port</em>"
 
 #. Management interface will connect as a TCP client
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:118
-msgid "openvpn_param_management_client"
+msgid "Management interface will connect as a TCP client"
 msgstr "Management interface will connect as a TCP client"
 
 #. Query management channel for private key
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:119
-msgid "openvpn_param_management_query_passwords"
+msgid "Query management channel for private key"
 msgstr "Query management channel for private key"
 
 #. Start OpenVPN in a hibernating state
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:120
-msgid "openvpn_param_management_hold"
+msgid "Start OpenVPN in a hibernating state"
 msgstr "Start OpenVPN in a hibernating state"
 
 #. Issue SIGUSR1 on management disconnect
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:121
-msgid "openvpn_param_management_signal"
+msgid "Issue SIGUSR1 on management disconnect"
 msgstr "Issue SIGUSR1 on management disconnect"
 
 #. Forget passwords on management disconnect
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:122
-msgid "openvpn_param_management_forget_disconnect"
+msgid "Forget passwords on management disconnect"
 msgstr "Forget passwords on management disconnect"
 
 #. Number of lines for log file history
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:123
-msgid "openvpn_param_management_log_cache"
+msgid "Number of lines for log file history"
 msgstr "Number of lines for log file history"
 
 #. Load plug-in module
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:124
-msgid "openvpn_param_plugin"
+msgid "Load plug-in module"
 msgstr "Load plug-in module"
 
 #. Configure server mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:125
-msgid "openvpn_param_server"
+msgid "Configure server mode"
 msgstr "Configure server mode"
 
 #. Configure server bridge
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:126
-msgid "openvpn_param_server_bridge"
+msgid "Configure server bridge"
 msgstr "Configure server bridge"
 
 #. Push options to peer
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:127
-msgid "openvpn_param_push"
+msgid "Push options to peer"
 msgstr "Push options to peer"
 
 #. Don't inherit global push options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:128
-msgid "openvpn_param_push_reset"
+msgid "Don't inherit global push options"
 msgstr "Don't inherit global push options"
 
 #. Set aside a pool of subnets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:129
-msgid "openvpn_param_ifconfig_pool"
+msgid "Set aside a pool of subnets"
 msgstr "Set aside a pool of subnets"
 
 #. Use individual addresses rather than /30 subnets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:130
-msgid "openvpn_param_ifconfig_pool_linear"
+msgid "Use individual addresses rather than /30 subnets"
 msgstr "Use individual addresses rather than /30 subnets"
 
 #. Persist/unpersist ifconfig-pool
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:131
-msgid "openvpn_param_ifconfig_pool_persist"
+msgid "Persist/unpersist ifconfig-pool"
 msgstr "Persist/unpersist ifconfig-pool"
 
 #. Push an ifconfig option to remote
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:132
-msgid "openvpn_param_ifconfig_push"
+msgid "Push an ifconfig option to remote"
 msgstr "Push an ifconfig option to remote"
 
 #. Route subnet to client
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:133
-msgid "openvpn_param_iroute"
+msgid "Route subnet to client"
 msgstr "Route subnet to client"
 
 #. Client is disabled
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:134
-msgid "openvpn_param_disable"
+msgid "Client is disabled"
 msgstr "Client is disabled"
 
 #. Don't require client certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:135
-msgid "openvpn_param_client_cert_not_required"
+msgid "Don't require client certificate"
 msgstr "Don't require client certificate"
 
 #. Use username as common name
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:136
-msgid "openvpn_param_username_as_common_name"
+msgid "Use username as common name"
 msgstr "Use username as common name"
 
 #. Script to verify interactive authentication
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:137
-msgid "openvpn_param_auth_user_pass_verify"
+msgid "Script to verify interactive authentication"
 msgstr "Script to verify interactive authentication"
 
 #. Allow client-to-client traffic
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:138
-msgid "openvpn_param_client_to_client"
+msgid "Allow client-to-client traffic"
 msgstr "Allow client-to-client traffic"
 
 #. Allow multiple clients with same certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:139
-msgid "openvpn_param_duplicate_cn"
+msgid "Allow multiple clients with same certificate"
 msgstr "Allow multiple clients with same certificate"
 
 #. Run script cmd on client connection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:140
-msgid "openvpn_param_client_connect"
+msgid "Run script cmd on client connection"
 msgstr "Run script cmd on client connection"
 
 #. Run script cmd on client disconnection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:141
-msgid "openvpn_param_client_disconnect"
+msgid "Run script cmd on client disconnection"
 msgstr "Run script cmd on client disconnection"
 
 #. Directory for custom client config files
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:142
-msgid "openvpn_param_client_config_dir"
+msgid "Directory for custom client config files"
 msgstr "Directory for custom client config files"
 
 #. Refuse connection if no custom client config
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:143
-msgid "openvpn_param_ccd_exclusive"
+msgid "Refuse connection if no custom client config"
 msgstr "Refuse connection if no custom client config"
 
 #. Temporary directory for client-connect return file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:144
-msgid "openvpn_param_tmp_dir"
+msgid "Temporary directory for client-connect return file"
 msgstr "Temporary directory for client-connect return file"
 
 #. Set size of real and virtual address hash tables
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:145
-msgid "openvpn_param_hash_size"
+msgid "Set size of real and virtual address hash tables"
 msgstr "Set size of real and virtual address hash tables"
 
 #. Number of allocated broadcast buffers
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:146
-msgid "openvpn_param_bcast_buffers"
+msgid "Number of allocated broadcast buffers"
 msgstr "Number of allocated broadcast buffers"
 
 #. Maximum number of queued TCP output packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:147
-msgid "openvpn_param_tcp_queue_limit"
+msgid "Maximum number of queued TCP output packets"
 msgstr "Maximum number of queued TCP output packets"
 
 #. Script to validate client virtual addresses
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:148
-msgid "openvpn_param_learn_address"
+msgid "Script to validate client virtual addresses"
 msgstr "Script to validate client virtual addresses"
 
 #. Allowed maximum of new connections
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:149
-msgid "openvpn_param_connect_freq"
+msgid "Allowed maximum of new connections"
 msgstr "Allowed maximum of new connections"
 
 #. Allowed maximum of connected clients
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:150
-msgid "openvpn_param_max_clients"
+msgid "Allowed maximum of connected clients"
 msgstr "Allowed maximum of connected clients"
 
 #. Allowed maximum of internal
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:151
-msgid "openvpn_param_max_routes_per_client"
+msgid "Allowed maximum of internal"
 msgstr "Allowed maximum of internal"
 
 #. Proxy incoming HTTPS sessions
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:152
-msgid "openvpn_param_port_share"
+msgid "Proxy incoming HTTPS sessions"
 msgstr "Proxy incoming HTTPS sessions"
 
 #. Configure client mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:153
-msgid "openvpn_param_client"
+msgid "Configure client mode"
 msgstr "Configure client mode"
 
 #. Authenticate using username/password
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:154
-msgid "openvpn_param_auth_user_pass"
+msgid "Authenticate using username/password"
 msgstr "Authenticate using username/password"
 
 #. Accept options pushed from server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:155
-msgid "openvpn_param_pull"
+msgid "Accept options pushed from server"
 msgstr "Accept options pushed from server"
 
 #. Handling of authentication failures
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:156
-msgid "openvpn_param_auth_retry"
+msgid "Handling of authentication failures"
 msgstr "Handling of authentication failures"
 
 #. Send notification to peer on disconnect
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:157
-msgid "openvpn_param_explicit_exit_notify"
+msgid "Send notification to peer on disconnect"
 msgstr "Send notification to peer on disconnect"
 
 #. Enable Static Key encryption mode (non-TLS)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:158
-msgid "openvpn_param_secret"
+msgid "Enable Static Key encryption mode (non-TLS)"
 msgstr "Enable Static Key encryption mode (non-TLS)"
 
 #. HMAC authentication for packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:159
-msgid "openvpn_param_auth"
+msgid "HMAC authentication for packets"
 msgstr "HMAC authentication for packets"
 
 #. Encryption cipher for packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:160
-msgid "openvpn_param_cipher"
+msgid "Encryption cipher for packets"
 msgstr "Encryption cipher for packets"
 
 #. Size of cipher key
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:161
-msgid "openvpn_param_keysize"
+msgid "Size of cipher key"
 msgstr "Size of cipher key"
 
 #. Enable OpenSSL hardware crypto engines
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:162
-msgid "openvpn_param_engine"
+msgid "Enable OpenSSL hardware crypto engines"
 msgstr "Enable OpenSSL hardware crypto engines"
 
 #. Disable replay protection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:163
-msgid "openvpn_param_no_replay"
+msgid "Disable replay protection"
 msgstr "Disable replay protection"
 
 #. Silence the output of replay warnings
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:164
-msgid "openvpn_param_mute_replay_warnings"
+msgid "Silence the output of replay warnings"
 msgstr "Silence the output of replay warnings"
 
 #. Replay protection sliding window size
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:165
-msgid "openvpn_param_replay_window"
+msgid "Replay protection sliding window size"
 msgstr "Replay protection sliding window size"
 
 #. Disable cipher initialisation vector
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:166
-msgid "openvpn_param_no_iv"
+msgid "Disable cipher initialisation vector"
 msgstr "Disable cipher initialisation vector"
 
 #. Persist replay-protection state
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:167
-msgid "openvpn_param_replay_persist"
+msgid "Persist replay-protection state"
 msgstr "Persist replay-protection state"
 
 #. Run a self-test of crypto features
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:168
-msgid "openvpn_param_test_crypto"
+msgid "Run a self-test of crypto features"
 msgstr "Run a self-test of crypto features"
 
 #. Enable TLS and assume server role
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:169
-msgid "openvpn_param_tls_server"
+msgid "Enable TLS and assume server role"
 msgstr "Enable TLS and assume server role"
 
 #. Enable TLS and assume client role
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:170
-msgid "openvpn_param_tls_client"
+msgid "Enable TLS and assume client role"
 msgstr "Enable TLS and assume client role"
 
 #. Data channel key exchange method
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:171
-msgid "openvpn_param_key_method"
+msgid "Data channel key exchange method"
 msgstr "Data channel key exchange method"
 
 #. Certificate authority
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:172
-msgid "openvpn_param_ca"
+msgid "Certificate authority"
 msgstr "Certificate authority"
 
 #. Directory of trusted certificates (CAs and CRLs)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:173
-msgid "openvpn_param_capath"
+msgid "Directory of trusted certificates (CAs and CRLs)"
 msgstr "Directory of trusted certificates (CAs and CRLs)"
 
 #. Diffie Hellman parameters
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:174
-msgid "openvpn_param_dh"
+msgid "Diffie Hellman parameters"
 msgstr "Diffie Hellman parameters"
 
 #. Local certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:175
-msgid "openvpn_param_cert"
+msgid "Local certificate"
 msgstr "Local certificate"
 
 #. Local private key
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:176
-msgid "openvpn_param_key"
+msgid "Local private key"
 msgstr "Local private key"
 
 #. PKCS#12 file containing keys
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:177
-msgid "openvpn_param_pkcs12"
+msgid "PKCS#12 file containing keys"
 msgstr "PKCS#12 file containing keys"
 
 #. TLS cipher
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:178
-msgid "openvpn_param_tls_cipher"
+msgid "TLS cipher"
 msgstr "TLS cipher"
 
 #. Retransmit timeout on TLS control channel
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:179
-msgid "openvpn_param_tls_timeout"
+msgid "Retransmit timeout on TLS control channel"
 msgstr "Retransmit timeout on TLS control channel"
 
 #. Renegotiate data chan. key after bytes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:180
-msgid "openvpn_param_reneg_bytes"
+msgid "Renegotiate data chan. key after bytes"
 msgstr "Renegotiate data chan. key after bytes"
 
 #. Renegotiate data chan. key after packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:181
-msgid "openvpn_param_reneg_pkts"
+msgid "Renegotiate data chan. key after packets"
 msgstr "Renegotiate data chan. key after packets"
 
 #. Renegotiate data chan. key after seconds
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:182
-msgid "openvpn_param_reneg_sec"
+msgid "Renegotiate data chan. key after seconds"
 msgstr "Renegotiate data chan. key after seconds"
 
 #. Timeframe for key exchange
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:183
-msgid "openvpn_param_hand_window"
+msgid "Timeframe for key exchange"
 msgstr "Timeframe for key exchange"
 
 #. Key transition window
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:184
-msgid "openvpn_param_tran_window"
+msgid "Key transition window"
 msgstr "Key transition window"
 
 #. Allow only one session
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:185
-msgid "openvpn_param_single_session"
+msgid "Allow only one session"
 msgstr "Allow only one session"
 
 #. Exit on TLS negotiation failure
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:186
-msgid "openvpn_param_tls_exit"
+msgid "Exit on TLS negotiation failure"
 msgstr "Exit on TLS negotiation failure"
 
 #. Additional authentication over TLS
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:187
-msgid "openvpn_param_tls_auth"
+msgid "Additional authentication over TLS"
 msgstr "Additional authentication over TLS"
 
 #. Get PEM password from controlling tty before we daemonize
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:188
-msgid "openvpn_param_askpass"
+msgid "Get PEM password from controlling tty before we daemonize"
 msgstr "Get PEM password from controlling tty before we daemonize"
 
 #. Don't cache --askpass or --auth-user-pass passwords
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:189
-msgid "openvpn_param_auth_nocache"
+msgid "Don't cache --askpass or --auth-user-pass passwords"
 msgstr "Don't cache --askpass or --auth-user-pass passwords"
 
 #. Check peer certificate against a CRL
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:190
-msgid "openvpn_param_crl_verify"
+msgid "Check peer certificate against a CRL"
 msgstr "Check peer certificate against a CRL"
 
 #. Shell command to verify X509 name
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:191
-msgid "openvpn_param_tls_verify"
+msgid "Shell command to verify X509 name"
 msgstr "Shell command to verify X509 name"
 
 #. Only accept connections from given X509 name
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:192
-msgid "openvpn_param_tls_remote"
+msgid "Only accept connections from given X509 name"
 msgstr "Only accept connections from given X509 name"
 
 #. Require explicit designation on certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:193
-msgid "openvpn_param_ns_cert_type"
+msgid "Require explicit designation on certificate"
 msgstr "Require explicit designation on certificate"
 
 #. Require explicit key usage on certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:194
-msgid "openvpn_param_remote_cert_ku"
+msgid "Require explicit key usage on certificate"
 msgstr "Require explicit key usage on certificate"
 
 #. Require extended explicit key usage on certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:195
-msgid "openvpn_param_remote_cert_eku"
+msgid "Require extended explicit key usage on certificate"
 msgstr "Require extended explicit key usage on certificate"
 
 #. Require normal and extended key usage on certificate
diff --git a/po/en/p910nd.po b/po/en/p910nd.po
index 1b8109cc8..1dfb4d646 100644
--- a/po/en/p910nd.po
+++ b/po/en/p910nd.po
@@ -14,19 +14,19 @@ msgstr ""
 
 #. p910nd - Printer server
 #: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:1
-msgid "p910nd"
+msgid "p910nd - Printer server"
 msgstr "p910nd - Printer server"
 
 #. First you have to install the packages to get support for USB (kmod-usb-printer) or parallel port (kmod-lp).
 #: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:2
-msgid "p910nd_desc"
+msgid "First you have to install the packages to get support for USB (kmod-usb-printer) or parallel port (kmod-lp)."
 msgstr ""
 "First you have to install the packages to get support for USB (kmod-usb-"
 "printer) or parallel port (kmod-lp)."
 
 #. Bidirectional mode
 #: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:3
-msgid "bidirectional"
+msgid "Bidirectional mode"
 msgstr "Bidirectional mode"
 
 #. p910nd listens on port 910+N. E.g. 9100 for the first printer.
diff --git a/po/en/polipo.po b/po/en/polipo.po
index f101e9647..119ca33f4 100644
--- a/po/en/polipo.po
+++ b/po/en/polipo.po
@@ -14,27 +14,27 @@ msgstr ""
 
 #. Polipo
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:1
-msgid "polipo"
+msgid "Polipo"
 msgstr "Polipo"
 
 #. On-Disk Cache
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:2
-msgid "polipo_cache"
+msgid "On-Disk Cache"
 msgstr "On-Disk Cache"
 
 #. Shared cache
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:3
-msgid "polipo_cache_cacheisshared"
+msgid "Shared cache"
 msgstr "Shared cache"
 
 #. Enable if cache (proxy) is shared by multiple users.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:4
-msgid "polipo_cache_cacheisshared_desc"
+msgid "Enable if cache (proxy) is shared by multiple users."
 msgstr "Enable if cache (proxy) is shared by multiple users."
 
 #. To enable polipo on-disk cache cleaning (highly recommended), you should add a cron job in Scheduled Tasks services that will execute /usr/sbin/polipo_purge script. For example to perform disk cache cleanup every day at 6:00 in the morning you should add the following line in Scheduled Tasks &quot;0 6 * * *	/usr/sbin/polipo_purge&quot; (without quotes).
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:5
-msgid "polipo_cache_desc"
+msgid "To enable polipo on-disk cache cleaning (highly recommended), you should add a cron job in Scheduled Tasks services that will execute /usr/sbin/polipo_purge script. For example to perform disk cache cleanup every day at 6:00 in the morning you should add the following line in Scheduled Tasks \"0 6 * * *\\t/usr/sbin/polipo_purge\" (without quotes)."
 msgstr ""
 "To enable polipo on-disk cache cleaning (highly recommended), you should add "
 "a cron job in Scheduled Tasks services that will execute "
@@ -45,12 +45,12 @@ msgstr ""
 
 #. Disk cache location
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:6
-msgid "polipo_cache_diskcacheroot"
+msgid "Disk cache location"
 msgstr "Disk cache location"
 
 #. Location where polipo will cache files permanently. Use of external storage devices is recommended, because the cache can grow considerably. Leave it empty to disable on-disk cache.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:7
-msgid "polipo_cache_diskcacheroot_desc"
+msgid "Location where polipo will cache files permanently. Use of external storage devices is recommended, because the cache can grow considerably. Leave it empty to disable on-disk cache."
 msgstr ""
 "Location where polipo will cache files permanently. Use of external storage "
 "devices is recommended, because the cache can grow considerably. Leave it "
@@ -58,53 +58,53 @@ msgstr ""
 
 #. Truncate cache files size (in bytes)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:8
-msgid "polipo_cache_diskcachetruncatesize"
+msgid "Truncate cache files size (in bytes)"
 msgstr "Truncate cache files size (in bytes)"
 
 #. Size to which cached files should be truncated. (default value: 1048576)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:9
-msgid "polipo_cache_diskcachetruncatesize_desc"
+msgid "Size to which cached files should be truncated. (default value: 1048576)"
 msgstr ""
 "Size to which cached files should be truncated. (default value: 1048576)"
 
 #. Truncate cache files time
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:10
-msgid "polipo_cache_diskcachetruncatetime"
+msgid "Truncate cache files time"
 msgstr "Truncate cache files time"
 
 #. Time after which cached files will be truncated. (default value: 4d12h)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:11
-msgid "polipo_cache_diskcachetruncatetime_desc"
+msgid "Time after which cached files will be truncated. (default value: 4d12h)"
 msgstr "Time after which cached files will be truncated. (default value: 4d12h)"
 
 #. Delete cache files time
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:12
-msgid "polipo_cache_diskcacheunlinktime"
+msgid "Delete cache files time"
 msgstr "Delete cache files time"
 
 #. Time after which cached files will be deleted. (default value: 32d)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:13
-msgid "polipo_cache_diskcacheunlinktime_desc"
+msgid "Time after which cached files will be deleted. (default value: 32d)"
 msgstr "Time after which cached files will be deleted. (default value: 32d)"
 
 #. Polipo is a small and fast caching web proxy.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:14
-msgid "polipo_desc"
+msgid "Polipo is a small and fast caching web proxy."
 msgstr "Polipo is a small and fast caching web proxy."
 
 #. General
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:15
-msgid "polipo_general"
+msgid "General"
 msgstr "General"
 
 #. Allowed clients
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:16
-msgid "polipo_general_allowedclients"
+msgid "Allowed clients"
 msgstr "Allowed clients"
 
 #. When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients that are allowed to connect. The format is IP address or network address (192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6)).
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:17
-msgid "polipo_general_allowedclients_desc"
+msgid "When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients that are allowed to connect. The format is IP address or network address (192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))."
 msgstr ""
 "When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
 "that are allowed to connect. The format is IP address or network address "
@@ -112,46 +112,46 @@ msgstr ""
 
 #. In RAM cache size (in bytes)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:18
-msgid "polipo_general_chunkhighmark"
+msgid "In RAM cache size (in bytes)"
 msgstr "In RAM cache size (in bytes)"
 
 #. How much RAM should Polipo use for its cache.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:19
-msgid "polipo_general_chunkhighmark_desc"
+msgid "How much RAM should Polipo use for its cache."
 msgstr "How much RAM should Polipo use for its cache."
 
 #. DNS server address
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:20
-msgid "polipo_general_dnsnameserver"
+msgid "DNS server address"
 msgstr "DNS server address"
 
 #. Set the DNS server address to use, if you want Polipo to use different DNS server than the host system.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:21
-msgid "polipo_general_dnsnameserver_desc"
+msgid "Set the DNS server address to use, if you want Polipo to use different DNS server than the host system."
 msgstr ""
 "Set the DNS server address to use, if you want Polipo to use different DNS "
 "server than the host system."
 
 #. Query DNS for IPv6
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:22
-msgid "polipo_general_dnsqueryipv6"
+msgid "Query DNS for IPv6"
 msgstr "Query DNS for IPv6"
 
 #. false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = Query both, prefer IPv6; true = Query only IPv6
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:23
-msgid "polipo_general_dnsqueryipv6_desc"
+msgid "false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = Query both, prefer IPv6; true = Query only IPv6"
 msgstr ""
 "false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = "
 "Query both, prefer IPv6; true = Query only IPv6"
 
 #. Query DNS by hostname
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:24
-msgid "polipo_general_dnsusegethostbyname"
+msgid "Query DNS by hostname"
 msgstr "Query DNS by hostname"
 
 #. false = Never use system DNS resolver; reluctantly = Query DNS directly, if DNS server is unavailable fail to system DNS resolver; happily = Query DNS directly, if host could not be found fallback to system DNS resolver; true = Always use system DNS resolver
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:25
-msgid "polipo_general_dnsusegethostbyname_desc"
+msgid "false = Never use system DNS resolver; reluctantly = Query DNS directly, if DNS server is unavailable fail to system DNS resolver; happily = Query DNS directly, if host could not be found fallback to system DNS resolver; true = Always use system DNS resolver"
 msgstr ""
 "false = Never use system DNS resolver; reluctantly = Query DNS directly, if "
 "DNS server is unavailable fail to system DNS resolver; happily = Query DNS "
@@ -160,80 +160,80 @@ msgstr ""
 
 #. Syslog facility
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:26
-msgid "polipo_general_logfacility"
+msgid "Syslog facility"
 msgstr "Syslog facility"
 
 #. Log file location
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:27
-msgid "polipo_general_logfile"
+msgid "Log file location"
 msgstr "Log file location"
 
 #. Use of external storage device is recommended, because the log file is written frequently and can grow considerably.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:28
-msgid "polipo_general_logfile_desc"
+msgid "Use of external storage device is recommended, because the log file is written frequently and can grow considerably."
 msgstr ""
 "Use of external storage device is recommended, because the log file is "
 "written frequently and can grow considerably."
 
 #. Log to syslog
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:29
-msgid "polipo_general_logsyslog"
+msgid "Log to syslog"
 msgstr "Log to syslog"
 
 #. Parent proxy authentication
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:30
-msgid "polipo_general_parentauthcredentials"
+msgid "Parent proxy authentication"
 msgstr "Parent proxy authentication"
 
 #. Basic HTTP authentication supported. Provide username and password in username:password format.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:31
-msgid "polipo_general_parentauthcredentials_desc"
+msgid "Basic HTTP authentication supported. Provide username and password in username:password format."
 msgstr ""
 "Basic HTTP authentication supported. Provide username and password in "
 "username:password format."
 
 #. Parent proxy address
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:32
-msgid "polipo_general_parentproxy"
+msgid "Parent proxy address"
 msgstr "Parent proxy address"
 
 #. Parent proxy address (in host:port format), to which Polipo will forward the requests.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:33
-msgid "polipo_general_parentproxy_desc"
+msgid "Parent proxy address (in host:port format), to which Polipo will forward the requests."
 msgstr ""
 "Parent proxy address (in host:port format), to which Polipo will forward the "
 "requests."
 
 #. Listen address
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:34
-msgid "polipo_general_proxyaddress"
+msgid "Listen address"
 msgstr "Listen address"
 
 #. The interface on which Polipo will listen. To listen on all interfaces use 0.0.0.0 or :: (IPv6).
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:35
-msgid "polipo_general_proxyaddress_desc"
+msgid "The interface on which Polipo will listen. To listen on all interfaces use 0.0.0.0 or :: (IPv6)."
 msgstr ""
 "The interface on which Polipo will listen. To listen on all interfaces use "
 "0.0.0.0 or :: (IPv6)."
 
 #. Listen port
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:36
-msgid "polipo_general_proxyport"
+msgid "Listen port"
 msgstr "Listen port"
 
 #. Port on which Polipo will listen. (default value: 8123)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:37
-msgid "polipo_general_proxyport_desc"
+msgid "Port on which Polipo will listen. (default value: 8123)"
 msgstr "Port on which Polipo will listen. (default value: 8123)"
 
 #. Poor Man&#39;s Multiplexing
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:38
-msgid "polipo_pmm"
+msgid "Poor Man's Multiplexing"
 msgstr "Poor Man&#39;s Multiplexing"
 
 #. Poor Man&#39;s Multiplexing (PMM) is a technique that simulates multiplexing by requesting an instance in multiple segments. It tries to lower the latency caused by the weakness of HTTP protocol. NOTE: some sites may not work with PMM enabled.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:39
-msgid "polipo_pmm_desc"
+msgid "Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by requesting an instance in multiple segments. It tries to lower the latency caused by the weakness of HTTP protocol. NOTE: some sites may not work with PMM enabled."
 msgstr ""
 "Poor Man&#39;s Multiplexing (PMM) is a technique that simulates multiplexing "
 "by requesting an instance in multiple segments. It tries to lower the "
@@ -242,19 +242,19 @@ msgstr ""
 
 #. First PMM segment size (in bytes)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:40
-msgid "polipo_pmm_pmmfirstsize"
+msgid "First PMM segment size (in bytes)"
 msgstr "First PMM segment size (in bytes)"
 
 #. Size of the first PMM segment. If not defined, it defaults to twice the PMM segment size.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:41
-msgid "polipo_pmm_pmmfirstsize_desc"
+msgid "Size of the first PMM segment. If not defined, it defaults to twice the PMM segment size."
 msgstr ""
 "Size of the first PMM segment. If not defined, it defaults to twice the PMM "
 "segment size."
 
 #. PMM segments size (in bytes)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:42
-msgid "polipo_pmm_pmmsize"
+msgid "PMM segments size (in bytes)"
 msgstr "PMM segments size (in bytes)"
 
 #. To enable PMM, PMM segment size must be set to some positive value.
diff --git a/po/en/qos.po b/po/en/qos.po
index ed1ea2c11..5d932b80a 100644
--- a/po/en/qos.po
+++ b/po/en/qos.po
@@ -9,93 +9,93 @@ msgstr ""
 
 #. Quality of Service
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:1
-msgid "qos"
+msgid "Quality of Service"
 msgstr "Quality of Service"
 
 #. With QoS you can priorize network traffic selected by adresses, ports or services.
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:2
-msgid "qos_desc"
+msgid "With QoS you can priorize network traffic selected by adresses, ports or services."
 msgstr ""
 "With QoS you can priorize network traffic selected by adresses, ports or "
 "services."
 
 #. Classification
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:3
-msgid "qos_interface_classgroup"
+msgid "Classification"
 msgstr "Classification"
 
 #. Calculate Overhead
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:4
-msgid "qos_interface_overhead"
+msgid "Calculate Overhead"
 msgstr "Calculate Overhead"
 
 #. Half-Duplex
-msgid "qos_interface_halfduplex"
+msgid "Half-Duplex"
 msgstr "Half-Duplex"
 
 #. Downlink
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:5
-msgid "qos_interface_download"
+msgid "Downlink"
 msgstr "Downlink"
 
 #. Uplink
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:6
-msgid "qos_interface_upload"
+msgid "Uplink"
 msgstr "Uplink"
 
 #. Prioritization
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:7
-msgid "qos_classify"
+msgid "Prioritization"
 msgstr "Prioritization"
 
 #. Priority
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:8
-msgid "qos_classify_target"
+msgid "Priority"
 msgstr "Priority"
 
 #. Source address
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:9
-msgid "qos_classify_srchost"
+msgid "Source address"
 msgstr "Source address"
 
 #. source network / source host
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:10
-msgid "qos_classify_srchost_dest"
+msgid "source network / source host"
 msgstr "source network / source host"
 
 #. Target address
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:11
-msgid "qos_classify_dsthost"
+msgid "Target address"
 msgstr "Target address"
 
 #. target network / target host
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:12
-msgid "qos_classify_dsthost_dest"
+msgid "target network / target host"
 msgstr "target network / target host"
 
 #. portrange
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:13
-msgid "qos_classify_portrange"
+msgid "portrange"
 msgstr "portrange"
 
 #. low
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:14
-msgid "qos_bulk"
+msgid "low"
 msgstr "low"
 
 #. normal
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:15
-msgid "qos_normal"
+msgid "normal"
 msgstr "normal"
 
 #. express
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:16
-msgid "qos_express"
+msgid "express"
 msgstr "express"
 
 #. priority
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:17
-msgid "qos_priority"
+msgid "priority"
 msgstr "priority"
 
 #. Bytes sent
diff --git a/po/en/rrdtool.po b/po/en/rrdtool.po
index d78014453..d79eab690 100644
--- a/po/en/rrdtool.po
+++ b/po/en/rrdtool.po
@@ -14,342 +14,342 @@ msgstr ""
 
 #. %H: Wireless - Signal Noise Ratio
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:1
-msgid "stat_dg_title_wireless__signal_noise"
+msgid "%H: Wireless - Signal Noise Ratio"
 msgstr "%H: Wireless - Signal Noise Ratio"
 
 #. dBm
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:2
-msgid "stat_dg_label_wireless__signal_noise"
+msgid "dBm"
 msgstr "dBm"
 
 #. Noise Level
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:3
-msgid "stat_ds_signal_noise"
+msgid "Noise Level"
 msgstr "Noise Level"
 
 #. Signal Strength
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:4
-msgid "stat_ds_signal_power"
+msgid "Signal Strength"
 msgstr "Signal Strength"
 
 #. %H: Wireless - Signal Quality
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:5
-msgid "stat_dg_title_wireless__signal_quality"
+msgid "%H: Wireless - Signal Quality"
 msgstr "%H: Wireless - Signal Quality"
 
 #. n
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:6
-msgid "stat_dg_label_wireless__signal_quality"
+msgid "n"
 msgstr "n"
 
 #. Signal Quality
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:7
-msgid "stat_ds_signal_quality"
+msgid "Signal Quality"
 msgstr "Signal Quality"
 
 #. %H: ICMP Roundtrip Times
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:8
-msgid "stat_dg_title_ping"
+msgid "%H: ICMP Roundtrip Times"
 msgstr "%H: ICMP Roundtrip Times"
 
 #. ms
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:9
-msgid "stat_dg_label_ping"
+msgid "ms"
 msgstr "ms"
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:10
-msgid "stat_ds_ping"
+msgid "%di"
 msgstr "%di"
 
 #. %H: Firewall - Processed Packets
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:11
-msgid "stat_dg_title_iptables__ipt_packets"
+msgid "%H: Firewall - Processed Packets"
 msgstr "%H: Firewall - Processed Packets"
 
 #. Packets/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:12
-msgid "stat_dg_label_iptables__ipt_packets"
+msgid "Packets/s"
 msgstr "Packets/s"
 
 #. Chain \"%di\"
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:13
-msgid "stat_ds_ipt_packets"
+msgid "Chain \"%di\""
 msgstr "Chain \"%di\""
 
 #. %H: Netlink - Transfer on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:14
-msgid "stat_dg_title_netlink__if_octets"
+msgid "%H: Netlink - Transfer on %pi"
 msgstr "%H: Netlink - Transfer on %pi"
 
 #. Bytes/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:15
-msgid "stat_dg_label_netlink__if_octets"
+msgid "Bytes/s"
 msgstr "Bytes/s"
 
 #. Bytes (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:16
-msgid "stat_ds_if_octets"
+msgid "Bytes (%ds)"
 msgstr "Bytes (%ds)"
 
 #. %H: Netlink - Packets on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:17
-msgid "stat_dg_title_netlink__if_packets"
+msgid "%H: Netlink - Packets on %pi"
 msgstr "%H: Netlink - Packets on %pi"
 
 #. Packets/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:18
-msgid "stat_dg_label_netlink__if_packets"
+msgid "Packets/s"
 msgstr "Packets/s"
 
 #. Processed (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:19
-msgid "stat_ds_if_packets"
+msgid "Processed (%ds)"
 msgstr "Processed (%ds)"
 
 #. Dropped   (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:20
-msgid "stat_ds_if_dropped"
+msgid "Dropped (%ds)"
 msgstr "Dropped   (%ds)"
 
 #. Errors    (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:21
-msgid "stat_ds_if_errors"
+msgid "Errors (%ds)"
 msgstr "Errors    (%ds)"
 
 #. %H: Netlink - Multicast on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:22
-msgid "stat_dg_title_netlink__if_multicast"
+msgid "%H: Netlink - Multicast on %pi"
 msgstr "%H: Netlink - Multicast on %pi"
 
 #. Packets/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:23
-msgid "stat_dg_label_netlink__if_multicast"
+msgid "Packets/s"
 msgstr "Packets/s"
 
 #. Packets
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:24
-msgid "stat_ds_if_multicast"
+msgid "Packets"
 msgstr "Packets"
 
 #. %H: Netlink - Collisions on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:25
-msgid "stat_dg_title_netlink__if_collisions"
+msgid "%H: Netlink - Collisions on %pi"
 msgstr "%H: Netlink - Collisions on %pi"
 
 #. Collisions/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:26
-msgid "stat_dg_label_netlink__if_collisions"
+msgid "Collisions/s"
 msgstr "Collisions/s"
 
 #. Collisions
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:27
-msgid "stat_ds_if_collisions"
+msgid "Collisions"
 msgstr "Collisions"
 
 #. %H: Netlink - Errors on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:28
-msgid "stat_dg_title_netlink__if_tx_errors"
+msgid "%H: Netlink - Errors on %pi"
 msgstr "%H: Netlink - Errors on %pi"
 
 #. Errors/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:29
-msgid "stat_dg_label_netlink__if_tx_errors"
+msgid "Errors/s"
 msgstr "Errors/s"
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:30
-msgid "stat_ds_if_tx_errors"
+msgid "%di"
 msgstr "%di"
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:31
-msgid "stat_ds_if_rx_errors"
+msgid "%di"
 msgstr "%di"
 
 #. %H: Processes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:32
-msgid "stat_dg_title_processes"
+msgid "%H: Processes"
 msgstr "%H: Processes"
 
 #. Processes/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:33
-msgid "stat_dg_label_processes"
+msgid "Processes/s"
 msgstr "Processes/s"
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:34
-msgid "stat_ds_ps_state"
+msgid "%di"
 msgstr "%di"
 
 #. %H: Process %pi - used cpu time
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:35
-msgid "stat_dg_title_processes__ps_cputime"
+msgid "%H: Process %pi - used cpu time"
 msgstr "%H: Process %pi - used cpu time"
 
 #. Jiffies
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:36
-msgid "stat_dg_label_processes__ps_cputime"
+msgid "Jiffies"
 msgstr "Jiffies"
 
 #. system
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:37
-msgid "stat_ds_ps_cputime__syst"
+msgid "System"
 msgstr "system"
 
 #. user
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:38
-msgid "stat_ds_ps_cputime__user"
+msgid "user"
 msgstr "user"
 
 #. %H: Process %pi - threads and processes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:39
-msgid "stat_dg_title_processes__ps_count"
+msgid "%H: Process %pi - threads and processes"
 msgstr "%H: Process %pi - threads and processes"
 
 #. Count
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:40
-msgid "stat_dg_label_processes__ps_count"
+msgid "Count"
 msgstr "Count"
 
 #. %ds
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:41
-msgid "stat_ds_ps_count"
+msgid "%ds"
 msgstr "%ds"
 
 #. %H: Process %pi - page faults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:42
-msgid "stat_dg_title_processes__ps_pagefaults"
+msgid "%H: Process %pi - page faults"
 msgstr "%H: Process %pi - page faults"
 
 #. Pagefaults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:43
-msgid "stat_dg_label_processes__ps_pagefaults"
+msgid "Pagefaults"
 msgstr "Pagefaults"
 
 #. page faults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:44
-msgid "stat_ds_ps_pagefaults"
+msgid "page faults"
 msgstr "page faults"
 
 #. %H: Process %pi - virtual memory size
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:45
-msgid "stat_dg_title_processes__ps_rss"
+msgid "%H: Process %pi - virtual memory size"
 msgstr "%H: Process %pi - virtual memory size"
 
 #. Bytes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:46
-msgid "stat_dg_label_processes__ps_rss"
+msgid "Bytes"
 msgstr "Bytes"
 
 #. virtual memory
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:47
-msgid "stat_ds_ps_rss"
+msgid "virtual memory"
 msgstr "virtual memory"
 
 #. %H: Usage on Processor #%pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:48
-msgid "stat_dg_title_cpu"
+msgid "%H: Usage on Processor #%pi"
 msgstr "%H: Usage on Processor #%pi"
 
 #. %
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:49
-msgid "stat_dg_label_cpu"
+msgid "%"
 msgstr "%"
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:50
-msgid "stat_ds_cpu"
+msgid "%di"
 msgstr "%di"
 
 #. %H: Transfer on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:51
-msgid "stat_dg_title_interface__if_octets"
+msgid "%H: Transfer on %di"
 msgstr "%H: Transfer on %di"
 
 #. Bytes/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:52
-msgid "stat_dg_label_interface__if_octets"
+msgid "Bytes/s"
 msgstr "Bytes/s"
 
 #. %H: Packets on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:53
-msgid "stat_dg_title_interface__if_packets"
+msgid "%H: Packets on %di"
 msgstr "%H: Packets on %di"
 
 #. Packets/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:54
-msgid "stat_dg_label_interface__if_packets"
+msgid "Packets/s"
 msgstr "Packets/s"
 
 #. %H: TCP-Connections to Port %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:55
-msgid "stat_dg_title_tcpconns"
+msgid "%H: TCP-Connections to Port %pi"
 msgstr "%H: TCP-Connections to Port %pi"
 
 #. Connections/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:56
-msgid "stat_dg_label_tcpconns"
+msgid "Connections/s"
 msgstr "Connections/s"
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:57
-msgid "stat_ds_tcp_connections"
+msgid "%di"
 msgstr "%di"
 
 #. %H: Disk Space Usage on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:58
-msgid "stat_dg_title_df"
+msgid "%H: Disk Space Usage on %di"
 msgstr "%H: Disk Space Usage on %di"
 
 #. Bytes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:59
-msgid "stat_dg_label_df"
+msgid "Bytes"
 msgstr "Bytes"
 
 #. %ds
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:60
-msgid "stat_ds_df__free"
+msgid "%ds"
 msgstr "%ds"
 
 #. %ds
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:61
-msgid "stat_ds_df__used"
+msgid "%ds"
 msgstr "%ds"
 
 #. %H: Interrupts
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:62
-msgid "stat_dg_title_irq"
+msgid "%H: Interrupts"
 msgstr "%H: Interrupts"
 
 #. Issues/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:63
-msgid "stat_dg_label_irq"
+msgid "Issues/s"
 msgstr "Issues/s"
 
 #. IRQ %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:64
-msgid "stat_ds_irq"
+msgid "IRQ %di"
 msgstr "IRQ %di"
 
 #. %H: System Load
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:65
-msgid "stat_dg_title_load"
+msgid "%H: System Load"
 msgstr "%H: System Load"
 
 #. Load
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:66
-msgid "stat_dg_label_load"
+msgid "Load"
 msgstr "Load"
 
 #. 1 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:67
-msgid "stat_ds_load__shortterm"
+msgid "1 min"
 msgstr "1 min"
 
 #. 5 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:68
-msgid "stat_ds_load__midterm"
+msgid "5 min"
 msgstr "5 min"
 
 #. 15 min
diff --git a/po/en/samba.po b/po/en/samba.po
index 6bca51d82..cd8cebc10 100644
--- a/po/en/samba.po
+++ b/po/en/samba.po
@@ -14,82 +14,82 @@ msgstr ""
 
 #. Network Shares
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:1
-msgid "samba"
+msgid "Network Shares"
 msgstr "Network Shares"
 
 #. Hostname
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:2
-msgid "samba_samba_name"
+msgid "Hostname"
 msgstr "Hostname"
 
 #. Description
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:3
-msgid "samba_samba_description"
+msgid "Description"
 msgstr "Description"
 
 #. Workgroup
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:4
-msgid "samba_samba_workgroup"
+msgid "Workgroup"
 msgstr "Workgroup"
 
 #. Share home-directories
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:5
-msgid "samba_samba_homes"
+msgid "Share home-directories"
 msgstr "Share home-directories"
 
 #. System users can reach their home directories via network shares.
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:6
-msgid "samba_samba_homes_desc"
+msgid "System users can reach their home directories via network shares."
 msgstr "System users can reach their home directories via network shares."
 
 #. Shared Directories
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:7
-msgid "samba_sambashare"
+msgid "Shared Directories"
 msgstr "Shared Directories"
 
 #. Shared Directory
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:8
-msgid "samba_sambashare_path"
+msgid "Shared Directory"
 msgstr "Shared Directory"
 
 #. Physical Path
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:9
-msgid "samba_sambashare_path_desc"
+msgid "Physical Path"
 msgstr "Physical Path"
 
 #. Allowed Users
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:10
-msgid "samba_sambashare_users"
+msgid "Allowed Users"
 msgstr "Allowed Users"
 
 #. optional
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:11
-msgid "samba_sambashare_users_desc"
+msgid "optional"
 msgstr "optional"
 
 #. Read Only
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:12
-msgid "samba_sambashare_readonly"
+msgid "Read Only"
 msgstr "Read Only"
 
 #. Allow Guests
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:13
-msgid "samba_sambashare_guestok"
+msgid "Allow Guests"
 msgstr "Allow Guests"
 
 #. Create Mask
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:14
-msgid "samba_sambashare_createmask"
+msgid "Create Mask"
 msgstr "Create Mask"
 
 #. Mask for new files
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:15
-msgid "samba_sambashare_createmask_desc"
+msgid "Mask for new files"
 msgstr "Mask for new files"
 
 #. Directory Mask
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:16
-msgid "samba_sambashare_dirmask"
+msgid "Directory Mask"
 msgstr "Directory Mask"
 
 #. Mask for new directories
diff --git a/po/en/statistics.po b/po/en/statistics.po
index f9802af4a..3dba6cc9c 100644
--- a/po/en/statistics.po
+++ b/po/en/statistics.po
@@ -14,12 +14,12 @@ msgstr ""
 
 #. Statistics
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:1
-msgid "stat_statistics"
+msgid "Statistics"
 msgstr "Statistics"
 
 #. The statistics package is based on <a href=\"http://collectd.org/index.shtml\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD Tool</a> to render diagram images from collected data.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:2
-msgid "stat_desc"
+msgid "The statistics package is based on <a href=\"http://collectd.org/index.shtml\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD Tool</a> to render diagram images from collected data."
 msgstr ""
 "The statistics package is based on <a "
 "href=\"http://collectd.org/index.shtml\">Collectd</a> and uses <a "
@@ -28,142 +28,142 @@ msgstr ""
 
 #. System plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:3
-msgid "stat_systemplugins"
+msgid "System plugins"
 msgstr "System plugins"
 
 #. Network plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:4
-msgid "stat_networkplugins"
+msgid "Network plugins"
 msgstr "Network plugins"
 
 #. Output plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:5
-msgid "stat_outputplugins"
+msgid "Output plugins"
 msgstr "Output plugins"
 
 #. Display timespan
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:6
-msgid "stat_showtimespan"
+msgid "Display timespan »"
 msgstr "Display timespan »"
 
 #. Graphs
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:7
-msgid "stat_graphs"
+msgid "Graphs"
 msgstr "Graphs"
 
 #. Collectd
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:8
-msgid "stat_collectd"
+msgid "Collectd"
 msgstr "Collectd"
 
 #. Processor
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:9
-msgid "stat_cpu"
+msgid "Processor"
 msgstr "Processor"
 
 #. Ping
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:10
-msgid "stat_ping"
+msgid "Ping"
 msgstr "Ping"
 
 #. Firewall
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:11
-msgid "stat_iptables"
+msgid "Firewall"
 msgstr "Firewall"
 
 #. Netlink
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:12
-msgid "stat_netlink"
+msgid "Netlink"
 msgstr "Netlink"
 
 #. Processes
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:13
-msgid "stat_processes"
+msgid "Processes"
 msgstr "Processes"
 
 #. Wireless
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:14
-msgid "stat_wireless"
+msgid "Wireless"
 msgstr "Wireless"
 
 #. TCP Connections
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:15
-msgid "stat_tcpconns"
+msgid "TCP Connections"
 msgstr "TCP Connections"
 
 #. Interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:16
-msgid "stat_interface"
+msgid "Interfaces"
 msgstr "Interfaces"
 
 #. Disk Space Usage
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:17
-msgid "stat_df"
+msgid "Disk Space Usage"
 msgstr "Disk Space Usage"
 
 #. Interrupts
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:18
-msgid "stat_irq"
+msgid "Interrupts"
 msgstr "Interrupts"
 
 #. Disk Usage
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:19
-msgid "stat_disk"
+msgid "Disk Usage"
 msgstr "Disk Usage"
 
 #. Exec
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:20
-msgid "stat_exec"
+msgid "Exec"
 msgstr "Exec"
 
 #. RRDTool
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:21
-msgid "stat_rrdtool"
+msgid "RRDTool"
 msgstr "RRDTool"
 
 #. Network
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:22
-msgid "stat_network"
+msgid "Network"
 msgstr "Network"
 
 #. CSV Output
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:23
-msgid "stat_csv"
+msgid "CSV Output"
 msgstr "CSV Output"
 
 #. System Load
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:24
-msgid "stat_load"
+msgid "System Load"
 msgstr "System Load"
 
 #. DNS
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:25
-msgid "stat_dns"
+msgid "DNS"
 msgstr "DNS"
 
 #. Email
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:26
-msgid "stat_email"
+msgid "Email"
 msgstr "Email"
 
 #. UnixSock
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:27
-msgid "stat_unixsock"
+msgid "UnixSock"
 msgstr "UnixSock"
 
 #. Statistics
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:28
-msgid "lucistatistics"
+msgid "Statistics"
 msgstr "Statistics"
 
 #. Collectd Settings
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:29
-msgid "lucistatistics_collectd"
+msgid "Collectd Settings"
 msgstr "Collectd Settings"
 
 #. Collectd is a small daeomon for collecting data from various sources through different plugins. On this page you can change general settings for the collectd daemon.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:30
-msgid "lucistatistics_collectd_desc"
+msgid "Collectd is a small daeomon for collecting data from various sources through different plugins. On this page you can change general settings for the collectd daemon."
 msgstr ""
 "Collectd is a small daeomon for collecting data from various sources through "
 "different plugins. On this page you can change general settings for the "
@@ -171,225 +171,225 @@ msgstr ""
 
 #. Hostname
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:31
-msgid "lucistatistics_collectd_hostname"
+msgid "Hostname"
 msgstr "Hostname"
 
 #. Base Directory
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:32
-msgid "lucistatistics_collectd_basedir"
+msgid "Base Directory"
 msgstr "Base Directory"
 
 #. Directory for sub-configurations
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:33
-msgid "lucistatistics_collectd_include"
+msgid "Directory for sub-configurations"
 msgstr "Directory for sub-configurations"
 
 #. Directory for collectd plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:34
-msgid "lucistatistics_collectd_plugindir"
+msgid "Directory for collectd plugins"
 msgstr "Directory for collectd plugins"
 
 #. Used PID file
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:35
-msgid "lucistatistics_collectd_pidfile"
+msgid "Used PID file"
 msgstr "Used PID file"
 
 #. Datasets definition file
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:36
-msgid "lucistatistics_collectd_typesdb"
+msgid "Datasets definition file"
 msgstr "Datasets definition file"
 
 #. Data collection interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:37
-msgid "lucistatistics_collectd_interval"
+msgid "Data collection interval"
 msgstr "Data collection interval"
 
 #. Seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:38
-msgid "lucistatistics_collectd_interval_desc"
+msgid "Seconds"
 msgstr "Seconds"
 
 #. Number of threads for data collection
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:39
-msgid "lucistatistics_collectd_readthreads"
+msgid "Number of threads for data collection"
 msgstr "Number of threads for data collection"
 
 #. Try to lookup fully qualified hostname
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:40
-msgid "lucistatistics_collectd_fqdnlookup"
+msgid "Try to lookup fully qualified hostname"
 msgstr "Try to lookup fully qualified hostname"
 
 #. CPU Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:41
-msgid "lucistatistics_collectdcpu"
+msgid "CPU Plugin Configuration"
 msgstr "CPU Plugin Configuration"
 
 #. The cpu plugin collects basic statistics about the processor usage.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:42
-msgid "lucistatistics_collectdcpu_desc"
+msgid "The cpu plugin collects basic statistics about the processor usage."
 msgstr "The cpu plugin collects basic statistics about the processor usage."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:43
-msgid "lucistatistics_collectdcpu_enable"
+msgid "Enable this plugin"
 msgstr "Enable this plugin"
 
 #. CSV Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:44
-msgid "lucistatistics_collectdcsv"
+msgid "CSV Plugin Configuration"
 msgstr "CSV Plugin Configuration"
 
 #. The csv plugin stores collected data in csv file format for further processing by external programs.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:45
-msgid "lucistatistics_collectdcsv_desc"
+msgid "The csv plugin stores collected data in csv file format for further processing by external programs."
 msgstr ""
 "The csv plugin stores collected data in csv file format for further "
 "processing by external programs."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:46
-msgid "lucistatistics_collectdcsv_enable"
+msgid "Enable this plugin"
 msgstr "Enable this plugin"
 
 #. Storage directory for the csv files
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:47
-msgid "lucistatistics_collectdcsv_datadir"
+msgid "Storage directory for the csv files"
 msgstr "Storage directory for the csv files"
 
 #. Store data values as rates instead of absolute values
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:48
-msgid "lucistatistics_collectdcsv_storerates"
+msgid "Store data values as rates instead of absolute values"
 msgstr "Store data values as rates instead of absolute values"
 
 #. DF Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:49
-msgid "lucistatistics_collectddf"
+msgid "DF Plugin Configuration"
 msgstr "DF Plugin Configuration"
 
 #. The df plugin collects statistics about the disk space usage on different devices, mount points or filesystem types.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:50
-msgid "lucistatistics_collectddf_desc"
+msgid "The df plugin collects statistics about the disk space usage on different devices, mount points or filesystem types."
 msgstr ""
 "The df plugin collects statistics about the disk space usage on different "
 "devices, mount points or filesystem types."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:51
-msgid "lucistatistics_collectddf_enable"
+msgid "Enable this plugin"
 msgstr "Enable this plugin"
 
 #. Monitor devices
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:52
-msgid "lucistatistics_collectddf_devices"
+msgid "Monitor devices"
 msgstr "Monitor devices"
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:53
-msgid "lucistatistics_collectddf_devices_desc"
+msgid "multiple separated by space"
 msgstr "multiple separated by space"
 
 #. Monitor mount points
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:54
-msgid "lucistatistics_collectddf_mountpoints"
+msgid "Monitor mount points"
 msgstr "Monitor mount points"
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:55
-msgid "lucistatistics_collectddf_mountpoints_desc"
+msgid "multiple separated by space"
 msgstr "multiple separated by space"
 
 #. Monitor filesystem types
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:56
-msgid "lucistatistics_collectddf_fstypes"
+msgid "Monitor filesystem types"
 msgstr "Monitor filesystem types"
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:57
-msgid "lucistatistics_collectddf_fstypes_desc"
+msgid "multiple separated by space"
 msgstr "multiple separated by space"
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:58
-msgid "lucistatistics_collectddf_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr "Monitor all except selected ones"
 
 #. Disk Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:59
-msgid "lucistatistics_collectddisk"
+msgid "Disk Plugin Configuration"
 msgstr "Disk Plugin Configuration"
 
 #. The disk plugin collects detailled usage statistics for selected partitions or whole disks.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:60
-msgid "lucistatistics_collectddisk_desc"
+msgid "The disk plugin collects detailled usage statistics for selected partitions or whole disks."
 msgstr ""
 "The disk plugin collects detailled usage statistics for selected partitions "
 "or whole disks."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:61
-msgid "lucistatistics_collectddisk_enable"
+msgid "Enable this plugin"
 msgstr "Enable this plugin"
 
 #. Monitor disks and partitions
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:62
-msgid "lucistatistics_collectddisk_disks"
+msgid "Monitor disks and partitions"
 msgstr "Monitor disks and partitions"
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:63
-msgid "lucistatistics_collectddisk_disks_desc"
+msgid "multiple separated by space"
 msgstr "multiple separated by space"
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:64
-msgid "lucistatistics_collectddisk_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr "Monitor all except selected ones"
 
 #. DNS Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:65
-msgid "lucistatistics_collectddns"
+msgid "DNS Plugin Configuration"
 msgstr "DNS Plugin Configuration"
 
 #. The dns plugin collects detailled statistics about dns related traffic on selected interfaces.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:66
-msgid "lucistatistics_collectddns_desc"
+msgid "The dns plugin collects detailled statistics about dns related traffic on selected interfaces."
 msgstr ""
 "The dns plugin collects detailled statistics about dns related traffic on "
 "selected interfaces."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:67
-msgid "lucistatistics_collectddns_enable"
+msgid "Enable this plugin"
 msgstr "Enable this plugin"
 
 #. Monitor interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:68
-msgid "lucistatistics_collectddns_interfaces"
+msgid "Monitor interfaces"
 msgstr "Monitor interfaces"
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:69
-msgid "lucistatistics_collectddns_interfaces_desc"
+msgid "multiple separated by space"
 msgstr "multiple separated by space"
 
 #. Ignore source addresses
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:70
-msgid "lucistatistics_collectddns_ignoresources"
+msgid "Ignore source addresses"
 msgstr "Ignore source addresses"
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:71
-msgid "lucistatistics_collectddns_ignoresources_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr "hold Ctrl while clicking to select multiple interfaces"
 
 #. E-Mail Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:72
-msgid "lucistatistics_collectdemail"
+msgid "E-Mail Plugin Configuration"
 msgstr "E-Mail Plugin Configuration"
 
 #. The email plugin creates a unix socket which can be used to transmit email-statistics to a running collectd daemon. This plugin is primarily intended to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can be used in other ways as well.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:73
-msgid "lucistatistics_collectdemail_desc"
+msgid "The email plugin creates a unix socket which can be used to transmit email-statistics to a running collectd daemon. This plugin is primarily intended to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can be used in other ways as well."
 msgstr ""
 "The email plugin creates a unix socket which can be used to transmit email-"
 "statistics to a running collectd daemon. This plugin is primarily intended "
@@ -398,91 +398,91 @@ msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:74
-msgid "lucistatistics_collectdemail_enable"
+msgid "Enable this plugin"
 msgstr "Enable this plugin"
 
 #. Filepath of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:75
-msgid "lucistatistics_collectdemail_socketfile"
+msgid "Filepath of the unix socket"
 msgstr "Filepath of the unix socket"
 
 #. Group ownership of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:76
-msgid "lucistatistics_collectdemail_socketgroup"
+msgid "Group ownership of the unix socket"
 msgstr "Group ownership of the unix socket"
 
 #. group name
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:77
-msgid "lucistatistics_collectdemail_socketgroup_desc"
+msgid "group name"
 msgstr "group name"
 
 #. File permissions of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:78
-msgid "lucistatistics_collectdemail_socketperms"
+msgid "File permissions of the unix socket"
 msgstr "File permissions of the unix socket"
 
 #. octal
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:79
-msgid "lucistatistics_collectdemail_socketperms_desc"
+msgid "octal"
 msgstr "octal"
 
 #. Maximum allowed connections
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:80
-msgid "lucistatistics_collectdemail_maxconns"
+msgid "Maximum allowed connections"
 msgstr "Maximum allowed connections"
 
 #. Exec Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:81
-msgid "lucistatistics_collectdexec"
+msgid "Exec Plugin Configuration"
 msgstr "Exec Plugin Configuration"
 
 #. The exec plugin starts external commands to read values from or to notify external processes when certain threshold values have been reached.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:82
-msgid "lucistatistics_collectdexec_desc"
+msgid "The exec plugin starts external commands to read values from or to notify external processes when certain threshold values have been reached."
 msgstr ""
 "The exec plugin starts external commands to read values from or to notify "
 "external processes when certain threshold values have been reached."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:83
-msgid "lucistatistics_collectdexec_enable"
+msgid "Enable this plugin"
 msgstr "Enable this plugin"
 
 #. Add command for reading values
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:84
-msgid "lucistatistics_collectdexecinput"
+msgid "Add command for reading values"
 msgstr "Add command for reading values"
 
 #. Here you can define external commands which will be started by collectd in order to read certain values. The values will be read from stdout.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:85
-msgid "lucistatistics_collectdexecinput_desc"
+msgid "Here you can define external commands which will be started by collectd in order to read certain values. The values will be read from stdout."
 msgstr ""
 "Here you can define external commands which will be started by collectd in "
 "order to read certain values. The values will be read from stdout."
 
 #. Commandline
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:86
-msgid "lucistatistics_collectdexecinput_cmdline"
+msgid "Commandline"
 msgstr "Commandline"
 
 #. Run as user
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:87
-msgid "lucistatistics_collectdexecinput_cmduser"
+msgid "Run as user"
 msgstr "Run as user"
 
 #. Run as group
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:88
-msgid "lucistatistics_collectdexecinput_cmdgroup"
+msgid "Run as group"
 msgstr "Run as group"
 
 #. Add notification command
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:89
-msgid "lucistatistics_collectdexecnotify"
+msgid "Add notification command"
 msgstr "Add notification command"
 
 #. Here you can define external commands which will be started by collectd when certain threshold values have been reached. The values leading to invokation will be feeded to the the called programs stdin.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:90
-msgid "lucistatistics_collectdexecnotify_desc"
+msgid "Here you can define external commands which will be started by collectd when certain threshold values have been reached. The values leading to invokation will be feeded to the the called programs stdin."
 msgstr ""
 "Here you can define external commands which will be started by collectd when "
 "certain threshold values have been reached. The values leading to "
@@ -490,286 +490,286 @@ msgstr ""
 
 #. Commandline
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:91
-msgid "lucistatistics_collectdexecnotify_cmdline"
+msgid "Commandline"
 msgstr "Commandline"
 
 #. Run as user
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:92
-msgid "lucistatistics_collectdexecnotify_cmduser"
+msgid "Run as user"
 msgstr "Run as user"
 
 #. Run as group
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:93
-msgid "lucistatistics_collectdexecnotify_cmdgroup"
+msgid "Run as group"
 msgstr "Run as group"
 
 #. Interface Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:94
-msgid "lucistatistics_collectdinterface"
+msgid "Interface Plugin Configuration"
 msgstr "Interface Plugin Configuration"
 
 #. The interface plugin collects traffic statistics on selected interfaces.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:95
-msgid "lucistatistics_collectdinterface_desc"
+msgid "The interface plugin collects traffic statistics on selected interfaces."
 msgstr ""
 "The interface plugin collects traffic statistics on selected interfaces."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:96
-msgid "lucistatistics_collectdinterface_enable"
+msgid "Enable this plugin"
 msgstr "Enable this plugin"
 
 #. Monitor interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:97
-msgid "lucistatistics_collectdinterface_interfaces"
+msgid "Monitor interfaces"
 msgstr "Monitor interfaces"
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:98
-msgid "lucistatistics_collectdinterface_interfaces_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr "hold Ctrl while clicking to select multiple interfaces"
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:99
-msgid "lucistatistics_collectdinterface_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr "Monitor all except selected ones"
 
 #. Iptables Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:100
-msgid "lucistatistics_collectdiptables"
+msgid "Iptables Plugin Configuration"
 msgstr "Iptables Plugin Configuration"
 
 #. The iptables plugin will monitor selected firewall rules and collect informations about processed bytes and packets per rule.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:101
-msgid "lucistatistics_collectdiptables_desc"
+msgid "The iptables plugin will monitor selected firewall rules and collect informations about processed bytes and packets per rule."
 msgstr ""
 "The iptables plugin will monitor selected firewall rules and collect "
 "informations about processed bytes and packets per rule."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:102
-msgid "lucistatistics_collectdiptables_enable"
+msgid "Enable this plugin"
 msgstr "Enable this plugin"
 
 #. Add matching rule
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:103
-msgid "lucistatistics_collectdiptablesmatch"
+msgid "Add matching rule"
 msgstr "Add matching rule"
 
 #. Here you can define various criteria by which the monitored iptables rules are selected.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:104
-msgid "lucistatistics_collectdiptablesmatch_desc"
+msgid "Here you can define various criteria by which the monitored iptables rules are selected."
 msgstr ""
 "Here you can define various criteria by which the monitored iptables rules "
 "are selected."
 
 #. Name of the rule
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:105
-msgid "lucistatistics_collectdiptablesmatch_name"
+msgid "Name of the rule"
 msgstr "Name of the rule"
 
 #. max. 16 chars
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:106
-msgid "lucistatistics_collectdiptablesmatch_name_desc"
+msgid "max. 16 chars"
 msgstr "max. 16 chars"
 
 #. Table
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:107
-msgid "lucistatistics_collectdiptablesmatch_table"
+msgid "Table"
 msgstr "Table"
 
 #. Chain
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:108
-msgid "lucistatistics_collectdiptablesmatch_chain"
+msgid "Chain"
 msgstr "Chain"
 
 #. Action (target)
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:109
-msgid "lucistatistics_collectdiptablesmatch_target"
+msgid "Action (target)"
 msgstr "Action (target)"
 
 #. Network protocol
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:110
-msgid "lucistatistics_collectdiptablesmatch_protocol"
+msgid "Network protocol"
 msgstr "Network protocol"
 
 #. Source ip range
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:111
-msgid "lucistatistics_collectdiptablesmatch_source"
+msgid "Source ip range"
 msgstr "Source ip range"
 
 #. CIDR notation
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:112
-msgid "lucistatistics_collectdiptablesmatch_source_desc"
+msgid "CIDR notation"
 msgstr "CIDR notation"
 
 #. Destination ip range
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:113
-msgid "lucistatistics_collectdiptablesmatch_destination"
+msgid "Destination ip range"
 msgstr "Destination ip range"
 
 #. CIDR notation
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:114
-msgid "lucistatistics_collectdiptablesmatch_destination_desc"
+msgid "CIDR notation"
 msgstr "CIDR notation"
 
 #. Incoming interface
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:115
-msgid "lucistatistics_collectdiptablesmatch_inputif"
+msgid "Incoming interface"
 msgstr "Incoming interface"
 
 #. e.g. br-lan
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:116
-msgid "lucistatistics_collectdiptablesmatch_inputif_desc"
+msgid "e.g. br-lan"
 msgstr "e.g. br-lan"
 
 #. Outgoing interface
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:117
-msgid "lucistatistics_collectdiptablesmatch_outputif"
+msgid "Outgoing interface"
 msgstr "Outgoing interface"
 
 #. e.g. br-ff
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:118
-msgid "lucistatistics_collectdiptablesmatch_outputif_desc"
+msgid "e.g. br-ff"
 msgstr "e.g. br-ff"
 
 #. Options
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:119
-msgid "lucistatistics_collectdiptablesmatch_options"
+msgid "Options"
 msgstr "Options"
 
 #. e.g. reject-with tcp-reset
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:120
-msgid "lucistatistics_collectdiptablesmatch_options_desc"
+msgid "e.g. reject-with tcp-reset"
 msgstr "e.g. reject-with tcp-reset"
 
 #. IRQ Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:121
-msgid "lucistatistics_collectdirq"
+msgid "IRQ Plugin Configuration"
 msgstr "IRQ Plugin Configuration"
 
 #. The irq plugin will monitor the rate of issues per second for each selected interrupt. If no interrupt is selected then all interrupts are monitored.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:122
-msgid "lucistatistics_collectdirq_desc"
+msgid "The irq plugin will monitor the rate of issues per second for each selected interrupt. If no interrupt is selected then all interrupts are monitored."
 msgstr ""
 "The irq plugin will monitor the rate of issues per second for each selected "
 "interrupt. If no interrupt is selected then all interrupts are monitored."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:123
-msgid "lucistatistics_collectdirq_enable"
+msgid "Enable this plugin"
 msgstr "Enable this plugin"
 
 #. Monitor interrupts
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:124
-msgid "lucistatistics_collectdirq_irqs"
+msgid "Monitor interrupts"
 msgstr "Monitor interrupts"
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:125
-msgid "lucistatistics_collectdirq_irqs_desc"
+msgid "multiple separated by space"
 msgstr "multiple separated by space"
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:126
-msgid "lucistatistics_collectdirq_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr "Monitor all except selected ones"
 
 #. Load Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:127
-msgid "lucistatistics_collectdload"
+msgid "Load Plugin Configuration"
 msgstr "Load Plugin Configuration"
 
 #. The load plugin collects statistics about the general system load.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:128
-msgid "lucistatistics_collectdload_desc"
+msgid "The load plugin collects statistics about the general system load."
 msgstr "The load plugin collects statistics about the general system load."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:129
-msgid "lucistatistics_collectdload_enable"
+msgid "Enable this plugin"
 msgstr "Enable this plugin"
 
 #. Netlink Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:130
-msgid "lucistatistics_collectdnetlink"
+msgid "Netlink Plugin Configuration"
 msgstr "Netlink Plugin Configuration"
 
 #. The netlink plugin collects extended informations like qdisc-, class- and filter-statistics for selected interfaces.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:131
-msgid "lucistatistics_collectdnetlink_desc"
+msgid "The netlink plugin collects extended informations like qdisc-, class- and filter-statistics for selected interfaces."
 msgstr ""
 "The netlink plugin collects extended informations like qdisc-, class- and "
 "filter-statistics for selected interfaces."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:132
-msgid "lucistatistics_collectdnetlink_enable"
+msgid "Enable this plugin"
 msgstr "Enable this plugin"
 
 #. Basic monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:133
-msgid "lucistatistics_collectdnetlink_interfaces"
+msgid "Basic monitoring"
 msgstr "Basic monitoring"
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:134
-msgid "lucistatistics_collectdnetlink_interfaces_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr "hold Ctrl while clicking to select multiple interfaces"
 
 #. Verbose monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:135
-msgid "lucistatistics_collectdnetlink_verboseinterfaces"
+msgid "Verbose monitoring"
 msgstr "Verbose monitoring"
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:136
-msgid "lucistatistics_collectdnetlink_verboseinterfaces_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr "hold Ctrl while clicking to select multiple interfaces"
 
 #. Qdisc monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:137
-msgid "lucistatistics_collectdnetlink_qdiscs"
+msgid "Qdisc monitoring"
 msgstr "Qdisc monitoring"
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:138
-msgid "lucistatistics_collectdnetlink_qdiscs_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr "hold Ctrl while clicking to select multiple interfaces"
 
 #. Shaping class monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:139
-msgid "lucistatistics_collectdnetlink_classes"
+msgid "Shaping class monitoring"
 msgstr "Shaping class monitoring"
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:140
-msgid "lucistatistics_collectdnetlink_classes_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr "hold Ctrl while clicking to select multiple interfaces"
 
 #. Filter class monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:141
-msgid "lucistatistics_collectdnetlink_filters"
+msgid "Filter class monitoring"
 msgstr "Filter class monitoring"
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:142
-msgid "lucistatistics_collectdnetlink_filters_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr "hold Ctrl while clicking to select multiple interfaces"
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:143
-msgid "lucistatistics_collectdnetlink_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr "Monitor all except selected ones"
 
 #. Network Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:144
-msgid "lucistatistics_collectdnetwork"
+msgid "Network Plugin Configuration"
 msgstr "Network Plugin Configuration"
 
 #. The network plugin provides network based communication between different collectd instances. Collectd can operate both in client and server mode. In client mode locally collected date is transferred to a collectd server instance, in server mode the local instance receives data from other hosts.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:145
-msgid "lucistatistics_collectdnetwork_desc"
+msgid "The network plugin provides network based communication between different collectd instances. Collectd can operate both in client and server mode. In client mode locally collected date is transferred to a collectd server instance, in server mode the local instance receives data from other hosts."
 msgstr ""
 "The network plugin provides network based communication between different "
 "collectd instances. Collectd can operate both in client and server mode. In "
@@ -778,169 +778,169 @@ msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:146
-msgid "lucistatistics_collectdnetwork_enable"
+msgid "Enable this plugin"
 msgstr "Enable this plugin"
 
 #. Listener interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:147
-msgid "lucistatistics_collectdnetworklisten"
+msgid "Listener interfaces"
 msgstr "Listener interfaces"
 
 #. This section defines on which interfaces collectd will wait for incoming connections.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:148
-msgid "lucistatistics_collectdnetworklisten_desc"
+msgid "This section defines on which interfaces collectd will wait for incoming connections."
 msgstr ""
 "This section defines on which interfaces collectd will wait for incoming "
 "connections."
 
 #. Listen host
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:149
-msgid "lucistatistics_collectdnetworklisten_host"
+msgid "Listen host"
 msgstr "Listen host"
 
 #. host-, ip- or ip6 address
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:150
-msgid "lucistatistics_collectdnetworklisten_host_desc"
+msgid "host-, ip- or ip6 address"
 msgstr "host-, ip- or ip6 address"
 
 #. Listen port
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:151
-msgid "lucistatistics_collectdnetworklisten_port"
+msgid "Listen port"
 msgstr "Listen port"
 
 #. 0 - 65535
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:152
-msgid "lucistatistics_collectdnetworklisten_port_desc"
+msgid "0 - 65535"
 msgstr "0 - 65535"
 
 #. server interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:153
-msgid "lucistatistics_collectdnetworkserver"
+msgid "server interfaces"
 msgstr "server interfaces"
 
 #. This section defines to which servers the locally collected data is sent to.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:154
-msgid "lucistatistics_collectdnetworkserver_desc"
+msgid "This section defines to which servers the locally collected data is sent to."
 msgstr ""
 "This section defines to which servers the locally collected data is sent to."
 
 #. Server host
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:155
-msgid "lucistatistics_collectdnetworkserver_host"
+msgid "Server host"
 msgstr "Server host"
 
 #. host-, ip- or ip6 address
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:156
-msgid "lucistatistics_collectdnetworkserver_host_desc"
+msgid "host-, ip- or ip6 address"
 msgstr "host-, ip- or ip6 address"
 
 #. Server port
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:157
-msgid "lucistatistics_collectdnetworkserver_port"
+msgid "Server port"
 msgstr "Server port"
 
 #. 0 - 65535
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:158
-msgid "lucistatistics_collectdnetworkserver_port_desc"
+msgid "0 - 65535"
 msgstr "0 - 65535"
 
 #. TTL for network packets
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:159
-msgid "lucistatistics_collectdnetwork_timetolive"
+msgid "TTL for network packets"
 msgstr "TTL for network packets"
 
 #. 0 - 255
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:160
-msgid "lucistatistics_collectdnetwork_timetolive_desc"
+msgid "0 - 255"
 msgstr "0 - 255"
 
 #. Forwarding between listen and server addresses
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:161
-msgid "lucistatistics_collectdnetwork_forward"
+msgid "Forwarding between listen and server addresses"
 msgstr "Forwarding between listen and server addresses"
 
 #. Cache flush interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:162
-msgid "lucistatistics_collectdnetwork_cacheflush"
+msgid "Cache flush interval"
 msgstr "Cache flush interval"
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:163
-msgid "lucistatistics_collectdnetwork_cacheflush_desc"
+msgid "seconds"
 msgstr "seconds"
 
 #. Ping Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:164
-msgid "lucistatistics_collectdping"
+msgid "Ping Plugin Configuration"
 msgstr "Ping Plugin Configuration"
 
 #. The ping plugin will send icmp echo replies to selected hosts and measure the roundtrip time for each host.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:165
-msgid "lucistatistics_collectdping_desc"
+msgid "The ping plugin will send icmp echo replies to selected hosts and measure the roundtrip time for each host."
 msgstr ""
 "The ping plugin will send icmp echo replies to selected hosts and measure "
 "the roundtrip time for each host."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:166
-msgid "lucistatistics_collectdping_enable"
+msgid "Enable this plugin"
 msgstr "Enable this plugin"
 
 #. Monitor hosts
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:167
-msgid "lucistatistics_collectdping_hosts"
+msgid "Monitor hosts"
 msgstr "Monitor hosts"
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:168
-msgid "lucistatistics_collectdping_hosts_desc"
+msgid "multiple separated by space"
 msgstr "multiple separated by space"
 
 #. TTL for ping packets
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:169
-msgid "lucistatistics_collectdping_ttl"
+msgid "TTL for ping packets"
 msgstr "TTL for ping packets"
 
 #. 0 - 255
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:170
-msgid "lucistatistics_collectdping_ttl_desc"
+msgid "0 - 255"
 msgstr "0 - 255"
 
 #. Processes Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:171
-msgid "lucistatistics_collectdprocesses"
+msgid "Processes Plugin Configuration"
 msgstr "Processes Plugin Configuration"
 
 #. The processes plugin collects informations like cpu time, page faults and memory usage of selected processes.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:172
-msgid "lucistatistics_collectdprocesses_desc"
+msgid "The processes plugin collects informations like cpu time, page faults and memory usage of selected processes."
 msgstr ""
 "The processes plugin collects informations like cpu time, page faults and "
 "memory usage of selected processes."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:173
-msgid "lucistatistics_collectdprocesses_enable"
+msgid "Enable this plugin"
 msgstr "Enable this plugin"
 
 #. Monitor processes
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:174
-msgid "lucistatistics_collectdprocesses_processes"
+msgid "Monitor processes"
 msgstr "Monitor processes"
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:175
-msgid "lucistatistics_collectdprocesses_processes_desc"
+msgid "multiple separated by space"
 msgstr "multiple separated by space"
 
 #. RRDTool Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:176
-msgid "lucistatistics_collectdrrdtool"
+msgid "RRDTool Plugin Configuration"
 msgstr "RRDTool Plugin Configuration"
 
 #. The rrdtool plugin stores the collected data in rrd database files, the foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong values will result in a very high memory consumption in the temporary directory. This can render the device unusable!</strong>
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:177
-msgid "lucistatistics_collectdrrdtool_desc"
+msgid "The rrdtool plugin stores the collected data in rrd database files, the foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong values will result in a very high memory consumption in the temporary directory. This can render the device unusable!</strong>"
 msgstr ""
 "The rrdtool plugin stores the collected data in rrd database files, the "
 "foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong "
@@ -949,176 +949,176 @@ msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:178
-msgid "lucistatistics_collectdrrdtool_enable"
+msgid "Enable this plugin"
 msgstr "Enable this plugin"
 
 #. Storage directory
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:179
-msgid "lucistatistics_collectdrrdtool_datadir"
+msgid "Storage directory"
 msgstr "Storage directory"
 
 #. RRD step interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:180
-msgid "lucistatistics_collectdrrdtool_stepsize"
+msgid "RRD step interval"
 msgstr "RRD step interval"
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:181
-msgid "lucistatistics_collectdrrdtool_stepsize_desc"
+msgid "seconds"
 msgstr "seconds"
 
 #. RRD heart beat interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:182
-msgid "lucistatistics_collectdrrdtool_heartbeat"
+msgid "RRD heart beat interval"
 msgstr "RRD heart beat interval"
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:183
-msgid "lucistatistics_collectdrrdtool_heartbeat_desc"
+msgid "seconds"
 msgstr "seconds"
 
 #. Only create average RRAs
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:184
-msgid "lucistatistics_collectdrrdtool_rrasingle"
+msgid "Only create average RRAs"
 msgstr "Only create average RRAs"
 
 #. reduces rrd size
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:185
-msgid "lucistatistics_collectdrrdtool_rrasingle_desc"
+msgid "reduces rrd size"
 msgstr "reduces rrd size"
 
 #. Stored timespans
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:186
-msgid "lucistatistics_collectdrrdtool_rratimespans"
+msgid "Stored timespans"
 msgstr "Stored timespans"
 
 #. seconds; multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:187
-msgid "lucistatistics_collectdrrdtool_rratimespans_desc"
+msgid "seconds; multiple separated by space"
 msgstr "seconds; multiple separated by space"
 
 #. Rows per RRA
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:188
-msgid "lucistatistics_collectdrrdtool_rrarows"
+msgid "Rows per RRA"
 msgstr "Rows per RRA"
 
 #. RRD XFiles Factor
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:189
-msgid "lucistatistics_collectdrrdtool_xff"
+msgid "RRD XFiles Factor"
 msgstr "RRD XFiles Factor"
 
 #. Cache collected data for
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:190
-msgid "lucistatistics_collectdrrdtool_cachetimeout"
+msgid "Cache collected data for"
 msgstr "Cache collected data for"
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:191
-msgid "lucistatistics_collectdrrdtool_cachetimeout_desc"
+msgid "seconds"
 msgstr "seconds"
 
 #. Flush cache after
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:192
-msgid "lucistatistics_collectdrrdtool_cacheflush"
+msgid "Flush cache after"
 msgstr "Flush cache after"
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:193
-msgid "lucistatistics_collectdrrdtool_cacheflush_desc"
+msgid "seconds"
 msgstr "seconds"
 
 #. TCPConns Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:194
-msgid "lucistatistics_collectdtcpconns"
+msgid "TCPConns Plugin Configuration"
 msgstr "TCPConns Plugin Configuration"
 
 #. The tcpconns plugin collects informations about open tcp connections on selected ports.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:195
-msgid "lucistatistics_collectdtcpconns_desc"
+msgid "The tcpconns plugin collects informations about open tcp connections on selected ports."
 msgstr ""
 "The tcpconns plugin collects informations about open tcp connections on "
 "selected ports."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:196
-msgid "lucistatistics_collectdtcpconns_enable"
+msgid "Enable this plugin"
 msgstr "Enable this plugin"
 
 #. Monitor all local listen ports
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:197
-msgid "lucistatistics_collectdtcpconns_listeningports"
+msgid "Monitor all local listen ports"
 msgstr "Monitor all local listen ports"
 
 #. Monitor local ports
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:198
-msgid "lucistatistics_collectdtcpconns_localports"
+msgid "Monitor local ports"
 msgstr "Monitor local ports"
 
 #. 0 - 65535; multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:199
-msgid "lucistatistics_collectdtcpconns_localports_desc"
+msgid "0 - 65535; multiple separated by space"
 msgstr "0 - 65535; multiple separated by space"
 
 #. Monitor remote ports
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:200
-msgid "lucistatistics_collectdtcpconns_remoteports"
+msgid "Monitor remote ports"
 msgstr "Monitor remote ports"
 
 #. 0 - 65535; multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:201
-msgid "lucistatistics_collectdtcpconns_remoteports_desc"
+msgid "0 - 65535; multiple separated by space"
 msgstr "0 - 65535; multiple separated by space"
 
 #. Unixsock Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:202
-msgid "lucistatistics_collectdunixsock"
+msgid "Unixsock Plugin Configuration"
 msgstr "Unixsock Plugin Configuration"
 
 #. The unixsock plugin creates a unix socket which can be used to read collected data from a running collectd instance.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:203
-msgid "lucistatistics_collectdunixsock_desc"
+msgid "The unixsock plugin creates a unix socket which can be used to read collected data from a running collectd instance."
 msgstr ""
 "The unixsock plugin creates a unix socket which can be used to read "
 "collected data from a running collectd instance."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:204
-msgid "lucistatistics_collectdunixsock_enable"
+msgid "Enable this plugin"
 msgstr "Enable this plugin"
 
 #. Filepath of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:205
-msgid "lucistatistics_collectdunixsock_socketfile"
+msgid "Filepath of the unix socket"
 msgstr "Filepath of the unix socket"
 
 #. Group ownership of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:206
-msgid "lucistatistics_collectdunixsock_socketgroup"
+msgid "Group ownership of the unix socket"
 msgstr "Group ownership of the unix socket"
 
 #. group name
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:207
-msgid "lucistatistics_collectdunixsock_socketgroup_desc"
+msgid "group name"
 msgstr "group name"
 
 #. File permissions of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:208
-msgid "lucistatistics_collectdunixsock_socketperms"
+msgid "File permissions of the unix socket"
 msgstr "File permissions of the unix socket"
 
 #. octal
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:209
-msgid "lucistatistics_collectdunixsock_socketperms_desc"
+msgid "octal"
 msgstr "octal"
 
 #. Wireless Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:210
-msgid "lucistatistics_collectdwireless"
+msgid "Wireless Plugin Configuration"
 msgstr "Wireless Plugin Configuration"
 
 #. The wireless plugin collects statistics about wireless signal strength, noise and quality.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:211
-msgid "lucistatistics_collectdwireless_desc"
+msgid "The wireless plugin collects statistics about wireless signal strength, noise and quality."
 msgstr ""
 "The wireless plugin collects statistics about wireless signal strength, "
 "noise and quality."
diff --git a/po/en/sysauth.po b/po/en/sysauth.po
index cb25cbf80..a3bae0366 100644
--- a/po/en/sysauth.po
+++ b/po/en/sysauth.po
@@ -14,12 +14,12 @@ msgstr ""
 
 #. Authorization Required
 #: i18n/english/luasrc/i18n/sysauth.en.lua:1
-msgid "sysauth_head"
+msgid "Authorization Required"
 msgstr "Authorization Required"
 
 #. Please enter your username and password.
 #: i18n/english/luasrc/i18n/sysauth.en.lua:2
-msgid "sysauth_prompt"
+msgid "Please enter your username and password."
 msgstr "Please enter your username and password."
 
 #. Invalid username and/or password! Please try again.
diff --git a/po/en/tinyproxy.po b/po/en/tinyproxy.po
index daff03767..88d72b5c5 100644
--- a/po/en/tinyproxy.po
+++ b/po/en/tinyproxy.po
@@ -14,157 +14,157 @@ msgstr ""
 
 #. Tinyproxy
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:1
-msgid "tinyproxy"
+msgid "Tinyproxy"
 msgstr "Tinyproxy"
 
 #. Tinyproxy is a small and fast non-caching HTTP(S)-Proxy
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:2
-msgid "tinyproxy_desc"
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
 msgstr "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
 
 #. Allow access from
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:3
-msgid "tinyproxy_tinyproxy_allow"
+msgid "Allow access from"
 msgstr "Allow access from"
 
 #. Allowed headers for anonymous proxy
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:4
-msgid "tinyproxy_tinyproxy_anonymous"
+msgid "Allowed headers for anonymous proxy"
 msgstr "Allowed headers for anonymous proxy"
 
 #. Bind outgoing traffic to address
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:5
-msgid "tinyproxy_tinyproxy_bind"
+msgid "Bind outgoing traffic to address"
 msgstr "Bind outgoing traffic to address"
 
 #. Ports allowed for CONNECT method
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:6
-msgid "tinyproxy_tinyproxy_connectport"
+msgid "Ports allowed for CONNECT method"
 msgstr "Ports allowed for CONNECT method"
 
 #. 0 = disabled, empty = all
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:7
-msgid "tinyproxy_tinyproxy_connectport_desc"
+msgid "0 = disabled, empty = all"
 msgstr "0 = disabled, empty = all"
 
 #. Error document
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:8
-msgid "tinyproxy_tinyproxy_defaulterrorfile"
+msgid "Error document"
 msgstr "Error document"
 
 #. Filter list
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:9
-msgid "tinyproxy_tinyproxy_filter"
+msgid "Filter list"
 msgstr "Filter list"
 
 #. Case sensitive filters
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:10
-msgid "tinyproxy_tinyproxy_filtercasesensitive"
+msgid "Case sensitive filters"
 msgstr "Case sensitive filters"
 
 #. Filter list is a whitelist
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:11
-msgid "tinyproxy_tinyproxy_filterdefaultdeny"
+msgid "Filter list is a whitelist"
 msgstr "Filter list is a whitelist"
 
 #. Extended regular expression filters
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:12
-msgid "tinyproxy_tinyproxy_filterextended"
+msgid "Extended regular expression filters"
 msgstr "Extended regular expression filters"
 
 #. Filter URLs instead of domains
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:13
-msgid "tinyproxy_tinyproxy_filterurls"
+msgid "Filter URLs instead of domains"
 msgstr "Filter URLs instead of domains"
 
 #. Listen on address
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:14
-msgid "tinyproxy_tinyproxy_listen"
+msgid "Listen on address"
 msgstr "Listen on address"
 
 #. Logfile
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:15
-msgid "tinyproxy_tinyproxy_logfile"
+msgid "Logfile"
 msgstr "Logfile"
 
 #. Log level
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:16
-msgid "tinyproxy_tinyproxy_loglevel"
+msgid "Log level"
 msgstr "Log level"
 
 #. Maximum number of clients
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:17
-msgid "tinyproxy_tinyproxy_maxclients"
+msgid "Maximum number of clients"
 msgstr "Maximum number of clients"
 
 #. Maximum requests per thread
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:18
-msgid "tinyproxy_tinyproxy_maxrequestsperchild"
+msgid "Maximum requests per thread"
 msgstr "Maximum requests per thread"
 
 #. Max. spare servers
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:19
-msgid "tinyproxy_tinyproxy_maxspareservers"
+msgid "Max. spare servers"
 msgstr "Max. spare servers"
 
 #. Min. spare servers
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:20
-msgid "tinyproxy_tinyproxy_minspareservers"
+msgid "Min. spare servers"
 msgstr "Min. spare servers"
 
 #. Spare servers to start with
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:21
-msgid "tinyproxy_tinyproxy_startservers"
+msgid "Spare servers to start with"
 msgstr "Spare servers to start with"
 
 #. Statistic document
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:22
-msgid "tinyproxy_tinyproxy_statfile"
+msgid "Statistic document"
 msgstr "Statistic document"
 
 #. Write to syslog
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:23
-msgid "tinyproxy_tinyproxy_syslog"
+msgid "Write to syslog"
 msgstr "Write to syslog"
 
 #. Connection Timeout
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:24
-msgid "tinyproxy_tinyproxy_timeout"
+msgid "Connection Timeout"
 msgstr "Connection Timeout"
 
 #. Value of Via-Header
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:25
-msgid "tinyproxy_tinyproxy_viaproxyname"
+msgid "Value of Via-Header"
 msgstr "Value of Via-Header"
 
 #. Include client IP
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:26
-msgid "tinyproxy_tinyproxy_xtinyproxy"
+msgid "Include client IP"
 msgstr "Include client IP"
 
 #. Via proxy
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:27
-msgid "tinyproxy_type_proxy"
+msgid "Via proxy"
 msgstr "Via proxy"
 
 #. Reject access
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:28
-msgid "tinyproxy_type_reject"
+msgid "Reject access"
 msgstr "Reject access"
 
 #. Upstream Control
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:29
-msgid "tinyproxy_upstream"
+msgid "Upstream Control"
 msgstr "Upstream Control"
 
 #. Target host
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:30
-msgid "tinyproxy_upstream_target"
+msgid "Target host"
 msgstr "Target host"
 
 #. Type
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:31
-msgid "tinyproxy_upstream_type"
+msgid "Type"
 msgstr "Type"
 
 #. Upstream Proxy
diff --git a/po/en/upnp.po b/po/en/upnp.po
index 630617515..61605630d 100644
--- a/po/en/upnp.po
+++ b/po/en/upnp.po
@@ -14,36 +14,36 @@ msgstr ""
 
 #. Universal Plug &amp; Play
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:1
-msgid "upnpd"
+msgid "Universal Plug & Play"
 msgstr "Universal Plug &amp; Play"
 
 #. UPNP allows clients in the local network to automatically configure the router.
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:2
-msgid "upnpd_desc"
+msgid "UPNP allows clients in the local network to automatically configure the router."
 msgstr ""
 "UPNP allows clients in the local network to automatically configure the "
 "router."
 
 #. UPNP should only be enabled if absolutely necessary as it can result in high security risks for your network.
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:3
-msgid "upnpd_config_desc"
+msgid "UPNP should only be enabled if absolutely necessary as it can result in high security risks for your network."
 msgstr ""
 "UPNP should only be enabled if absolutely necessary as it can result in high "
 "security risks for your network."
 
 #. Enable secure mode
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:4
-msgid "upnpd_config_securemode"
+msgid "Enable secure mode"
 msgstr "Enable secure mode"
 
 #. Log output
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:5
-msgid "upnpd_config_logoutput"
+msgid "Log output"
 msgstr "Log output"
 
 #. Downlink
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:6
-msgid "upnpd_config_download"
+msgid "Downlink"
 msgstr "Downlink"
 
 #. Uplink
diff --git a/po/en/ushare.po b/po/en/ushare.po
index eb20b06aa..8df345213 100644
--- a/po/en/ushare.po
+++ b/po/en/ushare.po
@@ -14,37 +14,37 @@ msgstr ""
 
 #. Content directories
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:1
-msgid "content_directories"
+msgid "Content directories"
 msgstr "Content directories"
 
 #. Disable telnet console
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:2
-msgid "disable_telnet"
+msgid "Disable telnet console"
 msgstr "Disable telnet console"
 
 #. Disable webinterface
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:3
-msgid "disable_webif"
+msgid "Disable webinterface"
 msgstr "Disable webinterface"
 
 #. Options
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:4
-msgid "options"
+msgid "Options"
 msgstr "Options"
 
 #. Servername
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:5
-msgid "servername"
+msgid "Servername"
 msgstr "Servername"
 
 #. Settings
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:6
-msgid "settings"
+msgid "Settings"
 msgstr "Settings"
 
 #. uShare
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:7
-msgid "ushare"
+msgid "uShare"
 msgstr "uShare"
 
 #. uShare
diff --git a/po/en/uvc_streamer.po b/po/en/uvc_streamer.po
index f3c16a606..8f071f0c0 100644
--- a/po/en/uvc_streamer.po
+++ b/po/en/uvc_streamer.po
@@ -14,22 +14,22 @@ msgstr ""
 
 #. Frames per second
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
-msgid "framespersecond"
+msgid "Frames per second"
 msgstr "Frames per second"
 
 #. Resolution
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
-msgid "resolution"
+msgid "Resolution"
 msgstr "Resolution"
 
 #. Settings
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
-msgid "settings"
+msgid "Settings"
 msgstr "Settings"
 
 #. Webcam streaming
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
-msgid "uvc_streamer"
+msgid "Webcam streaming"
 msgstr "Webcam streaming"
 
 #. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
diff --git a/po/en/uvl.po b/po/en/uvl.po
index 0b4fc14ee..027edb674 100644
--- a/po/en/uvl.po
+++ b/po/en/uvl.po
@@ -14,212 +14,212 @@ msgstr ""
 
 #. Unable to load config \"%p\": %1
 #: libs/uvl/luasrc/i18n/uvl.en.lua:1
-msgid "uvl_err_uciload"
+msgid "Unable to load config \"%p\": %1"
 msgstr "Unable to load config \"%p\": %1"
 
 #. Error in scheme \"%p\":\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:2
-msgid "uvl_err_scheme"
+msgid "Error in scheme \"%p\":\\n%c"
 msgstr ""
 "Error in scheme \"%p\":\n"
 "%c"
 
 #. Error in config \"%p\":\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:3
-msgid "uvl_err_config"
+msgid "Error in config \"%p\":\\n%c"
 msgstr ""
 "Error in config \"%p\":\n"
 "%c"
 
 #. Error in section \"%i\" (%I):\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:4
-msgid "uvl_err_section"
+msgid "Error in section \"%i\" (%I):\\n%c"
 msgstr ""
 "Error in section \"%i\" (%I):\n"
 "%c"
 
 #. Error in option \"%i\" (%I):\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:5
-msgid "uvl_err_option"
+msgid "Error in option \"%i\" (%I):\\n%c"
 msgstr ""
 "Error in option \"%i\" (%I):\n"
 "%c"
 
 #. Option \"%i\" has invalid reference specification %1:\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:6
-msgid "uvl_err_reference"
+msgid "Option \"%i\" has invalid reference specification %1:\\n%c"
 msgstr ""
 "Option \"%i\" has invalid reference specification %1:\n"
 "%c"
 
 #. In dependency check for %t \"%i\":\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:7
-msgid "uvl_err_dependency"
+msgid "In dependency check for %t \"%i\":\\n%c"
 msgstr ""
 "In dependency check for %t \"%i\":\n"
 "%c"
 
 #. Can not find scheme \"%p\" in \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:8
-msgid "uvl_err_sme_find"
+msgid "Can not find scheme \"%p\" in \"%1\""
 msgstr "Can not find scheme \"%p\" in \"%1\""
 
 #. Can not access file \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:9
-msgid "uvl_err_sme_read"
+msgid "Can not access file \"%1\""
 msgstr "Can not access file \"%1\""
 
 #. Missing required scheme field \"%1\" in \"%i\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:10
-msgid "uvl_err_sme_reqfld"
+msgid "Missing required scheme field \"%1\" in \"%i\""
 msgstr "Missing required scheme field \"%1\" in \"%i\""
 
 #. Illegal reference \"%1\" to an anonymous section
 #: libs/uvl/luasrc/i18n/uvl.en.lua:11
-msgid "uvl_err_sme_invref"
+msgid "Illegal reference \"%1\" to an anonymous section"
 msgstr "Illegal reference \"%1\" to an anonymous section"
 
 #. Malformed reference in \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:12
-msgid "uvl_err_sme_badref"
+msgid "Malformed reference in \"%1\""
 msgstr "Malformed reference in \"%1\""
 
 #. Malformed dependency specification \"%1\" in \"%i\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:13
-msgid "uvl_err_sme_baddep"
+msgid "Malformed dependency specification \"%1\" in \"%i\""
 msgstr "Malformed dependency specification \"%1\" in \"%i\""
 
 #. Malformed validator specification \"%1\" in \"%i\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:14
-msgid "uvl_err_sme_badval"
+msgid "Malformed validator specification \"%1\" in \"%i\""
 msgstr "Malformed validator specification \"%1\" in \"%i\""
 
 #. External validator \"%1\" failed: %2
 #: libs/uvl/luasrc/i18n/uvl.en.lua:15
-msgid "uvl_err_sme_errval"
+msgid "External validator \"%1\" failed: %2"
 msgstr "External validator \"%1\" failed: %2"
 
 #. Variable \"%o\" in scheme \"%p\" references unknown package \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:16
-msgid "uvl_err_sme_vbadpack"
+msgid "Variable \"%o\" in scheme \"%p\" references unknown package \"%1\""
 msgstr "Variable \"%o\" in scheme \"%p\" references unknown package \"%1\""
 
 #. Variable \"%o\" in scheme \"%p\" references unknown section \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:17
-msgid "uvl_err_sme_vbadsect"
+msgid "Variable \"%o\" in scheme \"%p\" references unknown section \"%1\""
 msgstr "Variable \"%o\" in scheme \"%p\" references unknown section \"%1\""
 
 #. Enum \"%v\" in scheme \"%p\" references unknown package \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:18
-msgid "uvl_err_sme_ebadpack"
+msgid "Enum \"%v\" in scheme \"%p\" references unknown package \"%1\""
 msgstr "Enum \"%v\" in scheme \"%p\" references unknown package \"%1\""
 
 #. Enum \"%v\" in scheme \"%p\" references unknown section \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:19
-msgid "uvl_err_sme_ebadsect"
+msgid "Enum \"%v\" in scheme \"%p\" references unknown section \"%1\""
 msgstr "Enum \"%v\" in scheme \"%p\" references unknown section \"%1\""
 
 #. Enum \"%v\" in scheme \"%p\" references unknown option \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:20
-msgid "uvl_err_sme_ebadopt"
+msgid "Enum \"%v\" in scheme \"%p\" references unknown option \"%1\""
 msgstr "Enum \"%v\" in scheme \"%p\" references unknown option \"%1\""
 
 #. Enum \"%v\" in scheme \"%p\" references non-enum option \"%p.%s.%o\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:21
-msgid "uvl_err_sme_ebadtype"
+msgid "Enum \"%v\" in scheme \"%p\" references non-enum option \"%p.%s.%o\""
 msgstr "Enum \"%v\" in scheme \"%p\" references non-enum option \"%p.%s.%o\""
 
 #. Enum \"%v\" in scheme \"%p\" redeclares the default value of \"%p.%s.%o\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:22
-msgid "uvl_err_sme_ebaddef"
+msgid "Enum \"%v\" in scheme \"%p\" redeclares the default value of \"%p.%s.%o\""
 msgstr "Enum \"%v\" in scheme \"%p\" redeclares the default value of \"%p.%s.%o\""
 
 #. Section \"%i\" (%I) not found in scheme
 #: libs/uvl/luasrc/i18n/uvl.en.lua:23
-msgid "uvl_err_sect_unknown"
+msgid "Section \"%i\" (%I) not found in scheme"
 msgstr "Section \"%i\" (%I) not found in scheme"
 
 #. Required section \"%p.%s\" not found in config
 #: libs/uvl/luasrc/i18n/uvl.en.lua:24
-msgid "uvl_err_sect_required"
+msgid "Required section \"%p.%s\" not found in config"
 msgstr "Required section \"%p.%s\" not found in config"
 
 #. Unique section \"%p.%s\" occurs multiple times in config
 #: libs/uvl/luasrc/i18n/uvl.en.lua:25
-msgid "uvl_err_sect_unique"
+msgid "Unique section \"%p.%s\" occurs multiple times in config"
 msgstr "Unique section \"%p.%s\" occurs multiple times in config"
 
 #. The section of type \"%p.%s\" is stored anonymously in config but must be named
 #: libs/uvl/luasrc/i18n/uvl.en.lua:26
-msgid "uvl_err_sect_named"
+msgid "The section of type \"%p.%s\" is stored anonymously in config but must be named"
 msgstr ""
 "The section of type \"%p.%s\" is stored anonymously in config but must be "
 "named"
 
 #. Section \"%p.%s\" not found in config
 #: libs/uvl/luasrc/i18n/uvl.en.lua:27
-msgid "uvl_err_sect_notfound"
+msgid "Section \"%p.%s\" not found in config"
 msgstr "Section \"%p.%s\" not found in config"
 
 #. Option \"%i\" (%I) not found in scheme
 #: libs/uvl/luasrc/i18n/uvl.en.lua:28
-msgid "uvl_err_opt_unknown"
+msgid "Option \"%i\" (%I) not found in scheme"
 msgstr "Option \"%i\" (%I) not found in scheme"
 
 #. Required option \"%i\" has no value
 #: libs/uvl/luasrc/i18n/uvl.en.lua:29
-msgid "uvl_err_opt_required"
+msgid "Required option \"%i\" has no value"
 msgstr "Required option \"%i\" has no value"
 
 #. Value \"%1\" of option \"%i\" is not defined in enum %2
 #: libs/uvl/luasrc/i18n/uvl.en.lua:30
-msgid "uvl_err_opt_badvalue"
+msgid "Value \"%1\" of option \"%i\" is not defined in enum %2"
 msgstr "Value \"%1\" of option \"%i\" is not defined in enum %2"
 
 #. Value \"%1\" of option \"%i\" does not validate as datatype \"%2\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:31
-msgid "uvl_err_opt_invvalue"
+msgid "Value \"%1\" of option \"%i\" does not validate as datatype \"%2\""
 msgstr "Value \"%1\" of option \"%i\" does not validate as datatype \"%2\""
 
 #. Option \"%i\" is defined as list but stored as plain value
 #: libs/uvl/luasrc/i18n/uvl.en.lua:32
-msgid "uvl_err_opt_notlist"
+msgid "Option \"%i\" is defined as list but stored as plain value"
 msgstr "Option \"%i\" is defined as list but stored as plain value"
 
 #. Option \"%i\" has unknown datatype \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:33
-msgid "uvl_err_opt_datatype"
+msgid "Option \"%i\" has unknown datatype \"%1\""
 msgstr "Option \"%i\" has unknown datatype \"%1\""
 
 #. Option \"%p.%s.%o\" not found in config
 #: libs/uvl/luasrc/i18n/uvl.en.lua:34
-msgid "uvl_err_opt_notfound"
+msgid "Option \"%p.%s.%o\" not found in config"
 msgstr "Option \"%p.%s.%o\" not found in config"
 
 #. Dependency (%1) failed:\noption \"%i\" is not eqal \"%2\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:35
-msgid "uvl_err_dep_notequal"
+msgid "Dependency (%1) failed:\\noption \"%i\" is not eqal \"%2\""
 msgstr ""
 "Dependency (%1) failed:\n"
 "option \"%i\" is not eqal \"%2\""
 
 #. Dependency (%1) failed:\noption \"%i\" has no value
 #: libs/uvl/luasrc/i18n/uvl.en.lua:36
-msgid "uvl_err_dep_novalue"
+msgid "Dependency (%1) failed:\\noption \"%i\" has no value"
 msgstr ""
 "Dependency (%1) failed:\n"
 "option \"%i\" has no value"
 
 #. Dependency (%1) failed:\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:37
-msgid "uvl_err_dep_notvalid"
+msgid "Dependency (%1) failed:\\n%c"
 msgstr ""
 "Dependency (%1) failed:\n"
 "%c"
 
 #. Recursive dependency for option \"%i\" detected
 #: libs/uvl/luasrc/i18n/uvl.en.lua:38
-msgid "uvl_err_dep_recursive"
+msgid "Recursive dependency for option \"%i\" detected"
 msgstr "Recursive dependency for option \"%i\" detected"
 
 #. In dependency check for enum value \"%i\":\n%c
diff --git a/po/en/voice_core.po b/po/en/voice_core.po
index 9da4b411a..6ffdbcc08 100644
--- a/po/en/voice_core.po
+++ b/po/en/voice_core.po
@@ -14,14 +14,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Voice
-msgid "l_v_adminvoice"
+msgid "Voice"
 msgstr "Voice"
 
 #. Voice
-msgid "l_v_minivoice"
+msgid "Voice"
 msgstr "Voice"
 
-msgid "l_v_miniphones"
+msgid "Phones"
 msgstr "Phones"
 
 msgid "l_v_adminphones"
diff --git a/po/en/voice_diag.po b/po/en/voice_diag.po
index d14aee58a..87ea3a3d0 100644
--- a/po/en/voice_diag.po
+++ b/po/en/voice_diag.po
@@ -13,15 +13,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-msgid "l_v_d_di_voicediag"
+msgid "Diagnostics"
 msgstr "Diagnostics"
 
-msgid "l_v_d_di_voicediag1"
+msgid "Under this menu are options that allow you to configure and perform tests on the voice operations of your system. These are known as diagnostics."
 msgstr ""
 "Under this menu are options that allow you to configure and perform tests on "
 "the voice operations of your system.  These are known as diagnostics."
 
-msgid "l_v_d_di_voicediag2"
+msgid "The diagnostics available on your device depend on the modules that you have installed."
 msgstr ""
 "The diagnostics available on your device depend on the modules that you have "
 "installed."
diff --git a/po/en/wifi.po b/po/en/wifi.po
index df9b040d9..f307f081d 100644
--- a/po/en/wifi.po
+++ b/po/en/wifi.po
@@ -13,192 +13,192 @@ msgstr ""
 
 #. auto
 #: i18n/english/luasrc/i18n/wifi.en.lua:1
-msgid "wifi_auto"
+msgid "auto"
 msgstr "auto"
 
 #. Frequency Hopping
 #: i18n/english/luasrc/i18n/wifi.en.lua:2
-msgid "wifi_fh"
+msgid "Frequency Hopping"
 msgstr "Frequency Hopping"
 
 #. Diversity
 #: i18n/english/luasrc/i18n/wifi.en.lua:3
-msgid "wifi_diversity"
+msgid "Diversity"
 msgstr "Diversity"
 
 #. Transmitter Antenna
 #: i18n/english/luasrc/i18n/wifi.en.lua:4
-msgid "wifi_txantenna"
+msgid "Transmitter Antenna"
 msgstr "Transmitter Antenna"
 
 #. Receiver Antenna
 #: i18n/english/luasrc/i18n/wifi.en.lua:5
-msgid "wifi_rxantenna"
+msgid "Receiver Antenna"
 msgstr "Receiver Antenna"
 
 #. Distance Optimization
 #: i18n/english/luasrc/i18n/wifi.en.lua:6
-msgid "wifi_distance"
+msgid "Distance Optimization"
 msgstr "Distance Optimization"
 
 #. Distance to farthest network member in meters.
 #: i18n/english/luasrc/i18n/wifi.en.lua:7
-msgid "wifi_distance_desc"
+msgid "Distance to farthest network member in meters."
 msgstr "Distance to farthest network member in meters."
 
 #. MAC-Address Filter
 #: i18n/english/luasrc/i18n/wifi.en.lua:8
-msgid "wifi_macpolicy"
+msgid "MAC-Address Filter"
 msgstr "MAC-Address Filter"
 
 #. Allow listed only
 #: i18n/english/luasrc/i18n/wifi.en.lua:9
-msgid "wifi_whitelist"
+msgid "Allow listed only"
 msgstr "Allow listed only"
 
 #. Allow all except listed
 #: i18n/english/luasrc/i18n/wifi.en.lua:10
-msgid "wifi_blacklist"
+msgid "Allow all except listed"
 msgstr "Allow all except listed"
 
 #. MAC-List
 #: i18n/english/luasrc/i18n/wifi.en.lua:11
-msgid "wifi_maclist"
+msgid "MAC-List"
 msgstr "MAC-List"
 
 #. Frame Bursting
 #: i18n/english/luasrc/i18n/wifi.en.lua:12
-msgid "wifi_bursting"
+msgid "Frame Bursting"
 msgstr "Frame Bursting"
 
 #. Regulatory Domain
 #: i18n/english/luasrc/i18n/wifi.en.lua:13
-msgid "wifi_regdomain"
+msgid "Regulatory Domain"
 msgstr "Regulatory Domain"
 
 #. Country Code
 #: i18n/english/luasrc/i18n/wifi.en.lua:14
-msgid "wifi_country"
+msgid "Country Code"
 msgstr "Country Code"
 
 #. Outdoor Channels
 #: i18n/english/luasrc/i18n/wifi.en.lua:15
-msgid "wifi_outdoor"
+msgid "Outdoor Channels"
 msgstr "Outdoor Channels"
 
 #. Connection Limit
 #: i18n/english/luasrc/i18n/wifi.en.lua:16
-msgid "wifi_maxassoc"
+msgid "Connection Limit"
 msgstr "Connection Limit"
 
 #. <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:17
-msgid "wifi_essid"
+msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
 #. <abbr title=\"Basic Service Set Identifier\">BSSID</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:18
-msgid "wifi_bssid"
+msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 
 #. Fragmentation Threshold
 #: i18n/english/luasrc/i18n/wifi.en.lua:19
-msgid "wifi_frag"
+msgid "Fragmentation Threshold"
 msgstr "Fragmentation Threshold"
 
 #. RTS/CTS Threshold
 #: i18n/english/luasrc/i18n/wifi.en.lua:20
-msgid "wifi_rts"
+msgid "RTS/CTS Threshold"
 msgstr "RTS/CTS Threshold"
 
 #. <abbr title=\"Wireless Distribution System\">WDS</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:21
-msgid "wifi_wds"
+msgid "<abbr title=\"Wireless Distribution System\">WDS</abbr>"
 msgstr "<abbr title=\"Wireless Distribution System\">WDS</abbr>"
 
 #. Separate WDS
 #: i18n/english/luasrc/i18n/wifi.en.lua:22
-msgid "wifi_wdssep"
+msgid "Separate WDS"
 msgstr "Separate WDS"
 
 #. Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:23
-msgid "wifi_hidden"
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
 #. Isolate Clients
 #: i18n/english/luasrc/i18n/wifi.en.lua:24
-msgid "wifi_isloate"
+msgid "Isolate Clients"
 msgstr "Isolate Clients"
 
 #. Prevent Client to Client Communication
 #: i18n/english/luasrc/i18n/wifi.en.lua:25
-msgid "wifi_isloate_desc"
+msgid "Prevent Client to Client Communication"
 msgstr "Prevent Client to Client Communication"
 
 #. Background Scan
 #: i18n/english/luasrc/i18n/wifi.en.lua:26
-msgid "wifi_bgscan"
+msgid "Background Scan"
 msgstr "Background Scan"
 
 #. Transmission Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:27
-msgid "wifi_rate"
+msgid "Transmission Rate"
 msgstr "Transmission Rate"
 
 #. Multicast Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:28
-msgid "wifi_mcast_rate"
+msgid "Multicast Rate"
 msgstr "Multicast Rate"
 
 #. Minimum Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:29
-msgid "wifi_minrate"
+msgid "Minimum Rate"
 msgstr "Minimum Rate"
 
 #. Maximum Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:30
-msgid "wifi_maxrate"
+msgid "Maximum Rate"
 msgstr "Maximum Rate"
 
 #. Compression
 #: i18n/english/luasrc/i18n/wifi.en.lua:31
-msgid "wifi_compression"
+msgid "Compression"
 msgstr "Compression"
 
 #. Turbo Mode
 #: i18n/english/luasrc/i18n/wifi.en.lua:32
-msgid "wifi_turbo"
+msgid "Turbo Mode"
 msgstr "Turbo Mode"
 
 #. Fast Frames
 #: i18n/english/luasrc/i18n/wifi.en.lua:33
-msgid "wifi_ff"
+msgid "Fast Frames"
 msgstr "Fast Frames"
 
 #. WMM Mode
 #: i18n/english/luasrc/i18n/wifi.en.lua:34
-msgid "wifi_wmm"
+msgid "WMM Mode"
 msgstr "WMM Mode"
 
 #. XR Support
 #: i18n/english/luasrc/i18n/wifi.en.lua:35
-msgid "wifi_xr"
+msgid "XR Support"
 msgstr "XR Support"
 
 #. AR Support
 #: i18n/english/luasrc/i18n/wifi.en.lua:36
-msgid "wifi_ar"
+msgid "AR Support"
 msgstr "AR Support"
 
 #. Disable HW-Beacon timer
 #: i18n/english/luasrc/i18n/wifi.en.lua:37
-msgid "wifi_nosbeacon"
+msgid "Disable HW-Beacon timer"
 msgstr "Disable HW-Beacon timer"
 
 #. Do not send probe responses
 #: i18n/english/luasrc/i18n/wifi.en.lua:38
-msgid "wifi_noprobereq"
+msgid "Do not send probe responses"
 msgstr "Do not send probe responses"
 
 #. WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP and ad-hoc mode) to be installed.
diff --git a/po/es/admin-core.po b/po/es/admin-core.po
index c719436da..5ebb9bb25 100644
--- a/po/es/admin-core.po
+++ b/po/es/admin-core.po
@@ -13,22 +13,22 @@ msgstr ""
 
 #. The following changes have been applied
 #: i18n/english/luasrc/i18n/admin-core.en.lua:1
-msgid "uci_applied"
+msgid "The following changes have been applied"
 msgstr "Los siguientes cambios se han aplicado"
 
 #. The following changes have been reverted
 #: i18n/english/luasrc/i18n/admin-core.en.lua:2
-msgid "uci_reverted"
+msgid "The following changes have been reverted"
 msgstr "Los siguientes cambios han sido revertidos"
 
 #. User Interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:3
-msgid "a_i_ui"
+msgid "User Interface"
 msgstr "Interfaz de usuario"
 
 #. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a collection of free Lua software including an <abbr title=\"Model-View-Controller\">MVC</abbr>-Webframework and webinterface for embedded devices. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is licensed under the Apache-License.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:4
-msgid "c_lucidesc"
+msgid "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a collection of free Lua software including an <abbr title=\"Model-View-Controller\">MVC</abbr>-Webframework and webinterface for embedded devices. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is licensed under the Apache-License."
 msgstr ""
 "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> es una colección libre "
 "de software Lua incluyendo un <abbr title=\"Model-View-"
@@ -38,40 +38,40 @@ msgstr ""
 
 #. Project Homepage
 #: i18n/english/luasrc/i18n/admin-core.en.lua:5
-msgid "c_projecthome"
+msgid "Project Homepage"
 msgstr "Página del proyecto "
 
 #. Lead Development
 #: i18n/english/luasrc/i18n/admin-core.en.lua:6
-msgid "c_leaddev"
+msgid "Lead Development"
 msgstr "Lider del desarrollo"
 
 #. Contributing Developers
 #: i18n/english/luasrc/i18n/admin-core.en.lua:7
-msgid "c_contributors"
+msgid "Contributing Developers"
 msgstr "Desarrolladores que contribuyen"
 
 # Thanks to --> Gracias a -> Agradecemientos --> Agregadecemos a
 #. Thanks To
 #: i18n/english/luasrc/i18n/admin-core.en.lua:8
-msgid "c_thanksto"
+msgid "Thanks To"
 msgstr "Agregadecemos a"
 
 #. Hello!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:9
-msgid "a_i_i_hello"
+msgid "Hello!"
 msgstr "Hola !"
 
 #. This is the administration area of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:10
-msgid "a_i_i_admin1"
+msgid "This is the administration area of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>."
 msgstr ""
 "Éste es el área de administración de <abbr title=\"Lua Configuration "
 "Interface\">LuCI</abbr>."
 
 #. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a free, flexible, and user friendly graphical interface for configuring OpenWrt Kamikaze.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:11
-msgid "a_i_i_admin2"
+msgid "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a free, flexible, and user friendly graphical interface for configuring OpenWrt Kamikaze."
 msgstr ""
 "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> interfaz gráfica "
 "libre, flexible y amigable para configurar la distro OpenWrt (Kamikaze) y "
@@ -79,14 +79,14 @@ msgstr ""
 
 #. On the following pages you can adjust all important settings of your router.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:12
-msgid "a_i_i_admin3"
+msgid "On the following pages you can adjust all important settings of your router."
 msgstr ""
 "En las páginas siguientes puede realizar todos los ajustes importantes de su "
 "router."
 
 #. Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> changes have to be confirmed by clicking Changes - Save &amp; Apply before being applied.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:13
-msgid "a_i_i_admin4"
+msgid "Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> changes have to be confirmed by clicking Changes - Save & Apply before being applied."
 msgstr ""
 "Aviso: En <abbr title=\"Lua Configuration Interface\">LuCI</abbr> los cambios "
 "deben ser confirmados haciendo clic en \"Cambios\" y luego en \"Guardar "
@@ -94,36 +94,36 @@ msgstr ""
 
 #. As we always want to improve this interface we are looking forward to your feedback and suggestions.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:14
-msgid "a_i_i_admin5"
+msgid "As we always want to improve this interface we are looking forward to your feedback and suggestions."
 msgstr ""
 "Como siempre queremos mejorar esta interfaz estamos esperando con interés "
 "sus comentarios y sugerencias. "
 
 #. And now have fun with your router!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:15
-msgid "a_i_i_admin6"
+msgid "And now have fun with your router!"
 msgstr "Y ahora disfrute su router!"
 
 #. The <abbr title=\"Lua Configuration Interface\">LuCI</abbr> Team
 #: i18n/english/luasrc/i18n/admin-core.en.lua:16
-msgid "a_i_i_team"
+msgid "The <abbr title=\"Lua Configuration Interface\">LuCI</abbr> Team"
 msgstr "El grupo de <abbr title=\"Lua Configuration Interface\">LuCI</abbr>"
 
 #. Here you can customize the settings and the functionality of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:17
-msgid "a_i_luci1"
+msgid "Here you can customize the settings and the functionality of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>."
 msgstr ""
 "Aquí puede personalizar las configuraciones y funcionalidad de <abbr "
 "title=\"Lua Configuration Interface\">LuCI</abbr>."
 
 #. Post-commit actions
 #: i18n/english/luasrc/i18n/admin-core.en.lua:18
-msgid "a_i_ucicommit"
+msgid "Post-commit actions"
 msgstr "Acciones luego de \"Post-commit\""
 
 #. These commands will be executed automatically when a given <abbr title=\"Unified Configuration Interface\">UCI</abbr> configuration is committed allowing changes to be applied instantly.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:19
-msgid "a_i_ucicommit1"
+msgid "These commands will be executed automatically when a given <abbr title=\"Unified Configuration Interface\">UCI</abbr> configuration is committed allowing changes to be applied instantly."
 msgstr ""
 "Estos comandos se ejecutan automáticamente cuando una determinada "
 "configuración de la <abbr title=\"Unified configuración Interface\"> UCI </ "
@@ -131,12 +131,12 @@ msgstr ""
 
 #. Files to be kept when flashing a new firmware
 #: i18n/english/luasrc/i18n/admin-core.en.lua:20
-msgid "a_i_keepflash"
+msgid "Files to be kept when flashing a new firmware"
 msgstr "Archivos que serán protegidos cuando un nuevo firmware es instalado"
 
 #. When flashing a new firmware with <abbr title=\"Lua Configuration Interface\">LuCI</abbr> these files will be added to the new firmware installation.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:21
-msgid "a_i_keepflash1"
+msgid "When flashing a new firmware with <abbr title=\"Lua Configuration Interface\">LuCI</abbr> these files will be added to the new firmware installation."
 msgstr ""
 "Cuando un nuevo firmware ha sido instalado con <abbr title=\"Lua "
 "Configuration Interface\">LuCI</abbr> estos archivos serán agregados a la "
@@ -144,7 +144,7 @@ msgstr ""
 
 #. Here you can find information about the current system status like <abbr title=\"Central Processing Unit\">CPU</abbr> clock frequency, memory usage or network interface data.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:22
-msgid "a_st_i_status1"
+msgid "Here you can find information about the current system status like <abbr title=\"Central Processing Unit\">CPU</abbr> clock frequency, memory usage or network interface data."
 msgstr ""
 "Aquí pude encontrar información acerca del estado actual del sistema como la "
 "frecuencia del reloj de la <abbr title=\"Central Processing Unit\">CPU</abbr> "
@@ -152,585 +152,585 @@ msgstr ""
 
 #. Also kernel or service logfiles can be viewed here to get an overview over their current state.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:23
-msgid "a_st_i_status2"
+msgid "Also kernel or service logfiles can be viewed here to get an overview over their current state."
 msgstr ""
 "También los archivos de registro del núcleo (kernel) o servicio se pueden "
 "ver aquí para obtener una visión general sobre su estado actual."
 
 #. <abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan
 #: i18n/english/luasrc/i18n/admin-core.en.lua:24
-msgid "iwscan"
+msgid "<abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan"
 msgstr "<abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan"
 
 #. Wifi networks in your local environment
 #: i18n/english/luasrc/i18n/admin-core.en.lua:25
-msgid "iwscan1"
+msgid "Wifi networks in your local environment"
 msgstr "Redes inalámbricas en un entorno local"
 
 #. <abbr title=\"Encrypted\">Encr.</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:26
-msgid "iwscan_encr"
+msgid "<abbr title=\"Encrypted\">Encr.</abbr>"
 msgstr "<abbr title=\"Encrypted\">Encr.</abbr>"
 
 #. Link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:27
-msgid "iwscan_link"
+msgid "Link"
 msgstr "Enlace"
 
 #. Signal
 #: i18n/english/luasrc/i18n/admin-core.en.lua:28
-msgid "iwscan_signal"
+msgid "Signal"
 msgstr "Señal"
 
 #. Noise
 #: i18n/english/luasrc/i18n/admin-core.en.lua:29
-msgid "iwscan_noise"
+msgid "Noise"
 msgstr "Ruido"
 
 #. Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:30
-msgid "routes"
+msgid "Routes"
 msgstr "Rutas"
 
 #. Netmask
 #: i18n/english/luasrc/i18n/admin-core.en.lua:31
-msgid "routes_netmask"
+msgid "Netmask"
 msgstr "Mascara de red"
 
 #. Gateway
 #: i18n/english/luasrc/i18n/admin-core.en.lua:32
-msgid "routes_gateway"
+msgid "Gateway"
 msgstr "Puerta de enlace"
 
 #. Metric
 #: i18n/english/luasrc/i18n/admin-core.en.lua:33
-msgid "routes_metric"
+msgid "Metric"
 msgstr "Métrica"
 
 #. Here you can configure the basic aspects of your device like its hostname or the timezone.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:34
-msgid "a_s_desc"
+msgid "Here you can configure the basic aspects of your device like its hostname or the timezone."
 msgstr ""
 "Aquí puede configurar los aspectos básico de su dispositivo como su zona "
 "horaria o hombre de host."
 
 #. Software
 #: i18n/english/luasrc/i18n/admin-core.en.lua:35
-msgid "a_s_packages"
+msgid "Software"
 msgstr "Software"
 
 #. Admin Password
 #: i18n/english/luasrc/i18n/admin-core.en.lua:36
-msgid "a_s_changepw"
+msgid "Admin Password"
 msgstr "Contraseña de Admin"
 
 #. OPKG-Configuration
 #: i18n/english/luasrc/i18n/admin-core.en.lua:37
-msgid "a_s_p_ipkg"
+msgid "OPKG-Configuration"
 msgstr "Configuración de OPKG"
 
 #. <abbr title=\"Secure Shell\">SSH</abbr>-Keys
 #: i18n/english/luasrc/i18n/admin-core.en.lua:38
-msgid "a_s_sshkeys"
+msgid "<abbr title=\"Secure Shell\">SSH</abbr>-Keys"
 msgstr "<abbr title=\"Secure Shell\">SSH</abbr>-Keys"
 
 #. Mount Points
 #: i18n/english/luasrc/i18n/admin-core.en.lua:39
-msgid "a_s_fstab"
+msgid "Mount Points"
 msgstr "Puntos de montaje"
 
 #. Change settings related to the system itself, its identification, installed hard- and software, authentication or mount points.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:40
-msgid "a_s_i_system1"
+msgid "Change settings related to the system itself, its identification, installed hard- and software, authentication or mount points."
 msgstr ""
 "Cambiar los ajustes relacionados con el sistema en sí, su identificación, "
 "hardware y software instalado, la autenticación o los puntos de montaje."
 
 #. These settings define the base of your system.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:41
-msgid "a_s_i_system2"
+msgid "These settings define the base of your system."
 msgstr "Estos valores definen la base de su sistema."
 
 #. Pay attention as any misconfiguration here may prevent your device from booting or may lock yourself out of it.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:42
-msgid "a_s_i_system3"
+msgid "Pay attention as any misconfiguration here may prevent your device from booting or may lock yourself out of it."
 msgstr ""
 "Preste atención ya que cualquier mala configuración aqui'puede evitar que su "
 "dispositivo se inicie o quede bloqueado permanentemente para su uso."
 
 #. Interfaces
 #: i18n/english/luasrc/i18n/admin-core.en.lua:43
-msgid "a_s_if"
+msgid "Interfaces"
 msgstr "Interfaces"
 
 #. Bridge
 #: i18n/english/luasrc/i18n/admin-core.en.lua:44
-msgid "a_s_if_bridge"
+msgid "Bridge"
 msgstr "Puente"
 
 #. ID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:45
-msgid "a_s_if_bridge_id"
+msgid "ID"
 msgstr "ID"
 
 #. Bridge Port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:46
-msgid "a_s_if_bridge_port"
+msgid "Bridge Port"
 msgstr "Puerto del puente"
 
 #. STP
 #: i18n/english/luasrc/i18n/admin-core.en.lua:47
-msgid "a_s_if_bridge_stp"
+msgid "STP"
 msgstr "STP"
 
 #. Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:48
-msgid "a_s_if_device"
+msgid "Device"
 msgstr "Dispositivo"
 
 #. Ethernet Bridge
 #: i18n/english/luasrc/i18n/admin-core.en.lua:49
-msgid "a_s_if_ethbridge"
+msgid "Ethernet Bridge"
 msgstr "Puente ethernet"
 
 #. Ethernet Adapter
 #: i18n/english/luasrc/i18n/admin-core.en.lua:50
-msgid "a_s_if_ethdev"
+msgid "Ethernet Adapter"
 msgstr "Adaptador ethernet"
 
 #. Ethernet Switch
 #: i18n/english/luasrc/i18n/admin-core.en.lua:51
-msgid "a_s_if_ethswitch"
+msgid "Ethernet Switch"
 msgstr "Switch ethernet"
 
 #. Interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:52
-msgid "a_s_if_interface"
+msgid "Interface"
 msgstr "Interfaz"
 
 #. IP Configuration
 #: i18n/english/luasrc/i18n/admin-core.en.lua:53
-msgid "a_s_if_ipconfig"
+msgid "IP Configuration"
 msgstr "Configuración IP"
 
 #. Alias
 #: i18n/english/luasrc/i18n/admin-core.en.lua:54
-msgid "a_s_if_ipconfig_alias"
+msgid "Alias"
 msgstr "Alias"
 
 #. DHCP assigned
 #: i18n/english/luasrc/i18n/admin-core.en.lua:55
-msgid "a_s_if_ipconfig_dhcp"
+msgid "DHCP assigned"
 msgstr "DHCP asignado"
 
 #. IPv6
 #: i18n/english/luasrc/i18n/admin-core.en.lua:56
-msgid "a_s_if_ipconfig_ipv6"
+msgid "IPv6"
 msgstr "IPv6"
 
 #. Not configured
 #: i18n/english/luasrc/i18n/admin-core.en.lua:57
-msgid "a_s_if_ipconfig_none"
+msgid "Not configured"
 msgstr "No configurado"
 
 #. Primary
 #: i18n/english/luasrc/i18n/admin-core.en.lua:58
-msgid "a_s_if_ipconfig_primary"
+msgid "Primary"
 msgstr "Primario"
 
 #. Channel
 #: i18n/english/luasrc/i18n/admin-core.en.lua:59
-msgid "a_s_if_iwchannel"
+msgid "Channel"
 msgstr "Canal"
 
 #. Mode
 #: i18n/english/luasrc/i18n/admin-core.en.lua:60
-msgid "a_s_if_iwmode"
+msgid "Mode"
 msgstr "Modo"
 
 #. Ad-Hoc
 #: i18n/english/luasrc/i18n/admin-core.en.lua:61
-msgid "a_s_if_iwmode_adhoc"
+msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
 #. Pseudo Ad-Hoc
 #: i18n/english/luasrc/i18n/admin-core.en.lua:62
-msgid "a_s_if_iwmode_ahdemo"
+msgid "Pseudo Ad-Hoc"
 msgstr "Pseudo Ad-Hoc"
 
 #. Master
 #: i18n/english/luasrc/i18n/admin-core.en.lua:63
-msgid "a_s_if_iwmode_ap"
+msgid "Master"
 msgstr "Master"
 
 #. Master + WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:64
-msgid "a_s_if_iwmode_apwds"
+msgid "Master + WDS"
 msgstr "Master + WDS"
 
 #. Client
 #: i18n/english/luasrc/i18n/admin-core.en.lua:65
-msgid "a_s_if_iwmode_sta"
+msgid "Client"
 msgstr "Cliente"
 
 #. Client + WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:66
-msgid "a_s_if_iwmode_stawds"
+msgid "Client + WDS"
 msgstr "Cliente + WDS"
 
 #. WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:67
-msgid "a_s_if_iwmode_wds"
+msgid "WDS"
 msgstr "WDS"
 
 #. SSID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:68
-msgid "a_s_if_iwssid"
+msgid "SSID"
 msgstr "SSID"
 
 #. MAC
 #: i18n/english/luasrc/i18n/admin-core.en.lua:69
-msgid "a_s_if_mac"
+msgid "MAC"
 msgstr "MAC"
 
 #. Pkts.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:70
-msgid "a_s_if_pkts"
+msgid "Pkts."
 msgstr "Paquetes."
 
 #. Interface Status
 #: i18n/english/luasrc/i18n/admin-core.en.lua:71
-msgid "a_s_if_status"
+msgid "Interface Status"
 msgstr "Interfaz de Estado "
 
 #. Transfer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:72
-msgid "a_s_if_transfer"
+msgid "Transfer"
 msgstr "Transferencia"
 
 #. RX
 #: i18n/english/luasrc/i18n/admin-core.en.lua:73
-msgid "a_s_if_transfer_rx"
+msgid "RX"
 msgstr "RX"
 
 #. TX
 #: i18n/english/luasrc/i18n/admin-core.en.lua:74
-msgid "a_s_if_transfer_tx"
+msgid "TX"
 msgstr "TX"
 
 #. Type
 #: i18n/english/luasrc/i18n/admin-core.en.lua:75
-msgid "a_s_if_type"
+msgid "Type"
 msgstr "Tipo"
 
 #. VLAN
 #: i18n/english/luasrc/i18n/admin-core.en.lua:76
-msgid "a_s_if_vlan"
+msgid "VLAN"
 msgstr "VLAN"
 
 #. Ports
 #: i18n/english/luasrc/i18n/admin-core.en.lua:77
-msgid "a_s_if_vlanports"
+msgid "Ports"
 msgstr "Puertos"
 
 #. Wireless Adapter
 #: i18n/english/luasrc/i18n/admin-core.en.lua:78
-msgid "a_s_if_wifidev"
+msgid "Wireless Adapter"
 msgstr "Adaptador inalámbrico"
 
 #. Firewall
 #: i18n/english/luasrc/i18n/admin-core.en.lua:79
-msgid "a_s_ipt"
+msgid "Firewall"
 msgstr "Corta fuego"
 
 #. Actions
 #: i18n/english/luasrc/i18n/admin-core.en.lua:80
-msgid "a_s_ipt_actions"
+msgid "Actions"
 msgstr "Acciones"
 
 #. Traffic
 #: i18n/english/luasrc/i18n/admin-core.en.lua:81
-msgid "a_s_ipt_bytes"
+msgid "Traffic"
 msgstr "Tráfico"
 
 #. Chain
 #: i18n/english/luasrc/i18n/admin-core.en.lua:82
-msgid "a_s_ipt_chain"
+msgid "Chain"
 msgstr "Cadena"
 
 #. Destination
 #: i18n/english/luasrc/i18n/admin-core.en.lua:83
-msgid "a_s_ipt_destination"
+msgid "Destination"
 msgstr "Destino"
 
 #. Flags
 #: i18n/english/luasrc/i18n/admin-core.en.lua:84
-msgid "a_s_ipt_flags"
+msgid "Flags"
 msgstr "Flags"
 
 #. In
 #: i18n/english/luasrc/i18n/admin-core.en.lua:85
-msgid "a_s_ipt_inputif"
+msgid "In"
 msgstr "Entrada"
 
 #. No chains in this table
 #: i18n/english/luasrc/i18n/admin-core.en.lua:86
-msgid "a_s_ipt_nochains"
+msgid "No chains in this table"
 msgstr "No hay cadenas in esta tabla"
 
 #. No Rules in this chain
 #: i18n/english/luasrc/i18n/admin-core.en.lua:87
-msgid "a_s_ipt_norules"
+msgid "No Rules in this chain"
 msgstr "No hay reglas en esta cadena"
 
 #. Options
 #: i18n/english/luasrc/i18n/admin-core.en.lua:88
-msgid "a_s_ipt_options"
+msgid "Options"
 msgstr "Opciones"
 
 #. Out
 #: i18n/english/luasrc/i18n/admin-core.en.lua:89
-msgid "a_s_ipt_outputif"
+msgid "Out"
 msgstr "Salida"
 
 #. Packets
 #: i18n/english/luasrc/i18n/admin-core.en.lua:90
-msgid "a_s_ipt_packets"
+msgid "Packets"
 msgstr "Paquetes"
 
 #. Pkts.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:91
-msgid "a_s_ipt_pkts"
+msgid "Pkts."
 msgstr "Paquetes."
 
 #. Policy
 #: i18n/english/luasrc/i18n/admin-core.en.lua:92
-msgid "a_s_ipt_policy"
+msgid "Policy"
 msgstr "Política"
 
 #. Prot.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:93
-msgid "a_s_ipt_prot"
+msgid "Prot."
 msgstr "Protocolo"
 
 #. References
 #: i18n/english/luasrc/i18n/admin-core.en.lua:94
-msgid "a_s_ipt_references"
+msgid "References"
 msgstr "Referencias"
 
 #. Reset Counters
 #: i18n/english/luasrc/i18n/admin-core.en.lua:95
-msgid "a_s_ipt_reset"
+msgid "Reset Counters"
 msgstr "Reiniciar contadores"
 
 #. Restart Firewall
 #: i18n/english/luasrc/i18n/admin-core.en.lua:96
-msgid "a_s_ipt_restart"
+msgid "Restart Firewall"
 msgstr "Reiniciar corta fuego"
 
 #. #
 #: i18n/english/luasrc/i18n/admin-core.en.lua:97
-msgid "a_s_ipt_rulenum"
+msgid "#"
 msgstr "#"
 
 #. Source
 #: i18n/english/luasrc/i18n/admin-core.en.lua:98
-msgid "a_s_ipt_source"
+msgid "Source"
 msgstr "Origen"
 
 #. Firewall Status
 #: i18n/english/luasrc/i18n/admin-core.en.lua:99
-msgid "a_s_ipt_status"
+msgid "Firewall Status"
 msgstr "Estado del corta fuego"
 
 #. Table
 #: i18n/english/luasrc/i18n/admin-core.en.lua:100
-msgid "a_s_ipt_table"
+msgid "Table"
 msgstr "Tabla"
 
 #. Target
 #: i18n/english/luasrc/i18n/admin-core.en.lua:101
-msgid "a_s_ipt_target"
+msgid "Target"
 msgstr "Objetivo"
 
 #. Perform Actions
 #: i18n/english/luasrc/i18n/admin-core.en.lua:102
-msgid "a_s_packages_do"
+msgid "Perform Actions"
 msgstr "Ejectuar acciones"
 
 #. Install
 #: i18n/english/luasrc/i18n/admin-core.en.lua:103
-msgid "a_s_packages_install"
+msgid "Install"
 msgstr "Instalar"
 
 #. Download and install package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:104
-msgid "a_s_packages_installurl"
+msgid "Download and install package"
 msgstr "Descargar e instalar paquete"
 
 #. Edit package lists and installation targets
 #: i18n/english/luasrc/i18n/admin-core.en.lua:105
-msgid "a_s_packages_ipkg"
+msgid "Edit package lists and installation targets"
 msgstr "Editar listas de paquetes de instalación y los objetivos "
 
 #. Package name
 #: i18n/english/luasrc/i18n/admin-core.en.lua:106
-msgid "a_s_packages_name"
+msgid "Package name"
 msgstr "Nombre del paquete"
 
 #. Remove
 #: i18n/english/luasrc/i18n/admin-core.en.lua:107
-msgid "a_s_packages_remove"
+msgid "Remove"
 msgstr "Desinstalar"
 
 #. Find package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:108
-msgid "a_s_packages_search"
+msgid "Find package"
 msgstr "Buscar paquete"
 
 #. Package lists updated
 #: i18n/english/luasrc/i18n/admin-core.en.lua:109
-msgid "a_s_packages_update"
+msgid "Package lists updated"
 msgstr "Listas de paquetes actualizada"
 
 #. Update package lists
 #: i18n/english/luasrc/i18n/admin-core.en.lua:110
-msgid "a_s_packages_updatelist"
+msgid "Update package lists"
 msgstr "Acutlizar listas de paquetes"
 
 #. Upgrade installed packages
 #: i18n/english/luasrc/i18n/admin-core.en.lua:111
-msgid "a_s_packages_upgrade"
+msgid "Upgrade installed packages"
 msgstr "Actualizar los paquetes instalados"
 
 #. Could not set default destination
 #: i18n/english/luasrc/i18n/admin-core.en.lua:112
-msgid "a_s_packages_code1"
+msgid "Could not set default destination"
 msgstr "No es posible establecer el destino por defecto"
 
 #. Error parsing config file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:113
-msgid "a_s_packages_code2"
+msgid "Error parsing config file"
 msgstr "Error al analizar el archivo de configuración"
 
 #. Could not create temporary directory (ran out of space?)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:114
-msgid "a_s_packages_code3"
+msgid "Could not create temporary directory (ran out of space?)"
 msgstr "No es posible crear el directorio temporal (se quedó sin espacio?) "
 
 #. Could not get adminstrative lock (ran out of space?)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:115
-msgid "a_s_packages_code4"
+msgid "Could not get adminstrative lock (ran out of space?)"
 msgstr ""
 "No es posible obtener de bloqueo administrativo (se quedó sin espacio?) "
 
 #. Unsatisfied Dependencies
 #: i18n/english/luasrc/i18n/admin-core.en.lua:116
-msgid "a_s_packages_code5"
+msgid "Unsatisfied Dependencies"
 msgstr "Dependencias insatisfechas "
 
 #. Refused to remove essential package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:117
-msgid "a_s_packages_code6"
+msgid "Refused to remove essential package"
 msgstr "No se puede eliminar un paquete esencial "
 
 #. Package has dependents
 #: i18n/english/luasrc/i18n/admin-core.en.lua:118
-msgid "a_s_packages_code7"
+msgid "Package has dependents"
 msgstr "Hay paquetes instalados que dependen de éste."
 
 #. Package has no installation candidate (wrong name?)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:119
-msgid "a_s_packages_code8"
+msgid "Package has no installation candidate (wrong name?)"
 msgstr ""
 "La instalación del paquete no tiene ningún candidato (nombre equivocado?) "
 
 #. Package has no available architecture 
 #: i18n/english/luasrc/i18n/admin-core.en.lua:120
-msgid "a_s_packages_code9"
+msgid "Package has no available architecture "
 msgstr ""
 "El paquete no tiene una arquitectura disponible <span class=\"translation-"
 "space\"> </ span> "
 
 #. Package is not trusted
 #: i18n/english/luasrc/i18n/admin-core.en.lua:121
-msgid "a_s_packages_code10"
+msgid "Package is not trusted"
 msgstr "El paquete no es de confianza "
 
 #. Error while downloading
 #: i18n/english/luasrc/i18n/admin-core.en.lua:122
-msgid "a_s_packages_code11"
+msgid "Error while downloading"
 msgstr "Error al descargar "
 
 #. Conflicts with other packages
 #: i18n/english/luasrc/i18n/admin-core.en.lua:123
-msgid "a_s_packages_code12"
+msgid "Conflicts with other packages"
 msgstr "Se produjeron conflictos con otros paquetes"
 
 #. Package is already installed
 #: i18n/english/luasrc/i18n/admin-core.en.lua:124
-msgid "a_s_packages_code13"
+msgid "Package is already installed"
 msgstr "El paquete ya se encuentra instalado"
 
 #. Package has unresolved dependencies
 #: i18n/english/luasrc/i18n/admin-core.en.lua:125
-msgid "a_s_packages_code14"
+msgid "Package has unresolved dependencies"
 msgstr "El paquete tien dependencias no resueltas"
 
 #. Refused to downgrade package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:126
-msgid "a_s_packages_code15"
+msgid "Refused to downgrade package"
 msgstr "Se negó a bajar (de versión) el paquete "
 
 #. Package manager ran out of space
 #: i18n/english/luasrc/i18n/admin-core.en.lua:127
-msgid "a_s_packages_code16"
+msgid "Package manager ran out of space"
 msgstr "Gestor de paquetes se quedó sin espacio "
 
 #. Bad signature while verifiying package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:128
-msgid "a_s_packages_code17"
+msgid "Bad signature while verifiying package"
 msgstr "Error en verificación del paquete, la firma no corresponde"
 
 #. MD5 error while verifiying package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:129
-msgid "a_s_packages_code18"
+msgid "MD5 error while verifiying package"
 msgstr "Error MD5 al verificar el paquete "
 
 #. Internal error occured
 #: i18n/english/luasrc/i18n/admin-core.en.lua:130
-msgid "a_s_packages_code19"
+msgid "Internal error occured"
 msgstr "Ha ocurrido un error interno"
 
 #. Package lists
 #: i18n/english/luasrc/i18n/admin-core.en.lua:131
-msgid "a_s_p_ipkg_pkglists"
+msgid "Package lists"
 msgstr "Listas de paquetes"
 
 #. Installation targets
 #: i18n/english/luasrc/i18n/admin-core.en.lua:132
-msgid "a_s_p_ipkg_targets"
+msgid "Installation targets"
 msgstr "Destinos de instalación"
 
 #. Change the password of the system administrator (User <code>root</code>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:133
-msgid "a_s_changepw1"
+msgid "Change the password of the system administrator (User <code>root</code>)"
 msgstr ""
 "Cambiar la clave del administrador del sistema (Usuario <code>root</code>)"
 
 #. Password successfully changed
 #: i18n/english/luasrc/i18n/admin-core.en.lua:134
-msgid "a_s_changepw_changed"
+msgid "Password successfully changed"
 msgstr "Contraseña cambiada satisfactoriamente"
 
 #. Error: Passwords do not match
 #: i18n/english/luasrc/i18n/admin-core.en.lua:135
-msgid "a_s_changepw_nomatch"
+msgid "Error: Passwords do not match"
 msgstr "Error: Las claves ingresadas no coinciden"
 
 #. Here you can paste public <abbr title=\"Secure Shell\">SSH</abbr>-Keys (one per line) for <abbr title=\"Secure Shell\">SSH</abbr> public-key authentication.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:136
-msgid "a_s_sshkeys1"
+msgid "Here you can paste public <abbr title=\"Secure Shell\">SSH</abbr>-Keys (one per line) for <abbr title=\"Secure Shell\">SSH</abbr> public-key authentication."
 msgstr ""
 "Aquí puede pegar las claves públicas de <abbr title=\"Secure "
 "Shell\">SSH</abbr> (una por línea) para la autenticación de claves públicas "
@@ -738,46 +738,46 @@ msgstr ""
 
 #. Mount Points
 #: i18n/english/luasrc/i18n/admin-core.en.lua:137
-msgid "a_s_fstab_mountpoints"
+msgid "Mount Points"
 msgstr "Puntos de montaje"
 
 #. Mount Points define at which point a memory device will be attached to the filesystem
 #: i18n/english/luasrc/i18n/admin-core.en.lua:138
-msgid "a_s_fstab_mountpoints1"
+msgid "Mount Points define at which point a memory device will be attached to the filesystem"
 msgstr ""
 "Los puntos de montaje definen donde un dispositivo de memoria será adjuntado "
 "al sistema de archivos"
 
 #. Mounted file systems
 #: i18n/english/luasrc/i18n/admin-core.en.lua:139
-msgid "a_s_fstab_active"
+msgid "Mounted file systems"
 msgstr "Sistemas de archivo montados"
 
 #. Used
 #: i18n/english/luasrc/i18n/admin-core.en.lua:140
-msgid "a_s_fstab_used"
+msgid "Used"
 msgstr "Usado"
 
 #. Available
 #: i18n/english/luasrc/i18n/admin-core.en.lua:141
-msgid "a_s_fstab_avail"
+msgid "Available"
 msgstr "Disponible"
 
 #. Mount Point
 #: i18n/english/luasrc/i18n/admin-core.en.lua:142
-msgid "a_s_fstab_mountpoint"
+msgid "Mount Point"
 msgstr "Punto de montaje"
 
 #. The device file of the memory or partition (<abbr title=\"for example\">e.g.</abbr> <code>/dev/sda1</code>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:143
-msgid "a_s_fstab_device1"
+msgid "The device file of the memory or partition (<abbr title=\"for example\">e.g.</abbr> <code>/dev/sda1</code>)"
 msgstr ""
 "El archivo de dispotivo de memoria o partición (<abbr title=\"Por "
 "ejemplo\">e.j.</abbr> <code>/dev/sda1</code>)"
 
 #. The filesystem that was used to format the memory (<abbr title=\"for example\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></samp>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:144
-msgid "a_s_fstab_fs1"
+msgid "The filesystem that was used to format the memory (<abbr title=\"for example\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></samp>)"
 msgstr ""
 "El sistema de archivo que fue utilizado para dar formato a la memoria (<abbr "
 "title=\"por ejemplo\">Ej.</abbr> <samp><abbr title=\"Third Extended "
@@ -785,7 +785,7 @@ msgstr ""
 
 #. If your physical memory is insufficient unused data can be temporarily swapped to a swap-device resulting in a higher amount of usable <abbr title=\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very slow process as the swap-device cannot be accessed with the high datarates of the <abbr title=\"Random Access Memory\">RAM</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:145
-msgid "a_s_fstab_swap1"
+msgid "If your physical memory is insufficient unused data can be temporarily swapped to a swap-device resulting in a higher amount of usable <abbr title=\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very slow process as the swap-device cannot be accessed with the high datarates of the <abbr title=\"Random Access Memory\">RAM</abbr>."
 msgstr ""
 "Si la memoria física es insuficiente, los datos no utilizados pueden ser "
 "intercambiado tempralmente en un dispositivo de intercambio (swap-device) "
@@ -797,64 +797,64 @@ msgstr ""
 
 #. Reboots the operating system of your device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:146
-msgid "a_s_reboot1"
+msgid "Reboots the operating system of your device"
 msgstr "Reiniciar el sistema operativo de su dispositivo"
 
 #. Perform reboot
 #: i18n/english/luasrc/i18n/admin-core.en.lua:147
-msgid "a_s_reboot_do"
+msgid "Perform reboot"
 msgstr "Reiniciar..."
 
 #. Please wait: Device rebooting...
 #: i18n/english/luasrc/i18n/admin-core.en.lua:148
-msgid "a_s_reboot_running"
+msgid "Please wait: Device rebooting..."
 msgstr "Por favor espere. Reiniciando dispositivo ..."
 
 #. Warning: There are unsaved changes that will be lost while rebooting!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:149
-msgid "a_s_reboot_u"
+msgid "Warning: There are unsaved changes that will be lost while rebooting!"
 msgstr ""
 "Advertencia: Hay cambios realizados que no han sido guardados, los mismos se "
 "perderán mientras se reinicia!"
 
 #. Changes applied.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:150
-msgid "a_s_applyreboot1"
+msgid "Changes applied."
 msgstr "Cambios aplicados."
 
 #. Backup / Restore
 #: i18n/english/luasrc/i18n/admin-core.en.lua:151
-msgid "a_s_backup"
+msgid "Backup / Restore"
 msgstr "Backup / Restore"
 
 #. Create backup
 #: i18n/english/luasrc/i18n/admin-core.en.lua:152
-msgid "a_s_backup_backup"
+msgid "Create backup"
 msgstr "Crear copia de respaldo"
 
 #. Backup Archive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:153
-msgid "a_s_backup_archive"
+msgid "Backup Archive"
 msgstr "Archivo de copia de seguridad"
 
 #. Reset router to defaults
 #: i18n/english/luasrc/i18n/admin-core.en.lua:154
-msgid "a_s_backup_reset"
+msgid "Reset router to defaults"
 msgstr "Reiniciar router a su configuración de fábrica"
 
 #. Proceed reverting all settings and resetting to firmware defaults?
 #: i18n/english/luasrc/i18n/admin-core.en.lua:155
-msgid "a_s_backup_reset1"
+msgid "Proceed reverting all settings and resetting to firmware defaults?"
 msgstr "Proceder a configurar su router a los valores de fábrica?"
 
 #. Restore backup
 #: i18n/english/luasrc/i18n/admin-core.en.lua:156
-msgid "a_s_backup_restore"
+msgid "Restore backup"
 msgstr "Restaurar copia de seguridad"
 
 #. Here you can backup and restore your router configuration and - if possible - reset the router to the default settings.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:157
-msgid "a_s_backup1"
+msgid "Here you can backup and restore your router configuration and - if possible - reset the router to the default settings."
 msgstr ""
 "Aquí puede realizar una copia de respaldo o bien restaurar la configuración "
 "de su ruter y, si es posible, reiniciar el ruter a su configuración de "
@@ -862,22 +862,22 @@ msgstr ""
 
 #. <abbr title=\"Hypertext Transfer Protocol\">HTTP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:158
-msgid "a_srv_http"
+msgid "<abbr title=\"Hypertext Transfer Protocol\">HTTP</abbr>-Server"
 msgstr "Servidor <abbr title=\"Hypertext Transfer Protocol\">HTTP</abbr>"
 
 #. <abbr title=\"Secure Shell\">SSH</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:159
-msgid "a_srv_ssh"
+msgid "<abbr title=\"Secure Shell\">SSH</abbr>-Server"
 msgstr "Servidor <abbr title=\"Secure Shell\">SSH</abbr>"
 
 #. Services and daemons perform certain tasks on your device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:160
-msgid "a_srv_services1"
+msgid "Services and daemons perform certain tasks on your device."
 msgstr "Los servicios y demonios ejecutan ciertas tareas en su dispositivo."
 
 #. Most of them are network servers, that offer a certain service for your device or network like shell access, serving webpages like <abbr title=\"Lua Configuration Interface\">LuCI</abbr>, doing mesh routing, sending e-mails, ...
 #: i18n/english/luasrc/i18n/admin-core.en.lua:161
-msgid "a_srv_services2"
+msgid "Most of them are network servers, that offer a certain service for your device or network like shell access, serving webpages like <abbr title=\"Lua Configuration Interface\">LuCI</abbr>, doing mesh routing, sending e-mails, ..."
 msgstr ""
 "La mayoría de ellos son servidores de red, que ofrezcen un determinado "
 "servicio para el dispositivo o la red como el acceso shell, servicio de "
@@ -886,58 +886,58 @@ msgstr ""
 
 #. A small webserver which can be used to serve <abbr title=\"Lua Configuration Interface\">LuCI</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:162
-msgid "a_srv_http1"
+msgid "A small webserver which can be used to serve <abbr title=\"Lua Configuration Interface\">LuCI</abbr>."
 msgstr ""
 "Un pequeño servidor web que puede ser usado para servir <abbr title=\"Lua "
 "configuración Interface\"> LuCI </ abbr>. "
 
 #. Authentication Realm
 #: i18n/english/luasrc/i18n/admin-core.en.lua:163
-msgid "a_srv_http_authrealm"
+msgid "Authentication Realm"
 msgstr "Autenticación Realm"
 
 #. The realm which will be displayed at the authentication prompt for protected pages.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:164
-msgid "a_srv_http_authrealm1"
+msgid "The realm which will be displayed at the authentication prompt for protected pages."
 msgstr ""
 "El nombre Realm el cual será mostrado en el símbolo de autenticación para "
 "páginas protegidas. "
 
 #. defaults to <code>/etc/httpd.conf</code>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:165
-msgid "a_srv_http_config1"
+msgid "defaults to <code>/etc/httpd.conf</code>"
 msgstr "por defecto a <code>/etc/httpd.conf</code>"
 
 #. Document root
 #: i18n/english/luasrc/i18n/admin-core.en.lua:166
-msgid "a_srv_http_root"
+msgid "Document root"
 msgstr "Raíz de documentos"
 
 #. Enable Keep-Alive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:167
-msgid "a_srv_http_keepalive"
+msgid "Enable Keep-Alive"
 msgstr "Habilitar Keep-Alive"
 
 #. Connection timeout
 #: i18n/english/luasrc/i18n/admin-core.en.lua:168
-msgid "a_srv_http_timeout"
+msgid "Connection timeout"
 msgstr "Tiempo de conexión agotado"
 
 #. Plugin path
 #: i18n/english/luasrc/i18n/admin-core.en.lua:169
-msgid "a_srv_http_path"
+msgid "Plugin path"
 msgstr "Ruta del plugin"
 
 #. A lightweight HTTP/1.1 webserver written in C and Lua designed to serve LuCI
 #: i18n/english/luasrc/i18n/admin-core.en.lua:170
-msgid "a_srv_lucittpd"
+msgid "A lightweight HTTP/1.1 webserver written in C and Lua designed to serve LuCI"
 msgstr ""
 "Un servidor web HTTP/1.1 liviano escrito en C y Lua, diseñado para servir "
 "LUCI "
 
 #. Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:171
-msgid "a_srv_dropbear1"
+msgid "Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
 msgstr ""
 "Dropbear ofrece acceso de red via el <abbr title=\"Secure Shell\"> SSH </ "
 "abbr> y servidor de copia de archivos integrado <abbr title=\"Secure Copy\"> "
@@ -945,30 +945,30 @@ msgstr ""
 
 #. Password authentication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:172
-msgid "a_srv_d_pwauth"
+msgid "Password authentication"
 msgstr "Autenticación de contraseña"
 
 #. Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:173
-msgid "a_srv_d_pwauth1"
+msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
 msgstr ""
 "Permitir autenticación de conseña via <abbr title=\"Secure Shell\">SSH</abbr>"
 
 #. Channel
 #: i18n/english/luasrc/i18n/admin-core.en.lua:174
-msgid "a_w_channel"
+msgid "Channel"
 msgstr "Canal"
 
 #. On this pages you can find configuration options for <abbr title=\"Wireless Local Area Network\">WLAN</abbr> based wireless networks.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:175
-msgid "a_w_wifi1"
+msgid "On this pages you can find configuration options for <abbr title=\"Wireless Local Area Network\">WLAN</abbr> based wireless networks."
 msgstr ""
 "En esta página podrá encontrar opciones de configuración para su(s) red(es) "
 "inalámbrica(s) <abbr title=\"Wireless Local Area Network\">WLAN</abbr>"
 
 #. You can easily integrate your 802.11a/b/g/n-devices into your physical network and use the virtual adapter support to build wireless repeaters or offer several networks with one device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:176
-msgid "a_w_wifi2"
+msgid "You can easily integrate your 802.11a/b/g/n-devices into your physical network and use the virtual adapter support to build wireless repeaters or offer several networks with one device."
 msgstr ""
 "Fácilmente puede integrar sus dispositivos 802.11a/b/g/n dentro de su red "
 "física y usar un adaptador virtual para crear repetidores u ofrecer redes "
@@ -976,7 +976,7 @@ msgstr ""
 
 #. There is support for Managed, Client, Ad-Hoc and <abbr title=\"Wireless Distribution System\">WDS</abbr> operating modes as well as <abbr title=\"Wi-Fi Protected Access\">WPA</abbr> and <abbr title=\"Wi-Fi Protected Access 2\">WPA2</abbr> encryption for secure communnication.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:177
-msgid "a_w_wifi3"
+msgid "There is support for Managed, Client, Ad-Hoc and <abbr title=\"Wireless Distribution System\">WDS</abbr> operating modes as well as <abbr title=\"Wi-Fi Protected Access\">WPA</abbr> and <abbr title=\"Wi-Fi Protected Access 2\">WPA2</abbr> encryption for secure communnication."
 msgstr ""
 "Se brinda soporte para operar en modo Managed, Client, Ad-Hoc y <abbr "
 "title=\"Wireless Distribution System\">WDS</abbr> así también como "
@@ -985,42 +985,42 @@ msgstr ""
 
 #. Here you can configure installed wifi devices.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:178
-msgid "a_w_devices1"
+msgid "Here you can configure installed wifi devices."
 msgstr "Aquí puede configurar los dispositivos Wi-Fi instalados."
 
 #. Transmit Antenna
 #: i18n/english/luasrc/i18n/admin-core.en.lua:179
-msgid "a_w_txantenna"
+msgid "Transmit Antenna"
 msgstr "Antena transmisora"
 
 #. Receive Antenna
 #: i18n/english/luasrc/i18n/admin-core.en.lua:180
-msgid "a_w_rxantenna"
+msgid "Receive Antenna"
 msgstr "Antena receptora"
 
 #. Distance to furthest station (in meter)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:181
-msgid "a_w_distance1"
+msgid "Distance to furthest station (in meter)"
 msgstr "Distancia de la estación mas alejada (en metros)"
 
 #. Diversity
 #: i18n/english/luasrc/i18n/admin-core.en.lua:182
-msgid "a_w_diversity"
+msgid "Diversity"
 msgstr "Diversidad"
 
 #. Country Code
 #: i18n/english/luasrc/i18n/admin-core.en.lua:183
-msgid "a_w_countrycode"
+msgid "Country Code"
 msgstr "Código de País"
 
 #. Connection Limit
 #: i18n/english/luasrc/i18n/admin-core.en.lua:184
-msgid "a_w_connlimit"
+msgid "Connection Limit"
 msgstr "Límite de conexión "
 
 #. You can run several wifi networks with one device. Be aware that there are certain hardware and driverspecific restrictions. Normally you can operate 1 Ad-Hoc or up to 3 Master-Mode and 1 Client-Mode network simultaneously.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:185
-msgid "a_w_networks1"
+msgid "You can run several wifi networks with one device. Be aware that there are certain hardware and driverspecific restrictions. Normally you can operate 1 Ad-Hoc or up to 3 Master-Mode and 1 Client-Mode network simultaneously."
 msgstr ""
 "Puede correr varias redes Wi-Fi con un solo dispositivo. Tenga en cuenta que "
 "hay restricciones que se aplican al propio hardware y al driver "
@@ -1029,97 +1029,97 @@ msgstr ""
 
 #. Network Name (<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:186
-msgid "a_w_netid"
+msgid "Network Name (<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>)"
 msgstr ""
 "Nombre de la red (<abbr title=\"Extended Service Set "
 "Identifier\">ESSID</abbr>)"
 
 #. Add the Wifi network to physical network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:187
-msgid "a_w_network1"
+msgid "Add the Wifi network to physical network"
 msgstr "Añadir una red WiFi a la red física"
 
 #.  - Create new Network - 
 #: i18n/english/luasrc/i18n/admin-core.en.lua:188
-msgid "a_w_netmanual"
+msgid " - Create new Network - "
 msgstr ""
 "<span class=\"translation-space\"> </span>\n"
 "- Crear nueva red -<span class=\"translation-space\"> </span>\n"
 
 #. Transmit Power
 #: i18n/english/luasrc/i18n/admin-core.en.lua:189
-msgid "a_w_txpwr"
+msgid "Transmit Power"
 msgstr "Potencia de transmisión"
 
 #. Broadcom Frameburst
 #: i18n/english/luasrc/i18n/admin-core.en.lua:190
-msgid "a_w_brcmburst"
+msgid "Broadcom Frameburst"
 msgstr "Frameburst Broadcom"
 
 # Frameburst = Punto de ruptura
 #. Atheros Frameburst
 #: i18n/english/luasrc/i18n/admin-core.en.lua:191
-msgid "a_w_athburst"
+msgid "Atheros Frameburst"
 msgstr "Frameburst Atheros"
 
 #. RadiusServer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:192
-msgid "a_w_radiussrv"
+msgid "RadiusServer"
 msgstr "Servidor Radius"
 
 #. Radius-Port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:193
-msgid "a_w_radiusport"
+msgid "Radius-Port"
 msgstr "Puerto servidor Radius"
 
 #. AP-Isolation
 #: i18n/english/luasrc/i18n/admin-core.en.lua:194
-msgid "a_w_apisolation"
+msgid "AP-Isolation"
 msgstr "Aislamiento AP"
 
 #. Prevents Client to Client communication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:195
-msgid "a_w_apisolation1"
+msgid "Prevents Client to Client communication"
 msgstr "Impide la comunicación de cliente a cliente "
 
 #. Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:196
-msgid "a_w_hideessid"
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "Ocultar <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
 #. Access Point
 #: i18n/english/luasrc/i18n/admin-core.en.lua:197
-msgid "a_w_ap"
+msgid "Access Point"
 msgstr "Punto de Acceso"
 
 #. Ad-Hoc
 #: i18n/english/luasrc/i18n/admin-core.en.lua:198
-msgid "a_w_adhoc"
+msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
 #. Pseudo Ad-Hoc (ahdemo)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:199
-msgid "a_w_ahdemo"
+msgid "Pseudo Ad-Hoc (ahdemo)"
 msgstr "Pseudo Ad-Hoc (ahdemo)"
 
 #. Client
 #: i18n/english/luasrc/i18n/admin-core.en.lua:200
-msgid "a_w_client"
+msgid "Client"
 msgstr "Cliente"
 
 #. WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:201
-msgid "a_w_wds"
+msgid "WDS"
 msgstr "WDS"
 
 #. Monitor
 #: i18n/english/luasrc/i18n/admin-core.en.lua:202
-msgid "a_w_monitor"
+msgid "Monitor"
 msgstr "Monitor"
 
 #. Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> firewalls
 #: i18n/english/luasrc/i18n/admin-core.en.lua:203
-msgid "dhcp_dnsmasq_desc"
+msgid "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> firewalls"
 msgstr ""
 "Dnsmasq es un software que combina un Servidor <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr> y Reenviador <abbr title=\"Domain Name "
@@ -1128,12 +1128,12 @@ msgstr ""
 
 #. Domain required
 #: i18n/english/luasrc/i18n/admin-core.en.lua:204
-msgid "dhcp_dnsmasq_domainneeded"
+msgid "Domain required"
 msgstr "Dominio requerido"
 
 #. Don&#39;t forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without <abbr title=\"Domain Name System\">DNS</abbr>-Name
 #: i18n/english/luasrc/i18n/admin-core.en.lua:205
-msgid "dhcp_dnsmasq_domainneeded_desc"
+msgid "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without <abbr title=\"Domain Name System\">DNS</abbr>-Name"
 msgstr ""
 "Hacer reenvío Don&amp;#39;t de peticiones de <abbr title=\"Domain Name "
 "System\">DNS</abbr> sin un nombre de <abbr title=\"Domain Name "
@@ -1141,231 +1141,231 @@ msgstr ""
 
 #. Authoritative
 #: i18n/english/luasrc/i18n/admin-core.en.lua:206
-msgid "dhcp_dnsmasq_authoritative"
+msgid "Authoritative"
 msgstr "Authoritative"
 
 #. This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> in the local network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:207
-msgid "dhcp_dnsmasq_authoritative_desc"
+msgid "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> in the local network"
 msgstr ""
 "Este es el único servidor <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> en la red de área local"
 
 #. Filter private
 #: i18n/english/luasrc/i18n/admin-core.en.lua:208
-msgid "dhcp_dnsmasq_boguspriv"
+msgid "Filter private"
 msgstr "Filtro privado "
 
 #. Don&#39;t forward reverse lookups for local networks
 #: i18n/english/luasrc/i18n/admin-core.en.lua:209
-msgid "dhcp_dnsmasq_boguspriv_desc"
+msgid "Don't forward reverse lookups for local networks"
 msgstr "Hacer búqueda inversa para redes locales"
 
 #. Filter useless
 #: i18n/english/luasrc/i18n/admin-core.en.lua:210
-msgid "dhcp_dnsmasq_filterwin2k"
+msgid "Filter useless"
 msgstr "Filtro inútil "
 
 #. filter useless <abbr title=\"Domain Name System\">DNS</abbr>-queries of Windows-systems
 #: i18n/english/luasrc/i18n/admin-core.en.lua:211
-msgid "dhcp_dnsmasq_filterwin2k_desc"
+msgid "filter useless <abbr title=\"Domain Name System\">DNS</abbr>-queries of Windows-systems"
 msgstr ""
 "filter useless <abbr title=\"Domain Name System\">DNS</abbr>-queries of "
 "Windows-systems"
 
 #. Localise queries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:212
-msgid "dhcp_dnsmasq_localisequeries"
+msgid "Localise queries"
 msgstr "Localización de las consultas "
 
 #. localises the hostname depending on its subnet
 #: i18n/english/luasrc/i18n/admin-core.en.lua:213
-msgid "dhcp_dnsmasq_localisequeries_desc"
+msgid "localises the hostname depending on its subnet"
 msgstr "Localización de nombre de host dependiendo de su subred"
 
 #. Local Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:214
-msgid "dhcp_dnsmasq_local"
+msgid "Local Server"
 msgstr "Servidor local"
 
 #. Local Domain
 #: i18n/english/luasrc/i18n/admin-core.en.lua:215
-msgid "dhcp_dnsmasq_domain"
+msgid "Local Domain"
 msgstr "Dominio local"
 
 #. Expand Hosts
 #: i18n/english/luasrc/i18n/admin-core.en.lua:216
-msgid "dhcp_dnsmasq_expandhosts"
+msgid "Expand Hosts"
 msgstr "Expandir hosts"
 
 #. adds domain names to hostentries in the resolv file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:217
-msgid "dhcp_dnsmasq_expandhosts_desc"
+msgid "adds domain names to hostentries in the resolv file"
 msgstr "añadir nombre de dominios a entradas de host en el archivo resolv"
 
 #. don&#39;t cache unknown
 #: i18n/english/luasrc/i18n/admin-core.en.lua:218
-msgid "dhcp_dnsmasq_nonegcache"
+msgid "don't cache unknown"
 msgstr "do cachear desconocido"
 
 #. prevents caching of negative <abbr title=\"Domain Name System\">DNS</abbr>-replies
 #: i18n/english/luasrc/i18n/admin-core.en.lua:219
-msgid "dhcp_dnsmasq_nonegcache_desc"
+msgid "prevents caching of negative <abbr title=\"Domain Name System\">DNS</abbr>-replies"
 msgstr ""
 "impedir cacheo de respuestas negativas de <abbr title=\"Domain Name "
 "System\">DNS</abbr>"
 
 #. Use <code>/etc/ethers</code>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:220
-msgid "dhcp_dnsmasq_readethers"
+msgid "Use <code>/etc/ethers</code>"
 msgstr "Usar <code>/etc/ethers</code>"
 
 #. Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:221
-msgid "dhcp_dnsmasq_readethers_desc"
+msgid "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server"
 msgstr ""
 "Leer <code>/etc/ethers</code> para configurar el Servidor <abbr "
 "title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 
 #. Leasefile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:222
-msgid "dhcp_dnsmasq_leasefile"
+msgid "Leasefile"
 msgstr "Archivo \"lease\""
 
 #. file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-leases will be stored
 #: i18n/english/luasrc/i18n/admin-core.en.lua:223
-msgid "dhcp_dnsmasq_leasefile_desc"
+msgid "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-leases will be stored"
 msgstr ""
 "archivo donde las direcciones dadas por el servidor <abbr title=\"Dynamic "
 "Host Configuration Protocol\">DHCP</abbr> serán guardadas"
 
 #. Resolvfile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:224
-msgid "dhcp_dnsmasq_resolvfile"
+msgid "Resolvfile"
 msgstr "Archivo \"resolv\""
 
 #. local <abbr title=\"Domain Name System\">DNS</abbr> file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:225
-msgid "dhcp_dnsmasq_resolvfile_desc"
+msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "Archvo <abbr title=\"Domain Name System\">DNS</abbr> local"
 
 #. Ignore <code>/etc/hosts</code>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:226
-msgid "dhcp_dnsmasq_nohosts"
+msgid "Ignore <code>/etc/hosts</code>"
 msgstr "Ignorar <code>/etc/hosts</code>"
 
 #. Strict order
 #: i18n/english/luasrc/i18n/admin-core.en.lua:227
-msgid "dhcp_dnsmasq_strictorder"
+msgid "Strict order"
 msgstr "Strict order"
 
 #. <abbr title=\"Domain Name System\">DNS</abbr>-Server will be queried in the order of the resolvfile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:228
-msgid "dhcp_dnsmasq_strictorder_desc"
+msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Server will be queried in the order of the resolvfile"
 msgstr ""
 "El Servidor <abbr title=\"Domain Name System\">DNS</abbr> serán consultados de "
 "acuerdo al orden explicitado en el archivo \"resolv\""
 
 #. Log queries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:229
-msgid "dhcp_dnsmasq_logqueries"
+msgid "Log queries"
 msgstr "Registrar consultas (LOG)"
 
 #. Ignore resolve file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:230
-msgid "dhcp_dnsmasq_noresolv"
+msgid "Ignore resolve file"
 msgstr "Iganorar archivo \"resolv\""
 
 #. concurrent queries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:231
-msgid "dhcp_dnsmasq_dnsforwardmax"
+msgid "concurrent queries"
 msgstr "consultas simultaneas"
 
 #. <abbr title=\"Domain Name System\">DNS</abbr>-Port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:232
-msgid "dhcp_dnsmasq_port"
+msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Port"
 msgstr "Puerto <abbr title=\"Domain Name System\">DNS</abbr>"
 
 #. <abbr title=\"maximal\">max.</abbr> <abbr title=\"Extension Mechanisms for Domain Name System\">EDNS0</abbr> paket size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:233
-msgid "dhcp_dnsmasq_ednspacket_max"
+msgid "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Extension Mechanisms for Domain Name System\">EDNS0</abbr> paket size"
 msgstr ""
 "Tamaño <abbr title=\"máximo\">máx.</abbr> de paquete <abbr title=\"Extension "
 "Mechanisms for Domain Name System\">EDNS0</abbr>"
 
 #. <abbr title=\"maximal\">max.</abbr> <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:234
-msgid "dhcp_dnsmasq_dhcpleasemax"
+msgid "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Leases"
 msgstr ""
 "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr>-Leases"
 
 #. additional hostfile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:235
-msgid "dhcp_dnsmasq_addnhosts"
+msgid "additional hostfile"
 msgstr "archivo de host adicional"
 
 #. query port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:236
-msgid "dhcp_dnsmasq_queryport"
+msgid "query port"
 msgstr "puerto de consulta"
 
 #. Enable TFTP-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:237
-msgid "dhcp_dnsmasq_enabletftp"
+msgid "Enable TFTP-Server"
 msgstr "Activar Servidor TFTP"
 
 #. TFTP-Server Root
 #: i18n/english/luasrc/i18n/admin-core.en.lua:238
-msgid "dhcp_dnsmasq_tftproot"
+msgid "TFTP-Server Root"
 msgstr "Raíz del Servidor TFTP"
 
 #. Network Boot Image
 #: i18n/english/luasrc/i18n/admin-core.en.lua:239
-msgid "dhcp_dnsmasq_dhcpboot"
+msgid "Network Boot Image"
 msgstr "Imágen de inicio en red"
 
 #. Switch
 #: i18n/english/luasrc/i18n/admin-core.en.lua:240
-msgid "a_n_switch"
+msgid "Switch"
 msgstr "Switch"
 
 #. Active Connections
 #: i18n/english/luasrc/i18n/admin-core.en.lua:241
-msgid "a_n_conntrack"
+msgid "Active Connections"
 msgstr "Conexiones activas"
 
 #. This page gives an overview over currently active network connections.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:242
-msgid "a_n_conntrack_desc"
+msgid "This page gives an overview over currently active network connections."
 msgstr ""
 "Esta brinda una descripción general acerca de la cantidad de conexiones "
 "activas de red."
 
 #. Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:243
-msgid "a_n_routes"
+msgid "Routes"
 msgstr "Rutas"
 
 #. IPv4 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:244
-msgid "a_n_routes4"
+msgid "IPv4 Routes"
 msgstr "Rutas IPv4"
 
 #. IPv6 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:245
-msgid "a_n_routes6"
+msgid "IPv6 Routes"
 msgstr "Rutas IPv6"
 
 #. In this area you find all network-related settings.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:246
-msgid "a_network1"
+msgid "In this area you find all network-related settings."
 msgstr ""
 "En este área encontrará todo lo relacionado a la configuración de la red"
 
 #. On most routers the network switch can be freely configured and splitted up into several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:247
-msgid "a_network2"
+msgid "On most routers the network switch can be freely configured and splitted up into several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s."
 msgstr ""
 "en la mayoría de los ruteadores el switch de red puede configurarse "
 "libremente y divirse en varias <abbr title=\"Virtual Local Area "
@@ -1373,7 +1373,7 @@ msgstr ""
 
 #. Interfaces and <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> / <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Settings allow a custom organisation of the network and connections to other networks like the internet.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:248
-msgid "a_network3"
+msgid "Interfaces and <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> / <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Settings allow a custom organisation of the network and connections to other networks like the internet."
 msgstr ""
 "La configuración de los protocolos <abbr title=\"Point-to-Point Protocol over "
 "Ethernet\">PPPoE</abbr> / <abbr title=\"Point-to-Point Tunneling "
@@ -1382,7 +1382,7 @@ msgstr ""
 
 #. With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> devices in your local network can be automatically configured for network communication.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:249
-msgid "a_network4"
+msgid "With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> devices in your local network can be automatically configured for network communication."
 msgstr ""
 "Con el Servidor <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> los dispositivos en su red de área local pueden ser "
@@ -1390,14 +1390,14 @@ msgstr ""
 
 #. Firewall and portforwarding can be used to secure your network while providing services to external networks.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:250
-msgid "a_network5"
+msgid "Firewall and portforwarding can be used to secure your network while providing services to external networks."
 msgstr ""
 "El corta fuego y el reenvío de puertos pueden ser configurados para asgurar "
 "su red mientras se provee de servicios externos a la red."
 
 #. The network ports on your router can be combined to several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s in which computers can communicate directly with each other. <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s are often used to separate different network segments. Often there is by default one Uplink port for a connection to the next greater network like the internet and other ports for a local network.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:251
-msgid "a_n_switch1"
+msgid "The network ports on your router can be combined to several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s in which computers can communicate directly with each other. <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s are often used to separate different network segments. Often there is by default one Uplink port for a connection to the next greater network like the internet and other ports for a local network."
 msgstr ""
 "Los puertos de red de su router pueden ser combinados en diferentes <abbr "
 "title=\"Virtual Local Area Network\">VLAN</abbr>s donde las computadoras "
@@ -1409,7 +1409,7 @@ msgstr ""
 
 #. Ports belonging to a <abbr title=\"Virtual Local Area Network\">VLAN</abbr> are separated with spaces. The port with the highest number (usually 5) is oftern the connection to the internal network interface of the router. On devices with 5 ports often the one with the lowest number (0) is the predefined Uplink port.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:252
-msgid "network_switch_desc"
+msgid "Ports belonging to a <abbr title=\"Virtual Local Area Network\">VLAN</abbr> are separated with spaces. The port with the highest number (usually 5) is oftern the connection to the internal network interface of the router. On devices with 5 ports often the one with the lowest number (0) is the predefined Uplink port."
 msgstr ""
 "Los puertos pertenecientes a una <abbr title=\"Virtual Local Area "
 "Network\">VLAN</abbr> son separados por espacios. El puerto con el número mas "
@@ -1419,7 +1419,7 @@ msgstr ""
 
 #. On this page you can configure the network interfaces. You can bridge several interfaces by ticking the &quot;bridge interfaces&quot; field and enter the names of several network interfaces separated by spaces. You can also use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation <samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: <samp>eth0.1</samp>).
 #: i18n/english/luasrc/i18n/admin-core.en.lua:253
-msgid "a_n_ifaces1"
+msgid "On this page you can configure the network interfaces. You can bridge several interfaces by ticking the \"bridge interfaces\" field and enter the names of several network interfaces separated by spaces. You can also use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation <samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: <samp>eth0.1</samp>)."
 msgstr ""
 "En esta página podrá configurar las interfaces de red. Puede hacer puentes "
 "con diferentes interfaces, ingresando el nombre de las interfaces asociadas "
@@ -1429,25 +1429,25 @@ msgstr ""
 
 #. Bridge interfaces
 #: i18n/english/luasrc/i18n/admin-core.en.lua:254
-msgid "a_n_i_bridge"
+msgid "Bridge interfaces"
 msgstr "Puentear interfaces"
 
 #. creates a bridge over specified interface(s)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:255
-msgid "a_n_i_bridge1"
+msgid "creates a bridge over specified interface(s)"
 msgstr "crear un puente sobre la(s) interfaz/(ces) asociada(s)"
 
 #. Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>
-msgid "a_n_i_stp"
+msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 msgstr "Activar <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 
 #. Enables the Spanning Tree Protocol on this bridge
-msgid "a_n_i_stp1"
+msgid "Enables the Spanning Tree Protocol on this bridge"
 msgstr "Activa STP en este puente"
 
 #. With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> network members can automatically receive their network settings (<abbr title=\"Internet Protocol\">IP</abbr>-address, netmask, <abbr title=\"Domain Name System\">DNS</abbr>-server, ...).
 #: i18n/english/luasrc/i18n/admin-core.en.lua:256
-msgid "dhcp_desc"
+msgid "With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> network members can automatically receive their network settings (<abbr title=\"Internet Protocol\">IP</abbr>-address, netmask, <abbr title=\"Domain Name System\">DNS</abbr>-server, ...)."
 msgstr ""
 "Con <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> miembros "
 "de la red pueden automáticamente recibir su configuración (<abbr "
@@ -1456,81 +1456,81 @@ msgstr ""
 
 #. Leasetime
 #: i18n/english/luasrc/i18n/admin-core.en.lua:257
-msgid "dhcp_dhcp_leasetime"
+msgid "Leasetime"
 msgstr "Tiempo de \"lease\""
 
 #. Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:258
-msgid "dhcp_dhcp_dynamicdhcp"
+msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 msgstr "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 
 #. Ignore interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:259
-msgid "dhcp_dhcp_ignore"
+msgid "Ignore interface"
 msgstr "Ignorar interfaz"
 
 #. disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for this interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:260
-msgid "dhcp_dhcp_ignore_desc"
+msgid "disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for this interface"
 msgstr ""
 "desactivar <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
 "para esta interfaz"
 
 #. Force
 #: i18n/english/luasrc/i18n/admin-core.en.lua:261
-msgid "dhcp_dhcp_force"
+msgid "Force"
 msgstr "Forzar"
 
 #. first address (last octet)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:262
-msgid "dhcp_dhcp_start_desc"
+msgid "first address (last octet)"
 msgstr "primer dirección (último octeto)"
 
 #. number of leased addresses -1
 #: i18n/english/luasrc/i18n/admin-core.en.lua:263
-msgid "dhcp_dhcp_limit_desc"
+msgid "number of leased addresses -1"
 msgstr "número de direcciones brindadas -1"
 
 #. DHCP-Options
 #: i18n/english/luasrc/i18n/admin-core.en.lua:264
-msgid "dhcp_dhcp_dhcpoption"
+msgid "DHCP-Options"
 msgstr "Opciones de DHCP"
 
 #. See &quot;dnsmasq --help dhcp&quot; for a list of available options.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:265
-msgid "dhcp_dhcp_dhcpoption_desc"
+msgid "See \"dnsmasq --help dhcp\" for a list of available options."
 msgstr ""
 "Ver la ayuda  &amp;quot;dnsmasq -- dhcp&amp;quot; para una lista de opciones "
 "disponibles."
 
 #. Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:266
-msgid "dhcp_leases"
+msgid "Leases"
 msgstr "Brindadas"
 
 #. Static Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:267
-msgid "luci_ethers"
+msgid "Static Leases"
 msgstr "Brindadas estáticamente"
 
 #. Leasetime remaining
 #: i18n/english/luasrc/i18n/admin-core.en.lua:268
-msgid "dhcp_timeremain"
+msgid "Leasetime remaining"
 msgstr "Tiempo de \"lease\" restante"
 
 #. Active Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:269
-msgid "dhcp_leases_active"
+msgid "Active Leases"
 msgstr "\"Leases\" activas"
 
 #. Point-to-Point Connections
 #: i18n/english/luasrc/i18n/admin-core.en.lua:270
-msgid "a_n_ptp"
+msgid "Point-to-Point Connections"
 msgstr "Conexiones punto-a-punto"
 
 #. Point-to-Point connections with <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> or <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr> are often used to connect a device over <abbr title=\"Digital Subscriber Line\">DSL</abbr> or similar technologies to an internet access point.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:271
-msgid "a_n_ptp1"
+msgid "Point-to-Point connections with <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> or <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr> are often used to connect a device over <abbr title=\"Digital Subscriber Line\">DSL</abbr> or similar technologies to an internet access point."
 msgstr ""
 "Las conexiones punto-a-punto los protocolos <abbr title=\"Point-to-Point "
 "Protocol over Ethernet\">PPPoE</abbr> o <abbr title=\"Point-to-Point Tunneling "
@@ -1540,7 +1540,7 @@ msgstr ""
 
 #. You need to install &quot;comgt&quot; for UMTS/GPRS, &quot;ppp-mod-pppoe&quot; for PPPoE, &quot;ppp-mod-pppoa&quot; for PPPoA or &quot;pptp&quot; for PPtP support
 #: i18n/english/luasrc/i18n/admin-core.en.lua:272
-msgid "network_interface_prereq"
+msgid "You need to install \"comgt\" for UMTS/GPRS, \"ppp-mod-pppoe\" for PPPoE, \"ppp-mod-pppoa\" for PPPoA or \"pptp\" for PPtP support"
 msgstr ""
 "Es necesario instalar &amp;quot;comgt&amp;quot; para UMTS/GPRS, &amp;quot"
 ";ppp-mod-pppoe&amp;quot; para PPPoE, &amp;quot;ppp-mod-pppoa&amp;quot; para "
@@ -1548,674 +1548,674 @@ msgstr ""
 
 #. You need to install &quot;ppp-mod-pppoe&quot; for PPPoE or &quot;pptp&quot; for PPtP support
 #: i18n/english/luasrc/i18n/admin-core.en.lua:273
-msgid "network_interface_prereq_mini"
+msgid "You need to install \"ppp-mod-pppoe\" for PPPoE or \"pptp\" for PPtP support"
 msgstr ""
 "Es necesario instalar &amp;quot;ppp-mod-pppoe&amp;quot; para PPPoE o "
 "&amp;quot;pptp&amp;quot; para PPtP support"
 
 #. <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:274
-msgid "network_interface_server"
+msgid "<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"
 msgstr "Servidor <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>"
 
 #. Automatic Disconnect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:275
-msgid "network_interface_demand"
+msgid "Automatic Disconnect"
 msgstr "Desconectar automáticamente"
 
 #. Time (in seconds) after which an unused connection will be closed
 #: i18n/english/luasrc/i18n/admin-core.en.lua:276
-msgid "network_interface_demand_desc"
+msgid "Time (in seconds) after which an unused connection will be closed"
 msgstr "Tiempo (en segundos) luego de que una conexión no usada será cerrada"
 
 #. Keep-Alive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:277
-msgid "network_interface_keepalive"
+msgid "Keep-Alive"
 msgstr "Mantener conectada"
 
 #. Number of failed connection tests to initiate automatic reconnect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:278
-msgid "network_interface_keepalive_desc"
+msgid "Number of failed connection tests to initiate automatic reconnect"
 msgstr ""
 "Número de tests de conexión fallida para iniciar la reconexión automática"
 
 #. Modem device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:279
-msgid "network_interface_device"
+msgid "Modem device"
 msgstr "Dispositivo de Modem"
 
 #. The device node of your modem, e.g. /dev/ttyUSB0
 #: i18n/english/luasrc/i18n/admin-core.en.lua:280
-msgid "network_interface_device_desc"
+msgid "The device node of your modem, e.g. /dev/ttyUSB0"
 msgstr "El nodo de dispositivo de su modem, ej. /dev/ttyUSB0"
 
 #. Replace default route
 #: i18n/english/luasrc/i18n/admin-core.en.lua:281
-msgid "network_interface_defaultroute"
+msgid "Replace default route"
 msgstr "Reemplazar la ruta por defecto"
 
 #. Let pppd replace the current default route to use the PPP interface after successful connect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:282
-msgid "network_interface_defaultroute_desc"
+msgid "Let pppd replace the current default route to use the PPP interface after successful connect"
 msgstr ""
 "Permite que pppd reemplace la ruta por defecto actual para usar la interfaz "
 "ppp como ruta por defecto luego de una conexión satisfactoria"
 
 #. Use peer DNS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:283
-msgid "network_interface_peerdns"
+msgid "Use peer DNS"
 msgstr "Uso de pares de DNS "
 
 #. Configure the local DNS server to use the name servers adverticed by the PPP peer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:284
-msgid "network_interface_peerdns_desc"
+msgid "Configure the local DNS server to use the name servers adverticed by the PPP peer"
 msgstr ""
 "Configurar el servidor DNS local para usar servidores de nombre sugeridos "
 "por el par PPP"
 
 #. Enable IPv6 on PPP link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:285
-msgid "network_interface_ipv6"
+msgid "Enable IPv6 on PPP link"
 msgstr "Ativar IPv6 sobre enlace PPP"
 
 #. Connect script
 #: i18n/english/luasrc/i18n/admin-core.en.lua:286
-msgid "network_interface_connect"
+msgid "Connect script"
 msgstr "Script de conexión"
 
 #. Let pppd run this script after establishing the PPP link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:287
-msgid "network_interface_connect_desc"
+msgid "Let pppd run this script after establishing the PPP link"
 msgstr "Permite a pppd ejecutar este script luego de establecer un enlace PPP"
 
 #. Disconnect script
 #: i18n/english/luasrc/i18n/admin-core.en.lua:288
-msgid "network_interface_disconnect"
+msgid "Disconnect script"
 msgstr "Script de desconexión"
 
 #. Let pppd run this script before tearing down the PPP link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:289
-msgid "network_interface_disconnect_desc"
+msgid "Let pppd run this script before tearing down the PPP link"
 msgstr "Permite a pppd ejecutar este script antes de terminar el enlace PPP"
 
 #. Additional pppd options
 #: i18n/english/luasrc/i18n/admin-core.en.lua:290
-msgid "network_interface_pppd_options"
+msgid "Additional pppd options"
 msgstr "Opciones adicional de pppd"
 
 #. Specify additional command line arguments for pppd here
 #: i18n/english/luasrc/i18n/admin-core.en.lua:291
-msgid "network_interface_pppd_options_desc"
+msgid "Specify additional command line arguments for pppd here"
 msgstr ""
 "Especifique aquí argumentos adicionales para la línea de comando de pppd"
 
 #. Access point (APN)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:292
-msgid "network_interface_apn"
+msgid "Access point (APN)"
 msgstr "Punto de acceso (APN)"
 
 #. PIN code
 #: i18n/english/luasrc/i18n/admin-core.en.lua:293
-msgid "network_interface_pincode"
+msgid "PIN code"
 msgstr "Código PIN"
 
 #. Make sure that you provide the correct pin code here or you might lock your sim card!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:294
-msgid "network_interface_pincode_desc"
+msgid "Make sure that you provide the correct pin code here or you might lock your sim card!"
 msgstr ""
 "Asegurese de escribir correctamente el código pin aquí caso contrario "
 "bloqueará su tarjeta sim!"
 
 #. Service type
 #: i18n/english/luasrc/i18n/admin-core.en.lua:295
-msgid "network_interface_service"
+msgid "Service type"
 msgstr "Tipo de servicio"
 
 #. Setup wait time
 #: i18n/english/luasrc/i18n/admin-core.en.lua:296
-msgid "network_interface_maxwait"
+msgid "Setup wait time"
 msgstr "Configurar tiempo de espera"
 
 #. Seconds to wait for the modem to become ready before attempting to connect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:297
-msgid "network_interface_maxwait_desc"
+msgid "Seconds to wait for the modem to become ready before attempting to connect"
 msgstr "Segundos a esperar al modem antes iniciar el intento de conexión"
 
 #. PPPoA Encapsulation
 #: i18n/english/luasrc/i18n/admin-core.en.lua:298
-msgid "network_interface_encaps"
+msgid "PPPoA Encapsulation"
 msgstr "Encapsulación PPPoA"
 
 #. Routes specify over which interface and gateway a certain host or network can be reached.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:299
-msgid "a_n_r_routes1"
+msgid "Routes specify over which interface and gateway a certain host or network can be reached."
 msgstr ""
 "Rutas a especificar sobre qué  interfaz y puerta de enlace cierto host o red "
 "a la que se puede llegar. "
 
 #. Static Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:300
-msgid "a_n_routes_static"
+msgid "Static Routes"
 msgstr "Rutas estáticas"
 
 #. Static IPv4 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:301
-msgid "a_n_routes_static4"
+msgid "Static IPv4 Routes"
 msgstr "Rutas estáticas IPv4"
 
 #. Static IPv6 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:302
-msgid "a_n_routes_static6"
+msgid "Static IPv6 Routes"
 msgstr "Rutas estáticas IPv6"
 
 #. Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:303
-msgid "a_n_routes_kernel4"
+msgid "Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes"
 msgstr "Rutas <abbr title=\"Internet Protocol Version 4\">IPv4</abbr> activas"
 
 #. Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:304
-msgid "a_n_routes_kernel6"
+msgid "Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes"
 msgstr "Rutas <abbr title=\"Internet Protocol Version 6\">IPv6</abbr> activas"
 
 #. Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:305
-msgid "a_n_r_target1"
+msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
 msgstr ""
 "Dirección <abbr title=\"Internet Protocol Address\">IP</abbr> de host o red"
 
 #. <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network (CIDR)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:306
-msgid "a_n_r_target6"
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network (CIDR)"
 msgstr ""
 "Dirección <abbr title=\"Internet Protocol Version 6\">IPv6</abbr> o (CIDR) de "
 "red"
 
 #. if target is a network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:307
-msgid "a_n_r_netmask1"
+msgid "if target is a network"
 msgstr "si el destino es una red"
 
 #. Internet Connection
 #: i18n/english/luasrc/i18n/admin-core.en.lua:308
-msgid "m_n_inet"
+msgid "Internet Connection"
 msgstr "Conexión a Internet "
 
 #. Local Network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:309
-msgid "m_n_local"
+msgid "Local Network"
 msgstr "Red local"
 
 #. Route
 #: i18n/english/luasrc/i18n/admin-core.en.lua:310
-msgid "m_n_route"
+msgid "Route"
 msgstr "Ruta"
 
 #. Bridge
 #: i18n/english/luasrc/i18n/admin-core.en.lua:311
-msgid "m_n_brdige"
+msgid "Bridge"
 msgstr "Puente"
 
 #. Provide (Access Point)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:312
-msgid "m_w_ap"
+msgid "Provide (Access Point)"
 msgstr "Proporcionar (Punto de Acceso) "
 
 #. Independent (Ad-Hoc)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:313
-msgid "m_w_adhoc"
+msgid "Independent (Ad-Hoc)"
 msgstr "Independiente (ad hoc) "
 
 #. Join (Client)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:314
-msgid "m_w_client"
+msgid "Join (Client)"
 msgstr "Únete (Cliente) "
 
 #. Distributed (<abbr title=\"Wireless Distribution System\">WDS</abbr>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:315
-msgid "m_w_wds"
+msgid "Distributed (<abbr title=\"Wireless Distribution System\">WDS</abbr>)"
 msgstr "Distribuído (<abbr title=\"Wireless Distribution System\">WDS</abbr>)"
 
 #. Clientmode
 #: i18n/english/luasrc/i18n/admin-core.en.lua:316
-msgid "m_w_clientmode"
+msgid "Clientmode"
 msgstr "Modo cliente"
 
 #. System log buffer size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:317
-msgid "system_system_logsize"
+msgid "System log buffer size"
 msgstr "Tamaño del buffer del registro de sistema"
 
 #. External system log server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:318
-msgid "system_system_logip"
+msgid "External system log server"
 msgstr "Servidor externo de registro de sistema"
 
 #. Log output level
 #: i18n/english/luasrc/i18n/admin-core.en.lua:319
-msgid "system_system_conloglevel"
+msgid "Log output level"
 msgstr "Nivel de salida del registro"
 
 #. Level of log messages on the console
 #: i18n/english/luasrc/i18n/admin-core.en.lua:320
-msgid "system_system_conloglevel_desc"
+msgid "Level of log messages on the console"
 msgstr "Nivel de mensajes de registro en la consola "
 
 #. Processor
 #: i18n/english/luasrc/i18n/admin-core.en.lua:321
-msgid "m_i_processor"
+msgid "Processor"
 msgstr "Procesador"
 
 #. Memory
 #: i18n/english/luasrc/i18n/admin-core.en.lua:322
-msgid "m_i_memory"
+msgid "Memory"
 msgstr "Memoria"
 
 #. Local Time
 #: i18n/english/luasrc/i18n/admin-core.en.lua:323
-msgid "m_i_systemtime"
+msgid "Local Time"
 msgstr "Hora local"
 
 #. Uptime
 #: i18n/english/luasrc/i18n/admin-core.en.lua:324
-msgid "m_i_uptime"
+msgid "Uptime"
 msgstr "Tiempo de actividad "
 
 #. First leased address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:325
-msgid "m_n_d_firstaddress"
+msgid "First leased address"
 msgstr "Primer dirección otorgada"
 
 #. Number of leased addresses
 #: i18n/english/luasrc/i18n/admin-core.en.lua:326
-msgid "m_n_d_numleases"
+msgid "Number of leased addresses"
 msgstr "Número de direcciones otorogada"
 
 #. Routing table
 #: i18n/english/luasrc/i18n/admin-core.en.lua:327
-msgid "routingtable"
+msgid "Routing table"
 msgstr "Tabla de enrutamiento "
 
 #. Wifi scan
 #: i18n/english/luasrc/i18n/admin-core.en.lua:328
-msgid "wlanscan"
+msgid "Wifi scan"
 msgstr "Wifi scan"
 
 #. Frequency
 #: i18n/english/luasrc/i18n/admin-core.en.lua:329
-msgid "frequency"
+msgid "Frequency"
 msgstr "Frecuencia"
 
 #. Power
 #: i18n/english/luasrc/i18n/admin-core.en.lua:330
-msgid "power"
+msgid "Power"
 msgstr "Potencia"
 
 #. Noise
 #: i18n/english/luasrc/i18n/admin-core.en.lua:331
-msgid "noise"
+msgid "Noise"
 msgstr "Ruído"
 
 #. Signal
 #: i18n/english/luasrc/i18n/admin-core.en.lua:332
-msgid "signal"
+msgid "Signal"
 msgstr "Señal"
 
 #. Link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:333
-msgid "link"
+msgid "Link"
 msgstr "Enlace"
 
 #. <abbr title=\"Fragmentation\">Frag.</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:334
-msgid "frag"
+msgid "<abbr title=\"Fragmentation\">Frag.</abbr>"
 msgstr "<abbr title=\"Fragmentación\">Frag.</abbr>"
 
 #. <abbr title=\"Request To Send\">RTS</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:335
-msgid "rts"
+msgid "<abbr title=\"Request To Send\">RTS</abbr>"
 msgstr "<abbr title=\"Request To Send\">RTS</abbr>"
 
 #. Bitrate
 #: i18n/english/luasrc/i18n/admin-core.en.lua:336
-msgid "bitrate"
+msgid "Bitrate"
 msgstr "Bitrate"
 
 #. automatically reconnect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:337
-msgid "m_n_keepalive"
+msgid "automatically reconnect"
 msgstr "reconectar automáticamente"
 
 #. disconnect when idle for
 #: i18n/english/luasrc/i18n/admin-core.en.lua:338
-msgid "m_n_dialondemand"
+msgid "disconnect when idle for"
 msgstr "desconecte cuando esté inactivo durante "
 
 #. <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:339
-msgid "m_n_pptp_server"
+msgid "<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"
 msgstr "Servidor <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>"
 
 #. <abbr title=\"Light Emitting Diode\">LED</abbr> Configuration
 #: i18n/english/luasrc/i18n/admin-core.en.lua:340
-msgid "leds"
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "Configuración de <abbr title=\"Light Emitting Diode\">LED</abbr>s"
 
 #. Customizes the behaviour of the device <abbr title=\"Light Emitting Diode\">LED</abbr>s if possible.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:341
-msgid "leds_desc"
+msgid "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode\">LED</abbr>s if possible."
 msgstr ""
 "Personaliza el comportamiento de los <abbr title=\"Light Emitting "
 "Diode\">LED</abbr>s del dispositivo, si es posible."
 
 #. <abbr title=\"Light Emitting Diode\">LED</abbr> Name
 #: i18n/english/luasrc/i18n/admin-core.en.lua:342
-msgid "system_led_name"
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr "Nombre del <abbr title=\"Light Emitting Diode\">LED</abbr>"
 
 #. <abbr title=\"Light Emitting Diode\">LED</abbr> Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:343
-msgid "system_led_sysfs"
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Device"
 msgstr "Disposito del <abbr title=\"Light Emitting Diode\">LED</abbr>"
 
 #. Default state
 #: i18n/english/luasrc/i18n/admin-core.en.lua:344
-msgid "system_led_default"
+msgid "Default state"
 msgstr "Estado por defecto"
 
 #. ticked = on
 #: i18n/english/luasrc/i18n/admin-core.en.lua:345
-msgid "system_led_default_desc"
+msgid "ticked = on"
 msgstr "marcado = encendido"
 
 #. Trigger
 #: i18n/english/luasrc/i18n/admin-core.en.lua:346
-msgid "system_led_trigger"
+msgid "Trigger"
 msgstr "Desencadenar "
 
 #. None
 #: i18n/english/luasrc/i18n/admin-core.en.lua:347
-msgid "system_led_trigger_none"
+msgid "None"
 msgstr "Ninguno"
 
 #. Default On
 #: i18n/english/luasrc/i18n/admin-core.en.lua:348
-msgid "system_led_trigger_defaulton"
+msgid "Default On"
 msgstr "Encendido por defecto"
 
 #. Timer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:349
-msgid "system_led_trigger_timer"
+msgid "Timer"
 msgstr "Temporizador "
 
 #. Heartbeat (Load Average)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:350
-msgid "system_led_trigger_heartbeat"
+msgid "Heartbeat (Load Average)"
 msgstr "Latido del corazón (carga media) "
 
 #. Network Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:351
-msgid "system_led_trigger_netdev"
+msgid "Network Device"
 msgstr "Dispositivo de red"
 
 #. Off-State Delay
 #: i18n/english/luasrc/i18n/admin-core.en.lua:352
-msgid "system_led_delayoff"
+msgid "Off-State Delay"
 msgstr "Retardo de Off-State"
 
 #. Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is off
 #: i18n/english/luasrc/i18n/admin-core.en.lua:353
-msgid "system_led_delayoff_desc"
+msgid "Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is off"
 msgstr ""
 "Tiempo (en ms) en el cual el <abbr title=\"Light Emitting Diode\">LED</abbr> "
 "permanece apagado"
 
 #. On-State Delay
 #: i18n/english/luasrc/i18n/admin-core.en.lua:354
-msgid "system_led_delayon"
+msgid "On-State Delay"
 msgstr "Retardo de On-State"
 
 #. Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is on
 #: i18n/english/luasrc/i18n/admin-core.en.lua:355
-msgid "system_led_delayon_desc"
+msgid "Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is on"
 msgstr ""
 "Tiempo (en ms) en el cual el <abbr title=\"Light Emitting Diode\">LED</abbr> "
 "permanece encendido"
 
 #. Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:356
-msgid "system_led_dev"
+msgid "Device"
 msgstr "Dispositivo"
 
 #. Trigger Mode
 #: i18n/english/luasrc/i18n/admin-core.en.lua:357
-msgid "system_led_mode"
+msgid "Trigger Mode"
 msgstr "Modo de activación "
 
 #. Link On
 #: i18n/english/luasrc/i18n/admin-core.en.lua:358
-msgid "system_led_mode_link"
+msgid "Link On"
 msgstr "Link On"
 
 #. Transmit
 #: i18n/english/luasrc/i18n/admin-core.en.lua:359
-msgid "system_led_mode_tx"
+msgid "Transmit"
 msgstr "Transmitir"
 
 #. Receive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:360
-msgid "system_led_mode_rx"
+msgid "Receive"
 msgstr "Recibir "
 
 #. Active
 #: i18n/english/luasrc/i18n/admin-core.en.lua:361
-msgid "network_interface_up"
+msgid "Active"
 msgstr "Activo"
 
 #. <abbr title=\"Media Access Control\">MAC</abbr>-Address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:362
-msgid "network_interface_hwaddr"
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr "Dirección <abbr title=\"Media Access Control\">MAC</abbr>"
 
 #. Hardware Address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:363
-msgid "network_interface_hwaddr_desc"
+msgid "Hardware Address"
 msgstr "Dirección de Hardware"
 
 #. Traffic
 #: i18n/english/luasrc/i18n/admin-core.en.lua:364
-msgid "network_interface_txrx"
+msgid "Traffic"
 msgstr "Tráfico"
 
 #. transmitted / received
 #: i18n/english/luasrc/i18n/admin-core.en.lua:365
-msgid "network_interface_txrx_desc"
+msgid "transmitted / received"
 msgstr "transmitido / recibido"
 
 #. Errors
 #: i18n/english/luasrc/i18n/admin-core.en.lua:366
-msgid "network_interface_err"
+msgid "Errors"
 msgstr "Errores"
 
 #. TX / RX
 #: i18n/english/luasrc/i18n/admin-core.en.lua:367
-msgid "network_interface_err_desc"
+msgid "TX / RX"
 msgstr "Tx / Rx"
 
 #. Create / Assign firewall-zone
 #: i18n/english/luasrc/i18n/admin-core.en.lua:368
-msgid "network_interface_fwzone"
+msgid "Create / Assign firewall-zone"
 msgstr "Crear / Asignar zona de seguridad "
 
 #. This interface does not belong to any firewall zone yet.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:369
-msgid "network_interface_fwzone_desc"
+msgid "Choose the firewall zone you want to assign to this interface. Select <em>unspecified</em> to remove the interface from the associated zone or fill out the <em>create</em> field to define a new zone and attach the interface to it."
 msgstr "Esta interfaz no pertenece a ninguna zona del corta fuego aún."
 
 #. Processes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:370
-msgid "process_head"
+msgid "Processes"
 msgstr "Procesos"
 
 #. This list gives an overview over currently running system processes and their status.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:371
-msgid "process_descr"
+msgid "This list gives an overview over currently running system processes and their status."
 msgstr ""
 "Esta lista brinda un pantallaso general acerca de los procesos de sistema "
 "que se encuentra ejecutando actualmente y su estado relacionado."
 
 #. PID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:372
-msgid "process_pid"
+msgid "PID"
 msgstr "PID"
 
 #. Owner
 #: i18n/english/luasrc/i18n/admin-core.en.lua:373
-msgid "process_owner"
+msgid "Owner"
 msgstr "Dueño"
 
 #. Command
 #: i18n/english/luasrc/i18n/admin-core.en.lua:374
-msgid "process_command"
+msgid "Command"
 msgstr "Comando"
 
 #. CPU usage (%)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:375
-msgid "process_cpu"
+msgid "CPU usage (%)"
 msgstr "Uso de la CPU (%)"
 
 #. Memory usage (%)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:376
-msgid "process_mem"
+msgid "Memory usage (%)"
 msgstr "Uso de la Memoria (%)"
 
 #. Hang Up
 #: i18n/english/luasrc/i18n/admin-core.en.lua:377
-msgid "process_hup"
+msgid "Hang Up"
 msgstr "Colgar"
 
 #. Terminate
 #: i18n/english/luasrc/i18n/admin-core.en.lua:378
-msgid "process_term"
+msgid "Terminate"
 msgstr "Terminar"
 
 #. Kill
 #: i18n/english/luasrc/i18n/admin-core.en.lua:379
-msgid "process_kill"
+msgid "Kill"
 msgstr "Matar"
 
 #. cached
 #: i18n/english/luasrc/i18n/admin-core.en.lua:380
-msgid "mem_cached"
+msgid "cached"
 msgstr "en caché "
 
 #. buffered
 #: i18n/english/luasrc/i18n/admin-core.en.lua:381
-msgid "mem_buffered"
+msgid "buffered"
 msgstr "buffered"
 
 #. free
 #: i18n/english/luasrc/i18n/admin-core.en.lua:382
-msgid "mem_free"
+msgid "free"
 msgstr "libre"
 
 #. Scheduled Tasks
 #: i18n/english/luasrc/i18n/admin-core.en.lua:383
-msgid "a_s_crontab"
+msgid "Scheduled Tasks"
 msgstr "Tareas programadas"
 
 #. This is the system crontab in which scheduled tasks can be defined.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:384
-msgid "a_s_crontab1"
+msgid "This is the system crontab in which scheduled tasks can be defined."
 msgstr ""
 "Este es el crontab del sistema en el que las tareas programadas son "
 "definidas"
 
 #. NAS ID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:385
-msgid "a_w_nasid"
+msgid "NAS ID"
 msgstr "NAS ID"
 
 #. Path to CA-Certificate
 #: i18n/english/luasrc/i18n/admin-core.en.lua:386
-msgid "a_w_cacert"
+msgid "Path to CA-Certificate"
 msgstr "Ruta al Certificado CA"
 
 #. EAP-Method
 #: i18n/english/luasrc/i18n/admin-core.en.lua:387
-msgid "a_w_eaptype"
+msgid "EAP-Method"
 msgstr "Método EAP"
 
 #. Path to Private Key
 #: i18n/english/luasrc/i18n/admin-core.en.lua:388
-msgid "a_w_tlsprivkey"
+msgid "Path to Private Key"
 msgstr "Ruta a la Clave Privada"
 
 #. Password of Private Key
 #: i18n/english/luasrc/i18n/admin-core.en.lua:389
-msgid "a_w_tlsprivkeypwd"
+msgid "Password of Private Key"
 msgstr "Contraseña de la Clave Privada"
 
 #. Authentication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:390
-msgid "a_w_peapauth"
+msgid "Authentication"
 msgstr "Autenticación"
 
 #. Identity
 #: i18n/english/luasrc/i18n/admin-core.en.lua:391
-msgid "a_w_peapidentity"
+msgid "Identity"
 msgstr "Identidad"
 
 #. Password
 #: i18n/english/luasrc/i18n/admin-core.en.lua:392
-msgid "a_w_peappassword"
+msgid "Password"
 msgstr "Contraseña"
 
 #. Create Network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:393
-msgid "a_w_create"
+msgid "Create Network"
 msgstr "Crear red"
 
 #. Hostnames
 #: i18n/english/luasrc/i18n/admin-core.en.lua:394
-msgid "hostnames"
+msgid "Hostnames"
 msgstr "Nombres de host"
 
 #. Host entries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:395
-msgid "hostnames_entries"
+msgid "Host entries"
 msgstr "Entradas de host"
 
 #. Hostname
 #: i18n/english/luasrc/i18n/admin-core.en.lua:396
-msgid "hostnames_hostname"
+msgid "Hostname"
 msgstr "Nombre de host"
 
 #. IP address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:397
-msgid "hostnames_address"
+msgid "IP address"
 msgstr "Dirección IP"
 
 #. Clamp Segment Size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:398
-msgid "m_n_mssfix"
+msgid "Clamp Segment Size"
 msgstr "Tamaño del segmento de la abrazadera"
 
 #. Fixes problems with unreachable websites, submitting forms or other unexpected behaviour for some ISPs.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:399
-msgid "m_n_mssfix_desc"
+msgid "Fixes problems with unreachable websites, submitting forms or other unexpected behaviour for some ISPs."
 msgstr ""
 "Correge problemas con los sitios web inaccesibles, envío de formularios o "
 "una conducta inesperada para algunos proveedores de servicios de Internet."
 
 #. Flash Firmware
 #: i18n/english/luasrc/i18n/admin-core.en.lua:400
-msgid "admin_upgrade"
+msgid "Flash Firmware"
 msgstr "Flash Firmware"
 
 #. The uploaded image file does not contain a supported format. Make sure that you choose the generic image format for your platform.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:401
-msgid "admin_upgrade_badimage"
+msgid "The uploaded image file does not contain a supported format. Make sure that you choose the generic image format for your platform."
 msgstr ""
 "El archivo con la imágen del firmware subido, presenta un formato de archivo "
 "no soportado. Asegurese de haber elegido una imágen genérica para su "
@@ -2223,34 +2223,34 @@ msgstr ""
 
 #. Checksum
 #: i18n/english/luasrc/i18n/admin-core.en.lua:402
-msgid "admin_upgrade_checksum"
+msgid "Checksum"
 msgstr "Checksum"
 
 #. Upload an OpenWrt image file to reflash the device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:403
-msgid "admin_upgrade_desc"
+msgid "Upload an OpenWrt image file to reflash the device."
 msgstr ""
 "Subir un archivo de imágen de OpenWrt o derivado para re-flashear el "
 "dispositivo."
 
 #. Size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:404
-msgid "admin_upgrade_filesize"
+msgid "Size"
 msgstr "Tamaño"
 
 #. Firmware image
 #: i18n/english/luasrc/i18n/admin-core.en.lua:405
-msgid "admin_upgrade_fwimage"
+msgid "Firmware image"
 msgstr "Imágen del firmware"
 
 #. Keep configuration files
 #: i18n/english/luasrc/i18n/admin-core.en.lua:406
-msgid "admin_upgrade_keepcfg"
+msgid "Keep configuration files"
 msgstr "Mantener archivos de configuración"
 
 #. Sorry. OpenWrt does not support a system upgrade on this platform.<br /> You need to manually flash your device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:407
-msgid "admin_upgrade_nosupport"
+msgid "Sorry. OpenWrt does not support a system upgrade on this platform.<br /> You need to manually flash your device."
 msgstr ""
 "Lo lamento. OpenWrt y derivados no permite la actualización de esta "
 "plataforma. <br /> Para poder flashear este dispositivo deberá hacerlo en "
@@ -2258,7 +2258,7 @@ msgstr ""
 
 #. The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a few minutes until you try to reconnect. It might be necessary to renew the address of your computer to reach the device again, depending on your settings.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:408
-msgid "admin_upgrade_running"
+msgid "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a few minutes until you try to reconnect. It might be necessary to renew the address of your computer to reach the device again, depending on your settings."
 msgstr ""
 "El sistema está siendo flasheado.<br /> NO APAGUE EL DISPOSITIVO!<br /> "
 "Espere unos minutos antes de intentar reconectarse. Posiblemente sea "
@@ -2267,21 +2267,21 @@ msgstr ""
 
 #.  (%s available)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:409
-msgid "admin_upgrade_spaceavail"
+msgid " (%s available)"
 msgstr ""
 "<span class=\"translation-space\"> </span>\n"
 "(%s disponible)"
 
 #. It appears that you try to flash an image that does not fit into the flash memory, please verify the image file!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:410
-msgid "admin_upgrade_toolarge"
+msgid "It appears that you try to flash an image that does not fit into the flash memory, please verify the image file!"
 msgstr ""
 "Aparentemente está intentando flashear con una imágen de firmware que no "
 "entra en la memoria flash de su equipo, por favor verifique el archivo!"
 
 #. Upload image
 #: i18n/english/luasrc/i18n/admin-core.en.lua:411
-msgid "admin_upgrade_upload"
+msgid "Upload image"
 msgstr "Subir imágen"
 
 #. The flash image was uploaded. Below is the checksum and file size listed, compare them with the original file to ensure data integrity.<br /> Click \"Proceed\" below to start the flash procedure.
diff --git a/po/es/asterisk.po b/po/es/asterisk.po
index 3969b2fb6..45f95cd5b 100644
--- a/po/es/asterisk.po
+++ b/po/es/asterisk.po
@@ -14,1252 +14,1252 @@ msgstr ""
 
 #. Asterisk General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:1
-msgid "asterisk_asterisk"
+msgid "Asterisk General Options"
 msgstr ""
 
 #. AGI directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:2
-msgid "asterisk_asterisk_agidir"
+msgid "AGI directory"
 msgstr ""
 
 #. Cache recorded sound files during recording
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:3
-msgid "asterisk_asterisk_cacherecordfiles"
+msgid "Cache recorded sound files during recording"
 msgstr ""
 
 #. Debug Level
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:4
-msgid "asterisk_asterisk_debug"
+msgid "Debug Level"
 msgstr ""
 
 #. Disable some warnings
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:5
-msgid "asterisk_asterisk_dontwarn"
+msgid "Disable some warnings"
 msgstr ""
 
 #. Dump core on crash
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:6
-msgid "asterisk_asterisk_dumpcore"
+msgid "Dump core on crash"
 msgstr ""
 
 #. High Priority
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:7
-msgid "asterisk_asterisk_highpriority"
+msgid "High Priority"
 msgstr ""
 
 #. Initialise Crypto
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:8
-msgid "asterisk_asterisk_initcrypto"
+msgid "Initialise Crypto"
 msgstr ""
 
 #. Use Internal Timing
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:9
-msgid "asterisk_asterisk_internaltiming"
+msgid "Use Internal Timing"
 msgstr ""
 
 #. Log directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:10
-msgid "asterisk_asterisk_logdir"
+msgid "Log directory"
 msgstr ""
 
 #. Maximum number of calls allowed
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:11
-msgid "asterisk_asterisk_maxcalls"
+msgid "Maximum number of calls allowed"
 msgstr ""
 
 #. Maximum load to stop accepting new calls
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:12
-msgid "asterisk_asterisk_maxload"
+msgid "Maximum load to stop accepting new calls"
 msgstr ""
 
 #. Disable console colors
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:13
-msgid "asterisk_asterisk_nocolor"
+msgid "Disable console colors"
 msgstr ""
 
 #. Sound files Cache directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:14
-msgid "asterisk_asterisk_recordcachedir"
+msgid "Sound files Cache directory"
 msgstr ""
 
 #. The Group to run as
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:15
-msgid "asterisk_asterisk_rungroup"
+msgid "The Group to run as"
 msgstr ""
 
 #. The User to run as
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:16
-msgid "asterisk_asterisk_runuser"
+msgid "The User to run as"
 msgstr ""
 
 #. Voicemail Spool directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:17
-msgid "asterisk_asterisk_spooldir"
+msgid "Voicemail Spool directory"
 msgstr ""
 
 #. Prefix UniquID with system name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:18
-msgid "asterisk_asterisk_systemname"
+msgid "Prefix UniquID with system name"
 msgstr ""
 
 #. Build transcode paths via SLINEAR, not directly
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:19
-msgid "asterisk_asterisk_transcodeviasln"
+msgid "Build transcode paths via SLINEAR, not directly"
 msgstr ""
 
 #. Transmit SLINEAR silence while recording a channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:20
-msgid "asterisk_asterisk_transmitsilenceduringrecord"
+msgid "Transmit SLINEAR silence while recording a channel"
 msgstr ""
 
 #. Verbose Level
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:21
-msgid "asterisk_asterisk_verbose"
+msgid "Verbose Level"
 msgstr ""
 
 #. Time Zone
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:22
-msgid "asterisk_asterisk_zone"
+msgid "Time Zone"
 msgstr ""
 
 #. Section dialplan
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:23
-msgid "asterisk_dialplan"
+msgid "Section dialplan"
 msgstr ""
 
 #. include
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:24
-msgid "asterisk_dialplan_include"
+msgid "include"
 msgstr ""
 
 #. Dialplan Extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:25
-msgid "asterisk_dialplanexten"
+msgid "Dialplan Extension"
 msgstr ""
 
 #. Dialplan General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:26
-msgid "asterisk_dialplangeneral"
+msgid "Dialplan General Options"
 msgstr ""
 
 #. Allow transfer
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:27
-msgid "asterisk_dialplangeneral_allowtransfer"
+msgid "Allow transfer"
 msgstr ""
 
 #. Reinvite/redirect media connections
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:28
-msgid "asterisk_dialplangeneral_canreinvite"
+msgid "Reinvite/redirect media connections"
 msgstr ""
 
 #. Clear global vars
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:29
-msgid "asterisk_dialplangeneral_clearglobalvars"
+msgid "Clear global vars"
 msgstr ""
 
 #. Dialplan Goto
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:30
-msgid "asterisk_dialplangoto"
+msgid "Dialplan Goto"
 msgstr ""
 
 #. Dialplan Conference
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:31
-msgid "asterisk_dialplanmeetme"
+msgid "Dialplan Conference"
 msgstr ""
 
 #. Dialplan Time
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:32
-msgid "asterisk_dialplansaytime"
+msgid "Dialplan Time"
 msgstr ""
 
 #. Dialplan Voicemail
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:33
-msgid "asterisk_dialplanvoice"
+msgid "Dialplan Voicemail"
 msgstr ""
 
 #. Dial Zones for Dialplan
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:34
-msgid "asterisk_dialzone"
+msgid "Dial Zones for Dialplan"
 msgstr ""
 
 #. Prefix to add matching dialplans
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:35
-msgid "asterisk_dialzone_addprefix"
+msgid "Prefix to add matching dialplans"
 msgstr ""
 
 #. Match International prefix
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:36
-msgid "asterisk_dialzone_international"
+msgid "Match International prefix"
 msgstr ""
 
 #. Prefix (0) to add/remove to/from international numbers
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:37
-msgid "asterisk_dialzone_localprefix"
+msgid "Prefix (0) to add/remove to/from international numbers"
 msgstr ""
 
 #. localzone
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:38
-msgid "asterisk_dialzone_localzone"
+msgid "localzone"
 msgstr ""
 
 #. Match plan
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:39
-msgid "asterisk_dialzone_match"
+msgid "Match plan"
 msgstr ""
 
 #. Connection to use
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:40
-msgid "asterisk_dialzone_uses"
+msgid "Connection to use"
 msgstr ""
 
 #. Feature Key maps
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:41
-msgid "asterisk_featuremap"
+msgid "Feature Key maps"
 msgstr ""
 
 #. Attended transfer key
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:42
-msgid "asterisk_featuremap_atxfer"
+msgid "Attended transfer key"
 msgstr ""
 
 #. Blind transfer key
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:43
-msgid "asterisk_featuremap_blindxfer"
+msgid "Blind transfer key"
 msgstr ""
 
 #. Key to Disconnect call
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:44
-msgid "asterisk_featuremap_disconnect"
+msgid "Key to Disconnect call"
 msgstr ""
 
 #. Key to Park call
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:45
-msgid "asterisk_featuremap_parkcall"
+msgid "Key to Park call"
 msgstr ""
 
 #. Parking Feature
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:46
-msgid "asterisk_featurepark"
+msgid "Parking Feature"
 msgstr ""
 
 #. ADSI Park
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:47
-msgid "asterisk_featurepark_adsipark"
+msgid "ADSI Park"
 msgstr ""
 
 #. Attended transfer timeout (sec)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:48
-msgid "asterisk_featurepark_atxfernoanswertimeout"
+msgid "Attended transfer timeout (sec)"
 msgstr ""
 
 #. One touch record key
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:49
-msgid "asterisk_featurepark_automon"
+msgid "One touch record key"
 msgstr ""
 
 #. Name of call context for parking
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:50
-msgid "asterisk_featurepark_context"
+msgid "Name of call context for parking"
 msgstr ""
 
 #. Sound file to play to parked caller
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:51
-msgid "asterisk_featurepark_courtesytone"
+msgid "Sound file to play to parked caller"
 msgstr ""
 
 #. Max time (ms) between digits for feature activation
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:52
-msgid "asterisk_featurepark_featuredigittimeout"
+msgid "Max time (ms) between digits for feature activation"
 msgstr ""
 
 #. Method to Find Parking slot
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:53
-msgid "asterisk_featurepark_findslot"
+msgid "Method to Find Parking slot"
 msgstr ""
 
 #. parkedmusicclass
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:54
-msgid "asterisk_featurepark_parkedmusicclass"
+msgid "parkedmusicclass"
 msgstr ""
 
 #. Play courtesy tone to
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:55
-msgid "asterisk_featurepark_parkedplay"
+msgid "Play courtesy tone to"
 msgstr ""
 
 #. Enable Parking
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:56
-msgid "asterisk_featurepark_parkenabled"
+msgid "Enable Parking"
 msgstr ""
 
 #. Extension to dial to park
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:57
-msgid "asterisk_featurepark_parkext"
+msgid "Extension to dial to park"
 msgstr ""
 
 #. Parking time (secs)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:58
-msgid "asterisk_featurepark_parkingtime"
+msgid "Parking time (secs)"
 msgstr ""
 
 #. Range of extensions for call parking
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:59
-msgid "asterisk_featurepark_parkpos"
+msgid "Range of extensions for call parking"
 msgstr ""
 
 #. Pickup extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:60
-msgid "asterisk_featurepark_pickupexten"
+msgid "Pickup extension"
 msgstr ""
 
 #. Seconds to wait bewteen digits when transferring
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:61
-msgid "asterisk_featurepark_transferdigittimeout"
+msgid "Seconds to wait bewteen digits when transferring"
 msgstr ""
 
 #. sound when attended transfer is complete
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:62
-msgid "asterisk_featurepark_xferfailsound"
+msgid "sound when attended transfer is complete"
 msgstr ""
 
 #. Sound when attended transfer fails
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:63
-msgid "asterisk_featurepark_xfersound"
+msgid "Sound when attended transfer fails"
 msgstr ""
 
 #. Reload Hardware Config
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:64
-msgid "asterisk_hardwarereboot"
+msgid "Reload Hardware Config"
 msgstr ""
 
 #. Reboot Method
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:65
-msgid "asterisk_hardwarereboot_method"
+msgid "Reboot Method"
 msgstr ""
 
 #. Parameter
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:66
-msgid "asterisk_hardwarereboot_param"
+msgid "Parameter"
 msgstr ""
 
 #. SIP Connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:67
-msgid "asterisk_iax"
+msgid "SIP Connection"
 msgstr ""
 
 #. Always Dial International
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:68
-msgid "asterisk_iax_alwaysinternational"
+msgid "Always Dial International"
 msgstr ""
 
 #. context
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:69
-msgid "asterisk_iax_context"
+msgid "context"
 msgstr ""
 
 #. Country Code for connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:70
-msgid "asterisk_iax_countrycode"
+msgid "Country Code for connection"
 msgstr ""
 
 #. Add as Extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:71
-msgid "asterisk_iax_extension"
+msgid "Add as Extension"
 msgstr ""
 
 #. Host name (or blank)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:72
-msgid "asterisk_iax_host"
+msgid "Host name (or blank)"
 msgstr ""
 
 #. International Dial Prefix
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:73
-msgid "asterisk_iax_internationalprefix"
+msgid "International Dial Prefix"
 msgstr ""
 
 #. Dial Prefix (for external line)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:74
-msgid "asterisk_iax_prefix"
+msgid "Dial Prefix (for external line)"
 msgstr ""
 
 #. Secret
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:75
-msgid "asterisk_iax_secret"
+msgid "Secret"
 msgstr ""
 
 #. Dial Timeout (sec)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:76
-msgid "asterisk_iax_timeout"
+msgid "Dial Timeout (sec)"
 msgstr ""
 
 #. Option type
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:77
-msgid "asterisk_iax_type"
+msgid "Option type"
 msgstr ""
 
 #. User name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:78
-msgid "asterisk_iax_username"
+msgid "User name"
 msgstr ""
 
 #. IAX General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:79
-msgid "asterisk_iaxgeneral"
+msgid "IAX General Options"
 msgstr ""
 
 #. Allow Codecs
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:80
-msgid "asterisk_iaxgeneral_allow"
+msgid "Allow Codecs"
 msgstr ""
 
 #. Reinvite/redirect media connections
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:81
-msgid "asterisk_iaxgeneral_canreinvite"
+msgid "Reinvite/redirect media connections"
 msgstr ""
 
 #. Static
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:82
-msgid "asterisk_iaxgeneral_static"
+msgid "Static"
 msgstr ""
 
 #. Write Protect
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:83
-msgid "asterisk_iaxgeneral_writeprotect"
+msgid "Write Protect"
 msgstr ""
 
 #. Meetme Conference
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:84
-msgid "asterisk_meetme"
+msgid "Meetme Conference"
 msgstr ""
 
 #. Admin PIN
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:85
-msgid "asterisk_meetme_adminpin"
+msgid "Admin PIN"
 msgstr ""
 
 #. Meeting PIN
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:86
-msgid "asterisk_meetme_pin"
+msgid "Meeting PIN"
 msgstr ""
 
 #. Meetme Conference General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:87
-msgid "asterisk_meetmegeneral"
+msgid "Meetme Conference General Options"
 msgstr ""
 
 #. Number of 20ms audio buffers to be used
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:88
-msgid "asterisk_meetmegeneral_audiobuffers"
+msgid "Number of 20ms audio buffers to be used"
 msgstr ""
 
 #. Modules
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:89
-msgid "asterisk_module"
+msgid "Modules"
 msgstr ""
 
 #. Alarm Receiver Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:90
-msgid "asterisk_module_appalarmreceiver"
+msgid "Alarm Receiver Application"
 msgstr ""
 
 #. Authentication Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:91
-msgid "asterisk_module_appauthenticate"
+msgid "Authentication Application"
 msgstr ""
 
 #. Make sure asterisk doesnt save CDR
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:92
-msgid "asterisk_module_appcdr"
+msgid "Make sure asterisk doesnt save CDR"
 msgstr ""
 
 #. Check if channel is available
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:93
-msgid "asterisk_module_appchanisavail"
+msgid "Check if channel is available"
 msgstr ""
 
 #. Listen in on any channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:94
-msgid "asterisk_module_appchanspy"
+msgid "Listen in on any channel"
 msgstr ""
 
 #. Control Playback Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:95
-msgid "asterisk_module_appcontrolplayback"
+msgid "Control Playback Application"
 msgstr ""
 
 #. Cuts up variables
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:96
-msgid "asterisk_module_appcut"
+msgid "Cuts up variables"
 msgstr ""
 
 #. Database access functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:97
-msgid "asterisk_module_appdb"
+msgid "Database access functions"
 msgstr ""
 
 #. Dialing Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:98
-msgid "asterisk_module_appdial"
+msgid "Dialing Application"
 msgstr ""
 
 #. Virtual Dictation Machine Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:99
-msgid "asterisk_module_appdictate"
+msgid "Virtual Dictation Machine Application"
 msgstr ""
 
 #. Directed Call Pickup Support
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:100
-msgid "asterisk_module_appdirectedpickup"
+msgid "Directed Call Pickup Support"
 msgstr ""
 
 #. Extension Directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:101
-msgid "asterisk_module_appdirectory"
+msgid "Extension Directory"
 msgstr ""
 
 #. DISA (Direct Inward System Access) Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:102
-msgid "asterisk_module_appdisa"
+msgid "DISA (Direct Inward System Access) Application"
 msgstr ""
 
 #. Dump channel variables Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:103
-msgid "asterisk_module_appdumpchan"
+msgid "Dump channel variables Application"
 msgstr ""
 
 #. Simple Echo Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:104
-msgid "asterisk_module_appecho"
+msgid "Simple Echo Application"
 msgstr ""
 
 #. ENUM Lookup
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:105
-msgid "asterisk_module_appenumlookup"
+msgid "ENUM Lookup"
 msgstr ""
 
 #. Reevaluates strings
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:106
-msgid "asterisk_module_appeval"
+msgid "Reevaluates strings"
 msgstr ""
 
 #. Executes applications
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:107
-msgid "asterisk_module_appexec"
+msgid "Executes applications"
 msgstr ""
 
 #. External IVR application interface
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:108
-msgid "asterisk_module_appexternalivr"
+msgid "External IVR application interface"
 msgstr ""
 
 #. Fork The CDR into 2 seperate entities
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:109
-msgid "asterisk_module_appforkcdr"
+msgid "Fork The CDR into 2 seperate entities"
 msgstr ""
 
 #. Get ADSI CPE ID
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:110
-msgid "asterisk_module_appgetcpeid"
+msgid "Get ADSI CPE ID"
 msgstr ""
 
 #. Group Management Routines
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:111
-msgid "asterisk_module_appgroupcount"
+msgid "Group Management Routines"
 msgstr ""
 
 #. Encode and Stream via icecast and ices
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:112
-msgid "asterisk_module_appices"
+msgid "Encode and Stream via icecast and ices"
 msgstr ""
 
 #. Image Transmission Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:113
-msgid "asterisk_module_appimage"
+msgid "Image Transmission Application"
 msgstr ""
 
 #. Look up Caller*ID name/number from black
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:114
-msgid "asterisk_module_applookupblacklist"
+msgid "Look up Caller*ID name/number from black"
 msgstr ""
 
 #. Look up CallerID Name from local databas
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:115
-msgid "asterisk_module_applookupcidname"
+msgid "Look up CallerID Name from local databas"
 msgstr ""
 
 #. Extension Macros
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:116
-msgid "asterisk_module_appmacro"
+msgid "Extension Macros"
 msgstr ""
 
 #. A simple math Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:117
-msgid "asterisk_module_appmath"
+msgid "A simple math Application"
 msgstr ""
 
 #. MD5 checksum Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:118
-msgid "asterisk_module_appmd5"
+msgid "MD5 checksum Application"
 msgstr ""
 
 #. Digital Milliwatt (mu-law) Test Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:119
-msgid "asterisk_module_appmilliwatt"
+msgid "Digital Milliwatt (mu-law) Test Application"
 msgstr ""
 
 #. Record a call and mix the audio during the recording
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:120
-msgid "asterisk_module_appmixmonitor"
+msgid "Record a call and mix the audio during the recording"
 msgstr ""
 
 #. Call Parking and Announce Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:121
-msgid "asterisk_module_appparkandannounce"
+msgid "Call Parking and Announce Application"
 msgstr ""
 
 #. Trivial Playback Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:122
-msgid "asterisk_module_appplayback"
+msgid "Trivial Playback Application"
 msgstr ""
 
 #. Require phone number to be entered
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:123
-msgid "asterisk_module_appprivacy"
+msgid "Require phone number to be entered"
 msgstr ""
 
 #. True Call Queueing
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:124
-msgid "asterisk_module_appqueue"
+msgid "True Call Queueing"
 msgstr ""
 
 #. Random goto
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:125
-msgid "asterisk_module_apprandom"
+msgid "Random goto"
 msgstr ""
 
 #. Read Variable Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:126
-msgid "asterisk_module_appread"
+msgid "Read Variable Application"
 msgstr ""
 
 #. Read in a file
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:127
-msgid "asterisk_module_appreadfile"
+msgid "Read in a file"
 msgstr ""
 
 #. Realtime Data Lookup/Rewrite
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:128
-msgid "asterisk_module_apprealtime"
+msgid "Realtime Data Lookup/Rewrite"
 msgstr ""
 
 #. Trivial Record Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:129
-msgid "asterisk_module_apprecord"
+msgid "Trivial Record Application"
 msgstr ""
 
 #. Say time
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:130
-msgid "asterisk_module_appsayunixtime"
+msgid "Say time"
 msgstr ""
 
 #. Send DTMF digits Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:131
-msgid "asterisk_module_appsenddtmf"
+msgid "Send DTMF digits Application"
 msgstr ""
 
 #. Send Text Applications
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:132
-msgid "asterisk_module_appsendtext"
+msgid "Send Text Applications"
 msgstr ""
 
 #. Set CallerID Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:133
-msgid "asterisk_module_appsetcallerid"
+msgid "Set CallerID Application"
 msgstr ""
 
 #. CDR user field apps
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:134
-msgid "asterisk_module_appsetcdruserfield"
+msgid "CDR user field apps"
 msgstr ""
 
 #. load =&gt; .so ; Set CallerID Name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:135
-msgid "asterisk_module_appsetcidname"
+msgid "load => .so ; Set CallerID Name"
 msgstr ""
 
 #. load =&gt; .so ; Set CallerID Number
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:136
-msgid "asterisk_module_appsetcidnum"
+msgid "load => .so ; Set CallerID Number"
 msgstr ""
 
 #. Set RDNIS Number
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:137
-msgid "asterisk_module_appsetrdnis"
+msgid "Set RDNIS Number"
 msgstr ""
 
 #. Set ISDN Transfer Capability
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:138
-msgid "asterisk_module_appsettransfercapability"
+msgid "Set ISDN Transfer Capability"
 msgstr ""
 
 #. SMS/PSTN handler
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:139
-msgid "asterisk_module_appsms"
+msgid "SMS/PSTN handler"
 msgstr ""
 
 #. Hangs up the requested channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:140
-msgid "asterisk_module_appsofthangup"
+msgid "Hangs up the requested channel"
 msgstr ""
 
 #. Stack Routines
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:141
-msgid "asterisk_module_appstack"
+msgid "Stack Routines"
 msgstr ""
 
 #. Generic System() application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:142
-msgid "asterisk_module_appsystem"
+msgid "Generic System() application"
 msgstr ""
 
 #. Playback with Talk Detection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:143
-msgid "asterisk_module_apptalkdetect"
+msgid "Playback with Talk Detection"
 msgstr ""
 
 #. Interface Test Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:144
-msgid "asterisk_module_apptest"
+msgid "Interface Test Application"
 msgstr ""
 
 #. Transfer
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:145
-msgid "asterisk_module_apptransfer"
+msgid "Transfer"
 msgstr ""
 
 #. TXTCIDName
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:146
-msgid "asterisk_module_apptxtcidname"
+msgid "TXTCIDName"
 msgstr ""
 
 #. Send URL Applications
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:147
-msgid "asterisk_module_appurl"
+msgid "Send URL Applications"
 msgstr ""
 
 #. Custom User Event Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:148
-msgid "asterisk_module_appuserevent"
+msgid "Custom User Event Application"
 msgstr ""
 
 #. Send verbose output
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:149
-msgid "asterisk_module_appverbose"
+msgid "Send verbose output"
 msgstr ""
 
 #. Voicemail
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:150
-msgid "asterisk_module_appvoicemail"
+msgid "Voicemail"
 msgstr ""
 
 #. Waits until first ring after time
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:151
-msgid "asterisk_module_appwaitforring"
+msgid "Waits until first ring after time"
 msgstr ""
 
 #. Wait For Silence Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:152
-msgid "asterisk_module_appwaitforsilence"
+msgid "Wait For Silence Application"
 msgstr ""
 
 #. While Loops and Conditional Execution
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:153
-msgid "asterisk_module_appwhile"
+msgid "While Loops and Conditional Execution"
 msgstr ""
 
 #. Comma Separated Values CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:154
-msgid "asterisk_module_cdrcsv"
+msgid "Comma Separated Values CDR Backend"
 msgstr ""
 
 #. Customizable Comma Separated Values CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:155
-msgid "asterisk_module_cdrcustom"
+msgid "Customizable Comma Separated Values CDR Backend"
 msgstr ""
 
 #. Asterisk Call Manager CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:156
-msgid "asterisk_module_cdrmanager"
+msgid "Asterisk Call Manager CDR Backend"
 msgstr ""
 
 #. MySQL CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:157
-msgid "asterisk_module_cdrmysql"
+msgid "MySQL CDR Backend"
 msgstr ""
 
 #. PostgreSQL CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:158
-msgid "asterisk_module_cdrpgsql"
+msgid "PostgreSQL CDR Backend"
 msgstr ""
 
 #. SQLite CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:159
-msgid "asterisk_module_cdrsqlite"
+msgid "SQLite CDR Backend"
 msgstr ""
 
 #. Agent Proxy Channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:160
-msgid "asterisk_module_chanagent"
+msgid "Agent Proxy Channel"
 msgstr ""
 
 #. Channel driver for GTalk
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:161
-msgid "asterisk_module_chanalsa"
+msgid "Channel driver for GTalk"
 msgstr ""
 
 #. Channel driver for GTalk
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:162
-msgid "asterisk_module_changtalk"
+msgid "Channel driver for GTalk"
 msgstr ""
 
 #. Option chan_iax2
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:163
-msgid "asterisk_module_chaniax2"
+msgid "Option chan_iax2"
 msgstr ""
 
 #. Local Proxy Channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:164
-msgid "asterisk_module_chanlocal"
+msgid "Local Proxy Channel"
 msgstr ""
 
 #. Session Initiation Protocol (SIP)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:165
-msgid "asterisk_module_chansip"
+msgid "Session Initiation Protocol (SIP)"
 msgstr ""
 
 #. Adaptive Differential PCM Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:166
-msgid "asterisk_module_codecadpcm"
+msgid "Adaptive Differential PCM Coder/Decoder"
 msgstr ""
 
 #. A-law Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:167
-msgid "asterisk_module_codecalaw"
+msgid "A-law Coder/Decoder"
 msgstr ""
 
 #. A-law and Mulaw direct Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:168
-msgid "asterisk_module_codecamu"
+msgid "A-law and Mulaw direct Coder/Decoder"
 msgstr ""
 
 #. ITU G.726-32kbps G726 Transcoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:169
-msgid "asterisk_module_codecg726"
+msgid "ITU G.726-32kbps G726 Transcoder"
 msgstr ""
 
 #. GSM/PCM16 (signed linear) Codec Translation
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:170
-msgid "asterisk_module_codecgsm"
+msgid "GSM/PCM16 (signed linear) Codec Translation"
 msgstr ""
 
 #. Speex/PCM16 (signed linear) Codec Translator
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:171
-msgid "asterisk_module_codecspeex"
+msgid "Speex/PCM16 (signed linear) Codec Translator"
 msgstr ""
 
 #. Mu-law Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:172
-msgid "asterisk_module_codeculaw"
+msgid "Mu-law Coder/Decoder"
 msgstr ""
 
 #. Sun Microsystems AU format (signed linear)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:173
-msgid "asterisk_module_formatau"
+msgid "Sun Microsystems AU format (signed linear)"
 msgstr ""
 
 #. G.723.1 Simple Timestamp File Format
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:174
-msgid "asterisk_module_formatg723"
+msgid "G.723.1 Simple Timestamp File Format"
 msgstr ""
 
 #. Raw G.726 (16/24/32/40kbps) data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:175
-msgid "asterisk_module_formatg726"
+msgid "Raw G.726 (16/24/32/40kbps) data"
 msgstr ""
 
 #. Raw G729 data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:176
-msgid "asterisk_module_formatg729"
+msgid "Raw G729 data"
 msgstr ""
 
 #. Raw GSM data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:177
-msgid "asterisk_module_formatgsm"
+msgid "Raw GSM data"
 msgstr ""
 
 #. Raw h263 data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:178
-msgid "asterisk_module_formath263"
+msgid "Raw h263 data"
 msgstr ""
 
 #. JPEG (Joint Picture Experts Group) Image
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:179
-msgid "asterisk_module_formatjpeg"
+msgid "JPEG (Joint Picture Experts Group) Image"
 msgstr ""
 
 #. Raw uLaw 8khz Audio support (PCM)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:180
-msgid "asterisk_module_formatpcm"
+msgid "Raw uLaw 8khz Audio support (PCM)"
 msgstr ""
 
 #. load =&gt; .so ; Raw aLaw 8khz PCM Audio support
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:181
-msgid "asterisk_module_formatpcmalaw"
+msgid "load => .so ; Raw aLaw 8khz PCM Audio support"
 msgstr ""
 
 #. Raw Signed Linear Audio support (SLN)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:182
-msgid "asterisk_module_formatsln"
+msgid "Raw Signed Linear Audio support (SLN)"
 msgstr ""
 
 #. Dialogic VOX (ADPCM) File Format
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:183
-msgid "asterisk_module_formatvox"
+msgid "Dialogic VOX (ADPCM) File Format"
 msgstr ""
 
 #. Microsoft WAV format (8000hz Signed Line
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:184
-msgid "asterisk_module_formatwav"
+msgid "Microsoft WAV format (8000hz Signed Line"
 msgstr ""
 
 #. Microsoft WAV format (Proprietary GSM)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:185
-msgid "asterisk_module_formatwavgsm"
+msgid "Microsoft WAV format (Proprietary GSM)"
 msgstr ""
 
 #. Caller ID related dialplan functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:186
-msgid "asterisk_module_funccallerid"
+msgid "Caller ID related dialplan functions"
 msgstr ""
 
 #. ENUM Functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:187
-msgid "asterisk_module_funcenum"
+msgid "ENUM Functions"
 msgstr ""
 
 #. URI encoding / decoding functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:188
-msgid "asterisk_module_funcuri"
+msgid "URI encoding / decoding functions"
 msgstr ""
 
 #. Asterisk Extension Language Compiler
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:189
-msgid "asterisk_module_pbxael"
+msgid "Asterisk Extension Language Compiler"
 msgstr ""
 
 #. Text Extension Configuration
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:190
-msgid "asterisk_module_pbxconfig"
+msgid "Text Extension Configuration"
 msgstr ""
 
 #. load =&gt; .so ; Builtin dialplan functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:191
-msgid "asterisk_module_pbxfunctions"
+msgid "load => .so ; Builtin dialplan functions"
 msgstr ""
 
 #. Loopback Switch
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:192
-msgid "asterisk_module_pbxloopback"
+msgid "Loopback Switch"
 msgstr ""
 
 #. Realtime Switch
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:193
-msgid "asterisk_module_pbxrealtime"
+msgid "Realtime Switch"
 msgstr ""
 
 #. Outgoing Spool Support
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:194
-msgid "asterisk_module_pbxspool"
+msgid "Outgoing Spool Support"
 msgstr ""
 
 #. Wil Cal U (Auto Dialer)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:195
-msgid "asterisk_module_pbxwilcalu"
+msgid "Wil Cal U (Auto Dialer)"
 msgstr ""
 
 #. MySQL Config Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:196
-msgid "asterisk_module_resconfigmysql"
+msgid "MySQL Config Resource"
 msgstr ""
 
 #. ODBC Config Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:197
-msgid "asterisk_module_resconfigodbc"
+msgid "ODBC Config Resource"
 msgstr ""
 
 #. PGSQL Module
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:198
-msgid "asterisk_module_resconfigpgsql"
+msgid "PGSQL Module"
 msgstr ""
 
 #. Cryptographic Digital Signatures
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:199
-msgid "asterisk_module_rescrypto"
+msgid "Cryptographic Digital Signatures"
 msgstr ""
 
 #. Call Parking Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:200
-msgid "asterisk_module_resfeatures"
+msgid "Call Parking Resource"
 msgstr ""
 
 #. Indications Configuration
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:201
-msgid "asterisk_module_resindications"
+msgid "Indications Configuration"
 msgstr ""
 
 #. Call Monitoring Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:202
-msgid "asterisk_module_resmonitor"
+msgid "Call Monitoring Resource"
 msgstr ""
 
 #. Music On Hold Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:203
-msgid "asterisk_module_resmusiconhold"
+msgid "Music On Hold Resource"
 msgstr ""
 
 #. ODBC Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:204
-msgid "asterisk_module_resodbc"
+msgid "ODBC Resource"
 msgstr ""
 
 #. SMDI Module
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:205
-msgid "asterisk_module_ressmdi"
+msgid "SMDI Module"
 msgstr ""
 
 #. SNMP Module
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:206
-msgid "asterisk_module_ressnmp"
+msgid "SNMP Module"
 msgstr ""
 
 #. Music On Hold
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:207
-msgid "asterisk_moh"
+msgid "Music On Hold"
 msgstr ""
 
 #. Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:208
-msgid "asterisk_moh_application"
+msgid "Application"
 msgstr ""
 
 #. Directory of Music
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:209
-msgid "asterisk_moh_directory"
+msgid "Directory of Music"
 msgstr ""
 
 #. Option mode
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:210
-msgid "asterisk_moh_mode"
+msgid "Option mode"
 msgstr ""
 
 #. Random Play
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:211
-msgid "asterisk_moh_random"
+msgid "Random Play"
 msgstr ""
 
 #. SIP Connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:212
-msgid "asterisk_sip"
+msgid "SIP Connection"
 msgstr ""
 
 #. Always Dial International
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:213
-msgid "asterisk_sip_alwaysinternational"
+msgid "Always Dial International"
 msgstr ""
 
 #. Reinvite/redirect media connections
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:214
-msgid "asterisk_sip_canreinvite"
+msgid "Reinvite/redirect media connections"
 msgstr ""
 
 #. context
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:215
-msgid "asterisk_sip_context"
+msgid "context"
 msgstr ""
 
 #. Country Code for connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:216
-msgid "asterisk_sip_countrycode"
+msgid "Country Code for connection"
 msgstr ""
 
 #. DTMF mode
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:217
-msgid "asterisk_sip_dtmfmode"
+msgid "DTMF mode"
 msgstr ""
 
 #. Add as Extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:218
-msgid "asterisk_sip_extension"
+msgid "Add as Extension"
 msgstr ""
 
 #. Primary domain identity for From: headers
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:219
-msgid "asterisk_sip_fromdomain"
+msgid "Primary domain identity for From: headers"
 msgstr ""
 
 #. From user (required by many SIP providers)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:220
-msgid "asterisk_sip_fromuser"
+msgid "From user (required by many SIP providers)"
 msgstr ""
 
 #. Host name (or blank)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:221
-msgid "asterisk_sip_host"
+msgid "Host name (or blank)"
 msgstr ""
 
 #. Ring on incoming dialplan contexts
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:222
-msgid "asterisk_sip_incoming"
+msgid "Ring on incoming dialplan contexts"
 msgstr ""
 
 #. Allow Insecure for
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:223
-msgid "asterisk_sip_insecure"
+msgid "Allow Insecure for"
 msgstr ""
 
 #. International Dial Prefix
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:224
-msgid "asterisk_sip_internationalprefix"
+msgid "International Dial Prefix"
 msgstr ""
 
 #. Mailbox for MWI
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:225
-msgid "asterisk_sip_mailbox"
+msgid "Mailbox for MWI"
 msgstr ""
 
 #. NAT between phone and Asterisk
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:226
-msgid "asterisk_sip_nat"
+msgid "NAT between phone and Asterisk"
 msgstr ""
 
 #. Check tags in headers
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:227
-msgid "asterisk_sip_pedantic"
+msgid "Check tags in headers"
 msgstr ""
 
 #. SIP Port
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:228
-msgid "asterisk_sip_port"
+msgid "SIP Port"
 msgstr ""
 
 #. Dial Prefix (for external line)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:229
-msgid "asterisk_sip_prefix"
+msgid "Dial Prefix (for external line)"
 msgstr ""
 
 #. Reply Timeout (ms) for down connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:230
-msgid "asterisk_sip_qualify"
+msgid "Reply Timeout (ms) for down connection"
 msgstr ""
 
 #. Register connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:231
-msgid "asterisk_sip_register"
+msgid "Register connection"
 msgstr ""
 
 #. Secret
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:232
-msgid "asterisk_sip_secret"
+msgid "Secret"
 msgstr ""
 
 #. Dial own extension for mailbox
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:233
-msgid "asterisk_sip_selfmailbox"
+msgid "Dial own extension for mailbox"
 msgstr ""
 
 #. Dial Timeout (sec)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:234
-msgid "asterisk_sip_timeout"
+msgid "Dial Timeout (sec)"
 msgstr ""
 
 #. Client Type
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:235
-msgid "asterisk_sip_type"
+msgid "Client Type"
 msgstr ""
 
 #. Username
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:236
-msgid "asterisk_sip_username"
+msgid "Username"
 msgstr ""
 
 #. Section sipgeneral
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:237
-msgid "asterisk_sipgeneral"
+msgid "Section sipgeneral"
 msgstr ""
 
 #. Allow codecs
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:238
-msgid "asterisk_sipgeneral_allow"
+msgid "Allow codecs"
 msgstr ""
 
 #. SIP Port
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:239
-msgid "asterisk_sipgeneral_port"
+msgid "SIP Port"
 msgstr ""
 
 #. SIP realm
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:240
-msgid "asterisk_sipgeneral_realm"
+msgid "SIP realm"
 msgstr ""
 
 #. Voicemail general options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:241
-msgid "asterisk_voicegeneral"
+msgid "Voicemail general options"
 msgstr ""
 
 #. From Email address of server
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:242
-msgid "asterisk_voicegeneral_serveremail"
+msgid "From Email address of server"
 msgstr ""
 
 #. Voice Mail boxes
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:243
-msgid "asterisk_voicemail"
+msgid "Voice Mail boxes"
 msgstr ""
 
 #. Email contains attachment
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:244
-msgid "asterisk_voicemail_attach"
+msgid "Email contains attachment"
 msgstr ""
 
 #. Email
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:245
-msgid "asterisk_voicemail_email"
+msgid "Email"
 msgstr ""
 
 #. Display Name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:246
-msgid "asterisk_voicemail_name"
+msgid "Display Name"
 msgstr ""
 
 #. Password
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:247
-msgid "asterisk_voicemail_password"
+msgid "Password"
 msgstr ""
 
 #. zone
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:248
-msgid "asterisk_voicemail_zone"
+msgid "zone"
 msgstr ""
 
 #. Voice Zone settings
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:249
-msgid "asterisk_voicezone"
+msgid "Voice Zone settings"
 msgstr ""
 
 #. Message Format
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:250
-msgid "asterisk_voicezone_message"
+msgid "Message Format"
 msgstr ""
 
 #. Time Zone
diff --git a/po/es/cbi.po b/po/es/cbi.po
index 920acfcd1..752cceef9 100644
--- a/po/es/cbi.po
+++ b/po/es/cbi.po
@@ -13,88 +13,88 @@ msgstr ""
 
 #. Add entry
 #: i18n/english/luasrc/i18n/cbi.en.lua:1
-msgid "cbi_add"
+msgid "Add"
 msgstr "Añadir entrada"
 
 #. Remove entry
 #: i18n/english/luasrc/i18n/cbi.en.lua:2
-msgid "cbi_del"
+msgid "Delete"
 msgstr "Eliminar entrada"
 
 #. Replace entry
 #: i18n/english/luasrc/i18n/cbi.en.lua:3
-msgid "cbi_replace"
+msgid "Replace entry"
 msgstr "Reemplazar entrada"
 
 #. Invalid input value
 #: i18n/english/luasrc/i18n/cbi.en.lua:4
-msgid "cbi_invalid"
+msgid "Invalid"
 msgstr "Valor ingresado inválido"
 
 #. <strong>Validation failed:</strong> Please check any input fields for mistakes.
 #: i18n/english/luasrc/i18n/cbi.en.lua:5
-msgid "cbi_invalid_section"
+msgid "<strong>Validation failed:</strong> Please check any input fields for mistakes."
 msgstr ""
 "<strong>Falló la validación:</strong> Por favor chequee todos los campos en "
 "los cuales se produjeron errores."
 
 #. This field is mandatory
 #: i18n/english/luasrc/i18n/cbi.en.lua:6
-msgid "cbi_missing"
+msgid "This field is mandatory"
 msgstr "Este campo es requerido"
 
 #. <strong>Validation failed:</strong> At least one mandatory field has no or an invalid value
 #: i18n/english/luasrc/i18n/cbi.en.lua:7
-msgid "cbi_deperror"
+msgid "<strong>Validation failed:</strong> At least one mandatory field has no or an invalid value"
 msgstr ""
 "<strong>Falló la validación:</strong> Al menos un campo requerido no fue "
 "ingresado o bien contiene un valor inválido."
 
 #. A requirement for this option was not met
 #: i18n/english/luasrc/i18n/cbi.en.lua:8
-msgid "cbi_reqerror"
+msgid "A requirement for this option was not met"
 msgstr "No se han cumplimentado con los requisitos para esta opción"
 
 #. -- Additional Field --
 #: i18n/english/luasrc/i18n/cbi.en.lua:9
-msgid "cbi_addopt"
+msgid "-- Additional Field --"
 msgstr "-- Campo Adicional --"
 
 #.  (optional)
 #: i18n/english/luasrc/i18n/cbi.en.lua:10
-msgid "cbi_optional"
+msgid " (optional)"
 msgstr ""
 "<span class=\"translation-space\"> </span>\r\n"
 "(opcional)"
 
 #. This section contains no values yet
 #: i18n/english/luasrc/i18n/cbi.en.lua:11
-msgid "cbi_sectempty"
+msgid "This section contains no values yet"
 msgstr "Esta sección aún no contiene los valores"
 
 #. -- custom --
 #: i18n/english/luasrc/i18n/cbi.en.lua:12
-msgid "cbi_manual"
+msgid "-- custom --"
 msgstr "-- personalizar --"
 
 #. -- Please choose --
 #: i18n/english/luasrc/i18n/cbi.en.lua:13
-msgid "cbi_select"
+msgid "-- Please choose --"
 msgstr "-- Por favor seleccione --"
 
 #. Go to relevant configuration page
 #: i18n/english/luasrc/i18n/cbi.en.lua:14
-msgid "cbi_gorel"
+msgid " "
 msgstr "Ir a la página principal de configuración"
 
 #. Applying changes
 #: i18n/english/luasrc/i18n/cbi.en.lua:15
-msgid "cbi_applying"
+msgid "Applying changes"
 msgstr "Aplicando cambios"
 
 #. Uploaded File
 #: i18n/english/luasrc/i18n/cbi.en.lua:16
-msgid "cbi_upload"
+msgid "Uploaded File"
 msgstr "Archivo cargado"
 
 #. Search file...
diff --git a/po/es/coovachilli.po b/po/es/coovachilli.po
index 697ec68eb..60fde7c33 100644
--- a/po/es/coovachilli.po
+++ b/po/es/coovachilli.po
@@ -14,882 +14,882 @@ msgstr ""
 
 #. CoovaChilli
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:1
-msgid "coovachilli"
+msgid "CoovaChilli"
 msgstr ""
 
 #. General configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:2
-msgid "coovachilli_general"
+msgid "General configuration"
 msgstr ""
 
 #. General CoovaChilli settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:3
-msgid "coovachilli_general_desc"
+msgid "General CoovaChilli settings"
 msgstr ""
 
 #. Command socket
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:4
-msgid "coovachilli_general_cmdsock"
+msgid "Command socket"
 msgstr ""
 
 #. UNIX socket used for communication with chilli_query
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:5
-msgid "coovachilli_general_cmdsock_desc"
+msgid "UNIX socket used for communication with chilli_query"
 msgstr ""
 
 #. Config refresh interval
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:6
-msgid "coovachilli_general_interval"
+msgid "Config refresh interval"
 msgstr ""
 
 #. Re-read configuration file and do DNS lookups every interval seconds. This has the same effect as sending the HUP signal. If interval is 0 (zero) this feature is disabled. 
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:7
-msgid "coovachilli_general_interval_desc"
+msgid "Re-read configuration file and do DNS lookups every interval seconds. This has the same effect as sending the HUP signal. If interval is 0 (zero) this feature is disabled. "
 msgstr ""
 
 #. Pid file
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:8
-msgid "coovachilli_general_pidfile"
+msgid "Pid file"
 msgstr ""
 
 #. Filename to put the process id
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:9
-msgid "coovachilli_general_pidfile_desc"
+msgid "Filename to put the process id"
 msgstr ""
 
 #. State directory
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:10
-msgid "coovachilli_general_statedir"
+msgid "State directory"
 msgstr ""
 
 #. Directory of non-volatile data
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:11
-msgid "coovachilli_general_statedir_desc"
+msgid "Directory of non-volatile data"
 msgstr ""
 
 #. TUN/TAP configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:12
-msgid "coovachilli_tun"
+msgid "TUN/TAP configuration"
 msgstr ""
 
 #. Network/Tun configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:13
-msgid "coovachilli_tun_desc"
+msgid "Network/Tun configuration"
 msgstr ""
 
 #. Network down script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:14
-msgid "coovachilli_tun_condown"
+msgid "Network down script"
 msgstr ""
 
 #. Script executed after a session has moved from authorized state to unauthorized
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:15
-msgid "coovachilli_tun_condown_desc"
+msgid "Script executed after a session has moved from authorized state to unauthorized"
 msgstr ""
 
 #. Network up script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:16
-msgid "coovachilli_tun_conup"
+msgid "Network up script"
 msgstr ""
 
 #. Script executed after the tun network interface has been brought up
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:17
-msgid "coovachilli_tun_conup_desc"
+msgid "Script executed after the tun network interface has been brought up"
 msgstr ""
 
 #. Primary DNS Server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:18
-msgid "coovachilli_tun_dns1"
+msgid "Primary DNS Server"
 msgstr ""
 
 #. Is used to inform the client about the DNS address to use for host name resolution
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:19
-msgid "coovachilli_tun_dns1_desc"
+msgid "Is used to inform the client about the DNS address to use for host name resolution"
 msgstr ""
 
 #. Secondary DNS Server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:20
-msgid "coovachilli_tun_dns2"
+msgid "Secondary DNS Server"
 msgstr ""
 
 #. Is used to inform the client about the DNS address to use for host name resolution
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:21
-msgid "coovachilli_tun_dns2_desc"
+msgid "Is used to inform the client about the DNS address to use for host name resolution"
 msgstr ""
 
 #. Domain name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:22
-msgid "coovachilli_tun_domain"
+msgid "Domain name"
 msgstr ""
 
 #. Is used to inform the client about the domain name to use for DNS lookups
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:23
-msgid "coovachilli_tun_domain_desc"
+msgid "Is used to inform the client about the domain name to use for DNS lookups"
 msgstr ""
 
 #. Dynamic IP address pool
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:24
-msgid "coovachilli_tun_dynip"
+msgid "Dynamic IP address pool"
 msgstr ""
 
 #. Specifies a pool of dynamic IP addresses
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:25
-msgid "coovachilli_tun_dynip_desc"
+msgid "Specifies a pool of dynamic IP addresses"
 msgstr ""
 
 #. IP down script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:26
-msgid "coovachilli_tun_ipdown"
+msgid "IP down script"
 msgstr ""
 
 #. Script executed after the tun network interface has been taken down
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:27
-msgid "coovachilli_tun_ipdown_desc"
+msgid "Script executed after the tun network interface has been taken down"
 msgstr ""
 
 #. IP up script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:28
-msgid "coovachilli_tun_ipup"
+msgid "IP up script"
 msgstr ""
 
 #. Script executed after the TUN/TAP network interface has been brought up
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:29
-msgid "coovachilli_tun_ipup_desc"
+msgid "Script executed after the TUN/TAP network interface has been brought up"
 msgstr ""
 
 #. Uplink subnet
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:30
-msgid "coovachilli_tun_net"
+msgid "Uplink subnet"
 msgstr ""
 
 #. Network address of the uplink interface (CIDR notation)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:31
-msgid "coovachilli_tun_net_desc"
+msgid "Network address of the uplink interface (CIDR notation)"
 msgstr ""
 
 #. Static IP address pool
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:32
-msgid "coovachilli_tun_statip"
+msgid "Static IP address pool"
 msgstr ""
 
 #. Specifies a pool of static IP addresses
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:33
-msgid "coovachilli_tun_statip_desc"
+msgid "Specifies a pool of static IP addresses"
 msgstr ""
 
 #. TUN/TAP device
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:34
-msgid "coovachilli_tun_tundev"
+msgid "TUN/TAP device"
 msgstr ""
 
 #. The specific device to use for the TUN/TAP interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:35
-msgid "coovachilli_tun_tundev_desc"
+msgid "The specific device to use for the TUN/TAP interface"
 msgstr ""
 
 #. TX queue length
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:36
-msgid "coovachilli_tun_txqlen"
+msgid "TX queue length"
 msgstr ""
 
 #. The TX queue length to set on the TUN/TAP interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:37
-msgid "coovachilli_tun_txqlen_desc"
+msgid "The TX queue length to set on the TUN/TAP interface"
 msgstr ""
 
 #. Use TAP device
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:38
-msgid "coovachilli_tun_usetap"
+msgid "Use TAP device"
 msgstr ""
 
 #. Use the TAP interface instead of TUN
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:39
-msgid "coovachilli_tun_usetap_desc"
+msgid "Use the TAP interface instead of TUN"
 msgstr ""
 
 #. DHCP configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:40
-msgid "coovachilli_dhcp"
+msgid "DHCP configuration"
 msgstr ""
 
 #. Set DHCP options for connecting clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:41
-msgid "coovachilli_dhcp_desc"
+msgid "Set DHCP options for connecting clients"
 msgstr ""
 
 #. DHCP end number
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:42
-msgid "coovachilli_dhcp_dhcpend"
+msgid "DHCP end number"
 msgstr ""
 
 #. Where to stop assigning IP addresses (default 254)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:43
-msgid "coovachilli_dhcp_dhcpend_desc"
+msgid "Where to stop assigning IP addresses (default 254)"
 msgstr ""
 
 #. DHCP interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:44
-msgid "coovachilli_dhcp_dhcpif"
+msgid "DHCP interface"
 msgstr ""
 
 #. Ethernet interface to listen to for the downlink interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:45
-msgid "coovachilli_dhcp_dhcpif_desc"
+msgid "Ethernet interface to listen to for the downlink interface"
 msgstr ""
 
 #. Listen MAC address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:46
-msgid "coovachilli_dhcp_dhcpmac"
+msgid "Listen MAC address"
 msgstr ""
 
 #. MAC address to listen to. If not specified the MAC address of the interface will be used
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:47
-msgid "coovachilli_dhcp_dhcpmac_desc"
+msgid "MAC address to listen to. If not specified the MAC address of the interface will be used"
 msgstr ""
 
 #. DHCP start number
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:48
-msgid "coovachilli_dhcp_dhcpstart"
+msgid "DHCP start number"
 msgstr ""
 
 #. Where to start assigning IP addresses (default 10)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:49
-msgid "coovachilli_dhcp_dhcpstart_desc"
+msgid "Where to start assigning IP addresses (default 10)"
 msgstr ""
 
 #. Enable IEEE 802.1x
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:50
-msgid "coovachilli_dhcp_eapolenable"
+msgid "Enable IEEE 802.1x"
 msgstr ""
 
 #. Enable IEEE 802.1x authentication and listen for EAP requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:51
-msgid "coovachilli_dhcp_eapolenable_desc"
+msgid "Enable IEEE 802.1x authentication and listen for EAP requests"
 msgstr ""
 
 #. Leasetime
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:52
-msgid "coovachilli_dhcp_lease"
+msgid "Leasetime"
 msgstr ""
 
 #. Use a DHCP lease of seconds (default 600)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:53
-msgid "coovachilli_dhcp_lease_desc"
+msgid "Use a DHCP lease of seconds (default 600)"
 msgstr ""
 
 #. RADIUS configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:54
-msgid "coovachilli_radius"
+msgid "RADIUS configuration"
 msgstr ""
 
 #. RADIUS configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:55
-msgid "coovachilli_radius_desc"
+msgid "RADIUS configuration"
 msgstr ""
 
 #. Allow session update through RADIUS
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:56
-msgid "coovachilli_radius_acctupdate"
+msgid "Allow session update through RADIUS"
 msgstr ""
 
 #. Allow updating of session parameters with RADIUS attributes sent in Accounting-Response
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:57
-msgid "coovachilli_radius_acctupdate_desc"
+msgid "Allow updating of session parameters with RADIUS attributes sent in Accounting-Response"
 msgstr ""
 
 #. Admin password
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:58
-msgid "coovachilli_radius_adminpasswd"
+msgid "Admin password"
 msgstr ""
 
 #. Password to use for Administrative-User authentication in order to pick up chilli configurations and establish a device &quot;system&quot; session
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:59
-msgid "coovachilli_radius_adminpasswd_desc"
+msgid "Password to use for Administrative-User authentication in order to pick up chilli configurations and establish a device \"system\" session"
 msgstr ""
 
 #. Admin user
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:60
-msgid "coovachilli_radius_adminuser"
+msgid "Admin user"
 msgstr ""
 
 #. User-name to use for Administrative-User authentication in order to pick up chilli configurations and establish a device &quot;system&quot; session
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:61
-msgid "coovachilli_radius_adminuser_desc"
+msgid "User-name to use for Administrative-User authentication in order to pick up chilli configurations and establish a device \"system\" session"
 msgstr ""
 
 #. Do not check disconnection requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:62
-msgid "coovachilli_radius_coanoipcheck"
+msgid "Do not check disconnection requests"
 msgstr ""
 
 #. Do not check the source IP address of radius disconnect requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:63
-msgid "coovachilli_radius_coanoipcheck_desc"
+msgid "Do not check the source IP address of radius disconnect requests"
 msgstr ""
 
 #. RADIUS disconnect port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:64
-msgid "coovachilli_radius_coaport"
+msgid "RADIUS disconnect port"
 msgstr ""
 
 #. UDP port to listen to for accepting radius disconnect requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:65
-msgid "coovachilli_radius_coaport_desc"
+msgid "UDP port to listen to for accepting radius disconnect requests"
 msgstr ""
 
 #. NAS IP
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:66
-msgid "coovachilli_radius_nasip"
+msgid "NAS IP"
 msgstr ""
 
 #. Value to use in RADIUS NAS-IP-Address attribute
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:67
-msgid "coovachilli_radius_nasip_desc"
+msgid "Value to use in RADIUS NAS-IP-Address attribute"
 msgstr ""
 
 #. NAS MAC
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:68
-msgid "coovachilli_radius_nasmac"
+msgid "NAS MAC"
 msgstr ""
 
 #. MAC address value to use in RADIUS Called-Station-ID attribute
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:69
-msgid "coovachilli_radius_nasmac_desc"
+msgid "MAC address value to use in RADIUS Called-Station-ID attribute"
 msgstr ""
 
 #. Allow OpenID authentication
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:70
-msgid "coovachilli_radius_openidauth"
+msgid "Allow OpenID authentication"
 msgstr ""
 
 #. Allows OpenID authentication by sending ChilliSpot-Config=allow-openidauth in RADIUS Access-Requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:71
-msgid "coovachilli_radius_openidauth_desc"
+msgid "Allows OpenID authentication by sending ChilliSpot-Config=allow-openidauth in RADIUS Access-Requests"
 msgstr ""
 
 #. RADIUS accounting port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:72
-msgid "coovachilli_radius_radiusacctport"
+msgid "RADIUS accounting port"
 msgstr ""
 
 #. The UDP port number to use for radius accounting requests (default 1813)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:73
-msgid "coovachilli_radius_radiusacctport_desc"
+msgid "The UDP port number to use for radius accounting requests (default 1813)"
 msgstr ""
 
 #. RADIUS authentication port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:74
-msgid "coovachilli_radius_radiusauthport"
+msgid "RADIUS authentication port"
 msgstr ""
 
 #. The UDP port number to use for radius authentication requests (default 1812)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:75
-msgid "coovachilli_radius_radiusauthport_desc"
+msgid "The UDP port number to use for radius authentication requests (default 1812)"
 msgstr ""
 
 #. Option radiuscalled
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:76
-msgid "coovachilli_radius_radiuscalled"
+msgid "Option radiuscalled"
 msgstr ""
 
 #. RADIUS listen address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:77
-msgid "coovachilli_radius_radiuslisten"
+msgid "RADIUS listen address"
 msgstr ""
 
 #. Local interface IP address to use for the radius interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:78
-msgid "coovachilli_radius_radiuslisten_desc"
+msgid "Local interface IP address to use for the radius interface"
 msgstr ""
 
 #. RADIUS location ID
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:79
-msgid "coovachilli_radius_radiuslocationid"
+msgid "RADIUS location ID"
 msgstr ""
 
 #. WISPr Location ID
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:80
-msgid "coovachilli_radius_radiuslocationid_desc"
+msgid "WISPr Location ID"
 msgstr ""
 
 #. RADIUS location name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:81
-msgid "coovachilli_radius_radiuslocationname"
+msgid "RADIUS location name"
 msgstr ""
 
 #. WISPr Location Name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:82
-msgid "coovachilli_radius_radiuslocationname_desc"
+msgid "WISPr Location Name"
 msgstr ""
 
 #. NAS ID
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:83
-msgid "coovachilli_radius_radiusnasid"
+msgid "NAS ID"
 msgstr ""
 
 #. Network access server identifier
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:84
-msgid "coovachilli_radius_radiusnasid_desc"
+msgid "Network access server identifier"
 msgstr ""
 
 #. Option radiusnasip
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:85
-msgid "coovachilli_radius_radiusnasip"
+msgid "Option radiusnasip"
 msgstr ""
 
 #. NAS port type
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:86
-msgid "coovachilli_radius_radiusnasporttype"
+msgid "NAS port type"
 msgstr ""
 
 #. Value of NAS-Port-Type attribute. Defaults to 19 (Wireless-IEEE-802.11)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:87
-msgid "coovachilli_radius_radiusnasporttype_desc"
+msgid "Value of NAS-Port-Type attribute. Defaults to 19 (Wireless-IEEE-802.11)"
 msgstr ""
 
 #. Send RADIUS VSA
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:88
-msgid "coovachilli_radius_radiusoriginalurl"
+msgid "Send RADIUS VSA"
 msgstr ""
 
 #. Send the ChilliSpot-OriginalURL RADIUS VSA in Access-Request
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:89
-msgid "coovachilli_radius_radiusoriginalurl_desc"
+msgid "Send the ChilliSpot-OriginalURL RADIUS VSA in Access-Request"
 msgstr ""
 
 #. RADIUS secret
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:90
-msgid "coovachilli_radius_radiussecret"
+msgid "RADIUS secret"
 msgstr ""
 
 #. Radius shared secret for both servers
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:91
-msgid "coovachilli_radius_radiussecret_desc"
+msgid "Radius shared secret for both servers"
 msgstr ""
 
 #. RADIUS server 1
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:92
-msgid "coovachilli_radius_radiusserver1"
+msgid "RADIUS server 1"
 msgstr ""
 
 #. The IP address of radius server 1
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:93
-msgid "coovachilli_radius_radiusserver1_desc"
+msgid "The IP address of radius server 1"
 msgstr ""
 
 #. RADIUS server 2
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:94
-msgid "coovachilli_radius_radiusserver2"
+msgid "RADIUS server 2"
 msgstr ""
 
 #. The IP address of radius server 2
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:95
-msgid "coovachilli_radius_radiusserver2_desc"
+msgid "The IP address of radius server 2"
 msgstr ""
 
 #. Swap octets
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:96
-msgid "coovachilli_radius_swapoctets"
+msgid "Swap octets"
 msgstr ""
 
 #. Swap the meaning of &quot;input octets&quot; and &quot;output octets&quot; as it related to RADIUS attribtues
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:97
-msgid "coovachilli_radius_swapoctets_desc"
+msgid "Swap the meaning of \"input octets\" and \"output octets\" as it related to RADIUS attribtues"
 msgstr ""
 
 #. Allow WPA guests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:98
-msgid "coovachilli_radius_wpaguests"
+msgid "Allow WPA guests"
 msgstr ""
 
 #. Allows WPA Guest authentication by sending ChilliSpot-Config=allow-wpa-guests in RADIUS Access-Requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:99
-msgid "coovachilli_radius_wpaguests_desc"
+msgid "Allows WPA Guest authentication by sending ChilliSpot-Config=allow-wpa-guests in RADIUS Access-Requests"
 msgstr ""
 
 #. RADIUS proxy settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:100
-msgid "coovachilli_proxy"
+msgid "RADIUS proxy settings"
 msgstr ""
 
 #. RADIUS proxy settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:101
-msgid "coovachilli_proxy_desc"
+msgid "RADIUS proxy settings"
 msgstr ""
 
 #. Proxy client
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:102
-msgid "coovachilli_proxy_proxyclient"
+msgid "Proxy client"
 msgstr ""
 
 #. IP address from which radius requests are accepted. If omitted the server will not accept radius requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:103
-msgid "coovachilli_proxy_proxyclient_desc"
+msgid "IP address from which radius requests are accepted. If omitted the server will not accept radius requests"
 msgstr ""
 
 #. Proxy listen address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:104
-msgid "coovachilli_proxy_proxylisten"
+msgid "Proxy listen address"
 msgstr ""
 
 #. Local interface IP address to use for accepting radius requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:105
-msgid "coovachilli_proxy_proxylisten_desc"
+msgid "Local interface IP address to use for accepting radius requests"
 msgstr ""
 
 #. Proxy port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:106
-msgid "coovachilli_proxy_proxyport"
+msgid "Proxy port"
 msgstr ""
 
 #. UDP Port to listen to for accepting radius requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:107
-msgid "coovachilli_proxy_proxyport_desc"
+msgid "UDP Port to listen to for accepting radius requests"
 msgstr ""
 
 #. Proxy secret
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:108
-msgid "coovachilli_proxy_proxysecret"
+msgid "Proxy secret"
 msgstr ""
 
 #. Radius shared secret for clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:109
-msgid "coovachilli_proxy_proxysecret_desc"
+msgid "Radius shared secret for clients"
 msgstr ""
 
 #. UAM configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:110
-msgid "coovachilli_uam"
+msgid "UAM configuration"
 msgstr ""
 
 #. Unified Configuration Method settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:111
-msgid "coovachilli_uam_desc"
+msgid "Unified Configuration Method settings"
 msgstr ""
 
 #. Use Chilli XML
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:112
-msgid "coovachilli_uam_chillixml"
+msgid "Use Chilli XML"
 msgstr ""
 
 #. Return the so-called Chilli XML along with WISPr XML
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:113
-msgid "coovachilli_uam_chillixml_desc"
+msgid "Return the so-called Chilli XML along with WISPr XML"
 msgstr ""
 
 #. Default idle timeout
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:114
-msgid "coovachilli_uam_defidletimeout"
+msgid "Default idle timeout"
 msgstr ""
 
 #. Default idle timeout unless otherwise set by RADIUS (defaults to 0)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:115
-msgid "coovachilli_uam_defidletimeout_desc"
+msgid "Default idle timeout unless otherwise set by RADIUS (defaults to 0)"
 msgstr ""
 
 #. Default interim interval
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:116
-msgid "coovachilli_uam_definteriminterval"
+msgid "Default interim interval"
 msgstr ""
 
 #. Default interim-interval for RADIUS accounting unless otherwise set by RADIUS (defaults to 0)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:117
-msgid "coovachilli_uam_definteriminterval_desc"
+msgid "Default interim-interval for RADIUS accounting unless otherwise set by RADIUS (defaults to 0)"
 msgstr ""
 
 #. Default session timeout
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:118
-msgid "coovachilli_uam_defsessiontimeout"
+msgid "Default session timeout"
 msgstr ""
 
 #. Default session timeout unless otherwise set by RADIUS (defaults to 0)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:119
-msgid "coovachilli_uam_defsessiontimeout_desc"
+msgid "Default session timeout unless otherwise set by RADIUS (defaults to 0)"
 msgstr ""
 
 #. Inspect DNS traffic
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:120
-msgid "coovachilli_uam_dnsparanoia"
+msgid "Inspect DNS traffic"
 msgstr ""
 
 #. Inspect DNS packets and drop responses with any non- A, CNAME, SOA, or MX records to prevent dns tunnels (experimental)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:121
-msgid "coovachilli_uam_dnsparanoia_desc"
+msgid "Inspect DNS packets and drop responses with any non- A, CNAME, SOA, or MX records to prevent dns tunnels (experimental)"
 msgstr ""
 
 #. Local users file
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:122
-msgid "coovachilli_uam_localusers"
+msgid "Local users file"
 msgstr ""
 
 #. A colon seperated file containing usernames and passwords of locally authenticated users
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:123
-msgid "coovachilli_uam_localusers_desc"
+msgid "A colon seperated file containing usernames and passwords of locally authenticated users"
 msgstr ""
 
 #. Location name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:124
-msgid "coovachilli_uam_locationname"
+msgid "Location name"
 msgstr ""
 
 #. Human readable location name used in JSON interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:125
-msgid "coovachilli_uam_locationname_desc"
+msgid "Human readable location name used in JSON interface"
 msgstr ""
 
 #. Do not redirect to UAM server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:126
-msgid "coovachilli_uam_nouamsuccess"
+msgid "Do not redirect to UAM server"
 msgstr ""
 
 #. Do not return to UAM server on login success, just redirect to original URL
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:127
-msgid "coovachilli_uam_nouamsuccess_desc"
+msgid "Do not return to UAM server on login success, just redirect to original URL"
 msgstr ""
 
 #. Do not do WISPr
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:128
-msgid "coovachilli_uam_nouamwispr"
+msgid "Do not do WISPr"
 msgstr ""
 
 #. Do not do any WISPr XML, assume the back-end is doing this instead
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:129
-msgid "coovachilli_uam_nouamwispr_desc"
+msgid "Do not do any WISPr XML, assume the back-end is doing this instead"
 msgstr ""
 
 #. Post auth proxy
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:130
-msgid "coovachilli_uam_postauthproxy"
+msgid "Post auth proxy"
 msgstr ""
 
 #. Used with postauthproxyport to define a post authentication HTTP proxy server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:131
-msgid "coovachilli_uam_postauthproxy_desc"
+msgid "Used with postauthproxyport to define a post authentication HTTP proxy server"
 msgstr ""
 
 #. Post auth proxy port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:132
-msgid "coovachilli_uam_postauthproxyport"
+msgid "Post auth proxy port"
 msgstr ""
 
 #. Used with postauthproxy to define a post authentication HTTP proxy server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:133
-msgid "coovachilli_uam_postauthproxyport_desc"
+msgid "Used with postauthproxy to define a post authentication HTTP proxy server"
 msgstr ""
 
 #. Allowed resources
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:134
-msgid "coovachilli_uam_uamallowed"
+msgid "Allowed resources"
 msgstr ""
 
 #. List of resources the client can access without first authenticating
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:135
-msgid "coovachilli_uam_uamallowed_desc"
+msgid "List of resources the client can access without first authenticating"
 msgstr ""
 
 #. Allow any DNS server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:136
-msgid "coovachilli_uam_uamanydns"
+msgid "Allow any DNS server"
 msgstr ""
 
 #. Allow any DNS server for unauthenticated clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:137
-msgid "coovachilli_uam_uamanydns_desc"
+msgid "Allow any DNS server for unauthenticated clients"
 msgstr ""
 
 #. Allow any IP address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:138
-msgid "coovachilli_uam_uamanyip"
+msgid "Allow any IP address"
 msgstr ""
 
 #. Allow clients to use any IP settings they wish by spoofing ARP (experimental)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:139
-msgid "coovachilli_uam_uamanyip_desc"
+msgid "Allow clients to use any IP settings they wish by spoofing ARP (experimental)"
 msgstr ""
 
 #. Allowed domains
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:140
-msgid "coovachilli_uam_uamdomain"
+msgid "Allowed domains"
 msgstr ""
 
 #. Defines a list of domain names to automatically add to the walled garden
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:141
-msgid "coovachilli_uam_uamdomain_desc"
+msgid "Defines a list of domain names to automatically add to the walled garden"
 msgstr ""
 
 #. UAM homepage
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:142
-msgid "coovachilli_uam_uamhomepage"
+msgid "UAM homepage"
 msgstr ""
 
 #. URL of homepage to redirect unauthenticated users to
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:143
-msgid "coovachilli_uam_uamhomepage_desc"
+msgid "URL of homepage to redirect unauthenticated users to"
 msgstr ""
 
 #. UAM static content port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:144
-msgid "coovachilli_uam_uamiport"
+msgid "UAM static content port"
 msgstr ""
 
 #. TCP port to bind to for only serving embedded content
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:145
-msgid "coovachilli_uam_uamiport_desc"
+msgid "TCP port to bind to for only serving embedded content"
 msgstr ""
 
 #. UAM listening address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:146
-msgid "coovachilli_uam_uamlisten"
+msgid "UAM listening address"
 msgstr ""
 
 #. IP address to listen to for authentication of clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:147
-msgid "coovachilli_uam_uamlisten_desc"
+msgid "IP address to listen to for authentication of clients"
 msgstr ""
 
 #. UAM logout IP
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:148
-msgid "coovachilli_uam_uamlogoutip"
+msgid "UAM logout IP"
 msgstr ""
 
 #. Use this IP address to instantly logout a client accessing it (defaults to 1.1.1.1)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:149
-msgid "coovachilli_uam_uamlogoutip_desc"
+msgid "Use this IP address to instantly logout a client accessing it (defaults to 1.1.1.1)"
 msgstr ""
 
 #. UAM listening port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:150
-msgid "coovachilli_uam_uamport"
+msgid "UAM listening port"
 msgstr ""
 
 #. TCP port to bind to for authenticating clients (default 3990)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:151
-msgid "coovachilli_uam_uamport_desc"
+msgid "TCP port to bind to for authenticating clients (default 3990)"
 msgstr ""
 
 #. UAM secret
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:152
-msgid "coovachilli_uam_uamsecret"
+msgid "UAM secret"
 msgstr ""
 
 #. Shared secret between uamserver and chilli
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:153
-msgid "coovachilli_uam_uamsecret_desc"
+msgid "Shared secret between uamserver and chilli"
 msgstr ""
 
 #. UAM server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:154
-msgid "coovachilli_uam_uamserver"
+msgid "UAM server"
 msgstr ""
 
 #. URL of web server to use for authenticating clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:155
-msgid "coovachilli_uam_uamserver_desc"
+msgid "URL of web server to use for authenticating clients"
 msgstr ""
 
 #. UAM user interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:156
-msgid "coovachilli_uam_uamui"
+msgid "UAM user interface"
 msgstr ""
 
 #. An init.d style program to handle local content on the uamuiport web server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:157
-msgid "coovachilli_uam_uamui_desc"
+msgid "An init.d style program to handle local content on the uamuiport web server"
 msgstr ""
 
 #. Use status file
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:158
-msgid "coovachilli_uam_usestatusfile"
+msgid "Use status file"
 msgstr ""
 
 #. Write the status of clients in a non-volatile state file (experimental)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:159
-msgid "coovachilli_uam_usestatusfile_desc"
+msgid "Write the status of clients in a non-volatile state file (experimental)"
 msgstr ""
 
 #. WISPr login url
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:160
-msgid "coovachilli_uam_wisprlogin"
+msgid "WISPr login url"
 msgstr ""
 
 #. Specific URL to be given in WISPr XML LoginURL
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:161
-msgid "coovachilli_uam_wisprlogin_desc"
+msgid "Specific URL to be given in WISPr XML LoginURL"
 msgstr ""
 
 #. CGI program
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:162
-msgid "coovachilli_uam_wwwbin"
+msgid "CGI program"
 msgstr ""
 
 #. Executable to run as a CGI type program (like haserl) for URLs with extention .chi
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:163
-msgid "coovachilli_uam_wwwbin_desc"
+msgid "Executable to run as a CGI type program (like haserl) for URLs with extention .chi"
 msgstr ""
 
 #. Web content directory
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:164
-msgid "coovachilli_uam_wwwdir"
+msgid "Web content directory"
 msgstr ""
 
 #. Directory where embedded local web content is placed
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:165
-msgid "coovachilli_uam_wwwdir_desc"
+msgid "Directory where embedded local web content is placed"
 msgstr ""
 
 #. MAC configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:166
-msgid "coovachilli_macauth"
+msgid "MAC configuration"
 msgstr ""
 
 #. Configure MAC authentication
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:167
-msgid "coovachilli_macauth_desc"
+msgid "Configure MAC authentication"
 msgstr ""
 
 #. Allowed MAC addresses
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:168
-msgid "coovachilli_macauth_macallowed"
+msgid "Allowed MAC addresses"
 msgstr ""
 
 #. List of MAC addresses for which MAC authentication will be performed
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:169
-msgid "coovachilli_macauth_macallowed_desc"
+msgid "List of MAC addresses for which MAC authentication will be performed"
 msgstr ""
 
 #. Authenticate locally allowed MACs
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:170
-msgid "coovachilli_macauth_macallowlocal"
+msgid "Authenticate locally allowed MACs"
 msgstr ""
 
 #. Authenticate allowed MAC addresses without the use of RADIUS
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:171
-msgid "coovachilli_macauth_macallowlocal_desc"
+msgid "Authenticate allowed MAC addresses without the use of RADIUS"
 msgstr ""
 
 #. Enable MAC authentification
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:172
-msgid "coovachilli_macauth_macauth"
+msgid "Enable MAC authentification"
 msgstr ""
 
 #. Try to authenticate all users based on their mac address alone
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:173
-msgid "coovachilli_macauth_macauth_desc"
+msgid "Try to authenticate all users based on their mac address alone"
 msgstr ""
 
 #. Password
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:174
-msgid "coovachilli_macauth_macpasswd"
+msgid "Password"
 msgstr ""
 
 #. Password used when performing MAC authentication
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:175
-msgid "coovachilli_macauth_macpasswd_desc"
+msgid "Password used when performing MAC authentication"
 msgstr ""
 
 #. Suffix
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:176
-msgid "coovachilli_macauth_macsuffix"
+msgid "Suffix"
 msgstr ""
 
 #. Suffix to add to the MAC address in order to form the User-Name, which is sent to the radius server
diff --git a/po/es/ddns.po b/po/es/ddns.po
index 477d0ca43..1df06f4ba 100644
--- a/po/es/ddns.po
+++ b/po/es/ddns.po
@@ -13,39 +13,39 @@ msgstr ""
 
 #. Dynamic DNS
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:1
-msgid "ddns"
+msgid "Dynamic DNS"
 msgstr "DNS dinámico"
 
 #. Dynamic DNS allows that your router can be reached with a fixed hostname while having a dynamically changing IP-Address.
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:2
-msgid "ddns_desc"
+msgid "Dynamic DNS allows that your router can be reached with a fixed hostname while having a dynamically changing IP-Address."
 msgstr ""
 "DNS Dinámico, le permite a su router ser alcanzado con un nombre de host "
 "establecido/fijo aunque su dirección IP cambie en forma dinámica."
 
 #. Source of IP-Address
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:3
-msgid "ddns_service_ipsource"
+msgid "Source of IP-Address"
 msgstr "Dirección IP de origen"
 
 #. Check for changed IP every
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:4
-msgid "ddns_service_checkinterval"
+msgid "Check for changed IP every"
 msgstr "Verificar que la dirección IP haya cambiado cada"
 
 #. Check-Time unit
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:5
-msgid "ddns_service_checkunit"
+msgid "Check-Time unit"
 msgstr "Unidad para el chequeo del tiempo"
 
 #. Force update every
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:6
-msgid "ddns_service_forceinterval"
+msgid "Force update every"
 msgstr "Forzar actualización cada"
 
 #. Force-Time unit
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:7
-msgid "ddns_service_forceunit"
+msgid "Force-Time unit"
 msgstr "Forzar unidad de tiempo"
 
 #. Custom Update-URL
diff --git a/po/es/default.po b/po/es/default.po
index ca0f9226c..11f4da9f2 100644
--- a/po/es/default.po
+++ b/po/es/default.po
@@ -13,37 +13,37 @@ msgstr ""
 
 #. Skip to navigation
 #: i18n/english/luasrc/i18n/default.en.lua:1
-msgid "skiplink1"
+msgid "Skip to navigation"
 msgstr "Saltar a navegación "
 
 #. Skip to content
 #: i18n/english/luasrc/i18n/default.en.lua:2
-msgid "skiplink2"
+msgid "Skip to content"
 msgstr "Saltar al contenido"
 
 #. Navigation
 #: i18n/english/luasrc/i18n/default.en.lua:3
-msgid "navigation"
+msgid "Navigation"
 msgstr "Navegación"
 
 #. About
 #: i18n/english/luasrc/i18n/default.en.lua:4
-msgid "about"
+msgid "About"
 msgstr "Acerca de"
 
 #. Add
 #: i18n/english/luasrc/i18n/default.en.lua:5
-msgid "add"
+msgid "Add"
 msgstr "Añadir"
 
 #. Addresses
 #: i18n/english/luasrc/i18n/default.en.lua:6
-msgid "addresses"
+msgid "Addresses"
 msgstr "Direcciones"
 
 #. Aliases
 #: i18n/english/luasrc/i18n/default.en.lua:7
-msgid "aliases"
+msgid "Aliases"
 msgstr "Aliases"
 
 #. all
@@ -58,99 +58,99 @@ msgstr "volver"
 
 #. Administration
 #: i18n/english/luasrc/i18n/default.en.lua:10
-msgid "administration"
+msgid "Administration"
 msgstr "Administración"
 
 #. Essentials
 #: i18n/english/luasrc/i18n/default.en.lua:11
-msgid "essentials"
+msgid "Essentials"
 msgstr "Esencial"
 
 #. Apply
 #: i18n/english/luasrc/i18n/default.en.lua:12
-msgid "apply"
+msgid "Apply"
 msgstr "Aplicar"
 
 #. Basic Settings
 #: i18n/english/luasrc/i18n/default.en.lua:13
-msgid "basicsettings"
+msgid "Basic Settings"
 msgstr "Configuración Básica"
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast
 #: i18n/english/luasrc/i18n/default.en.lua:14
-msgid "broadcast"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"
 msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"
 
 #. Cancel
 #: i18n/english/luasrc/i18n/default.en.lua:15
-msgid "cancel"
+msgid "Cancel"
 msgstr "Cancelar"
 
 #. Changes
 #: i18n/english/luasrc/i18n/default.en.lua:16
-msgid "changes"
+msgid "Changes"
 msgstr "Cambios"
 
 #. Channel
 #: i18n/english/luasrc/i18n/default.en.lua:17
-msgid "channel"
+msgid "Channel"
 msgstr "Canal"
 
 #. <abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/prefix
 #: i18n/english/luasrc/i18n/default.en.lua:18
-msgid "cidr6"
+msgid "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/prefix"
 msgstr ""
 "Notación-<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>: "
 "dirección/prefijo"
 
 #. Code
 #: i18n/english/luasrc/i18n/default.en.lua:19
-msgid "code"
+msgid "Code"
 msgstr "Código"
 
 #. Configuration
 #: i18n/english/luasrc/i18n/default.en.lua:20
-msgid "config"
+msgid "Configuration"
 msgstr "Configuración"
 
 #. Configuration file
 #: i18n/english/luasrc/i18n/default.en.lua:21
-msgid "configfile"
+msgid "Configuration file"
 msgstr "Fichero configuración"
 
 #. Confirmation
 #: i18n/english/luasrc/i18n/default.en.lua:22
-msgid "confirmation"
+msgid "Confirmation"
 msgstr "Confirmación"
 
 #. Delete
 #: i18n/english/luasrc/i18n/default.en.lua:23
-msgid "delete"
+msgid "Delete"
 msgstr "Eliminar"
 
 #. Description
 #: i18n/english/luasrc/i18n/default.en.lua:24
-msgid "descr"
+msgid "Description"
 msgstr "Descripción"
 
 #. Design
 #: i18n/english/luasrc/i18n/default.en.lua:25
-msgid "design"
+msgid "Design"
 msgstr "Diseño"
 
 #. Destination
 #: i18n/english/luasrc/i18n/default.en.lua:26
-msgid "destination"
+msgid "Destination"
 msgstr "Destino"
 
 #. Device
 #: i18n/english/luasrc/i18n/default.en.lua:27
-msgid "device"
+msgid "Device"
 msgstr "Dispositivo"
 
 #. Devices
 #: i18n/english/luasrc/i18n/default.en.lua:28
-msgid "devices"
+msgid "Devices"
 msgstr "Dispositivos"
 
 #. disable
@@ -160,22 +160,22 @@ msgstr "desabilitar"
 
 #. Distance
 #: i18n/english/luasrc/i18n/default.en.lua:30
-msgid "distance"
+msgid "Distance"
 msgstr "Distancia"
 
 #. Kernel Log
 #: i18n/english/luasrc/i18n/default.en.lua:31
-msgid "dmesg"
+msgid "Kernel Log"
 msgstr "Log Kernel"
 
 #. <abbr title=\"Domain Name System\">DNS</abbr>-Server
 #: i18n/english/luasrc/i18n/default.en.lua:32
-msgid "dnsserver"
+msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Server"
 msgstr "Servidor <abbr title=\"Domain Name System\">DNS</abbr>"
 
 #. Edit
 #: i18n/english/luasrc/i18n/default.en.lua:33
-msgid "edit"
+msgid "Edit"
 msgstr "Editar"
 
 #. enable
@@ -185,47 +185,47 @@ msgstr "habilitar"
 
 #. Encryption
 #: i18n/english/luasrc/i18n/default.en.lua:35
-msgid "encryption"
+msgid "Encryption"
 msgstr "Encriptación"
 
 #. Error
 #: i18n/english/luasrc/i18n/default.en.lua:36
-msgid "error"
+msgid "Error"
 msgstr "Error"
 
 #. Filesystem
 #: i18n/english/luasrc/i18n/default.en.lua:37
-msgid "filesystem"
+msgid "Filesystem"
 msgstr "Sistema de ficheros"
 
 #. Filter
 #: i18n/english/luasrc/i18n/default.en.lua:38
-msgid "filter"
+msgid "Filter"
 msgstr "Filtro"
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway
 #: i18n/english/luasrc/i18n/default.en.lua:39
-msgid "gateway"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
 msgstr "Puerta de enlace <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
 
 #. <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway
 #: i18n/english/luasrc/i18n/default.en.lua:40
-msgid "gateway6"
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 msgstr "Puerta de enlace <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>"
 
 #. General
 #: i18n/english/luasrc/i18n/default.en.lua:41
-msgid "general"
+msgid "General"
 msgstr "General"
 
 #. Hostname
 #: i18n/english/luasrc/i18n/default.en.lua:42
-msgid "hostname"
+msgid "Hostname"
 msgstr "Nombre de host"
 
 #. Install
 #: i18n/english/luasrc/i18n/default.en.lua:43
-msgid "install"
+msgid "Install"
 msgstr "Instalar"
 
 #. installed
@@ -235,102 +235,102 @@ msgstr "instalado"
 
 #. Interface
 #: i18n/english/luasrc/i18n/default.en.lua:45
-msgid "interface"
+msgid "Interface"
 msgstr "Interfaz"
 
 #. Interfaces
 #: i18n/english/luasrc/i18n/default.en.lua:46
-msgid "interfaces"
+msgid "Interfaces"
 msgstr "Interfaces"
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address
 #: i18n/english/luasrc/i18n/default.en.lua:47
-msgid "ipaddress"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
 msgstr "Dirección <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
 
 #. <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address
 #: i18n/english/luasrc/i18n/default.en.lua:48
-msgid "ip6address"
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address"
 msgstr "Dirección <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>"
 
 #. Legend
 #: i18n/english/luasrc/i18n/default.en.lua:49
-msgid "legend"
+msgid "Legend"
 msgstr "Leyenda"
 
 #. Library
 #: i18n/english/luasrc/i18n/default.en.lua:50
-msgid "library"
+msgid "Library"
 msgstr "Biblioteca"
 
 #. Logout
 #: i18n/english/luasrc/i18n/default.en.lua:51
-msgid "logout"
+msgid "Logout"
 msgstr "Cerrar sesión"
 
 #. Key
 #: i18n/english/luasrc/i18n/default.en.lua:52
-msgid "key"
+msgid "Key"
 msgstr "Llave"
 
 #. Language
 #: i18n/english/luasrc/i18n/default.en.lua:53
-msgid "language"
+msgid "Language"
 msgstr "Lenguaje"
 
 #. Limit
 #: i18n/english/luasrc/i18n/default.en.lua:54
-msgid "limit"
+msgid "Limit"
 msgstr "Límite"
 
 #. Load
 #: i18n/english/luasrc/i18n/default.en.lua:55
-msgid "load"
+msgid "Load"
 msgstr "Carga"
 
 #. Login
 #: i18n/english/luasrc/i18n/default.en.lua:56
-msgid "login"
+msgid "Login"
 msgstr "Iniciar sesión"
 
 #. <abbr title=\"Media Access Control\">MAC</abbr>-Address
 #: i18n/english/luasrc/i18n/default.en.lua:57
-msgid "macaddress"
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr "Dirección <abbr title=\"Media Access Control\">MAC</abbr>"
 
 #. see &#39;%s&#39; manpage
 #: i18n/english/luasrc/i18n/default.en.lua:58
-msgid "manpage"
+msgid "see '%s' manpage"
 msgstr "ver las páginas de man de &amp;#39;%s&amp;#39;"
 
 #. Metric
 #: i18n/english/luasrc/i18n/default.en.lua:59
-msgid "metric"
+msgid "Metric"
 msgstr "Métrica"
 
 #. Mode
 #: i18n/english/luasrc/i18n/default.en.lua:60
-msgid "mode"
+msgid "Mode"
 msgstr "Modo"
 
 #. Name
 #: i18n/english/luasrc/i18n/default.en.lua:61
-msgid "name"
+msgid "Name"
 msgstr "Nombre"
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask
 #: i18n/english/luasrc/i18n/default.en.lua:62
-msgid "netmask"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr "Máscara de red <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
 
 #. Network
 #: i18n/english/luasrc/i18n/default.en.lua:63
-msgid "network"
+msgid "Network"
 msgstr "Red"
 
 #. Networks
 #: i18n/english/luasrc/i18n/default.en.lua:64
-msgid "networks"
+msgid "Networks"
 msgstr "Redes"
 
 #. none
@@ -340,117 +340,117 @@ msgstr "ninguno"
 
 #. not installed
 #: i18n/english/luasrc/i18n/default.en.lua:66
-msgid "notinstalled"
+msgid "not installed"
 msgstr "no instalado"
 
 #. OK
 #: i18n/english/luasrc/i18n/default.en.lua:67
-msgid "ok"
+msgid "OK"
 msgstr "Aceptar"
 
 #. Options
 #: i18n/english/luasrc/i18n/default.en.lua:68
-msgid "options"
+msgid "Options"
 msgstr "Opciones"
 
 #. Overview
 #: i18n/english/luasrc/i18n/default.en.lua:69
-msgid "overview"
+msgid "Overview"
 msgstr "Descripción general"
 
 #. Package Manager
 #: i18n/english/luasrc/i18n/default.en.lua:70
-msgid "packagemanager"
+msgid "Package Manager"
 msgstr "Gestor de Paquetes"
 
 #. Password
 #: i18n/english/luasrc/i18n/default.en.lua:71
-msgid "password"
+msgid "Password"
 msgstr "Contraseña"
 
 #. Path
 #: i18n/english/luasrc/i18n/default.en.lua:72
-msgid "path"
+msgid "Path"
 msgstr "Ruta (path)"
 
 #. Port
 #: i18n/english/luasrc/i18n/default.en.lua:73
-msgid "port"
+msgid "Port"
 msgstr "Puerto"
 
 #. Ports
 #: i18n/english/luasrc/i18n/default.en.lua:74
-msgid "ports"
+msgid "Ports"
 msgstr "Puertos"
 
 #. Proceed
 #: i18n/english/luasrc/i18n/default.en.lua:75
-msgid "proceed"
+msgid "Proceed"
 msgstr "Proceda"
 
 #. Protocol
 #: i18n/english/luasrc/i18n/default.en.lua:76
-msgid "protocol"
+msgid "Protocol"
 msgstr "Protocolo"
 
 #. Reboot
 #: i18n/english/luasrc/i18n/default.en.lua:77
-msgid "reboot"
+msgid "Reboot"
 msgstr "Reiniciar"
 
 #. Reset
 #: i18n/english/luasrc/i18n/default.en.lua:78
-msgid "reset"
+msgid "Reset"
 msgstr "Resetear"
 
 #. Revert
 #: i18n/english/luasrc/i18n/default.en.lua:79
-msgid "revert"
+msgid "Revert"
 msgstr "Revertir"
 
 #. Save
 #: i18n/english/luasrc/i18n/default.en.lua:80
-msgid "save"
+msgid "Save"
 msgstr "Guardar"
 
 #. Save &amp; Apply
 #: i18n/english/luasrc/i18n/default.en.lua:81
-msgid "saveapply"
+msgid "Save & Apply"
 msgstr "Guardar &amp;amp; Aplicar"
 
 #. Scan
 #: i18n/english/luasrc/i18n/default.en.lua:82
-msgid "scan"
+msgid "Scan"
 msgstr "Escanear"
 
 #. Service
 #: i18n/english/luasrc/i18n/default.en.lua:83
-msgid "service"
+msgid "Service"
 msgstr "Servicio"
 
 #. Services
 #: i18n/english/luasrc/i18n/default.en.lua:84
-msgid "services"
+msgid "Services"
 msgstr "Servicios"
 
 #. Settings
 #: i18n/english/luasrc/i18n/default.en.lua:85
-msgid "settings"
+msgid "Settings"
 msgstr "Configuraciones"
 
 #. Size
 #: i18n/english/luasrc/i18n/default.en.lua:86
-msgid "size"
+msgid "Size"
 msgstr "Tamaño"
 
 #. Source
 #: i18n/english/luasrc/i18n/default.en.lua:87
-msgid "source"
+msgid "Source"
 msgstr "Origen"
 
 #. Start
 #: i18n/english/luasrc/i18n/default.en.lua:88
-msgid "start"
+msgid "Start"
 msgstr "Iniciar"
 
 #. static
@@ -460,73 +460,73 @@ msgstr "estático"
 
 #. Status
 #: i18n/english/luasrc/i18n/default.en.lua:90
-msgid "status"
+msgid "Status"
 msgstr "Estado"
 
 #. Statistics
 #: i18n/english/luasrc/i18n/default.en.lua:91
-msgid "statistics"
+msgid "Statistics"
 msgstr "Estadísticas"
 
 #. Submit
 #: i18n/english/luasrc/i18n/default.en.lua:92
-msgid "submit"
+msgid "Submit"
 msgstr "Enviar"
 
 #. System Log
 #: i18n/english/luasrc/i18n/default.en.lua:93
-msgid "syslog"
+msgid "System Log"
 msgstr "Registro del Sistema"
 
 #. System
 #: i18n/english/luasrc/i18n/default.en.lua:94
-msgid "system"
+msgid "System"
 msgstr "Sistema"
 
 # Target = Meta --> Objetivo --> Destino?
 #. Target
 #: i18n/english/luasrc/i18n/default.en.lua:95
-msgid "target"
+msgid "Target"
 msgstr "Destino"
 
 #. Timezone
 #: i18n/english/luasrc/i18n/default.en.lua:96
-msgid "timezone"
+msgid "Timezone"
 msgstr "Zona horaria"
 
 #. Type
 #: i18n/english/luasrc/i18n/default.en.lua:97
-msgid "type"
+msgid "Type"
 msgstr "Tipo"
 
 #. Unknown Error
 #: i18n/english/luasrc/i18n/default.en.lua:98
-msgid "unknownerror"
+msgid "Unknown Error"
 msgstr "Error desconocido"
 
 #. Unsaved Changes
 #: i18n/english/luasrc/i18n/default.en.lua:99
-msgid "unsavedchanges"
+msgid "Unsaved Changes"
 msgstr "Cambios no guardados"
 
 #. Username
 #: i18n/english/luasrc/i18n/default.en.lua:100
-msgid "username"
+msgid "Username"
 msgstr "Nombre de usuario"
 
 #. Version
 #: i18n/english/luasrc/i18n/default.en.lua:101
-msgid "version"
+msgid "Version"
 msgstr "Versión"
 
 #. Web <abbr title=\"User Interface\">UI</abbr>
 #: i18n/english/luasrc/i18n/default.en.lua:102
-msgid "webui"
+msgid "Web <abbr title=\"User Interface\">UI</abbr>"
 msgstr "<abbr title=\"User Interface\">Interfaz de Usuario</abbr> Web"
 
 #. Wifi
 #: i18n/english/luasrc/i18n/default.en.lua:103
-msgid "wifi"
+msgid "Wifi"
 msgstr "Wifi"
 
 #. Zone
diff --git a/po/es/freifunk.po b/po/es/freifunk.po
index e98561621..fdc3c7ae7 100644
--- a/po/es/freifunk.po
+++ b/po/es/freifunk.po
@@ -13,210 +13,210 @@ msgstr ""
 
 #. Hello and welcome in the network of
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:1
-msgid "ff_hellonet"
+msgid "Hello and welcome in the network of"
 msgstr "Hola y bienvenido a la red de"
 
 #. We are an initiative to establish a free, independent and open wireless mesh network.
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:2
-msgid "ff_public1"
+msgid "We are an initiative to establish a free, independent and open wireless mesh network."
 msgstr ""
 "Somos una iniciativa que pretende crear red libre, independiente y abierta "
 "utilizando tecnología de conexión inalámbrica."
 
 #. This is the access point
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:3
-msgid "ff_public2"
+msgid "This is the access point"
 msgstr "Este es el punto de acceso"
 
 #. It is operated by
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:4
-msgid "ff_public3"
+msgid "It is operated by"
 msgstr "Se encuentra administrado por"
 
 #. You can find further information about the global Freifunk initiative at
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:5
-msgid "ff_public4"
+msgid "You can find further information about the global Freifunk initiative at"
 msgstr "Puede obtener información acrca de la iniciativaglobal Freifunk en"
 
 #. If you are interested in our project then contact the local community
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:6
-msgid "ff_public5"
+msgid "If you are interested in our project then contact the local community"
 msgstr ""
 "Si se encuentra interesado en nuestro proyecto, por favor contáctese con su "
 "comunidad local mas cercana"
 
 #. Internet access depends on technical and organisational conditions and may or may not work for you.
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:7
-msgid "ff_public6"
+msgid "Internet access depends on technical and organisational conditions and may or may not work for you."
 msgstr ""
 "El acceso a Internet depende de condiciones técnicas y organizacionales y "
 "puede o no funcionar para usted."
 
 #. Location
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:8
-msgid "ff_location"
+msgid "Location"
 msgstr "Dirección"
 
 #. E-Mail
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:9
-msgid "ff_mail"
+msgid "E-Mail"
 msgstr "E-Mail"
 
 #. You really should provide your address here!
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:10
-msgid "ff_mail1"
+msgid "You really should provide your address here!"
 msgstr "Usted realmente debe proporcionar su dirección aquí!"
 
 #. Nickname
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:11
-msgid "ff_nickname"
+msgid "Nickname"
 msgstr "Apodo"
 
 #. Realname
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:12
-msgid "ff_name"
+msgid "Realname"
 msgstr "Nombre completo"
 
 #. Node
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:13
-msgid "ff_node"
+msgid "Node"
 msgstr "Nodo"
 
 #. Notice
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:14
-msgid "ff_note"
+msgid "Notice"
 msgstr "Aviso"
 
 #. Phone
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:15
-msgid "ff_phone"
+msgid "Phone"
 msgstr "Teléfono"
 
 #. Memory
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:16
-msgid "ff_ram"
+msgid "Memory"
 msgstr "Memoria"
 
 #. Free
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:17
-msgid "ff_free"
+msgid "Free"
 msgstr "Libre"
 
 #. Buffers
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:18
-msgid "ff_buffers"
+msgid "Buffers"
 msgstr "Buffers"
 
 #. Cached
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:19
-msgid "ff_cached"
+msgid "Cached"
 msgstr "En caché"
 
 #. Total
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:20
-msgid "ff_total"
+msgid "Total"
 msgstr "Total"
 
 #. Coordinates
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:21
-msgid "ff_geocoord"
+msgid "Coordinates"
 msgstr "Coordenadas"
 
 #. Client-Splash
-msgid "ff_splash"
+msgid "Client-Splash"
 msgstr "Client-Splash"
 
 #. Active Clients
-msgid "ff_splash_clients"
+msgid "Active Clients"
 msgstr "Clientes activos"
 
 #. Hostname
-msgid "ff_splash_hostname"
+msgid "Hostname"
 msgstr "Nombre de host"
 
 #. IP Address
-msgid "ff_splash_ip"
+msgid "IP Address"
 msgstr "Dirección IP"
 
 #. MAC Address
-msgid "ff_splash_mac"
+msgid "MAC Address"
 msgstr "Dirección MAC"
 
 #. Time remaining
-msgid "ff_splash_timeleft"
+msgid "Time remaining"
 msgstr "Tiempo restante"
 
 #. Outgoing traffic
-msgid "ff_splash_traffic"
+msgid "Traffic (down/up)"
 msgstr "Tráfico saliente"
 
 #. Policy
-msgid "ff_splash_policy"
+msgid "Policy"
 msgstr "Política"
 
 #. unknown
-msgid "ff_splash_unknown"
+msgid "unknown"
 msgstr "desconocido"
 
 #. expired
-msgid "ff_splash_expired"
+msgid "expired"
 msgstr "expirado"
 
 #. whitelisted
-msgid "ff_splash_whitelisted"
+msgid "whitelisted"
 msgstr "en lista blanca"
 
 #. splashed
-msgid "ff_splash_splashed"
+msgid "splashed"
 msgstr "salpicado"
 
 #. blacklisted
-msgid "ff_splash_blacklisted"
+msgid "blacklisted"
 msgstr "en lista negra"
 
 #. temporarily blocked
-msgid "ff_splash_tempblock"
+msgid "temporarily blocked"
 msgstr "bloqueado temporalmente"
 
 #. No clients connected
-msgid "ff_splash_noclients"
+msgid "No clients connected"
 msgstr "No hay clientes conectados"
 
 #. P2P-Block
-msgid "ff_p2pblock"
+msgid "P2P-Block"
 msgstr "Bloqueo de P2P"
 
 #. P2P-Block is a greylisting mechanism to block various peer-to-peer protocols for non-whitelisted clients.
-msgid "ff_p2pblock_desc"
+msgid "P2P-Block is a greylisting mechanism to block various peer-to-peer protocols for non-whitelisted clients."
 msgstr ""
 "El Bloqueo de P2P es un mecanismo que implementa una lista gris "
 "(greylisting) para bloquear varios protocolos peer-to-peer para los clientes "
 "que no se encuentren en la lista blanca (whitelisted)"
 
 #. Enable P2P-Block
-msgid "ff_p2pblock_enabled"
+msgid "Enable P2P-Block"
 msgstr "Activar bloqueo P2P"
 
 #. Portrange
-msgid "ff_p2pblock_portrange"
+msgid "Portrange"
 msgstr "Rango de puertos"
 
 #. Block Time
-msgid "ff_p2pblock_blocktime"
+msgid "Block Time"
 msgstr "Tiempo de bloqueo"
 
 #. seconds
-msgid "ff_p2pblock_blocktime_desc"
+msgid "seconds"
 msgstr "segundos"
 
 #. Whitelisted IPs
-msgid "ff_p2pblock_whitelist"
+msgid "Whitelisted IPs"
 msgstr "IPs en la lista blanca"
 
 #. Layer7-Protokolle
-msgid "ff_p2pblock_layer7"
+msgid "Layer7-Protocols"
 msgstr "Protocolo Layer7"
 
 #. IP-P2P
-msgid "ff_p2pblock_ipp2p"
+msgid "IP-P2P"
 msgstr "IP-P2P"
diff --git a/po/es/hd_idle.po b/po/es/hd_idle.po
index 31877728d..b873285a5 100644
--- a/po/es/hd_idle.po
+++ b/po/es/hd_idle.po
@@ -13,37 +13,37 @@ msgstr ""
 
 #. Disk
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:1
-msgid "disk"
+msgid "Disk"
 msgstr "Disco"
 
 #. Enable debug
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:2
-msgid "enable_debug"
+msgid "Enable debug"
 msgstr "Activar depuración"
 
 #. hd-idle
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:3
-msgid "hd_idle"
+msgid "hd-idle"
 msgstr "hd-idle"
 
 #. hd-idle is a utility program for spinning-down external disks after a period of idle time.
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:4
-msgid "hd_idle_desc"
+msgid "hd-idle is a utility program for spinning-down external disks after a period of idle time."
 msgstr ""
 "hd-idle es una programa utilitario para el manejo del estado de reposo "
 "(spinning-down) de discos externos luego de estar un cierto tiempo inactivo."
 
 #. Idle-Time
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:5
-msgid "idle_time_interval"
+msgid "Idle-Time"
 msgstr "Tiempo Inactivo"
 
 #. Idle-Time unit
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:6
-msgid "idle_time_unit"
+msgid "Idle-Time unit"
 msgstr "Unidad de \"Tiempo Inactivo\""
 
 #. Settings
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:7
-msgid "settings"
+msgid "Settings"
 msgstr "Configuración"
diff --git a/po/es/initmgr.po b/po/es/initmgr.po
index 37244b48a..5bcdec7ed 100644
--- a/po/es/initmgr.po
+++ b/po/es/initmgr.po
@@ -13,12 +13,12 @@ msgstr ""
 
 #. Initscripts
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:1
-msgid "initmgr"
+msgid "Initscripts"
 msgstr "Scripts de inicio"
 
 #. You can enable or disable installed init scripts here. Changes will applied after a device reboot.<br /><strong>Warning: If you disable essential init scripts like &quot;network&quot;, your device might become inaccesable!</strong>
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:2
-msgid "initmgr_desc"
+msgid "You can enable or disable installed init scripts here. Changes will applied after a device reboot.<br /><strong>Warning: If you disable essential init scripts like \"network\", your device might become inaccesable!</strong>"
 msgstr ""
 "Puede activar o desactivar los scripts de inicio (init scripts) desde aquí. "
 "Los cambios serána plicados luego de que reinicie el equipo.<br "
@@ -28,12 +28,12 @@ msgstr ""
 
 #. Start priority
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:3
-msgid "initmgr_index"
+msgid "Start priority"
 msgstr "Prioridad de inicio"
 
 #. Initscript
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:4
-msgid "initmgr_name"
+msgid "Initscript"
 msgstr "Nombre del script de inicio"
 
 #. Enable/Disable
diff --git a/po/es/livestats.po b/po/es/livestats.po
index f9a6f7f32..eb6030027 100644
--- a/po/es/livestats.po
+++ b/po/es/livestats.po
@@ -13,32 +13,32 @@ msgstr ""
 
 #. incoming
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:1
-msgid "livestats_incoming"
+msgid "incoming"
 msgstr "entrante"
 
 #. outgoing
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:2
-msgid "livestats_outgoing"
+msgid "outgoing"
 msgstr "saliente"
 
 #. traffic on
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:3
-msgid "livestats_traffic"
+msgid "traffic on"
 msgstr "traffic on"
 
 #. signal-to-noise ratio for
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:4
-msgid "livestats_wifi"
+msgid "signal-to-noise ratio for"
 msgstr "Relación señal-ruido"
 
 #. load average
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:5
-msgid "livestats_loadavg"
+msgid "load average"
 msgstr "carga promedio"
 
 #. Realtime Wireless Status
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:6
-msgid "livestats_stat_wireless"
+msgid "Realtime Wireless Status"
 msgstr "Estado en tiempo real de la red wireless"
 
 #. Realtime Network Traffic
diff --git a/po/es/luci-fw.po b/po/es/luci-fw.po
index ea0bea912..73694a644 100644
--- a/po/es/luci-fw.po
+++ b/po/es/luci-fw.po
@@ -13,61 +13,61 @@ msgstr ""
 
 #. Port forwarding
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:1
-msgid "fw_portfw"
+msgid "Port forwarding"
 msgstr "Reenvío de puerto"
 
 #. Traffic Redirection
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:2
-msgid "fw_redirect"
+msgid "Traffic Redirection"
 msgstr "Redirección de tráfico"
 
 #. Traffic redirection allows you to change the destination address of forwarded packets.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:3
-msgid "fw_redirect_desc"
+msgid "Traffic redirection allows you to change the destination address of forwarded packets."
 msgstr ""
 "La redirección de tráfico permite cambiar la dirección de destino de los "
 "paquetes reenviados."
 
 #. Zone-to-Zone traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:4
-msgid "fw_forwarding"
+msgid "Zone-to-Zone traffic"
 msgstr "Tráfico Zona-a-Zona"
 
 #. Firewall
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:5
-msgid "fw_fw"
+msgid "Firewall"
 msgstr "Corta fuego"
 
 #. Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:6
-msgid "fw_zone"
+msgid "Zone"
 msgstr "Zona"
 
 #. Zones
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:7
-msgid "fw_zones"
+msgid "Zones"
 msgstr "Zonas"
 
 #. Custom forwarding
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:8
-msgid "fw_custfwd"
+msgid "Custom forwarding"
 msgstr "Renvío personalizado"
 
 #. The firewall creates zones over your network interfaces to control network traffic flow.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:9
-msgid "fw_fw1"
+msgid "The firewall creates zones over your network interfaces to control network traffic flow."
 msgstr ""
 "El corta fuego crea zonas sobre sus interfaces de red para controlar el "
 "flujo del tráfico."
 
 #. Advanced Rules
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:10
-msgid "firewall_rule"
+msgid "Advanced Rules"
 msgstr "Reglas avanzadas"
 
 #. Advanced rules let you customize the firewall to your needs. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:11
-msgid "firewall_rule_desc"
+msgid "Advanced rules let you customize the firewall to your needs. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall."
 msgstr ""
 "Las reglas avanzadas le permite personalizar el corta fuego según sus "
 "necesidades. Sólamente las nuevas conexiones serán afectadas por las reglas. "
@@ -76,139 +76,139 @@ msgstr ""
 
 #. Input Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:12
-msgid "firewall_rule_src"
+msgid "Input Zone"
 msgstr "Zona de entrada"
 
 #. Output Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:13
-msgid "firewall_rule_dest"
+msgid "Output Zone"
 msgstr "Zona de salida"
 
 #. Source address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:14
-msgid "firewall_rule_srcip"
+msgid "Source address"
 msgstr "Dirección de origen"
 
 #. Destination address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:15
-msgid "firewall_rule_destip"
+msgid "Destination address"
 msgstr "Dirección de destino"
 
 #. Source MAC-Address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:16
-msgid "firewall_rule_srcmac"
+msgid "Source MAC-Address"
 msgstr "Dirección MAC de origen"
 
 #. Source port
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:17
-msgid "firewall_rule_srcport"
+msgid "Source port"
 msgstr "Puerto de origen"
 
 #. Destination port
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:18
-msgid "firewall_rule_destport"
+msgid "Destination port"
 msgstr "Puerto de destino"
 
 #. Action
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:19
-msgid "firewall_rule_target"
+msgid "Action"
 msgstr "Acción"
 
 #. accept
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:20
-msgid "fw_accept"
+msgid "accept"
 msgstr "aceptar"
 
 #. reject
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:21
-msgid "fw_reject"
+msgid "reject"
 msgstr "desechar"
 
 #. drop
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:22
-msgid "fw_drop"
+msgid "drop"
 msgstr "rechazar"
 
 #. Source
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:23
-msgid "fw_src"
+msgid "Source"
 msgstr "Origen"
 
 #. Destination
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:24
-msgid "fw_dest"
+msgid "Destination"
 msgstr "Destino"
 
 #. Traffic Control
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:25
-msgid "fw_traffic"
+msgid "Traffic Control"
 msgstr "Control de tráfico"
 
 #. MSS Clamping
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:26
-msgid "fw_mtufix"
+msgid "MSS Clamping"
 msgstr "MSS Clamping"
 
 #. Drop invalid packets
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:27
-msgid "fw_dropinvalid"
+msgid "Drop invalid packets"
 msgstr "Rechazar paquetes inválidos"
 
 #. Port forwarding allows to provide network services in the internal network to an external network.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:28
-msgid "fw_portfw1"
+msgid "Port forwarding allows to provide network services in the internal network to an external network."
 msgstr ""
 "El reenvío de puerto permite proveer servicios de red en una red interna a "
 "una red externa (por ejemplo Internet)"
 
 #. External Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:29
-msgid "firewall_redirect_src_desc"
+msgid "External Zone"
 msgstr "Zona Externa"
 
 #. External port
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:30
-msgid "firewall_redirect_srcdport"
+msgid "External port"
 msgstr "Puerto externo"
 
 #. port or range as first-last
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:31
-msgid "firewall_redirect_srcdport_desc"
+msgid "port or range as first-last"
 msgstr "puerto o rango de puertos (primero-último)"
 
 #. Source address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:32
-msgid "firewall_redirect_srcip"
+msgid "Source address"
 msgstr "Dirección de Origen"
 
 #. Source MAC
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:33
-msgid "firewall_redirect_srcmac"
+msgid "Source MAC"
 msgstr "MAC de Origen"
 
 #. Internal address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:34
-msgid "firewall_redirect_destip"
+msgid "Internal address"
 msgstr "Dirección interna"
 
 #. IP-Address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:35
-msgid "firewall_redirect_destip_desc"
+msgid "IP-Address"
 msgstr "Dirección IP"
 
 #. Internal port (optional)
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:36
-msgid "firewall_redirect_destport"
+msgid "Internal port (optional)"
 msgstr "Puerto interno (opcional)"
 
 #. port or range as first-last
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:37
-msgid "firewall_redirect_destport_desc"
+msgid "port or range as first-last"
 msgstr "puerto o rango de puertos (primero-último)"
 
 #. Here you can specify which network traffic is allowed to flow between network zones. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall. If you experience occasional connection problems try enabling MSS Clamping otherwise disable it for performance reasons.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:38
-msgid "fw_forwarding1"
+msgid "Here you can specify which network traffic is allowed to flow between network zones. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall. If you experience occasional connection problems try enabling MSS Clamping otherwise disable it for performance reasons."
 msgstr ""
 "Aquí puede especificar qué tráfico de red is permitido, discho tráfico "
 "fluirá entre las zonas de red definidas. Sólamente las nuevas conexiones "
@@ -219,49 +219,49 @@ msgstr ""
 
 #. Input
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:39
-msgid "firewall_forwarding_src"
+msgid "Input"
 msgstr "Entrada"
 
 #. Output
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:40
-msgid "firewall_forwarding_dest"
+msgid "Output"
 msgstr "Salida"
 
 #. Defaults
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:41
-msgid "firewall_defaults"
+msgid "Defaults"
 msgstr "De fábrica"
 
 #. These are the default settings that are used if no other rules match.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:42
-msgid "firewall_defaults_desc"
+msgid "These are the default settings that are used if no other rules match."
 msgstr ""
 "Estos son los valores por defecto que son usados si no hay otra regla a "
 "aplicar."
 
 #. SYN-flood protection
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:43
-msgid "firewall_defaults_synflood"
+msgid "SYN-flood protection"
 msgstr "Protección por exceso de SYN"
 
 #. Incoming Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:44
-msgid "firewall_defaults_input"
+msgid "Incoming Traffic"
 msgstr "Tráfico entrante"
 
 #. Outgoing Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:45
-msgid "firewall_defaults_output"
+msgid "Outgoing Traffic"
 msgstr "Tráfico saliente"
 
 #. Forwarded Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:46
-msgid "firewall_defaults_forward"
+msgid "Forwarded Traffic"
 msgstr "Tráfico reenviado"
 
 #. Zones part the network interfaces into certain isolated areas to separate network traffic. One or more networks can belong to a zone. The MASQ-flag enables NAT masquerading for all outgoing traffic on this zone.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:47
-msgid "firewall_zone_desc"
+msgid "Zones part the network interfaces into certain isolated areas to separate network traffic. One or more networks can belong to a zone. The MASQ-flag enables NAT masquerading for all outgoing traffic on this zone."
 msgstr ""
 "Las zonas dividen las interfaces de red en varias partes aisladas para "
 "separar el tráfico de red. Una o mas redes pueden pertenecer a una zona. La "
@@ -270,42 +270,42 @@ msgstr ""
 
 #. Incoming Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:48
-msgid "firewall_zone_input"
+msgid "Incoming Traffic"
 msgstr "Tráfico entrante"
 
 #. Default Policy
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:49
-msgid "firewall_zone_input_desc"
+msgid "Default Policy"
 msgstr "Poítica por defecto"
 
 #. Outgoing Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:50
-msgid "firewall_zone_output"
+msgid "Outgoing Traffic"
 msgstr "Tráfico saliente"
 
 #. Default Policy
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:51
-msgid "firewall_zone_output_desc"
+msgid "Default Policy"
 msgstr "Política por defecto"
 
 #. Forwarded Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:52
-msgid "firewall_zone_forward"
+msgid "Forwarded Traffic"
 msgstr "Tráfico reenviado"
 
 #. Default Policy
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:53
-msgid "firewall_zone_forward_desc"
+msgid "Default Policy"
 msgstr "Política por defecto"
 
 #. MASQ
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:54
-msgid "firewall_zone_masq"
+msgid "MASQ"
 msgstr "MASQ"
 
 #. Networks
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:55
-msgid "firewall_zone_network"
+msgid "Networks"
 msgstr "Redes"
 
 #. contained networks
diff --git a/po/es/mmc_over_gpio.po b/po/es/mmc_over_gpio.po
index a26c2749d..219c90e3d 100644
--- a/po/es/mmc_over_gpio.po
+++ b/po/es/mmc_over_gpio.po
@@ -13,15 +13,15 @@ msgstr ""
 
 #. MMC/SD driver configuration
 #: applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua:1
-msgid "mmc_over_gpio"
+msgid "MMC/SD driver configuration"
 msgstr "Configuración del driver de MMC/SD"
 
 #. MMC/SD driver configuration
 #: applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua:2
-msgid "mmc_over_gpio_desc"
+msgid "MMC/SD driver configuration"
 msgstr "Configuración del driver de MMC/SD"
 
 #. Settings
 #: applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua:3
-msgid "settings"
+msgid "Settings"
 msgstr "Configuración"
diff --git a/po/es/ntpc.po b/po/es/ntpc.po
index 45b879bee..03a793cd9 100644
--- a/po/es/ntpc.po
+++ b/po/es/ntpc.po
@@ -13,42 +13,42 @@ msgstr ""
 
 #. Time Synchronisation
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:1
-msgid "ntpc"
+msgid "Time Synchronisation"
 msgstr "Sincronización Horaria"
 
 #. Synchronizes the system time
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:2
-msgid "ntpc_desc"
+msgid "Synchronizes the system time"
 msgstr "Sincronizar la hora del sistema"
 
 #. Time Server
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:3
-msgid "ntpc_timeserver"
+msgid "Time Server"
 msgstr "Servidor de la hora"
 
 #. Update Interval (in s)
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:4
-msgid "ntpc_interval"
+msgid "Update Interval (in s)"
 msgstr "Intervalo de Actualización (en segundos)"
 
 #. Count of Time Measurements
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:5
-msgid "ntpc_count"
+msgid "Count of Time Measurements"
 msgstr "Contar las mediciones del tiempo "
 
 #. empty = infinite
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:6
-msgid "ntpc_count_desc"
+msgid "empty = infinite"
 msgstr "vacío = infinito"
 
 #. Clock Adjustment
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:7
-msgid "ntpc_drift"
+msgid "Clock Adjustment"
 msgstr "Ajuste del Reloj"
 
 #. Offset Frequency
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:8
-msgid "ntpc_drift_freq"
+msgid "Offset Frequency"
 msgstr "Corrimiento de Frecuencia"
 
 #. Current system time
diff --git a/po/es/olsr.po b/po/es/olsr.po
index c2577afec..f8bf1fccf 100644
--- a/po/es/olsr.po
+++ b/po/es/olsr.po
@@ -13,663 +13,663 @@ msgstr ""
 
 #. OLSR Daemon
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:1
-msgid "olsrd"
+msgid "OLSR Daemon"
 msgstr "Demonio OLSR"
 
 #. Neighbour IP
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:2
-msgid "olsrd_neighbour_ip"
+msgid "Neighbour IP"
 msgstr "Neighbour IP"
 
 #. Local interface IP
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:3
-msgid "olsrd_local_ip"
+msgid "Local interface IP"
 msgstr "IP de la interfaz local"
 
 #. Announced network
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:4
-msgid "olsrd_network"
+msgid "Announced network"
 msgstr "Red a anunciar"
 
 #. OLSR gateway
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:5
-msgid "olsrd_gateway"
+msgid "OLSR gateway"
 msgstr "Puerta de enlace OLSR"
 
 #. OLSR node
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:6
-msgid "olsrd_node"
+msgid "OLSR node"
 msgstr "Nodo OLSR"
 
 #. Unable to connect to the OLSR daemon!
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:7
-msgid "olsrd_error"
+msgid "Unable to connect to the OLSR daemon!"
 msgstr "No es posible conectar con el demonio de OLSR! "
 
 #. Make sure that OLSRd is running, the &quot;txtinfo&quot; plugin is loaded, configured on port 2006 and accepts connections from &quot;127.0.0.1&quot;.
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:8
-msgid "olsrd_error_desc"
+msgid "Make sure that OLSRd is running, the \"txtinfo\" plugin is loaded, configured on port 2006 and accepts connections from \"127.0.0.1\"."
 msgstr ""
 "Asegúrese de que olsrd se está ejecutando, qué el plugin \"txtinfo\" esté "
 "cargado, configurado en el puerto 2006, y acepta conexiones desde 127.0.0.1."
 
 #. OLSR - HNA-Announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:9
-msgid "olsrd_hna"
+msgid "OLSR - HNA-Announcements"
 msgstr "Anuncios HNA de OLSR"
 
 #. OLSR - Plugins
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:10
-msgid "olsrd_plugins"
+msgid "OLSR - Plugins"
 msgstr "Plugins OLSR"
 
 #. OLSR connections
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:11
-msgid "olsrd_links"
+msgid "OLSR connections"
 msgstr "Conexiones OLSR"
 
 #. Overview of currently established OLSR connections
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:12
-msgid "olsrd_links_desc"
+msgid "Overview of currently established OLSR connections"
 msgstr ""
 "Detalle general acerca de las conexiones de OLSR establecidas actualmente."
 
 #. Expected retransmission count
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:13
-msgid "olsrd_links_etx_desc"
+msgid "Expected retransmission count"
 msgstr "Contador de retransmisión esperado"
 
 #. Success rate of sent packages
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:14
-msgid "olsrd_links_lq_desc"
+msgid "Success rate of sent packages"
 msgstr "Tasa de éxito de los paquetes enviados "
 
 #. Success rate of received packages
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:15
-msgid "olsrd_links_nlq_desc"
+msgid "Success rate of received packages"
 msgstr "Tasa de éxito de los paquetes recibidos"
 
 #. Known OLSR routes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:16
-msgid "olsrd_routes"
+msgid "Known OLSR routes"
 msgstr "Rutas OLSR conocidas"
 
 #. Overview of currently known routes to other OLSR nodes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:17
-msgid "olsrd_routes_desc"
+msgid "Overview of currently known routes to other OLSR nodes"
 msgstr "Listado de las rutas conocidas en la actualidad a otros nodos de OLSR "
 
 #. Active OLSR nodes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:18
-msgid "olsrd_topology"
+msgid "Active OLSR nodes"
 msgstr "Nodos OLSR activos"
 
 #. Overview of currently known OLSR nodes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:19
-msgid "olsrd_topology_desc"
+msgid "Overview of currently known OLSR nodes"
 msgstr "Listado de nodos actualmente conocido OLSR "
 
 #. Last hop
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:20
-msgid "olsrd_topology_lasthop"
+msgid "Last hop"
 msgstr "Último salto"
 
 #. Active host net announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:21
-msgid "olsrd_hna2"
+msgid "Active host net announcements"
 msgstr "Anuncios activos del host de red"
 
 #. Overview of currently active OLSR host net announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:22
-msgid "olsrd_hna_desc"
+msgid "Overview of currently active OLSR host net announcements"
 msgstr "Listado de los anuncios activos actuales de host de red de OLSR"
 
 #. Active MID announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:23
-msgid "olsrd_mid"
+msgid "Active MID announcements"
 msgstr "Anuncios MID activos"
 
 #. Overview of known multiple interface announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:24
-msgid "olsrd_mid_desc"
+msgid "Overview of known multiple interface announcements"
 msgstr "Listados múltiples de anuncios sobre las internfaces"
 
 #. Secondary OLSR interfaces
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:25
-msgid "olsrd_mid_aliases"
+msgid "Secondary OLSR interfaces"
 msgstr "Interfaces OLSR secundarias"
 
 #. Freifunk
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:26
-msgid "olsrd_etx_ff"
+msgid "Freifunk"
 msgstr "Freifunk"
 
 #. floating point
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:27
-msgid "olsrd_etx_float"
+msgid "floating point"
 msgstr "punto flotante"
 
 #. fixed point math
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:28
-msgid "olsrd_etx_fpm"
+msgid "fixed point math"
 msgstr "punto fijo matemático"
 
 #. General settings
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:29
-msgid "olsrd_olsrd"
+msgid "General settings"
 msgstr "Configuración general"
 
 #. Start without network
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:30
-msgid "olsrd_olsrd_allownoint"
+msgid "Start without network"
 msgstr "Iniciar sin red activa"
 
 #. Clear screen
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:31
-msgid "olsrd_olsrd_clearscreen"
+msgid "Clear screen"
 msgstr "Limpiar pantalla"
 
 #. Debugmode
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:32
-msgid "olsrd_olsrd_debuglevel"
+msgid "Debugmode"
 msgstr "Modo Depuración"
 
 #. FIB metric
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:33
-msgid "olsrd_olsrd_fibmetric"
+msgid "FIB metric"
 msgstr "FIB metric"
 
 #. Internet protocol
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:34
-msgid "olsrd_olsrd_ipversion"
+msgid "Internet protocol"
 msgstr "Protocolo de Internet"
 
 #. LQ aging
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:35
-msgid "olsrd_olsrd_linkqualityaging"
+msgid "LQ aging"
 msgstr "LQ aging"
 
 #. LQ algorithm
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:36
-msgid "olsrd_olsrd_linkqualityalgorithm"
+msgid "LQ algorithm"
 msgstr "LQ algorithm"
 
 #. LQ Dijkstra limit
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:37
-msgid "olsrd_olsrd_linkqualitydijkstralimit"
+msgid "LQ Dijkstra limit"
 msgstr "LQ Dijkstra limit"
 
 #. LQ fisheye
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:38
-msgid "olsrd_olsrd_linkqualityfisheye"
+msgid "LQ fisheye"
 msgstr "LQ fisheye"
 
 #. LQ level
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:39
-msgid "olsrd_olsrd_linkqualitylevel"
+msgid "LQ level"
 msgstr "LQ level"
 
 #. MPR selection
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:40
-msgid "olsrd_olsrd_linkqualitylevel_1"
+msgid "MPR selection"
 msgstr "Selección del MPR"
 
 #. MPR selection and routing
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:41
-msgid "olsrd_olsrd_linkqualitylevel_2"
+msgid "MPR selection and routing"
 msgstr "Selección del MPR y ruteo"
 
 #. LQ window size
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:42
-msgid "olsrd_olsrd_linkqualitywinsize"
+msgid "LQ window size"
 msgstr "Tamaño de la venta del LQ"
 
 #. MPR coverage
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:43
-msgid "olsrd_olsrd_mprcoverage"
+msgid "MPR coverage"
 msgstr "Cobertura MPR"
 
 #. Pollrate
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:44
-msgid "olsrd_olsrd_pollrate"
+msgid "Pollrate"
 msgstr "Pollrate"
 
 #. TC redundancy
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:45
-msgid "olsrd_olsrd_tcredundancy"
+msgid "TC redundancy"
 msgstr ""
 "Redundancia <abbr title=\"Topology Control - Control de la "
 "topología\">TC</abbr>"
 
 #. MPR selectors
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:46
-msgid "olsrd_olsrd_tcredundancy_0"
+msgid "MPR selectors"
 msgstr "Selectores MPR"
 
 #. MPR selectors and MPR
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:47
-msgid "olsrd_olsrd_tcredundancy_1"
+msgid "MPR selectors and MPR"
 msgstr "Selectores MPR y MPR"
 
 #. all neighbours
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:48
-msgid "olsrd_olsrd_tcredundancy_2"
+msgid "all neighbours"
 msgstr "todos los vecinos"
 
 #. Use hysteresis
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:49
-msgid "olsrd_olsrd_usehysteresis"
+msgid "Use hysteresis"
 msgstr "Uso de histéresis"
 
 #. Willingness
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:50
-msgid "olsrd_olsrd_willingness"
+msgid "Willingness"
 msgstr "<abbr title=\"Willingness\">Voluntad</abbr>"
 
 #. Hello interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:51
-msgid "olsrd_interface_hellointerval"
+msgid "Hello interval"
 msgstr "Intervalo de \"Hola\""
 
 #. Hello validity time
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:52
-msgid "olsrd_interface_hellovaliditytime"
+msgid "Hello validity time"
 msgstr "Tiempo de validez de \"Hola\""
 
 #. HNA interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:53
-msgid "olsrd_interface_hnainterval"
+msgid "HNA interval"
 msgstr "Intervalo HNA"
 
 #. HNA validity time
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:54
-msgid "olsrd_interface_hnavaliditytime"
+msgid "HNA validity time"
 msgstr "Timpo de validez de HNA"
 
 #. IPv4 broadcast
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:55
-msgid "olsrd_interface_ip4broadcast"
+msgid "IPv4 broadcast"
 msgstr "Dirección de transmisión IPv4"
 
 #. MID interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:56
-msgid "olsrd_interface_midinterval"
+msgid "MID interval"
 msgstr "Intervalo de MID"
 
 #. MID validity time
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:57
-msgid "olsrd_interface_midvaliditytime"
+msgid "MID validity time"
 msgstr "Tiempo de validez de MID"
 
 #. TC interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:58
-msgid "olsrd_interface_tcinterval"
+msgid "TC interval"
 msgstr "Intervalo TC"
 
 #. TC validity time
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:59
-msgid "olsrd_interface_tcvaliditytime"
+msgid "TC validity time"
 msgstr "Timpo de validez de TC"
 
 #. IPv6 address type
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:60
-msgid "olsrd_interface_ip6addrtype"
+msgid "IPv6 address type"
 msgstr "Tipo de dirección IPv6"
 
 #. IPC settings
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:61
-msgid "olsrd_ipcconnect"
+msgid "IPC settings"
 msgstr "Configuraciónes del IPC"
 
 #. IPC connections enable you to remote-control the local OLSRd instance using external programs
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:62
-msgid "olsrd_ipcconnect_desc"
+msgid "IPC connections enable you to remote-control the local OLSRd instance using external programs"
 msgstr ""
 "Las conexión de IPC le permite controlar de forma remota la instancia de "
 "OLSR (OLSRd) utilizando herramientas y programas externos"
 
 #. Allowed host addresses
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:63
-msgid "olsrd_ipcconnect_host"
+msgid "Allowed host addresses"
 msgstr "Direcciones de host permitidas"
 
 #. Multiple separated by spaces
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:64
-msgid "olsrd_ipcconnect_host_desc"
+msgid "Multiple separated by spaces"
 msgstr "Separar con espacios en caso de ser múltiples"
 
 #. Maxmimum connection count
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:65
-msgid "olsrd_ipcconnect_maxconnections"
+msgid "Maxmimum connection count"
 msgstr "Cuenta máxima de conexión"
 
 #. Set to 0 to disable IPC
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:66
-msgid "olsrd_ipcconnect_maxconnections_desc"
+msgid "Set to 0 to disable IPC"
 msgstr "Especifique \"0\" para desactivar IPC"
 
 #. Allowed subnets
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:67
-msgid "olsrd_ipcconnect_net"
+msgid "Allowed subnets"
 msgstr "Subredes permitidas"
 
 #. Address Mask; multiple separated by space
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:68
-msgid "olsrd_ipcconnect_net_desc"
+msgid "Address Mask; multiple separated by space"
 msgstr ""
 "Dirección de máscara de red, en caso de ser mas de una, sepárelas mediante "
 "un espacio"
 
 #. IPv4 HNA announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:69
-msgid "olsrd_hna4"
+msgid "IPv4 HNA announcements"
 msgstr "Anuncios IPv4 de HNA"
 
 #. Hna4 entries allow you to propagate local IPv4 host- and network-routes into the mesh network
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:70
-msgid "olsrd_hna4_desc"
+msgid "Hna4 entries allow you to propagate local IPv4 host- and network-routes into the mesh network"
 msgstr ""
 "Las entradas de Hna4 permite propagar las rutas locales de host y red dentro "
 "de la red en malla."
 
 #. Network address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:71
-msgid "olsrd_hna4_netaddr"
+msgid "Network address"
 msgstr "Direccíon de red"
 
 #. IPv4 address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:72
-msgid "olsrd_hna4_netaddr_desc"
+msgid "IPv4 address"
 msgstr "Dirección IPv4"
 
 #. Netmask
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:73
-msgid "olsrd_hna4_netmask"
+msgid "Netmask"
 msgstr "Máscara de red"
 
 #. IPv4 address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:74
-msgid "olsrd_hna4_netmask_desc"
+msgid "IPv4 address"
 msgstr "Dirección IPv4"
 
 #. IPv6 HNA announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:75
-msgid "olsrd_hna6"
+msgid "IPv6 HNA announcements"
 msgstr "Anuncios IPV6 de HNA"
 
 #. Hna6 entries allow you to propagate local IPv6 host- and network-routes into the mesh network
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:76
-msgid "olsrd_hna6_desc"
+msgid "Hna6 entries allow you to propagate local IPv6 host- and network-routes into the mesh network"
 msgstr ""
 "Las entradas de Hna6 permite propagar las rutas locales de host y red dentro "
 "de la red en malla."
 
 #. Network address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:77
-msgid "olsrd_hna6_netaddr"
+msgid "Network address"
 msgstr "Dirección de Red"
 
 #. IPv6 address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:78
-msgid "olsrd_hna6_netaddr_desc"
+msgid "IPv6 address"
 msgstr "Dirección IPv6"
 
 #. Prefix
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:79
-msgid "olsrd_hna6_prefix"
+msgid "Prefix"
 msgstr "Prefijo"
 
 #. IPv6 prefix
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:80
-msgid "olsrd_hna6_prefix_desc"
+msgid "IPv6 prefix"
 msgstr "Prefijo IPv6"
 
 #. Plugin configuration
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:81
-msgid "olsrd_loadplugin"
+msgid "Plugin configuration"
 msgstr "Configuración del plugin"
 
 #. Enable plugin
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:82
-msgid "olsrd_loadplugin_ignore"
+msgid "Enable plugin"
 msgstr "Activar plugin"
 
 #. Library
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:83
-msgid "olsrd_loadplugin_library"
+msgid "Library"
 msgstr "Librería"
 
 #. Allow connections from this hosts
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:84
-msgid "olsrd_loadplugin_accept"
+msgid "Allow connections from this hosts"
 msgstr "Permitir conexiones desde este host"
 
 #. Ping test addresses
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:85
-msgid "olsrd_loadplugin_ping"
+msgid "Ping test addresses"
 msgstr "Direcciones para el testeo con \"ping\""
 
 #. Interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:86
-msgid "olsrd_loadplugin_interval"
+msgid "Refresh interval in seconds"
 msgstr "Intervalo"
 
 #. HNA announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:87
-msgid "olsrd_loadplugin_hna"
+msgid "HNA announcements"
 msgstr "Anuncios HNA"
 
 #. Format: IP-Address Netmask / OLSR will announce this network once it is reachable
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:88
-msgid "olsrd_loadplugin_hna_desc"
+msgid "Format: IP-Address Netmask / OLSR will announce this network once it is reachable"
 msgstr ""
 "Formato: Dirección IP - Máscara de Red / OLSR anunciará esta red una vez que "
 "sea alcanzada"
 
 #. Alternative \"hosts\" file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:89
-msgid "olsrd_loadplugin_addhosts"
+msgid "Alternative \"hosts\" file"
 msgstr "Archivo alternativo de \"hosts\""
 
 #. The contents of this file will be appended to the autogenerated \"hosts\" file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:90
-msgid "olsrd_loadplugin_addhosts_desc"
+msgid "The contents of this file will be appended to the autogenerated \"hosts\" file"
 msgstr ""
 "El contenido de este archivo será agregado al archivo de \"hosts\" "
 "autogenerado"
 
 #. DNS server
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:91
-msgid "olsrd_loadplugin_dnsserver"
+msgid "DNS server"
 msgstr "Servidor DNS"
 
 #. Alternative hostnames
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:92
-msgid "olsrd_loadplugin_hosts"
+msgid "Alternative hostnames"
 msgstr "Nombres de host alternativo"
 
 #. Format: Interface-IP Hostname
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:93
-msgid "olsrd_loadplugin_hosts_desc"
+msgid "Format: Interface-IP Hostname"
 msgstr "Formato: Interfaz-IP nombre de host"
 
 #. Path to the \"hosts\" file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:94
-msgid "olsrd_loadplugin_hostsfile"
+msgid "Path to the \"hosts\" file"
 msgstr "Ruta al archivo de \"hosts\""
 
 #. Latitude
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:95
-msgid "olsrd_loadplugin_lat"
+msgid "Latitude"
 msgstr "Latitud"
 
 #. Output file for coordinates
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:96
-msgid "olsrd_loadplugin_latlonfile"
+msgid "Output file for coordinates"
 msgstr "Archivo de salida para las coordenadas"
 
 #. OLSR will write received coordinates of other nodes to this file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:97
-msgid "olsrd_loadplugin_latlonfile_desc"
+msgid "OLSR will write received coordinates of other nodes to this file"
 msgstr "OLSR escribirá las coordenadas recibidas de otros nodos a este archivo"
 
 #. Input file for coordinates
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:98
-msgid "olsrd_loadplugin_latloninfile"
+msgid "Input file for coordinates"
 msgstr "Archivo de entrada para las coordenadas"
 
 #. OLSR periodically checks this file for new coordinates and propagates them
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:99
-msgid "olsrd_loadplugin_latloninfile_desc"
+msgid "OLSR periodically checks this file for new coordinates and propagates them"
 msgstr ""
 "OLSR periodicamente chquea este archivo en búsqueda de nuevas coordenadas "
 "para luego propagarlas"
 
 #. Longitude
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:100
-msgid "olsrd_loadplugin_lon"
+msgid "Longitude"
 msgstr "Longitud"
 
 #. Hostnames
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:101
-msgid "olsrd_loadplugin_name"
+msgid "Hostnames"
 msgstr "Nombres de host"
 
 #. Command for name changes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:102
-msgid "olsrd_loadplugin_namechangescript"
+msgid "Command for name changes"
 msgstr "Comando para los cambios de nombre"
 
 #. OLSR executes this command once entries in the \"hosts\" are changed
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:103
-msgid "olsrd_loadplugin_namechangescript_desc"
+msgid "OLSR executes this command once entries in the \"hosts\" are changed"
 msgstr ""
 "OLSR ejecuta este comando una vez que las entradas en el archivo de \"hosts\" "
 "hayan cambiado"
 
 #. Path to the \"resolv\" file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:104
-msgid "olsrd_loadplugin_resolvfile"
+msgid "Path to the \"resolv\" file"
 msgstr "Ruta al archivo \"resolv\""
 
 #. Command for service changes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:105
-msgid "olsrd_loadplugin_serviceschangescript"
+msgid "Command for service changes"
 msgstr "Comando para los cambios de servicio"
 
 #. OLSR excutes this command once new service announcements are received
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:106
-msgid "olsrd_loadplugin_serviceschangescript_desc"
+msgid "OLSR excutes this command once new service announcements are received"
 msgstr ""
 "OLSR ejecuta este comando una vez que son recibidos los anuncios de un nuevo "
 "servicio"
 
 #. PID file for SIGHUP signals
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:107
-msgid "olsrd_loadplugin_sighuppidfile"
+msgid "PID file for SIGHUP signals"
 msgstr "Archivo PID para las señales de SIGHUP"
 
 #. OLSR sends a HUP signal to this PID once the \"hosts\" oder \"resolv\" file is changed
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:108
-msgid "olsrd_loadplugin_sighuppidfile_desc"
+msgid "OLSR sends a HUP signal to this PID once the \"hosts\" oder \"resolv\" file is changed"
 msgstr ""
 "OLSR envía una señal de HUP a este archivo PID cada vez que el archivo "
 "\"hosts\" o \"resolv\" es actualizado"
 
 #. Domain suffix
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:109
-msgid "olsrd_loadplugin_suffix"
+msgid "Domain suffix"
 msgstr "Sufijo de dominio"
 
 #. Timeout
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:110
-msgid "olsrd_loadplugin_timeout"
+msgid "Timeout"
 msgstr "Tiempo agotado"
 
 #. Name of the BMF interface
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:111
-msgid "olsrd_loadplugin_bmfinterface"
+msgid "Name of the BMF interface"
 msgstr "Nombre de la interfaz BMF"
 
 #. IP address of the BMF interface
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:112
-msgid "olsrd_loadplugin_bmfinterfaceid"
+msgid "IP address of the BMF interface"
 msgstr "Dirección IP de la interfaz BMF"
 
 #. Redirect local broadcasts
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:113
-msgid "olsrd_loadplugin_dolocalbroadcast"
+msgid "Redirect local broadcasts"
 msgstr "Redireccionar direcciones de transmisiones local"
 
 #. Also redirect broadcasts from OLSR interfaces
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:114
-msgid "olsrd_loadplugin_capturepacketsonolsrinterfaces"
+msgid "Also redirect broadcasts from OLSR interfaces"
 msgstr ""
 "También redireccionar direcciones de transmisión de las interfaces de OLSR"
 
 #. Propagation mechanism
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:115
-msgid "olsrd_loadplugin_bmfmechanism"
+msgid "Propagation mechanism"
 msgstr "Mecanismo de propagación"
 
 #. Number of retransmissions per package
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:116
-msgid "olsrd_loadplugin_broadcastretransmitcount"
+msgid "Number of retransmissions per package"
 msgstr "Número de retransmisión por paquete"
 
 #. Minimum number of neighbours for broadcast redirection
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:117
-msgid "olsrd_loadplugin_fanoutlimit"
+msgid "Minimum number of neighbours for broadcast redirection"
 msgstr "Número mínimo de vecinos para la redireccionar la transmisión"
 
 #. Non-OLSR interfaces
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:118
-msgid "olsrd_loadplugin_nonolsrif"
+msgid "Non-OLSR interfaces"
 msgstr "Interfaces NO OLSR"
 
 #. Used port
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:119
-msgid "olsrd_loadplugin_port"
+msgid "Used port"
 msgstr "Puerto usado"
 
 #. Allow connections from hosts
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:120
-msgid "olsrd_loadplugin_host"
+msgid "Allow connections from hosts"
 msgstr "Permitir conexiones desde los host"
 
 #. Allow connections from subnets
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:121
-msgid "olsrd_loadplugin_net"
+msgid "Allow connections from subnets"
 msgstr "Permitir conexiones desde las subredes"
 
 #. Format: IP-AddresseNetmask
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:122
-msgid "olsrd_loadplugin_net_desc"
+msgid "Format: IP-AddresseNetmask"
 msgstr "Formato: Dirección IP-Máscara de red"
 
 #. Used protocols
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:123
-msgid "olsrd_loadplugin_redistribute"
+msgid "Used protocols"
 msgstr "Protocolos utilizado"
 
 #. Only export routes to Quagga or to kernel too
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:124
-msgid "olsrd_loadplugin_exportroutes"
+msgid "Only export routes to Quagga or to kernel too"
 msgstr "Only export routes to Quagga or to kernel too"
 
 #. Always prefer local routes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:125
-msgid "olsrd_loadplugin_localpref"
+msgid "Always prefer local routes"
 msgstr "Siempre preferir rutas locales"
 
 #. Distance of exported routes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:126
-msgid "olsrd_loadplugin_distance"
+msgid "Distance of exported routes"
 msgstr "Distancia de las rutas exportadas"
 
 #. Key file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:127
-msgid "olsrd_loadplugin_keyfile"
+msgid "Key file"
 msgstr "Archivo de clave"
 
 #. Watchdog timestamp file
diff --git a/po/es/openvpn.po b/po/es/openvpn.po
index fc143a3b4..f2d6e08f5 100644
--- a/po/es/openvpn.po
+++ b/po/es/openvpn.po
@@ -14,947 +14,947 @@ msgstr ""
 
 #. OpenVPN
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:1
-msgid "openvpn"
+msgid "OpenVPN"
 msgstr ""
 
 #. Switch to basic configuration
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:3
-msgid "openvpn_switch_basic"
+msgid "« Switch to basic configuration"
 msgstr ""
 
 #. Switch to advanced configuration
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:4
-msgid "openvpn_switch_advanced"
+msgid "Switch to advanced configuration »"
 msgstr ""
 
 #. Enabled
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:6
-msgid "openvpn_enable"
+msgid "Enabled"
 msgstr ""
 
 #. Started
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:7
-msgid "openvpn_active"
+msgid "Started"
 msgstr ""
 
 #. no
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:8
-msgid "openvpn_active_no"
+msgid "no"
 msgstr ""
 
 #. yes (%i)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:9
-msgid "openvpn_active_yes"
+msgid "yes (%i)"
 msgstr ""
 
 #. Port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:10
-msgid "openvpn_port"
+msgid "Port"
 msgstr ""
 
 #. Protocol
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:11
-msgid "openvpn_proto"
+msgid "Protocol"
 msgstr ""
 
 #. Instance \"%s\"
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:13
-msgid "openvpn_instance"
+msgid "Instance \"%s\""
 msgstr ""
 
 #. OpenVPN instances
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:15
-msgid "openvpn_overview"
+msgid "OpenVPN instances"
 msgstr ""
 
 #. Below is a list of configured OpenVPN instances and their current state
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:16
-msgid "openvpn_overview_desc"
+msgid "Below is a list of configured OpenVPN instances and their current state"
 msgstr ""
 
 #. Daemon configuration
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:18
-msgid "openvpn_service"
+msgid "Daemon configuration"
 msgstr ""
 
 #. Networking options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:19
-msgid "openvpn_networking"
+msgid "Networking options"
 msgstr ""
 
 #. VPN options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:20
-msgid "openvpn_vpn"
+msgid "VPN options"
 msgstr ""
 
 #. Cryptography settings
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:21
-msgid "openvpn_cryptography"
+msgid "Cryptography settings"
 msgstr ""
 
 #. Read configuration options from file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:23
-msgid "openvpn_param_config"
+msgid "Read configuration options from file"
 msgstr ""
 
 #. Local host name or ip address
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:24
-msgid "openvpn_param_local"
+msgid "Local host name or ip address"
 msgstr ""
 
 #. Remote host name or ip address
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:25
-msgid "openvpn_param_remote"
+msgid "Remote host name or ip address"
 msgstr ""
 
 #. Randomly choose remote server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:26
-msgid "openvpn_param_remote_random"
+msgid "Randomly choose remote server"
 msgstr ""
 
 #. Major mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:27
-msgid "openvpn_param_mode"
+msgid "Major mode"
 msgstr ""
 
 #. Use protocol
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:28
-msgid "openvpn_param_proto"
+msgid "Use protocol"
 msgstr ""
 
 #. Connection retry interval
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:29
-msgid "openvpn_param_connect_retry"
+msgid "Connection retry interval"
 msgstr ""
 
 #. Connection timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:30
-msgid "openvpn_param_connect_timeout"
+msgid "Connection timeout"
 msgstr ""
 
 #. Maximum connection attempt retries
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:31
-msgid "openvpn_param_connect_retry_max"
+msgid "Maximum connection attempt retries"
 msgstr ""
 
 #. Try to sense proxy settings automatically
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:32
-msgid "openvpn_param_auto_proxy"
+msgid "Try to sense proxy settings automatically"
 msgstr ""
 
 #. Connect to remote host
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:33
-msgid "openvpn_param_http_proxy"
+msgid "Connect to remote host"
 msgstr ""
 
 #. Retry indefinitely on HTTP proxy errors
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:34
-msgid "openvpn_param_http_proxy_retry"
+msgid "Retry indefinitely on HTTP proxy errors"
 msgstr ""
 
 #. Proxy timeout in seconds
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:35
-msgid "openvpn_param_http_proxy_timeout"
+msgid "Proxy timeout in seconds"
 msgstr ""
 
 #. Set extended HTTP proxy options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:36
-msgid "openvpn_param_http_proxy_option"
+msgid "Set extended HTTP proxy options"
 msgstr ""
 
 #. Connect through Socks5 proxy
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:37
-msgid "openvpn_param_socks_proxy"
+msgid "Connect through Socks5 proxy"
 msgstr ""
 
 #. Retry indefinitely on Socks proxy errors
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:38
-msgid "openvpn_param_socks_proxy_retry"
+msgid "Retry indefinitely on Socks proxy errors"
 msgstr ""
 
 #. If hostname resolve fails, retry
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:39
-msgid "openvpn_param_resolv_retry"
+msgid "If hostname resolve fails, retry"
 msgstr ""
 
 #. Allow remote to change its IP or port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:40
-msgid "openvpn_param_float"
+msgid "Allow remote to change its IP or port"
 msgstr ""
 
 #. Execute shell command on remote ip change
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:41
-msgid "openvpn_param_ipchange"
+msgid "Execute shell command on remote ip change"
 msgstr ""
 
 #. TCP/UDP port # for both local and remote
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:42
-msgid "openvpn_param_port"
+msgid "TCP/UDP port # for both local and remote"
 msgstr ""
 
 #. TCP/UDP port # for local (default=1194)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:43
-msgid "openvpn_param_lport"
+msgid "TCP/UDP port # for local (default=1194)"
 msgstr ""
 
 #. TCP/UDP port # for remote (default=1194)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:44
-msgid "openvpn_param_rport"
+msgid "TCP/UDP port # for remote (default=1194)"
 msgstr ""
 
 #. Bind to local address and port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:45
-msgid "openvpn_param_bind"
+msgid "Bind to local address and port"
 msgstr ""
 
 #. Do not bind to local address and port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:46
-msgid "openvpn_param_nobind"
+msgid "Do not bind to local address and port"
 msgstr ""
 
 #. tun/tap device
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:47
-msgid "openvpn_param_dev"
+msgid "tun/tap device"
 msgstr ""
 
 #. Type of used device
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:48
-msgid "openvpn_param_dev_type"
+msgid "Type of used device"
 msgstr ""
 
 #. Use tun/tap device node
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:49
-msgid "openvpn_param_dev_node"
+msgid "Use tun/tap device node"
 msgstr ""
 
 #. Set the link layer address of the tap device
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:50
-msgid "openvpn_param_lladdr"
+msgid "Set the link layer address of the tap device"
 msgstr ""
 
 #. 'net30', 'p2p', or 'subnet'
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:51
-msgid "openvpn_param_topology"
+msgid "'net30', 'p2p', or 'subnet'"
 msgstr ""
 
 #. Make tun device IPv6 capable
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:52
-msgid "openvpn_param_tun_ipv6"
+msgid "Make tun device IPv6 capable"
 msgstr ""
 
 #. Configure device to use IP address
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:53
-msgid "openvpn_param_ifconfig"
+msgid "Configure device to use IP address"
 msgstr ""
 
 #. Don't actually execute ifconfig
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:54
-msgid "openvpn_param_ifconfig_noexec"
+msgid "Don't actually execute ifconfig"
 msgstr ""
 
 #. Don't warn on ifconfig inconsistencies
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:55
-msgid "openvpn_param_ifconfig_nowarn"
+msgid "Don't warn on ifconfig inconsistencies"
 msgstr ""
 
 #. Add route after establishing connection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:56
-msgid "openvpn_param_route"
+msgid "Add route after establishing connection"
 msgstr ""
 
 #. Specify a default gateway for routes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:57
-msgid "openvpn_param_route_gateway"
+msgid "Specify a default gateway for routes"
 msgstr ""
 
 #. Specify a default metric for routes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:58
-msgid "openvpn_param_route_metric"
+msgid "Specify a default metric for routes"
 msgstr ""
 
 #. Delay n seconds after connection 
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:59
-msgid "openvpn_param_route_delay"
+msgid "Delay n seconds after connection "
 msgstr ""
 
 #. Execute shell cmd after routes are added
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:60
-msgid "openvpn_param_route_up"
+msgid "Execute shell cmd after routes are added"
 msgstr ""
 
 #. Don't add routes automatically
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:61
-msgid "openvpn_param_route_noexec"
+msgid "Don't add routes automatically"
 msgstr ""
 
 #. Don't pull options from server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:62
-msgid "openvpn_param_route_nopull"
+msgid "Don't pull options from server"
 msgstr ""
 
 #. Automatically redirect default route
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:63
-msgid "openvpn_param_redirect_gateway"
+msgid "Automatically redirect default route"
 msgstr ""
 
 #. Pass environment variables to script
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:64
-msgid "openvpn_param_setenv"
+msgid "Pass environment variables to script"
 msgstr ""
 
 #. Shaping for peer bandwidth
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:65
-msgid "openvpn_param_shaper"
+msgid "Shaping for peer bandwidth"
 msgstr ""
 
 #. Set timeouts in server mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:66
-msgid "openvpn_param_keepalive"
+msgid "Set timeouts in server mode"
 msgstr ""
 
 #. tun/tap inactivity timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:67
-msgid "openvpn_param_inactive"
+msgid "tun/tap inactivity timeout"
 msgstr ""
 
 #. Remote ping timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:68
-msgid "openvpn_param_ping_exit"
+msgid "Remote ping timeout"
 msgstr ""
 
 #. Restart after remote ping timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:69
-msgid "openvpn_param_ping_restart"
+msgid "Restart after remote ping timeout"
 msgstr ""
 
 #. Only process ping timeouts if routes exist
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:70
-msgid "openvpn_param_ping_timer_rem"
+msgid "Only process ping timeouts if routes exist"
 msgstr ""
 
 #. Ping remote every n seconds over TCP/UDP port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:71
-msgid "openvpn_param_ping"
+msgid "Ping remote every n seconds over TCP/UDP port"
 msgstr ""
 
 #. Configure a multi-homed UDP server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:72
-msgid "openvpn_param_multihome"
+msgid "Configure a multi-homed UDP server"
 msgstr ""
 
 #. Optimize TUN/TAP/UDP writes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:73
-msgid "openvpn_param_fast_io"
+msgid "Optimize TUN/TAP/UDP writes"
 msgstr ""
 
 #. Remap SIGUSR1 signals
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:74
-msgid "openvpn_param_remap_usr1"
+msgid "Remap SIGUSR1 signals"
 msgstr ""
 
 #. Keep tun/tap device open on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:75
-msgid "openvpn_param_persist_tun"
+msgid "Keep tun/tap device open on restart"
 msgstr ""
 
 #. Keep remote IP address on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:76
-msgid "openvpn_param_persist_remote_ip"
+msgid "Keep remote IP address on restart"
 msgstr ""
 
 #. Keep local IP address on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:77
-msgid "openvpn_param_persist_local_ip"
+msgid "Keep local IP address on restart"
 msgstr ""
 
 #. Don't re-read key on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:78
-msgid "openvpn_param_persist_key"
+msgid "Don't re-read key on restart"
 msgstr ""
 
 #. TOS passthrough (applies to IPv4 only)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:79
-msgid "openvpn_param_passtos"
+msgid "TOS passthrough (applies to IPv4 only)"
 msgstr ""
 
 #. Set tun/tap device MTU
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:80
-msgid "openvpn_param_tun_mtu"
+msgid "Set tun/tap device MTU"
 msgstr ""
 
 #. Set tun/tap device overhead
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:81
-msgid "openvpn_param_tun_mtu_extra"
+msgid "Set tun/tap device overhead"
 msgstr ""
 
 #. Set TCP/UDP MTU
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:82
-msgid "openvpn_param_link_mtu"
+msgid "Set TCP/UDP MTU"
 msgstr ""
 
 #. Enable Path MTU discovery
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:83
-msgid "openvpn_param_mtu_disc"
+msgid "Enable Path MTU discovery"
 msgstr ""
 
 #. Empirically measure MTU
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:84
-msgid "openvpn_param_mtu_test"
+msgid "Empirically measure MTU"
 msgstr ""
 
 #. Enable internal datagram fragmentation
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:85
-msgid "openvpn_param_fragment"
+msgid "Enable internal datagram fragmentation"
 msgstr ""
 
 #. Set upper bound on TCP MSS
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:86
-msgid "openvpn_param_mssfix"
+msgid "Set upper bound on TCP MSS"
 msgstr ""
 
 #. Set the TCP/UDP send buffer size
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:87
-msgid "openvpn_param_sndbuf"
+msgid "Set the TCP/UDP send buffer size"
 msgstr ""
 
 #. Set the TCP/UDP receive buffer size
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:88
-msgid "openvpn_param_rcvbuf"
+msgid "Set the TCP/UDP receive buffer size"
 msgstr ""
 
 #. Set tun/tap TX queue length
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:89
-msgid "openvpn_param_txqueuelen"
+msgid "Set tun/tap TX queue length"
 msgstr ""
 
 #. Disable Paging
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:90
-msgid "openvpn_param_mlock"
+msgid "Disable Paging"
 msgstr ""
 
 #. Shell cmd to execute after tun device open
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:91
-msgid "openvpn_param_up"
+msgid "Shell cmd to execute after tun device open"
 msgstr ""
 
 #. Delay tun/tap open and up script execution
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:92
-msgid "openvpn_param_up_delay"
+msgid "Delay tun/tap open and up script execution"
 msgstr ""
 
 #. Shell cmd to run after tun device close
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:93
-msgid "openvpn_param_down"
+msgid "Shell cmd to run after tun device close"
 msgstr ""
 
 #. Call down cmd/script before TUN/TAP close
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:94
-msgid "openvpn_param_down_pre"
+msgid "Call down cmd/script before TUN/TAP close"
 msgstr ""
 
 #. Run up/down scripts for all restarts
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:95
-msgid "openvpn_param_up_restart"
+msgid "Run up/down scripts for all restarts"
 msgstr ""
 
 #. Set UID to user
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:96
-msgid "openvpn_param_user"
+msgid "Set UID to user"
 msgstr ""
 
 #. Set GID to group
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:97
-msgid "openvpn_param_group"
+msgid "Set GID to group"
 msgstr ""
 
 #. Chroot to directory after initialization
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:98
-msgid "openvpn_param_chroot"
+msgid "Chroot to directory after initialization"
 msgstr ""
 
 #. Change to directory before initialization
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:99
-msgid "openvpn_param_cd"
+msgid "Change to directory before initialization"
 msgstr ""
 
 #. Daemonize after initialization
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:100
-msgid "openvpn_param_daemon"
+msgid "Daemonize after initialization"
 msgstr ""
 
 #. Output to syslog and do not daemonize
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:101
-msgid "openvpn_param_syslog"
+msgid "Output to syslog and do not daemonize"
 msgstr ""
 
 #. Run as an inetd or xinetd server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:102
-msgid "openvpn_param_inetd"
+msgid "Run as an inetd or xinetd server"
 msgstr ""
 
 #. Write log to file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:103
-msgid "openvpn_param_log"
+msgid "Write log to file"
 msgstr ""
 
 #. Append log to file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:104
-msgid "openvpn_param_log_append"
+msgid "Append log to file"
 msgstr ""
 
 #. Don't log timestamps
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:105
-msgid "openvpn_param_suppress_timestamps"
+msgid "Don't log timestamps"
 msgstr ""
 
 #. Write process ID to file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:106
-msgid "openvpn_param_writepid"
+msgid "Write process ID to file"
 msgstr ""
 
 #. Change process priority
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:107
-msgid "openvpn_param_nice"
+msgid "Change process priority"
 msgstr ""
 
 #. Echo parameters to log
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:108
-msgid "openvpn_param_echo"
+msgid "Echo parameters to log"
 msgstr ""
 
 #. Set output verbosity
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:109
-msgid "openvpn_param_verb"
+msgid "Set output verbosity"
 msgstr ""
 
 #. Limit repeated log messages
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:110
-msgid "openvpn_param_mute"
+msgid "Limit repeated log messages"
 msgstr ""
 
 #. Write status to file every n seconds
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:111
-msgid "openvpn_param_status"
+msgid "Write status to file every n seconds"
 msgstr ""
 
 #. Status file format version
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:112
-msgid "openvpn_param_status_version"
+msgid "Status file format version"
 msgstr ""
 
 #. Disable options consistency check
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:113
-msgid "openvpn_param_disable_occ"
+msgid "Disable options consistency check"
 msgstr ""
 
 #. Special stress testing mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:114
-msgid "openvpn_param_gremlin"
+msgid "Special stress testing mode"
 msgstr ""
 
 #. Use fast LZO compression
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:115
-msgid "openvpn_param_comp_lzo"
+msgid "Use fast LZO compression"
 msgstr ""
 
 #. Don't use adaptive lzo compression
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:116
-msgid "openvpn_param_comp_noadapt"
+msgid "Don't use adaptive lzo compression"
 msgstr ""
 
 #. Enable management interface on <em>IP</em> <em>port</em>
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:117
-msgid "openvpn_param_management"
+msgid "Enable management interface on <em>IP</em> <em>port</em>"
 msgstr ""
 
 #. Management interface will connect as a TCP client
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:118
-msgid "openvpn_param_management_client"
+msgid "Management interface will connect as a TCP client"
 msgstr ""
 
 #. Query management channel for private key
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:119
-msgid "openvpn_param_management_query_passwords"
+msgid "Query management channel for private key"
 msgstr ""
 
 #. Start OpenVPN in a hibernating state
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:120
-msgid "openvpn_param_management_hold"
+msgid "Start OpenVPN in a hibernating state"
 msgstr ""
 
 #. Issue SIGUSR1 on management disconnect
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:121
-msgid "openvpn_param_management_signal"
+msgid "Issue SIGUSR1 on management disconnect"
 msgstr ""
 
 #. Forget passwords on management disconnect
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:122
-msgid "openvpn_param_management_forget_disconnect"
+msgid "Forget passwords on management disconnect"
 msgstr ""
 
 #. Number of lines for log file history
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:123
-msgid "openvpn_param_management_log_cache"
+msgid "Number of lines for log file history"
 msgstr ""
 
 #. Load plug-in module
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:124
-msgid "openvpn_param_plugin"
+msgid "Load plug-in module"
 msgstr ""
 
 #. Configure server mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:125
-msgid "openvpn_param_server"
+msgid "Configure server mode"
 msgstr ""
 
 #. Configure server bridge
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:126
-msgid "openvpn_param_server_bridge"
+msgid "Configure server bridge"
 msgstr ""
 
 #. Push options to peer
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:127
-msgid "openvpn_param_push"
+msgid "Push options to peer"
 msgstr ""
 
 #. Don't inherit global push options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:128
-msgid "openvpn_param_push_reset"
+msgid "Don't inherit global push options"
 msgstr ""
 
 #. Set aside a pool of subnets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:129
-msgid "openvpn_param_ifconfig_pool"
+msgid "Set aside a pool of subnets"
 msgstr ""
 
 #. Use individual addresses rather than /30 subnets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:130
-msgid "openvpn_param_ifconfig_pool_linear"
+msgid "Use individual addresses rather than /30 subnets"
 msgstr ""
 
 #. Persist/unpersist ifconfig-pool
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:131
-msgid "openvpn_param_ifconfig_pool_persist"
+msgid "Persist/unpersist ifconfig-pool"
 msgstr ""
 
 #. Push an ifconfig option to remote
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:132
-msgid "openvpn_param_ifconfig_push"
+msgid "Push an ifconfig option to remote"
 msgstr ""
 
 #. Route subnet to client
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:133
-msgid "openvpn_param_iroute"
+msgid "Route subnet to client"
 msgstr ""
 
 #. Client is disabled
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:134
-msgid "openvpn_param_disable"
+msgid "Client is disabled"
 msgstr ""
 
 #. Don't require client certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:135
-msgid "openvpn_param_client_cert_not_required"
+msgid "Don't require client certificate"
 msgstr ""
 
 #. Use username as common name
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:136
-msgid "openvpn_param_username_as_common_name"
+msgid "Use username as common name"
 msgstr ""
 
 #. Script to verify interactive authentication
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:137
-msgid "openvpn_param_auth_user_pass_verify"
+msgid "Script to verify interactive authentication"
 msgstr ""
 
 #. Allow client-to-client traffic
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:138
-msgid "openvpn_param_client_to_client"
+msgid "Allow client-to-client traffic"
 msgstr ""
 
 #. Allow multiple clients with same certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:139
-msgid "openvpn_param_duplicate_cn"
+msgid "Allow multiple clients with same certificate"
 msgstr ""
 
 #. Run script cmd on client connection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:140
-msgid "openvpn_param_client_connect"
+msgid "Run script cmd on client connection"
 msgstr ""
 
 #. Run script cmd on client disconnection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:141
-msgid "openvpn_param_client_disconnect"
+msgid "Run script cmd on client disconnection"
 msgstr ""
 
 #. Directory for custom client config files
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:142
-msgid "openvpn_param_client_config_dir"
+msgid "Directory for custom client config files"
 msgstr ""
 
 #. Refuse connection if no custom client config
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:143
-msgid "openvpn_param_ccd_exclusive"
+msgid "Refuse connection if no custom client config"
 msgstr ""
 
 #. Temporary directory for client-connect return file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:144
-msgid "openvpn_param_tmp_dir"
+msgid "Temporary directory for client-connect return file"
 msgstr ""
 
 #. Set size of real and virtual address hash tables
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:145
-msgid "openvpn_param_hash_size"
+msgid "Set size of real and virtual address hash tables"
 msgstr ""
 
 #. Number of allocated broadcast buffers
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:146
-msgid "openvpn_param_bcast_buffers"
+msgid "Number of allocated broadcast buffers"
 msgstr ""
 
 #. Maximum number of queued TCP output packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:147
-msgid "openvpn_param_tcp_queue_limit"
+msgid "Maximum number of queued TCP output packets"
 msgstr ""
 
 #. Script to validate client virtual addresses
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:148
-msgid "openvpn_param_learn_address"
+msgid "Script to validate client virtual addresses"
 msgstr ""
 
 #. Allowed maximum of new connections
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:149
-msgid "openvpn_param_connect_freq"
+msgid "Allowed maximum of new connections"
 msgstr ""
 
 #. Allowed maximum of connected clients
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:150
-msgid "openvpn_param_max_clients"
+msgid "Allowed maximum of connected clients"
 msgstr ""
 
 #. Allowed maximum of internal
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:151
-msgid "openvpn_param_max_routes_per_client"
+msgid "Allowed maximum of internal"
 msgstr ""
 
 #. Proxy incoming HTTPS sessions
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:152
-msgid "openvpn_param_port_share"
+msgid "Proxy incoming HTTPS sessions"
 msgstr ""
 
 #. Configure client mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:153
-msgid "openvpn_param_client"
+msgid "Configure client mode"
 msgstr ""
 
 #. Authenticate using username/password
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:154
-msgid "openvpn_param_auth_user_pass"
+msgid "Authenticate using username/password"
 msgstr ""
 
 #. Accept options pushed from server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:155
-msgid "openvpn_param_pull"
+msgid "Accept options pushed from server"
 msgstr ""
 
 #. Handling of authentication failures
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:156
-msgid "openvpn_param_auth_retry"
+msgid "Handling of authentication failures"
 msgstr ""
 
 #. Send notification to peer on disconnect
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:157
-msgid "openvpn_param_explicit_exit_notify"
+msgid "Send notification to peer on disconnect"
 msgstr ""
 
 #. Enable Static Key encryption mode (non-TLS)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:158
-msgid "openvpn_param_secret"
+msgid "Enable Static Key encryption mode (non-TLS)"
 msgstr ""
 
 #. HMAC authentication for packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:159
-msgid "openvpn_param_auth"
+msgid "HMAC authentication for packets"
 msgstr ""
 
 #. Encryption cipher for packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:160
-msgid "openvpn_param_cipher"
+msgid "Encryption cipher for packets"
 msgstr ""
 
 #. Size of cipher key
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:161
-msgid "openvpn_param_keysize"
+msgid "Size of cipher key"
 msgstr ""
 
 #. Enable OpenSSL hardware crypto engines
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:162
-msgid "openvpn_param_engine"
+msgid "Enable OpenSSL hardware crypto engines"
 msgstr ""
 
 #. Disable replay protection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:163
-msgid "openvpn_param_no_replay"
+msgid "Disable replay protection"
 msgstr ""
 
 #. Silence the output of replay warnings
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:164
-msgid "openvpn_param_mute_replay_warnings"
+msgid "Silence the output of replay warnings"
 msgstr ""
 
 #. Replay protection sliding window size
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:165
-msgid "openvpn_param_replay_window"
+msgid "Replay protection sliding window size"
 msgstr ""
 
 #. Disable cipher initialisation vector
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:166
-msgid "openvpn_param_no_iv"
+msgid "Disable cipher initialisation vector"
 msgstr ""
 
 #. Persist replay-protection state
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:167
-msgid "openvpn_param_replay_persist"
+msgid "Persist replay-protection state"
 msgstr ""
 
 #. Run a self-test of crypto features
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:168
-msgid "openvpn_param_test_crypto"
+msgid "Run a self-test of crypto features"
 msgstr ""
 
 #. Enable TLS and assume server role
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:169
-msgid "openvpn_param_tls_server"
+msgid "Enable TLS and assume server role"
 msgstr ""
 
 #. Enable TLS and assume client role
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:170
-msgid "openvpn_param_tls_client"
+msgid "Enable TLS and assume client role"
 msgstr ""
 
 #. Data channel key exchange method
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:171
-msgid "openvpn_param_key_method"
+msgid "Data channel key exchange method"
 msgstr ""
 
 #. Certificate authority
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:172
-msgid "openvpn_param_ca"
+msgid "Certificate authority"
 msgstr ""
 
 #. Directory of trusted certificates (CAs and CRLs)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:173
-msgid "openvpn_param_capath"
+msgid "Directory of trusted certificates (CAs and CRLs)"
 msgstr ""
 
 #. Diffie Hellman parameters
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:174
-msgid "openvpn_param_dh"
+msgid "Diffie Hellman parameters"
 msgstr ""
 
 #. Local certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:175
-msgid "openvpn_param_cert"
+msgid "Local certificate"
 msgstr ""
 
 #. Local private key
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:176
-msgid "openvpn_param_key"
+msgid "Local private key"
 msgstr ""
 
 #. PKCS#12 file containing keys
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:177
-msgid "openvpn_param_pkcs12"
+msgid "PKCS#12 file containing keys"
 msgstr ""
 
 #. TLS cipher
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:178
-msgid "openvpn_param_tls_cipher"
+msgid "TLS cipher"
 msgstr ""
 
 #. Retransmit timeout on TLS control channel
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:179
-msgid "openvpn_param_tls_timeout"
+msgid "Retransmit timeout on TLS control channel"
 msgstr ""
 
 #. Renegotiate data chan. key after bytes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:180
-msgid "openvpn_param_reneg_bytes"
+msgid "Renegotiate data chan. key after bytes"
 msgstr ""
 
 #. Renegotiate data chan. key after packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:181
-msgid "openvpn_param_reneg_pkts"
+msgid "Renegotiate data chan. key after packets"
 msgstr ""
 
 #. Renegotiate data chan. key after seconds
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:182
-msgid "openvpn_param_reneg_sec"
+msgid "Renegotiate data chan. key after seconds"
 msgstr ""
 
 #. Timeframe for key exchange
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:183
-msgid "openvpn_param_hand_window"
+msgid "Timeframe for key exchange"
 msgstr ""
 
 #. Key transition window
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:184
-msgid "openvpn_param_tran_window"
+msgid "Key transition window"
 msgstr ""
 
 #. Allow only one session
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:185
-msgid "openvpn_param_single_session"
+msgid "Allow only one session"
 msgstr ""
 
 #. Exit on TLS negotiation failure
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:186
-msgid "openvpn_param_tls_exit"
+msgid "Exit on TLS negotiation failure"
 msgstr ""
 
 #. Additional authentication over TLS
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:187
-msgid "openvpn_param_tls_auth"
+msgid "Additional authentication over TLS"
 msgstr ""
 
 #. Get PEM password from controlling tty before we daemonize
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:188
-msgid "openvpn_param_askpass"
+msgid "Get PEM password from controlling tty before we daemonize"
 msgstr ""
 
 #. Don't cache --askpass or --auth-user-pass passwords
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:189
-msgid "openvpn_param_auth_nocache"
+msgid "Don't cache --askpass or --auth-user-pass passwords"
 msgstr ""
 
 #. Check peer certificate against a CRL
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:190
-msgid "openvpn_param_crl_verify"
+msgid "Check peer certificate against a CRL"
 msgstr ""
 
 #. Shell command to verify X509 name
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:191
-msgid "openvpn_param_tls_verify"
+msgid "Shell command to verify X509 name"
 msgstr ""
 
 #. Only accept connections from given X509 name
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:192
-msgid "openvpn_param_tls_remote"
+msgid "Only accept connections from given X509 name"
 msgstr ""
 
 #. Require explicit designation on certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:193
-msgid "openvpn_param_ns_cert_type"
+msgid "Require explicit designation on certificate"
 msgstr ""
 
 #. Require explicit key usage on certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:194
-msgid "openvpn_param_remote_cert_ku"
+msgid "Require explicit key usage on certificate"
 msgstr ""
 
 #. Require extended explicit key usage on certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:195
-msgid "openvpn_param_remote_cert_eku"
+msgid "Require extended explicit key usage on certificate"
 msgstr ""
 
 #. Require normal and extended key usage on certificate
diff --git a/po/es/p910nd.po b/po/es/p910nd.po
index f5457fcbb..beebaa3fb 100644
--- a/po/es/p910nd.po
+++ b/po/es/p910nd.po
@@ -13,19 +13,19 @@ msgstr ""
 
 #. p910nd - Printer server
 #: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:1
-msgid "p910nd"
+msgid "p910nd - Printer server"
 msgstr "Servidor de Impresión - p910nd"
 
 #. First you have to install the packages to get support for USB (kmod-usb-printer) or parallel port (kmod-lp).
 #: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:2
-msgid "p910nd_desc"
+msgid "First you have to install the packages to get support for USB (kmod-usb-printer) or parallel port (kmod-lp)."
 msgstr ""
 "Debe instalar primero los paquetes que den soporte al puerto USB (kmod-usb-"
 "printer) o al puerto paralelo (kmod-lp)."
 
 #. Bidirectional mode
 #: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:3
-msgid "bidirectional"
+msgid "Bidirectional mode"
 msgstr "Modo Bidireccional"
 
 #. p910nd listens on port 910+N. E.g. 9100 for the first printer.
diff --git a/po/es/polipo.po b/po/es/polipo.po
index 1bfb93f68..61f15a7ef 100644
--- a/po/es/polipo.po
+++ b/po/es/polipo.po
@@ -13,27 +13,27 @@ msgstr ""
 
 #. Polipo
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:1
-msgid "polipo"
+msgid "Polipo"
 msgstr "Polipo"
 
 #. On-Disk Cache
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:2
-msgid "polipo_cache"
+msgid "On-Disk Cache"
 msgstr "Cache en disco"
 
 #. Shared cache
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:3
-msgid "polipo_cache_cacheisshared"
+msgid "Shared cache"
 msgstr "Cache compartida"
 
 #. Enable if cache (proxy) is shared by multiple users.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:4
-msgid "polipo_cache_cacheisshared_desc"
+msgid "Enable if cache (proxy) is shared by multiple users."
 msgstr "Activar si la cache (proxy) is compartida por multiples usuarios."
 
 #. To enable polipo on-disk cache cleaning (highly recommended), you should add a cron job in Scheduled Tasks services that will execute /usr/sbin/polipo_purge script. For example to perform disk cache cleanup every day at 6:00 in the morning you should add the following line in Scheduled Tasks &quot;0 6 * * *	/usr/sbin/polipo_purge&quot; (without quotes).
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:5
-msgid "polipo_cache_desc"
+msgid "To enable polipo on-disk cache cleaning (highly recommended), you should add a cron job in Scheduled Tasks services that will execute /usr/sbin/polipo_purge script. For example to perform disk cache cleanup every day at 6:00 in the morning you should add the following line in Scheduled Tasks \"0 6 * * *\\t/usr/sbin/polipo_purge\" (without quotes)."
 msgstr ""
 "Para activar la limpieza de la cache en disco polipo (recomendada), se "
 "recomienda agregar un trabajo al cron in los Servicios de Tareas Programadas "
@@ -45,12 +45,12 @@ msgstr ""
 
 #. Disk cache location
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:6
-msgid "polipo_cache_diskcacheroot"
+msgid "Disk cache location"
 msgstr "Ubicación de la caché de disco"
 
 #. Location where polipo will cache files permanently. Use of external storage devices is recommended, because the cache can grow considerably. Leave it empty to disable on-disk cache.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:7
-msgid "polipo_cache_diskcacheroot_desc"
+msgid "Location where polipo will cache files permanently. Use of external storage devices is recommended, because the cache can grow considerably. Leave it empty to disable on-disk cache."
 msgstr ""
 "Ubicación donde polipo creará archivos permanentemente. Se recomienda el uso "
 "de dispositivos de almacenamiento externo, ya que la cache puede aumentar "
@@ -58,58 +58,58 @@ msgstr ""
 
 #. Truncate cache files size (in bytes)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:8
-msgid "polipo_cache_diskcachetruncatesize"
+msgid "Truncate cache files size (in bytes)"
 msgstr "Truncar el tamaño del archivo de la cache (en bytes)"
 
 #. Size to which cached files should be truncated. (default value: 1048576)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:9
-msgid "polipo_cache_diskcachetruncatesize_desc"
+msgid "Size to which cached files should be truncated. (default value: 1048576)"
 msgstr ""
 "Tamaño del archivo sobre el cual la cache deberá ser truncada. (valor por "
 "defecto: 1048576)"
 
 #. Truncate cache files time
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:10
-msgid "polipo_cache_diskcachetruncatetime"
+msgid "Truncate cache files time"
 msgstr "Truncar tiempo del archivo de cache "
 
 #. Time after which cached files will be truncated. (default value: 4d12h)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:11
-msgid "polipo_cache_diskcachetruncatetime_desc"
+msgid "Time after which cached files will be truncated. (default value: 4d12h)"
 msgstr ""
 "Tiempo transcurrido necesario antes de truncar los archivos cacheado. (valor "
 "por defecto: 4d12h)"
 
 #. Delete cache files time
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:12
-msgid "polipo_cache_diskcacheunlinktime"
+msgid "Delete cache files time"
 msgstr "Timpo para eliminar archivos de cache"
 
 #. Time after which cached files will be deleted. (default value: 32d)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:13
-msgid "polipo_cache_diskcacheunlinktime_desc"
+msgid "Time after which cached files will be deleted. (default value: 32d)"
 msgstr ""
 "Tiempo transcurrido necesario antes de eliminar los archivos en la cache. "
 "(valor por defecto: 32d)"
 
 #. Polipo is a small and fast caching web proxy.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:14
-msgid "polipo_desc"
+msgid "Polipo is a small and fast caching web proxy."
 msgstr "Polipo es un rápido y pequeño servidor proxy de web."
 
 #. General
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:15
-msgid "polipo_general"
+msgid "General"
 msgstr "General"
 
 #. Allowed clients
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:16
-msgid "polipo_general_allowedclients"
+msgid "Allowed clients"
 msgstr "Clientes permitos"
 
 #. When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients that are allowed to connect. The format is IP address or network address (192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6)).
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:17
-msgid "polipo_general_allowedclients_desc"
+msgid "When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients that are allowed to connect. The format is IP address or network address (192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))."
 msgstr ""
 "Cuando la dirección a escuchar es establecida en 0.0.0.0 or :: (en caso de "
 "utilizar IPv6), deberá listar los clientes que se encuentran permitos a "
@@ -119,22 +119,22 @@ msgstr ""
 
 #. In RAM cache size (in bytes)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:18
-msgid "polipo_general_chunkhighmark"
+msgid "In RAM cache size (in bytes)"
 msgstr "Tamaño (en bytes) de la cache en RAM"
 
 #. How much RAM should Polipo use for its cache.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:19
-msgid "polipo_general_chunkhighmark_desc"
+msgid "How much RAM should Polipo use for its cache."
 msgstr "Cuánta RAM Polipo utilizará para este tipo de cache?."
 
 #. DNS server address
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:20
-msgid "polipo_general_dnsnameserver"
+msgid "DNS server address"
 msgstr "Dirección del servidor DNS"
 
 #. Set the DNS server address to use, if you want Polipo to use different DNS server than the host system.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:21
-msgid "polipo_general_dnsnameserver_desc"
+msgid "Set the DNS server address to use, if you want Polipo to use different DNS server than the host system."
 msgstr ""
 "Indique la dirección del servidor DNS a utilizar, si prefiere que Polipo "
 "utilice una dirección para el servidor DNS distinta al utilizado en el "
@@ -142,24 +142,24 @@ msgstr ""
 
 #. Query DNS for IPv6
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:22
-msgid "polipo_general_dnsqueryipv6"
+msgid "Query DNS for IPv6"
 msgstr "Consulta DNS para IPv6"
 
 #. false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = Query both, prefer IPv6; true = Query only IPv6
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:23
-msgid "polipo_general_dnsqueryipv6_desc"
+msgid "false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = Query both, prefer IPv6; true = Query only IPv6"
 msgstr ""
 "false = No consulta IPv6, reluctantly = Consulta ambos, preferencia IPv4; "
 "happily = Consulta ambos, preferencia IPv6; true = Consulta sólamente IPv6"
 
 #. Query DNS by hostname
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:24
-msgid "polipo_general_dnsusegethostbyname"
+msgid "Query DNS by hostname"
 msgstr "Consultar DNS por nombre de host"
 
 #. false = Never use system DNS resolver; reluctantly = Query DNS directly, if DNS server is unavailable fail to system DNS resolver; happily = Query DNS directly, if host could not be found fallback to system DNS resolver; true = Always use system DNS resolver
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:25
-msgid "polipo_general_dnsusegethostbyname_desc"
+msgid "false = Never use system DNS resolver; reluctantly = Query DNS directly, if DNS server is unavailable fail to system DNS resolver; happily = Query DNS directly, if host could not be found fallback to system DNS resolver; true = Always use system DNS resolver"
 msgstr ""
 "false = Nunca use el sistema de resolución de DNS, reluctantly = Consultar "
 "DNS directamente, si el servidor DNS no está disponible al utilizar el "
@@ -169,17 +169,17 @@ msgstr ""
 
 #. Syslog facility
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:26
-msgid "polipo_general_logfacility"
+msgid "Syslog facility"
 msgstr "Falicidad Syslog"
 
 #. Log file location
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:27
-msgid "polipo_general_logfile"
+msgid "Log file location"
 msgstr "Ubicación del archivo de Log"
 
 #. Use of external storage device is recommended, because the log file is written frequently and can grow considerably.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:28
-msgid "polipo_general_logfile_desc"
+msgid "Use of external storage device is recommended, because the log file is written frequently and can grow considerably."
 msgstr ""
 "El uso de un dispositivo externo de almacenamiento es recomendado, debido a "
 "que el archivo log es escrito con mucha frecuencia y el mismo puede "
@@ -187,63 +187,63 @@ msgstr ""
 
 #. Log to syslog
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:29
-msgid "polipo_general_logsyslog"
+msgid "Log to syslog"
 msgstr "Loguear al sistema Syslog"
 
 #. Parent proxy authentication
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:30
-msgid "polipo_general_parentauthcredentials"
+msgid "Parent proxy authentication"
 msgstr "Padre(s) de proxy de autenticación "
 
 #. Basic HTTP authentication supported. Provide username and password in username:password format.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:31
-msgid "polipo_general_parentauthcredentials_desc"
+msgid "Basic HTTP authentication supported. Provide username and password in username:password format."
 msgstr ""
 "Autenticación soportada: Basic HTTP. Provee del nombre de usuario y "
 "contraseña in el formato username:password."
 
 #. Parent proxy address
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:32
-msgid "polipo_general_parentproxy"
+msgid "Parent proxy address"
 msgstr "Dirección padre de proxy"
 
 #. Parent proxy address (in host:port format), to which Polipo will forward the requests.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:33
-msgid "polipo_general_parentproxy_desc"
+msgid "Parent proxy address (in host:port format), to which Polipo will forward the requests."
 msgstr ""
 "Dirección padre del proxy (en formato host:port), al cual Polipo hará "
 "forward de las peticiones."
 
 #. Listen address
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:34
-msgid "polipo_general_proxyaddress"
+msgid "Listen address"
 msgstr "Dirección de escucha"
 
 #. The interface on which Polipo will listen. To listen on all interfaces use 0.0.0.0 or :: (IPv6).
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:35
-msgid "polipo_general_proxyaddress_desc"
+msgid "The interface on which Polipo will listen. To listen on all interfaces use 0.0.0.0 or :: (IPv6)."
 msgstr ""
 "La interface en la cual Polipo escuchará. Para escuchar en todas las "
 "interfaces utilice 0.0.0.0 o :: (IPv6)."
 
 #. Listen port
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:36
-msgid "polipo_general_proxyport"
+msgid "Listen port"
 msgstr "Puerto de escucha:"
 
 #. Port on which Polipo will listen. (default value: 8123)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:37
-msgid "polipo_general_proxyport_desc"
+msgid "Port on which Polipo will listen. (default value: 8123)"
 msgstr "Puerto de escucha que Polipo utilizará. (valor por defecto: 8123)"
 
 #. Poor Man&#39;s Multiplexing
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:38
-msgid "polipo_pmm"
+msgid "Poor Man's Multiplexing"
 msgstr "Poor Man&amp;#39;s Multiplexing"
 
 #. Poor Man&#39;s Multiplexing (PMM) is a technique that simulates multiplexing by requesting an instance in multiple segments. It tries to lower the latency caused by the weakness of HTTP protocol. NOTE: some sites may not work with PMM enabled.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:39
-msgid "polipo_pmm_desc"
+msgid "Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by requesting an instance in multiple segments. It tries to lower the latency caused by the weakness of HTTP protocol. NOTE: some sites may not work with PMM enabled."
 msgstr ""
 "Poor Man&amp;#39;s Multiplexing (PMM) es una técnica de multiplexación que "
 "simula una instancia solicitando en varios segmentos. Se intenta reducir la "
@@ -252,19 +252,19 @@ msgstr ""
 
 #. First PMM segment size (in bytes)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:40
-msgid "polipo_pmm_pmmfirstsize"
+msgid "First PMM segment size (in bytes)"
 msgstr "Tamaño del primer segmento PMM  (en bytes)"
 
 #. Size of the first PMM segment. If not defined, it defaults to twice the PMM segment size.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:41
-msgid "polipo_pmm_pmmfirstsize_desc"
+msgid "Size of the first PMM segment. If not defined, it defaults to twice the PMM segment size."
 msgstr ""
 "Tamaño del primer segmento PMM. Si no se encuentra definido, su valor por "
 "defecto es el doble del tamaño del segmento PMM."
 
 #. PMM segments size (in bytes)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:42
-msgid "polipo_pmm_pmmsize"
+msgid "PMM segments size (in bytes)"
 msgstr "Tamaño de segmentos PMM (en bytes)"
 
 #. To enable PMM, PMM segment size must be set to some positive value.
diff --git a/po/es/qos.po b/po/es/qos.po
index d5cc041fb..0dfe9c6a2 100644
--- a/po/es/qos.po
+++ b/po/es/qos.po
@@ -13,93 +13,93 @@ msgstr ""
 
 #. Quality of Service
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:1
-msgid "qos"
+msgid "Quality of Service"
 msgstr "Calidad de Servicio (QoS)"
 
 #. With QoS you can priorize network traffic selected by adresses, ports or services.
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:2
-msgid "qos_desc"
+msgid "With QoS you can priorize network traffic selected by adresses, ports or services."
 msgstr ""
 "Con QoS puede priorizar el tráfico de red seleccionado por direcciones, "
 "puertos o servicios."
 
 #. Classification
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:3
-msgid "qos_interface_classgroup"
+msgid "Classification"
 msgstr "Clasificación"
 
 #. Calculate Overhead
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:4
-msgid "qos_interface_overhead"
+msgid "Calculate Overhead"
 msgstr "Calcular Generales"
 
 #. Half-Duplex
-msgid "qos_interface_halfduplex"
+msgid "Half-Duplex"
 msgstr "Half-Duplex"
 
 #. Downlink
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:5
-msgid "qos_interface_download"
+msgid "Downlink"
 msgstr "Enlace de bajada (downlink)"
 
 #. Uplink
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:6
-msgid "qos_interface_upload"
+msgid "Uplink"
 msgstr "Enlace de subida (uplink)"
 
 #. Prioritization
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:7
-msgid "qos_classify"
+msgid "Prioritization"
 msgstr "Priorización"
 
 #. Priority
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:8
-msgid "qos_classify_target"
+msgid "Priority"
 msgstr "Prioridad"
 
 #. Source address
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:9
-msgid "qos_classify_srchost"
+msgid "Source address"
 msgstr "Dirección de origen"
 
 #. source network / source host
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:10
-msgid "qos_classify_srchost_dest"
+msgid "source network / source host"
 msgstr "red de origen / host de origen"
 
 #. Target address
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:11
-msgid "qos_classify_dsthost"
+msgid "Target address"
 msgstr "Dirección de destino"
 
 #. target network / target host
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:12
-msgid "qos_classify_dsthost_dest"
+msgid "target network / target host"
 msgstr "red de destino / host de destino"
 
 #. portrange
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:13
-msgid "qos_classify_portrange"
+msgid "portrange"
 msgstr "rango de puerto"
 
 #. low
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:14
-msgid "qos_bulk"
+msgid "low"
 msgstr "bajo"
 
 #. normal
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:15
-msgid "qos_normal"
+msgid "normal"
 msgstr "normal"
 
 #. express
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:16
-msgid "qos_express"
+msgid "express"
 msgstr "express"
 
 #. priority
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:17
-msgid "qos_priority"
+msgid "priority"
 msgstr "prioridad"
 
 #. Bytes sent
diff --git a/po/es/rrdtool.po b/po/es/rrdtool.po
index d0444ceb5..6f87ff716 100644
--- a/po/es/rrdtool.po
+++ b/po/es/rrdtool.po
@@ -14,342 +14,342 @@ msgstr ""
 
 #. %H: Wireless - Signal Noise Ratio
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:1
-msgid "stat_dg_title_wireless__signal_noise"
+msgid "%H: Wireless - Signal Noise Ratio"
 msgstr ""
 
 #. dBm
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:2
-msgid "stat_dg_label_wireless__signal_noise"
+msgid "dBm"
 msgstr ""
 
 #. Noise Level
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:3
-msgid "stat_ds_signal_noise"
+msgid "Noise Level"
 msgstr ""
 
 #. Signal Strength
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:4
-msgid "stat_ds_signal_power"
+msgid "Signal Strength"
 msgstr ""
 
 #. %H: Wireless - Signal Quality
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:5
-msgid "stat_dg_title_wireless__signal_quality"
+msgid "%H: Wireless - Signal Quality"
 msgstr ""
 
 #. n
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:6
-msgid "stat_dg_label_wireless__signal_quality"
+msgid "n"
 msgstr ""
 
 #. Signal Quality
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:7
-msgid "stat_ds_signal_quality"
+msgid "Signal Quality"
 msgstr ""
 
 #. %H: ICMP Roundtrip Times
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:8
-msgid "stat_dg_title_ping"
+msgid "%H: ICMP Roundtrip Times"
 msgstr ""
 
 #. ms
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:9
-msgid "stat_dg_label_ping"
+msgid "ms"
 msgstr ""
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:10
-msgid "stat_ds_ping"
+msgid "%di"
 msgstr ""
 
 #. %H: Firewall - Processed Packets
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:11
-msgid "stat_dg_title_iptables__ipt_packets"
+msgid "%H: Firewall - Processed Packets"
 msgstr ""
 
 #. Packets/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:12
-msgid "stat_dg_label_iptables__ipt_packets"
+msgid "Packets/s"
 msgstr ""
 
 #. Chain \"%di\"
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:13
-msgid "stat_ds_ipt_packets"
+msgid "Chain \"%di\""
 msgstr ""
 
 #. %H: Netlink - Transfer on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:14
-msgid "stat_dg_title_netlink__if_octets"
+msgid "%H: Netlink - Transfer on %pi"
 msgstr ""
 
 #. Bytes/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:15
-msgid "stat_dg_label_netlink__if_octets"
+msgid "Bytes/s"
 msgstr ""
 
 #. Bytes (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:16
-msgid "stat_ds_if_octets"
+msgid "Bytes (%ds)"
 msgstr ""
 
 #. %H: Netlink - Packets on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:17
-msgid "stat_dg_title_netlink__if_packets"
+msgid "%H: Netlink - Packets on %pi"
 msgstr ""
 
 #. Packets/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:18
-msgid "stat_dg_label_netlink__if_packets"
+msgid "Packets/s"
 msgstr ""
 
 #. Processed (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:19
-msgid "stat_ds_if_packets"
+msgid "Processed (%ds)"
 msgstr ""
 
 #. Dropped   (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:20
-msgid "stat_ds_if_dropped"
+msgid "Dropped (%ds)"
 msgstr ""
 
 #. Errors    (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:21
-msgid "stat_ds_if_errors"
+msgid "Errors (%ds)"
 msgstr ""
 
 #. %H: Netlink - Multicast on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:22
-msgid "stat_dg_title_netlink__if_multicast"
+msgid "%H: Netlink - Multicast on %pi"
 msgstr ""
 
 #. Packets/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:23
-msgid "stat_dg_label_netlink__if_multicast"
+msgid "Packets/s"
 msgstr ""
 
 #. Packets
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:24
-msgid "stat_ds_if_multicast"
+msgid "Packets"
 msgstr ""
 
 #. %H: Netlink - Collisions on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:25
-msgid "stat_dg_title_netlink__if_collisions"
+msgid "%H: Netlink - Collisions on %pi"
 msgstr ""
 
 #. Collisions/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:26
-msgid "stat_dg_label_netlink__if_collisions"
+msgid "Collisions/s"
 msgstr ""
 
 #. Collisions
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:27
-msgid "stat_ds_if_collisions"
+msgid "Collisions"
 msgstr ""
 
 #. %H: Netlink - Errors on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:28
-msgid "stat_dg_title_netlink__if_tx_errors"
+msgid "%H: Netlink - Errors on %pi"
 msgstr ""
 
 #. Errors/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:29
-msgid "stat_dg_label_netlink__if_tx_errors"
+msgid "Errors/s"
 msgstr ""
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:30
-msgid "stat_ds_if_tx_errors"
+msgid "%di"
 msgstr ""
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:31
-msgid "stat_ds_if_rx_errors"
+msgid "%di"
 msgstr ""
 
 #. %H: Processes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:32
-msgid "stat_dg_title_processes"
+msgid "%H: Processes"
 msgstr ""
 
 #. Processes/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:33
-msgid "stat_dg_label_processes"
+msgid "Processes/s"
 msgstr ""
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:34
-msgid "stat_ds_ps_state"
+msgid "%di"
 msgstr ""
 
 #. %H: Process %pi - used cpu time
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:35
-msgid "stat_dg_title_processes__ps_cputime"
+msgid "%H: Process %pi - used cpu time"
 msgstr ""
 
 #. Jiffies
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:36
-msgid "stat_dg_label_processes__ps_cputime"
+msgid "Jiffies"
 msgstr ""
 
 #. system
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:37
-msgid "stat_ds_ps_cputime__syst"
+msgid "System"
 msgstr ""
 
 #. user
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:38
-msgid "stat_ds_ps_cputime__user"
+msgid "user"
 msgstr ""
 
 #. %H: Process %pi - threads and processes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:39
-msgid "stat_dg_title_processes__ps_count"
+msgid "%H: Process %pi - threads and processes"
 msgstr ""
 
 #. Count
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:40
-msgid "stat_dg_label_processes__ps_count"
+msgid "Count"
 msgstr ""
 
 #. %ds
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:41
-msgid "stat_ds_ps_count"
+msgid "%ds"
 msgstr ""
 
 #. %H: Process %pi - page faults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:42
-msgid "stat_dg_title_processes__ps_pagefaults"
+msgid "%H: Process %pi - page faults"
 msgstr ""
 
 #. Pagefaults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:43
-msgid "stat_dg_label_processes__ps_pagefaults"
+msgid "Pagefaults"
 msgstr ""
 
 #. page faults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:44
-msgid "stat_ds_ps_pagefaults"
+msgid "page faults"
 msgstr ""
 
 #. %H: Process %pi - virtual memory size
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:45
-msgid "stat_dg_title_processes__ps_rss"
+msgid "%H: Process %pi - virtual memory size"
 msgstr ""
 
 #. Bytes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:46
-msgid "stat_dg_label_processes__ps_rss"
+msgid "Bytes"
 msgstr ""
 
 #. virtual memory
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:47
-msgid "stat_ds_ps_rss"
+msgid "virtual memory"
 msgstr ""
 
 #. %H: Usage on Processor #%pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:48
-msgid "stat_dg_title_cpu"
+msgid "%H: Usage on Processor #%pi"
 msgstr ""
 
 #. %
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:49
-msgid "stat_dg_label_cpu"
+msgid "%"
 msgstr ""
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:50
-msgid "stat_ds_cpu"
+msgid "%di"
 msgstr ""
 
 #. %H: Transfer on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:51
-msgid "stat_dg_title_interface__if_octets"
+msgid "%H: Transfer on %di"
 msgstr ""
 
 #. Bytes/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:52
-msgid "stat_dg_label_interface__if_octets"
+msgid "Bytes/s"
 msgstr ""
 
 #. %H: Packets on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:53
-msgid "stat_dg_title_interface__if_packets"
+msgid "%H: Packets on %di"
 msgstr ""
 
 #. Packets/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:54
-msgid "stat_dg_label_interface__if_packets"
+msgid "Packets/s"
 msgstr ""
 
 #. %H: TCP-Connections to Port %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:55
-msgid "stat_dg_title_tcpconns"
+msgid "%H: TCP-Connections to Port %pi"
 msgstr ""
 
 #. Connections/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:56
-msgid "stat_dg_label_tcpconns"
+msgid "Connections/s"
 msgstr ""
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:57
-msgid "stat_ds_tcp_connections"
+msgid "%di"
 msgstr ""
 
 #. %H: Disk Space Usage on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:58
-msgid "stat_dg_title_df"
+msgid "%H: Disk Space Usage on %di"
 msgstr ""
 
 #. Bytes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:59
-msgid "stat_dg_label_df"
+msgid "Bytes"
 msgstr ""
 
 #. %ds
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:60
-msgid "stat_ds_df__free"
+msgid "%ds"
 msgstr ""
 
 #. %ds
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:61
-msgid "stat_ds_df__used"
+msgid "%ds"
 msgstr ""
 
 #. %H: Interrupts
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:62
-msgid "stat_dg_title_irq"
+msgid "%H: Interrupts"
 msgstr ""
 
 #. Issues/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:63
-msgid "stat_dg_label_irq"
+msgid "Issues/s"
 msgstr ""
 
 #. IRQ %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:64
-msgid "stat_ds_irq"
+msgid "IRQ %di"
 msgstr ""
 
 #. %H: System Load
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:65
-msgid "stat_dg_title_load"
+msgid "%H: System Load"
 msgstr ""
 
 #. Load
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:66
-msgid "stat_dg_label_load"
+msgid "Load"
 msgstr ""
 
 #. 1 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:67
-msgid "stat_ds_load__shortterm"
+msgid "1 min"
 msgstr ""
 
 #. 5 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:68
-msgid "stat_ds_load__midterm"
+msgid "5 min"
 msgstr ""
 
 #. 15 min
diff --git a/po/es/samba.po b/po/es/samba.po
index e73266781..4e4656229 100644
--- a/po/es/samba.po
+++ b/po/es/samba.po
@@ -13,84 +13,84 @@ msgstr ""
 
 #. Network Shares
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:1
-msgid "samba"
+msgid "Network Shares"
 msgstr "Recursos compartidos de red "
 
 #. Hostname
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:2
-msgid "samba_samba_name"
+msgid "Hostname"
 msgstr "Nombre del Host (Hostname)"
 
 #. Description
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:3
-msgid "samba_samba_description"
+msgid "Description"
 msgstr "Descripción"
 
 #. Workgroup
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:4
-msgid "samba_samba_workgroup"
+msgid "Workgroup"
 msgstr "Grupo de Trabajo"
 
 #. Share home-directories
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:5
-msgid "samba_samba_homes"
+msgid "Share home-directories"
 msgstr "Compartir directorios-home"
 
 #. System users can reach their home directories via network shares.
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:6
-msgid "samba_samba_homes_desc"
+msgid "System users can reach their home directories via network shares."
 msgstr ""
 "Los usuarios del sistema pueden llegar a sus directorios de inicio a través "
 "de recursos compartidos de red."
 
 #. Shared Directories
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:7
-msgid "samba_sambashare"
+msgid "Shared Directories"
 msgstr "Directorios compartidos"
 
 #. Shared Directory
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:8
-msgid "samba_sambashare_path"
+msgid "Shared Directory"
 msgstr "Directorio compatido"
 
 #. Physical Path
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:9
-msgid "samba_sambashare_path_desc"
+msgid "Physical Path"
 msgstr "Ruta Física"
 
 #. Allowed Users
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:10
-msgid "samba_sambashare_users"
+msgid "Allowed Users"
 msgstr "Usuarios Perimitidos"
 
 #. optional
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:11
-msgid "samba_sambashare_users_desc"
+msgid "optional"
 msgstr "opcional"
 
 #. Read Only
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:12
-msgid "samba_sambashare_readonly"
+msgid "Read Only"
 msgstr "Solo lectura"
 
 #. Allow Guests
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:13
-msgid "samba_sambashare_guestok"
+msgid "Allow Guests"
 msgstr "Permitir Invitados"
 
 #. Create Mask
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:14
-msgid "samba_sambashare_createmask"
+msgid "Create Mask"
 msgstr "Crear Máscara "
 
 #. Mask for new files
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:15
-msgid "samba_sambashare_createmask_desc"
+msgid "Mask for new files"
 msgstr "Máscara para archivos nuevos"
 
 #. Directory Mask
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:16
-msgid "samba_sambashare_dirmask"
+msgid "Directory Mask"
 msgstr "Máscara de Directorio"
 
 #. Mask for new directories
diff --git a/po/es/statistics.po b/po/es/statistics.po
index 5d4e551c5..05adc4083 100644
--- a/po/es/statistics.po
+++ b/po/es/statistics.po
@@ -13,12 +13,12 @@ msgstr ""
 
 #. Statistics
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:1
-msgid "stat_statistics"
+msgid "Statistics"
 msgstr "Estadísticas"
 
 #. The statistics package is based on <a href=\"http://collectd.org/index.shtml\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD Tool</a> to render diagram images from collected data.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:2
-msgid "stat_desc"
+msgid "The statistics package is based on <a href=\"http://collectd.org/index.shtml\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD Tool</a> to render diagram images from collected data."
 msgstr ""
 "El paquete \"Estadísticas\" está basado en <a "
 "href=\"http://collectd.org/index.shtml\">Collectd</a> y utiliza <a "
@@ -27,142 +27,142 @@ msgstr ""
 
 #. System plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:3
-msgid "stat_systemplugins"
+msgid "System plugins"
 msgstr "Plugins de sistema"
 
 #. Network plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:4
-msgid "stat_networkplugins"
+msgid "Network plugins"
 msgstr "Plugins de red"
 
 #. Output plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:5
-msgid "stat_outputplugins"
+msgid "Output plugins"
 msgstr "Plugins de salida"
 
 #. Display timespan
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:6
-msgid "stat_showtimespan"
+msgid "Display timespan »"
 msgstr "Mostrar lapso de tiempo"
 
 #. Graphs
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:7
-msgid "stat_graphs"
+msgid "Graphs"
 msgstr "Gráficos"
 
 #. Collectd
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:8
-msgid "stat_collectd"
+msgid "Collectd"
 msgstr "Collectd"
 
 #. Processor
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:9
-msgid "stat_cpu"
+msgid "Processor"
 msgstr "Procesador"
 
 #. Ping
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:10
-msgid "stat_ping"
+msgid "Ping"
 msgstr "Ping"
 
 #. Firewall
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:11
-msgid "stat_iptables"
+msgid "Firewall"
 msgstr "Corta fuego"
 
 #. Netlink
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:12
-msgid "stat_netlink"
+msgid "Netlink"
 msgstr "Enlace de red"
 
 #. Processes
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:13
-msgid "stat_processes"
+msgid "Processes"
 msgstr "Procesos"
 
 #. Wireless
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:14
-msgid "stat_wireless"
+msgid "Wireless"
 msgstr "Inalámbrico"
 
 #. TCP Connections
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:15
-msgid "stat_tcpconns"
+msgid "TCP Connections"
 msgstr "Conexiones TCP"
 
 #. Interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:16
-msgid "stat_interface"
+msgid "Interfaces"
 msgstr "Interfaces"
 
 #. Disk Space Usage
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:17
-msgid "stat_df"
+msgid "Disk Space Usage"
 msgstr "Uso del Espacio en Disco"
 
 #. Interrupts
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:18
-msgid "stat_irq"
+msgid "Interrupts"
 msgstr "Interrupciones"
 
 #. Disk Usage
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:19
-msgid "stat_disk"
+msgid "Disk Usage"
 msgstr "Uso del Disco"
 
 #. Exec
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:20
-msgid "stat_exec"
+msgid "Exec"
 msgstr "Exec"
 
 #. RRDTool
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:21
-msgid "stat_rrdtool"
+msgid "RRDTool"
 msgstr "RRDTool"
 
 #. Network
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:22
-msgid "stat_network"
+msgid "Network"
 msgstr "Red"
 
 #. CSV Output
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:23
-msgid "stat_csv"
+msgid "CSV Output"
 msgstr "Salida CSV"
 
 #. System Load
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:24
-msgid "stat_load"
+msgid "System Load"
 msgstr "Carga del sistema"
 
 #. DNS
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:25
-msgid "stat_dns"
+msgid "DNS"
 msgstr "DNS"
 
 #. Email
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:26
-msgid "stat_email"
+msgid "Email"
 msgstr "Correo eletrónico"
 
 #. UnixSock
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:27
-msgid "stat_unixsock"
+msgid "UnixSock"
 msgstr "UnixSock"
 
 #. Statistics
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:28
-msgid "lucistatistics"
+msgid "Statistics"
 msgstr "Estadísticas"
 
 #. Collectd Settings
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:29
-msgid "lucistatistics_collectd"
+msgid "Collectd Settings"
 msgstr "Configuración de Collectd"
 
 #. Collectd is a small daeomon for collecting data from various sources through different plugins. On this page you can change general settings for the collectd daemon.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:30
-msgid "lucistatistics_collectd_desc"
+msgid "Collectd is a small daeomon for collecting data from various sources through different plugins. On this page you can change general settings for the collectd daemon."
 msgstr ""
 "Collectd is un demonio para la recolección de datos desde varias fuentes a "
 "travéz de la utilización de diferentes agregados (plugins). En esta página "
@@ -170,230 +170,230 @@ msgstr ""
 
 #. Hostname
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:31
-msgid "lucistatistics_collectd_hostname"
+msgid "Hostname"
 msgstr "Nombre de Host"
 
 #. Base Directory
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:32
-msgid "lucistatistics_collectd_basedir"
+msgid "Base Directory"
 msgstr "Directorio Base"
 
 #. Directory for sub-configurations
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:33
-msgid "lucistatistics_collectd_include"
+msgid "Directory for sub-configurations"
 msgstr "Directorio para las sub-configuraciones"
 
 #. Directory for collectd plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:34
-msgid "lucistatistics_collectd_plugindir"
+msgid "Directory for collectd plugins"
 msgstr "Directorio para los plugins de collectd"
 
 #. Used PID file
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:35
-msgid "lucistatistics_collectd_pidfile"
+msgid "Used PID file"
 msgstr "Archivo PID utilizado"
 
 #. Datasets definition file
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:36
-msgid "lucistatistics_collectd_typesdb"
+msgid "Datasets definition file"
 msgstr "Archivo de definición de conjunto de datos (Datasets)"
 
 #. Data collection interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:37
-msgid "lucistatistics_collectd_interval"
+msgid "Data collection interval"
 msgstr "Intervalo de recolección de datos"
 
 #. Seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:38
-msgid "lucistatistics_collectd_interval_desc"
+msgid "Seconds"
 msgstr "Segundos"
 
 #. Number of threads for data collection
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:39
-msgid "lucistatistics_collectd_readthreads"
+msgid "Number of threads for data collection"
 msgstr "Número de hilos para la recogida de datos "
 
 #. Try to lookup fully qualified hostname
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:40
-msgid "lucistatistics_collectd_fqdnlookup"
+msgid "Try to lookup fully qualified hostname"
 msgstr "Trate de buscar nombres de host (FQDN)"
 
 #. CPU Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:41
-msgid "lucistatistics_collectdcpu"
+msgid "CPU Plugin Configuration"
 msgstr "Configuración del plugin de CPU"
 
 #. The cpu plugin collects basic statistics about the processor usage.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:42
-msgid "lucistatistics_collectdcpu_desc"
+msgid "The cpu plugin collects basic statistics about the processor usage."
 msgstr ""
 "El plugin de CPU recolecta estadísticas básica acerca del uso del "
 "procesador."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:43
-msgid "lucistatistics_collectdcpu_enable"
+msgid "Enable this plugin"
 msgstr "Activar plugin"
 
 #. CSV Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:44
-msgid "lucistatistics_collectdcsv"
+msgid "CSV Plugin Configuration"
 msgstr "Configuración del plugin de CSV"
 
 #. The csv plugin stores collected data in csv file format for further processing by external programs.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:45
-msgid "lucistatistics_collectdcsv_desc"
+msgid "The csv plugin stores collected data in csv file format for further processing by external programs."
 msgstr ""
 "El plugin de CSV almacena los datos recolectados en un archivo con formato "
 "csv para un futuro procesamiento utilizando programas de terceros."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:46
-msgid "lucistatistics_collectdcsv_enable"
+msgid "Enable this plugin"
 msgstr "Activar plugin"
 
 #. Storage directory for the csv files
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:47
-msgid "lucistatistics_collectdcsv_datadir"
+msgid "Storage directory for the csv files"
 msgstr "Directorio de almacenamiento para los archivos csv"
 
 #. Store data values as rates instead of absolute values
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:48
-msgid "lucistatistics_collectdcsv_storerates"
+msgid "Store data values as rates instead of absolute values"
 msgstr ""
 "Almacenar datos como los tipos de valores en lugar de valores absolutos "
 
 #. DF Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:49
-msgid "lucistatistics_collectddf"
+msgid "DF Plugin Configuration"
 msgstr "Configuración del plugin de DF"
 
 #. The df plugin collects statistics about the disk space usage on different devices, mount points or filesystem types.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:50
-msgid "lucistatistics_collectddf_desc"
+msgid "The df plugin collects statistics about the disk space usage on different devices, mount points or filesystem types."
 msgstr ""
 "El plugin DF recolecta estadísticas acerca del uso del espacio en disco en "
 "diferentes dispositivos, puntos de montaje y tipos de sistema de archivos."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:51
-msgid "lucistatistics_collectddf_enable"
+msgid "Enable this plugin"
 msgstr "Activar plugin"
 
 #. Monitor devices
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:52
-msgid "lucistatistics_collectddf_devices"
+msgid "Monitor devices"
 msgstr "Monitorear de dispositivos "
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:53
-msgid "lucistatistics_collectddf_devices_desc"
+msgid "multiple separated by space"
 msgstr "múltiples separados por un espacio "
 
 #. Monitor mount points
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:54
-msgid "lucistatistics_collectddf_mountpoints"
+msgid "Monitor mount points"
 msgstr "Monitorear los puntos de montaje "
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:55
-msgid "lucistatistics_collectddf_mountpoints_desc"
+msgid "multiple separated by space"
 msgstr "múltiples separados por un espacio "
 
 #. Monitor filesystem types
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:56
-msgid "lucistatistics_collectddf_fstypes"
+msgid "Monitor filesystem types"
 msgstr "Monitorear tipos de sistema de archivos"
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:57
-msgid "lucistatistics_collectddf_fstypes_desc"
+msgid "multiple separated by space"
 msgstr "múltiples separados por un espacio "
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:58
-msgid "lucistatistics_collectddf_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr "Monitorear todo excepto los seleccionados"
 
 #. Disk Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:59
-msgid "lucistatistics_collectddisk"
+msgid "Disk Plugin Configuration"
 msgstr "Configuración del plugin de Disco"
 
 #. The disk plugin collects detailled usage statistics for selected partitions or whole disks.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:60
-msgid "lucistatistics_collectddisk_desc"
+msgid "The disk plugin collects detailled usage statistics for selected partitions or whole disks."
 msgstr ""
 "El plugin de disco recolecta estadísticas detallada acerca de su utilización "
 "para las particiones seleccionadas o bien el disco completo."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:61
-msgid "lucistatistics_collectddisk_enable"
+msgid "Enable this plugin"
 msgstr "Activar plugin"
 
 #. Monitor disks and partitions
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:62
-msgid "lucistatistics_collectddisk_disks"
+msgid "Monitor disks and partitions"
 msgstr "Monitorear discos y particiones"
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:63
-msgid "lucistatistics_collectddisk_disks_desc"
+msgid "multiple separated by space"
 msgstr "múltiples separados por un espacio "
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:64
-msgid "lucistatistics_collectddisk_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr "Monitorear todos excepto los seleccionados"
 
 #. DNS Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:65
-msgid "lucistatistics_collectddns"
+msgid "DNS Plugin Configuration"
 msgstr "Configuración del plugin de DNS"
 
 #. The dns plugin collects detailled statistics about dns related traffic on selected interfaces.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:66
-msgid "lucistatistics_collectddns_desc"
+msgid "The dns plugin collects detailled statistics about dns related traffic on selected interfaces."
 msgstr ""
 "El plugin DNS recolecta estdísticas detallada acerca del trafico relacionado "
 "al DNS en las interfaces seleccionadas."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:67
-msgid "lucistatistics_collectddns_enable"
+msgid "Enable this plugin"
 msgstr "Activar plugin"
 
 #. Monitor interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:68
-msgid "lucistatistics_collectddns_interfaces"
+msgid "Monitor interfaces"
 msgstr "Monitorear interfaces"
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:69
-msgid "lucistatistics_collectddns_interfaces_desc"
+msgid "multiple separated by space"
 msgstr "múltiples separados por un espacio "
 
 #. Ignore source addresses
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:70
-msgid "lucistatistics_collectddns_ignoresources"
+msgid "Ignore source addresses"
 msgstr "Ignorar direcciones de origen"
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:71
-msgid "lucistatistics_collectddns_ignoresources_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr ""
 "Mantener la tecla CTRL mientras hace clic para seleccionar multiples "
 "interfaces"
 
 #. E-Mail Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:72
-msgid "lucistatistics_collectdemail"
+msgid "E-Mail Plugin Configuration"
 msgstr "Configuración del plugin de E-Mail"
 
 #. The email plugin creates a unix socket which can be used to transmit email-statistics to a running collectd daemon. This plugin is primarily intended to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can be used in other ways as well.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:73
-msgid "lucistatistics_collectdemail_desc"
+msgid "The email plugin creates a unix socket which can be used to transmit email-statistics to a running collectd daemon. This plugin is primarily intended to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can be used in other ways as well."
 msgstr ""
 "El plugin de E-Mail crea un socket de unix (unix-socket) el cual puede "
 "utilizarse para transmitir estadísticas de e-mail a un demonio collectd en "
@@ -403,47 +403,47 @@ msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:74
-msgid "lucistatistics_collectdemail_enable"
+msgid "Enable this plugin"
 msgstr "Activar plugin"
 
 #. Filepath of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:75
-msgid "lucistatistics_collectdemail_socketfile"
+msgid "Filepath of the unix socket"
 msgstr "Ruta de archivo para el socket de unix"
 
 #. Group ownership of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:76
-msgid "lucistatistics_collectdemail_socketgroup"
+msgid "Group ownership of the unix socket"
 msgstr "Grupo (dueño) del socket de unix "
 
 #. group name
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:77
-msgid "lucistatistics_collectdemail_socketgroup_desc"
+msgid "group name"
 msgstr "nombre del grupo"
 
 #. File permissions of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:78
-msgid "lucistatistics_collectdemail_socketperms"
+msgid "File permissions of the unix socket"
 msgstr "Permisos de archivos del socket de unix"
 
 #. octal
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:79
-msgid "lucistatistics_collectdemail_socketperms_desc"
+msgid "octal"
 msgstr "octal"
 
 #. Maximum allowed connections
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:80
-msgid "lucistatistics_collectdemail_maxconns"
+msgid "Maximum allowed connections"
 msgstr "Conexiones máximas permitidas"
 
 #. Exec Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:81
-msgid "lucistatistics_collectdexec"
+msgid "Exec Plugin Configuration"
 msgstr "Configuración del plugin Exec"
 
 #. The exec plugin starts external commands to read values from or to notify external processes when certain threshold values have been reached.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:82
-msgid "lucistatistics_collectdexec_desc"
+msgid "The exec plugin starts external commands to read values from or to notify external processes when certain threshold values have been reached."
 msgstr ""
 "El plugin Exec inicia comandos externo para leer valores desde o para "
 "notificar a los procesos externos cuando determinados valores \"umbral\" se "
@@ -451,17 +451,17 @@ msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:83
-msgid "lucistatistics_collectdexec_enable"
+msgid "Enable this plugin"
 msgstr "Activar plugin"
 
 #. Add command for reading values
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:84
-msgid "lucistatistics_collectdexecinput"
+msgid "Add command for reading values"
 msgstr "Añadir comando para leer los valores "
 
 #. Here you can define external commands which will be started by collectd in order to read certain values. The values will be read from stdout.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:85
-msgid "lucistatistics_collectdexecinput_desc"
+msgid "Here you can define external commands which will be started by collectd in order to read certain values. The values will be read from stdout."
 msgstr ""
 "Aquí puede definir los comandos externos los cuales serán iniciados por "
 "Collectd con el fin de leer determinados valores. Los valores serán leídos "
@@ -469,86 +469,86 @@ msgstr ""
 
 #. Commandline
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:86
-msgid "lucistatistics_collectdexecinput_cmdline"
+msgid "Commandline"
 msgstr "Línea de comando"
 
 #. Run as user
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:87
-msgid "lucistatistics_collectdexecinput_cmduser"
+msgid "Run as user"
 msgstr "Ejecutar como usuario"
 
 #. Run as group
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:88
-msgid "lucistatistics_collectdexecinput_cmdgroup"
+msgid "Run as group"
 msgstr "Ejecutar como grupo"
 
 #. Add notification command
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:89
-msgid "lucistatistics_collectdexecnotify"
+msgid "Add notification command"
 msgstr "Añadir comando de notificación"
 
 #. Here you can define external commands which will be started by collectd when certain threshold values have been reached. The values leading to invokation will be feeded to the the called programs stdin.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:90
-msgid "lucistatistics_collectdexecnotify_desc"
+msgid "Here you can define external commands which will be started by collectd when certain threshold values have been reached. The values leading to invokation will be feeded to the the called programs stdin."
 msgstr ""
 "Aquí puede definir los comandos externos los cuales serán iniciados por "
 "Collectd cuando determinados valores \"umbral\" sean alcanzados. "
 
 #. Commandline
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:91
-msgid "lucistatistics_collectdexecnotify_cmdline"
+msgid "Commandline"
 msgstr "Línea de comando"
 
 #. Run as user
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:92
-msgid "lucistatistics_collectdexecnotify_cmduser"
+msgid "Run as user"
 msgstr "Ejecutar como usuario"
 
 #. Run as group
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:93
-msgid "lucistatistics_collectdexecnotify_cmdgroup"
+msgid "Run as group"
 msgstr "Ejecutar como grupo"
 
 #. Interface Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:94
-msgid "lucistatistics_collectdinterface"
+msgid "Interface Plugin Configuration"
 msgstr "Configuración del plugin Interface"
 
 #. The interface plugin collects traffic statistics on selected interfaces.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:95
-msgid "lucistatistics_collectdinterface_desc"
+msgid "The interface plugin collects traffic statistics on selected interfaces."
 msgstr ""
 "El plugin Interface recolecta estadísticas de tráfico en las interfaces "
 "seleccionadas."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:96
-msgid "lucistatistics_collectdinterface_enable"
+msgid "Enable this plugin"
 msgstr "Activar plugin"
 
 #. Monitor interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:97
-msgid "lucistatistics_collectdinterface_interfaces"
+msgid "Monitor interfaces"
 msgstr "Monitorear interfaces"
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:98
-msgid "lucistatistics_collectdinterface_interfaces_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr "Mantener CTRL mientras hace clic para seleccionar múltiples interfaces"
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:99
-msgid "lucistatistics_collectdinterface_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr "Monitorear todas excepto las seleccionadas"
 
 #. Iptables Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:100
-msgid "lucistatistics_collectdiptables"
+msgid "Iptables Plugin Configuration"
 msgstr "Configuración del plugin Iptables"
 
 #. The iptables plugin will monitor selected firewall rules and collect informations about processed bytes and packets per rule.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:101
-msgid "lucistatistics_collectdiptables_desc"
+msgid "The iptables plugin will monitor selected firewall rules and collect informations about processed bytes and packets per rule."
 msgstr ""
 "El plugin Iptables monitoreará las reglas del corta fuego seleccionado y de "
 "esa forma relecta información relevante acerca de los bytes y paquetes "
@@ -556,552 +556,552 @@ msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:102
-msgid "lucistatistics_collectdiptables_enable"
+msgid "Enable this plugin"
 msgstr "Activar plugin"
 
 #. Add matching rule
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:103
-msgid "lucistatistics_collectdiptablesmatch"
+msgid "Add matching rule"
 msgstr ""
 
 #. Here you can define various criteria by which the monitored iptables rules are selected.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:104
-msgid "lucistatistics_collectdiptablesmatch_desc"
+msgid "Here you can define various criteria by which the monitored iptables rules are selected."
 msgstr ""
 
 #. Name of the rule
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:105
-msgid "lucistatistics_collectdiptablesmatch_name"
+msgid "Name of the rule"
 msgstr ""
 
 #. max. 16 chars
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:106
-msgid "lucistatistics_collectdiptablesmatch_name_desc"
+msgid "max. 16 chars"
 msgstr ""
 
 #. Table
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:107
-msgid "lucistatistics_collectdiptablesmatch_table"
+msgid "Table"
 msgstr ""
 
 #. Chain
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:108
-msgid "lucistatistics_collectdiptablesmatch_chain"
+msgid "Chain"
 msgstr ""
 
 #. Action (target)
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:109
-msgid "lucistatistics_collectdiptablesmatch_target"
+msgid "Action (target)"
 msgstr ""
 
 #. Network protocol
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:110
-msgid "lucistatistics_collectdiptablesmatch_protocol"
+msgid "Network protocol"
 msgstr ""
 
 #. Source ip range
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:111
-msgid "lucistatistics_collectdiptablesmatch_source"
+msgid "Source ip range"
 msgstr ""
 
 #. CIDR notation
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:112
-msgid "lucistatistics_collectdiptablesmatch_source_desc"
+msgid "CIDR notation"
 msgstr ""
 
 #. Destination ip range
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:113
-msgid "lucistatistics_collectdiptablesmatch_destination"
+msgid "Destination ip range"
 msgstr ""
 
 #. CIDR notation
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:114
-msgid "lucistatistics_collectdiptablesmatch_destination_desc"
+msgid "CIDR notation"
 msgstr ""
 
 #. Incoming interface
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:115
-msgid "lucistatistics_collectdiptablesmatch_inputif"
+msgid "Incoming interface"
 msgstr ""
 
 #. e.g. br-lan
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:116
-msgid "lucistatistics_collectdiptablesmatch_inputif_desc"
+msgid "e.g. br-lan"
 msgstr ""
 
 #. Outgoing interface
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:117
-msgid "lucistatistics_collectdiptablesmatch_outputif"
+msgid "Outgoing interface"
 msgstr ""
 
 #. e.g. br-ff
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:118
-msgid "lucistatistics_collectdiptablesmatch_outputif_desc"
+msgid "e.g. br-ff"
 msgstr ""
 
 #. Options
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:119
-msgid "lucistatistics_collectdiptablesmatch_options"
+msgid "Options"
 msgstr ""
 
 #. e.g. reject-with tcp-reset
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:120
-msgid "lucistatistics_collectdiptablesmatch_options_desc"
+msgid "e.g. reject-with tcp-reset"
 msgstr ""
 
 #. IRQ Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:121
-msgid "lucistatistics_collectdirq"
+msgid "IRQ Plugin Configuration"
 msgstr ""
 
 #. The irq plugin will monitor the rate of issues per second for each selected interrupt. If no interrupt is selected then all interrupts are monitored.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:122
-msgid "lucistatistics_collectdirq_desc"
+msgid "The irq plugin will monitor the rate of issues per second for each selected interrupt. If no interrupt is selected then all interrupts are monitored."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:123
-msgid "lucistatistics_collectdirq_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Monitor interrupts
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:124
-msgid "lucistatistics_collectdirq_irqs"
+msgid "Monitor interrupts"
 msgstr ""
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:125
-msgid "lucistatistics_collectdirq_irqs_desc"
+msgid "multiple separated by space"
 msgstr ""
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:126
-msgid "lucistatistics_collectdirq_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr ""
 
 #. Load Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:127
-msgid "lucistatistics_collectdload"
+msgid "Load Plugin Configuration"
 msgstr ""
 
 #. The load plugin collects statistics about the general system load.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:128
-msgid "lucistatistics_collectdload_desc"
+msgid "The load plugin collects statistics about the general system load."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:129
-msgid "lucistatistics_collectdload_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Netlink Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:130
-msgid "lucistatistics_collectdnetlink"
+msgid "Netlink Plugin Configuration"
 msgstr ""
 
 #. The netlink plugin collects extended informations like qdisc-, class- and filter-statistics for selected interfaces.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:131
-msgid "lucistatistics_collectdnetlink_desc"
+msgid "The netlink plugin collects extended informations like qdisc-, class- and filter-statistics for selected interfaces."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:132
-msgid "lucistatistics_collectdnetlink_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Basic monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:133
-msgid "lucistatistics_collectdnetlink_interfaces"
+msgid "Basic monitoring"
 msgstr ""
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:134
-msgid "lucistatistics_collectdnetlink_interfaces_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr ""
 
 #. Verbose monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:135
-msgid "lucistatistics_collectdnetlink_verboseinterfaces"
+msgid "Verbose monitoring"
 msgstr ""
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:136
-msgid "lucistatistics_collectdnetlink_verboseinterfaces_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr ""
 
 #. Qdisc monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:137
-msgid "lucistatistics_collectdnetlink_qdiscs"
+msgid "Qdisc monitoring"
 msgstr ""
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:138
-msgid "lucistatistics_collectdnetlink_qdiscs_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr ""
 
 #. Shaping class monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:139
-msgid "lucistatistics_collectdnetlink_classes"
+msgid "Shaping class monitoring"
 msgstr ""
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:140
-msgid "lucistatistics_collectdnetlink_classes_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr ""
 
 #. Filter class monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:141
-msgid "lucistatistics_collectdnetlink_filters"
+msgid "Filter class monitoring"
 msgstr ""
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:142
-msgid "lucistatistics_collectdnetlink_filters_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr ""
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:143
-msgid "lucistatistics_collectdnetlink_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr ""
 
 #. Network Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:144
-msgid "lucistatistics_collectdnetwork"
+msgid "Network Plugin Configuration"
 msgstr ""
 
 #. The network plugin provides network based communication between different collectd instances. Collectd can operate both in client and server mode. In client mode locally collected date is transferred to a collectd server instance, in server mode the local instance receives data from other hosts.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:145
-msgid "lucistatistics_collectdnetwork_desc"
+msgid "The network plugin provides network based communication between different collectd instances. Collectd can operate both in client and server mode. In client mode locally collected date is transferred to a collectd server instance, in server mode the local instance receives data from other hosts."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:146
-msgid "lucistatistics_collectdnetwork_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Listener interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:147
-msgid "lucistatistics_collectdnetworklisten"
+msgid "Listener interfaces"
 msgstr ""
 
 #. This section defines on which interfaces collectd will wait for incoming connections.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:148
-msgid "lucistatistics_collectdnetworklisten_desc"
+msgid "This section defines on which interfaces collectd will wait for incoming connections."
 msgstr ""
 
 #. Listen host
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:149
-msgid "lucistatistics_collectdnetworklisten_host"
+msgid "Listen host"
 msgstr ""
 
 #. host-, ip- or ip6 address
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:150
-msgid "lucistatistics_collectdnetworklisten_host_desc"
+msgid "host-, ip- or ip6 address"
 msgstr ""
 
 #. Listen port
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:151
-msgid "lucistatistics_collectdnetworklisten_port"
+msgid "Listen port"
 msgstr ""
 
 #. 0 - 65535
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:152
-msgid "lucistatistics_collectdnetworklisten_port_desc"
+msgid "0 - 65535"
 msgstr ""
 
 #. server interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:153
-msgid "lucistatistics_collectdnetworkserver"
+msgid "server interfaces"
 msgstr ""
 
 #. This section defines to which servers the locally collected data is sent to.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:154
-msgid "lucistatistics_collectdnetworkserver_desc"
+msgid "This section defines to which servers the locally collected data is sent to."
 msgstr ""
 
 #. Server host
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:155
-msgid "lucistatistics_collectdnetworkserver_host"
+msgid "Server host"
 msgstr ""
 
 #. host-, ip- or ip6 address
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:156
-msgid "lucistatistics_collectdnetworkserver_host_desc"
+msgid "host-, ip- or ip6 address"
 msgstr ""
 
 #. Server port
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:157
-msgid "lucistatistics_collectdnetworkserver_port"
+msgid "Server port"
 msgstr ""
 
 #. 0 - 65535
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:158
-msgid "lucistatistics_collectdnetworkserver_port_desc"
+msgid "0 - 65535"
 msgstr ""
 
 #. TTL for network packets
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:159
-msgid "lucistatistics_collectdnetwork_timetolive"
+msgid "TTL for network packets"
 msgstr ""
 
 #. 0 - 255
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:160
-msgid "lucistatistics_collectdnetwork_timetolive_desc"
+msgid "0 - 255"
 msgstr ""
 
 #. Forwarding between listen and server addresses
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:161
-msgid "lucistatistics_collectdnetwork_forward"
+msgid "Forwarding between listen and server addresses"
 msgstr ""
 
 #. Cache flush interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:162
-msgid "lucistatistics_collectdnetwork_cacheflush"
+msgid "Cache flush interval"
 msgstr ""
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:163
-msgid "lucistatistics_collectdnetwork_cacheflush_desc"
+msgid "seconds"
 msgstr ""
 
 #. Ping Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:164
-msgid "lucistatistics_collectdping"
+msgid "Ping Plugin Configuration"
 msgstr ""
 
 #. The ping plugin will send icmp echo replies to selected hosts and measure the roundtrip time for each host.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:165
-msgid "lucistatistics_collectdping_desc"
+msgid "The ping plugin will send icmp echo replies to selected hosts and measure the roundtrip time for each host."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:166
-msgid "lucistatistics_collectdping_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Monitor hosts
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:167
-msgid "lucistatistics_collectdping_hosts"
+msgid "Monitor hosts"
 msgstr ""
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:168
-msgid "lucistatistics_collectdping_hosts_desc"
+msgid "multiple separated by space"
 msgstr ""
 
 #. TTL for ping packets
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:169
-msgid "lucistatistics_collectdping_ttl"
+msgid "TTL for ping packets"
 msgstr ""
 
 #. 0 - 255
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:170
-msgid "lucistatistics_collectdping_ttl_desc"
+msgid "0 - 255"
 msgstr ""
 
 #. Processes Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:171
-msgid "lucistatistics_collectdprocesses"
+msgid "Processes Plugin Configuration"
 msgstr ""
 
 #. The processes plugin collects informations like cpu time, page faults and memory usage of selected processes.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:172
-msgid "lucistatistics_collectdprocesses_desc"
+msgid "The processes plugin collects informations like cpu time, page faults and memory usage of selected processes."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:173
-msgid "lucistatistics_collectdprocesses_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Monitor processes
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:174
-msgid "lucistatistics_collectdprocesses_processes"
+msgid "Monitor processes"
 msgstr ""
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:175
-msgid "lucistatistics_collectdprocesses_processes_desc"
+msgid "multiple separated by space"
 msgstr ""
 
 #. RRDTool Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:176
-msgid "lucistatistics_collectdrrdtool"
+msgid "RRDTool Plugin Configuration"
 msgstr ""
 
 #. The rrdtool plugin stores the collected data in rrd database files, the foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong values will result in a very high memory consumption in the temporary directory. This can render the device unusable!</strong>
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:177
-msgid "lucistatistics_collectdrrdtool_desc"
+msgid "The rrdtool plugin stores the collected data in rrd database files, the foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong values will result in a very high memory consumption in the temporary directory. This can render the device unusable!</strong>"
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:178
-msgid "lucistatistics_collectdrrdtool_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Storage directory
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:179
-msgid "lucistatistics_collectdrrdtool_datadir"
+msgid "Storage directory"
 msgstr ""
 
 #. RRD step interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:180
-msgid "lucistatistics_collectdrrdtool_stepsize"
+msgid "RRD step interval"
 msgstr ""
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:181
-msgid "lucistatistics_collectdrrdtool_stepsize_desc"
+msgid "seconds"
 msgstr ""
 
 #. RRD heart beat interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:182
-msgid "lucistatistics_collectdrrdtool_heartbeat"
+msgid "RRD heart beat interval"
 msgstr ""
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:183
-msgid "lucistatistics_collectdrrdtool_heartbeat_desc"
+msgid "seconds"
 msgstr ""
 
 #. Only create average RRAs
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:184
-msgid "lucistatistics_collectdrrdtool_rrasingle"
+msgid "Only create average RRAs"
 msgstr ""
 
 #. reduces rrd size
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:185
-msgid "lucistatistics_collectdrrdtool_rrasingle_desc"
+msgid "reduces rrd size"
 msgstr ""
 
 #. Stored timespans
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:186
-msgid "lucistatistics_collectdrrdtool_rratimespans"
+msgid "Stored timespans"
 msgstr ""
 
 #. seconds; multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:187
-msgid "lucistatistics_collectdrrdtool_rratimespans_desc"
+msgid "seconds; multiple separated by space"
 msgstr ""
 
 #. Rows per RRA
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:188
-msgid "lucistatistics_collectdrrdtool_rrarows"
+msgid "Rows per RRA"
 msgstr ""
 
 #. RRD XFiles Factor
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:189
-msgid "lucistatistics_collectdrrdtool_xff"
+msgid "RRD XFiles Factor"
 msgstr ""
 
 #. Cache collected data for
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:190
-msgid "lucistatistics_collectdrrdtool_cachetimeout"
+msgid "Cache collected data for"
 msgstr ""
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:191
-msgid "lucistatistics_collectdrrdtool_cachetimeout_desc"
+msgid "seconds"
 msgstr ""
 
 #. Flush cache after
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:192
-msgid "lucistatistics_collectdrrdtool_cacheflush"
+msgid "Flush cache after"
 msgstr ""
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:193
-msgid "lucistatistics_collectdrrdtool_cacheflush_desc"
+msgid "seconds"
 msgstr ""
 
 #. TCPConns Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:194
-msgid "lucistatistics_collectdtcpconns"
+msgid "TCPConns Plugin Configuration"
 msgstr ""
 
 #. The tcpconns plugin collects informations about open tcp connections on selected ports.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:195
-msgid "lucistatistics_collectdtcpconns_desc"
+msgid "The tcpconns plugin collects informations about open tcp connections on selected ports."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:196
-msgid "lucistatistics_collectdtcpconns_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Monitor all local listen ports
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:197
-msgid "lucistatistics_collectdtcpconns_listeningports"
+msgid "Monitor all local listen ports"
 msgstr ""
 
 #. Monitor local ports
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:198
-msgid "lucistatistics_collectdtcpconns_localports"
+msgid "Monitor local ports"
 msgstr ""
 
 #. 0 - 65535; multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:199
-msgid "lucistatistics_collectdtcpconns_localports_desc"
+msgid "0 - 65535; multiple separated by space"
 msgstr ""
 
 #. Monitor remote ports
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:200
-msgid "lucistatistics_collectdtcpconns_remoteports"
+msgid "Monitor remote ports"
 msgstr ""
 
 #. 0 - 65535; multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:201
-msgid "lucistatistics_collectdtcpconns_remoteports_desc"
+msgid "0 - 65535; multiple separated by space"
 msgstr ""
 
 #. Unixsock Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:202
-msgid "lucistatistics_collectdunixsock"
+msgid "Unixsock Plugin Configuration"
 msgstr ""
 
 #. The unixsock plugin creates a unix socket which can be used to read collected data from a running collectd instance.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:203
-msgid "lucistatistics_collectdunixsock_desc"
+msgid "The unixsock plugin creates a unix socket which can be used to read collected data from a running collectd instance."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:204
-msgid "lucistatistics_collectdunixsock_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Filepath of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:205
-msgid "lucistatistics_collectdunixsock_socketfile"
+msgid "Filepath of the unix socket"
 msgstr ""
 
 #. Group ownership of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:206
-msgid "lucistatistics_collectdunixsock_socketgroup"
+msgid "Group ownership of the unix socket"
 msgstr ""
 
 #. group name
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:207
-msgid "lucistatistics_collectdunixsock_socketgroup_desc"
+msgid "group name"
 msgstr ""
 
 #. File permissions of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:208
-msgid "lucistatistics_collectdunixsock_socketperms"
+msgid "File permissions of the unix socket"
 msgstr ""
 
 #. octal
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:209
-msgid "lucistatistics_collectdunixsock_socketperms_desc"
+msgid "octal"
 msgstr ""
 
 #. Wireless Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:210
-msgid "lucistatistics_collectdwireless"
+msgid "Wireless Plugin Configuration"
 msgstr ""
 
 #. The wireless plugin collects statistics about wireless signal strength, noise and quality.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:211
-msgid "lucistatistics_collectdwireless_desc"
+msgid "The wireless plugin collects statistics about wireless signal strength, noise and quality."
 msgstr ""
 
 #. Enable this plugin
diff --git a/po/es/sysauth.po b/po/es/sysauth.po
index 86fdc812f..c6c0b108d 100644
--- a/po/es/sysauth.po
+++ b/po/es/sysauth.po
@@ -13,12 +13,12 @@ msgstr ""
 
 #. Authorization Required
 #: i18n/english/luasrc/i18n/sysauth.en.lua:1
-msgid "sysauth_head"
+msgid "Authorization Required"
 msgstr "Autorización requerida"
 
 #. Please enter your username and password.
 #: i18n/english/luasrc/i18n/sysauth.en.lua:2
-msgid "sysauth_prompt"
+msgid "Please enter your username and password."
 msgstr "Por favor ingrese su nombre de usuario y contraseña"
 
 #. Invalid username and/or password! Please try again.
diff --git a/po/es/tinyproxy.po b/po/es/tinyproxy.po
index f9d07efae..9459d909a 100644
--- a/po/es/tinyproxy.po
+++ b/po/es/tinyproxy.po
@@ -13,157 +13,157 @@ msgstr ""
 
 #. Tinyproxy
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:1
-msgid "tinyproxy"
+msgid "Tinyproxy"
 msgstr "Tinyproxy"
 
 #. Tinyproxy is a small and fast non-caching HTTP(S)-Proxy
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:2
-msgid "tinyproxy_desc"
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
 msgstr "Tinyproxy es un pequeño y rápido Proxy de HTTP(S) sin cache"
 
 #. Allow access from
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:3
-msgid "tinyproxy_tinyproxy_allow"
+msgid "Allow access from"
 msgstr "Permitir acceso desde"
 
 #. Allowed headers for anonymous proxy
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:4
-msgid "tinyproxy_tinyproxy_anonymous"
+msgid "Allowed headers for anonymous proxy"
 msgstr "Encabezados permitidos de proxies anónimos"
 
 #. Bind outgoing traffic to address
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:5
-msgid "tinyproxy_tinyproxy_bind"
+msgid "Bind outgoing traffic to address"
 msgstr "Ligar tráfico de salida a la dirección"
 
 #. Ports allowed for CONNECT method
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:6
-msgid "tinyproxy_tinyproxy_connectport"
+msgid "Ports allowed for CONNECT method"
 msgstr "Puertos permitidos para el método CONNECT"
 
 #. 0 = disabled, empty = all
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:7
-msgid "tinyproxy_tinyproxy_connectport_desc"
+msgid "0 = disabled, empty = all"
 msgstr "0 = Deshabilitado, vacío = todos"
 
 #. Error document
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:8
-msgid "tinyproxy_tinyproxy_defaulterrorfile"
+msgid "Error document"
 msgstr "Error en documento"
 
 #. Filter list
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:9
-msgid "tinyproxy_tinyproxy_filter"
+msgid "Filter list"
 msgstr "Lista de filtros"
 
 #. Case sensitive filters
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:10
-msgid "tinyproxy_tinyproxy_filtercasesensitive"
+msgid "Case sensitive filters"
 msgstr "Filtros de mayúsculas y minúsculas "
 
 #. Filter list is a whitelist
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:11
-msgid "tinyproxy_tinyproxy_filterdefaultdeny"
+msgid "Filter list is a whitelist"
 msgstr "La Lista de Filtros es una lista blanca"
 
 #. Extended regular expression filters
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:12
-msgid "tinyproxy_tinyproxy_filterextended"
+msgid "Extended regular expression filters"
 msgstr "Filtros extendido para expresiones regulares"
 
 #. Filter URLs instead of domains
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:13
-msgid "tinyproxy_tinyproxy_filterurls"
+msgid "Filter URLs instead of domains"
 msgstr "Filtrar URLs en vez de dominios"
 
 #. Listen on address
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:14
-msgid "tinyproxy_tinyproxy_listen"
+msgid "Listen on address"
 msgstr "Escuchar en dirección"
 
 #. Logfile
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:15
-msgid "tinyproxy_tinyproxy_logfile"
+msgid "Logfile"
 msgstr "Logfile"
 
 #. Log level
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:16
-msgid "tinyproxy_tinyproxy_loglevel"
+msgid "Log level"
 msgstr "Nivel de LOG"
 
 #. Maximum number of clients
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:17
-msgid "tinyproxy_tinyproxy_maxclients"
+msgid "Maximum number of clients"
 msgstr "Número máximo de clientes"
 
 #. Maximum requests per thread
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:18
-msgid "tinyproxy_tinyproxy_maxrequestsperchild"
+msgid "Maximum requests per thread"
 msgstr "Máximas peticiones por hilo"
 
 #. Max. spare servers
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:19
-msgid "tinyproxy_tinyproxy_maxspareservers"
+msgid "Max. spare servers"
 msgstr "Máxima cantidad de servidores de \"repuestos\""
 
 #. Min. spare servers
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:20
-msgid "tinyproxy_tinyproxy_minspareservers"
+msgid "Min. spare servers"
 msgstr "Mínima cantidad de servidores de \"repuestos\""
 
 #. Spare servers to start with
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:21
-msgid "tinyproxy_tinyproxy_startservers"
+msgid "Spare servers to start with"
 msgstr "Spare servers to start with"
 
 #. Statistic document
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:22
-msgid "tinyproxy_tinyproxy_statfile"
+msgid "Statistic document"
 msgstr "Documento de estadística"
 
 #. Write to syslog
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:23
-msgid "tinyproxy_tinyproxy_syslog"
+msgid "Write to syslog"
 msgstr "Escribir al syslog"
 
 #. Connection Timeout
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:24
-msgid "tinyproxy_tinyproxy_timeout"
+msgid "Connection Timeout"
 msgstr "Tiempo agotado para la conexión"
 
 #. Value of Via-Header
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:25
-msgid "tinyproxy_tinyproxy_viaproxyname"
+msgid "Value of Via-Header"
 msgstr "Valor para Via-Header"
 
 #. Include client IP
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:26
-msgid "tinyproxy_tinyproxy_xtinyproxy"
+msgid "Include client IP"
 msgstr "Incluir IP del cliente"
 
 #. Via proxy
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:27
-msgid "tinyproxy_type_proxy"
+msgid "Via proxy"
 msgstr "Via proxy"
 
 #. Reject access
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:28
-msgid "tinyproxy_type_reject"
+msgid "Reject access"
 msgstr "Rechazar acceso"
 
 #. Upstream Control
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:29
-msgid "tinyproxy_upstream"
+msgid "Upstream Control"
 msgstr "Control de subida (upstream)"
 
 #. Target host
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:30
-msgid "tinyproxy_upstream_target"
+msgid "Target host"
 msgstr "Host de destino "
 
 #. Type
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:31
-msgid "tinyproxy_upstream_type"
+msgid "Type"
 msgstr "Tipo"
 
 #. Upstream Proxy
diff --git a/po/es/upnp.po b/po/es/upnp.po
index b5be1982b..2c2ee15e2 100644
--- a/po/es/upnp.po
+++ b/po/es/upnp.po
@@ -13,36 +13,36 @@ msgstr ""
 
 #. Universal Plug &amp; Play
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:1
-msgid "upnpd"
+msgid "Universal Plug & Play"
 msgstr "Universal Plug &amp;amp; Play"
 
 #. UPNP allows clients in the local network to automatically configure the router.
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:2
-msgid "upnpd_desc"
+msgid "UPNP allows clients in the local network to automatically configure the router."
 msgstr ""
 "UPNP permite a los clientes conectados a la red local configurar "
 "automáticamente el ruteador (router)."
 
 #. UPNP should only be enabled if absolutely necessary as it can result in high security risks for your network.
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:3
-msgid "upnpd_config_desc"
+msgid "UPNP should only be enabled if absolutely necessary as it can result in high security risks for your network."
 msgstr ""
 "UPNP sólo deberia habilitarse si es abasolutamente necesario ya que puede "
 "comprometer la seguridad de su red."
 
 #. Enable secure mode
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:4
-msgid "upnpd_config_securemode"
+msgid "Enable secure mode"
 msgstr "Habilitar modo seguro"
 
 #. Log output
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:5
-msgid "upnpd_config_logoutput"
+msgid "Log output"
 msgstr "Loguear salida"
 
 #. Downlink
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:6
-msgid "upnpd_config_download"
+msgid "Downlink"
 msgstr "Enlace de bajada (downlink)"
 
 #. Uplink
diff --git a/po/es/ushare.po b/po/es/ushare.po
index 1e5884de1..1a9a2a9a7 100644
--- a/po/es/ushare.po
+++ b/po/es/ushare.po
@@ -13,37 +13,37 @@ msgstr ""
 
 #. Content directories
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:1
-msgid "content_directories"
+msgid "Content directories"
 msgstr "Directorios de contenido"
 
 #. Disable telnet console
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:2
-msgid "disable_telnet"
+msgid "Disable telnet console"
 msgstr "Deshabilitar consola telnet"
 
 #. Disable webinterface
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:3
-msgid "disable_webif"
+msgid "Disable webinterface"
 msgstr "Deshabilitar interfaz web"
 
 #. Options
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:4
-msgid "options"
+msgid "Options"
 msgstr "Opciones"
 
 #. Servername
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:5
-msgid "servername"
+msgid "Servername"
 msgstr "Nombre del Servidor (Servername)"
 
 #. Settings
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:6
-msgid "settings"
+msgid "Settings"
 msgstr "Configuración"
 
 #. uShare
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:7
-msgid "ushare"
+msgid "uShare"
 msgstr "uShare"
 
 #. uShare
diff --git a/po/es/uvc_streamer.po b/po/es/uvc_streamer.po
index a6642a8a7..4344456b8 100644
--- a/po/es/uvc_streamer.po
+++ b/po/es/uvc_streamer.po
@@ -13,22 +13,22 @@ msgstr ""
 
 #. Frames per second
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
-msgid "framespersecond"
+msgid "Frames per second"
 msgstr "Cuadros por segundo"
 
 #. Resolution
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
-msgid "resolution"
+msgid "Resolution"
 msgstr "Resolución"
 
 #. Settings
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
-msgid "settings"
+msgid "Settings"
 msgstr "Configuraciones"
 
 #. Webcam streaming
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
-msgid "uvc_streamer"
+msgid "Webcam streaming"
 msgstr "Transmitir via webcam"
 
 #. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
diff --git a/po/es/uvl.po b/po/es/uvl.po
index 42a1d2d5f..cc20fb45b 100644
--- a/po/es/uvl.po
+++ b/po/es/uvl.po
@@ -13,232 +13,232 @@ msgstr ""
 
 #. Unable to load config \"%p\": %1
 #: libs/uvl/luasrc/i18n/uvl.en.lua:1
-msgid "uvl_err_uciload"
+msgid "Unable to load config \"%p\": %1"
 msgstr "No se puede cargar la configuración \"%p\": %1"
 
 #. Error in scheme \"%p\":\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:2
-msgid "uvl_err_scheme"
+msgid "Error in scheme \"%p\":\\n%c"
 msgstr ""
 "Error en el esquema \"%p\":\n"
 "%c"
 
 #. Error in config \"%p\":\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:3
-msgid "uvl_err_config"
+msgid "Error in config \"%p\":\\n%c"
 msgstr ""
 "Error en la configuración \"%p\":\n"
 "%c"
 
 #. Error in section \"%i\" (%I):\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:4
-msgid "uvl_err_section"
+msgid "Error in section \"%i\" (%I):\\n%c"
 msgstr ""
 "Error en la sección \"%i\" (%I):\n"
 "%c"
 
 #. Error in option \"%i\" (%I):\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:5
-msgid "uvl_err_option"
+msgid "Error in option \"%i\" (%I):\\n%c"
 msgstr ""
 "Error en la opción \"%i\" (%I):\n"
 "%c"
 
 #. Option \"%i\" has invalid reference specification %1:\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:6
-msgid "uvl_err_reference"
+msgid "Option \"%i\" has invalid reference specification %1:\\n%c"
 msgstr ""
 "La opción \"%i\" posee una referencia inválida para la especificación %1:\n"
 "%c"
 
 #. In dependency check for %t \"%i\":\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:7
-msgid "uvl_err_dependency"
+msgid "In dependency check for %t \"%i\":\\n%c"
 msgstr ""
 "Dependencia no verificada para for %t \"%i\":\n"
 "%c"
 
 #. Can not find scheme \"%p\" in \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:8
-msgid "uvl_err_sme_find"
+msgid "Can not find scheme \"%p\" in \"%1\""
 msgstr "No se puede encontrar el esquema \"%p\" in \"%1\""
 
 #. Can not access file \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:9
-msgid "uvl_err_sme_read"
+msgid "Can not access file \"%1\""
 msgstr "No se puede acceder al archivo \"%1\""
 
 #. Missing required scheme field \"%1\" in \"%i\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:10
-msgid "uvl_err_sme_reqfld"
+msgid "Missing required scheme field \"%1\" in \"%i\""
 msgstr "No se encuentra el campo \"%1\" requerido en el esquema \"%i\""
 
 #. Illegal reference \"%1\" to an anonymous section
 #: libs/uvl/luasrc/i18n/uvl.en.lua:11
-msgid "uvl_err_sme_invref"
+msgid "Illegal reference \"%1\" to an anonymous section"
 msgstr "Referecia Ilegal \"%1\" a una sección anómina"
 
 #. Malformed reference in \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:12
-msgid "uvl_err_sme_badref"
+msgid "Malformed reference in \"%1\""
 msgstr "Referencia mal confeccioanda en \"%1\""
 
 #. Malformed dependency specification \"%1\" in \"%i\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:13
-msgid "uvl_err_sme_baddep"
+msgid "Malformed dependency specification \"%1\" in \"%i\""
 msgstr "Especificación de depedencia \"%1\" mal confeccionada en \"%i\""
 
 #. Malformed validator specification \"%1\" in \"%i\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:14
-msgid "uvl_err_sme_badval"
+msgid "Malformed validator specification \"%1\" in \"%i\""
 msgstr "Especificación del validador \"%1\" mal confeccionado en \"%i\""
 
 #. External validator \"%1\" failed: %2
 #: libs/uvl/luasrc/i18n/uvl.en.lua:15
-msgid "uvl_err_sme_errval"
+msgid "External validator \"%1\" failed: %2"
 msgstr "Falló Validación \"%1\" externa: %2"
 
 #. Variable \"%o\" in scheme \"%p\" references unknown package \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:16
-msgid "uvl_err_sme_vbadpack"
+msgid "Variable \"%o\" in scheme \"%p\" references unknown package \"%1\""
 msgstr ""
 "La variable \"%o\" en el esquema \"%p\" hace referencia a un paquete desconocido "
 "\"%1\""
 
 #. Variable \"%o\" in scheme \"%p\" references unknown section \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:17
-msgid "uvl_err_sme_vbadsect"
+msgid "Variable \"%o\" in scheme \"%p\" references unknown section \"%1\""
 msgstr ""
 "La variable \"%o\" en el esquema \"%p\" hace referencia a una sección "
 "desconocida \"%1\""
 
 #. Enum \"%v\" in scheme \"%p\" references unknown package \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:18
-msgid "uvl_err_sme_ebadpack"
+msgid "Enum \"%v\" in scheme \"%p\" references unknown package \"%1\""
 msgstr ""
 "Enumerador \"%v\" en el esquema \"%p\" hace referencia a un paquete desconocido "
 "\"%1\""
 
 #. Enum \"%v\" in scheme \"%p\" references unknown section \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:19
-msgid "uvl_err_sme_ebadsect"
+msgid "Enum \"%v\" in scheme \"%p\" references unknown section \"%1\""
 msgstr ""
 "Enumerador \"%v\" en el esquema \"%p\" hace referencia a una sección desconocida "
 "\"%1\""
 
 #. Enum \"%v\" in scheme \"%p\" references unknown option \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:20
-msgid "uvl_err_sme_ebadopt"
+msgid "Enum \"%v\" in scheme \"%p\" references unknown option \"%1\""
 msgstr ""
 "Enumerador \"%v\" en el esquema \"%p\" hace referencia a una opción desconocida "
 "\"%1\""
 
 #. Enum \"%v\" in scheme \"%p\" references non-enum option \"%p.%s.%o\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:21
-msgid "uvl_err_sme_ebadtype"
+msgid "Enum \"%v\" in scheme \"%p\" references non-enum option \"%p.%s.%o\""
 msgstr ""
 "Enumerador \"%v\" en el esquema \"%p\" hace referencia a una opción no numerable "
 "\"%p.%s.%o\""
 
 #. Enum \"%v\" in scheme \"%p\" redeclares the default value of \"%p.%s.%o\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:22
-msgid "uvl_err_sme_ebaddef"
+msgid "Enum \"%v\" in scheme \"%p\" redeclares the default value of \"%p.%s.%o\""
 msgstr ""
 "Enumerador \"%v\" en el esquema \"%p\" redefine el valor por defecto de "
 "\"%p.%s.%o\""
 
 #. Section \"%i\" (%I) not found in scheme
 #: libs/uvl/luasrc/i18n/uvl.en.lua:23
-msgid "uvl_err_sect_unknown"
+msgid "Section \"%i\" (%I) not found in scheme"
 msgstr "La Sección \"%i\" (%I) no se encuentra en el esquema"
 
 #. Required section \"%p.%s\" not found in config
 #: libs/uvl/luasrc/i18n/uvl.en.lua:24
-msgid "uvl_err_sect_required"
+msgid "Required section \"%p.%s\" not found in config"
 msgstr "Sección requerida \"%p.%s\" no se encuentra en la configuración (config)"
 
 #. Unique section \"%p.%s\" occurs multiple times in config
 #: libs/uvl/luasrc/i18n/uvl.en.lua:25
-msgid "uvl_err_sect_unique"
+msgid "Unique section \"%p.%s\" occurs multiple times in config"
 msgstr ""
 "La sección (unique) \"%p.%s\" se encuentra definida varias veces en el archivo "
 "de configuración"
 
 #. The section of type \"%p.%s\" is stored anonymously in config but must be named
 #: libs/uvl/luasrc/i18n/uvl.en.lua:26
-msgid "uvl_err_sect_named"
+msgid "The section of type \"%p.%s\" is stored anonymously in config but must be named"
 msgstr ""
 "El tipo de sección \"%p.%s\" es almacenada anónimamente en el archivo de "
 "configuración pero debe ser renombrada"
 
 #. Section \"%p.%s\" not found in config
 #: libs/uvl/luasrc/i18n/uvl.en.lua:27
-msgid "uvl_err_sect_notfound"
+msgid "Section \"%p.%s\" not found in config"
 msgstr "La Sección \"%p.%s\" no se encuentra en el archivo de configuración"
 
 #. Option \"%i\" (%I) not found in scheme
 #: libs/uvl/luasrc/i18n/uvl.en.lua:28
-msgid "uvl_err_opt_unknown"
+msgid "Option \"%i\" (%I) not found in scheme"
 msgstr "La Opción \"%i\" (%I) no se encuentra en el esquema"
 
 #. Required option \"%i\" has no value
 #: libs/uvl/luasrc/i18n/uvl.en.lua:29
-msgid "uvl_err_opt_required"
+msgid "Required option \"%i\" has no value"
 msgstr "No se ha ingresado un valor correcto para la Opción requerida \"%i\""
 
 #. Value \"%1\" of option \"%i\" is not defined in enum %2
 #: libs/uvl/luasrc/i18n/uvl.en.lua:30
-msgid "uvl_err_opt_badvalue"
+msgid "Value \"%1\" of option \"%i\" is not defined in enum %2"
 msgstr ""
 "El valor \"%1\" de la opción \"%i\" no se ha sido definido en el enumerador %2"
 
 #. Value \"%1\" of option \"%i\" does not validate as datatype \"%2\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:31
-msgid "uvl_err_opt_invvalue"
+msgid "Value \"%1\" of option \"%i\" does not validate as datatype \"%2\""
 msgstr ""
 "El valor \"%1\" de la opción \"%i\" no se valida como un tipo de dato (datatype) "
 "\"%2\""
 
 #. Option \"%i\" is defined as list but stored as plain value
 #: libs/uvl/luasrc/i18n/uvl.en.lua:32
-msgid "uvl_err_opt_notlist"
+msgid "Option \"%i\" is defined as list but stored as plain value"
 msgstr ""
 "La \"%i\" está definida como una lista pero es almacenado como un valor plano"
 
 #. Option \"%i\" has unknown datatype \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:33
-msgid "uvl_err_opt_datatype"
+msgid "Option \"%i\" has unknown datatype \"%1\""
 msgstr "La opción \"%i\" tiene un tipo de dato (datatype)  \"%1\" desconocido"
 
 #. Option \"%p.%s.%o\" not found in config
 #: libs/uvl/luasrc/i18n/uvl.en.lua:34
-msgid "uvl_err_opt_notfound"
+msgid "Option \"%p.%s.%o\" not found in config"
 msgstr "Opción \"%p.%s.%o\" no encontrada en archivo de configuración"
 
 #. Dependency (%1) failed:\noption \"%i\" is not eqal \"%2\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:35
-msgid "uvl_err_dep_notequal"
+msgid "Dependency (%1) failed:\\noption \"%i\" is not eqal \"%2\""
 msgstr ""
 "Error en la dependencia (%1) :\n"
 " la opción \"%i\" no es igual a \"%2\""
 
 #. Dependency (%1) failed:\noption \"%i\" has no value
 #: libs/uvl/luasrc/i18n/uvl.en.lua:36
-msgid "uvl_err_dep_novalue"
+msgid "Dependency (%1) failed:\\noption \"%i\" has no value"
 msgstr ""
 "Error en la dependencia (%1) :\n"
 " la opción \"%i\" no tiene un valor válido"
 
 #. Dependency (%1) failed:\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:37
-msgid "uvl_err_dep_notvalid"
+msgid "Dependency (%1) failed:\\n%c"
 msgstr ""
 "Error en la dependencia (%1) :\n"
 "%c"
 
 #. Recursive dependency for option \"%i\" detected
 #: libs/uvl/luasrc/i18n/uvl.en.lua:38
-msgid "uvl_err_dep_recursive"
+msgid "Recursive dependency for option \"%i\" detected"
 msgstr ""
 "Se ha detectado una repedencia definida recursivamente para la opción \"%i\" "
 
diff --git a/po/es/wifi.po b/po/es/wifi.po
index 3d74d2d6f..deb155de5 100644
--- a/po/es/wifi.po
+++ b/po/es/wifi.po
@@ -13,193 +13,193 @@ msgstr ""
 
 #. auto
 #: i18n/english/luasrc/i18n/wifi.en.lua:1
-msgid "wifi_auto"
+msgid "auto"
 msgstr "auto"
 
 #. Frequency Hopping
 #: i18n/english/luasrc/i18n/wifi.en.lua:2
-msgid "wifi_fh"
+msgid "Frequency Hopping"
 msgstr "Saltos de Frecuencia"
 
 #. Diversity
 #: i18n/english/luasrc/i18n/wifi.en.lua:3
-msgid "wifi_diversity"
+msgid "Diversity"
 msgstr "Diversidad (MIMO)"
 
 #. Transmitter Antenna
 #: i18n/english/luasrc/i18n/wifi.en.lua:4
-msgid "wifi_txantenna"
+msgid "Transmitter Antenna"
 msgstr "Antena Transmisora"
 
 #. Receiver Antenna
 #: i18n/english/luasrc/i18n/wifi.en.lua:5
-msgid "wifi_rxantenna"
+msgid "Receiver Antenna"
 msgstr "Antena Receptora"
 
 #. Distance Optimization
 #: i18n/english/luasrc/i18n/wifi.en.lua:6
-msgid "wifi_distance"
+msgid "Distance Optimization"
 msgstr "Optimización de Distancia"
 
 #. Distance to farthest network member in meters.
 #: i18n/english/luasrc/i18n/wifi.en.lua:7
-msgid "wifi_distance_desc"
+msgid "Distance to farthest network member in meters."
 msgstr "Distancia al miembro de la red mas lejana en metros."
 
 #. MAC-Address Filter
 #: i18n/english/luasrc/i18n/wifi.en.lua:8
-msgid "wifi_macpolicy"
+msgid "MAC-Address Filter"
 msgstr "Filtro por dirección MAC"
 
 #. Allow listed only
 #: i18n/english/luasrc/i18n/wifi.en.lua:9
-msgid "wifi_whitelist"
+msgid "Allow listed only"
 msgstr "Permitir a los pertenecientes en la lista"
 
 #. Allow all except listed
 #: i18n/english/luasrc/i18n/wifi.en.lua:10
-msgid "wifi_blacklist"
+msgid "Allow all except listed"
 msgstr "Permitir a todos excepto a los de la lista"
 
 #. MAC-List
 #: i18n/english/luasrc/i18n/wifi.en.lua:11
-msgid "wifi_maclist"
+msgid "MAC-List"
 msgstr "Lista de direcciones MAC"
 
 # It should be "Frame Bursting" at once!
 #. Frame Bursting
 #: i18n/english/luasrc/i18n/wifi.en.lua:12
-msgid "wifi_bursting"
+msgid "Frame Bursting"
 msgstr "Marco de Ruptura"
 
 #. Regulatory Domain
 #: i18n/english/luasrc/i18n/wifi.en.lua:13
-msgid "wifi_regdomain"
+msgid "Regulatory Domain"
 msgstr "Dominio Regulador"
 
 #. Country Code
 #: i18n/english/luasrc/i18n/wifi.en.lua:14
-msgid "wifi_country"
+msgid "Country Code"
 msgstr "Código de País"
 
 #. Outdoor Channels
 #: i18n/english/luasrc/i18n/wifi.en.lua:15
-msgid "wifi_outdoor"
+msgid "Outdoor Channels"
 msgstr "Canales al aire libre"
 
 #. Connection Limit
 #: i18n/english/luasrc/i18n/wifi.en.lua:16
-msgid "wifi_maxassoc"
+msgid "Connection Limit"
 msgstr "Límite de Conexión"
 
 #. <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:17
-msgid "wifi_essid"
+msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
 #. <abbr title=\"Basic Service Set Identifier\">BSSID</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:18
-msgid "wifi_bssid"
+msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 
 #. Fragmentation Threshold
 #: i18n/english/luasrc/i18n/wifi.en.lua:19
-msgid "wifi_frag"
+msgid "Fragmentation Threshold"
 msgstr "Umbral de Fragmentación"
 
 #. RTS/CTS Threshold
 #: i18n/english/luasrc/i18n/wifi.en.lua:20
-msgid "wifi_rts"
+msgid "RTS/CTS Threshold"
 msgstr "Umbral RTS / CTS"
 
 #. <abbr title=\"Wireless Distribution System\">WDS</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:21
-msgid "wifi_wds"
+msgid "<abbr title=\"Wireless Distribution System\">WDS</abbr>"
 msgstr "<abbr title=\"Wireless Distribution System\">WDS</abbr>"
 
 #. Separate WDS
 #: i18n/english/luasrc/i18n/wifi.en.lua:22
-msgid "wifi_wdssep"
+msgid "Separate WDS"
 msgstr "WDS Separado"
 
 #. Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:23
-msgid "wifi_hidden"
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "Ocultar <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
 #. Isolate Clients
 #: i18n/english/luasrc/i18n/wifi.en.lua:24
-msgid "wifi_isloate"
+msgid "Isolate Clients"
 msgstr "Aislar Clientes"
 
 #. Prevent Client to Client Communication
 #: i18n/english/luasrc/i18n/wifi.en.lua:25
-msgid "wifi_isloate_desc"
+msgid "Prevent Client to Client Communication"
 msgstr "Prevenir la comunicación Cliente a Cliente"
 
 #. Background Scan
 #: i18n/english/luasrc/i18n/wifi.en.lua:26
-msgid "wifi_bgscan"
+msgid "Background Scan"
 msgstr "Background Scan"
 
 #. Transmission Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:27
-msgid "wifi_rate"
+msgid "Transmission Rate"
 msgstr "Tasa de Transmisión"
 
 #. Multicast Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:28
-msgid "wifi_mcast_rate"
+msgid "Multicast Rate"
 msgstr "Multicast Rate"
 
 #. Minimum Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:29
-msgid "wifi_minrate"
+msgid "Minimum Rate"
 msgstr "Taza Mínima de Transmisión"
 
 #. Maximum Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:30
-msgid "wifi_maxrate"
+msgid "Maximum Rate"
 msgstr "Taza Máxima de Transmisión"
 
 #. Compression
 #: i18n/english/luasrc/i18n/wifi.en.lua:31
-msgid "wifi_compression"
+msgid "Compression"
 msgstr "Compresión"
 
 #. Turbo Mode
 #: i18n/english/luasrc/i18n/wifi.en.lua:32
-msgid "wifi_turbo"
+msgid "Turbo Mode"
 msgstr "Modo Turbo"
 
 #. Fast Frames
 #: i18n/english/luasrc/i18n/wifi.en.lua:33
-msgid "wifi_ff"
+msgid "Fast Frames"
 msgstr "Marcos rápido "
 
 #. WMM Mode
 #: i18n/english/luasrc/i18n/wifi.en.lua:34
-msgid "wifi_wmm"
+msgid "WMM Mode"
 msgstr "Modo WMM"
 
 #. XR Support
 #: i18n/english/luasrc/i18n/wifi.en.lua:35
-msgid "wifi_xr"
+msgid "XR Support"
 msgstr "Soporte a XR (eXtended Range)"
 
 #. AR Support
 #: i18n/english/luasrc/i18n/wifi.en.lua:36
-msgid "wifi_ar"
+msgid "AR Support"
 msgstr "Soporte a AR"
 
 #. Disable HW-Beacon timer
 #: i18n/english/luasrc/i18n/wifi.en.lua:37
-msgid "wifi_nosbeacon"
+msgid "Disable HW-Beacon timer"
 msgstr "Desactivar el temporizador del Beacon de Hardware (HW-Beacon timer) "
 
 #. Do not send probe responses
 #: i18n/english/luasrc/i18n/wifi.en.lua:38
-msgid "wifi_noprobereq"
+msgid "Do not send probe responses"
 msgstr "No enviar respuestas de prueba"
 
 #. WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP and ad-hoc mode) to be installed.
diff --git a/po/fr/admin-core.po b/po/fr/admin-core.po
index c3c6294c9..751cf778f 100644
--- a/po/fr/admin-core.po
+++ b/po/fr/admin-core.po
@@ -14,22 +14,22 @@ msgstr ""
 
 #. The following changes have been applied
 #: i18n/english/luasrc/i18n/admin-core.en.lua:1
-msgid "uci_applied"
+msgid "The following changes have been applied"
 msgstr "Les changements suivants ont été appliqués"
 
 #. The following changes have been reverted
 #: i18n/english/luasrc/i18n/admin-core.en.lua:2
-msgid "uci_reverted"
+msgid "The following changes have been reverted"
 msgstr "Les changements suivants ont été annulés"
 
 #. User Interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:3
-msgid "a_i_ui"
+msgid "User Interface"
 msgstr "Interface utilisateur"
 
 #. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a collection of free Lua software including an <abbr title=\"Model-View-Controller\">MVC</abbr>-Webframework and webinterface for embedded devices. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is licensed under the Apache-License.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:4
-msgid "c_lucidesc"
+msgid "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a collection of free Lua software including an <abbr title=\"Model-View-Controller\">MVC</abbr>-Webframework and webinterface for embedded devices. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is licensed under the Apache-License."
 msgstr ""
 "LuCI est une suite logicielle d'applications Lua software incluant un MVC-"
 "Webframework et une interface web pour équipements embarqués. Luci est sous "
@@ -37,766 +37,766 @@ msgstr ""
 
 #. Project Homepage
 #: i18n/english/luasrc/i18n/admin-core.en.lua:5
-msgid "c_projecthome"
+msgid "Project Homepage"
 msgstr "Page d'accueil du projet"
 
 #. Lead Development
 #: i18n/english/luasrc/i18n/admin-core.en.lua:6
-msgid "c_leaddev"
+msgid "Lead Development"
 msgstr "Développeurs principaux"
 
 #. Contributing Developers
 #: i18n/english/luasrc/i18n/admin-core.en.lua:7
-msgid "c_contributors"
+msgid "Contributing Developers"
 msgstr "Contributeurs"
 
 #. Thanks To
 #: i18n/english/luasrc/i18n/admin-core.en.lua:8
-msgid "c_thanksto"
+msgid "Thanks To"
 msgstr "Merci à"
 
 #. Hello!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:9
-msgid "a_i_i_hello"
+msgid "Hello!"
 msgstr "Bonjour !"
 
 #. This is the administration area of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:10
-msgid "a_i_i_admin1"
+msgid "This is the administration area of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>."
 msgstr "Voici la page d'administration de LuCI."
 
 #. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a free, flexible, and user friendly graphical interface for configuring OpenWrt Kamikaze.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:11
-msgid "a_i_i_admin2"
+msgid "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a free, flexible, and user friendly graphical interface for configuring OpenWrt Kamikaze."
 msgstr ""
 "LuCI est une interface graphique libre, flexible, et user friendly pour "
 "configurer OpenWrt Kamikaze."
 
 #. On the following pages you can adjust all important settings of your router.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:12
-msgid "a_i_i_admin3"
+msgid "On the following pages you can adjust all important settings of your router."
 msgstr ""
 "Dans les pages suivantes vous pouvez ajuster tous les réglages importants de "
 "votre routeur."
 
 #. Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> changes have to be confirmed by clicking Changes - Save &amp; Apply before being applied.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:13
-msgid "a_i_i_admin4"
+msgid "Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> changes have to be confirmed by clicking Changes - Save & Apply before being applied."
 msgstr ""
 "Vous trouverez une page de navigation sur le côté gauche permettant "
 "d'accèder aux différentes pages de configuration."
 
 #. As we always want to improve this interface we are looking forward to your feedback and suggestions.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:14
-msgid "a_i_i_admin5"
+msgid "As we always want to improve this interface we are looking forward to your feedback and suggestions."
 msgstr ""
 "Nous souhaitons améliorer l'interface de manière permanente, vos retours et "
 "suggestions sont primordiaux."
 
 #. And now have fun with your router!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:15
-msgid "a_i_i_admin6"
+msgid "And now have fun with your router!"
 msgstr "Et maintenant que la fête commence !"
 
 #. The <abbr title=\"Lua Configuration Interface\">LuCI</abbr> Team
 #: i18n/english/luasrc/i18n/admin-core.en.lua:16
-msgid "a_i_i_team"
+msgid "The <abbr title=\"Lua Configuration Interface\">LuCI</abbr> Team"
 msgstr "L'équipe LuCI"
 
 #. Here you can customize the settings and the functionality of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:17
-msgid "a_i_luci1"
+msgid "Here you can customize the settings and the functionality of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>."
 msgstr ""
 "Ici, vous pouvez personnaliser les réglages et les fonctionnalités de LuCI."
 
 #. Post-commit actions
 #: i18n/english/luasrc/i18n/admin-core.en.lua:18
-msgid "a_i_ucicommit"
+msgid "Post-commit actions"
 msgstr "Actions post-changements"
 
 #. These commands will be executed automatically when a given <abbr title=\"Unified Configuration Interface\">UCI</abbr> configuration is committed allowing changes to be applied instantly.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:19
-msgid "a_i_ucicommit1"
+msgid "These commands will be executed automatically when a given <abbr title=\"Unified Configuration Interface\">UCI</abbr> configuration is committed allowing changes to be applied instantly."
 msgstr ""
 "Ces commandes seront executées automatiquement lorsqu'une configuration UCI "
 "est appliquée, les changement prenant effet immédiatement."
 
 #. Files to be kept when flashing a new firmware
 #: i18n/english/luasrc/i18n/admin-core.en.lua:20
-msgid "a_i_keepflash"
+msgid "Files to be kept when flashing a new firmware"
 msgstr "Fichiers à conserver lors d'une mise à jour du firmware"
 
 #. When flashing a new firmware with <abbr title=\"Lua Configuration Interface\">LuCI</abbr> these files will be added to the new firmware installation.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:21
-msgid "a_i_keepflash1"
+msgid "When flashing a new firmware with <abbr title=\"Lua Configuration Interface\">LuCI</abbr> these files will be added to the new firmware installation."
 msgstr ""
 "Lors d'une nouvelle installation, ces fichiers seront ajoutés à la nouvelle "
 "installation."
 
 #. Here you can find information about the current system status like <abbr title=\"Central Processing Unit\">CPU</abbr> clock frequency, memory usage or network interface data.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:22
-msgid "a_st_i_status1"
+msgid "Here you can find information about the current system status like <abbr title=\"Central Processing Unit\">CPU</abbr> clock frequency, memory usage or network interface data."
 msgstr ""
 "Ici, vous trouverez des informations sur l'état actuel du système comme la "
 "fréquence processeur, utilisation mémoire et trafic réseau."
 
 #. Also kernel or service logfiles can be viewed here to get an overview over their current state.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:23
-msgid "a_st_i_status2"
+msgid "Also kernel or service logfiles can be viewed here to get an overview over their current state."
 msgstr ""
 "Les journaux des services ou du noyau peuvent être vus ici afin d'obtenir un "
 "aperçu de leur état."
 
 #. <abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan
 #: i18n/english/luasrc/i18n/admin-core.en.lua:24
-msgid "iwscan"
+msgid "<abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan"
 msgstr "Scan WLAN"
 
 #. Wifi networks in your local environment
 #: i18n/english/luasrc/i18n/admin-core.en.lua:25
-msgid "iwscan1"
+msgid "Wifi networks in your local environment"
 msgstr "Réseaux Wi-Fi dans votre environnement"
 
 #. <abbr title=\"Encrypted\">Encr.</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:26
-msgid "iwscan_encr"
+msgid "<abbr title=\"Encrypted\">Encr.</abbr>"
 msgstr "Chiffrement"
 
 #. Link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:27
-msgid "iwscan_link"
+msgid "Link"
 msgstr "Lien"
 
 #. Signal
 #: i18n/english/luasrc/i18n/admin-core.en.lua:28
-msgid "iwscan_signal"
+msgid "Signal"
 msgstr "Signal"
 
 #. Noise
 #: i18n/english/luasrc/i18n/admin-core.en.lua:29
-msgid "iwscan_noise"
+msgid "Noise"
 msgstr "Bruit"
 
 #. Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:30
-msgid "routes"
+msgid "Routes"
 msgstr "Routes"
 
 #. Netmask
 #: i18n/english/luasrc/i18n/admin-core.en.lua:31
-msgid "routes_netmask"
+msgid "Netmask"
 msgstr "Masque réseau"
 
 #. Gateway
 #: i18n/english/luasrc/i18n/admin-core.en.lua:32
-msgid "routes_gateway"
+msgid "Gateway"
 msgstr "Passerelle"
 
 #. Metric
 #: i18n/english/luasrc/i18n/admin-core.en.lua:33
-msgid "routes_metric"
+msgid "Metric"
 msgstr "Metrique"
 
 #. Here you can configure the basic aspects of your device like its hostname or the timezone.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:34
-msgid "a_s_desc"
+msgid "Here you can configure the basic aspects of your device like its hostname or the timezone."
 msgstr ""
 "Ici, vous pouvez configurer les aspects basiques de votre routeur comme son "
 "nom ou son fuseau horaire."
 
 #. Software
 #: i18n/english/luasrc/i18n/admin-core.en.lua:35
-msgid "a_s_packages"
+msgid "Software"
 msgstr "Logiciels"
 
 #. Admin Password
 #: i18n/english/luasrc/i18n/admin-core.en.lua:36
-msgid "a_s_changepw"
+msgid "Admin Password"
 msgstr "Mot de passe administrateur"
 
 #. OPKG-Configuration
 #: i18n/english/luasrc/i18n/admin-core.en.lua:37
-msgid "a_s_p_ipkg"
+msgid "OPKG-Configuration"
 msgstr "Configuration OPKG"
 
 #. <abbr title=\"Secure Shell\">SSH</abbr>-Keys
 #: i18n/english/luasrc/i18n/admin-core.en.lua:38
-msgid "a_s_sshkeys"
+msgid "<abbr title=\"Secure Shell\">SSH</abbr>-Keys"
 msgstr "Clés SSH"
 
 #. Mount Points
 #: i18n/english/luasrc/i18n/admin-core.en.lua:39
-msgid "a_s_fstab"
+msgid "Mount Points"
 msgstr "Points de montage"
 
 #. Change settings related to the system itself, its identification, installed hard- and software, authentication or mount points.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:40
-msgid "a_s_i_system1"
+msgid "Change settings related to the system itself, its identification, installed hard- and software, authentication or mount points."
 msgstr ""
 "Changements en rapport avec le système, son identification le "
 "logiciel/matériel installé, l'authentification ou points de montage."
 
 #. These settings define the base of your system.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:41
-msgid "a_s_i_system2"
+msgid "These settings define the base of your system."
 msgstr "Ces réglages définissent la base de votre système."
 
 #. Pay attention as any misconfiguration here may prevent your device from booting or may lock yourself out of it.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:42
-msgid "a_s_i_system3"
+msgid "Pay attention as any misconfiguration here may prevent your device from booting or may lock yourself out of it."
 msgstr ""
 "Soyez vigilent car un mauvais réglage peut empêcher votre équipement de "
 "démarrer, ou vous empêcher de vous y connecter."
 
 #. Interfaces
 #: i18n/english/luasrc/i18n/admin-core.en.lua:43
-msgid "a_s_if"
+msgid "Interfaces"
 msgstr ""
 
 #. Bridge
 #: i18n/english/luasrc/i18n/admin-core.en.lua:44
 #, fuzzy
-msgid "a_s_if_bridge"
+msgid "Bridge"
 msgstr "Bridger les interfaces"
 
 #. ID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:45
 #, fuzzy
-msgid "a_s_if_bridge_id"
+msgid "ID"
 msgstr "Bridger les interfaces"
 
 #. Bridge Port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:46
 #, fuzzy
-msgid "a_s_if_bridge_port"
+msgid "Bridge Port"
 msgstr "Bridger les interfaces"
 
 #. STP
 #: i18n/english/luasrc/i18n/admin-core.en.lua:47
 #, fuzzy
-msgid "a_s_if_bridge_stp"
+msgid "STP"
 msgstr "Bridger les interfaces"
 
 #. Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:48
-msgid "a_s_if_device"
+msgid "Device"
 msgstr ""
 
 #. Ethernet Bridge
 #: i18n/english/luasrc/i18n/admin-core.en.lua:49
 #, fuzzy
-msgid "a_s_if_ethbridge"
+msgid "Ethernet Bridge"
 msgstr "Bridger les interfaces"
 
 #. Ethernet Adapter
 #: i18n/english/luasrc/i18n/admin-core.en.lua:50
-msgid "a_s_if_ethdev"
+msgid "Ethernet Adapter"
 msgstr ""
 
 #. Ethernet Switch
 #: i18n/english/luasrc/i18n/admin-core.en.lua:51
-msgid "a_s_if_ethswitch"
+msgid "Ethernet Switch"
 msgstr ""
 
 #. Interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:52
-msgid "a_s_if_interface"
+msgid "Interface"
 msgstr ""
 
 #. IP Configuration
 #: i18n/english/luasrc/i18n/admin-core.en.lua:53
-msgid "a_s_if_ipconfig"
+msgid "IP Configuration"
 msgstr ""
 
 #. Alias
 #: i18n/english/luasrc/i18n/admin-core.en.lua:54
-msgid "a_s_if_ipconfig_alias"
+msgid "Alias"
 msgstr ""
 
 #. DHCP assigned
 #: i18n/english/luasrc/i18n/admin-core.en.lua:55
-msgid "a_s_if_ipconfig_dhcp"
+msgid "DHCP assigned"
 msgstr ""
 
 #. IPv6
 #: i18n/english/luasrc/i18n/admin-core.en.lua:56
-msgid "a_s_if_ipconfig_ipv6"
+msgid "IPv6"
 msgstr ""
 
 #. Not configured
 #: i18n/english/luasrc/i18n/admin-core.en.lua:57
-msgid "a_s_if_ipconfig_none"
+msgid "Not configured"
 msgstr ""
 
 #. Primary
 #: i18n/english/luasrc/i18n/admin-core.en.lua:58
-msgid "a_s_if_ipconfig_primary"
+msgid "Primary"
 msgstr ""
 
 #. Channel
 #: i18n/english/luasrc/i18n/admin-core.en.lua:59
-msgid "a_s_if_iwchannel"
+msgid "Channel"
 msgstr ""
 
 #. Mode
 #: i18n/english/luasrc/i18n/admin-core.en.lua:60
-msgid "a_s_if_iwmode"
+msgid "Mode"
 msgstr ""
 
 #. Ad-Hoc
 #: i18n/english/luasrc/i18n/admin-core.en.lua:61
-msgid "a_s_if_iwmode_adhoc"
+msgid "Ad-Hoc"
 msgstr ""
 
 #. Pseudo Ad-Hoc
 #: i18n/english/luasrc/i18n/admin-core.en.lua:62
-msgid "a_s_if_iwmode_ahdemo"
+msgid "Pseudo Ad-Hoc"
 msgstr ""
 
 #. Master
 #: i18n/english/luasrc/i18n/admin-core.en.lua:63
-msgid "a_s_if_iwmode_ap"
+msgid "Master"
 msgstr ""
 
 #. Master + WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:64
-msgid "a_s_if_iwmode_apwds"
+msgid "Master + WDS"
 msgstr ""
 
 #. Client
 #: i18n/english/luasrc/i18n/admin-core.en.lua:65
-msgid "a_s_if_iwmode_sta"
+msgid "Client"
 msgstr ""
 
 #. Client + WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:66
-msgid "a_s_if_iwmode_stawds"
+msgid "Client + WDS"
 msgstr ""
 
 #. WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:67
-msgid "a_s_if_iwmode_wds"
+msgid "WDS"
 msgstr ""
 
 #. SSID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:68
-msgid "a_s_if_iwssid"
+msgid "SSID"
 msgstr ""
 
 #. MAC
 #: i18n/english/luasrc/i18n/admin-core.en.lua:69
-msgid "a_s_if_mac"
+msgid "MAC"
 msgstr ""
 
 #. Pkts.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:70
-msgid "a_s_if_pkts"
+msgid "Pkts."
 msgstr ""
 
 #. Interface Status
 #: i18n/english/luasrc/i18n/admin-core.en.lua:71
 #, fuzzy
-msgid "a_s_if_status"
+msgid "Interface Status"
 msgstr ""
 "Ici, vous trouverez des informations sur l&#39;état actuel du système comme "
 "la fréquence processeur, utilisation mémoire et trafic réseau."
 
 #. Transfer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:72
-msgid "a_s_if_transfer"
+msgid "Transfer"
 msgstr ""
 
 #. RX
 #: i18n/english/luasrc/i18n/admin-core.en.lua:73
-msgid "a_s_if_transfer_rx"
+msgid "RX"
 msgstr ""
 
 #. TX
 #: i18n/english/luasrc/i18n/admin-core.en.lua:74
-msgid "a_s_if_transfer_tx"
+msgid "TX"
 msgstr ""
 
 #. Type
 #: i18n/english/luasrc/i18n/admin-core.en.lua:75
-msgid "a_s_if_type"
+msgid "Type"
 msgstr ""
 
 #. VLAN
 #: i18n/english/luasrc/i18n/admin-core.en.lua:76
-msgid "a_s_if_vlan"
+msgid "VLAN"
 msgstr ""
 
 #. Ports
 #: i18n/english/luasrc/i18n/admin-core.en.lua:77
-msgid "a_s_if_vlanports"
+msgid "Ports"
 msgstr ""
 
 #. Wireless Adapter
 #: i18n/english/luasrc/i18n/admin-core.en.lua:78
-msgid "a_s_if_wifidev"
+msgid "Wireless Adapter"
 msgstr ""
 
 #. Firewall
 #: i18n/english/luasrc/i18n/admin-core.en.lua:79
-msgid "a_s_ipt"
+msgid "Firewall"
 msgstr ""
 
 #. Actions
 #: i18n/english/luasrc/i18n/admin-core.en.lua:80
-msgid "a_s_ipt_actions"
+msgid "Actions"
 msgstr ""
 
 #. Traffic
 #: i18n/english/luasrc/i18n/admin-core.en.lua:81
-msgid "a_s_ipt_bytes"
+msgid "Traffic"
 msgstr ""
 
 #. Chain
 #: i18n/english/luasrc/i18n/admin-core.en.lua:82
-msgid "a_s_ipt_chain"
+msgid "Chain"
 msgstr ""
 
 #. Destination
 #: i18n/english/luasrc/i18n/admin-core.en.lua:83
-msgid "a_s_ipt_destination"
+msgid "Destination"
 msgstr ""
 
 #. Flags
 #: i18n/english/luasrc/i18n/admin-core.en.lua:84
-msgid "a_s_ipt_flags"
+msgid "Flags"
 msgstr ""
 
 #. In
 #: i18n/english/luasrc/i18n/admin-core.en.lua:85
-msgid "a_s_ipt_inputif"
+msgid "In"
 msgstr ""
 
 #. No chains in this table
 #: i18n/english/luasrc/i18n/admin-core.en.lua:86
-msgid "a_s_ipt_nochains"
+msgid "No chains in this table"
 msgstr ""
 
 #. No Rules in this chain
 #: i18n/english/luasrc/i18n/admin-core.en.lua:87
-msgid "a_s_ipt_norules"
+msgid "No Rules in this chain"
 msgstr ""
 
 #. Options
 #: i18n/english/luasrc/i18n/admin-core.en.lua:88
-msgid "a_s_ipt_options"
+msgid "Options"
 msgstr ""
 
 #. Out
 #: i18n/english/luasrc/i18n/admin-core.en.lua:89
-msgid "a_s_ipt_outputif"
+msgid "Out"
 msgstr ""
 
 #. Packets
 #: i18n/english/luasrc/i18n/admin-core.en.lua:90
-msgid "a_s_ipt_packets"
+msgid "Packets"
 msgstr ""
 
 #. Pkts.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:91
-msgid "a_s_ipt_pkts"
+msgid "Pkts."
 msgstr ""
 
 #. Policy
 #: i18n/english/luasrc/i18n/admin-core.en.lua:92
-msgid "a_s_ipt_policy"
+msgid "Policy"
 msgstr ""
 
 #. Prot.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:93
-msgid "a_s_ipt_prot"
+msgid "Prot."
 msgstr ""
 
 #. References
 #: i18n/english/luasrc/i18n/admin-core.en.lua:94
-msgid "a_s_ipt_references"
+msgid "References"
 msgstr ""
 
 #. Reset Counters
 #: i18n/english/luasrc/i18n/admin-core.en.lua:95
-msgid "a_s_ipt_reset"
+msgid "Reset Counters"
 msgstr ""
 
 #. Restart Firewall
 #: i18n/english/luasrc/i18n/admin-core.en.lua:96
-msgid "a_s_ipt_restart"
+msgid "Restart Firewall"
 msgstr ""
 
 #. #
 #: i18n/english/luasrc/i18n/admin-core.en.lua:97
-msgid "a_s_ipt_rulenum"
+msgid "#"
 msgstr ""
 
 #. Source
 #: i18n/english/luasrc/i18n/admin-core.en.lua:98
-msgid "a_s_ipt_source"
+msgid "Source"
 msgstr ""
 
 #. Firewall Status
 #: i18n/english/luasrc/i18n/admin-core.en.lua:99
 #, fuzzy
-msgid "a_s_ipt_status"
+msgid "Firewall Status"
 msgstr ""
 "Ici, vous trouverez des informations sur l&#39;état actuel du système comme "
 "la fréquence processeur, utilisation mémoire et trafic réseau."
 
 #. Table
 #: i18n/english/luasrc/i18n/admin-core.en.lua:100
-msgid "a_s_ipt_table"
+msgid "Table"
 msgstr ""
 
 #. Target
 #: i18n/english/luasrc/i18n/admin-core.en.lua:101
-msgid "a_s_ipt_target"
+msgid "Target"
 msgstr ""
 
 #. Perform Actions
 #: i18n/english/luasrc/i18n/admin-core.en.lua:102
-msgid "a_s_packages_do"
+msgid "Perform Actions"
 msgstr "Accomplir les actions"
 
 #. Install
 #: i18n/english/luasrc/i18n/admin-core.en.lua:103
-msgid "a_s_packages_install"
+msgid "Install"
 msgstr "Installer"
 
 #. Download and install package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:104
-msgid "a_s_packages_installurl"
+msgid "Download and install package"
 msgstr "Télécharge et installe le paquet"
 
 #. Edit package lists and installation targets
 #: i18n/english/luasrc/i18n/admin-core.en.lua:105
-msgid "a_s_packages_ipkg"
+msgid "Edit package lists and installation targets"
 msgstr "Editer la liste des paquets et le répertoire de destination"
 
 #. Package name
 #: i18n/english/luasrc/i18n/admin-core.en.lua:106
-msgid "a_s_packages_name"
+msgid "Package name"
 msgstr "Nom du paquet"
 
 #. Remove
 #: i18n/english/luasrc/i18n/admin-core.en.lua:107
-msgid "a_s_packages_remove"
+msgid "Remove"
 msgstr "Désinstaller"
 
 #. Find package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:108
-msgid "a_s_packages_search"
+msgid "Find package"
 msgstr "Trouver un paquet"
 
 #. Package lists updated
 #: i18n/english/luasrc/i18n/admin-core.en.lua:109
-msgid "a_s_packages_update"
+msgid "Package lists updated"
 msgstr "Liste des paquets mise à jour"
 
 #. Update package lists
 #: i18n/english/luasrc/i18n/admin-core.en.lua:110
-msgid "a_s_packages_updatelist"
+msgid "Update package lists"
 msgstr "Mettre à jour la liste des paquets"
 
 #. Upgrade installed packages
 #: i18n/english/luasrc/i18n/admin-core.en.lua:111
-msgid "a_s_packages_upgrade"
+msgid "Upgrade installed packages"
 msgstr "Mettre à jour les paquets installés"
 
 #. Could not set default destination
 #: i18n/english/luasrc/i18n/admin-core.en.lua:112
 #, fuzzy
-msgid "a_s_packages_code1"
+msgid "Could not set default destination"
 msgstr "Accomplir les actions"
 
 #. Error parsing config file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:113
 #, fuzzy
-msgid "a_s_packages_code2"
+msgid "Error parsing config file"
 msgstr "Accomplir les actions"
 
 #. Could not create temporary directory (ran out of space?)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:114
 #, fuzzy
-msgid "a_s_packages_code3"
+msgid "Could not create temporary directory (ran out of space?)"
 msgstr "Accomplir les actions"
 
 #. Could not get adminstrative lock (ran out of space?)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:115
 #, fuzzy
-msgid "a_s_packages_code4"
+msgid "Could not get adminstrative lock (ran out of space?)"
 msgstr "Accomplir les actions"
 
 #. Unsatisfied Dependencies
 #: i18n/english/luasrc/i18n/admin-core.en.lua:116
 #, fuzzy
-msgid "a_s_packages_code5"
+msgid "Unsatisfied Dependencies"
 msgstr "Accomplir les actions"
 
 #. Refused to remove essential package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:117
 #, fuzzy
-msgid "a_s_packages_code6"
+msgid "Refused to remove essential package"
 msgstr "Accomplir les actions"
 
 #. Package has dependents
 #: i18n/english/luasrc/i18n/admin-core.en.lua:118
 #, fuzzy
-msgid "a_s_packages_code7"
+msgid "Package has dependents"
 msgstr "Accomplir les actions"
 
 #. Package has no installation candidate (wrong name?)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:119
 #, fuzzy
-msgid "a_s_packages_code8"
+msgid "Package has no installation candidate (wrong name?)"
 msgstr "Accomplir les actions"
 
 #. Package has no available architecture 
 #: i18n/english/luasrc/i18n/admin-core.en.lua:120
 #, fuzzy
-msgid "a_s_packages_code9"
+msgid "Package has no available architecture "
 msgstr "Accomplir les actions"
 
 #. Package is not trusted
 #: i18n/english/luasrc/i18n/admin-core.en.lua:121
 #, fuzzy
-msgid "a_s_packages_code10"
+msgid "Package is not trusted"
 msgstr "Accomplir les actions"
 
 #. Error while downloading
 #: i18n/english/luasrc/i18n/admin-core.en.lua:122
 #, fuzzy
-msgid "a_s_packages_code11"
+msgid "Error while downloading"
 msgstr "Accomplir les actions"
 
 #. Conflicts with other packages
 #: i18n/english/luasrc/i18n/admin-core.en.lua:123
 #, fuzzy
-msgid "a_s_packages_code12"
+msgid "Conflicts with other packages"
 msgstr "Accomplir les actions"
 
 #. Package is already installed
 #: i18n/english/luasrc/i18n/admin-core.en.lua:124
 #, fuzzy
-msgid "a_s_packages_code13"
+msgid "Package is already installed"
 msgstr "Accomplir les actions"
 
 #. Package has unresolved dependencies
 #: i18n/english/luasrc/i18n/admin-core.en.lua:125
 #, fuzzy
-msgid "a_s_packages_code14"
+msgid "Package has unresolved dependencies"
 msgstr "Accomplir les actions"
 
 #. Refused to downgrade package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:126
 #, fuzzy
-msgid "a_s_packages_code15"
+msgid "Refused to downgrade package"
 msgstr "Accomplir les actions"
 
 #. Package manager ran out of space
 #: i18n/english/luasrc/i18n/admin-core.en.lua:127
 #, fuzzy
-msgid "a_s_packages_code16"
+msgid "Package manager ran out of space"
 msgstr "Accomplir les actions"
 
 #. Bad signature while verifiying package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:128
 #, fuzzy
-msgid "a_s_packages_code17"
+msgid "Bad signature while verifiying package"
 msgstr "Accomplir les actions"
 
 #. MD5 error while verifiying package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:129
 #, fuzzy
-msgid "a_s_packages_code18"
+msgid "MD5 error while verifiying package"
 msgstr "Accomplir les actions"
 
 #. Internal error occured
 #: i18n/english/luasrc/i18n/admin-core.en.lua:130
 #, fuzzy
-msgid "a_s_packages_code19"
+msgid "Internal error occured"
 msgstr "Accomplir les actions"
 
 #. Package lists
 #: i18n/english/luasrc/i18n/admin-core.en.lua:131
-msgid "a_s_p_ipkg_pkglists"
+msgid "Package lists"
 msgstr "Listes de paquets"
 
 #. Installation targets
 #: i18n/english/luasrc/i18n/admin-core.en.lua:132
-msgid "a_s_p_ipkg_targets"
+msgid "Installation targets"
 msgstr "Répertoires de destination"
 
 #. Change the password of the system administrator (User <code>root</code>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:133
-msgid "a_s_changepw1"
+msgid "Change the password of the system administrator (User <code>root</code>)"
 msgstr "Changer le mot de passe du système (Utilisateur &quot;root&quot;)"
 
 #. Password successfully changed
 #: i18n/english/luasrc/i18n/admin-core.en.lua:134
-msgid "a_s_changepw_changed"
+msgid "Password successfully changed"
 msgstr "Mot de passe changé avec succès"
 
 #. Error: Passwords do not match
 #: i18n/english/luasrc/i18n/admin-core.en.lua:135
-msgid "a_s_changepw_nomatch"
+msgid "Error: Passwords do not match"
 msgstr "Erreur: les mots de passe ne correspondent pas"
 
 #. Here you can paste public <abbr title=\"Secure Shell\">SSH</abbr>-Keys (one per line) for <abbr title=\"Secure Shell\">SSH</abbr> public-key authentication.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:136
-msgid "a_s_sshkeys1"
+msgid "Here you can paste public <abbr title=\"Secure Shell\">SSH</abbr>-Keys (one per line) for <abbr title=\"Secure Shell\">SSH</abbr> public-key authentication."
 msgstr ""
 "Vous pouvez copier ici des clés SSH publiques (une par ligne) pour une "
 "authentification SSH sur clés publiques."
 
 #. Mount Points
 #: i18n/english/luasrc/i18n/admin-core.en.lua:137
-msgid "a_s_fstab_mountpoints"
+msgid "Mount Points"
 msgstr "Points de montage"
 
 #. Mount Points define at which point a memory device will be attached to the filesystem
 #: i18n/english/luasrc/i18n/admin-core.en.lua:138
-msgid "a_s_fstab_mountpoints1"
+msgid "Mount Points define at which point a memory device will be attached to the filesystem"
 msgstr ""
 "Les points de montage définissent l'attachement d'un périphérique au système "
 "de fichier."
 
 #. Mounted file systems
 #: i18n/english/luasrc/i18n/admin-core.en.lua:139
-msgid "a_s_fstab_active"
+msgid "Mounted file systems"
 msgstr "Systèmes de fichiers montés"
 
 #. Used
 #: i18n/english/luasrc/i18n/admin-core.en.lua:140
-msgid "a_s_fstab_used"
+msgid "Used"
 msgstr "Utilisé"
 
 #. Available
 #: i18n/english/luasrc/i18n/admin-core.en.lua:141
-msgid "a_s_fstab_avail"
+msgid "Available"
 msgstr "Disponible"
 
 #. Mount Point
 #: i18n/english/luasrc/i18n/admin-core.en.lua:142
-msgid "a_s_fstab_mountpoint"
+msgid "Mount Point"
 msgstr "Point de montage"
 
 #. The device file of the memory or partition (<abbr title=\"for example\">e.g.</abbr> <code>/dev/sda1</code>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:143
-msgid "a_s_fstab_device1"
+msgid "The device file of the memory or partition (<abbr title=\"for example\">e.g.</abbr> <code>/dev/sda1</code>)"
 msgstr "Le périphérique de bloc contenant la partition (ex : /dev/sda1)"
 
 #. The filesystem that was used to format the memory (<abbr title=\"for example\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></samp>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:144
-msgid "a_s_fstab_fs1"
+msgid "The filesystem that was used to format the memory (<abbr title=\"for example\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></samp>)"
 msgstr ""
 "Le système de fichiers utilisé pour formatter le support de stockage (ex : "
 "ext3)"
 
 #. If your physical memory is insufficient unused data can be temporarily swapped to a swap-device resulting in a higher amount of usable <abbr title=\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very slow process as the swap-device cannot be accessed with the high datarates of the <abbr title=\"Random Access Memory\">RAM</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:145
-msgid "a_s_fstab_swap1"
+msgid "If your physical memory is insufficient unused data can be temporarily swapped to a swap-device resulting in a higher amount of usable <abbr title=\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very slow process as the swap-device cannot be accessed with the high datarates of the <abbr title=\"Random Access Memory\">RAM</abbr>."
 msgstr ""
 "Si la mémoire physique n'est pas en quantité suffisante, les données "
 "inutilisées peuvent être temporairement transférée sur une partition "
@@ -805,88 +805,88 @@ msgstr ""
 
 #. Reboots the operating system of your device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:146
-msgid "a_s_reboot1"
+msgid "Reboots the operating system of your device"
 msgstr "Redémarrage du système d'exploitation de votre équipement"
 
 #. Perform reboot
 #: i18n/english/luasrc/i18n/admin-core.en.lua:147
-msgid "a_s_reboot_do"
+msgid "Perform reboot"
 msgstr "Redémarrer"
 
 #. Please wait: Device rebooting...
 #: i18n/english/luasrc/i18n/admin-core.en.lua:148
-msgid "a_s_reboot_running"
+msgid "Please wait: Device rebooting..."
 msgstr "Patientez s'il vous plaît: équipement en cours de redémarrage..."
 
 #. Warning: There are unsaved changes that will be lost while rebooting!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:149
-msgid "a_s_reboot_u"
+msgid "Warning: There are unsaved changes that will be lost while rebooting!"
 msgstr ""
 "Attention : il reste des changements non appliqués qui seront perdus après "
 "redémarrage !"
 
 #. Changes applied.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:150
-msgid "a_s_applyreboot1"
+msgid "Changes applied."
 msgstr "Changements appliqués."
 
 #. Backup / Restore
 #: i18n/english/luasrc/i18n/admin-core.en.lua:151
-msgid "a_s_backup"
+msgid "Backup / Restore"
 msgstr "Sauvegarder / Restaurer"
 
 #. Create backup
 #: i18n/english/luasrc/i18n/admin-core.en.lua:152
-msgid "a_s_backup_backup"
+msgid "Create backup"
 msgstr "Créer une archive de sauvegarde"
 
 #. Backup Archive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:153
-msgid "a_s_backup_archive"
+msgid "Backup Archive"
 msgstr "Sauvegarder l'archive"
 
 #. Reset router to defaults
 #: i18n/english/luasrc/i18n/admin-core.en.lua:154
-msgid "a_s_backup_reset"
+msgid "Reset router to defaults"
 msgstr "Revenir à la configuration par défaut du routeur"
 
 #. Proceed reverting all settings and resetting to firmware defaults?
 #: i18n/english/luasrc/i18n/admin-core.en.lua:155
-msgid "a_s_backup_reset1"
+msgid "Proceed reverting all settings and resetting to firmware defaults?"
 msgstr ""
 "Etes-vous sûr de vouloir revenir à la configuration par défaut du firmware ?"
 
 #. Restore backup
 #: i18n/english/luasrc/i18n/admin-core.en.lua:156
-msgid "a_s_backup_restore"
+msgid "Restore backup"
 msgstr "Restaurer une sauvegarde"
 
 #. Here you can backup and restore your router configuration and - if possible - reset the router to the default settings.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:157
-msgid "a_s_backup1"
+msgid "Here you can backup and restore your router configuration and - if possible - reset the router to the default settings."
 msgstr ""
 "Ici, vous pouvez sauvegarder et restaurer la configuration de votre routeur "
 "et, si possible, restaurer la configuration par défaut du routeur."
 
 #. <abbr title=\"Hypertext Transfer Protocol\">HTTP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:158
-msgid "a_srv_http"
+msgid "<abbr title=\"Hypertext Transfer Protocol\">HTTP</abbr>-Server"
 msgstr "Serveur HTTP"
 
 #. <abbr title=\"Secure Shell\">SSH</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:159
-msgid "a_srv_ssh"
+msgid "<abbr title=\"Secure Shell\">SSH</abbr>-Server"
 msgstr "Serveur SSH"
 
 #. Services and daemons perform certain tasks on your device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:160
-msgid "a_srv_services1"
+msgid "Services and daemons perform certain tasks on your device."
 msgstr ""
 "Les services et démons accomplissent certaines tâches sur votre équipement."
 
 #. Most of them are network servers, that offer a certain service for your device or network like shell access, serving webpages like <abbr title=\"Lua Configuration Interface\">LuCI</abbr>, doing mesh routing, sending e-mails, ...
 #: i18n/english/luasrc/i18n/admin-core.en.lua:161
-msgid "a_srv_services2"
+msgid "Most of them are network servers, that offer a certain service for your device or network like shell access, serving webpages like <abbr title=\"Lua Configuration Interface\">LuCI</abbr>, doing mesh routing, sending e-mails, ..."
 msgstr ""
 "La plupart d'entre eux sont des serveurs réseaux, qui vous offrent certains "
 "services comme un accès shell, accéder à des pages comme LuCI, faire du "
@@ -894,79 +894,79 @@ msgstr ""
 
 #. A small webserver which can be used to serve <abbr title=\"Lua Configuration Interface\">LuCI</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:162
-msgid "a_srv_http1"
+msgid "A small webserver which can be used to serve <abbr title=\"Lua Configuration Interface\">LuCI</abbr>."
 msgstr "Un serveur web léger qui peut être utilisé pour LuCI."
 
 #. Authentication Realm
 #: i18n/english/luasrc/i18n/admin-core.en.lua:163
-msgid "a_srv_http_authrealm"
+msgid "Authentication Realm"
 msgstr "Domaine d'authentification"
 
 #. The realm which will be displayed at the authentication prompt for protected pages.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:164
-msgid "a_srv_http_authrealm1"
+msgid "The realm which will be displayed at the authentication prompt for protected pages."
 msgstr "Le domaine qui sera affiché lors de la fenêtre d'authentification."
 
 #. defaults to <code>/etc/httpd.conf</code>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:165
-msgid "a_srv_http_config1"
+msgid "defaults to <code>/etc/httpd.conf</code>"
 msgstr "fichier de configuration par défaut : /etc/httpd.conf"
 
 #. Document root
 #: i18n/english/luasrc/i18n/admin-core.en.lua:166
-msgid "a_srv_http_root"
+msgid "Document root"
 msgstr "Page racine"
 
 #. Enable Keep-Alive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:167
-msgid "a_srv_http_keepalive"
+msgid "Enable Keep-Alive"
 msgstr ""
 
 #. Connection timeout
 #: i18n/english/luasrc/i18n/admin-core.en.lua:168
-msgid "a_srv_http_timeout"
+msgid "Connection timeout"
 msgstr ""
 
 #. Plugin path
 #: i18n/english/luasrc/i18n/admin-core.en.lua:169
-msgid "a_srv_http_path"
+msgid "Plugin path"
 msgstr ""
 
 #. A lightweight HTTP/1.1 webserver written in C and Lua designed to serve LuCI
 #: i18n/english/luasrc/i18n/admin-core.en.lua:170
-msgid "a_srv_lucittpd"
+msgid "A lightweight HTTP/1.1 webserver written in C and Lua designed to serve LuCI"
 msgstr ""
 
 #. Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:171
-msgid "a_srv_dropbear1"
+msgid "Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
 msgstr "Dropbear est un serveur SSH et intègre un serveur SCP"
 
 #. Password authentication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:172
-msgid "a_srv_d_pwauth"
+msgid "Password authentication"
 msgstr "Authentification par mot de passe"
 
 #. Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:173
-msgid "a_srv_d_pwauth1"
+msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
 msgstr "Autoriser l'authentification SSH par mot de passe"
 
 #. Channel
 #: i18n/english/luasrc/i18n/admin-core.en.lua:174
-msgid "a_w_channel"
+msgid "Channel"
 msgstr "Canal"
 
 #. On this pages you can find configuration options for <abbr title=\"Wireless Local Area Network\">WLAN</abbr> based wireless networks.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:175
-msgid "a_w_wifi1"
+msgid "On this pages you can find configuration options for <abbr title=\"Wireless Local Area Network\">WLAN</abbr> based wireless networks."
 msgstr ""
 "Dans cette page vous trouverez des options de configuration pour les réseau "
 "sans-fils."
 
 #. You can easily integrate your 802.11a/b/g/n-devices into your physical network and use the virtual adapter support to build wireless repeaters or offer several networks with one device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:176
-msgid "a_w_wifi2"
+msgid "You can easily integrate your 802.11a/b/g/n-devices into your physical network and use the virtual adapter support to build wireless repeaters or offer several networks with one device."
 msgstr ""
 "Vous pouvez facilement installer un périphérique 802.11a/b/g/n dans votre "
 "réseau physique existant et utiliser la gestion des interfaces virtuelles "
@@ -975,49 +975,49 @@ msgstr ""
 
 #. There is support for Managed, Client, Ad-Hoc and <abbr title=\"Wireless Distribution System\">WDS</abbr> operating modes as well as <abbr title=\"Wi-Fi Protected Access\">WPA</abbr> and <abbr title=\"Wi-Fi Protected Access 2\">WPA2</abbr> encryption for secure communnication.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:177
-msgid "a_w_wifi3"
+msgid "There is support for Managed, Client, Ad-Hoc and <abbr title=\"Wireless Distribution System\">WDS</abbr> operating modes as well as <abbr title=\"Wi-Fi Protected Access\">WPA</abbr> and <abbr title=\"Wi-Fi Protected Access 2\">WPA2</abbr> encryption for secure communnication."
 msgstr ""
 "Les modes Point d'accès, Station, Ad-Hoc et WDS couplés aux chiffrements WPA "
 "et WPA2 sont gérés."
 
 #. Here you can configure installed wifi devices.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:178
-msgid "a_w_devices1"
+msgid "Here you can configure installed wifi devices."
 msgstr "Ici vous pouvez configurer les équipements Wi-Fi installés."
 
 #. Transmit Antenna
 #: i18n/english/luasrc/i18n/admin-core.en.lua:179
-msgid "a_w_txantenna"
+msgid "Transmit Antenna"
 msgstr "Antenne transmission"
 
 #. Receive Antenna
 #: i18n/english/luasrc/i18n/admin-core.en.lua:180
-msgid "a_w_rxantenna"
+msgid "Receive Antenna"
 msgstr "Antenne réception"
 
 #. Distance to furthest station (in meter)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:181
-msgid "a_w_distance1"
+msgid "Distance to furthest station (in meter)"
 msgstr "Distance vers la station la plus éloignée (m)"
 
 #. Diversity
 #: i18n/english/luasrc/i18n/admin-core.en.lua:182
-msgid "a_w_diversity"
+msgid "Diversity"
 msgstr "Diversité"
 
 #. Country Code
 #: i18n/english/luasrc/i18n/admin-core.en.lua:183
-msgid "a_w_countrycode"
+msgid "Country Code"
 msgstr "Code pays"
 
 #. Connection Limit
 #: i18n/english/luasrc/i18n/admin-core.en.lua:184
-msgid "a_w_connlimit"
+msgid "Connection Limit"
 msgstr "Limite de connexion"
 
 #. You can run several wifi networks with one device. Be aware that there are certain hardware and driverspecific restrictions. Normally you can operate 1 Ad-Hoc or up to 3 Master-Mode and 1 Client-Mode network simultaneously.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:185
-msgid "a_w_networks1"
+msgid "You can run several wifi networks with one device. Be aware that there are certain hardware and driverspecific restrictions. Normally you can operate 1 Ad-Hoc or up to 3 Master-Mode and 1 Client-Mode network simultaneously."
 msgstr ""
 "Vous pouvez faire fonctionner plusieurs réseaux Wi-Fi sur un seul "
 "équipement. Il existe des limitations matérielles et liées au pilote. En "
@@ -1026,345 +1026,345 @@ msgstr ""
 
 #. Network Name (<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:186
-msgid "a_w_netid"
+msgid "Network Name (<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>)"
 msgstr "Nom du réseau (ESSID)"
 
 #. Add the Wifi network to physical network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:187
-msgid "a_w_network1"
+msgid "Add the Wifi network to physical network"
 msgstr "Ajouter ce réseau Wi-Fi au réseau physique"
 
 #.  - Create new Network - 
 #: i18n/english/luasrc/i18n/admin-core.en.lua:188
-msgid "a_w_netmanual"
+msgid " - Create new Network - "
 msgstr " - Créer un nouveau réseau - "
 
 #. Transmit Power
 #: i18n/english/luasrc/i18n/admin-core.en.lua:189
-msgid "a_w_txpwr"
+msgid "Transmit Power"
 msgstr "Puissance d'émission"
 
 #. Broadcom Frameburst
 #: i18n/english/luasrc/i18n/admin-core.en.lua:190
-msgid "a_w_brcmburst"
+msgid "Broadcom Frameburst"
 msgstr "Technologie Broadcom Frameburst"
 
 #. Atheros Frameburst
 #: i18n/english/luasrc/i18n/admin-core.en.lua:191
-msgid "a_w_athburst"
+msgid "Atheros Frameburst"
 msgstr "Technologie Atheros Frameburst"
 
 #. RadiusServer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:192
-msgid "a_w_radiussrv"
+msgid "RadiusServer"
 msgstr "Serveur Radius"
 
 #. Radius-Port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:193
-msgid "a_w_radiusport"
+msgid "Radius-Port"
 msgstr "Port Radius"
 
 #. AP-Isolation
 #: i18n/english/luasrc/i18n/admin-core.en.lua:194
-msgid "a_w_apisolation"
+msgid "AP-Isolation"
 msgstr "Isolation AP"
 
 #. Prevents Client to Client communication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:195
-msgid "a_w_apisolation1"
+msgid "Prevents Client to Client communication"
 msgstr "Empêche la communication directe Client à Client"
 
 #. Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:196
-msgid "a_w_hideessid"
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "Cacher le ESSID"
 
 #. Access Point
 #: i18n/english/luasrc/i18n/admin-core.en.lua:197
-msgid "a_w_ap"
+msgid "Access Point"
 msgstr "Point d'accès"
 
 #. Ad-Hoc
 #: i18n/english/luasrc/i18n/admin-core.en.lua:198
-msgid "a_w_adhoc"
+msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
 #. Pseudo Ad-Hoc (ahdemo)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:199
-msgid "a_w_ahdemo"
+msgid "Pseudo Ad-Hoc (ahdemo)"
 msgstr "Pseudo Ad-Hoc (ahdemo)"
 
 #. Client
 #: i18n/english/luasrc/i18n/admin-core.en.lua:200
-msgid "a_w_client"
+msgid "Client"
 msgstr "Client"
 
 #. WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:201
-msgid "a_w_wds"
+msgid "WDS"
 msgstr "WDS"
 
 #. Monitor
 #: i18n/english/luasrc/i18n/admin-core.en.lua:202
-msgid "a_w_monitor"
+msgid "Monitor"
 msgstr "Monitor"
 
 #. Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> firewalls
 #: i18n/english/luasrc/i18n/admin-core.en.lua:203
-msgid "dhcp_dnsmasq_desc"
+msgid "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> firewalls"
 msgstr ""
 "Dnsmasq est un serveur DHCP combiné à un requêteur DNS pour les pare-feu NAT"
 
 #. Domain required
 #: i18n/english/luasrc/i18n/admin-core.en.lua:204
-msgid "dhcp_dnsmasq_domainneeded"
+msgid "Domain required"
 msgstr "Domain requis"
 
 #. Don&#39;t forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without <abbr title=\"Domain Name System\">DNS</abbr>-Name
 #: i18n/english/luasrc/i18n/admin-core.en.lua:205
-msgid "dhcp_dnsmasq_domainneeded_desc"
+msgid "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without <abbr title=\"Domain Name System\">DNS</abbr>-Name"
 msgstr "Ne pas transmettre de requêtes DNS sans nom DNS"
 
 #. Authoritative
 #: i18n/english/luasrc/i18n/admin-core.en.lua:206
-msgid "dhcp_dnsmasq_authoritative"
+msgid "Authoritative"
 msgstr "Authoritaire"
 
 #. This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> in the local network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:207
-msgid "dhcp_dnsmasq_authoritative_desc"
+msgid "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> in the local network"
 msgstr "C'est le seul serveur DHCP sur le réseau local"
 
 #. Filter private
 #: i18n/english/luasrc/i18n/admin-core.en.lua:208
-msgid "dhcp_dnsmasq_boguspriv"
+msgid "Filter private"
 msgstr "Filtrer les requêtes privées"
 
 #. Don&#39;t forward reverse lookups for local networks
 #: i18n/english/luasrc/i18n/admin-core.en.lua:209
-msgid "dhcp_dnsmasq_boguspriv_desc"
+msgid "Don't forward reverse lookups for local networks"
 msgstr ""
 "Ne pas transmettre les requêtes de recherche inverse pour les réseaux locaux"
 
 #. Filter useless
 #: i18n/english/luasrc/i18n/admin-core.en.lua:210
-msgid "dhcp_dnsmasq_filterwin2k"
+msgid "Filter useless"
 msgstr "Filtrer les requêtes inutiles"
 
 #. filter useless <abbr title=\"Domain Name System\">DNS</abbr>-queries of Windows-systems
 #: i18n/english/luasrc/i18n/admin-core.en.lua:211
-msgid "dhcp_dnsmasq_filterwin2k_desc"
+msgid "filter useless <abbr title=\"Domain Name System\">DNS</abbr>-queries of Windows-systems"
 msgstr "filtre les requêtes inutiles émises par les systèmes Windows"
 
 #. Localise queries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:212
-msgid "dhcp_dnsmasq_localisequeries"
+msgid "Localise queries"
 msgstr "Localiser les requêtes"
 
 #. localises the hostname depending on its subnet
 #: i18n/english/luasrc/i18n/admin-core.en.lua:213
-msgid "dhcp_dnsmasq_localisequeries_desc"
+msgid "localises the hostname depending on its subnet"
 msgstr "localiser la réponse suivant l'émetteur de la requête"
 
 #. Local Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:214
-msgid "dhcp_dnsmasq_local"
+msgid "Local Server"
 msgstr "Serveur local"
 
 #. Local Domain
 #: i18n/english/luasrc/i18n/admin-core.en.lua:215
-msgid "dhcp_dnsmasq_domain"
+msgid "Local Domain"
 msgstr "Domaine local"
 
 #. Expand Hosts
 #: i18n/english/luasrc/i18n/admin-core.en.lua:216
-msgid "dhcp_dnsmasq_expandhosts"
+msgid "Expand Hosts"
 msgstr "Etendre le nom d'hôte"
 
 #. adds domain names to hostentries in the resolv file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:217
-msgid "dhcp_dnsmasq_expandhosts_desc"
+msgid "adds domain names to hostentries in the resolv file"
 msgstr "concatène le nom de domaine aux noms d'hôtes"
 
 #. don&#39;t cache unknown
 #: i18n/english/luasrc/i18n/admin-core.en.lua:218
-msgid "dhcp_dnsmasq_nonegcache"
+msgid "don't cache unknown"
 msgstr "Ne pas mettre en cache les requêtes négatives"
 
 #. prevents caching of negative <abbr title=\"Domain Name System\">DNS</abbr>-replies
 #: i18n/english/luasrc/i18n/admin-core.en.lua:219
-msgid "dhcp_dnsmasq_nonegcache_desc"
+msgid "prevents caching of negative <abbr title=\"Domain Name System\">DNS</abbr>-replies"
 msgstr "empêche la mise en cache de requêtes DNS erronnées"
 
 #. Use <code>/etc/ethers</code>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:220
-msgid "dhcp_dnsmasq_readethers"
+msgid "Use <code>/etc/ethers</code>"
 msgstr "Utiliser /etc/ethers"
 
 #. Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:221
-msgid "dhcp_dnsmasq_readethers_desc"
+msgid "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server"
 msgstr "Lire /etc/ethers pour configurer le serveur DHCP"
 
 #. Leasefile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:222
-msgid "dhcp_dnsmasq_leasefile"
+msgid "Leasefile"
 msgstr "Fichier de baux"
 
 #. file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-leases will be stored
 #: i18n/english/luasrc/i18n/admin-core.en.lua:223
-msgid "dhcp_dnsmasq_leasefile_desc"
+msgid "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-leases will be stored"
 msgstr "fichier dans lequel les baux DHCP seront stockés"
 
 #. Resolvfile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:224
-msgid "dhcp_dnsmasq_resolvfile"
+msgid "Resolvfile"
 msgstr "Fichier de résolution"
 
 #. local <abbr title=\"Domain Name System\">DNS</abbr> file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:225
-msgid "dhcp_dnsmasq_resolvfile_desc"
+msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "fichier de résolution local"
 
 #. Ignore <code>/etc/hosts</code>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:226
-msgid "dhcp_dnsmasq_nohosts"
+msgid "Ignore <code>/etc/hosts</code>"
 msgstr "Ignorer /etc/hosts"
 
 #. Strict order
 #: i18n/english/luasrc/i18n/admin-core.en.lua:227
-msgid "dhcp_dnsmasq_strictorder"
+msgid "Strict order"
 msgstr "Ordre stricte"
 
 #. <abbr title=\"Domain Name System\">DNS</abbr>-Server will be queried in the order of the resolvfile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:228
-msgid "dhcp_dnsmasq_strictorder_desc"
+msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Server will be queried in the order of the resolvfile"
 msgstr ""
 "Les serveurs DNS du fichier de résolution seront interrogés dans l'ordre"
 
 #. Log queries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:229
-msgid "dhcp_dnsmasq_logqueries"
+msgid "Log queries"
 msgstr "Journaliser les requêtes"
 
 #. Ignore resolve file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:230
-msgid "dhcp_dnsmasq_noresolv"
+msgid "Ignore resolve file"
 msgstr "Ignorer le fichier de résolution"
 
 #. concurrent queries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:231
-msgid "dhcp_dnsmasq_dnsforwardmax"
+msgid "concurrent queries"
 msgstr "Requêtes concurrentes maximum"
 
 #. <abbr title=\"Domain Name System\">DNS</abbr>-Port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:232
-msgid "dhcp_dnsmasq_port"
+msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Port"
 msgstr "Port DNS"
 
 #. <abbr title=\"maximal\">max.</abbr> <abbr title=\"Extension Mechanisms for Domain Name System\">EDNS0</abbr> paket size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:233
-msgid "dhcp_dnsmasq_ednspacket_max"
+msgid "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Extension Mechanisms for Domain Name System\">EDNS0</abbr> paket size"
 msgstr "taille maximum du paquet. EDNS.0 "
 
 #. <abbr title=\"maximal\">max.</abbr> <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:234
-msgid "dhcp_dnsmasq_dhcpleasemax"
+msgid "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Leases"
 msgstr "baux maximum"
 
 #. additional hostfile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:235
-msgid "dhcp_dnsmasq_addnhosts"
+msgid "additional hostfile"
 msgstr "fichiers de noms d'hôtes supplémentaires"
 
 #. query port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:236
-msgid "dhcp_dnsmasq_queryport"
+msgid "query port"
 msgstr "port de requête"
 
 #. Enable TFTP-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:237
-msgid "dhcp_dnsmasq_enabletftp"
+msgid "Enable TFTP-Server"
 msgstr "Activer le serveur TFTP"
 
 #. TFTP-Server Root
 #: i18n/english/luasrc/i18n/admin-core.en.lua:238
-msgid "dhcp_dnsmasq_tftproot"
+msgid "TFTP-Server Root"
 msgstr "Racine du serveur TFTP"
 
 #. Network Boot Image
 #: i18n/english/luasrc/i18n/admin-core.en.lua:239
-msgid "dhcp_dnsmasq_dhcpboot"
+msgid "Network Boot Image"
 msgstr "Image de démarrage réseau"
 
 #. Switch
 #: i18n/english/luasrc/i18n/admin-core.en.lua:240
-msgid "a_n_switch"
+msgid "Switch"
 msgstr "Switch"
 
 #. Active Connections
 #: i18n/english/luasrc/i18n/admin-core.en.lua:241
-msgid "a_n_conntrack"
+msgid "Active Connections"
 msgstr "Connexions Actives"
 
 #. This page gives an overview over currently active network connections.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:242
-msgid "a_n_conntrack_desc"
+msgid "This page gives an overview over currently active network connections."
 msgstr ""
 "Cette page donne une vue d'ensemble des connexions réseaux actuellement "
 "actives."
 
 #. Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:243
-msgid "a_n_routes"
+msgid "Routes"
 msgstr "Routes"
 
 #. IPv4 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:244
-msgid "a_n_routes4"
+msgid "IPv4 Routes"
 msgstr "IPv4 Routes"
 
 #. IPv6 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:245
-msgid "a_n_routes6"
+msgid "IPv6 Routes"
 msgstr "IPv6 Routes"
 
 #. In this area you find all network-related settings.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:246
-msgid "a_network1"
+msgid "In this area you find all network-related settings."
 msgstr "Dans cette section vous trouverez tous les réglages relatifs au réseau."
 
 #. On most routers the network switch can be freely configured and splitted up into several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:247
-msgid "a_network2"
+msgid "On most routers the network switch can be freely configured and splitted up into several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s."
 msgstr ""
 "Sur la plupart des routeurs, les ports des switchs peuvent être configurés "
 "et séparés en plusieurs VLANs."
 
 #. Interfaces and <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> / <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Settings allow a custom organisation of the network and connections to other networks like the internet.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:248
-msgid "a_network3"
+msgid "Interfaces and <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> / <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Settings allow a custom organisation of the network and connections to other networks like the internet."
 msgstr ""
 "Les réglages des interfaces et du PPPoE / PPTP vous permettent une "
 "configuration personalisée du réseau."
 
 #. With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> devices in your local network can be automatically configured for network communication.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:249
-msgid "a_network4"
+msgid "With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> devices in your local network can be automatically configured for network communication."
 msgstr ""
 "Les équipements utilisant DHCP dans votre réseau local peuvent être "
 "configurés automatique pour l'accès au réseau."
 
 #. Firewall and portforwarding can be used to secure your network while providing services to external networks.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:250
-msgid "a_network5"
+msgid "Firewall and portforwarding can be used to secure your network while providing services to external networks."
 msgstr ""
 "Le pare-feu et la redirection de ports peuvent être utilisés pour fournir un "
 "service interne à un réseau extérieur."
 
 #. The network ports on your router can be combined to several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s in which computers can communicate directly with each other. <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s are often used to separate different network segments. Often there is by default one Uplink port for a connection to the next greater network like the internet and other ports for a local network.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:251
-msgid "a_n_switch1"
+msgid "The network ports on your router can be combined to several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s in which computers can communicate directly with each other. <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s are often used to separate different network segments. Often there is by default one Uplink port for a connection to the next greater network like the internet and other ports for a local network."
 msgstr ""
 "Les ports de votre routeur peuvent être configurés pour combiner plusieurs "
 "VLANs dans lesquels les machines connectées peuvent dialoguer directement "
@@ -1375,7 +1375,7 @@ msgstr ""
 
 #. Ports belonging to a <abbr title=\"Virtual Local Area Network\">VLAN</abbr> are separated with spaces. The port with the highest number (usually 5) is oftern the connection to the internal network interface of the router. On devices with 5 ports often the one with the lowest number (0) is the predefined Uplink port.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:252
-msgid "network_switch_desc"
+msgid "Ports belonging to a <abbr title=\"Virtual Local Area Network\">VLAN</abbr> are separated with spaces. The port with the highest number (usually 5) is oftern the connection to the internal network interface of the router. On devices with 5 ports often the one with the lowest number (0) is the predefined Uplink port."
 msgstr ""
 "Les ports appartenant à un VLAN sont séparés par des espaces. Le port ayant "
 "le numéro le plus élevé (5 en général) est souvent connecté à l'interface "
@@ -1384,7 +1384,7 @@ msgstr ""
 
 #. On this page you can configure the network interfaces. You can bridge several interfaces by ticking the &quot;bridge interfaces&quot; field and enter the names of several network interfaces separated by spaces. You can also use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation <samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: <samp>eth0.1</samp>).
 #: i18n/english/luasrc/i18n/admin-core.en.lua:253
-msgid "a_n_ifaces1"
+msgid "On this page you can configure the network interfaces. You can bridge several interfaces by ticking the \"bridge interfaces\" field and enter the names of several network interfaces separated by spaces. You can also use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation <samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: <samp>eth0.1</samp>)."
 msgstr ""
 "Dans cette page vous pourrez configurer les interfaces réseaux. Vous pouvez "
 "bridger différentes interfaces en cochant le champ &quot;bridger les "
@@ -1394,110 +1394,110 @@ msgstr ""
 
 #. Bridge interfaces
 #: i18n/english/luasrc/i18n/admin-core.en.lua:254
-msgid "a_n_i_bridge"
+msgid "Bridge interfaces"
 msgstr "Bridger les interfaces"
 
 #. creates a bridge over specified interface(s)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:255
-msgid "a_n_i_bridge1"
+msgid "creates a bridge over specified interface(s)"
 msgstr "créer un bridge entre plusieurs interfaces"
 
 #. Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>
-msgid "a_n_i_stp"
+msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 msgstr ""
 
 #. Enables the Spanning Tree Protocol on this bridge
-msgid "a_n_i_stp1"
+msgid "Enables the Spanning Tree Protocol on this bridge"
 msgstr ""
 
 #. With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> network members can automatically receive their network settings (<abbr title=\"Internet Protocol\">IP</abbr>-address, netmask, <abbr title=\"Domain Name System\">DNS</abbr>-server, ...).
 #: i18n/english/luasrc/i18n/admin-core.en.lua:256
-msgid "dhcp_desc"
+msgid "With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> network members can automatically receive their network settings (<abbr title=\"Internet Protocol\">IP</abbr>-address, netmask, <abbr title=\"Domain Name System\">DNS</abbr>-server, ...)."
 msgstr ""
 "Avec DHCP, les machines connectées au réseau peuvent recevoir leurs réglages "
 "réseau directement (adresse IP, masque de réseau, serveur DNS, ...)"
 
 #. Leasetime
 #: i18n/english/luasrc/i18n/admin-core.en.lua:257
-msgid "dhcp_dhcp_leasetime"
+msgid "Leasetime"
 msgstr "Durée du bail"
 
 #. Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:258
-msgid "dhcp_dhcp_dynamicdhcp"
+msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 msgstr "DHCP dynamique"
 
 #. Ignore interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:259
-msgid "dhcp_dhcp_ignore"
+msgid "Ignore interface"
 msgstr "Ignorer l'interface"
 
 #. disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for this interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:260
-msgid "dhcp_dhcp_ignore_desc"
+msgid "disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for this interface"
 msgstr "désactiver DHCP sur cette interface"
 
 #. Force
 #: i18n/english/luasrc/i18n/admin-core.en.lua:261
-msgid "dhcp_dhcp_force"
+msgid "Force"
 msgstr "Forcer"
 
 #. first address (last octet)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:262
-msgid "dhcp_dhcp_start_desc"
+msgid "first address (last octet)"
 msgstr "première addresse (dernier octet)"
 
 #. number of leased addresses -1
 #: i18n/english/luasrc/i18n/admin-core.en.lua:263
-msgid "dhcp_dhcp_limit_desc"
+msgid "number of leased addresses -1"
 msgstr "nombre d'adresses disponibles - 1"
 
 #. DHCP-Options
 #: i18n/english/luasrc/i18n/admin-core.en.lua:264
-msgid "dhcp_dhcp_dhcpoption"
+msgid "DHCP-Options"
 msgstr "Options DHCP"
 
 #. See &quot;dnsmasq --help dhcp&quot; for a list of available options.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:265
-msgid "dhcp_dhcp_dhcpoption_desc"
+msgid "See \"dnsmasq --help dhcp\" for a list of available options."
 msgstr ""
 "Voir &quot;dnsmasq --help dhcp&quot; pour une liste d'options disponibles."
 
 #. Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:266
-msgid "dhcp_leases"
+msgid "Leases"
 msgstr "Baux"
 
 #. Static Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:267
-msgid "luci_ethers"
+msgid "Static Leases"
 msgstr "Baux Statiques"
 
 #. Leasetime remaining
 #: i18n/english/luasrc/i18n/admin-core.en.lua:268
-msgid "dhcp_timeremain"
+msgid "Leasetime remaining"
 msgstr "Durée de validité"
 
 #. Active Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:269
-msgid "dhcp_leases_active"
+msgid "Active Leases"
 msgstr "Baux actifs"
 
 #. Point-to-Point Connections
 #: i18n/english/luasrc/i18n/admin-core.en.lua:270
-msgid "a_n_ptp"
+msgid "Point-to-Point Connections"
 msgstr "Connexions Point-à-Point"
 
 #. Point-to-Point connections with <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> or <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr> are often used to connect a device over <abbr title=\"Digital Subscriber Line\">DSL</abbr> or similar technologies to an internet access point.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:271
-msgid "a_n_ptp1"
+msgid "Point-to-Point connections with <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> or <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr> are often used to connect a device over <abbr title=\"Digital Subscriber Line\">DSL</abbr> or similar technologies to an internet access point."
 msgstr ""
 "Les connexions Point-à-Point en PPPoE ou PPTP sont souvent utilisées pour "
 "connecter un équipement à internet sur du DSL ou une technologie similaire."
 
 #. You need to install &quot;comgt&quot; for UMTS/GPRS, &quot;ppp-mod-pppoe&quot; for PPPoE, &quot;ppp-mod-pppoa&quot; for PPPoA or &quot;pptp&quot; for PPtP support
 #: i18n/english/luasrc/i18n/admin-core.en.lua:272
-msgid "network_interface_prereq"
+msgid "You need to install \"comgt\" for UMTS/GPRS, \"ppp-mod-pppoe\" for PPPoE, \"ppp-mod-pppoa\" for PPPoA or \"pptp\" for PPtP support"
 msgstr ""
 "Vous avez besoin d'installer &quot;comgt&quot; pour le support UMTS/GPRS, "
 "&quot;ppp-mod-pppoe&quot; pour le PPPoE, &quot;ppp-mod-pppoa&quot; pour le "
@@ -1505,711 +1505,711 @@ msgstr ""
 
 #. You need to install &quot;ppp-mod-pppoe&quot; for PPPoE or &quot;pptp&quot; for PPtP support
 #: i18n/english/luasrc/i18n/admin-core.en.lua:273
-msgid "network_interface_prereq_mini"
+msgid "You need to install \"ppp-mod-pppoe\" for PPPoE or \"pptp\" for PPtP support"
 msgstr ""
 "Vous avez besoin d'installer &quot;ppp-mod-pppoe&quot; pour le support PPPoE "
 "ou &quot;pptp&quot; pour le PPtP"
 
 #. <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:274
-msgid "network_interface_server"
+msgid "<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"
 msgstr "Serveur PPTP"
 
 #. Automatic Disconnect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:275
-msgid "network_interface_demand"
+msgid "Automatic Disconnect"
 msgstr "Déconnexion automatique"
 
 #. Time (in seconds) after which an unused connection will be closed
 #: i18n/english/luasrc/i18n/admin-core.en.lua:276
-msgid "network_interface_demand_desc"
+msgid "Time (in seconds) after which an unused connection will be closed"
 msgstr "Délai d'inactivité à partir duquel la connexion est coupée"
 
 #. Keep-Alive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:277
-msgid "network_interface_keepalive"
+msgid "Keep-Alive"
 msgstr "Maintenir la connexion"
 
 #. Number of failed connection tests to initiate automatic reconnect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:278
-msgid "network_interface_keepalive_desc"
+msgid "Number of failed connection tests to initiate automatic reconnect"
 msgstr "Reconnexion si la connexion est perdue"
 
 #. Modem device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:279
-msgid "network_interface_device"
+msgid "Modem device"
 msgstr "Interface Modem"
 
 #. The device node of your modem, e.g. /dev/ttyUSB0
 #: i18n/english/luasrc/i18n/admin-core.en.lua:280
-msgid "network_interface_device_desc"
+msgid "The device node of your modem, e.g. /dev/ttyUSB0"
 msgstr "Le noeud d'interface de votre modem, e.g. /dev/ttyUSB0"
 
 #. Replace default route
 #: i18n/english/luasrc/i18n/admin-core.en.lua:281
-msgid "network_interface_defaultroute"
+msgid "Replace default route"
 msgstr "Remplacer la route par défaut"
 
 #. Let pppd replace the current default route to use the PPP interface after successful connect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:282
-msgid "network_interface_defaultroute_desc"
+msgid "Let pppd replace the current default route to use the PPP interface after successful connect"
 msgstr ""
 "Laisser pppd remplacer la route par défaut courante pour utiliser "
 "l'interface PPP après l'établissement de la connexion"
 
 #. Use peer DNS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:283
-msgid "network_interface_peerdns"
+msgid "Use peer DNS"
 msgstr "Utiliser le DNS fourni"
 
 #. Configure the local DNS server to use the name servers adverticed by the PPP peer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:284
-msgid "network_interface_peerdns_desc"
+msgid "Configure the local DNS server to use the name servers adverticed by the PPP peer"
 msgstr ""
 "Configurer le serveur DNS local pour utiliser le serveur de nom fourni par "
 "le pair PPP"
 
 #. Enable IPv6 on PPP link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:285
-msgid "network_interface_ipv6"
+msgid "Enable IPv6 on PPP link"
 msgstr "Activer l'IPv6 sur le lien PPP"
 
 #. Connect script
 #: i18n/english/luasrc/i18n/admin-core.en.lua:286
-msgid "network_interface_connect"
+msgid "Connect script"
 msgstr "Script de Connexion"
 
 #. Let pppd run this script after establishing the PPP link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:287
-msgid "network_interface_connect_desc"
+msgid "Let pppd run this script after establishing the PPP link"
 msgstr "pppd exécutera ce script après l'établissement du lien PPP"
 
 #. Disconnect script
 #: i18n/english/luasrc/i18n/admin-core.en.lua:288
-msgid "network_interface_disconnect"
+msgid "Disconnect script"
 msgstr "Script de Déconnexion"
 
 #. Let pppd run this script before tearing down the PPP link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:289
-msgid "network_interface_disconnect_desc"
+msgid "Let pppd run this script before tearing down the PPP link"
 msgstr "pppd exécutera ce script avant de déconnecter le lien PPP"
 
 #. Additional pppd options
 #: i18n/english/luasrc/i18n/admin-core.en.lua:290
-msgid "network_interface_pppd_options"
+msgid "Additional pppd options"
 msgstr "Options pppd supplémentaires"
 
 #. Specify additional command line arguments for pppd here
 #: i18n/english/luasrc/i18n/admin-core.en.lua:291
-msgid "network_interface_pppd_options_desc"
+msgid "Specify additional command line arguments for pppd here"
 msgstr ""
 "Spécifiez ici des arguments de ligne de commande supplémentaire pour pppd"
 
 #. Access point (APN)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:292
-msgid "network_interface_apn"
+msgid "Access point (APN)"
 msgstr "Point d'accès (APN)"
 
 #. PIN code
 #: i18n/english/luasrc/i18n/admin-core.en.lua:293
-msgid "network_interface_pincode"
+msgid "PIN code"
 msgstr "code PIN"
 
 #. Make sure that you provide the correct pin code here or you might lock your sim card!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:294
-msgid "network_interface_pincode_desc"
+msgid "Make sure that you provide the correct pin code here or you might lock your sim card!"
 msgstr ""
 "Assurez-vous de fournir le bon code PIN ou vous pourriez bloquer votre carte "
 "SIM !"
 
 #. Service type
 #: i18n/english/luasrc/i18n/admin-core.en.lua:295
-msgid "network_interface_service"
+msgid "Service type"
 msgstr "Type de service"
 
 #. Setup wait time
 #: i18n/english/luasrc/i18n/admin-core.en.lua:296
-msgid "network_interface_maxwait"
+msgid "Setup wait time"
 msgstr "Délai d'initialisation"
 
 #. Seconds to wait for the modem to become ready before attempting to connect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:297
-msgid "network_interface_maxwait_desc"
+msgid "Seconds to wait for the modem to become ready before attempting to connect"
 msgstr ""
 "Secondes à attendre pour que le modem soit prêt avant d'essayer de se "
 "connecter"
 
 #. PPPoA Encapsulation
 #: i18n/english/luasrc/i18n/admin-core.en.lua:298
-msgid "network_interface_encaps"
+msgid "PPPoA Encapsulation"
 msgstr "PPPoA Encapsulation"
 
 #. Routes specify over which interface and gateway a certain host or network can be reached.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:299
-msgid "a_n_r_routes1"
+msgid "Routes specify over which interface and gateway a certain host or network can be reached."
 msgstr ""
 "Avec les routes statiques vous pouvez spécifier à travers quelle interface "
 "ou passerelle un réseau peut être contacté."
 
 #. Static Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:300
-msgid "a_n_routes_static"
+msgid "Static Routes"
 msgstr "Routes statiques"
 
 #. Static IPv4 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:301
-msgid "a_n_routes_static4"
+msgid "Static IPv4 Routes"
 msgstr "Routes IPv4 statiques"
 
 #. Static IPv6 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:302
-msgid "a_n_routes_static6"
+msgid "Static IPv6 Routes"
 msgstr "Routes IPv6 statiques"
 
 #. Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:303
-msgid "a_n_routes_kernel4"
+msgid "Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes"
 msgstr "Routes <abbr title=\"Internet Protocol Version 4\">IPv4</abbr> actives"
 
 #. Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:304
-msgid "a_n_routes_kernel6"
+msgid "Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes"
 msgstr "Routes <abbr title=\"Internet Protocol Version 6\">IPv6</abbr> actives"
 
 #. Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:305
-msgid "a_n_r_target1"
+msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
 msgstr "adresse IP ou réseau"
 
 #. <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network (CIDR)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:306
-msgid "a_n_r_target6"
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network (CIDR)"
 msgstr "adresse IPv6 ou réseau"
 
 #. if target is a network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:307
-msgid "a_n_r_netmask1"
+msgid "if target is a network"
 msgstr "si la destination est un réseau"
 
 #. Internet Connection
 #: i18n/english/luasrc/i18n/admin-core.en.lua:308
-msgid "m_n_inet"
+msgid "Internet Connection"
 msgstr "Connexion Internet"
 
 #. Local Network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:309
-msgid "m_n_local"
+msgid "Local Network"
 msgstr "Réseau Local"
 
 #. Route
 #: i18n/english/luasrc/i18n/admin-core.en.lua:310
-msgid "m_n_route"
+msgid "Route"
 msgstr "Route"
 
 #. Bridge
 #: i18n/english/luasrc/i18n/admin-core.en.lua:311
-msgid "m_n_brdige"
+msgid "Bridge"
 msgstr "Bridge"
 
 #. Provide (Access Point)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:312
-msgid "m_w_ap"
+msgid "Provide (Access Point)"
 msgstr "Point d'accès"
 
 #. Independent (Ad-Hoc)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:313
-msgid "m_w_adhoc"
+msgid "Independent (Ad-Hoc)"
 msgstr "Ad-Hoc"
 
 #. Join (Client)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:314
-msgid "m_w_client"
+msgid "Join (Client)"
 msgstr "Client"
 
 #. Distributed (<abbr title=\"Wireless Distribution System\">WDS</abbr>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:315
-msgid "m_w_wds"
+msgid "Distributed (<abbr title=\"Wireless Distribution System\">WDS</abbr>)"
 msgstr "<abbr title=\"Wireless Distribution System\">WDS</abbr>"
 
 #. Clientmode
 #: i18n/english/luasrc/i18n/admin-core.en.lua:316
-msgid "m_w_clientmode"
+msgid "Clientmode"
 msgstr "Mode client"
 
 #. System log buffer size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:317
-msgid "system_system_logsize"
+msgid "System log buffer size"
 msgstr "Taille de buffer du journal système"
 
 #. External system log server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:318
-msgid "system_system_logip"
+msgid "External system log server"
 msgstr "Serveur externe pour le journal système"
 
 #. Log output level
 #: i18n/english/luasrc/i18n/admin-core.en.lua:319
-msgid "system_system_conloglevel"
+msgid "Log output level"
 msgstr "Niveau de gravité du journal"
 
 #. Level of log messages on the console
 #: i18n/english/luasrc/i18n/admin-core.en.lua:320
-msgid "system_system_conloglevel_desc"
+msgid "Level of log messages on the console"
 msgstr "Niveau de gravité du journal système affiché sur la console"
 
 #. Processor
 #: i18n/english/luasrc/i18n/admin-core.en.lua:321
-msgid "m_i_processor"
+msgid "Processor"
 msgstr "Processeur"
 
 #. Memory
 #: i18n/english/luasrc/i18n/admin-core.en.lua:322
-msgid "m_i_memory"
+msgid "Memory"
 msgstr "Mémoire"
 
 #. Local Time
 #: i18n/english/luasrc/i18n/admin-core.en.lua:323
-msgid "m_i_systemtime"
+msgid "Local Time"
 msgstr "Heure Locale"
 
 #. Uptime
 #: i18n/english/luasrc/i18n/admin-core.en.lua:324
-msgid "m_i_uptime"
+msgid "Uptime"
 msgstr "Uptime"
 
 #. First leased address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:325
-msgid "m_n_d_firstaddress"
+msgid "First leased address"
 msgstr "Première adresse attribuée"
 
 #. Number of leased addresses
 #: i18n/english/luasrc/i18n/admin-core.en.lua:326
-msgid "m_n_d_numleases"
+msgid "Number of leased addresses"
 msgstr "Nombre d'adresses attribuées"
 
 #. Routing table
 #: i18n/english/luasrc/i18n/admin-core.en.lua:327
-msgid "routingtable"
+msgid "Routing table"
 msgstr "Table de routage"
 
 #. Wifi scan
 #: i18n/english/luasrc/i18n/admin-core.en.lua:328
-msgid "wlanscan"
+msgid "Wifi scan"
 msgstr "Scan Wifi"
 
 #. Frequency
 #: i18n/english/luasrc/i18n/admin-core.en.lua:329
-msgid "frequency"
+msgid "Frequency"
 msgstr "Fréquence"
 
 #. Power
 #: i18n/english/luasrc/i18n/admin-core.en.lua:330
-msgid "power"
+msgid "Power"
 msgstr "Puissance"
 
 #. Noise
 #: i18n/english/luasrc/i18n/admin-core.en.lua:331
-msgid "noise"
+msgid "Noise"
 msgstr "Bruit"
 
 #. Signal
 #: i18n/english/luasrc/i18n/admin-core.en.lua:332
-msgid "signal"
+msgid "Signal"
 msgstr "Signal"
 
 #. Link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:333
-msgid "link"
+msgid "Link"
 msgstr "Lien"
 
 #. <abbr title=\"Fragmentation\">Frag.</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:334
-msgid "frag"
+msgid "<abbr title=\"Fragmentation\">Frag.</abbr>"
 msgstr "<abbr title=\"Fragmentation\">Frag.</abbr>"
 
 #. <abbr title=\"Request To Send\">RTS</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:335
-msgid "rts"
+msgid "<abbr title=\"Request To Send\">RTS</abbr>"
 msgstr "<abbr title=\"Request To Send\">RTS</abbr>"
 
 #. Bitrate
 #: i18n/english/luasrc/i18n/admin-core.en.lua:336
-msgid "bitrate"
+msgid "Bitrate"
 msgstr "Débit binaire"
 
 #. automatically reconnect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:337
-msgid "m_n_keepalive"
+msgid "automatically reconnect"
 msgstr "reconnecter automatiquement"
 
 #. disconnect when idle for
 #: i18n/english/luasrc/i18n/admin-core.en.lua:338
-msgid "m_n_dialondemand"
+msgid "disconnect when idle for"
 msgstr "déconnecter après une inactivité de"
 
 #. <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:339
-msgid "m_n_pptp_server"
+msgid "<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"
 msgstr "Serveur <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>"
 
 #. <abbr title=\"Light Emitting Diode\">LED</abbr> Configuration
 #: i18n/english/luasrc/i18n/admin-core.en.lua:340
-msgid "leds"
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "Configuration des <abbr title=\"Light Emitting Diode\">LED</abbr>s"
 
 #. Customizes the behaviour of the device <abbr title=\"Light Emitting Diode\">LED</abbr>s if possible.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:341
-msgid "leds_desc"
+msgid "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode\">LED</abbr>s if possible."
 msgstr ""
 "Personnaliser le comportement des <abbr title=\"Light Emitting "
 "Diode\">LED</abbr>s si possible."
 
 #. <abbr title=\"Light Emitting Diode\">LED</abbr> Name
 #: i18n/english/luasrc/i18n/admin-core.en.lua:342
-msgid "system_led_name"
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr "Nom de la <abbr title=\"Light Emitting Diode\">LED</abbr>"
 
 #. <abbr title=\"Light Emitting Diode\">LED</abbr> Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:343
-msgid "system_led_sysfs"
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Device"
 msgstr "Inteface de la <abbr title=\"Light Emitting Diode\">LED</abbr>"
 
 #. Default state
 #: i18n/english/luasrc/i18n/admin-core.en.lua:344
-msgid "system_led_default"
+msgid "Default state"
 msgstr "Etat par défaut"
 
 #. ticked = on
 #: i18n/english/luasrc/i18n/admin-core.en.lua:345
-msgid "system_led_default_desc"
+msgid "ticked = on"
 msgstr "ticked = on"
 
 #. Trigger
 #: i18n/english/luasrc/i18n/admin-core.en.lua:346
-msgid "system_led_trigger"
+msgid "Trigger"
 msgstr "Clignotant"
 
 #. None
 #: i18n/english/luasrc/i18n/admin-core.en.lua:347
-msgid "system_led_trigger_none"
+msgid "None"
 msgstr "Aucun"
 
 #. Default On
 #: i18n/english/luasrc/i18n/admin-core.en.lua:348
-msgid "system_led_trigger_defaulton"
+msgid "Default On"
 msgstr "Allumé par défaut"
 
 #. Timer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:349
-msgid "system_led_trigger_timer"
+msgid "Timer"
 msgstr "Timer"
 
 #. Heartbeat (Load Average)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:350
-msgid "system_led_trigger_heartbeat"
+msgid "Heartbeat (Load Average)"
 msgstr "Heartbeat (Load Average)"
 
 #. Network Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:351
-msgid "system_led_trigger_netdev"
+msgid "Network Device"
 msgstr "Interface Réseau"
 
 #. Off-State Delay
 #: i18n/english/luasrc/i18n/admin-core.en.lua:352
-msgid "system_led_delayoff"
+msgid "Off-State Delay"
 msgstr "Délai de l'état Off"
 
 #. Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is off
 #: i18n/english/luasrc/i18n/admin-core.en.lua:353
-msgid "system_led_delayoff_desc"
+msgid "Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is off"
 msgstr ""
 "Temps (en ms) pendant lequel la <abbr title=\"Light Emitting "
 "Diode\">LED</abbr> est éteinte"
 
 #. On-State Delay
 #: i18n/english/luasrc/i18n/admin-core.en.lua:354
-msgid "system_led_delayon"
+msgid "On-State Delay"
 msgstr "Délai de l'état On"
 
 #. Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is on
 #: i18n/english/luasrc/i18n/admin-core.en.lua:355
-msgid "system_led_delayon_desc"
+msgid "Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is on"
 msgstr ""
 "Temps (en ms) pendant lequel la <abbr title=\"Light Emitting "
 "Diode\">LED</abbr> est allumée"
 
 #. Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:356
-msgid "system_led_dev"
+msgid "Device"
 msgstr "Interface"
 
 #. Trigger Mode
 #: i18n/english/luasrc/i18n/admin-core.en.lua:357
-msgid "system_led_mode"
+msgid "Trigger Mode"
 msgstr "Mode Clignotant"
 
 #. Link On
 #: i18n/english/luasrc/i18n/admin-core.en.lua:358
-msgid "system_led_mode_link"
+msgid "Link On"
 msgstr "Lien établi"
 
 #. Transmit
 #: i18n/english/luasrc/i18n/admin-core.en.lua:359
-msgid "system_led_mode_tx"
+msgid "Transmit"
 msgstr "Transmet"
 
 #. Receive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:360
-msgid "system_led_mode_rx"
+msgid "Receive"
 msgstr "Reçoit"
 
 #. Active
 #: i18n/english/luasrc/i18n/admin-core.en.lua:361
-msgid "network_interface_up"
+msgid "Active"
 msgstr "Active"
 
 #. <abbr title=\"Media Access Control\">MAC</abbr>-Address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:362
-msgid "network_interface_hwaddr"
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr "Addresse <abbr title=\"Media Access Control\">MAC</abbr>"
 
 #. Hardware Address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:363
-msgid "network_interface_hwaddr_desc"
+msgid "Hardware Address"
 msgstr "Addresse matériel"
 
 #. Traffic
 #: i18n/english/luasrc/i18n/admin-core.en.lua:364
-msgid "network_interface_txrx"
+msgid "Traffic"
 msgstr "Trafic"
 
 #. transmitted / received
 #: i18n/english/luasrc/i18n/admin-core.en.lua:365
-msgid "network_interface_txrx_desc"
+msgid "transmitted / received"
 msgstr "transmis / reçu"
 
 #. Errors
 #: i18n/english/luasrc/i18n/admin-core.en.lua:366
-msgid "network_interface_err"
+msgid "Errors"
 msgstr "Erreurs"
 
 #. TX / RX
 #: i18n/english/luasrc/i18n/admin-core.en.lua:367
-msgid "network_interface_err_desc"
+msgid "TX / RX"
 msgstr "TX / RX"
 
 #. Create / Assign firewall-zone
 #: i18n/english/luasrc/i18n/admin-core.en.lua:368
-msgid "network_interface_fwzone"
+msgid "Create / Assign firewall-zone"
 msgstr "Créer / Assigner une zone du pare-feu"
 
 #. This interface does not belong to any firewall zone yet.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:369
-msgid "network_interface_fwzone_desc"
+msgid "Choose the firewall zone you want to assign to this interface. Select <em>unspecified</em> to remove the interface from the associated zone or fill out the <em>create</em> field to define a new zone and attach the interface to it."
 msgstr "Cette interface n'appartient à aucune zone du pare-feu pour le moment."
 
 #. Processes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:370
-msgid "process_head"
+msgid "Processes"
 msgstr "Processus"
 
 #. This list gives an overview over currently running system processes and their status.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:371
-msgid "process_descr"
+msgid "This list gives an overview over currently running system processes and their status."
 msgstr ""
 "Cette liste donne une vue d'ensemble des processus en exécution et leur "
 "statut."
 
 #. PID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:372
-msgid "process_pid"
+msgid "PID"
 msgstr "PID"
 
 #. Owner
 #: i18n/english/luasrc/i18n/admin-core.en.lua:373
-msgid "process_owner"
+msgid "Owner"
 msgstr "Propriétaire"
 
 #. Command
 #: i18n/english/luasrc/i18n/admin-core.en.lua:374
-msgid "process_command"
+msgid "Command"
 msgstr "Commande"
 
 #. CPU usage (%)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:375
-msgid "process_cpu"
+msgid "CPU usage (%)"
 msgstr "Utilisation CPU (%)"
 
 #. Memory usage (%)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:376
-msgid "process_mem"
+msgid "Memory usage (%)"
 msgstr "Utilisation Mémoire (%)"
 
 #. Hang Up
 #: i18n/english/luasrc/i18n/admin-core.en.lua:377
-msgid "process_hup"
+msgid "Hang Up"
 msgstr "Signal (HUP)"
 
 #. Terminate
 #: i18n/english/luasrc/i18n/admin-core.en.lua:378
-msgid "process_term"
+msgid "Terminate"
 msgstr "Terminer"
 
 #. Kill
 #: i18n/english/luasrc/i18n/admin-core.en.lua:379
-msgid "process_kill"
+msgid "Kill"
 msgstr "Tuer"
 
 #. cached
 #: i18n/english/luasrc/i18n/admin-core.en.lua:380
-msgid "mem_cached"
+msgid "cached"
 msgstr "mis en cache"
 
 #. buffered
 #: i18n/english/luasrc/i18n/admin-core.en.lua:381
-msgid "mem_buffered"
+msgid "buffered"
 msgstr "bufferisé"
 
 #. free
 #: i18n/english/luasrc/i18n/admin-core.en.lua:382
-msgid "mem_free"
+msgid "free"
 msgstr "libre"
 
 #. Scheduled Tasks
 #: i18n/english/luasrc/i18n/admin-core.en.lua:383
-msgid "a_s_crontab"
+msgid "Scheduled Tasks"
 msgstr "Tâches Régulières"
 
 #. This is the system crontab in which scheduled tasks can be defined.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:384
-msgid "a_s_crontab1"
+msgid "This is the system crontab in which scheduled tasks can be defined."
 msgstr ""
 "Ceci est le système crontab avec lequel sont définies les tâches "
 "récurrentes."
 
 #. NAS ID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:385
-msgid "a_w_nasid"
+msgid "NAS ID"
 msgstr "NAS ID"
 
 #. Path to CA-Certificate
 #: i18n/english/luasrc/i18n/admin-core.en.lua:386
-msgid "a_w_cacert"
+msgid "Path to CA-Certificate"
 msgstr "Chemin de la CA"
 
 #. EAP-Method
 #: i18n/english/luasrc/i18n/admin-core.en.lua:387
-msgid "a_w_eaptype"
+msgid "EAP-Method"
 msgstr "Méthode EAP"
 
 #. Path to Private Key
 #: i18n/english/luasrc/i18n/admin-core.en.lua:388
-msgid "a_w_tlsprivkey"
+msgid "Path to Private Key"
 msgstr "Chemin de la clé privée"
 
 #. Password of Private Key
 #: i18n/english/luasrc/i18n/admin-core.en.lua:389
-msgid "a_w_tlsprivkeypwd"
+msgid "Password of Private Key"
 msgstr "Mot de passe de la clé privée"
 
 #. Authentication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:390
-msgid "a_w_peapauth"
+msgid "Authentication"
 msgstr "Authentification"
 
 #. Identity
 #: i18n/english/luasrc/i18n/admin-core.en.lua:391
-msgid "a_w_peapidentity"
+msgid "Identity"
 msgstr "Identité"
 
 #. Password
 #: i18n/english/luasrc/i18n/admin-core.en.lua:392
-msgid "a_w_peappassword"
+msgid "Password"
 msgstr "Mot de passe"
 
 #. Create Network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:393
-msgid "a_w_create"
+msgid "Create Network"
 msgstr "Créer un réseau"
 
 #. Hostnames
 #: i18n/english/luasrc/i18n/admin-core.en.lua:394
-msgid "hostnames"
+msgid "Hostnames"
 msgstr "Noms d'hôtes"
 
 #. Host entries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:395
-msgid "hostnames_entries"
+msgid "Host entries"
 msgstr "Entrées d'hôtes"
 
 #. Hostname
 #: i18n/english/luasrc/i18n/admin-core.en.lua:396
-msgid "hostnames_hostname"
+msgid "Hostname"
 msgstr "Nom d'hôte"
 
 #. IP address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:397
-msgid "hostnames_address"
+msgid "IP address"
 msgstr "Adresse IP"
 
 #. Clamp Segment Size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:398
-msgid "m_n_mssfix"
+msgid "Clamp Segment Size"
 msgstr "Clamp Segment Size"
 
 #. Fixes problems with unreachable websites, submitting forms or other unexpected behaviour for some ISPs.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:399
-msgid "m_n_mssfix_desc"
+msgid "Fixes problems with unreachable websites, submitting forms or other unexpected behaviour for some ISPs."
 msgstr ""
 "Fixes problems with unreachable websites, submitting forms or other "
 "unexpected behaviour for some ISPs."
 
 #. Flash Firmware
 #: i18n/english/luasrc/i18n/admin-core.en.lua:400
-msgid "admin_upgrade"
+msgid "Flash Firmware"
 msgstr "Flash Firmware"
 
 #. The uploaded image file does not contain a supported format. Make sure that you choose the generic image format for your platform.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:401
-msgid "admin_upgrade_badimage"
+msgid "The uploaded image file does not contain a supported format. Make sure that you choose the generic image format for your platform."
 msgstr ""
 "The uploaded image file does not contain a supported format. Make sure that "
 "you choose the generic image format for your platform."
 
 #. Checksum
 #: i18n/english/luasrc/i18n/admin-core.en.lua:402
-msgid "admin_upgrade_checksum"
+msgid "Checksum"
 msgstr "Checksum"
 
 #. Upload an OpenWrt image file to reflash the device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:403
-msgid "admin_upgrade_desc"
+msgid "Upload an OpenWrt image file to reflash the device."
 msgstr "Upload an OpenWrt image file to reflash the device."
 
 #. Size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:404
-msgid "admin_upgrade_filesize"
+msgid "Size"
 msgstr "Size"
 
 #. Firmware image
 #: i18n/english/luasrc/i18n/admin-core.en.lua:405
-msgid "admin_upgrade_fwimage"
+msgid "Firmware image"
 msgstr "Firmware image"
 
 #. Keep configuration files
 #: i18n/english/luasrc/i18n/admin-core.en.lua:406
-msgid "admin_upgrade_keepcfg"
+msgid "Keep configuration files"
 msgstr "Keep configuration files"
 
 #. Sorry. OpenWrt does not support a system upgrade on this platform.<br /> You need to manually flash your device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:407
-msgid "admin_upgrade_nosupport"
+msgid "Sorry. OpenWrt does not support a system upgrade on this platform.<br /> You need to manually flash your device."
 msgstr ""
 "Sorry. OpenWrt does not support a system upgrade on this platform.<br /> You "
 "need to manually flash your device."
 
 #. The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a few minutes until you try to reconnect. It might be necessary to renew the address of your computer to reach the device again, depending on your settings.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:408
-msgid "admin_upgrade_running"
+msgid "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a few minutes until you try to reconnect. It might be necessary to renew the address of your computer to reach the device again, depending on your settings."
 msgstr ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
 "few minutes until you try to reconnect. It might be necessary to renew the "
@@ -2218,19 +2218,19 @@ msgstr ""
 
 #.  (%s available)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:409
-msgid "admin_upgrade_spaceavail"
+msgid " (%s available)"
 msgstr " (%s available)"
 
 #. It appears that you try to flash an image that does not fit into the flash memory, please verify the image file!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:410
-msgid "admin_upgrade_toolarge"
+msgid "It appears that you try to flash an image that does not fit into the flash memory, please verify the image file!"
 msgstr ""
 "It appears that you try to flash an image that does not fit into the flash "
 "memory, please verify the image file!"
 
 #. Upload image
 #: i18n/english/luasrc/i18n/admin-core.en.lua:411
-msgid "admin_upgrade_upload"
+msgid "Upload image"
 msgstr "Upload image"
 
 #. The flash image was uploaded. Below is the checksum and file size listed, compare them with the original file to ensure data integrity.<br /> Click \"Proceed\" below to start the flash procedure.
diff --git a/po/fr/asterisk.po b/po/fr/asterisk.po
index 89aa53994..32d1202a4 100644
--- a/po/fr/asterisk.po
+++ b/po/fr/asterisk.po
@@ -14,1252 +14,1252 @@ msgstr ""
 
 #. Asterisk General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:1
-msgid "asterisk_asterisk"
+msgid "Asterisk General Options"
 msgstr ""
 
 #. AGI directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:2
-msgid "asterisk_asterisk_agidir"
+msgid "AGI directory"
 msgstr ""
 
 #. Cache recorded sound files during recording
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:3
-msgid "asterisk_asterisk_cacherecordfiles"
+msgid "Cache recorded sound files during recording"
 msgstr ""
 
 #. Debug Level
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:4
-msgid "asterisk_asterisk_debug"
+msgid "Debug Level"
 msgstr ""
 
 #. Disable some warnings
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:5
-msgid "asterisk_asterisk_dontwarn"
+msgid "Disable some warnings"
 msgstr ""
 
 #. Dump core on crash
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:6
-msgid "asterisk_asterisk_dumpcore"
+msgid "Dump core on crash"
 msgstr ""
 
 #. High Priority
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:7
-msgid "asterisk_asterisk_highpriority"
+msgid "High Priority"
 msgstr ""
 
 #. Initialise Crypto
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:8
-msgid "asterisk_asterisk_initcrypto"
+msgid "Initialise Crypto"
 msgstr ""
 
 #. Use Internal Timing
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:9
-msgid "asterisk_asterisk_internaltiming"
+msgid "Use Internal Timing"
 msgstr ""
 
 #. Log directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:10
-msgid "asterisk_asterisk_logdir"
+msgid "Log directory"
 msgstr ""
 
 #. Maximum number of calls allowed
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:11
-msgid "asterisk_asterisk_maxcalls"
+msgid "Maximum number of calls allowed"
 msgstr ""
 
 #. Maximum load to stop accepting new calls
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:12
-msgid "asterisk_asterisk_maxload"
+msgid "Maximum load to stop accepting new calls"
 msgstr ""
 
 #. Disable console colors
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:13
-msgid "asterisk_asterisk_nocolor"
+msgid "Disable console colors"
 msgstr ""
 
 #. Sound files Cache directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:14
-msgid "asterisk_asterisk_recordcachedir"
+msgid "Sound files Cache directory"
 msgstr ""
 
 #. The Group to run as
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:15
-msgid "asterisk_asterisk_rungroup"
+msgid "The Group to run as"
 msgstr ""
 
 #. The User to run as
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:16
-msgid "asterisk_asterisk_runuser"
+msgid "The User to run as"
 msgstr ""
 
 #. Voicemail Spool directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:17
-msgid "asterisk_asterisk_spooldir"
+msgid "Voicemail Spool directory"
 msgstr ""
 
 #. Prefix UniquID with system name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:18
-msgid "asterisk_asterisk_systemname"
+msgid "Prefix UniquID with system name"
 msgstr ""
 
 #. Build transcode paths via SLINEAR, not directly
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:19
-msgid "asterisk_asterisk_transcodeviasln"
+msgid "Build transcode paths via SLINEAR, not directly"
 msgstr ""
 
 #. Transmit SLINEAR silence while recording a channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:20
-msgid "asterisk_asterisk_transmitsilenceduringrecord"
+msgid "Transmit SLINEAR silence while recording a channel"
 msgstr ""
 
 #. Verbose Level
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:21
-msgid "asterisk_asterisk_verbose"
+msgid "Verbose Level"
 msgstr ""
 
 #. Time Zone
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:22
-msgid "asterisk_asterisk_zone"
+msgid "Time Zone"
 msgstr ""
 
 #. Section dialplan
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:23
-msgid "asterisk_dialplan"
+msgid "Section dialplan"
 msgstr ""
 
 #. include
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:24
-msgid "asterisk_dialplan_include"
+msgid "include"
 msgstr ""
 
 #. Dialplan Extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:25
-msgid "asterisk_dialplanexten"
+msgid "Dialplan Extension"
 msgstr ""
 
 #. Dialplan General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:26
-msgid "asterisk_dialplangeneral"
+msgid "Dialplan General Options"
 msgstr ""
 
 #. Allow transfer
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:27
-msgid "asterisk_dialplangeneral_allowtransfer"
+msgid "Allow transfer"
 msgstr ""
 
 #. Reinvite/redirect media connections
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:28
-msgid "asterisk_dialplangeneral_canreinvite"
+msgid "Reinvite/redirect media connections"
 msgstr ""
 
 #. Clear global vars
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:29
-msgid "asterisk_dialplangeneral_clearglobalvars"
+msgid "Clear global vars"
 msgstr ""
 
 #. Dialplan Goto
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:30
-msgid "asterisk_dialplangoto"
+msgid "Dialplan Goto"
 msgstr ""
 
 #. Dialplan Conference
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:31
-msgid "asterisk_dialplanmeetme"
+msgid "Dialplan Conference"
 msgstr ""
 
 #. Dialplan Time
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:32
-msgid "asterisk_dialplansaytime"
+msgid "Dialplan Time"
 msgstr ""
 
 #. Dialplan Voicemail
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:33
-msgid "asterisk_dialplanvoice"
+msgid "Dialplan Voicemail"
 msgstr ""
 
 #. Dial Zones for Dialplan
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:34
-msgid "asterisk_dialzone"
+msgid "Dial Zones for Dialplan"
 msgstr ""
 
 #. Prefix to add matching dialplans
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:35
-msgid "asterisk_dialzone_addprefix"
+msgid "Prefix to add matching dialplans"
 msgstr ""
 
 #. Match International prefix
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:36
-msgid "asterisk_dialzone_international"
+msgid "Match International prefix"
 msgstr ""
 
 #. Prefix (0) to add/remove to/from international numbers
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:37
-msgid "asterisk_dialzone_localprefix"
+msgid "Prefix (0) to add/remove to/from international numbers"
 msgstr ""
 
 #. localzone
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:38
-msgid "asterisk_dialzone_localzone"
+msgid "localzone"
 msgstr ""
 
 #. Match plan
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:39
-msgid "asterisk_dialzone_match"
+msgid "Match plan"
 msgstr ""
 
 #. Connection to use
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:40
-msgid "asterisk_dialzone_uses"
+msgid "Connection to use"
 msgstr ""
 
 #. Feature Key maps
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:41
-msgid "asterisk_featuremap"
+msgid "Feature Key maps"
 msgstr ""
 
 #. Attended transfer key
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:42
-msgid "asterisk_featuremap_atxfer"
+msgid "Attended transfer key"
 msgstr ""
 
 #. Blind transfer key
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:43
-msgid "asterisk_featuremap_blindxfer"
+msgid "Blind transfer key"
 msgstr ""
 
 #. Key to Disconnect call
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:44
-msgid "asterisk_featuremap_disconnect"
+msgid "Key to Disconnect call"
 msgstr ""
 
 #. Key to Park call
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:45
-msgid "asterisk_featuremap_parkcall"
+msgid "Key to Park call"
 msgstr ""
 
 #. Parking Feature
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:46
-msgid "asterisk_featurepark"
+msgid "Parking Feature"
 msgstr ""
 
 #. ADSI Park
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:47
-msgid "asterisk_featurepark_adsipark"
+msgid "ADSI Park"
 msgstr ""
 
 #. Attended transfer timeout (sec)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:48
-msgid "asterisk_featurepark_atxfernoanswertimeout"
+msgid "Attended transfer timeout (sec)"
 msgstr ""
 
 #. One touch record key
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:49
-msgid "asterisk_featurepark_automon"
+msgid "One touch record key"
 msgstr ""
 
 #. Name of call context for parking
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:50
-msgid "asterisk_featurepark_context"
+msgid "Name of call context for parking"
 msgstr ""
 
 #. Sound file to play to parked caller
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:51
-msgid "asterisk_featurepark_courtesytone"
+msgid "Sound file to play to parked caller"
 msgstr ""
 
 #. Max time (ms) between digits for feature activation
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:52
-msgid "asterisk_featurepark_featuredigittimeout"
+msgid "Max time (ms) between digits for feature activation"
 msgstr ""
 
 #. Method to Find Parking slot
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:53
-msgid "asterisk_featurepark_findslot"
+msgid "Method to Find Parking slot"
 msgstr ""
 
 #. parkedmusicclass
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:54
-msgid "asterisk_featurepark_parkedmusicclass"
+msgid "parkedmusicclass"
 msgstr ""
 
 #. Play courtesy tone to
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:55
-msgid "asterisk_featurepark_parkedplay"
+msgid "Play courtesy tone to"
 msgstr ""
 
 #. Enable Parking
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:56
-msgid "asterisk_featurepark_parkenabled"
+msgid "Enable Parking"
 msgstr ""
 
 #. Extension to dial to park
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:57
-msgid "asterisk_featurepark_parkext"
+msgid "Extension to dial to park"
 msgstr ""
 
 #. Parking time (secs)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:58
-msgid "asterisk_featurepark_parkingtime"
+msgid "Parking time (secs)"
 msgstr ""
 
 #. Range of extensions for call parking
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:59
-msgid "asterisk_featurepark_parkpos"
+msgid "Range of extensions for call parking"
 msgstr ""
 
 #. Pickup extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:60
-msgid "asterisk_featurepark_pickupexten"
+msgid "Pickup extension"
 msgstr ""
 
 #. Seconds to wait bewteen digits when transferring
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:61
-msgid "asterisk_featurepark_transferdigittimeout"
+msgid "Seconds to wait bewteen digits when transferring"
 msgstr ""
 
 #. sound when attended transfer is complete
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:62
-msgid "asterisk_featurepark_xferfailsound"
+msgid "sound when attended transfer is complete"
 msgstr ""
 
 #. Sound when attended transfer fails
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:63
-msgid "asterisk_featurepark_xfersound"
+msgid "Sound when attended transfer fails"
 msgstr ""
 
 #. Reload Hardware Config
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:64
-msgid "asterisk_hardwarereboot"
+msgid "Reload Hardware Config"
 msgstr ""
 
 #. Reboot Method
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:65
-msgid "asterisk_hardwarereboot_method"
+msgid "Reboot Method"
 msgstr ""
 
 #. Parameter
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:66
-msgid "asterisk_hardwarereboot_param"
+msgid "Parameter"
 msgstr ""
 
 #. SIP Connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:67
-msgid "asterisk_iax"
+msgid "SIP Connection"
 msgstr ""
 
 #. Always Dial International
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:68
-msgid "asterisk_iax_alwaysinternational"
+msgid "Always Dial International"
 msgstr ""
 
 #. context
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:69
-msgid "asterisk_iax_context"
+msgid "context"
 msgstr ""
 
 #. Country Code for connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:70
-msgid "asterisk_iax_countrycode"
+msgid "Country Code for connection"
 msgstr ""
 
 #. Add as Extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:71
-msgid "asterisk_iax_extension"
+msgid "Add as Extension"
 msgstr ""
 
 #. Host name (or blank)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:72
-msgid "asterisk_iax_host"
+msgid "Host name (or blank)"
 msgstr ""
 
 #. International Dial Prefix
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:73
-msgid "asterisk_iax_internationalprefix"
+msgid "International Dial Prefix"
 msgstr ""
 
 #. Dial Prefix (for external line)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:74
-msgid "asterisk_iax_prefix"
+msgid "Dial Prefix (for external line)"
 msgstr ""
 
 #. Secret
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:75
-msgid "asterisk_iax_secret"
+msgid "Secret"
 msgstr ""
 
 #. Dial Timeout (sec)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:76
-msgid "asterisk_iax_timeout"
+msgid "Dial Timeout (sec)"
 msgstr ""
 
 #. Option type
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:77
-msgid "asterisk_iax_type"
+msgid "Option type"
 msgstr ""
 
 #. User name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:78
-msgid "asterisk_iax_username"
+msgid "User name"
 msgstr ""
 
 #. IAX General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:79
-msgid "asterisk_iaxgeneral"
+msgid "IAX General Options"
 msgstr ""
 
 #. Allow Codecs
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:80
-msgid "asterisk_iaxgeneral_allow"
+msgid "Allow Codecs"
 msgstr ""
 
 #. Reinvite/redirect media connections
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:81
-msgid "asterisk_iaxgeneral_canreinvite"
+msgid "Reinvite/redirect media connections"
 msgstr ""
 
 #. Static
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:82
-msgid "asterisk_iaxgeneral_static"
+msgid "Static"
 msgstr ""
 
 #. Write Protect
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:83
-msgid "asterisk_iaxgeneral_writeprotect"
+msgid "Write Protect"
 msgstr ""
 
 #. Meetme Conference
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:84
-msgid "asterisk_meetme"
+msgid "Meetme Conference"
 msgstr ""
 
 #. Admin PIN
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:85
-msgid "asterisk_meetme_adminpin"
+msgid "Admin PIN"
 msgstr ""
 
 #. Meeting PIN
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:86
-msgid "asterisk_meetme_pin"
+msgid "Meeting PIN"
 msgstr ""
 
 #. Meetme Conference General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:87
-msgid "asterisk_meetmegeneral"
+msgid "Meetme Conference General Options"
 msgstr ""
 
 #. Number of 20ms audio buffers to be used
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:88
-msgid "asterisk_meetmegeneral_audiobuffers"
+msgid "Number of 20ms audio buffers to be used"
 msgstr ""
 
 #. Modules
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:89
-msgid "asterisk_module"
+msgid "Modules"
 msgstr ""
 
 #. Alarm Receiver Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:90
-msgid "asterisk_module_appalarmreceiver"
+msgid "Alarm Receiver Application"
 msgstr ""
 
 #. Authentication Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:91
-msgid "asterisk_module_appauthenticate"
+msgid "Authentication Application"
 msgstr ""
 
 #. Make sure asterisk doesnt save CDR
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:92
-msgid "asterisk_module_appcdr"
+msgid "Make sure asterisk doesnt save CDR"
 msgstr ""
 
 #. Check if channel is available
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:93
-msgid "asterisk_module_appchanisavail"
+msgid "Check if channel is available"
 msgstr ""
 
 #. Listen in on any channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:94
-msgid "asterisk_module_appchanspy"
+msgid "Listen in on any channel"
 msgstr ""
 
 #. Control Playback Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:95
-msgid "asterisk_module_appcontrolplayback"
+msgid "Control Playback Application"
 msgstr ""
 
 #. Cuts up variables
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:96
-msgid "asterisk_module_appcut"
+msgid "Cuts up variables"
 msgstr ""
 
 #. Database access functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:97
-msgid "asterisk_module_appdb"
+msgid "Database access functions"
 msgstr ""
 
 #. Dialing Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:98
-msgid "asterisk_module_appdial"
+msgid "Dialing Application"
 msgstr ""
 
 #. Virtual Dictation Machine Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:99
-msgid "asterisk_module_appdictate"
+msgid "Virtual Dictation Machine Application"
 msgstr ""
 
 #. Directed Call Pickup Support
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:100
-msgid "asterisk_module_appdirectedpickup"
+msgid "Directed Call Pickup Support"
 msgstr ""
 
 #. Extension Directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:101
-msgid "asterisk_module_appdirectory"
+msgid "Extension Directory"
 msgstr ""
 
 #. DISA (Direct Inward System Access) Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:102
-msgid "asterisk_module_appdisa"
+msgid "DISA (Direct Inward System Access) Application"
 msgstr ""
 
 #. Dump channel variables Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:103
-msgid "asterisk_module_appdumpchan"
+msgid "Dump channel variables Application"
 msgstr ""
 
 #. Simple Echo Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:104
-msgid "asterisk_module_appecho"
+msgid "Simple Echo Application"
 msgstr ""
 
 #. ENUM Lookup
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:105
-msgid "asterisk_module_appenumlookup"
+msgid "ENUM Lookup"
 msgstr ""
 
 #. Reevaluates strings
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:106
-msgid "asterisk_module_appeval"
+msgid "Reevaluates strings"
 msgstr ""
 
 #. Executes applications
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:107
-msgid "asterisk_module_appexec"
+msgid "Executes applications"
 msgstr ""
 
 #. External IVR application interface
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:108
-msgid "asterisk_module_appexternalivr"
+msgid "External IVR application interface"
 msgstr ""
 
 #. Fork The CDR into 2 seperate entities
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:109
-msgid "asterisk_module_appforkcdr"
+msgid "Fork The CDR into 2 seperate entities"
 msgstr ""
 
 #. Get ADSI CPE ID
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:110
-msgid "asterisk_module_appgetcpeid"
+msgid "Get ADSI CPE ID"
 msgstr ""
 
 #. Group Management Routines
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:111
-msgid "asterisk_module_appgroupcount"
+msgid "Group Management Routines"
 msgstr ""
 
 #. Encode and Stream via icecast and ices
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:112
-msgid "asterisk_module_appices"
+msgid "Encode and Stream via icecast and ices"
 msgstr ""
 
 #. Image Transmission Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:113
-msgid "asterisk_module_appimage"
+msgid "Image Transmission Application"
 msgstr ""
 
 #. Look up Caller*ID name/number from black
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:114
-msgid "asterisk_module_applookupblacklist"
+msgid "Look up Caller*ID name/number from black"
 msgstr ""
 
 #. Look up CallerID Name from local databas
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:115
-msgid "asterisk_module_applookupcidname"
+msgid "Look up CallerID Name from local databas"
 msgstr ""
 
 #. Extension Macros
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:116
-msgid "asterisk_module_appmacro"
+msgid "Extension Macros"
 msgstr ""
 
 #. A simple math Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:117
-msgid "asterisk_module_appmath"
+msgid "A simple math Application"
 msgstr ""
 
 #. MD5 checksum Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:118
-msgid "asterisk_module_appmd5"
+msgid "MD5 checksum Application"
 msgstr ""
 
 #. Digital Milliwatt (mu-law) Test Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:119
-msgid "asterisk_module_appmilliwatt"
+msgid "Digital Milliwatt (mu-law) Test Application"
 msgstr ""
 
 #. Record a call and mix the audio during the recording
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:120
-msgid "asterisk_module_appmixmonitor"
+msgid "Record a call and mix the audio during the recording"
 msgstr ""
 
 #. Call Parking and Announce Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:121
-msgid "asterisk_module_appparkandannounce"
+msgid "Call Parking and Announce Application"
 msgstr ""
 
 #. Trivial Playback Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:122
-msgid "asterisk_module_appplayback"
+msgid "Trivial Playback Application"
 msgstr ""
 
 #. Require phone number to be entered
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:123
-msgid "asterisk_module_appprivacy"
+msgid "Require phone number to be entered"
 msgstr ""
 
 #. True Call Queueing
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:124
-msgid "asterisk_module_appqueue"
+msgid "True Call Queueing"
 msgstr ""
 
 #. Random goto
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:125
-msgid "asterisk_module_apprandom"
+msgid "Random goto"
 msgstr ""
 
 #. Read Variable Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:126
-msgid "asterisk_module_appread"
+msgid "Read Variable Application"
 msgstr ""
 
 #. Read in a file
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:127
-msgid "asterisk_module_appreadfile"
+msgid "Read in a file"
 msgstr ""
 
 #. Realtime Data Lookup/Rewrite
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:128
-msgid "asterisk_module_apprealtime"
+msgid "Realtime Data Lookup/Rewrite"
 msgstr ""
 
 #. Trivial Record Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:129
-msgid "asterisk_module_apprecord"
+msgid "Trivial Record Application"
 msgstr ""
 
 #. Say time
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:130
-msgid "asterisk_module_appsayunixtime"
+msgid "Say time"
 msgstr ""
 
 #. Send DTMF digits Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:131
-msgid "asterisk_module_appsenddtmf"
+msgid "Send DTMF digits Application"
 msgstr ""
 
 #. Send Text Applications
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:132
-msgid "asterisk_module_appsendtext"
+msgid "Send Text Applications"
 msgstr ""
 
 #. Set CallerID Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:133
-msgid "asterisk_module_appsetcallerid"
+msgid "Set CallerID Application"
 msgstr ""
 
 #. CDR user field apps
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:134
-msgid "asterisk_module_appsetcdruserfield"
+msgid "CDR user field apps"
 msgstr ""
 
 #. load =&gt; .so ; Set CallerID Name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:135
-msgid "asterisk_module_appsetcidname"
+msgid "load => .so ; Set CallerID Name"
 msgstr ""
 
 #. load =&gt; .so ; Set CallerID Number
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:136
-msgid "asterisk_module_appsetcidnum"
+msgid "load => .so ; Set CallerID Number"
 msgstr ""
 
 #. Set RDNIS Number
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:137
-msgid "asterisk_module_appsetrdnis"
+msgid "Set RDNIS Number"
 msgstr ""
 
 #. Set ISDN Transfer Capability
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:138
-msgid "asterisk_module_appsettransfercapability"
+msgid "Set ISDN Transfer Capability"
 msgstr ""
 
 #. SMS/PSTN handler
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:139
-msgid "asterisk_module_appsms"
+msgid "SMS/PSTN handler"
 msgstr ""
 
 #. Hangs up the requested channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:140
-msgid "asterisk_module_appsofthangup"
+msgid "Hangs up the requested channel"
 msgstr ""
 
 #. Stack Routines
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:141
-msgid "asterisk_module_appstack"
+msgid "Stack Routines"
 msgstr ""
 
 #. Generic System() application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:142
-msgid "asterisk_module_appsystem"
+msgid "Generic System() application"
 msgstr ""
 
 #. Playback with Talk Detection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:143
-msgid "asterisk_module_apptalkdetect"
+msgid "Playback with Talk Detection"
 msgstr ""
 
 #. Interface Test Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:144
-msgid "asterisk_module_apptest"
+msgid "Interface Test Application"
 msgstr ""
 
 #. Transfer
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:145
-msgid "asterisk_module_apptransfer"
+msgid "Transfer"
 msgstr ""
 
 #. TXTCIDName
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:146
-msgid "asterisk_module_apptxtcidname"
+msgid "TXTCIDName"
 msgstr ""
 
 #. Send URL Applications
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:147
-msgid "asterisk_module_appurl"
+msgid "Send URL Applications"
 msgstr ""
 
 #. Custom User Event Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:148
-msgid "asterisk_module_appuserevent"
+msgid "Custom User Event Application"
 msgstr ""
 
 #. Send verbose output
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:149
-msgid "asterisk_module_appverbose"
+msgid "Send verbose output"
 msgstr ""
 
 #. Voicemail
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:150
-msgid "asterisk_module_appvoicemail"
+msgid "Voicemail"
 msgstr ""
 
 #. Waits until first ring after time
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:151
-msgid "asterisk_module_appwaitforring"
+msgid "Waits until first ring after time"
 msgstr ""
 
 #. Wait For Silence Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:152
-msgid "asterisk_module_appwaitforsilence"
+msgid "Wait For Silence Application"
 msgstr ""
 
 #. While Loops and Conditional Execution
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:153
-msgid "asterisk_module_appwhile"
+msgid "While Loops and Conditional Execution"
 msgstr ""
 
 #. Comma Separated Values CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:154
-msgid "asterisk_module_cdrcsv"
+msgid "Comma Separated Values CDR Backend"
 msgstr ""
 
 #. Customizable Comma Separated Values CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:155
-msgid "asterisk_module_cdrcustom"
+msgid "Customizable Comma Separated Values CDR Backend"
 msgstr ""
 
 #. Asterisk Call Manager CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:156
-msgid "asterisk_module_cdrmanager"
+msgid "Asterisk Call Manager CDR Backend"
 msgstr ""
 
 #. MySQL CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:157
-msgid "asterisk_module_cdrmysql"
+msgid "MySQL CDR Backend"
 msgstr ""
 
 #. PostgreSQL CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:158
-msgid "asterisk_module_cdrpgsql"
+msgid "PostgreSQL CDR Backend"
 msgstr ""
 
 #. SQLite CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:159
-msgid "asterisk_module_cdrsqlite"
+msgid "SQLite CDR Backend"
 msgstr ""
 
 #. Agent Proxy Channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:160
-msgid "asterisk_module_chanagent"
+msgid "Agent Proxy Channel"
 msgstr ""
 
 #. Channel driver for GTalk
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:161
-msgid "asterisk_module_chanalsa"
+msgid "Channel driver for GTalk"
 msgstr ""
 
 #. Channel driver for GTalk
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:162
-msgid "asterisk_module_changtalk"
+msgid "Channel driver for GTalk"
 msgstr ""
 
 #. Option chan_iax2
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:163
-msgid "asterisk_module_chaniax2"
+msgid "Option chan_iax2"
 msgstr ""
 
 #. Local Proxy Channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:164
-msgid "asterisk_module_chanlocal"
+msgid "Local Proxy Channel"
 msgstr ""
 
 #. Session Initiation Protocol (SIP)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:165
-msgid "asterisk_module_chansip"
+msgid "Session Initiation Protocol (SIP)"
 msgstr ""
 
 #. Adaptive Differential PCM Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:166
-msgid "asterisk_module_codecadpcm"
+msgid "Adaptive Differential PCM Coder/Decoder"
 msgstr ""
 
 #. A-law Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:167
-msgid "asterisk_module_codecalaw"
+msgid "A-law Coder/Decoder"
 msgstr ""
 
 #. A-law and Mulaw direct Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:168
-msgid "asterisk_module_codecamu"
+msgid "A-law and Mulaw direct Coder/Decoder"
 msgstr ""
 
 #. ITU G.726-32kbps G726 Transcoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:169
-msgid "asterisk_module_codecg726"
+msgid "ITU G.726-32kbps G726 Transcoder"
 msgstr ""
 
 #. GSM/PCM16 (signed linear) Codec Translation
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:170
-msgid "asterisk_module_codecgsm"
+msgid "GSM/PCM16 (signed linear) Codec Translation"
 msgstr ""
 
 #. Speex/PCM16 (signed linear) Codec Translator
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:171
-msgid "asterisk_module_codecspeex"
+msgid "Speex/PCM16 (signed linear) Codec Translator"
 msgstr ""
 
 #. Mu-law Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:172
-msgid "asterisk_module_codeculaw"
+msgid "Mu-law Coder/Decoder"
 msgstr ""
 
 #. Sun Microsystems AU format (signed linear)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:173
-msgid "asterisk_module_formatau"
+msgid "Sun Microsystems AU format (signed linear)"
 msgstr ""
 
 #. G.723.1 Simple Timestamp File Format
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:174
-msgid "asterisk_module_formatg723"
+msgid "G.723.1 Simple Timestamp File Format"
 msgstr ""
 
 #. Raw G.726 (16/24/32/40kbps) data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:175
-msgid "asterisk_module_formatg726"
+msgid "Raw G.726 (16/24/32/40kbps) data"
 msgstr ""
 
 #. Raw G729 data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:176
-msgid "asterisk_module_formatg729"
+msgid "Raw G729 data"
 msgstr ""
 
 #. Raw GSM data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:177
-msgid "asterisk_module_formatgsm"
+msgid "Raw GSM data"
 msgstr ""
 
 #. Raw h263 data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:178
-msgid "asterisk_module_formath263"
+msgid "Raw h263 data"
 msgstr ""
 
 #. JPEG (Joint Picture Experts Group) Image
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:179
-msgid "asterisk_module_formatjpeg"
+msgid "JPEG (Joint Picture Experts Group) Image"
 msgstr ""
 
 #. Raw uLaw 8khz Audio support (PCM)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:180
-msgid "asterisk_module_formatpcm"
+msgid "Raw uLaw 8khz Audio support (PCM)"
 msgstr ""
 
 #. load =&gt; .so ; Raw aLaw 8khz PCM Audio support
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:181
-msgid "asterisk_module_formatpcmalaw"
+msgid "load => .so ; Raw aLaw 8khz PCM Audio support"
 msgstr ""
 
 #. Raw Signed Linear Audio support (SLN)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:182
-msgid "asterisk_module_formatsln"
+msgid "Raw Signed Linear Audio support (SLN)"
 msgstr ""
 
 #. Dialogic VOX (ADPCM) File Format
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:183
-msgid "asterisk_module_formatvox"
+msgid "Dialogic VOX (ADPCM) File Format"
 msgstr ""
 
 #. Microsoft WAV format (8000hz Signed Line
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:184
-msgid "asterisk_module_formatwav"
+msgid "Microsoft WAV format (8000hz Signed Line"
 msgstr ""
 
 #. Microsoft WAV format (Proprietary GSM)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:185
-msgid "asterisk_module_formatwavgsm"
+msgid "Microsoft WAV format (Proprietary GSM)"
 msgstr ""
 
 #. Caller ID related dialplan functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:186
-msgid "asterisk_module_funccallerid"
+msgid "Caller ID related dialplan functions"
 msgstr ""
 
 #. ENUM Functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:187
-msgid "asterisk_module_funcenum"
+msgid "ENUM Functions"
 msgstr ""
 
 #. URI encoding / decoding functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:188
-msgid "asterisk_module_funcuri"
+msgid "URI encoding / decoding functions"
 msgstr ""
 
 #. Asterisk Extension Language Compiler
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:189
-msgid "asterisk_module_pbxael"
+msgid "Asterisk Extension Language Compiler"
 msgstr ""
 
 #. Text Extension Configuration
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:190
-msgid "asterisk_module_pbxconfig"
+msgid "Text Extension Configuration"
 msgstr ""
 
 #. load =&gt; .so ; Builtin dialplan functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:191
-msgid "asterisk_module_pbxfunctions"
+msgid "load => .so ; Builtin dialplan functions"
 msgstr ""
 
 #. Loopback Switch
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:192
-msgid "asterisk_module_pbxloopback"
+msgid "Loopback Switch"
 msgstr ""
 
 #. Realtime Switch
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:193
-msgid "asterisk_module_pbxrealtime"
+msgid "Realtime Switch"
 msgstr ""
 
 #. Outgoing Spool Support
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:194
-msgid "asterisk_module_pbxspool"
+msgid "Outgoing Spool Support"
 msgstr ""
 
 #. Wil Cal U (Auto Dialer)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:195
-msgid "asterisk_module_pbxwilcalu"
+msgid "Wil Cal U (Auto Dialer)"
 msgstr ""
 
 #. MySQL Config Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:196
-msgid "asterisk_module_resconfigmysql"
+msgid "MySQL Config Resource"
 msgstr ""
 
 #. ODBC Config Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:197
-msgid "asterisk_module_resconfigodbc"
+msgid "ODBC Config Resource"
 msgstr ""
 
 #. PGSQL Module
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:198
-msgid "asterisk_module_resconfigpgsql"
+msgid "PGSQL Module"
 msgstr ""
 
 #. Cryptographic Digital Signatures
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:199
-msgid "asterisk_module_rescrypto"
+msgid "Cryptographic Digital Signatures"
 msgstr ""
 
 #. Call Parking Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:200
-msgid "asterisk_module_resfeatures"
+msgid "Call Parking Resource"
 msgstr ""
 
 #. Indications Configuration
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:201
-msgid "asterisk_module_resindications"
+msgid "Indications Configuration"
 msgstr ""
 
 #. Call Monitoring Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:202
-msgid "asterisk_module_resmonitor"
+msgid "Call Monitoring Resource"
 msgstr ""
 
 #. Music On Hold Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:203
-msgid "asterisk_module_resmusiconhold"
+msgid "Music On Hold Resource"
 msgstr ""
 
 #. ODBC Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:204
-msgid "asterisk_module_resodbc"
+msgid "ODBC Resource"
 msgstr ""
 
 #. SMDI Module
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:205
-msgid "asterisk_module_ressmdi"
+msgid "SMDI Module"
 msgstr ""
 
 #. SNMP Module
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:206
-msgid "asterisk_module_ressnmp"
+msgid "SNMP Module"
 msgstr ""
 
 #. Music On Hold
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:207
-msgid "asterisk_moh"
+msgid "Music On Hold"
 msgstr ""
 
 #. Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:208
-msgid "asterisk_moh_application"
+msgid "Application"
 msgstr ""
 
 #. Directory of Music
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:209
-msgid "asterisk_moh_directory"
+msgid "Directory of Music"
 msgstr ""
 
 #. Option mode
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:210
-msgid "asterisk_moh_mode"
+msgid "Option mode"
 msgstr ""
 
 #. Random Play
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:211
-msgid "asterisk_moh_random"
+msgid "Random Play"
 msgstr ""
 
 #. SIP Connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:212
-msgid "asterisk_sip"
+msgid "SIP Connection"
 msgstr ""
 
 #. Always Dial International
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:213
-msgid "asterisk_sip_alwaysinternational"
+msgid "Always Dial International"
 msgstr ""
 
 #. Reinvite/redirect media connections
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:214
-msgid "asterisk_sip_canreinvite"
+msgid "Reinvite/redirect media connections"
 msgstr ""
 
 #. context
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:215
-msgid "asterisk_sip_context"
+msgid "context"
 msgstr ""
 
 #. Country Code for connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:216
-msgid "asterisk_sip_countrycode"
+msgid "Country Code for connection"
 msgstr ""
 
 #. DTMF mode
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:217
-msgid "asterisk_sip_dtmfmode"
+msgid "DTMF mode"
 msgstr ""
 
 #. Add as Extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:218
-msgid "asterisk_sip_extension"
+msgid "Add as Extension"
 msgstr ""
 
 #. Primary domain identity for From: headers
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:219
-msgid "asterisk_sip_fromdomain"
+msgid "Primary domain identity for From: headers"
 msgstr ""
 
 #. From user (required by many SIP providers)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:220
-msgid "asterisk_sip_fromuser"
+msgid "From user (required by many SIP providers)"
 msgstr ""
 
 #. Host name (or blank)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:221
-msgid "asterisk_sip_host"
+msgid "Host name (or blank)"
 msgstr ""
 
 #. Ring on incoming dialplan contexts
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:222
-msgid "asterisk_sip_incoming"
+msgid "Ring on incoming dialplan contexts"
 msgstr ""
 
 #. Allow Insecure for
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:223
-msgid "asterisk_sip_insecure"
+msgid "Allow Insecure for"
 msgstr ""
 
 #. International Dial Prefix
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:224
-msgid "asterisk_sip_internationalprefix"
+msgid "International Dial Prefix"
 msgstr ""
 
 #. Mailbox for MWI
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:225
-msgid "asterisk_sip_mailbox"
+msgid "Mailbox for MWI"
 msgstr ""
 
 #. NAT between phone and Asterisk
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:226
-msgid "asterisk_sip_nat"
+msgid "NAT between phone and Asterisk"
 msgstr ""
 
 #. Check tags in headers
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:227
-msgid "asterisk_sip_pedantic"
+msgid "Check tags in headers"
 msgstr ""
 
 #. SIP Port
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:228
-msgid "asterisk_sip_port"
+msgid "SIP Port"
 msgstr ""
 
 #. Dial Prefix (for external line)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:229
-msgid "asterisk_sip_prefix"
+msgid "Dial Prefix (for external line)"
 msgstr ""
 
 #. Reply Timeout (ms) for down connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:230
-msgid "asterisk_sip_qualify"
+msgid "Reply Timeout (ms) for down connection"
 msgstr ""
 
 #. Register connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:231
-msgid "asterisk_sip_register"
+msgid "Register connection"
 msgstr ""
 
 #. Secret
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:232
-msgid "asterisk_sip_secret"
+msgid "Secret"
 msgstr ""
 
 #. Dial own extension for mailbox
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:233
-msgid "asterisk_sip_selfmailbox"
+msgid "Dial own extension for mailbox"
 msgstr ""
 
 #. Dial Timeout (sec)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:234
-msgid "asterisk_sip_timeout"
+msgid "Dial Timeout (sec)"
 msgstr ""
 
 #. Client Type
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:235
-msgid "asterisk_sip_type"
+msgid "Client Type"
 msgstr ""
 
 #. Username
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:236
-msgid "asterisk_sip_username"
+msgid "Username"
 msgstr ""
 
 #. Section sipgeneral
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:237
-msgid "asterisk_sipgeneral"
+msgid "Section sipgeneral"
 msgstr ""
 
 #. Allow codecs
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:238
-msgid "asterisk_sipgeneral_allow"
+msgid "Allow codecs"
 msgstr ""
 
 #. SIP Port
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:239
-msgid "asterisk_sipgeneral_port"
+msgid "SIP Port"
 msgstr ""
 
 #. SIP realm
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:240
-msgid "asterisk_sipgeneral_realm"
+msgid "SIP realm"
 msgstr ""
 
 #. Voicemail general options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:241
-msgid "asterisk_voicegeneral"
+msgid "Voicemail general options"
 msgstr ""
 
 #. From Email address of server
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:242
-msgid "asterisk_voicegeneral_serveremail"
+msgid "From Email address of server"
 msgstr ""
 
 #. Voice Mail boxes
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:243
-msgid "asterisk_voicemail"
+msgid "Voice Mail boxes"
 msgstr ""
 
 #. Email contains attachment
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:244
-msgid "asterisk_voicemail_attach"
+msgid "Email contains attachment"
 msgstr ""
 
 #. Email
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:245
-msgid "asterisk_voicemail_email"
+msgid "Email"
 msgstr ""
 
 #. Display Name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:246
-msgid "asterisk_voicemail_name"
+msgid "Display Name"
 msgstr ""
 
 #. Password
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:247
-msgid "asterisk_voicemail_password"
+msgid "Password"
 msgstr ""
 
 #. zone
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:248
-msgid "asterisk_voicemail_zone"
+msgid "zone"
 msgstr ""
 
 #. Voice Zone settings
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:249
-msgid "asterisk_voicezone"
+msgid "Voice Zone settings"
 msgstr ""
 
 #. Message Format
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:250
-msgid "asterisk_voicezone_message"
+msgid "Message Format"
 msgstr ""
 
 #. Time Zone
diff --git a/po/fr/cbi.po b/po/fr/cbi.po
index 18672829c..2f61c49ab 100644
--- a/po/fr/cbi.po
+++ b/po/fr/cbi.po
@@ -14,86 +14,86 @@ msgstr ""
 
 #. Add entry
 #: i18n/english/luasrc/i18n/cbi.en.lua:1
-msgid "cbi_add"
+msgid "Add"
 msgstr "Ajouter une entrée"
 
 #. Remove entry
 #: i18n/english/luasrc/i18n/cbi.en.lua:2
-msgid "cbi_del"
+msgid "Delete"
 msgstr "Supprimer l'entrée"
 
 #. Replace entry
 #: i18n/english/luasrc/i18n/cbi.en.lua:3
-msgid "cbi_replace"
+msgid "Replace entry"
 msgstr "Remplacer l'entrée"
 
 #. Invalid input value
 #: i18n/english/luasrc/i18n/cbi.en.lua:4
-msgid "cbi_invalid"
+msgid "Invalid"
 msgstr "Erreur : donnée entrée invalide"
 
 #. <strong>Validation failed:</strong> Please check any input fields for mistakes.
 #: i18n/english/luasrc/i18n/cbi.en.lua:5
-msgid "cbi_invalid_section"
+msgid "<strong>Validation failed:</strong> Please check any input fields for mistakes."
 msgstr ""
 "<strong>Erreur de validation :</strong> merci de vérifier les champs de "
 "saisie."
 
 #. This field is mandatory
 #: i18n/english/luasrc/i18n/cbi.en.lua:6
-msgid "cbi_missing"
+msgid "This field is mandatory"
 msgstr "Ce champ est obligatoire"
 
 #. <strong>Validation failed:</strong> At least one mandatory field has no or an invalid value
 #: i18n/english/luasrc/i18n/cbi.en.lua:7
-msgid "cbi_deperror"
+msgid "<strong>Validation failed:</strong> At least one mandatory field has no or an invalid value"
 msgstr ""
 "<strong>Erreur de validation :</strong> au moins un champ est vide ou a une "
 "valeur incorrecte"
 
 #. A requirement for this option was not met
 #: i18n/english/luasrc/i18n/cbi.en.lua:8
-msgid "cbi_reqerror"
+msgid "A requirement for this option was not met"
 msgstr "Une spécification pour cette option n'a pu être vérifiée"
 
 #. -- Additional Field --
 #: i18n/english/luasrc/i18n/cbi.en.lua:9
-msgid "cbi_addopt"
+msgid "-- Additional Field --"
 msgstr "-- Champ Supplémentaire --"
 
 #.  (optional)
 #: i18n/english/luasrc/i18n/cbi.en.lua:10
-msgid "cbi_optional"
+msgid " (optional)"
 msgstr " (optionnel)"
 
 #. This section contains no values yet
 #: i18n/english/luasrc/i18n/cbi.en.lua:11
-msgid "cbi_sectempty"
+msgid "This section contains no values yet"
 msgstr "Cette section ne contient pas encore de valeur"
 
 #. -- custom --
 #: i18n/english/luasrc/i18n/cbi.en.lua:12
-msgid "cbi_manual"
+msgid "-- custom --"
 msgstr "-- autre --"
 
 #. -- Please choose --
 #: i18n/english/luasrc/i18n/cbi.en.lua:13
-msgid "cbi_select"
+msgid "-- Please choose --"
 msgstr "-- Choisir --"
 
 #. Go to relevant configuration page
 #: i18n/english/luasrc/i18n/cbi.en.lua:14
-msgid "cbi_gorel"
+msgid " "
 msgstr "Aller à la page de configuration correspondante"
 
 #. Applying changes
 #: i18n/english/luasrc/i18n/cbi.en.lua:15
-msgid "cbi_applying"
+msgid "Applying changes"
 msgstr "Changements en cours d'application"
 
 #. Uploaded File
 #: i18n/english/luasrc/i18n/cbi.en.lua:16
-msgid "cbi_upload"
+msgid "Uploaded File"
 msgstr "Fichier Uploadé"
 
 #. Search file...
diff --git a/po/fr/coovachilli.po b/po/fr/coovachilli.po
index f9e02ff30..dd6495d6f 100644
--- a/po/fr/coovachilli.po
+++ b/po/fr/coovachilli.po
@@ -14,882 +14,882 @@ msgstr ""
 
 #. CoovaChilli
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:1
-msgid "coovachilli"
+msgid "CoovaChilli"
 msgstr ""
 
 #. General configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:2
-msgid "coovachilli_general"
+msgid "General configuration"
 msgstr ""
 
 #. General CoovaChilli settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:3
-msgid "coovachilli_general_desc"
+msgid "General CoovaChilli settings"
 msgstr ""
 
 #. Command socket
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:4
-msgid "coovachilli_general_cmdsock"
+msgid "Command socket"
 msgstr ""
 
 #. UNIX socket used for communication with chilli_query
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:5
-msgid "coovachilli_general_cmdsock_desc"
+msgid "UNIX socket used for communication with chilli_query"
 msgstr ""
 
 #. Config refresh interval
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:6
-msgid "coovachilli_general_interval"
+msgid "Config refresh interval"
 msgstr ""
 
 #. Re-read configuration file and do DNS lookups every interval seconds. This has the same effect as sending the HUP signal. If interval is 0 (zero) this feature is disabled. 
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:7
-msgid "coovachilli_general_interval_desc"
+msgid "Re-read configuration file and do DNS lookups every interval seconds. This has the same effect as sending the HUP signal. If interval is 0 (zero) this feature is disabled. "
 msgstr ""
 
 #. Pid file
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:8
-msgid "coovachilli_general_pidfile"
+msgid "Pid file"
 msgstr ""
 
 #. Filename to put the process id
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:9
-msgid "coovachilli_general_pidfile_desc"
+msgid "Filename to put the process id"
 msgstr ""
 
 #. State directory
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:10
-msgid "coovachilli_general_statedir"
+msgid "State directory"
 msgstr ""
 
 #. Directory of non-volatile data
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:11
-msgid "coovachilli_general_statedir_desc"
+msgid "Directory of non-volatile data"
 msgstr ""
 
 #. TUN/TAP configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:12
-msgid "coovachilli_tun"
+msgid "TUN/TAP configuration"
 msgstr ""
 
 #. Network/Tun configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:13
-msgid "coovachilli_tun_desc"
+msgid "Network/Tun configuration"
 msgstr ""
 
 #. Network down script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:14
-msgid "coovachilli_tun_condown"
+msgid "Network down script"
 msgstr ""
 
 #. Script executed after a session has moved from authorized state to unauthorized
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:15
-msgid "coovachilli_tun_condown_desc"
+msgid "Script executed after a session has moved from authorized state to unauthorized"
 msgstr ""
 
 #. Network up script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:16
-msgid "coovachilli_tun_conup"
+msgid "Network up script"
 msgstr ""
 
 #. Script executed after the tun network interface has been brought up
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:17
-msgid "coovachilli_tun_conup_desc"
+msgid "Script executed after the tun network interface has been brought up"
 msgstr ""
 
 #. Primary DNS Server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:18
-msgid "coovachilli_tun_dns1"
+msgid "Primary DNS Server"
 msgstr ""
 
 #. Is used to inform the client about the DNS address to use for host name resolution
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:19
-msgid "coovachilli_tun_dns1_desc"
+msgid "Is used to inform the client about the DNS address to use for host name resolution"
 msgstr ""
 
 #. Secondary DNS Server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:20
-msgid "coovachilli_tun_dns2"
+msgid "Secondary DNS Server"
 msgstr ""
 
 #. Is used to inform the client about the DNS address to use for host name resolution
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:21
-msgid "coovachilli_tun_dns2_desc"
+msgid "Is used to inform the client about the DNS address to use for host name resolution"
 msgstr ""
 
 #. Domain name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:22
-msgid "coovachilli_tun_domain"
+msgid "Domain name"
 msgstr ""
 
 #. Is used to inform the client about the domain name to use for DNS lookups
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:23
-msgid "coovachilli_tun_domain_desc"
+msgid "Is used to inform the client about the domain name to use for DNS lookups"
 msgstr ""
 
 #. Dynamic IP address pool
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:24
-msgid "coovachilli_tun_dynip"
+msgid "Dynamic IP address pool"
 msgstr ""
 
 #. Specifies a pool of dynamic IP addresses
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:25
-msgid "coovachilli_tun_dynip_desc"
+msgid "Specifies a pool of dynamic IP addresses"
 msgstr ""
 
 #. IP down script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:26
-msgid "coovachilli_tun_ipdown"
+msgid "IP down script"
 msgstr ""
 
 #. Script executed after the tun network interface has been taken down
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:27
-msgid "coovachilli_tun_ipdown_desc"
+msgid "Script executed after the tun network interface has been taken down"
 msgstr ""
 
 #. IP up script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:28
-msgid "coovachilli_tun_ipup"
+msgid "IP up script"
 msgstr ""
 
 #. Script executed after the TUN/TAP network interface has been brought up
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:29
-msgid "coovachilli_tun_ipup_desc"
+msgid "Script executed after the TUN/TAP network interface has been brought up"
 msgstr ""
 
 #. Uplink subnet
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:30
-msgid "coovachilli_tun_net"
+msgid "Uplink subnet"
 msgstr ""
 
 #. Network address of the uplink interface (CIDR notation)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:31
-msgid "coovachilli_tun_net_desc"
+msgid "Network address of the uplink interface (CIDR notation)"
 msgstr ""
 
 #. Static IP address pool
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:32
-msgid "coovachilli_tun_statip"
+msgid "Static IP address pool"
 msgstr ""
 
 #. Specifies a pool of static IP addresses
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:33
-msgid "coovachilli_tun_statip_desc"
+msgid "Specifies a pool of static IP addresses"
 msgstr ""
 
 #. TUN/TAP device
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:34
-msgid "coovachilli_tun_tundev"
+msgid "TUN/TAP device"
 msgstr ""
 
 #. The specific device to use for the TUN/TAP interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:35
-msgid "coovachilli_tun_tundev_desc"
+msgid "The specific device to use for the TUN/TAP interface"
 msgstr ""
 
 #. TX queue length
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:36
-msgid "coovachilli_tun_txqlen"
+msgid "TX queue length"
 msgstr ""
 
 #. The TX queue length to set on the TUN/TAP interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:37
-msgid "coovachilli_tun_txqlen_desc"
+msgid "The TX queue length to set on the TUN/TAP interface"
 msgstr ""
 
 #. Use TAP device
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:38
-msgid "coovachilli_tun_usetap"
+msgid "Use TAP device"
 msgstr ""
 
 #. Use the TAP interface instead of TUN
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:39
-msgid "coovachilli_tun_usetap_desc"
+msgid "Use the TAP interface instead of TUN"
 msgstr ""
 
 #. DHCP configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:40
-msgid "coovachilli_dhcp"
+msgid "DHCP configuration"
 msgstr ""
 
 #. Set DHCP options for connecting clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:41
-msgid "coovachilli_dhcp_desc"
+msgid "Set DHCP options for connecting clients"
 msgstr ""
 
 #. DHCP end number
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:42
-msgid "coovachilli_dhcp_dhcpend"
+msgid "DHCP end number"
 msgstr ""
 
 #. Where to stop assigning IP addresses (default 254)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:43
-msgid "coovachilli_dhcp_dhcpend_desc"
+msgid "Where to stop assigning IP addresses (default 254)"
 msgstr ""
 
 #. DHCP interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:44
-msgid "coovachilli_dhcp_dhcpif"
+msgid "DHCP interface"
 msgstr ""
 
 #. Ethernet interface to listen to for the downlink interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:45
-msgid "coovachilli_dhcp_dhcpif_desc"
+msgid "Ethernet interface to listen to for the downlink interface"
 msgstr ""
 
 #. Listen MAC address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:46
-msgid "coovachilli_dhcp_dhcpmac"
+msgid "Listen MAC address"
 msgstr ""
 
 #. MAC address to listen to. If not specified the MAC address of the interface will be used
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:47
-msgid "coovachilli_dhcp_dhcpmac_desc"
+msgid "MAC address to listen to. If not specified the MAC address of the interface will be used"
 msgstr ""
 
 #. DHCP start number
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:48
-msgid "coovachilli_dhcp_dhcpstart"
+msgid "DHCP start number"
 msgstr ""
 
 #. Where to start assigning IP addresses (default 10)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:49
-msgid "coovachilli_dhcp_dhcpstart_desc"
+msgid "Where to start assigning IP addresses (default 10)"
 msgstr ""
 
 #. Enable IEEE 802.1x
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:50
-msgid "coovachilli_dhcp_eapolenable"
+msgid "Enable IEEE 802.1x"
 msgstr ""
 
 #. Enable IEEE 802.1x authentication and listen for EAP requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:51
-msgid "coovachilli_dhcp_eapolenable_desc"
+msgid "Enable IEEE 802.1x authentication and listen for EAP requests"
 msgstr ""
 
 #. Leasetime
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:52
-msgid "coovachilli_dhcp_lease"
+msgid "Leasetime"
 msgstr ""
 
 #. Use a DHCP lease of seconds (default 600)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:53
-msgid "coovachilli_dhcp_lease_desc"
+msgid "Use a DHCP lease of seconds (default 600)"
 msgstr ""
 
 #. RADIUS configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:54
-msgid "coovachilli_radius"
+msgid "RADIUS configuration"
 msgstr ""
 
 #. RADIUS configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:55
-msgid "coovachilli_radius_desc"
+msgid "RADIUS configuration"
 msgstr ""
 
 #. Allow session update through RADIUS
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:56
-msgid "coovachilli_radius_acctupdate"
+msgid "Allow session update through RADIUS"
 msgstr ""
 
 #. Allow updating of session parameters with RADIUS attributes sent in Accounting-Response
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:57
-msgid "coovachilli_radius_acctupdate_desc"
+msgid "Allow updating of session parameters with RADIUS attributes sent in Accounting-Response"
 msgstr ""
 
 #. Admin password
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:58
-msgid "coovachilli_radius_adminpasswd"
+msgid "Admin password"
 msgstr ""
 
 #. Password to use for Administrative-User authentication in order to pick up chilli configurations and establish a device &quot;system&quot; session
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:59
-msgid "coovachilli_radius_adminpasswd_desc"
+msgid "Password to use for Administrative-User authentication in order to pick up chilli configurations and establish a device \"system\" session"
 msgstr ""
 
 #. Admin user
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:60
-msgid "coovachilli_radius_adminuser"
+msgid "Admin user"
 msgstr ""
 
 #. User-name to use for Administrative-User authentication in order to pick up chilli configurations and establish a device &quot;system&quot; session
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:61
-msgid "coovachilli_radius_adminuser_desc"
+msgid "User-name to use for Administrative-User authentication in order to pick up chilli configurations and establish a device \"system\" session"
 msgstr ""
 
 #. Do not check disconnection requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:62
-msgid "coovachilli_radius_coanoipcheck"
+msgid "Do not check disconnection requests"
 msgstr ""
 
 #. Do not check the source IP address of radius disconnect requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:63
-msgid "coovachilli_radius_coanoipcheck_desc"
+msgid "Do not check the source IP address of radius disconnect requests"
 msgstr ""
 
 #. RADIUS disconnect port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:64
-msgid "coovachilli_radius_coaport"
+msgid "RADIUS disconnect port"
 msgstr ""
 
 #. UDP port to listen to for accepting radius disconnect requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:65
-msgid "coovachilli_radius_coaport_desc"
+msgid "UDP port to listen to for accepting radius disconnect requests"
 msgstr ""
 
 #. NAS IP
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:66
-msgid "coovachilli_radius_nasip"
+msgid "NAS IP"
 msgstr ""
 
 #. Value to use in RADIUS NAS-IP-Address attribute
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:67
-msgid "coovachilli_radius_nasip_desc"
+msgid "Value to use in RADIUS NAS-IP-Address attribute"
 msgstr ""
 
 #. NAS MAC
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:68
-msgid "coovachilli_radius_nasmac"
+msgid "NAS MAC"
 msgstr ""
 
 #. MAC address value to use in RADIUS Called-Station-ID attribute
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:69
-msgid "coovachilli_radius_nasmac_desc"
+msgid "MAC address value to use in RADIUS Called-Station-ID attribute"
 msgstr ""
 
 #. Allow OpenID authentication
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:70
-msgid "coovachilli_radius_openidauth"
+msgid "Allow OpenID authentication"
 msgstr ""
 
 #. Allows OpenID authentication by sending ChilliSpot-Config=allow-openidauth in RADIUS Access-Requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:71
-msgid "coovachilli_radius_openidauth_desc"
+msgid "Allows OpenID authentication by sending ChilliSpot-Config=allow-openidauth in RADIUS Access-Requests"
 msgstr ""
 
 #. RADIUS accounting port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:72
-msgid "coovachilli_radius_radiusacctport"
+msgid "RADIUS accounting port"
 msgstr ""
 
 #. The UDP port number to use for radius accounting requests (default 1813)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:73
-msgid "coovachilli_radius_radiusacctport_desc"
+msgid "The UDP port number to use for radius accounting requests (default 1813)"
 msgstr ""
 
 #. RADIUS authentication port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:74
-msgid "coovachilli_radius_radiusauthport"
+msgid "RADIUS authentication port"
 msgstr ""
 
 #. The UDP port number to use for radius authentication requests (default 1812)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:75
-msgid "coovachilli_radius_radiusauthport_desc"
+msgid "The UDP port number to use for radius authentication requests (default 1812)"
 msgstr ""
 
 #. Option radiuscalled
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:76
-msgid "coovachilli_radius_radiuscalled"
+msgid "Option radiuscalled"
 msgstr ""
 
 #. RADIUS listen address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:77
-msgid "coovachilli_radius_radiuslisten"
+msgid "RADIUS listen address"
 msgstr ""
 
 #. Local interface IP address to use for the radius interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:78
-msgid "coovachilli_radius_radiuslisten_desc"
+msgid "Local interface IP address to use for the radius interface"
 msgstr ""
 
 #. RADIUS location ID
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:79
-msgid "coovachilli_radius_radiuslocationid"
+msgid "RADIUS location ID"
 msgstr ""
 
 #. WISPr Location ID
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:80
-msgid "coovachilli_radius_radiuslocationid_desc"
+msgid "WISPr Location ID"
 msgstr ""
 
 #. RADIUS location name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:81
-msgid "coovachilli_radius_radiuslocationname"
+msgid "RADIUS location name"
 msgstr ""
 
 #. WISPr Location Name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:82
-msgid "coovachilli_radius_radiuslocationname_desc"
+msgid "WISPr Location Name"
 msgstr ""
 
 #. NAS ID
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:83
-msgid "coovachilli_radius_radiusnasid"
+msgid "NAS ID"
 msgstr ""
 
 #. Network access server identifier
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:84
-msgid "coovachilli_radius_radiusnasid_desc"
+msgid "Network access server identifier"
 msgstr ""
 
 #. Option radiusnasip
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:85
-msgid "coovachilli_radius_radiusnasip"
+msgid "Option radiusnasip"
 msgstr ""
 
 #. NAS port type
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:86
-msgid "coovachilli_radius_radiusnasporttype"
+msgid "NAS port type"
 msgstr ""
 
 #. Value of NAS-Port-Type attribute. Defaults to 19 (Wireless-IEEE-802.11)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:87
-msgid "coovachilli_radius_radiusnasporttype_desc"
+msgid "Value of NAS-Port-Type attribute. Defaults to 19 (Wireless-IEEE-802.11)"
 msgstr ""
 
 #. Send RADIUS VSA
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:88
-msgid "coovachilli_radius_radiusoriginalurl"
+msgid "Send RADIUS VSA"
 msgstr ""
 
 #. Send the ChilliSpot-OriginalURL RADIUS VSA in Access-Request
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:89
-msgid "coovachilli_radius_radiusoriginalurl_desc"
+msgid "Send the ChilliSpot-OriginalURL RADIUS VSA in Access-Request"
 msgstr ""
 
 #. RADIUS secret
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:90
-msgid "coovachilli_radius_radiussecret"
+msgid "RADIUS secret"
 msgstr ""
 
 #. Radius shared secret for both servers
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:91
-msgid "coovachilli_radius_radiussecret_desc"
+msgid "Radius shared secret for both servers"
 msgstr ""
 
 #. RADIUS server 1
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:92
-msgid "coovachilli_radius_radiusserver1"
+msgid "RADIUS server 1"
 msgstr ""
 
 #. The IP address of radius server 1
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:93
-msgid "coovachilli_radius_radiusserver1_desc"
+msgid "The IP address of radius server 1"
 msgstr ""
 
 #. RADIUS server 2
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:94
-msgid "coovachilli_radius_radiusserver2"
+msgid "RADIUS server 2"
 msgstr ""
 
 #. The IP address of radius server 2
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:95
-msgid "coovachilli_radius_radiusserver2_desc"
+msgid "The IP address of radius server 2"
 msgstr ""
 
 #. Swap octets
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:96
-msgid "coovachilli_radius_swapoctets"
+msgid "Swap octets"
 msgstr ""
 
 #. Swap the meaning of &quot;input octets&quot; and &quot;output octets&quot; as it related to RADIUS attribtues
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:97
-msgid "coovachilli_radius_swapoctets_desc"
+msgid "Swap the meaning of \"input octets\" and \"output octets\" as it related to RADIUS attribtues"
 msgstr ""
 
 #. Allow WPA guests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:98
-msgid "coovachilli_radius_wpaguests"
+msgid "Allow WPA guests"
 msgstr ""
 
 #. Allows WPA Guest authentication by sending ChilliSpot-Config=allow-wpa-guests in RADIUS Access-Requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:99
-msgid "coovachilli_radius_wpaguests_desc"
+msgid "Allows WPA Guest authentication by sending ChilliSpot-Config=allow-wpa-guests in RADIUS Access-Requests"
 msgstr ""
 
 #. RADIUS proxy settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:100
-msgid "coovachilli_proxy"
+msgid "RADIUS proxy settings"
 msgstr ""
 
 #. RADIUS proxy settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:101
-msgid "coovachilli_proxy_desc"
+msgid "RADIUS proxy settings"
 msgstr ""
 
 #. Proxy client
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:102
-msgid "coovachilli_proxy_proxyclient"
+msgid "Proxy client"
 msgstr ""
 
 #. IP address from which radius requests are accepted. If omitted the server will not accept radius requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:103
-msgid "coovachilli_proxy_proxyclient_desc"
+msgid "IP address from which radius requests are accepted. If omitted the server will not accept radius requests"
 msgstr ""
 
 #. Proxy listen address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:104
-msgid "coovachilli_proxy_proxylisten"
+msgid "Proxy listen address"
 msgstr ""
 
 #. Local interface IP address to use for accepting radius requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:105
-msgid "coovachilli_proxy_proxylisten_desc"
+msgid "Local interface IP address to use for accepting radius requests"
 msgstr ""
 
 #. Proxy port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:106
-msgid "coovachilli_proxy_proxyport"
+msgid "Proxy port"
 msgstr ""
 
 #. UDP Port to listen to for accepting radius requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:107
-msgid "coovachilli_proxy_proxyport_desc"
+msgid "UDP Port to listen to for accepting radius requests"
 msgstr ""
 
 #. Proxy secret
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:108
-msgid "coovachilli_proxy_proxysecret"
+msgid "Proxy secret"
 msgstr ""
 
 #. Radius shared secret for clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:109
-msgid "coovachilli_proxy_proxysecret_desc"
+msgid "Radius shared secret for clients"
 msgstr ""
 
 #. UAM configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:110
-msgid "coovachilli_uam"
+msgid "UAM configuration"
 msgstr ""
 
 #. Unified Configuration Method settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:111
-msgid "coovachilli_uam_desc"
+msgid "Unified Configuration Method settings"
 msgstr ""
 
 #. Use Chilli XML
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:112
-msgid "coovachilli_uam_chillixml"
+msgid "Use Chilli XML"
 msgstr ""
 
 #. Return the so-called Chilli XML along with WISPr XML
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:113
-msgid "coovachilli_uam_chillixml_desc"
+msgid "Return the so-called Chilli XML along with WISPr XML"
 msgstr ""
 
 #. Default idle timeout
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:114
-msgid "coovachilli_uam_defidletimeout"
+msgid "Default idle timeout"
 msgstr ""
 
 #. Default idle timeout unless otherwise set by RADIUS (defaults to 0)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:115
-msgid "coovachilli_uam_defidletimeout_desc"
+msgid "Default idle timeout unless otherwise set by RADIUS (defaults to 0)"
 msgstr ""
 
 #. Default interim interval
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:116
-msgid "coovachilli_uam_definteriminterval"
+msgid "Default interim interval"
 msgstr ""
 
 #. Default interim-interval for RADIUS accounting unless otherwise set by RADIUS (defaults to 0)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:117
-msgid "coovachilli_uam_definteriminterval_desc"
+msgid "Default interim-interval for RADIUS accounting unless otherwise set by RADIUS (defaults to 0)"
 msgstr ""
 
 #. Default session timeout
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:118
-msgid "coovachilli_uam_defsessiontimeout"
+msgid "Default session timeout"
 msgstr ""
 
 #. Default session timeout unless otherwise set by RADIUS (defaults to 0)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:119
-msgid "coovachilli_uam_defsessiontimeout_desc"
+msgid "Default session timeout unless otherwise set by RADIUS (defaults to 0)"
 msgstr ""
 
 #. Inspect DNS traffic
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:120
-msgid "coovachilli_uam_dnsparanoia"
+msgid "Inspect DNS traffic"
 msgstr ""
 
 #. Inspect DNS packets and drop responses with any non- A, CNAME, SOA, or MX records to prevent dns tunnels (experimental)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:121
-msgid "coovachilli_uam_dnsparanoia_desc"
+msgid "Inspect DNS packets and drop responses with any non- A, CNAME, SOA, or MX records to prevent dns tunnels (experimental)"
 msgstr ""
 
 #. Local users file
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:122
-msgid "coovachilli_uam_localusers"
+msgid "Local users file"
 msgstr ""
 
 #. A colon seperated file containing usernames and passwords of locally authenticated users
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:123
-msgid "coovachilli_uam_localusers_desc"
+msgid "A colon seperated file containing usernames and passwords of locally authenticated users"
 msgstr ""
 
 #. Location name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:124
-msgid "coovachilli_uam_locationname"
+msgid "Location name"
 msgstr ""
 
 #. Human readable location name used in JSON interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:125
-msgid "coovachilli_uam_locationname_desc"
+msgid "Human readable location name used in JSON interface"
 msgstr ""
 
 #. Do not redirect to UAM server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:126
-msgid "coovachilli_uam_nouamsuccess"
+msgid "Do not redirect to UAM server"
 msgstr ""
 
 #. Do not return to UAM server on login success, just redirect to original URL
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:127
-msgid "coovachilli_uam_nouamsuccess_desc"
+msgid "Do not return to UAM server on login success, just redirect to original URL"
 msgstr ""
 
 #. Do not do WISPr
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:128
-msgid "coovachilli_uam_nouamwispr"
+msgid "Do not do WISPr"
 msgstr ""
 
 #. Do not do any WISPr XML, assume the back-end is doing this instead
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:129
-msgid "coovachilli_uam_nouamwispr_desc"
+msgid "Do not do any WISPr XML, assume the back-end is doing this instead"
 msgstr ""
 
 #. Post auth proxy
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:130
-msgid "coovachilli_uam_postauthproxy"
+msgid "Post auth proxy"
 msgstr ""
 
 #. Used with postauthproxyport to define a post authentication HTTP proxy server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:131
-msgid "coovachilli_uam_postauthproxy_desc"
+msgid "Used with postauthproxyport to define a post authentication HTTP proxy server"
 msgstr ""
 
 #. Post auth proxy port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:132
-msgid "coovachilli_uam_postauthproxyport"
+msgid "Post auth proxy port"
 msgstr ""
 
 #. Used with postauthproxy to define a post authentication HTTP proxy server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:133
-msgid "coovachilli_uam_postauthproxyport_desc"
+msgid "Used with postauthproxy to define a post authentication HTTP proxy server"
 msgstr ""
 
 #. Allowed resources
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:134
-msgid "coovachilli_uam_uamallowed"
+msgid "Allowed resources"
 msgstr ""
 
 #. List of resources the client can access without first authenticating
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:135
-msgid "coovachilli_uam_uamallowed_desc"
+msgid "List of resources the client can access without first authenticating"
 msgstr ""
 
 #. Allow any DNS server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:136
-msgid "coovachilli_uam_uamanydns"
+msgid "Allow any DNS server"
 msgstr ""
 
 #. Allow any DNS server for unauthenticated clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:137
-msgid "coovachilli_uam_uamanydns_desc"
+msgid "Allow any DNS server for unauthenticated clients"
 msgstr ""
 
 #. Allow any IP address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:138
-msgid "coovachilli_uam_uamanyip"
+msgid "Allow any IP address"
 msgstr ""
 
 #. Allow clients to use any IP settings they wish by spoofing ARP (experimental)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:139
-msgid "coovachilli_uam_uamanyip_desc"
+msgid "Allow clients to use any IP settings they wish by spoofing ARP (experimental)"
 msgstr ""
 
 #. Allowed domains
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:140
-msgid "coovachilli_uam_uamdomain"
+msgid "Allowed domains"
 msgstr ""
 
 #. Defines a list of domain names to automatically add to the walled garden
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:141
-msgid "coovachilli_uam_uamdomain_desc"
+msgid "Defines a list of domain names to automatically add to the walled garden"
 msgstr ""
 
 #. UAM homepage
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:142
-msgid "coovachilli_uam_uamhomepage"
+msgid "UAM homepage"
 msgstr ""
 
 #. URL of homepage to redirect unauthenticated users to
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:143
-msgid "coovachilli_uam_uamhomepage_desc"
+msgid "URL of homepage to redirect unauthenticated users to"
 msgstr ""
 
 #. UAM static content port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:144
-msgid "coovachilli_uam_uamiport"
+msgid "UAM static content port"
 msgstr ""
 
 #. TCP port to bind to for only serving embedded content
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:145
-msgid "coovachilli_uam_uamiport_desc"
+msgid "TCP port to bind to for only serving embedded content"
 msgstr ""
 
 #. UAM listening address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:146
-msgid "coovachilli_uam_uamlisten"
+msgid "UAM listening address"
 msgstr ""
 
 #. IP address to listen to for authentication of clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:147
-msgid "coovachilli_uam_uamlisten_desc"
+msgid "IP address to listen to for authentication of clients"
 msgstr ""
 
 #. UAM logout IP
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:148
-msgid "coovachilli_uam_uamlogoutip"
+msgid "UAM logout IP"
 msgstr ""
 
 #. Use this IP address to instantly logout a client accessing it (defaults to 1.1.1.1)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:149
-msgid "coovachilli_uam_uamlogoutip_desc"
+msgid "Use this IP address to instantly logout a client accessing it (defaults to 1.1.1.1)"
 msgstr ""
 
 #. UAM listening port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:150
-msgid "coovachilli_uam_uamport"
+msgid "UAM listening port"
 msgstr ""
 
 #. TCP port to bind to for authenticating clients (default 3990)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:151
-msgid "coovachilli_uam_uamport_desc"
+msgid "TCP port to bind to for authenticating clients (default 3990)"
 msgstr ""
 
 #. UAM secret
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:152
-msgid "coovachilli_uam_uamsecret"
+msgid "UAM secret"
 msgstr ""
 
 #. Shared secret between uamserver and chilli
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:153
-msgid "coovachilli_uam_uamsecret_desc"
+msgid "Shared secret between uamserver and chilli"
 msgstr ""
 
 #. UAM server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:154
-msgid "coovachilli_uam_uamserver"
+msgid "UAM server"
 msgstr ""
 
 #. URL of web server to use for authenticating clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:155
-msgid "coovachilli_uam_uamserver_desc"
+msgid "URL of web server to use for authenticating clients"
 msgstr ""
 
 #. UAM user interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:156
-msgid "coovachilli_uam_uamui"
+msgid "UAM user interface"
 msgstr ""
 
 #. An init.d style program to handle local content on the uamuiport web server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:157
-msgid "coovachilli_uam_uamui_desc"
+msgid "An init.d style program to handle local content on the uamuiport web server"
 msgstr ""
 
 #. Use status file
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:158
-msgid "coovachilli_uam_usestatusfile"
+msgid "Use status file"
 msgstr ""
 
 #. Write the status of clients in a non-volatile state file (experimental)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:159
-msgid "coovachilli_uam_usestatusfile_desc"
+msgid "Write the status of clients in a non-volatile state file (experimental)"
 msgstr ""
 
 #. WISPr login url
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:160
-msgid "coovachilli_uam_wisprlogin"
+msgid "WISPr login url"
 msgstr ""
 
 #. Specific URL to be given in WISPr XML LoginURL
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:161
-msgid "coovachilli_uam_wisprlogin_desc"
+msgid "Specific URL to be given in WISPr XML LoginURL"
 msgstr ""
 
 #. CGI program
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:162
-msgid "coovachilli_uam_wwwbin"
+msgid "CGI program"
 msgstr ""
 
 #. Executable to run as a CGI type program (like haserl) for URLs with extention .chi
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:163
-msgid "coovachilli_uam_wwwbin_desc"
+msgid "Executable to run as a CGI type program (like haserl) for URLs with extention .chi"
 msgstr ""
 
 #. Web content directory
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:164
-msgid "coovachilli_uam_wwwdir"
+msgid "Web content directory"
 msgstr ""
 
 #. Directory where embedded local web content is placed
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:165
-msgid "coovachilli_uam_wwwdir_desc"
+msgid "Directory where embedded local web content is placed"
 msgstr ""
 
 #. MAC configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:166
-msgid "coovachilli_macauth"
+msgid "MAC configuration"
 msgstr ""
 
 #. Configure MAC authentication
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:167
-msgid "coovachilli_macauth_desc"
+msgid "Configure MAC authentication"
 msgstr ""
 
 #. Allowed MAC addresses
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:168
-msgid "coovachilli_macauth_macallowed"
+msgid "Allowed MAC addresses"
 msgstr ""
 
 #. List of MAC addresses for which MAC authentication will be performed
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:169
-msgid "coovachilli_macauth_macallowed_desc"
+msgid "List of MAC addresses for which MAC authentication will be performed"
 msgstr ""
 
 #. Authenticate locally allowed MACs
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:170
-msgid "coovachilli_macauth_macallowlocal"
+msgid "Authenticate locally allowed MACs"
 msgstr ""
 
 #. Authenticate allowed MAC addresses without the use of RADIUS
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:171
-msgid "coovachilli_macauth_macallowlocal_desc"
+msgid "Authenticate allowed MAC addresses without the use of RADIUS"
 msgstr ""
 
 #. Enable MAC authentification
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:172
-msgid "coovachilli_macauth_macauth"
+msgid "Enable MAC authentification"
 msgstr ""
 
 #. Try to authenticate all users based on their mac address alone
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:173
-msgid "coovachilli_macauth_macauth_desc"
+msgid "Try to authenticate all users based on their mac address alone"
 msgstr ""
 
 #. Password
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:174
-msgid "coovachilli_macauth_macpasswd"
+msgid "Password"
 msgstr ""
 
 #. Password used when performing MAC authentication
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:175
-msgid "coovachilli_macauth_macpasswd_desc"
+msgid "Password used when performing MAC authentication"
 msgstr ""
 
 #. Suffix
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:176
-msgid "coovachilli_macauth_macsuffix"
+msgid "Suffix"
 msgstr ""
 
 #. Suffix to add to the MAC address in order to form the User-Name, which is sent to the radius server
diff --git a/po/fr/ddns.po b/po/fr/ddns.po
index 28d1bca00..a4a71842f 100644
--- a/po/fr/ddns.po
+++ b/po/fr/ddns.po
@@ -14,39 +14,39 @@ msgstr ""
 
 #. Dynamic DNS
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:1
-msgid "ddns"
+msgid "Dynamic DNS"
 msgstr "DNS Dynamique"
 
 #. Dynamic DNS allows that your router can be reached with a fixed hostname while having a dynamically changing IP-Address.
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:2
-msgid "ddns_desc"
+msgid "Dynamic DNS allows that your router can be reached with a fixed hostname while having a dynamically changing IP-Address."
 msgstr ""
 "Le DNS Dynamique permet au routeur d'être joint avec un nom d'hôte fixe bien "
 "que changeant dynamiquement d'adresse IP."
 
 #. Source of IP-Address
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:3
-msgid "ddns_service_ipsource"
+msgid "Source of IP-Address"
 msgstr "Source de l'adresse IP"
 
 #. Check for changed IP every
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:4
-msgid "ddns_service_checkinterval"
+msgid "Check for changed IP every"
 msgstr "Vérifier l'adresse IP toutes les"
 
 #. Check-Time unit
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:5
-msgid "ddns_service_checkunit"
+msgid "Check-Time unit"
 msgstr "Unité de temps"
 
 #. Force update every
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:6
-msgid "ddns_service_forceinterval"
+msgid "Force update every"
 msgstr "Vérification forcée toutes les"
 
 #. Force-Time unit
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:7
-msgid "ddns_service_forceunit"
+msgid "Force-Time unit"
 msgstr "Unité de temps"
 
 #. Custom Update-URL
diff --git a/po/fr/default.po b/po/fr/default.po
index 054ded0f9..59632c6a9 100644
--- a/po/fr/default.po
+++ b/po/fr/default.po
@@ -13,37 +13,37 @@ msgstr ""
 
 #. Skip to navigation
 #: i18n/english/luasrc/i18n/default.en.lua:1
-msgid "skiplink1"
+msgid "Skip to navigation"
 msgstr "Skip to navigation"
 
 #. Skip to content
 #: i18n/english/luasrc/i18n/default.en.lua:2
-msgid "skiplink2"
+msgid "Skip to content"
 msgstr "Skip to content"
 
 #. Navigation
 #: i18n/english/luasrc/i18n/default.en.lua:3
-msgid "navigation"
+msgid "Navigation"
 msgstr ""
 
 #. About
 #: i18n/english/luasrc/i18n/default.en.lua:4
-msgid "about"
+msgid "About"
 msgstr "A propos"
 
 #. Add
 #: i18n/english/luasrc/i18n/default.en.lua:5
-msgid "add"
+msgid "Add"
 msgstr "Ajouter"
 
 #. Addresses
 #: i18n/english/luasrc/i18n/default.en.lua:6
-msgid "addresses"
+msgid "Addresses"
 msgstr "Adresses"
 
 #. Aliases
 #: i18n/english/luasrc/i18n/default.en.lua:7
-msgid "aliases"
+msgid "Aliases"
 msgstr "Alias"
 
 #. all
@@ -58,99 +58,99 @@ msgstr "retour"
 
 #. Administration
 #: i18n/english/luasrc/i18n/default.en.lua:10
-msgid "administration"
+msgid "Administration"
 msgstr "Administration"
 
 #. Essentials
 #: i18n/english/luasrc/i18n/default.en.lua:11
-msgid "essentials"
+msgid "Essentials"
 msgstr "Essentiel"
 
 #. Apply
 #: i18n/english/luasrc/i18n/default.en.lua:12
-msgid "apply"
+msgid "Apply"
 msgstr "Appliquer"
 
 #. Basic Settings
 #: i18n/english/luasrc/i18n/default.en.lua:13
-msgid "basicsettings"
+msgid "Basic Settings"
 msgstr "Paramètres de base"
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast
 #: i18n/english/luasrc/i18n/default.en.lua:14
-msgid "broadcast"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"
 msgstr "Broadcast <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
 
 #. Cancel
 #: i18n/english/luasrc/i18n/default.en.lua:15
-msgid "cancel"
+msgid "Cancel"
 msgstr "Annuler"
 
 #. Changes
 #: i18n/english/luasrc/i18n/default.en.lua:16
-msgid "changes"
+msgid "Changes"
 msgstr "Changements"
 
 #. Channel
 #: i18n/english/luasrc/i18n/default.en.lua:17
-msgid "channel"
+msgid "Channel"
 msgstr "Canal"
 
 #. <abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/prefix
 #: i18n/english/luasrc/i18n/default.en.lua:18
-msgid "cidr6"
+msgid "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/prefix"
 msgstr ""
 "Notation <abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr> : "
 "adresse/prefixe"
 
 #. Code
 #: i18n/english/luasrc/i18n/default.en.lua:19
-msgid "code"
+msgid "Code"
 msgstr "Code"
 
 #. Configuration
 #: i18n/english/luasrc/i18n/default.en.lua:20
-msgid "config"
+msgid "Configuration"
 msgstr "Configuration"
 
 #. Configuration file
 #: i18n/english/luasrc/i18n/default.en.lua:21
-msgid "configfile"
+msgid "Configuration file"
 msgstr "Fichier de configuration"
 
 #. Confirmation
 #: i18n/english/luasrc/i18n/default.en.lua:22
-msgid "confirmation"
+msgid "Confirmation"
 msgstr "Confirmation"
 
 #. Delete
 #: i18n/english/luasrc/i18n/default.en.lua:23
-msgid "delete"
+msgid "Delete"
 msgstr "Effacer"
 
 #. Description
 #: i18n/english/luasrc/i18n/default.en.lua:24
-msgid "descr"
+msgid "Description"
 msgstr "Description"
 
 #. Design
 #: i18n/english/luasrc/i18n/default.en.lua:25
-msgid "design"
+msgid "Design"
 msgstr "Apparence"
 
 #. Destination
 #: i18n/english/luasrc/i18n/default.en.lua:26
-msgid "destination"
+msgid "Destination"
 msgstr "Destination"
 
 #. Device
 #: i18n/english/luasrc/i18n/default.en.lua:27
-msgid "device"
+msgid "Device"
 msgstr "Equipement"
 
 #. Devices
 #: i18n/english/luasrc/i18n/default.en.lua:28
-msgid "devices"
+msgid "Devices"
 msgstr "Equipements"
 
 #. disable
@@ -160,22 +160,22 @@ msgstr "désactiver"
 
 #. Distance
 #: i18n/english/luasrc/i18n/default.en.lua:30
-msgid "distance"
+msgid "Distance"
 msgstr "Distance"
 
 #. Kernel Log
 #: i18n/english/luasrc/i18n/default.en.lua:31
-msgid "dmesg"
+msgid "Kernel Log"
 msgstr "Journal du noyau"
 
 #. <abbr title=\"Domain Name System\">DNS</abbr>-Server
 #: i18n/english/luasrc/i18n/default.en.lua:32
-msgid "dnsserver"
+msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Server"
 msgstr "Serveur DNS"
 
 #. Edit
 #: i18n/english/luasrc/i18n/default.en.lua:33
-msgid "edit"
+msgid "Edit"
 msgstr "Editer"
 
 #. enable
@@ -185,47 +185,47 @@ msgstr "activer"
 
 #. Encryption
 #: i18n/english/luasrc/i18n/default.en.lua:35
-msgid "encryption"
+msgid "Encryption"
 msgstr "Chiffrement"
 
 #. Error
 #: i18n/english/luasrc/i18n/default.en.lua:36
-msgid "error"
+msgid "Error"
 msgstr "Erreur"
 
 #. Filesystem
 #: i18n/english/luasrc/i18n/default.en.lua:37
-msgid "filesystem"
+msgid "Filesystem"
 msgstr "Système de fichiers"
 
 #. Filter
 #: i18n/english/luasrc/i18n/default.en.lua:38
-msgid "filter"
+msgid "Filter"
 msgstr "Filtrer"
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway
 #: i18n/english/luasrc/i18n/default.en.lua:39
-msgid "gateway"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
 msgstr "Passerelle"
 
 #. <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway
 #: i18n/english/luasrc/i18n/default.en.lua:40
-msgid "gateway6"
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 msgstr "Passerelle <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>"
 
 #. General
 #: i18n/english/luasrc/i18n/default.en.lua:41
-msgid "general"
+msgid "General"
 msgstr "Général"
 
 #. Hostname
 #: i18n/english/luasrc/i18n/default.en.lua:42
-msgid "hostname"
+msgid "Hostname"
 msgstr "Nom d'hôte"
 
 #. Install
 #: i18n/english/luasrc/i18n/default.en.lua:43
-msgid "install"
+msgid "Install"
 msgstr "Installer"
 
 #. installed
@@ -235,102 +235,102 @@ msgstr "installé"
 
 #. Interface
 #: i18n/english/luasrc/i18n/default.en.lua:45
-msgid "interface"
+msgid "Interface"
 msgstr "Interface"
 
 #. Interfaces
 #: i18n/english/luasrc/i18n/default.en.lua:46
-msgid "interfaces"
+msgid "Interfaces"
 msgstr "Interfaces"
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address
 #: i18n/english/luasrc/i18n/default.en.lua:47
-msgid "ipaddress"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
 msgstr "Adresse IP"
 
 #. <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address
 #: i18n/english/luasrc/i18n/default.en.lua:48
-msgid "ip6address"
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address"
 msgstr "Adresse <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>"
 
 #. Legend
 #: i18n/english/luasrc/i18n/default.en.lua:49
-msgid "legend"
+msgid "Legend"
 msgstr "Légende"
 
 #. Library
 #: i18n/english/luasrc/i18n/default.en.lua:50
-msgid "library"
+msgid "Library"
 msgstr "Bibliothèque"
 
 #. Logout
 #: i18n/english/luasrc/i18n/default.en.lua:51
-msgid "logout"
+msgid "Logout"
 msgstr "Déconnexion"
 
 #. Key
 #: i18n/english/luasrc/i18n/default.en.lua:52
-msgid "key"
+msgid "Key"
 msgstr "Clé"
 
 #. Language
 #: i18n/english/luasrc/i18n/default.en.lua:53
-msgid "language"
+msgid "Language"
 msgstr "Langue"
 
 #. Limit
 #: i18n/english/luasrc/i18n/default.en.lua:54
-msgid "limit"
+msgid "Limit"
 msgstr "Limite"
 
 #. Load
 #: i18n/english/luasrc/i18n/default.en.lua:55
-msgid "load"
+msgid "Load"
 msgstr "Charger"
 
 #. Login
 #: i18n/english/luasrc/i18n/default.en.lua:56
-msgid "login"
+msgid "Login"
 msgstr "Connexion"
 
 #. <abbr title=\"Media Access Control\">MAC</abbr>-Address
 #: i18n/english/luasrc/i18n/default.en.lua:57
-msgid "macaddress"
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr "Adresse MAC"
 
 #. see &#39;%s&#39; manpage
 #: i18n/english/luasrc/i18n/default.en.lua:58
-msgid "manpage"
+msgid "see '%s' manpage"
 msgstr "voir la page de man de '%s'"
 
 #. Metric
 #: i18n/english/luasrc/i18n/default.en.lua:59
-msgid "metric"
+msgid "Metric"
 msgstr "Metrique"
 
 #. Mode
 #: i18n/english/luasrc/i18n/default.en.lua:60
-msgid "mode"
+msgid "Mode"
 msgstr "Mode"
 
 #. Name
 #: i18n/english/luasrc/i18n/default.en.lua:61
-msgid "name"
+msgid "Name"
 msgstr "Nom"
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask
 #: i18n/english/luasrc/i18n/default.en.lua:62
-msgid "netmask"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr "Masque réseau"
 
 #. Network
 #: i18n/english/luasrc/i18n/default.en.lua:63
-msgid "network"
+msgid "Network"
 msgstr "Réseau"
 
 #. Networks
 #: i18n/english/luasrc/i18n/default.en.lua:64
-msgid "networks"
+msgid "Networks"
 msgstr "Réseaux"
 
 #. none
@@ -340,117 +340,117 @@ msgstr "aucun"
 
 #. not installed
 #: i18n/english/luasrc/i18n/default.en.lua:66
-msgid "notinstalled"
+msgid "not installed"
 msgstr "pas installé"
 
 #. OK
 #: i18n/english/luasrc/i18n/default.en.lua:67
-msgid "ok"
+msgid "OK"
 msgstr "OK"
 
 #. Options
 #: i18n/english/luasrc/i18n/default.en.lua:68
-msgid "options"
+msgid "Options"
 msgstr "Options"
 
 #. Overview
 #: i18n/english/luasrc/i18n/default.en.lua:69
-msgid "overview"
+msgid "Overview"
 msgstr "Vue d'ensemble"
 
 #. Package Manager
 #: i18n/english/luasrc/i18n/default.en.lua:70
-msgid "packagemanager"
+msgid "Package Manager"
 msgstr "Gestionnaire de paquets"
 
 #. Password
 #: i18n/english/luasrc/i18n/default.en.lua:71
-msgid "password"
+msgid "Password"
 msgstr "Mot de passe"
 
 #. Path
 #: i18n/english/luasrc/i18n/default.en.lua:72
-msgid "path"
+msgid "Path"
 msgstr "Chemin"
 
 #. Port
 #: i18n/english/luasrc/i18n/default.en.lua:73
-msgid "port"
+msgid "Port"
 msgstr "Port"
 
 #. Ports
 #: i18n/english/luasrc/i18n/default.en.lua:74
-msgid "ports"
+msgid "Ports"
 msgstr "Ports"
 
 #. Proceed
 #: i18n/english/luasrc/i18n/default.en.lua:75
-msgid "proceed"
+msgid "Proceed"
 msgstr "Continuer"
 
 #. Protocol
 #: i18n/english/luasrc/i18n/default.en.lua:76
-msgid "protocol"
+msgid "Protocol"
 msgstr "Protocole"
 
 #. Reboot
 #: i18n/english/luasrc/i18n/default.en.lua:77
-msgid "reboot"
+msgid "Reboot"
 msgstr "Redémarrage"
 
 #. Reset
 #: i18n/english/luasrc/i18n/default.en.lua:78
-msgid "reset"
+msgid "Reset"
 msgstr "Remise à zéro"
 
 #. Revert
 #: i18n/english/luasrc/i18n/default.en.lua:79
-msgid "revert"
+msgid "Revert"
 msgstr "Revenir"
 
 #. Save
 #: i18n/english/luasrc/i18n/default.en.lua:80
-msgid "save"
+msgid "Save"
 msgstr "Sauvegarder"
 
 #. Save &amp; Apply
 #: i18n/english/luasrc/i18n/default.en.lua:81
-msgid "saveapply"
+msgid "Save & Apply"
 msgstr "Sauvegarder et Appliquer"
 
 #. Scan
 #: i18n/english/luasrc/i18n/default.en.lua:82
-msgid "scan"
+msgid "Scan"
 msgstr "Scan"
 
 #. Service
 #: i18n/english/luasrc/i18n/default.en.lua:83
-msgid "service"
+msgid "Service"
 msgstr "Service"
 
 #. Services
 #: i18n/english/luasrc/i18n/default.en.lua:84
-msgid "services"
+msgid "Services"
 msgstr "Services"
 
 #. Settings
 #: i18n/english/luasrc/i18n/default.en.lua:85
-msgid "settings"
+msgid "Settings"
 msgstr "Réglages"
 
 #. Size
 #: i18n/english/luasrc/i18n/default.en.lua:86
-msgid "size"
+msgid "Size"
 msgstr "Taille"
 
 #. Source
 #: i18n/english/luasrc/i18n/default.en.lua:87
-msgid "source"
+msgid "Source"
 msgstr "Source"
 
 #. Start
 #: i18n/english/luasrc/i18n/default.en.lua:88
-msgid "start"
+msgid "Start"
 msgstr "Démarrer"
 
 #. static
@@ -460,72 +460,72 @@ msgstr "statique"
 
 #. Status
 #: i18n/english/luasrc/i18n/default.en.lua:90
-msgid "status"
+msgid "Status"
 msgstr "Status"
 
 #. Statistics
 #: i18n/english/luasrc/i18n/default.en.lua:91
-msgid "statistics"
+msgid "Statistics"
 msgstr "Statistiques"
 
 #. Submit
 #: i18n/english/luasrc/i18n/default.en.lua:92
-msgid "submit"
+msgid "Submit"
 msgstr "Soumettre"
 
 #. System Log
 #: i18n/english/luasrc/i18n/default.en.lua:93
-msgid "syslog"
+msgid "System Log"
 msgstr "Journal système"
 
 #. System
 #: i18n/english/luasrc/i18n/default.en.lua:94
-msgid "system"
+msgid "System"
 msgstr "Système"
 
 #. Target
 #: i18n/english/luasrc/i18n/default.en.lua:95
-msgid "target"
+msgid "Target"
 msgstr "Cible"
 
 #. Timezone
 #: i18n/english/luasrc/i18n/default.en.lua:96
-msgid "timezone"
+msgid "Timezone"
 msgstr "Fuseau horaire"
 
 #. Type
 #: i18n/english/luasrc/i18n/default.en.lua:97
-msgid "type"
+msgid "Type"
 msgstr "Type"
 
 #. Unknown Error
 #: i18n/english/luasrc/i18n/default.en.lua:98
-msgid "unknownerror"
+msgid "Unknown Error"
 msgstr "Erreur inconnue"
 
 #. Unsaved Changes
 #: i18n/english/luasrc/i18n/default.en.lua:99
-msgid "unsavedchanges"
+msgid "Unsaved Changes"
 msgstr "Changements non appliqués"
 
 #. Username
 #: i18n/english/luasrc/i18n/default.en.lua:100
-msgid "username"
+msgid "Username"
 msgstr "Nom d'utilisateur"
 
 #. Version
 #: i18n/english/luasrc/i18n/default.en.lua:101
-msgid "version"
+msgid "Version"
 msgstr "Version"
 
 #. Web <abbr title=\"User Interface\">UI</abbr>
 #: i18n/english/luasrc/i18n/default.en.lua:102
-msgid "webui"
+msgid "Web <abbr title=\"User Interface\">UI</abbr>"
 msgstr "IU Web"
 
 #. Wifi
 #: i18n/english/luasrc/i18n/default.en.lua:103
-msgid "wifi"
+msgid "Wifi"
 msgstr "Wi-Fi"
 
 #. Zone
diff --git a/po/fr/freifunk.po b/po/fr/freifunk.po
index 970eddddd..26fce2f2a 100644
--- a/po/fr/freifunk.po
+++ b/po/fr/freifunk.po
@@ -14,105 +14,105 @@ msgstr ""
 
 #. Hello and welcome in the network of
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:1
-msgid "ff_hellonet"
+msgid "Hello and welcome in the network of"
 msgstr ""
 
 #. We are an initiative to establish a free, independent and open wireless mesh network.
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:2
-msgid "ff_public1"
+msgid "We are an initiative to establish a free, independent and open wireless mesh network."
 msgstr ""
 
 #. This is the access point
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:3
-msgid "ff_public2"
+msgid "This is the access point"
 msgstr ""
 
 #. It is operated by
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:4
-msgid "ff_public3"
+msgid "It is operated by"
 msgstr ""
 
 #. You can find further information about the global Freifunk initiative at
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:5
-msgid "ff_public4"
+msgid "You can find further information about the global Freifunk initiative at"
 msgstr ""
 
 #. If you are interested in our project then contact the local community
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:6
-msgid "ff_public5"
+msgid "If you are interested in our project then contact the local community"
 msgstr ""
 
 #. Internet access depends on technical and organisational conditions and may or may not work for you.
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:7
-msgid "ff_public6"
+msgid "Internet access depends on technical and organisational conditions and may or may not work for you."
 msgstr ""
 
 #. Location
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:8
-msgid "ff_location"
+msgid "Location"
 msgstr ""
 
 #. E-Mail
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:9
-msgid "ff_mail"
+msgid "E-Mail"
 msgstr ""
 
 #. You really should provide your address here!
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:10
-msgid "ff_mail1"
+msgid "You really should provide your address here!"
 msgstr ""
 
 #. Nickname
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:11
-msgid "ff_nickname"
+msgid "Nickname"
 msgstr ""
 
 #. Realname
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:12
-msgid "ff_name"
+msgid "Realname"
 msgstr ""
 
 #. Node
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:13
-msgid "ff_node"
+msgid "Node"
 msgstr ""
 
 #. Notice
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:14
-msgid "ff_note"
+msgid "Notice"
 msgstr ""
 
 #. Phone
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:15
-msgid "ff_phone"
+msgid "Phone"
 msgstr ""
 
 #. Memory
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:16
-msgid "ff_ram"
+msgid "Memory"
 msgstr ""
 
 #. Free
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:17
-msgid "ff_free"
+msgid "Free"
 msgstr ""
 
 #. Buffers
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:18
-msgid "ff_buffers"
+msgid "Buffers"
 msgstr ""
 
 #. Cached
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:19
-msgid "ff_cached"
+msgid "Cached"
 msgstr ""
 
 #. Total
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:20
-msgid "ff_total"
+msgid "Total"
 msgstr ""
 
 #. Coordinates
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:21
-msgid "ff_geocoord"
+msgid "Coordinates"
 msgstr ""
diff --git a/po/fr/hd_idle.po b/po/fr/hd_idle.po
index a758eb35b..c298a21e0 100644
--- a/po/fr/hd_idle.po
+++ b/po/fr/hd_idle.po
@@ -14,35 +14,35 @@ msgstr ""
 
 #. Disk
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:1
-msgid "disk"
+msgid "Disk"
 msgstr ""
 
 #. Enable debug
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:2
-msgid "enable_debug"
+msgid "Enable debug"
 msgstr ""
 
 #. hd-idle
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:3
-msgid "hd_idle"
+msgid "hd-idle"
 msgstr ""
 
 #. hd-idle is a utility program for spinning-down external disks after a period of idle time.
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:4
-msgid "hd_idle_desc"
+msgid "hd-idle is a utility program for spinning-down external disks after a period of idle time."
 msgstr ""
 
 #. Idle-Time
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:5
-msgid "idle_time_interval"
+msgid "Idle-Time"
 msgstr ""
 
 #. Idle-Time unit
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:6
-msgid "idle_time_unit"
+msgid "Idle-Time unit"
 msgstr ""
 
 #. Settings
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:7
-msgid "settings"
+msgid "Settings"
 msgstr ""
diff --git a/po/fr/initmgr.po b/po/fr/initmgr.po
index d8d3711cd..547802d9f 100644
--- a/po/fr/initmgr.po
+++ b/po/fr/initmgr.po
@@ -14,22 +14,22 @@ msgstr ""
 
 #. Initscripts
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:1
-msgid "initmgr"
+msgid "Initscripts"
 msgstr ""
 
 #. You can enable or disable installed init scripts here. Changes will applied after a device reboot.<br /><strong>Warning: If you disable essential init scripts like &quot;network&quot;, your device might become inaccesable!</strong>
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:2
-msgid "initmgr_desc"
+msgid "You can enable or disable installed init scripts here. Changes will applied after a device reboot.<br /><strong>Warning: If you disable essential init scripts like \"network\", your device might become inaccesable!</strong>"
 msgstr ""
 
 #. Start priority
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:3
-msgid "initmgr_index"
+msgid "Start priority"
 msgstr ""
 
 #. Initscript
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:4
-msgid "initmgr_name"
+msgid "Initscript"
 msgstr ""
 
 #. Enable/Disable
diff --git a/po/fr/livestats.po b/po/fr/livestats.po
index d14541ae1..5a1b08d37 100644
--- a/po/fr/livestats.po
+++ b/po/fr/livestats.po
@@ -14,32 +14,32 @@ msgstr ""
 
 #. incoming
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:1
-msgid "livestats_incoming"
+msgid "incoming"
 msgstr ""
 
 #. outgoing
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:2
-msgid "livestats_outgoing"
+msgid "outgoing"
 msgstr ""
 
 #. traffic on
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:3
-msgid "livestats_traffic"
+msgid "traffic on"
 msgstr ""
 
 #. signal-to-noise ratio for
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:4
-msgid "livestats_wifi"
+msgid "signal-to-noise ratio for"
 msgstr ""
 
 #. load average
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:5
-msgid "livestats_loadavg"
+msgid "load average"
 msgstr ""
 
 #. Realtime Wireless Status
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:6
-msgid "livestats_stat_wireless"
+msgid "Realtime Wireless Status"
 msgstr ""
 
 #. Realtime Network Traffic
diff --git a/po/fr/luci-fw.po b/po/fr/luci-fw.po
index 1bac656ee..9b5c489a6 100644
--- a/po/fr/luci-fw.po
+++ b/po/fr/luci-fw.po
@@ -14,61 +14,61 @@ msgstr ""
 
 #. Port forwarding
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:1
-msgid "fw_portfw"
+msgid "Port forwarding"
 msgstr "Redirection de port"
 
 #. Traffic Redirection
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:2
-msgid "fw_redirect"
+msgid "Traffic Redirection"
 msgstr "Redirection de trafic"
 
 #. Traffic redirection allows you to change the destination address of forwarded packets.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:3
-msgid "fw_redirect_desc"
+msgid "Traffic redirection allows you to change the destination address of forwarded packets."
 msgstr ""
 "La redirection de trafic vous permet de changer l'adresse de destination des "
 "paquets transférés."
 
 #. Zone-to-Zone traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:4
-msgid "fw_forwarding"
+msgid "Zone-to-Zone traffic"
 msgstr "Trafic inter-zone"
 
 #. Firewall
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:5
-msgid "fw_fw"
+msgid "Firewall"
 msgstr "Pare-Feu"
 
 #. Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:6
-msgid "fw_zone"
+msgid "Zone"
 msgstr "Zone"
 
 #. Zones
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:7
-msgid "fw_zones"
+msgid "Zones"
 msgstr "Zones"
 
 #. Custom forwarding
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:8
-msgid "fw_custfwd"
+msgid "Custom forwarding"
 msgstr "Transfert particulière"
 
 #. The firewall creates zones over your network interfaces to control network traffic flow.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:9
-msgid "fw_fw1"
+msgid "The firewall creates zones over your network interfaces to control network traffic flow."
 msgstr ""
 "Le pare-feu crée des zone à partir des interfaces réseaux pour controller le "
 "trafic réseau."
 
 #. Advanced Rules
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:10
-msgid "firewall_rule"
+msgid "Advanced Rules"
 msgstr "Règles Avancées"
 
 #. Advanced rules let you customize the firewall to your needs. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:11
-msgid "firewall_rule_desc"
+msgid "Advanced rules let you customize the firewall to your needs. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall."
 msgstr ""
 "Les règles avancées vous laisse personnaliser le pare-feu selon vos besoins. "
 "Seules les nouvelles connexions seront prises en compte. Les paquets "
@@ -77,139 +77,139 @@ msgstr ""
 
 #. Input Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:12
-msgid "firewall_rule_src"
+msgid "Input Zone"
 msgstr "Zone d'Entrée (Input)"
 
 #. Output Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:13
-msgid "firewall_rule_dest"
+msgid "Output Zone"
 msgstr "Zone de Sortie (Output)"
 
 #. Source address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:14
-msgid "firewall_rule_srcip"
+msgid "Source address"
 msgstr "Adresse source"
 
 #. Destination address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:15
-msgid "firewall_rule_destip"
+msgid "Destination address"
 msgstr "Adresse de destination"
 
 #. Source MAC-Address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:16
-msgid "firewall_rule_srcmac"
+msgid "Source MAC-Address"
 msgstr "Adresse MAC source"
 
 #. Source port
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:17
-msgid "firewall_rule_srcport"
+msgid "Source port"
 msgstr "Port source"
 
 #. Destination port
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:18
-msgid "firewall_rule_destport"
+msgid "Destination port"
 msgstr "Port de destination"
 
 #. Action
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:19
-msgid "firewall_rule_target"
+msgid "Action"
 msgstr "Action"
 
 #. accept
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:20
-msgid "fw_accept"
+msgid "accept"
 msgstr "accepter"
 
 #. reject
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:21
-msgid "fw_reject"
+msgid "reject"
 msgstr "rejeter"
 
 #. drop
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:22
-msgid "fw_drop"
+msgid "drop"
 msgstr "ignorer (drop)"
 
 #. Source
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:23
-msgid "fw_src"
+msgid "Source"
 msgstr "Source"
 
 #. Destination
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:24
-msgid "fw_dest"
+msgid "Destination"
 msgstr "Destination"
 
 #. Traffic Control
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:25
-msgid "fw_traffic"
+msgid "Traffic Control"
 msgstr "Contrôle de Trafic"
 
 #. MSS Clamping
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:26
-msgid "fw_mtufix"
+msgid "MSS Clamping"
 msgstr "MSS-Correction"
 
 #. Drop invalid packets
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:27
-msgid "fw_dropinvalid"
+msgid "Drop invalid packets"
 msgstr "Drop incorrect packets"
 
 #. Port forwarding allows to provide network services in the internal network to an external network.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:28
-msgid "fw_portfw1"
+msgid "Port forwarding allows to provide network services in the internal network to an external network."
 msgstr ""
 "La redirection de port vous permet d'exposer des services réseaux de votre "
 "réseau local au réseau externe."
 
 #. External Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:29
-msgid "firewall_redirect_src_desc"
+msgid "External Zone"
 msgstr "Zone externe"
 
 #. External port
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:30
-msgid "firewall_redirect_srcdport"
+msgid "External port"
 msgstr "Port externe"
 
 #. port or range as first-last
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:31
-msgid "firewall_redirect_srcdport_desc"
+msgid "port or range as first-last"
 msgstr "port ou plage de ports (premier-dernier)"
 
 #. Source address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:32
-msgid "firewall_redirect_srcip"
+msgid "Source address"
 msgstr "Adresse source"
 
 #. Source MAC
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:33
-msgid "firewall_redirect_srcmac"
+msgid "Source MAC"
 msgstr "MAC source"
 
 #. Internal address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:34
-msgid "firewall_redirect_destip"
+msgid "Internal address"
 msgstr "Adresse interne"
 
 #. IP-Address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:35
-msgid "firewall_redirect_destip_desc"
+msgid "IP-Address"
 msgstr "Adresse IP"
 
 #. Internal port (optional)
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:36
-msgid "firewall_redirect_destport"
+msgid "Internal port (optional)"
 msgstr "Port interne"
 
 #. port or range as first-last
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:37
-msgid "firewall_redirect_destport_desc"
+msgid "port or range as first-last"
 msgstr "port ou plage de ports (premier-dernier)"
 
 #. Here you can specify which network traffic is allowed to flow between network zones. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall. If you experience occasional connection problems try enabling MSS Clamping otherwise disable it for performance reasons.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:38
-msgid "fw_forwarding1"
+msgid "Here you can specify which network traffic is allowed to flow between network zones. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall. If you experience occasional connection problems try enabling MSS Clamping otherwise disable it for performance reasons."
 msgstr ""
 "Ici, vous pouvez spécifier quel trafic réseau est autorisé à transiter entre "
 "les zones réseaux. Seules les nouvelles connexions seront prises en compte. "
@@ -218,49 +218,49 @@ msgstr ""
 
 #. Input
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:39
-msgid "firewall_forwarding_src"
+msgid "Input"
 msgstr "Entrée (Input)"
 
 #. Output
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:40
-msgid "firewall_forwarding_dest"
+msgid "Output"
 msgstr "Sortie (Output)"
 
 #. Defaults
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:41
-msgid "firewall_defaults"
+msgid "Defaults"
 msgstr "Défauts"
 
 #. These are the default settings that are used if no other rules match.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:42
-msgid "firewall_defaults_desc"
+msgid "These are the default settings that are used if no other rules match."
 msgstr ""
 "Ceci sont les paramètres par défaut qui sont utilisés si aucune autre règle "
 "ne s'applique."
 
 #. SYN-flood protection
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:43
-msgid "firewall_defaults_synflood"
+msgid "SYN-flood protection"
 msgstr "Protection anti SYN-flood"
 
 #. Incoming Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:44
-msgid "firewall_defaults_input"
+msgid "Incoming Traffic"
 msgstr "Trafic Entrant"
 
 #. Outgoing Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:45
-msgid "firewall_defaults_output"
+msgid "Outgoing Traffic"
 msgstr "Trafic Sortant"
 
 #. Forwarded Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:46
-msgid "firewall_defaults_forward"
+msgid "Forwarded Traffic"
 msgstr "Trafic Transféré"
 
 #. Zones part the network interfaces into certain isolated areas to separate network traffic. One or more networks can belong to a zone. The MASQ-flag enables NAT masquerading for all outgoing traffic on this zone.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:47
-msgid "firewall_zone_desc"
+msgid "Zones part the network interfaces into certain isolated areas to separate network traffic. One or more networks can belong to a zone. The MASQ-flag enables NAT masquerading for all outgoing traffic on this zone."
 msgstr ""
 "Les zones partagent les interfaces réseaux en régions isolées pour séparer "
 "les trafic réseaux. Seules les nouvelles connexions seront prises en compte. "
@@ -269,42 +269,42 @@ msgstr ""
 
 #. Incoming Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:48
-msgid "firewall_zone_input"
+msgid "Incoming Traffic"
 msgstr "Trafic Entrant"
 
 #. Default Policy
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:49
-msgid "firewall_zone_input_desc"
+msgid "Default Policy"
 msgstr "Politique par Défaut"
 
 #. Outgoing Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:50
-msgid "firewall_zone_output"
+msgid "Outgoing Traffic"
 msgstr "Trafic Sortant"
 
 #. Default Policy
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:51
-msgid "firewall_zone_output_desc"
+msgid "Default Policy"
 msgstr "Politique par Défaut"
 
 #. Forwarded Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:52
-msgid "firewall_zone_forward"
+msgid "Forwarded Traffic"
 msgstr "Trafic Transféré"
 
 #. Default Policy
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:53
-msgid "firewall_zone_forward_desc"
+msgid "Default Policy"
 msgstr "Politique par Défaut"
 
 #. MASQ
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:54
-msgid "firewall_zone_masq"
+msgid "MASQ"
 msgstr "MASQ"
 
 #. Networks
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:55
-msgid "firewall_zone_network"
+msgid "Networks"
 msgstr "Réseaux"
 
 #. contained networks
diff --git a/po/fr/mmc_over_gpio.po b/po/fr/mmc_over_gpio.po
index a3f97bdab..62b202a9e 100644
--- a/po/fr/mmc_over_gpio.po
+++ b/po/fr/mmc_over_gpio.po
@@ -14,15 +14,15 @@ msgstr ""
 
 #. MMC/SD driver configuration
 #: applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua:1
-msgid "mmc_over_gpio"
+msgid "MMC/SD driver configuration"
 msgstr ""
 
 #. MMC/SD driver configuration
 #: applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua:2
-msgid "mmc_over_gpio_desc"
+msgid "MMC/SD driver configuration"
 msgstr ""
 
 #. Settings
 #: applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua:3
-msgid "settings"
+msgid "Settings"
 msgstr ""
diff --git a/po/fr/ntpc.po b/po/fr/ntpc.po
index d349e7ebc..b1e6417dc 100644
--- a/po/fr/ntpc.po
+++ b/po/fr/ntpc.po
@@ -14,42 +14,42 @@ msgstr ""
 
 #. Time Synchronisation
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:1
-msgid "ntpc"
+msgid "Time Synchronisation"
 msgstr ""
 
 #. Synchronizes the system time
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:2
-msgid "ntpc_desc"
+msgid "Synchronizes the system time"
 msgstr ""
 
 #. Time Server
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:3
-msgid "ntpc_timeserver"
+msgid "Time Server"
 msgstr ""
 
 #. Update Interval (in s)
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:4
-msgid "ntpc_interval"
+msgid "Update Interval (in s)"
 msgstr ""
 
 #. Count of Time Measurements
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:5
-msgid "ntpc_count"
+msgid "Count of Time Measurements"
 msgstr ""
 
 #. empty = infinite
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:6
-msgid "ntpc_count_desc"
+msgid "empty = infinite"
 msgstr ""
 
 #. Clock Adjustment
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:7
-msgid "ntpc_drift"
+msgid "Clock Adjustment"
 msgstr ""
 
 #. Offset Frequency
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:8
-msgid "ntpc_drift_freq"
+msgid "Offset Frequency"
 msgstr ""
 
 #. Current system time
diff --git a/po/fr/olsr.po b/po/fr/olsr.po
index 95dfeb8dd..c1fe81b99 100644
--- a/po/fr/olsr.po
+++ b/po/fr/olsr.po
@@ -14,637 +14,637 @@ msgstr ""
 
 #. OLSR Daemon
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:1
-msgid "olsrd"
+msgid "OLSR Daemon"
 msgstr ""
 
 #. Neighbour IP
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:2
-msgid "olsrd_neighbour_ip"
+msgid "Neighbour IP"
 msgstr ""
 
 #. Local interface IP
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:3
-msgid "olsrd_local_ip"
+msgid "Local interface IP"
 msgstr ""
 
 #. Announced network
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:4
-msgid "olsrd_network"
+msgid "Announced network"
 msgstr ""
 
 #. OLSR gateway
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:5
-msgid "olsrd_gateway"
+msgid "OLSR gateway"
 msgstr ""
 
 #. OLSR node
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:6
-msgid "olsrd_node"
+msgid "OLSR node"
 msgstr ""
 
 #. Unable to connect to the OLSR daemon!
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:7
-msgid "olsrd_error"
+msgid "Unable to connect to the OLSR daemon!"
 msgstr ""
 
 #. Make sure that OLSRd is running, the &quot;txtinfo&quot; plugin is loaded, configured on port 2006 and accepts connections from &quot;127.0.0.1&quot;.
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:8
-msgid "olsrd_error_desc"
+msgid "Make sure that OLSRd is running, the \"txtinfo\" plugin is loaded, configured on port 2006 and accepts connections from \"127.0.0.1\"."
 msgstr ""
 
 #. OLSR - HNA-Announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:9
-msgid "olsrd_hna"
+msgid "OLSR - HNA-Announcements"
 msgstr ""
 
 #. OLSR - Plugins
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:10
-msgid "olsrd_plugins"
+msgid "OLSR - Plugins"
 msgstr ""
 
 #. OLSR connections
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:11
-msgid "olsrd_links"
+msgid "OLSR connections"
 msgstr ""
 
 #. Overview of currently established OLSR connections
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:12
-msgid "olsrd_links_desc"
+msgid "Overview of currently established OLSR connections"
 msgstr ""
 
 #. Expected retransmission count
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:13
-msgid "olsrd_links_etx_desc"
+msgid "Expected retransmission count"
 msgstr ""
 
 #. Success rate of sent packages
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:14
-msgid "olsrd_links_lq_desc"
+msgid "Success rate of sent packages"
 msgstr ""
 
 #. Success rate of received packages
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:15
-msgid "olsrd_links_nlq_desc"
+msgid "Success rate of received packages"
 msgstr ""
 
 #. Known OLSR routes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:16
-msgid "olsrd_routes"
+msgid "Known OLSR routes"
 msgstr ""
 
 #. Overview of currently known routes to other OLSR nodes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:17
-msgid "olsrd_routes_desc"
+msgid "Overview of currently known routes to other OLSR nodes"
 msgstr ""
 
 #. Active OLSR nodes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:18
-msgid "olsrd_topology"
+msgid "Active OLSR nodes"
 msgstr ""
 
 #. Overview of currently known OLSR nodes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:19
-msgid "olsrd_topology_desc"
+msgid "Overview of currently known OLSR nodes"
 msgstr ""
 
 #. Last hop
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:20
-msgid "olsrd_topology_lasthop"
+msgid "Last hop"
 msgstr ""
 
 #. Active host net announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:21
-msgid "olsrd_hna2"
+msgid "Active host net announcements"
 msgstr ""
 
 #. Overview of currently active OLSR host net announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:22
-msgid "olsrd_hna_desc"
+msgid "Overview of currently active OLSR host net announcements"
 msgstr ""
 
 #. Active MID announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:23
-msgid "olsrd_mid"
+msgid "Active MID announcements"
 msgstr ""
 
 #. Overview of known multiple interface announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:24
-msgid "olsrd_mid_desc"
+msgid "Overview of known multiple interface announcements"
 msgstr ""
 
 #. Secondary OLSR interfaces
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:25
-msgid "olsrd_mid_aliases"
+msgid "Secondary OLSR interfaces"
 msgstr ""
 
 #. Freifunk
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:26
-msgid "olsrd_etx_ff"
+msgid "Freifunk"
 msgstr ""
 
 #. floating point
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:27
-msgid "olsrd_etx_float"
+msgid "floating point"
 msgstr ""
 
 #. fixed point math
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:28
-msgid "olsrd_etx_fpm"
+msgid "fixed point math"
 msgstr ""
 
 #. General settings
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:29
-msgid "olsrd_olsrd"
+msgid "General settings"
 msgstr ""
 
 #. Start without network
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:30
-msgid "olsrd_olsrd_allownoint"
+msgid "Start without network"
 msgstr ""
 
 #. Clear screen
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:31
-msgid "olsrd_olsrd_clearscreen"
+msgid "Clear screen"
 msgstr ""
 
 #. Debugmode
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:32
-msgid "olsrd_olsrd_debuglevel"
+msgid "Debugmode"
 msgstr ""
 
 #. FIB metric
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:33
-msgid "olsrd_olsrd_fibmetric"
+msgid "FIB metric"
 msgstr ""
 
 #. Internet protocol
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:34
-msgid "olsrd_olsrd_ipversion"
+msgid "Internet protocol"
 msgstr ""
 
 #. LQ aging
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:35
-msgid "olsrd_olsrd_linkqualityaging"
+msgid "LQ aging"
 msgstr ""
 
 #. LQ algorithm
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:36
-msgid "olsrd_olsrd_linkqualityalgorithm"
+msgid "LQ algorithm"
 msgstr ""
 
 #. LQ Dijkstra limit
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:37
-msgid "olsrd_olsrd_linkqualitydijkstralimit"
+msgid "LQ Dijkstra limit"
 msgstr ""
 
 #. LQ fisheye
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:38
-msgid "olsrd_olsrd_linkqualityfisheye"
+msgid "LQ fisheye"
 msgstr ""
 
 #. LQ level
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:39
-msgid "olsrd_olsrd_linkqualitylevel"
+msgid "LQ level"
 msgstr ""
 
 #. MPR selection
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:40
-msgid "olsrd_olsrd_linkqualitylevel_1"
+msgid "MPR selection"
 msgstr ""
 
 #. MPR selection and routing
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:41
-msgid "olsrd_olsrd_linkqualitylevel_2"
+msgid "MPR selection and routing"
 msgstr ""
 
 #. LQ window size
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:42
-msgid "olsrd_olsrd_linkqualitywinsize"
+msgid "LQ window size"
 msgstr ""
 
 #. MPR coverage
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:43
-msgid "olsrd_olsrd_mprcoverage"
+msgid "MPR coverage"
 msgstr ""
 
 #. Pollrate
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:44
-msgid "olsrd_olsrd_pollrate"
+msgid "Pollrate"
 msgstr ""
 
 #. TC redundancy
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:45
-msgid "olsrd_olsrd_tcredundancy"
+msgid "TC redundancy"
 msgstr ""
 
 #. MPR selectors
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:46
-msgid "olsrd_olsrd_tcredundancy_0"
+msgid "MPR selectors"
 msgstr ""
 
 #. MPR selectors and MPR
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:47
-msgid "olsrd_olsrd_tcredundancy_1"
+msgid "MPR selectors and MPR"
 msgstr ""
 
 #. all neighbours
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:48
-msgid "olsrd_olsrd_tcredundancy_2"
+msgid "all neighbours"
 msgstr ""
 
 #. Use hysteresis
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:49
-msgid "olsrd_olsrd_usehysteresis"
+msgid "Use hysteresis"
 msgstr ""
 
 #. Willingness
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:50
-msgid "olsrd_olsrd_willingness"
+msgid "Willingness"
 msgstr ""
 
 #. Hello interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:51
-msgid "olsrd_interface_hellointerval"
+msgid "Hello interval"
 msgstr ""
 
 #. Hello validity time
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:52
-msgid "olsrd_interface_hellovaliditytime"
+msgid "Hello validity time"
 msgstr ""
 
 #. HNA interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:53
-msgid "olsrd_interface_hnainterval"
+msgid "HNA interval"
 msgstr ""
 
 #. HNA validity time
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:54
-msgid "olsrd_interface_hnavaliditytime"
+msgid "HNA validity time"
 msgstr ""
 
 #. IPv4 broadcast
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:55
-msgid "olsrd_interface_ip4broadcast"
+msgid "IPv4 broadcast"
 msgstr ""
 
 #. MID interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:56
-msgid "olsrd_interface_midinterval"
+msgid "MID interval"
 msgstr ""
 
 #. MID validity time
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:57
-msgid "olsrd_interface_midvaliditytime"
+msgid "MID validity time"
 msgstr ""
 
 #. TC interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:58
-msgid "olsrd_interface_tcinterval"
+msgid "TC interval"
 msgstr ""
 
 #. TC validity time
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:59
-msgid "olsrd_interface_tcvaliditytime"
+msgid "TC validity time"
 msgstr ""
 
 #. IPv6 address type
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:60
-msgid "olsrd_interface_ip6addrtype"
+msgid "IPv6 address type"
 msgstr ""
 
 #. IPC settings
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:61
-msgid "olsrd_ipcconnect"
+msgid "IPC settings"
 msgstr ""
 
 #. IPC connections enable you to remote-control the local OLSRd instance using external programs
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:62
-msgid "olsrd_ipcconnect_desc"
+msgid "IPC connections enable you to remote-control the local OLSRd instance using external programs"
 msgstr ""
 
 #. Allowed host addresses
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:63
-msgid "olsrd_ipcconnect_host"
+msgid "Allowed host addresses"
 msgstr ""
 
 #. Multiple separated by spaces
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:64
-msgid "olsrd_ipcconnect_host_desc"
+msgid "Multiple separated by spaces"
 msgstr ""
 
 #. Maxmimum connection count
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:65
-msgid "olsrd_ipcconnect_maxconnections"
+msgid "Maxmimum connection count"
 msgstr ""
 
 #. Set to 0 to disable IPC
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:66
-msgid "olsrd_ipcconnect_maxconnections_desc"
+msgid "Set to 0 to disable IPC"
 msgstr ""
 
 #. Allowed subnets
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:67
-msgid "olsrd_ipcconnect_net"
+msgid "Allowed subnets"
 msgstr ""
 
 #. Address Mask; multiple separated by space
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:68
-msgid "olsrd_ipcconnect_net_desc"
+msgid "Address Mask; multiple separated by space"
 msgstr ""
 
 #. IPv4 HNA announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:69
-msgid "olsrd_hna4"
+msgid "IPv4 HNA announcements"
 msgstr ""
 
 #. Hna4 entries allow you to propagate local IPv4 host- and network-routes into the mesh network
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:70
-msgid "olsrd_hna4_desc"
+msgid "Hna4 entries allow you to propagate local IPv4 host- and network-routes into the mesh network"
 msgstr ""
 
 #. Network address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:71
-msgid "olsrd_hna4_netaddr"
+msgid "Network address"
 msgstr ""
 
 #. IPv4 address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:72
-msgid "olsrd_hna4_netaddr_desc"
+msgid "IPv4 address"
 msgstr ""
 
 #. Netmask
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:73
-msgid "olsrd_hna4_netmask"
+msgid "Netmask"
 msgstr ""
 
 #. IPv4 address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:74
-msgid "olsrd_hna4_netmask_desc"
+msgid "IPv4 address"
 msgstr ""
 
 #. IPv6 HNA announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:75
-msgid "olsrd_hna6"
+msgid "IPv6 HNA announcements"
 msgstr ""
 
 #. Hna6 entries allow you to propagate local IPv6 host- and network-routes into the mesh network
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:76
-msgid "olsrd_hna6_desc"
+msgid "Hna6 entries allow you to propagate local IPv6 host- and network-routes into the mesh network"
 msgstr ""
 
 #. Network address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:77
-msgid "olsrd_hna6_netaddr"
+msgid "Network address"
 msgstr ""
 
 #. IPv6 address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:78
-msgid "olsrd_hna6_netaddr_desc"
+msgid "IPv6 address"
 msgstr ""
 
 #. Prefix
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:79
-msgid "olsrd_hna6_prefix"
+msgid "Prefix"
 msgstr ""
 
 #. IPv6 prefix
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:80
-msgid "olsrd_hna6_prefix_desc"
+msgid "IPv6 prefix"
 msgstr ""
 
 #. Plugin configuration
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:81
-msgid "olsrd_loadplugin"
+msgid "Plugin configuration"
 msgstr ""
 
 #. Enable plugin
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:82
-msgid "olsrd_loadplugin_ignore"
+msgid "Enable plugin"
 msgstr ""
 
 #. Library
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:83
-msgid "olsrd_loadplugin_library"
+msgid "Library"
 msgstr ""
 
 #. Allow connections from this hosts
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:84
-msgid "olsrd_loadplugin_accept"
+msgid "Allow connections from this hosts"
 msgstr ""
 
 #. Ping test addresses
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:85
-msgid "olsrd_loadplugin_ping"
+msgid "Ping test addresses"
 msgstr ""
 
 #. Interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:86
-msgid "olsrd_loadplugin_interval"
+msgid "Refresh interval in seconds"
 msgstr ""
 
 #. HNA announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:87
-msgid "olsrd_loadplugin_hna"
+msgid "HNA announcements"
 msgstr ""
 
 #. Format: IP-Address Netmask / OLSR will announce this network once it is reachable
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:88
-msgid "olsrd_loadplugin_hna_desc"
+msgid "Format: IP-Address Netmask / OLSR will announce this network once it is reachable"
 msgstr ""
 
 #. Alternative \"hosts\" file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:89
-msgid "olsrd_loadplugin_addhosts"
+msgid "Alternative \"hosts\" file"
 msgstr ""
 
 #. The contents of this file will be appended to the autogenerated \"hosts\" file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:90
-msgid "olsrd_loadplugin_addhosts_desc"
+msgid "The contents of this file will be appended to the autogenerated \"hosts\" file"
 msgstr ""
 
 #. DNS server
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:91
-msgid "olsrd_loadplugin_dnsserver"
+msgid "DNS server"
 msgstr ""
 
 #. Alternative hostnames
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:92
-msgid "olsrd_loadplugin_hosts"
+msgid "Alternative hostnames"
 msgstr ""
 
 #. Format: Interface-IP Hostname
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:93
-msgid "olsrd_loadplugin_hosts_desc"
+msgid "Format: Interface-IP Hostname"
 msgstr ""
 
 #. Path to the \"hosts\" file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:94
-msgid "olsrd_loadplugin_hostsfile"
+msgid "Path to the \"hosts\" file"
 msgstr ""
 
 #. Latitude
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:95
-msgid "olsrd_loadplugin_lat"
+msgid "Latitude"
 msgstr ""
 
 #. Output file for coordinates
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:96
-msgid "olsrd_loadplugin_latlonfile"
+msgid "Output file for coordinates"
 msgstr ""
 
 #. OLSR will write received coordinates of other nodes to this file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:97
-msgid "olsrd_loadplugin_latlonfile_desc"
+msgid "OLSR will write received coordinates of other nodes to this file"
 msgstr ""
 
 #. Input file for coordinates
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:98
-msgid "olsrd_loadplugin_latloninfile"
+msgid "Input file for coordinates"
 msgstr ""
 
 #. OLSR periodically checks this file for new coordinates and propagates them
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:99
-msgid "olsrd_loadplugin_latloninfile_desc"
+msgid "OLSR periodically checks this file for new coordinates and propagates them"
 msgstr ""
 
 #. Longitude
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:100
-msgid "olsrd_loadplugin_lon"
+msgid "Longitude"
 msgstr ""
 
 #. Hostnames
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:101
-msgid "olsrd_loadplugin_name"
+msgid "Hostnames"
 msgstr ""
 
 #. Command for name changes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:102
-msgid "olsrd_loadplugin_namechangescript"
+msgid "Command for name changes"
 msgstr ""
 
 #. OLSR executes this command once entries in the \"hosts\" are changed
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:103
-msgid "olsrd_loadplugin_namechangescript_desc"
+msgid "OLSR executes this command once entries in the \"hosts\" are changed"
 msgstr ""
 
 #. Path to the \"resolv\" file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:104
-msgid "olsrd_loadplugin_resolvfile"
+msgid "Path to the \"resolv\" file"
 msgstr ""
 
 #. Command for service changes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:105
-msgid "olsrd_loadplugin_serviceschangescript"
+msgid "Command for service changes"
 msgstr ""
 
 #. OLSR excutes this command once new service announcements are received
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:106
-msgid "olsrd_loadplugin_serviceschangescript_desc"
+msgid "OLSR excutes this command once new service announcements are received"
 msgstr ""
 
 #. PID file for SIGHUP signals
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:107
-msgid "olsrd_loadplugin_sighuppidfile"
+msgid "PID file for SIGHUP signals"
 msgstr ""
 
 #. OLSR sends a HUP signal to this PID once the \"hosts\" oder \"resolv\" file is changed
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:108
-msgid "olsrd_loadplugin_sighuppidfile_desc"
+msgid "OLSR sends a HUP signal to this PID once the \"hosts\" oder \"resolv\" file is changed"
 msgstr ""
 
 #. Domain suffix
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:109
-msgid "olsrd_loadplugin_suffix"
+msgid "Domain suffix"
 msgstr ""
 
 #. Timeout
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:110
-msgid "olsrd_loadplugin_timeout"
+msgid "Timeout"
 msgstr ""
 
 #. Name of the BMF interface
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:111
-msgid "olsrd_loadplugin_bmfinterface"
+msgid "Name of the BMF interface"
 msgstr ""
 
 #. IP address of the BMF interface
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:112
-msgid "olsrd_loadplugin_bmfinterfaceid"
+msgid "IP address of the BMF interface"
 msgstr ""
 
 #. Redirect local broadcasts
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:113
-msgid "olsrd_loadplugin_dolocalbroadcast"
+msgid "Redirect local broadcasts"
 msgstr ""
 
 #. Also redirect broadcasts from OLSR interfaces
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:114
-msgid "olsrd_loadplugin_capturepacketsonolsrinterfaces"
+msgid "Also redirect broadcasts from OLSR interfaces"
 msgstr ""
 
 #. Propagation mechanism
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:115
-msgid "olsrd_loadplugin_bmfmechanism"
+msgid "Propagation mechanism"
 msgstr ""
 
 #. Number of retransmissions per package
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:116
-msgid "olsrd_loadplugin_broadcastretransmitcount"
+msgid "Number of retransmissions per package"
 msgstr ""
 
 #. Minimum number of neighbours for broadcast redirection
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:117
-msgid "olsrd_loadplugin_fanoutlimit"
+msgid "Minimum number of neighbours for broadcast redirection"
 msgstr ""
 
 #. Non-OLSR interfaces
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:118
-msgid "olsrd_loadplugin_nonolsrif"
+msgid "Non-OLSR interfaces"
 msgstr ""
 
 #. Used port
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:119
-msgid "olsrd_loadplugin_port"
+msgid "Used port"
 msgstr ""
 
 #. Allow connections from hosts
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:120
-msgid "olsrd_loadplugin_host"
+msgid "Allow connections from hosts"
 msgstr ""
 
 #. Allow connections from subnets
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:121
-msgid "olsrd_loadplugin_net"
+msgid "Allow connections from subnets"
 msgstr ""
 
 #. Format: IP-AddresseNetmask
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:122
-msgid "olsrd_loadplugin_net_desc"
+msgid "Format: IP-AddresseNetmask"
 msgstr ""
 
 #. Used protocols
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:123
-msgid "olsrd_loadplugin_redistribute"
+msgid "Used protocols"
 msgstr ""
 
 #. Only export routes to Quagga or to kernel too
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:124
-msgid "olsrd_loadplugin_exportroutes"
+msgid "Only export routes to Quagga or to kernel too"
 msgstr ""
 
 #. Always prefer local routes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:125
-msgid "olsrd_loadplugin_localpref"
+msgid "Always prefer local routes"
 msgstr ""
 
 #. Distance of exported routes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:126
-msgid "olsrd_loadplugin_distance"
+msgid "Distance of exported routes"
 msgstr ""
 
 #. Key file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:127
-msgid "olsrd_loadplugin_keyfile"
+msgid "Key file"
 msgstr ""
 
 #. Watchdog timestamp file
diff --git a/po/fr/openvpn.po b/po/fr/openvpn.po
index 418079656..3883ec08e 100644
--- a/po/fr/openvpn.po
+++ b/po/fr/openvpn.po
@@ -14,947 +14,947 @@ msgstr ""
 
 #. OpenVPN
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:1
-msgid "openvpn"
+msgid "OpenVPN"
 msgstr ""
 
 #. Switch to basic configuration
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:3
-msgid "openvpn_switch_basic"
+msgid "« Switch to basic configuration"
 msgstr ""
 
 #. Switch to advanced configuration
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:4
-msgid "openvpn_switch_advanced"
+msgid "Switch to advanced configuration »"
 msgstr ""
 
 #. Enabled
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:6
-msgid "openvpn_enable"
+msgid "Enabled"
 msgstr ""
 
 #. Started
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:7
-msgid "openvpn_active"
+msgid "Started"
 msgstr ""
 
 #. no
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:8
-msgid "openvpn_active_no"
+msgid "no"
 msgstr ""
 
 #. yes (%i)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:9
-msgid "openvpn_active_yes"
+msgid "yes (%i)"
 msgstr ""
 
 #. Port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:10
-msgid "openvpn_port"
+msgid "Port"
 msgstr ""
 
 #. Protocol
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:11
-msgid "openvpn_proto"
+msgid "Protocol"
 msgstr ""
 
 #. Instance \"%s\"
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:13
-msgid "openvpn_instance"
+msgid "Instance \"%s\""
 msgstr ""
 
 #. OpenVPN instances
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:15
-msgid "openvpn_overview"
+msgid "OpenVPN instances"
 msgstr ""
 
 #. Below is a list of configured OpenVPN instances and their current state
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:16
-msgid "openvpn_overview_desc"
+msgid "Below is a list of configured OpenVPN instances and their current state"
 msgstr ""
 
 #. Daemon configuration
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:18
-msgid "openvpn_service"
+msgid "Daemon configuration"
 msgstr ""
 
 #. Networking options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:19
-msgid "openvpn_networking"
+msgid "Networking options"
 msgstr ""
 
 #. VPN options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:20
-msgid "openvpn_vpn"
+msgid "VPN options"
 msgstr ""
 
 #. Cryptography settings
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:21
-msgid "openvpn_cryptography"
+msgid "Cryptography settings"
 msgstr ""
 
 #. Read configuration options from file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:23
-msgid "openvpn_param_config"
+msgid "Read configuration options from file"
 msgstr ""
 
 #. Local host name or ip address
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:24
-msgid "openvpn_param_local"
+msgid "Local host name or ip address"
 msgstr ""
 
 #. Remote host name or ip address
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:25
-msgid "openvpn_param_remote"
+msgid "Remote host name or ip address"
 msgstr ""
 
 #. Randomly choose remote server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:26
-msgid "openvpn_param_remote_random"
+msgid "Randomly choose remote server"
 msgstr ""
 
 #. Major mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:27
-msgid "openvpn_param_mode"
+msgid "Major mode"
 msgstr ""
 
 #. Use protocol
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:28
-msgid "openvpn_param_proto"
+msgid "Use protocol"
 msgstr ""
 
 #. Connection retry interval
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:29
-msgid "openvpn_param_connect_retry"
+msgid "Connection retry interval"
 msgstr ""
 
 #. Connection timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:30
-msgid "openvpn_param_connect_timeout"
+msgid "Connection timeout"
 msgstr ""
 
 #. Maximum connection attempt retries
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:31
-msgid "openvpn_param_connect_retry_max"
+msgid "Maximum connection attempt retries"
 msgstr ""
 
 #. Try to sense proxy settings automatically
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:32
-msgid "openvpn_param_auto_proxy"
+msgid "Try to sense proxy settings automatically"
 msgstr ""
 
 #. Connect to remote host
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:33
-msgid "openvpn_param_http_proxy"
+msgid "Connect to remote host"
 msgstr ""
 
 #. Retry indefinitely on HTTP proxy errors
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:34
-msgid "openvpn_param_http_proxy_retry"
+msgid "Retry indefinitely on HTTP proxy errors"
 msgstr ""
 
 #. Proxy timeout in seconds
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:35
-msgid "openvpn_param_http_proxy_timeout"
+msgid "Proxy timeout in seconds"
 msgstr ""
 
 #. Set extended HTTP proxy options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:36
-msgid "openvpn_param_http_proxy_option"
+msgid "Set extended HTTP proxy options"
 msgstr ""
 
 #. Connect through Socks5 proxy
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:37
-msgid "openvpn_param_socks_proxy"
+msgid "Connect through Socks5 proxy"
 msgstr ""
 
 #. Retry indefinitely on Socks proxy errors
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:38
-msgid "openvpn_param_socks_proxy_retry"
+msgid "Retry indefinitely on Socks proxy errors"
 msgstr ""
 
 #. If hostname resolve fails, retry
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:39
-msgid "openvpn_param_resolv_retry"
+msgid "If hostname resolve fails, retry"
 msgstr ""
 
 #. Allow remote to change its IP or port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:40
-msgid "openvpn_param_float"
+msgid "Allow remote to change its IP or port"
 msgstr ""
 
 #. Execute shell command on remote ip change
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:41
-msgid "openvpn_param_ipchange"
+msgid "Execute shell command on remote ip change"
 msgstr ""
 
 #. TCP/UDP port # for both local and remote
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:42
-msgid "openvpn_param_port"
+msgid "TCP/UDP port # for both local and remote"
 msgstr ""
 
 #. TCP/UDP port # for local (default=1194)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:43
-msgid "openvpn_param_lport"
+msgid "TCP/UDP port # for local (default=1194)"
 msgstr ""
 
 #. TCP/UDP port # for remote (default=1194)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:44
-msgid "openvpn_param_rport"
+msgid "TCP/UDP port # for remote (default=1194)"
 msgstr ""
 
 #. Bind to local address and port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:45
-msgid "openvpn_param_bind"
+msgid "Bind to local address and port"
 msgstr ""
 
 #. Do not bind to local address and port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:46
-msgid "openvpn_param_nobind"
+msgid "Do not bind to local address and port"
 msgstr ""
 
 #. tun/tap device
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:47
-msgid "openvpn_param_dev"
+msgid "tun/tap device"
 msgstr ""
 
 #. Type of used device
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:48
-msgid "openvpn_param_dev_type"
+msgid "Type of used device"
 msgstr ""
 
 #. Use tun/tap device node
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:49
-msgid "openvpn_param_dev_node"
+msgid "Use tun/tap device node"
 msgstr ""
 
 #. Set the link layer address of the tap device
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:50
-msgid "openvpn_param_lladdr"
+msgid "Set the link layer address of the tap device"
 msgstr ""
 
 #. 'net30', 'p2p', or 'subnet'
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:51
-msgid "openvpn_param_topology"
+msgid "'net30', 'p2p', or 'subnet'"
 msgstr ""
 
 #. Make tun device IPv6 capable
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:52
-msgid "openvpn_param_tun_ipv6"
+msgid "Make tun device IPv6 capable"
 msgstr ""
 
 #. Configure device to use IP address
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:53
-msgid "openvpn_param_ifconfig"
+msgid "Configure device to use IP address"
 msgstr ""
 
 #. Don't actually execute ifconfig
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:54
-msgid "openvpn_param_ifconfig_noexec"
+msgid "Don't actually execute ifconfig"
 msgstr ""
 
 #. Don't warn on ifconfig inconsistencies
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:55
-msgid "openvpn_param_ifconfig_nowarn"
+msgid "Don't warn on ifconfig inconsistencies"
 msgstr ""
 
 #. Add route after establishing connection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:56
-msgid "openvpn_param_route"
+msgid "Add route after establishing connection"
 msgstr ""
 
 #. Specify a default gateway for routes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:57
-msgid "openvpn_param_route_gateway"
+msgid "Specify a default gateway for routes"
 msgstr ""
 
 #. Specify a default metric for routes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:58
-msgid "openvpn_param_route_metric"
+msgid "Specify a default metric for routes"
 msgstr ""
 
 #. Delay n seconds after connection 
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:59
-msgid "openvpn_param_route_delay"
+msgid "Delay n seconds after connection "
 msgstr ""
 
 #. Execute shell cmd after routes are added
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:60
-msgid "openvpn_param_route_up"
+msgid "Execute shell cmd after routes are added"
 msgstr ""
 
 #. Don't add routes automatically
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:61
-msgid "openvpn_param_route_noexec"
+msgid "Don't add routes automatically"
 msgstr ""
 
 #. Don't pull options from server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:62
-msgid "openvpn_param_route_nopull"
+msgid "Don't pull options from server"
 msgstr ""
 
 #. Automatically redirect default route
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:63
-msgid "openvpn_param_redirect_gateway"
+msgid "Automatically redirect default route"
 msgstr ""
 
 #. Pass environment variables to script
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:64
-msgid "openvpn_param_setenv"
+msgid "Pass environment variables to script"
 msgstr ""
 
 #. Shaping for peer bandwidth
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:65
-msgid "openvpn_param_shaper"
+msgid "Shaping for peer bandwidth"
 msgstr ""
 
 #. Set timeouts in server mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:66
-msgid "openvpn_param_keepalive"
+msgid "Set timeouts in server mode"
 msgstr ""
 
 #. tun/tap inactivity timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:67
-msgid "openvpn_param_inactive"
+msgid "tun/tap inactivity timeout"
 msgstr ""
 
 #. Remote ping timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:68
-msgid "openvpn_param_ping_exit"
+msgid "Remote ping timeout"
 msgstr ""
 
 #. Restart after remote ping timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:69
-msgid "openvpn_param_ping_restart"
+msgid "Restart after remote ping timeout"
 msgstr ""
 
 #. Only process ping timeouts if routes exist
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:70
-msgid "openvpn_param_ping_timer_rem"
+msgid "Only process ping timeouts if routes exist"
 msgstr ""
 
 #. Ping remote every n seconds over TCP/UDP port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:71
-msgid "openvpn_param_ping"
+msgid "Ping remote every n seconds over TCP/UDP port"
 msgstr ""
 
 #. Configure a multi-homed UDP server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:72
-msgid "openvpn_param_multihome"
+msgid "Configure a multi-homed UDP server"
 msgstr ""
 
 #. Optimize TUN/TAP/UDP writes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:73
-msgid "openvpn_param_fast_io"
+msgid "Optimize TUN/TAP/UDP writes"
 msgstr ""
 
 #. Remap SIGUSR1 signals
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:74
-msgid "openvpn_param_remap_usr1"
+msgid "Remap SIGUSR1 signals"
 msgstr ""
 
 #. Keep tun/tap device open on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:75
-msgid "openvpn_param_persist_tun"
+msgid "Keep tun/tap device open on restart"
 msgstr ""
 
 #. Keep remote IP address on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:76
-msgid "openvpn_param_persist_remote_ip"
+msgid "Keep remote IP address on restart"
 msgstr ""
 
 #. Keep local IP address on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:77
-msgid "openvpn_param_persist_local_ip"
+msgid "Keep local IP address on restart"
 msgstr ""
 
 #. Don't re-read key on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:78
-msgid "openvpn_param_persist_key"
+msgid "Don't re-read key on restart"
 msgstr ""
 
 #. TOS passthrough (applies to IPv4 only)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:79
-msgid "openvpn_param_passtos"
+msgid "TOS passthrough (applies to IPv4 only)"
 msgstr ""
 
 #. Set tun/tap device MTU
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:80
-msgid "openvpn_param_tun_mtu"
+msgid "Set tun/tap device MTU"
 msgstr ""
 
 #. Set tun/tap device overhead
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:81
-msgid "openvpn_param_tun_mtu_extra"
+msgid "Set tun/tap device overhead"
 msgstr ""
 
 #. Set TCP/UDP MTU
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:82
-msgid "openvpn_param_link_mtu"
+msgid "Set TCP/UDP MTU"
 msgstr ""
 
 #. Enable Path MTU discovery
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:83
-msgid "openvpn_param_mtu_disc"
+msgid "Enable Path MTU discovery"
 msgstr ""
 
 #. Empirically measure MTU
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:84
-msgid "openvpn_param_mtu_test"
+msgid "Empirically measure MTU"
 msgstr ""
 
 #. Enable internal datagram fragmentation
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:85
-msgid "openvpn_param_fragment"
+msgid "Enable internal datagram fragmentation"
 msgstr ""
 
 #. Set upper bound on TCP MSS
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:86
-msgid "openvpn_param_mssfix"
+msgid "Set upper bound on TCP MSS"
 msgstr ""
 
 #. Set the TCP/UDP send buffer size
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:87
-msgid "openvpn_param_sndbuf"
+msgid "Set the TCP/UDP send buffer size"
 msgstr ""
 
 #. Set the TCP/UDP receive buffer size
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:88
-msgid "openvpn_param_rcvbuf"
+msgid "Set the TCP/UDP receive buffer size"
 msgstr ""
 
 #. Set tun/tap TX queue length
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:89
-msgid "openvpn_param_txqueuelen"
+msgid "Set tun/tap TX queue length"
 msgstr ""
 
 #. Disable Paging
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:90
-msgid "openvpn_param_mlock"
+msgid "Disable Paging"
 msgstr ""
 
 #. Shell cmd to execute after tun device open
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:91
-msgid "openvpn_param_up"
+msgid "Shell cmd to execute after tun device open"
 msgstr ""
 
 #. Delay tun/tap open and up script execution
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:92
-msgid "openvpn_param_up_delay"
+msgid "Delay tun/tap open and up script execution"
 msgstr ""
 
 #. Shell cmd to run after tun device close
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:93
-msgid "openvpn_param_down"
+msgid "Shell cmd to run after tun device close"
 msgstr ""
 
 #. Call down cmd/script before TUN/TAP close
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:94
-msgid "openvpn_param_down_pre"
+msgid "Call down cmd/script before TUN/TAP close"
 msgstr ""
 
 #. Run up/down scripts for all restarts
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:95
-msgid "openvpn_param_up_restart"
+msgid "Run up/down scripts for all restarts"
 msgstr ""
 
 #. Set UID to user
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:96
-msgid "openvpn_param_user"
+msgid "Set UID to user"
 msgstr ""
 
 #. Set GID to group
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:97
-msgid "openvpn_param_group"
+msgid "Set GID to group"
 msgstr ""
 
 #. Chroot to directory after initialization
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:98
-msgid "openvpn_param_chroot"
+msgid "Chroot to directory after initialization"
 msgstr ""
 
 #. Change to directory before initialization
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:99
-msgid "openvpn_param_cd"
+msgid "Change to directory before initialization"
 msgstr ""
 
 #. Daemonize after initialization
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:100
-msgid "openvpn_param_daemon"
+msgid "Daemonize after initialization"
 msgstr ""
 
 #. Output to syslog and do not daemonize
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:101
-msgid "openvpn_param_syslog"
+msgid "Output to syslog and do not daemonize"
 msgstr ""
 
 #. Run as an inetd or xinetd server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:102
-msgid "openvpn_param_inetd"
+msgid "Run as an inetd or xinetd server"
 msgstr ""
 
 #. Write log to file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:103
-msgid "openvpn_param_log"
+msgid "Write log to file"
 msgstr ""
 
 #. Append log to file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:104
-msgid "openvpn_param_log_append"
+msgid "Append log to file"
 msgstr ""
 
 #. Don't log timestamps
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:105
-msgid "openvpn_param_suppress_timestamps"
+msgid "Don't log timestamps"
 msgstr ""
 
 #. Write process ID to file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:106
-msgid "openvpn_param_writepid"
+msgid "Write process ID to file"
 msgstr ""
 
 #. Change process priority
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:107
-msgid "openvpn_param_nice"
+msgid "Change process priority"
 msgstr ""
 
 #. Echo parameters to log
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:108
-msgid "openvpn_param_echo"
+msgid "Echo parameters to log"
 msgstr ""
 
 #. Set output verbosity
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:109
-msgid "openvpn_param_verb"
+msgid "Set output verbosity"
 msgstr ""
 
 #. Limit repeated log messages
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:110
-msgid "openvpn_param_mute"
+msgid "Limit repeated log messages"
 msgstr ""
 
 #. Write status to file every n seconds
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:111
-msgid "openvpn_param_status"
+msgid "Write status to file every n seconds"
 msgstr ""
 
 #. Status file format version
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:112
-msgid "openvpn_param_status_version"
+msgid "Status file format version"
 msgstr ""
 
 #. Disable options consistency check
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:113
-msgid "openvpn_param_disable_occ"
+msgid "Disable options consistency check"
 msgstr ""
 
 #. Special stress testing mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:114
-msgid "openvpn_param_gremlin"
+msgid "Special stress testing mode"
 msgstr ""
 
 #. Use fast LZO compression
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:115
-msgid "openvpn_param_comp_lzo"
+msgid "Use fast LZO compression"
 msgstr ""
 
 #. Don't use adaptive lzo compression
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:116
-msgid "openvpn_param_comp_noadapt"
+msgid "Don't use adaptive lzo compression"
 msgstr ""
 
 #. Enable management interface on <em>IP</em> <em>port</em>
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:117
-msgid "openvpn_param_management"
+msgid "Enable management interface on <em>IP</em> <em>port</em>"
 msgstr ""
 
 #. Management interface will connect as a TCP client
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:118
-msgid "openvpn_param_management_client"
+msgid "Management interface will connect as a TCP client"
 msgstr ""
 
 #. Query management channel for private key
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:119
-msgid "openvpn_param_management_query_passwords"
+msgid "Query management channel for private key"
 msgstr ""
 
 #. Start OpenVPN in a hibernating state
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:120
-msgid "openvpn_param_management_hold"
+msgid "Start OpenVPN in a hibernating state"
 msgstr ""
 
 #. Issue SIGUSR1 on management disconnect
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:121
-msgid "openvpn_param_management_signal"
+msgid "Issue SIGUSR1 on management disconnect"
 msgstr ""
 
 #. Forget passwords on management disconnect
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:122
-msgid "openvpn_param_management_forget_disconnect"
+msgid "Forget passwords on management disconnect"
 msgstr ""
 
 #. Number of lines for log file history
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:123
-msgid "openvpn_param_management_log_cache"
+msgid "Number of lines for log file history"
 msgstr ""
 
 #. Load plug-in module
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:124
-msgid "openvpn_param_plugin"
+msgid "Load plug-in module"
 msgstr ""
 
 #. Configure server mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:125
-msgid "openvpn_param_server"
+msgid "Configure server mode"
 msgstr ""
 
 #. Configure server bridge
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:126
-msgid "openvpn_param_server_bridge"
+msgid "Configure server bridge"
 msgstr ""
 
 #. Push options to peer
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:127
-msgid "openvpn_param_push"
+msgid "Push options to peer"
 msgstr ""
 
 #. Don't inherit global push options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:128
-msgid "openvpn_param_push_reset"
+msgid "Don't inherit global push options"
 msgstr ""
 
 #. Set aside a pool of subnets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:129
-msgid "openvpn_param_ifconfig_pool"
+msgid "Set aside a pool of subnets"
 msgstr ""
 
 #. Use individual addresses rather than /30 subnets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:130
-msgid "openvpn_param_ifconfig_pool_linear"
+msgid "Use individual addresses rather than /30 subnets"
 msgstr ""
 
 #. Persist/unpersist ifconfig-pool
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:131
-msgid "openvpn_param_ifconfig_pool_persist"
+msgid "Persist/unpersist ifconfig-pool"
 msgstr ""
 
 #. Push an ifconfig option to remote
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:132
-msgid "openvpn_param_ifconfig_push"
+msgid "Push an ifconfig option to remote"
 msgstr ""
 
 #. Route subnet to client
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:133
-msgid "openvpn_param_iroute"
+msgid "Route subnet to client"
 msgstr ""
 
 #. Client is disabled
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:134
-msgid "openvpn_param_disable"
+msgid "Client is disabled"
 msgstr ""
 
 #. Don't require client certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:135
-msgid "openvpn_param_client_cert_not_required"
+msgid "Don't require client certificate"
 msgstr ""
 
 #. Use username as common name
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:136
-msgid "openvpn_param_username_as_common_name"
+msgid "Use username as common name"
 msgstr ""
 
 #. Script to verify interactive authentication
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:137
-msgid "openvpn_param_auth_user_pass_verify"
+msgid "Script to verify interactive authentication"
 msgstr ""
 
 #. Allow client-to-client traffic
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:138
-msgid "openvpn_param_client_to_client"
+msgid "Allow client-to-client traffic"
 msgstr ""
 
 #. Allow multiple clients with same certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:139
-msgid "openvpn_param_duplicate_cn"
+msgid "Allow multiple clients with same certificate"
 msgstr ""
 
 #. Run script cmd on client connection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:140
-msgid "openvpn_param_client_connect"
+msgid "Run script cmd on client connection"
 msgstr ""
 
 #. Run script cmd on client disconnection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:141
-msgid "openvpn_param_client_disconnect"
+msgid "Run script cmd on client disconnection"
 msgstr ""
 
 #. Directory for custom client config files
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:142
-msgid "openvpn_param_client_config_dir"
+msgid "Directory for custom client config files"
 msgstr ""
 
 #. Refuse connection if no custom client config
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:143
-msgid "openvpn_param_ccd_exclusive"
+msgid "Refuse connection if no custom client config"
 msgstr ""
 
 #. Temporary directory for client-connect return file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:144
-msgid "openvpn_param_tmp_dir"
+msgid "Temporary directory for client-connect return file"
 msgstr ""
 
 #. Set size of real and virtual address hash tables
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:145
-msgid "openvpn_param_hash_size"
+msgid "Set size of real and virtual address hash tables"
 msgstr ""
 
 #. Number of allocated broadcast buffers
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:146
-msgid "openvpn_param_bcast_buffers"
+msgid "Number of allocated broadcast buffers"
 msgstr ""
 
 #. Maximum number of queued TCP output packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:147
-msgid "openvpn_param_tcp_queue_limit"
+msgid "Maximum number of queued TCP output packets"
 msgstr ""
 
 #. Script to validate client virtual addresses
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:148
-msgid "openvpn_param_learn_address"
+msgid "Script to validate client virtual addresses"
 msgstr ""
 
 #. Allowed maximum of new connections
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:149
-msgid "openvpn_param_connect_freq"
+msgid "Allowed maximum of new connections"
 msgstr ""
 
 #. Allowed maximum of connected clients
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:150
-msgid "openvpn_param_max_clients"
+msgid "Allowed maximum of connected clients"
 msgstr ""
 
 #. Allowed maximum of internal
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:151
-msgid "openvpn_param_max_routes_per_client"
+msgid "Allowed maximum of internal"
 msgstr ""
 
 #. Proxy incoming HTTPS sessions
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:152
-msgid "openvpn_param_port_share"
+msgid "Proxy incoming HTTPS sessions"
 msgstr ""
 
 #. Configure client mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:153
-msgid "openvpn_param_client"
+msgid "Configure client mode"
 msgstr ""
 
 #. Authenticate using username/password
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:154
-msgid "openvpn_param_auth_user_pass"
+msgid "Authenticate using username/password"
 msgstr ""
 
 #. Accept options pushed from server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:155
-msgid "openvpn_param_pull"
+msgid "Accept options pushed from server"
 msgstr ""
 
 #. Handling of authentication failures
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:156
-msgid "openvpn_param_auth_retry"
+msgid "Handling of authentication failures"
 msgstr ""
 
 #. Send notification to peer on disconnect
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:157
-msgid "openvpn_param_explicit_exit_notify"
+msgid "Send notification to peer on disconnect"
 msgstr ""
 
 #. Enable Static Key encryption mode (non-TLS)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:158
-msgid "openvpn_param_secret"
+msgid "Enable Static Key encryption mode (non-TLS)"
 msgstr ""
 
 #. HMAC authentication for packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:159
-msgid "openvpn_param_auth"
+msgid "HMAC authentication for packets"
 msgstr ""
 
 #. Encryption cipher for packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:160
-msgid "openvpn_param_cipher"
+msgid "Encryption cipher for packets"
 msgstr ""
 
 #. Size of cipher key
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:161
-msgid "openvpn_param_keysize"
+msgid "Size of cipher key"
 msgstr ""
 
 #. Enable OpenSSL hardware crypto engines
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:162
-msgid "openvpn_param_engine"
+msgid "Enable OpenSSL hardware crypto engines"
 msgstr ""
 
 #. Disable replay protection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:163
-msgid "openvpn_param_no_replay"
+msgid "Disable replay protection"
 msgstr ""
 
 #. Silence the output of replay warnings
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:164
-msgid "openvpn_param_mute_replay_warnings"
+msgid "Silence the output of replay warnings"
 msgstr ""
 
 #. Replay protection sliding window size
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:165
-msgid "openvpn_param_replay_window"
+msgid "Replay protection sliding window size"
 msgstr ""
 
 #. Disable cipher initialisation vector
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:166
-msgid "openvpn_param_no_iv"
+msgid "Disable cipher initialisation vector"
 msgstr ""
 
 #. Persist replay-protection state
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:167
-msgid "openvpn_param_replay_persist"
+msgid "Persist replay-protection state"
 msgstr ""
 
 #. Run a self-test of crypto features
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:168
-msgid "openvpn_param_test_crypto"
+msgid "Run a self-test of crypto features"
 msgstr ""
 
 #. Enable TLS and assume server role
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:169
-msgid "openvpn_param_tls_server"
+msgid "Enable TLS and assume server role"
 msgstr ""
 
 #. Enable TLS and assume client role
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:170
-msgid "openvpn_param_tls_client"
+msgid "Enable TLS and assume client role"
 msgstr ""
 
 #. Data channel key exchange method
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:171
-msgid "openvpn_param_key_method"
+msgid "Data channel key exchange method"
 msgstr ""
 
 #. Certificate authority
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:172
-msgid "openvpn_param_ca"
+msgid "Certificate authority"
 msgstr ""
 
 #. Directory of trusted certificates (CAs and CRLs)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:173
-msgid "openvpn_param_capath"
+msgid "Directory of trusted certificates (CAs and CRLs)"
 msgstr ""
 
 #. Diffie Hellman parameters
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:174
-msgid "openvpn_param_dh"
+msgid "Diffie Hellman parameters"
 msgstr ""
 
 #. Local certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:175
-msgid "openvpn_param_cert"
+msgid "Local certificate"
 msgstr ""
 
 #. Local private key
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:176
-msgid "openvpn_param_key"
+msgid "Local private key"
 msgstr ""
 
 #. PKCS#12 file containing keys
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:177
-msgid "openvpn_param_pkcs12"
+msgid "PKCS#12 file containing keys"
 msgstr ""
 
 #. TLS cipher
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:178
-msgid "openvpn_param_tls_cipher"
+msgid "TLS cipher"
 msgstr ""
 
 #. Retransmit timeout on TLS control channel
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:179
-msgid "openvpn_param_tls_timeout"
+msgid "Retransmit timeout on TLS control channel"
 msgstr ""
 
 #. Renegotiate data chan. key after bytes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:180
-msgid "openvpn_param_reneg_bytes"
+msgid "Renegotiate data chan. key after bytes"
 msgstr ""
 
 #. Renegotiate data chan. key after packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:181
-msgid "openvpn_param_reneg_pkts"
+msgid "Renegotiate data chan. key after packets"
 msgstr ""
 
 #. Renegotiate data chan. key after seconds
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:182
-msgid "openvpn_param_reneg_sec"
+msgid "Renegotiate data chan. key after seconds"
 msgstr ""
 
 #. Timeframe for key exchange
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:183
-msgid "openvpn_param_hand_window"
+msgid "Timeframe for key exchange"
 msgstr ""
 
 #. Key transition window
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:184
-msgid "openvpn_param_tran_window"
+msgid "Key transition window"
 msgstr ""
 
 #. Allow only one session
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:185
-msgid "openvpn_param_single_session"
+msgid "Allow only one session"
 msgstr ""
 
 #. Exit on TLS negotiation failure
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:186
-msgid "openvpn_param_tls_exit"
+msgid "Exit on TLS negotiation failure"
 msgstr ""
 
 #. Additional authentication over TLS
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:187
-msgid "openvpn_param_tls_auth"
+msgid "Additional authentication over TLS"
 msgstr ""
 
 #. Get PEM password from controlling tty before we daemonize
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:188
-msgid "openvpn_param_askpass"
+msgid "Get PEM password from controlling tty before we daemonize"
 msgstr ""
 
 #. Don't cache --askpass or --auth-user-pass passwords
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:189
-msgid "openvpn_param_auth_nocache"
+msgid "Don't cache --askpass or --auth-user-pass passwords"
 msgstr ""
 
 #. Check peer certificate against a CRL
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:190
-msgid "openvpn_param_crl_verify"
+msgid "Check peer certificate against a CRL"
 msgstr ""
 
 #. Shell command to verify X509 name
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:191
-msgid "openvpn_param_tls_verify"
+msgid "Shell command to verify X509 name"
 msgstr ""
 
 #. Only accept connections from given X509 name
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:192
-msgid "openvpn_param_tls_remote"
+msgid "Only accept connections from given X509 name"
 msgstr ""
 
 #. Require explicit designation on certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:193
-msgid "openvpn_param_ns_cert_type"
+msgid "Require explicit designation on certificate"
 msgstr ""
 
 #. Require explicit key usage on certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:194
-msgid "openvpn_param_remote_cert_ku"
+msgid "Require explicit key usage on certificate"
 msgstr ""
 
 #. Require extended explicit key usage on certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:195
-msgid "openvpn_param_remote_cert_eku"
+msgid "Require extended explicit key usage on certificate"
 msgstr ""
 
 #. Require normal and extended key usage on certificate
diff --git a/po/fr/p910nd.po b/po/fr/p910nd.po
index a8b125c5f..9a5e7e0c0 100644
--- a/po/fr/p910nd.po
+++ b/po/fr/p910nd.po
@@ -14,17 +14,17 @@ msgstr ""
 
 #. p910nd - Printer server
 #: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:1
-msgid "p910nd"
+msgid "p910nd - Printer server"
 msgstr ""
 
 #. First you have to install the packages to get support for USB (kmod-usb-printer) or parallel port (kmod-lp).
 #: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:2
-msgid "p910nd_desc"
+msgid "First you have to install the packages to get support for USB (kmod-usb-printer) or parallel port (kmod-lp)."
 msgstr ""
 
 #. Bidirectional mode
 #: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:3
-msgid "bidirectional"
+msgid "Bidirectional mode"
 msgstr ""
 
 #. p910nd listens on port 910+N. E.g. 9100 for the first printer.
diff --git a/po/fr/polipo.po b/po/fr/polipo.po
index 82b0d7db3..d8f454a1c 100644
--- a/po/fr/polipo.po
+++ b/po/fr/polipo.po
@@ -14,212 +14,212 @@ msgstr ""
 
 #. Polipo
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:1
-msgid "polipo"
+msgid "Polipo"
 msgstr ""
 
 #. On-Disk Cache
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:2
-msgid "polipo_cache"
+msgid "On-Disk Cache"
 msgstr ""
 
 #. Shared cache
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:3
-msgid "polipo_cache_cacheisshared"
+msgid "Shared cache"
 msgstr ""
 
 #. Enable if cache (proxy) is shared by multiple users.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:4
-msgid "polipo_cache_cacheisshared_desc"
+msgid "Enable if cache (proxy) is shared by multiple users."
 msgstr ""
 
 #. To enable polipo on-disk cache cleaning (highly recommended), you should add a cron job in Scheduled Tasks services that will execute /usr/sbin/polipo_purge script. For example to perform disk cache cleanup every day at 6:00 in the morning you should add the following line in Scheduled Tasks &quot;0 6 * * *	/usr/sbin/polipo_purge&quot; (without quotes).
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:5
-msgid "polipo_cache_desc"
+msgid "To enable polipo on-disk cache cleaning (highly recommended), you should add a cron job in Scheduled Tasks services that will execute /usr/sbin/polipo_purge script. For example to perform disk cache cleanup every day at 6:00 in the morning you should add the following line in Scheduled Tasks \"0 6 * * *\\t/usr/sbin/polipo_purge\" (without quotes)."
 msgstr ""
 
 #. Disk cache location
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:6
-msgid "polipo_cache_diskcacheroot"
+msgid "Disk cache location"
 msgstr ""
 
 #. Location where polipo will cache files permanently. Use of external storage devices is recommended, because the cache can grow considerably. Leave it empty to disable on-disk cache.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:7
-msgid "polipo_cache_diskcacheroot_desc"
+msgid "Location where polipo will cache files permanently. Use of external storage devices is recommended, because the cache can grow considerably. Leave it empty to disable on-disk cache."
 msgstr ""
 
 #. Truncate cache files size (in bytes)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:8
-msgid "polipo_cache_diskcachetruncatesize"
+msgid "Truncate cache files size (in bytes)"
 msgstr ""
 
 #. Size to which cached files should be truncated. (default value: 1048576)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:9
-msgid "polipo_cache_diskcachetruncatesize_desc"
+msgid "Size to which cached files should be truncated. (default value: 1048576)"
 msgstr ""
 
 #. Truncate cache files time
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:10
-msgid "polipo_cache_diskcachetruncatetime"
+msgid "Truncate cache files time"
 msgstr ""
 
 #. Time after which cached files will be truncated. (default value: 4d12h)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:11
-msgid "polipo_cache_diskcachetruncatetime_desc"
+msgid "Time after which cached files will be truncated. (default value: 4d12h)"
 msgstr ""
 
 #. Delete cache files time
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:12
-msgid "polipo_cache_diskcacheunlinktime"
+msgid "Delete cache files time"
 msgstr ""
 
 #. Time after which cached files will be deleted. (default value: 32d)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:13
-msgid "polipo_cache_diskcacheunlinktime_desc"
+msgid "Time after which cached files will be deleted. (default value: 32d)"
 msgstr ""
 
 #. Polipo is a small and fast caching web proxy.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:14
-msgid "polipo_desc"
+msgid "Polipo is a small and fast caching web proxy."
 msgstr ""
 
 #. General
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:15
-msgid "polipo_general"
+msgid "General"
 msgstr ""
 
 #. Allowed clients
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:16
-msgid "polipo_general_allowedclients"
+msgid "Allowed clients"
 msgstr ""
 
 #. When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients that are allowed to connect. The format is IP address or network address (192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6)).
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:17
-msgid "polipo_general_allowedclients_desc"
+msgid "When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients that are allowed to connect. The format is IP address or network address (192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))."
 msgstr ""
 
 #. In RAM cache size (in bytes)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:18
-msgid "polipo_general_chunkhighmark"
+msgid "In RAM cache size (in bytes)"
 msgstr ""
 
 #. How much RAM should Polipo use for its cache.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:19
-msgid "polipo_general_chunkhighmark_desc"
+msgid "How much RAM should Polipo use for its cache."
 msgstr ""
 
 #. DNS server address
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:20
-msgid "polipo_general_dnsnameserver"
+msgid "DNS server address"
 msgstr ""
 
 #. Set the DNS server address to use, if you want Polipo to use different DNS server than the host system.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:21
-msgid "polipo_general_dnsnameserver_desc"
+msgid "Set the DNS server address to use, if you want Polipo to use different DNS server than the host system."
 msgstr ""
 
 #. Query DNS for IPv6
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:22
-msgid "polipo_general_dnsqueryipv6"
+msgid "Query DNS for IPv6"
 msgstr ""
 
 #. false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = Query both, prefer IPv6; true = Query only IPv6
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:23
-msgid "polipo_general_dnsqueryipv6_desc"
+msgid "false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = Query both, prefer IPv6; true = Query only IPv6"
 msgstr ""
 
 #. Query DNS by hostname
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:24
-msgid "polipo_general_dnsusegethostbyname"
+msgid "Query DNS by hostname"
 msgstr ""
 
 #. false = Never use system DNS resolver; reluctantly = Query DNS directly, if DNS server is unavailable fail to system DNS resolver; happily = Query DNS directly, if host could not be found fallback to system DNS resolver; true = Always use system DNS resolver
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:25
-msgid "polipo_general_dnsusegethostbyname_desc"
+msgid "false = Never use system DNS resolver; reluctantly = Query DNS directly, if DNS server is unavailable fail to system DNS resolver; happily = Query DNS directly, if host could not be found fallback to system DNS resolver; true = Always use system DNS resolver"
 msgstr ""
 
 #. Syslog facility
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:26
-msgid "polipo_general_logfacility"
+msgid "Syslog facility"
 msgstr ""
 
 #. Log file location
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:27
-msgid "polipo_general_logfile"
+msgid "Log file location"
 msgstr ""
 
 #. Use of external storage device is recommended, because the log file is written frequently and can grow considerably.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:28
-msgid "polipo_general_logfile_desc"
+msgid "Use of external storage device is recommended, because the log file is written frequently and can grow considerably."
 msgstr ""
 
 #. Log to syslog
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:29
-msgid "polipo_general_logsyslog"
+msgid "Log to syslog"
 msgstr ""
 
 #. Parent proxy authentication
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:30
-msgid "polipo_general_parentauthcredentials"
+msgid "Parent proxy authentication"
 msgstr ""
 
 #. Basic HTTP authentication supported. Provide username and password in username:password format.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:31
-msgid "polipo_general_parentauthcredentials_desc"
+msgid "Basic HTTP authentication supported. Provide username and password in username:password format."
 msgstr ""
 
 #. Parent proxy address
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:32
-msgid "polipo_general_parentproxy"
+msgid "Parent proxy address"
 msgstr ""
 
 #. Parent proxy address (in host:port format), to which Polipo will forward the requests.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:33
-msgid "polipo_general_parentproxy_desc"
+msgid "Parent proxy address (in host:port format), to which Polipo will forward the requests."
 msgstr ""
 
 #. Listen address
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:34
-msgid "polipo_general_proxyaddress"
+msgid "Listen address"
 msgstr ""
 
 #. The interface on which Polipo will listen. To listen on all interfaces use 0.0.0.0 or :: (IPv6).
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:35
-msgid "polipo_general_proxyaddress_desc"
+msgid "The interface on which Polipo will listen. To listen on all interfaces use 0.0.0.0 or :: (IPv6)."
 msgstr ""
 
 #. Listen port
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:36
-msgid "polipo_general_proxyport"
+msgid "Listen port"
 msgstr ""
 
 #. Port on which Polipo will listen. (default value: 8123)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:37
-msgid "polipo_general_proxyport_desc"
+msgid "Port on which Polipo will listen. (default value: 8123)"
 msgstr ""
 
 #. Poor Man&#39;s Multiplexing
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:38
-msgid "polipo_pmm"
+msgid "Poor Man's Multiplexing"
 msgstr ""
 
 #. Poor Man&#39;s Multiplexing (PMM) is a technique that simulates multiplexing by requesting an instance in multiple segments. It tries to lower the latency caused by the weakness of HTTP protocol. NOTE: some sites may not work with PMM enabled.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:39
-msgid "polipo_pmm_desc"
+msgid "Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by requesting an instance in multiple segments. It tries to lower the latency caused by the weakness of HTTP protocol. NOTE: some sites may not work with PMM enabled."
 msgstr ""
 
 #. First PMM segment size (in bytes)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:40
-msgid "polipo_pmm_pmmfirstsize"
+msgid "First PMM segment size (in bytes)"
 msgstr ""
 
 #. Size of the first PMM segment. If not defined, it defaults to twice the PMM segment size.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:41
-msgid "polipo_pmm_pmmfirstsize_desc"
+msgid "Size of the first PMM segment. If not defined, it defaults to twice the PMM segment size."
 msgstr ""
 
 #. PMM segments size (in bytes)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:42
-msgid "polipo_pmm_pmmsize"
+msgid "PMM segments size (in bytes)"
 msgstr ""
 
 #. To enable PMM, PMM segment size must be set to some positive value.
diff --git a/po/fr/qos.po b/po/fr/qos.po
index c0d0eb448..1ac71c566 100644
--- a/po/fr/qos.po
+++ b/po/fr/qos.po
@@ -15,94 +15,94 @@ msgstr ""
 
 #. Quality of Service
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:1
-msgid "qos"
+msgid "Quality of Service"
 msgstr "Qualité de service"
 
 #. With QoS you can priorize network traffic selected by adresses, ports or services.
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:2
-msgid "qos_desc"
+msgid "With QoS you can priorize network traffic selected by adresses, ports or services."
 msgstr ""
 "Avec la QOS, vous pouvez donner des priorités au trafic de votre réseau en "
 "fonction des adresses, des ports ou des services présents."
 
 #. Classification
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:3
-msgid "qos_interface_classgroup"
+msgid "Classification"
 msgstr "Classification"
 
 #. Calculate Overhead
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:4
-msgid "qos_interface_overhead"
+msgid "Calculate Overhead"
 msgstr "calcul de la surcharge"
 
 #. Half-Duplex
 #, fuzzy
-msgid "qos_interface_halfduplex"
+msgid "Half-Duplex"
 msgstr "Half-Duplex"
 
 #. Downlink
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:5
-msgid "qos_interface_download"
+msgid "Downlink"
 msgstr "Liaison descendante"
 
 #. Uplink
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:6
-msgid "qos_interface_upload"
+msgid "Uplink"
 msgstr "Liaison montante"
 
 #. Prioritization
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:7
-msgid "qos_classify"
+msgid "Prioritization"
 msgstr "Priorité"
 
 #. Priority
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:8
-msgid "qos_classify_target"
+msgid "Priority"
 msgstr "Priorité"
 
 #. Source address
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:9
-msgid "qos_classify_srchost"
+msgid "Source address"
 msgstr "Adresse source"
 
 #. source network / source host
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:10
-msgid "qos_classify_srchost_dest"
+msgid "source network / source host"
 msgstr "Réseau source / Hôte source"
 
 #. Target address
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:11
-msgid "qos_classify_dsthost"
+msgid "Target address"
 msgstr "Adresse de destination"
 
 #. target network / target host
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:12
-msgid "qos_classify_dsthost_dest"
+msgid "target network / target host"
 msgstr "Réseau de destination / Hôte de destination"
 
 #. portrange
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:13
-msgid "qos_classify_portrange"
+msgid "portrange"
 msgstr "ports"
 
 #. low
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:14
-msgid "qos_bulk"
+msgid "low"
 msgstr "lent"
 
 #. normal
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:15
-msgid "qos_normal"
+msgid "normal"
 msgstr "normal"
 
 #. express
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:16
-msgid "qos_express"
+msgid "express"
 msgstr "express"
 
 #. priority
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:17
-msgid "qos_priority"
+msgid "priority"
 msgstr "prioritaire"
 
 #. Bytes sent
diff --git a/po/fr/rrdtool.po b/po/fr/rrdtool.po
index 95545db6d..135d1b3f9 100644
--- a/po/fr/rrdtool.po
+++ b/po/fr/rrdtool.po
@@ -14,342 +14,342 @@ msgstr ""
 
 #. %H: Wireless - Signal Noise Ratio
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:1
-msgid "stat_dg_title_wireless__signal_noise"
+msgid "%H: Wireless - Signal Noise Ratio"
 msgstr ""
 
 #. dBm
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:2
-msgid "stat_dg_label_wireless__signal_noise"
+msgid "dBm"
 msgstr ""
 
 #. Noise Level
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:3
-msgid "stat_ds_signal_noise"
+msgid "Noise Level"
 msgstr ""
 
 #. Signal Strength
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:4
-msgid "stat_ds_signal_power"
+msgid "Signal Strength"
 msgstr ""
 
 #. %H: Wireless - Signal Quality
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:5
-msgid "stat_dg_title_wireless__signal_quality"
+msgid "%H: Wireless - Signal Quality"
 msgstr ""
 
 #. n
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:6
-msgid "stat_dg_label_wireless__signal_quality"
+msgid "n"
 msgstr ""
 
 #. Signal Quality
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:7
-msgid "stat_ds_signal_quality"
+msgid "Signal Quality"
 msgstr ""
 
 #. %H: ICMP Roundtrip Times
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:8
-msgid "stat_dg_title_ping"
+msgid "%H: ICMP Roundtrip Times"
 msgstr ""
 
 #. ms
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:9
-msgid "stat_dg_label_ping"
+msgid "ms"
 msgstr ""
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:10
-msgid "stat_ds_ping"
+msgid "%di"
 msgstr ""
 
 #. %H: Firewall - Processed Packets
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:11
-msgid "stat_dg_title_iptables__ipt_packets"
+msgid "%H: Firewall - Processed Packets"
 msgstr ""
 
 #. Packets/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:12
-msgid "stat_dg_label_iptables__ipt_packets"
+msgid "Packets/s"
 msgstr ""
 
 #. Chain \"%di\"
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:13
-msgid "stat_ds_ipt_packets"
+msgid "Chain \"%di\""
 msgstr ""
 
 #. %H: Netlink - Transfer on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:14
-msgid "stat_dg_title_netlink__if_octets"
+msgid "%H: Netlink - Transfer on %pi"
 msgstr ""
 
 #. Bytes/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:15
-msgid "stat_dg_label_netlink__if_octets"
+msgid "Bytes/s"
 msgstr ""
 
 #. Bytes (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:16
-msgid "stat_ds_if_octets"
+msgid "Bytes (%ds)"
 msgstr ""
 
 #. %H: Netlink - Packets on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:17
-msgid "stat_dg_title_netlink__if_packets"
+msgid "%H: Netlink - Packets on %pi"
 msgstr ""
 
 #. Packets/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:18
-msgid "stat_dg_label_netlink__if_packets"
+msgid "Packets/s"
 msgstr ""
 
 #. Processed (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:19
-msgid "stat_ds_if_packets"
+msgid "Processed (%ds)"
 msgstr ""
 
 #. Dropped   (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:20
-msgid "stat_ds_if_dropped"
+msgid "Dropped (%ds)"
 msgstr ""
 
 #. Errors    (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:21
-msgid "stat_ds_if_errors"
+msgid "Errors (%ds)"
 msgstr ""
 
 #. %H: Netlink - Multicast on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:22
-msgid "stat_dg_title_netlink__if_multicast"
+msgid "%H: Netlink - Multicast on %pi"
 msgstr ""
 
 #. Packets/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:23
-msgid "stat_dg_label_netlink__if_multicast"
+msgid "Packets/s"
 msgstr ""
 
 #. Packets
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:24
-msgid "stat_ds_if_multicast"
+msgid "Packets"
 msgstr ""
 
 #. %H: Netlink - Collisions on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:25
-msgid "stat_dg_title_netlink__if_collisions"
+msgid "%H: Netlink - Collisions on %pi"
 msgstr ""
 
 #. Collisions/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:26
-msgid "stat_dg_label_netlink__if_collisions"
+msgid "Collisions/s"
 msgstr ""
 
 #. Collisions
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:27
-msgid "stat_ds_if_collisions"
+msgid "Collisions"
 msgstr ""
 
 #. %H: Netlink - Errors on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:28
-msgid "stat_dg_title_netlink__if_tx_errors"
+msgid "%H: Netlink - Errors on %pi"
 msgstr ""
 
 #. Errors/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:29
-msgid "stat_dg_label_netlink__if_tx_errors"
+msgid "Errors/s"
 msgstr ""
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:30
-msgid "stat_ds_if_tx_errors"
+msgid "%di"
 msgstr ""
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:31
-msgid "stat_ds_if_rx_errors"
+msgid "%di"
 msgstr ""
 
 #. %H: Processes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:32
-msgid "stat_dg_title_processes"
+msgid "%H: Processes"
 msgstr ""
 
 #. Processes/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:33
-msgid "stat_dg_label_processes"
+msgid "Processes/s"
 msgstr ""
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:34
-msgid "stat_ds_ps_state"
+msgid "%di"
 msgstr ""
 
 #. %H: Process %pi - used cpu time
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:35
-msgid "stat_dg_title_processes__ps_cputime"
+msgid "%H: Process %pi - used cpu time"
 msgstr ""
 
 #. Jiffies
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:36
-msgid "stat_dg_label_processes__ps_cputime"
+msgid "Jiffies"
 msgstr ""
 
 #. system
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:37
-msgid "stat_ds_ps_cputime__syst"
+msgid "System"
 msgstr ""
 
 #. user
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:38
-msgid "stat_ds_ps_cputime__user"
+msgid "user"
 msgstr ""
 
 #. %H: Process %pi - threads and processes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:39
-msgid "stat_dg_title_processes__ps_count"
+msgid "%H: Process %pi - threads and processes"
 msgstr ""
 
 #. Count
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:40
-msgid "stat_dg_label_processes__ps_count"
+msgid "Count"
 msgstr ""
 
 #. %ds
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:41
-msgid "stat_ds_ps_count"
+msgid "%ds"
 msgstr ""
 
 #. %H: Process %pi - page faults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:42
-msgid "stat_dg_title_processes__ps_pagefaults"
+msgid "%H: Process %pi - page faults"
 msgstr ""
 
 #. Pagefaults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:43
-msgid "stat_dg_label_processes__ps_pagefaults"
+msgid "Pagefaults"
 msgstr ""
 
 #. page faults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:44
-msgid "stat_ds_ps_pagefaults"
+msgid "page faults"
 msgstr ""
 
 #. %H: Process %pi - virtual memory size
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:45
-msgid "stat_dg_title_processes__ps_rss"
+msgid "%H: Process %pi - virtual memory size"
 msgstr ""
 
 #. Bytes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:46
-msgid "stat_dg_label_processes__ps_rss"
+msgid "Bytes"
 msgstr ""
 
 #. virtual memory
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:47
-msgid "stat_ds_ps_rss"
+msgid "virtual memory"
 msgstr ""
 
 #. %H: Usage on Processor #%pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:48
-msgid "stat_dg_title_cpu"
+msgid "%H: Usage on Processor #%pi"
 msgstr ""
 
 #. %
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:49
-msgid "stat_dg_label_cpu"
+msgid "%"
 msgstr ""
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:50
-msgid "stat_ds_cpu"
+msgid "%di"
 msgstr ""
 
 #. %H: Transfer on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:51
-msgid "stat_dg_title_interface__if_octets"
+msgid "%H: Transfer on %di"
 msgstr ""
 
 #. Bytes/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:52
-msgid "stat_dg_label_interface__if_octets"
+msgid "Bytes/s"
 msgstr ""
 
 #. %H: Packets on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:53
-msgid "stat_dg_title_interface__if_packets"
+msgid "%H: Packets on %di"
 msgstr ""
 
 #. Packets/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:54
-msgid "stat_dg_label_interface__if_packets"
+msgid "Packets/s"
 msgstr ""
 
 #. %H: TCP-Connections to Port %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:55
-msgid "stat_dg_title_tcpconns"
+msgid "%H: TCP-Connections to Port %pi"
 msgstr ""
 
 #. Connections/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:56
-msgid "stat_dg_label_tcpconns"
+msgid "Connections/s"
 msgstr ""
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:57
-msgid "stat_ds_tcp_connections"
+msgid "%di"
 msgstr ""
 
 #. %H: Disk Space Usage on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:58
-msgid "stat_dg_title_df"
+msgid "%H: Disk Space Usage on %di"
 msgstr ""
 
 #. Bytes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:59
-msgid "stat_dg_label_df"
+msgid "Bytes"
 msgstr ""
 
 #. %ds
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:60
-msgid "stat_ds_df__free"
+msgid "%ds"
 msgstr ""
 
 #. %ds
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:61
-msgid "stat_ds_df__used"
+msgid "%ds"
 msgstr ""
 
 #. %H: Interrupts
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:62
-msgid "stat_dg_title_irq"
+msgid "%H: Interrupts"
 msgstr ""
 
 #. Issues/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:63
-msgid "stat_dg_label_irq"
+msgid "Issues/s"
 msgstr ""
 
 #. IRQ %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:64
-msgid "stat_ds_irq"
+msgid "IRQ %di"
 msgstr ""
 
 #. %H: System Load
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:65
-msgid "stat_dg_title_load"
+msgid "%H: System Load"
 msgstr ""
 
 #. Load
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:66
-msgid "stat_dg_label_load"
+msgid "Load"
 msgstr ""
 
 #. 1 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:67
-msgid "stat_ds_load__shortterm"
+msgid "1 min"
 msgstr ""
 
 #. 5 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:68
-msgid "stat_ds_load__midterm"
+msgid "5 min"
 msgstr ""
 
 #. 15 min
diff --git a/po/fr/samba.po b/po/fr/samba.po
index c53f03d59..b9d997ea1 100644
--- a/po/fr/samba.po
+++ b/po/fr/samba.po
@@ -14,82 +14,82 @@ msgstr ""
 
 #. Network Shares
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:1
-msgid "samba"
+msgid "Network Shares"
 msgstr ""
 
 #. Hostname
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:2
-msgid "samba_samba_name"
+msgid "Hostname"
 msgstr ""
 
 #. Description
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:3
-msgid "samba_samba_description"
+msgid "Description"
 msgstr ""
 
 #. Workgroup
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:4
-msgid "samba_samba_workgroup"
+msgid "Workgroup"
 msgstr ""
 
 #. Share home-directories
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:5
-msgid "samba_samba_homes"
+msgid "Share home-directories"
 msgstr ""
 
 #. System users can reach their home directories via network shares.
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:6
-msgid "samba_samba_homes_desc"
+msgid "System users can reach their home directories via network shares."
 msgstr ""
 
 #. Shared Directories
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:7
-msgid "samba_sambashare"
+msgid "Shared Directories"
 msgstr ""
 
 #. Shared Directory
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:8
-msgid "samba_sambashare_path"
+msgid "Shared Directory"
 msgstr ""
 
 #. Physical Path
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:9
-msgid "samba_sambashare_path_desc"
+msgid "Physical Path"
 msgstr ""
 
 #. Allowed Users
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:10
-msgid "samba_sambashare_users"
+msgid "Allowed Users"
 msgstr ""
 
 #. optional
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:11
-msgid "samba_sambashare_users_desc"
+msgid "optional"
 msgstr ""
 
 #. Read Only
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:12
-msgid "samba_sambashare_readonly"
+msgid "Read Only"
 msgstr ""
 
 #. Allow Guests
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:13
-msgid "samba_sambashare_guestok"
+msgid "Allow Guests"
 msgstr ""
 
 #. Create Mask
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:14
-msgid "samba_sambashare_createmask"
+msgid "Create Mask"
 msgstr ""
 
 #. Mask for new files
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:15
-msgid "samba_sambashare_createmask_desc"
+msgid "Mask for new files"
 msgstr ""
 
 #. Directory Mask
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:16
-msgid "samba_sambashare_dirmask"
+msgid "Directory Mask"
 msgstr ""
 
 #. Mask for new directories
diff --git a/po/fr/statistics.po b/po/fr/statistics.po
index 2bf759906..2d6a6e136 100644
--- a/po/fr/statistics.po
+++ b/po/fr/statistics.po
@@ -14,1057 +14,1057 @@ msgstr ""
 
 #. Statistics
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:1
-msgid "stat_statistics"
+msgid "Statistics"
 msgstr ""
 
 #. The statistics package is based on <a href=\"http://collectd.org/index.shtml\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD Tool</a> to render diagram images from collected data.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:2
-msgid "stat_desc"
+msgid "The statistics package is based on <a href=\"http://collectd.org/index.shtml\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD Tool</a> to render diagram images from collected data."
 msgstr ""
 
 #. System plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:3
-msgid "stat_systemplugins"
+msgid "System plugins"
 msgstr ""
 
 #. Network plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:4
-msgid "stat_networkplugins"
+msgid "Network plugins"
 msgstr ""
 
 #. Output plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:5
-msgid "stat_outputplugins"
+msgid "Output plugins"
 msgstr ""
 
 #. Display timespan
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:6
-msgid "stat_showtimespan"
+msgid "Display timespan »"
 msgstr ""
 
 #. Graphs
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:7
-msgid "stat_graphs"
+msgid "Graphs"
 msgstr ""
 
 #. Collectd
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:8
-msgid "stat_collectd"
+msgid "Collectd"
 msgstr ""
 
 #. Processor
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:9
-msgid "stat_cpu"
+msgid "Processor"
 msgstr ""
 
 #. Ping
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:10
-msgid "stat_ping"
+msgid "Ping"
 msgstr ""
 
 #. Firewall
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:11
-msgid "stat_iptables"
+msgid "Firewall"
 msgstr ""
 
 #. Netlink
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:12
-msgid "stat_netlink"
+msgid "Netlink"
 msgstr ""
 
 #. Processes
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:13
-msgid "stat_processes"
+msgid "Processes"
 msgstr ""
 
 #. Wireless
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:14
-msgid "stat_wireless"
+msgid "Wireless"
 msgstr ""
 
 #. TCP Connections
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:15
-msgid "stat_tcpconns"
+msgid "TCP Connections"
 msgstr ""
 
 #. Interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:16
-msgid "stat_interface"
+msgid "Interfaces"
 msgstr ""
 
 #. Disk Space Usage
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:17
-msgid "stat_df"
+msgid "Disk Space Usage"
 msgstr ""
 
 #. Interrupts
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:18
-msgid "stat_irq"
+msgid "Interrupts"
 msgstr ""
 
 #. Disk Usage
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:19
-msgid "stat_disk"
+msgid "Disk Usage"
 msgstr ""
 
 #. Exec
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:20
-msgid "stat_exec"
+msgid "Exec"
 msgstr ""
 
 #. RRDTool
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:21
-msgid "stat_rrdtool"
+msgid "RRDTool"
 msgstr ""
 
 #. Network
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:22
-msgid "stat_network"
+msgid "Network"
 msgstr ""
 
 #. CSV Output
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:23
-msgid "stat_csv"
+msgid "CSV Output"
 msgstr ""
 
 #. System Load
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:24
-msgid "stat_load"
+msgid "System Load"
 msgstr ""
 
 #. DNS
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:25
-msgid "stat_dns"
+msgid "DNS"
 msgstr ""
 
 #. Email
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:26
-msgid "stat_email"
+msgid "Email"
 msgstr ""
 
 #. UnixSock
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:27
-msgid "stat_unixsock"
+msgid "UnixSock"
 msgstr ""
 
 #. Statistics
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:28
-msgid "lucistatistics"
+msgid "Statistics"
 msgstr ""
 
 #. Collectd Settings
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:29
-msgid "lucistatistics_collectd"
+msgid "Collectd Settings"
 msgstr ""
 
 #. Collectd is a small daeomon for collecting data from various sources through different plugins. On this page you can change general settings for the collectd daemon.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:30
-msgid "lucistatistics_collectd_desc"
+msgid "Collectd is a small daeomon for collecting data from various sources through different plugins. On this page you can change general settings for the collectd daemon."
 msgstr ""
 
 #. Hostname
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:31
-msgid "lucistatistics_collectd_hostname"
+msgid "Hostname"
 msgstr ""
 
 #. Base Directory
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:32
-msgid "lucistatistics_collectd_basedir"
+msgid "Base Directory"
 msgstr ""
 
 #. Directory for sub-configurations
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:33
-msgid "lucistatistics_collectd_include"
+msgid "Directory for sub-configurations"
 msgstr ""
 
 #. Directory for collectd plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:34
-msgid "lucistatistics_collectd_plugindir"
+msgid "Directory for collectd plugins"
 msgstr ""
 
 #. Used PID file
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:35
-msgid "lucistatistics_collectd_pidfile"
+msgid "Used PID file"
 msgstr ""
 
 #. Datasets definition file
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:36
-msgid "lucistatistics_collectd_typesdb"
+msgid "Datasets definition file"
 msgstr ""
 
 #. Data collection interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:37
-msgid "lucistatistics_collectd_interval"
+msgid "Data collection interval"
 msgstr ""
 
 #. Seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:38
-msgid "lucistatistics_collectd_interval_desc"
+msgid "Seconds"
 msgstr ""
 
 #. Number of threads for data collection
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:39
-msgid "lucistatistics_collectd_readthreads"
+msgid "Number of threads for data collection"
 msgstr ""
 
 #. Try to lookup fully qualified hostname
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:40
-msgid "lucistatistics_collectd_fqdnlookup"
+msgid "Try to lookup fully qualified hostname"
 msgstr ""
 
 #. CPU Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:41
-msgid "lucistatistics_collectdcpu"
+msgid "CPU Plugin Configuration"
 msgstr ""
 
 #. The cpu plugin collects basic statistics about the processor usage.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:42
-msgid "lucistatistics_collectdcpu_desc"
+msgid "The cpu plugin collects basic statistics about the processor usage."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:43
-msgid "lucistatistics_collectdcpu_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. CSV Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:44
-msgid "lucistatistics_collectdcsv"
+msgid "CSV Plugin Configuration"
 msgstr ""
 
 #. The csv plugin stores collected data in csv file format for further processing by external programs.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:45
-msgid "lucistatistics_collectdcsv_desc"
+msgid "The csv plugin stores collected data in csv file format for further processing by external programs."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:46
-msgid "lucistatistics_collectdcsv_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Storage directory for the csv files
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:47
-msgid "lucistatistics_collectdcsv_datadir"
+msgid "Storage directory for the csv files"
 msgstr ""
 
 #. Store data values as rates instead of absolute values
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:48
-msgid "lucistatistics_collectdcsv_storerates"
+msgid "Store data values as rates instead of absolute values"
 msgstr ""
 
 #. DF Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:49
-msgid "lucistatistics_collectddf"
+msgid "DF Plugin Configuration"
 msgstr ""
 
 #. The df plugin collects statistics about the disk space usage on different devices, mount points or filesystem types.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:50
-msgid "lucistatistics_collectddf_desc"
+msgid "The df plugin collects statistics about the disk space usage on different devices, mount points or filesystem types."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:51
-msgid "lucistatistics_collectddf_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Monitor devices
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:52
-msgid "lucistatistics_collectddf_devices"
+msgid "Monitor devices"
 msgstr ""
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:53
-msgid "lucistatistics_collectddf_devices_desc"
+msgid "multiple separated by space"
 msgstr ""
 
 #. Monitor mount points
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:54
-msgid "lucistatistics_collectddf_mountpoints"
+msgid "Monitor mount points"
 msgstr ""
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:55
-msgid "lucistatistics_collectddf_mountpoints_desc"
+msgid "multiple separated by space"
 msgstr ""
 
 #. Monitor filesystem types
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:56
-msgid "lucistatistics_collectddf_fstypes"
+msgid "Monitor filesystem types"
 msgstr ""
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:57
-msgid "lucistatistics_collectddf_fstypes_desc"
+msgid "multiple separated by space"
 msgstr ""
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:58
-msgid "lucistatistics_collectddf_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr ""
 
 #. Disk Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:59
-msgid "lucistatistics_collectddisk"
+msgid "Disk Plugin Configuration"
 msgstr ""
 
 #. The disk plugin collects detailled usage statistics for selected partitions or whole disks.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:60
-msgid "lucistatistics_collectddisk_desc"
+msgid "The disk plugin collects detailled usage statistics for selected partitions or whole disks."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:61
-msgid "lucistatistics_collectddisk_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Monitor disks and partitions
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:62
-msgid "lucistatistics_collectddisk_disks"
+msgid "Monitor disks and partitions"
 msgstr ""
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:63
-msgid "lucistatistics_collectddisk_disks_desc"
+msgid "multiple separated by space"
 msgstr ""
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:64
-msgid "lucistatistics_collectddisk_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr ""
 
 #. DNS Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:65
-msgid "lucistatistics_collectddns"
+msgid "DNS Plugin Configuration"
 msgstr ""
 
 #. The dns plugin collects detailled statistics about dns related traffic on selected interfaces.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:66
-msgid "lucistatistics_collectddns_desc"
+msgid "The dns plugin collects detailled statistics about dns related traffic on selected interfaces."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:67
-msgid "lucistatistics_collectddns_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Monitor interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:68
-msgid "lucistatistics_collectddns_interfaces"
+msgid "Monitor interfaces"
 msgstr ""
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:69
-msgid "lucistatistics_collectddns_interfaces_desc"
+msgid "multiple separated by space"
 msgstr ""
 
 #. Ignore source addresses
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:70
-msgid "lucistatistics_collectddns_ignoresources"
+msgid "Ignore source addresses"
 msgstr ""
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:71
-msgid "lucistatistics_collectddns_ignoresources_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr ""
 
 #. E-Mail Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:72
-msgid "lucistatistics_collectdemail"
+msgid "E-Mail Plugin Configuration"
 msgstr ""
 
 #. The email plugin creates a unix socket which can be used to transmit email-statistics to a running collectd daemon. This plugin is primarily intended to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can be used in other ways as well.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:73
-msgid "lucistatistics_collectdemail_desc"
+msgid "The email plugin creates a unix socket which can be used to transmit email-statistics to a running collectd daemon. This plugin is primarily intended to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can be used in other ways as well."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:74
-msgid "lucistatistics_collectdemail_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Filepath of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:75
-msgid "lucistatistics_collectdemail_socketfile"
+msgid "Filepath of the unix socket"
 msgstr ""
 
 #. Group ownership of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:76
-msgid "lucistatistics_collectdemail_socketgroup"
+msgid "Group ownership of the unix socket"
 msgstr ""
 
 #. group name
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:77
-msgid "lucistatistics_collectdemail_socketgroup_desc"
+msgid "group name"
 msgstr ""
 
 #. File permissions of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:78
-msgid "lucistatistics_collectdemail_socketperms"
+msgid "File permissions of the unix socket"
 msgstr ""
 
 #. octal
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:79
-msgid "lucistatistics_collectdemail_socketperms_desc"
+msgid "octal"
 msgstr ""
 
 #. Maximum allowed connections
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:80
-msgid "lucistatistics_collectdemail_maxconns"
+msgid "Maximum allowed connections"
 msgstr ""
 
 #. Exec Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:81
-msgid "lucistatistics_collectdexec"
+msgid "Exec Plugin Configuration"
 msgstr ""
 
 #. The exec plugin starts external commands to read values from or to notify external processes when certain threshold values have been reached.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:82
-msgid "lucistatistics_collectdexec_desc"
+msgid "The exec plugin starts external commands to read values from or to notify external processes when certain threshold values have been reached."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:83
-msgid "lucistatistics_collectdexec_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Add command for reading values
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:84
-msgid "lucistatistics_collectdexecinput"
+msgid "Add command for reading values"
 msgstr ""
 
 #. Here you can define external commands which will be started by collectd in order to read certain values. The values will be read from stdout.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:85
-msgid "lucistatistics_collectdexecinput_desc"
+msgid "Here you can define external commands which will be started by collectd in order to read certain values. The values will be read from stdout."
 msgstr ""
 
 #. Commandline
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:86
-msgid "lucistatistics_collectdexecinput_cmdline"
+msgid "Commandline"
 msgstr ""
 
 #. Run as user
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:87
-msgid "lucistatistics_collectdexecinput_cmduser"
+msgid "Run as user"
 msgstr ""
 
 #. Run as group
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:88
-msgid "lucistatistics_collectdexecinput_cmdgroup"
+msgid "Run as group"
 msgstr ""
 
 #. Add notification command
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:89
-msgid "lucistatistics_collectdexecnotify"
+msgid "Add notification command"
 msgstr ""
 
 #. Here you can define external commands which will be started by collectd when certain threshold values have been reached. The values leading to invokation will be feeded to the the called programs stdin.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:90
-msgid "lucistatistics_collectdexecnotify_desc"
+msgid "Here you can define external commands which will be started by collectd when certain threshold values have been reached. The values leading to invokation will be feeded to the the called programs stdin."
 msgstr ""
 
 #. Commandline
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:91
-msgid "lucistatistics_collectdexecnotify_cmdline"
+msgid "Commandline"
 msgstr ""
 
 #. Run as user
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:92
-msgid "lucistatistics_collectdexecnotify_cmduser"
+msgid "Run as user"
 msgstr ""
 
 #. Run as group
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:93
-msgid "lucistatistics_collectdexecnotify_cmdgroup"
+msgid "Run as group"
 msgstr ""
 
 #. Interface Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:94
-msgid "lucistatistics_collectdinterface"
+msgid "Interface Plugin Configuration"
 msgstr ""
 
 #. The interface plugin collects traffic statistics on selected interfaces.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:95
-msgid "lucistatistics_collectdinterface_desc"
+msgid "The interface plugin collects traffic statistics on selected interfaces."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:96
-msgid "lucistatistics_collectdinterface_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Monitor interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:97
-msgid "lucistatistics_collectdinterface_interfaces"
+msgid "Monitor interfaces"
 msgstr ""
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:98
-msgid "lucistatistics_collectdinterface_interfaces_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr ""
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:99
-msgid "lucistatistics_collectdinterface_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr ""
 
 #. Iptables Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:100
-msgid "lucistatistics_collectdiptables"
+msgid "Iptables Plugin Configuration"
 msgstr ""
 
 #. The iptables plugin will monitor selected firewall rules and collect informations about processed bytes and packets per rule.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:101
-msgid "lucistatistics_collectdiptables_desc"
+msgid "The iptables plugin will monitor selected firewall rules and collect informations about processed bytes and packets per rule."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:102
-msgid "lucistatistics_collectdiptables_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Add matching rule
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:103
-msgid "lucistatistics_collectdiptablesmatch"
+msgid "Add matching rule"
 msgstr ""
 
 #. Here you can define various criteria by which the monitored iptables rules are selected.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:104
-msgid "lucistatistics_collectdiptablesmatch_desc"
+msgid "Here you can define various criteria by which the monitored iptables rules are selected."
 msgstr ""
 
 #. Name of the rule
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:105
-msgid "lucistatistics_collectdiptablesmatch_name"
+msgid "Name of the rule"
 msgstr ""
 
 #. max. 16 chars
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:106
-msgid "lucistatistics_collectdiptablesmatch_name_desc"
+msgid "max. 16 chars"
 msgstr ""
 
 #. Table
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:107
-msgid "lucistatistics_collectdiptablesmatch_table"
+msgid "Table"
 msgstr ""
 
 #. Chain
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:108
-msgid "lucistatistics_collectdiptablesmatch_chain"
+msgid "Chain"
 msgstr ""
 
 #. Action (target)
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:109
-msgid "lucistatistics_collectdiptablesmatch_target"
+msgid "Action (target)"
 msgstr ""
 
 #. Network protocol
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:110
-msgid "lucistatistics_collectdiptablesmatch_protocol"
+msgid "Network protocol"
 msgstr ""
 
 #. Source ip range
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:111
-msgid "lucistatistics_collectdiptablesmatch_source"
+msgid "Source ip range"
 msgstr ""
 
 #. CIDR notation
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:112
-msgid "lucistatistics_collectdiptablesmatch_source_desc"
+msgid "CIDR notation"
 msgstr ""
 
 #. Destination ip range
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:113
-msgid "lucistatistics_collectdiptablesmatch_destination"
+msgid "Destination ip range"
 msgstr ""
 
 #. CIDR notation
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:114
-msgid "lucistatistics_collectdiptablesmatch_destination_desc"
+msgid "CIDR notation"
 msgstr ""
 
 #. Incoming interface
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:115
-msgid "lucistatistics_collectdiptablesmatch_inputif"
+msgid "Incoming interface"
 msgstr ""
 
 #. e.g. br-lan
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:116
-msgid "lucistatistics_collectdiptablesmatch_inputif_desc"
+msgid "e.g. br-lan"
 msgstr ""
 
 #. Outgoing interface
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:117
-msgid "lucistatistics_collectdiptablesmatch_outputif"
+msgid "Outgoing interface"
 msgstr ""
 
 #. e.g. br-ff
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:118
-msgid "lucistatistics_collectdiptablesmatch_outputif_desc"
+msgid "e.g. br-ff"
 msgstr ""
 
 #. Options
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:119
-msgid "lucistatistics_collectdiptablesmatch_options"
+msgid "Options"
 msgstr ""
 
 #. e.g. reject-with tcp-reset
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:120
-msgid "lucistatistics_collectdiptablesmatch_options_desc"
+msgid "e.g. reject-with tcp-reset"
 msgstr ""
 
 #. IRQ Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:121
-msgid "lucistatistics_collectdirq"
+msgid "IRQ Plugin Configuration"
 msgstr ""
 
 #. The irq plugin will monitor the rate of issues per second for each selected interrupt. If no interrupt is selected then all interrupts are monitored.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:122
-msgid "lucistatistics_collectdirq_desc"
+msgid "The irq plugin will monitor the rate of issues per second for each selected interrupt. If no interrupt is selected then all interrupts are monitored."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:123
-msgid "lucistatistics_collectdirq_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Monitor interrupts
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:124
-msgid "lucistatistics_collectdirq_irqs"
+msgid "Monitor interrupts"
 msgstr ""
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:125
-msgid "lucistatistics_collectdirq_irqs_desc"
+msgid "multiple separated by space"
 msgstr ""
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:126
-msgid "lucistatistics_collectdirq_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr ""
 
 #. Load Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:127
-msgid "lucistatistics_collectdload"
+msgid "Load Plugin Configuration"
 msgstr ""
 
 #. The load plugin collects statistics about the general system load.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:128
-msgid "lucistatistics_collectdload_desc"
+msgid "The load plugin collects statistics about the general system load."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:129
-msgid "lucistatistics_collectdload_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Netlink Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:130
-msgid "lucistatistics_collectdnetlink"
+msgid "Netlink Plugin Configuration"
 msgstr ""
 
 #. The netlink plugin collects extended informations like qdisc-, class- and filter-statistics for selected interfaces.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:131
-msgid "lucistatistics_collectdnetlink_desc"
+msgid "The netlink plugin collects extended informations like qdisc-, class- and filter-statistics for selected interfaces."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:132
-msgid "lucistatistics_collectdnetlink_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Basic monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:133
-msgid "lucistatistics_collectdnetlink_interfaces"
+msgid "Basic monitoring"
 msgstr ""
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:134
-msgid "lucistatistics_collectdnetlink_interfaces_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr ""
 
 #. Verbose monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:135
-msgid "lucistatistics_collectdnetlink_verboseinterfaces"
+msgid "Verbose monitoring"
 msgstr ""
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:136
-msgid "lucistatistics_collectdnetlink_verboseinterfaces_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr ""
 
 #. Qdisc monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:137
-msgid "lucistatistics_collectdnetlink_qdiscs"
+msgid "Qdisc monitoring"
 msgstr ""
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:138
-msgid "lucistatistics_collectdnetlink_qdiscs_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr ""
 
 #. Shaping class monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:139
-msgid "lucistatistics_collectdnetlink_classes"
+msgid "Shaping class monitoring"
 msgstr ""
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:140
-msgid "lucistatistics_collectdnetlink_classes_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr ""
 
 #. Filter class monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:141
-msgid "lucistatistics_collectdnetlink_filters"
+msgid "Filter class monitoring"
 msgstr ""
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:142
-msgid "lucistatistics_collectdnetlink_filters_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr ""
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:143
-msgid "lucistatistics_collectdnetlink_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr ""
 
 #. Network Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:144
-msgid "lucistatistics_collectdnetwork"
+msgid "Network Plugin Configuration"
 msgstr ""
 
 #. The network plugin provides network based communication between different collectd instances. Collectd can operate both in client and server mode. In client mode locally collected date is transferred to a collectd server instance, in server mode the local instance receives data from other hosts.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:145
-msgid "lucistatistics_collectdnetwork_desc"
+msgid "The network plugin provides network based communication between different collectd instances. Collectd can operate both in client and server mode. In client mode locally collected date is transferred to a collectd server instance, in server mode the local instance receives data from other hosts."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:146
-msgid "lucistatistics_collectdnetwork_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Listener interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:147
-msgid "lucistatistics_collectdnetworklisten"
+msgid "Listener interfaces"
 msgstr ""
 
 #. This section defines on which interfaces collectd will wait for incoming connections.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:148
-msgid "lucistatistics_collectdnetworklisten_desc"
+msgid "This section defines on which interfaces collectd will wait for incoming connections."
 msgstr ""
 
 #. Listen host
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:149
-msgid "lucistatistics_collectdnetworklisten_host"
+msgid "Listen host"
 msgstr ""
 
 #. host-, ip- or ip6 address
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:150
-msgid "lucistatistics_collectdnetworklisten_host_desc"
+msgid "host-, ip- or ip6 address"
 msgstr ""
 
 #. Listen port
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:151
-msgid "lucistatistics_collectdnetworklisten_port"
+msgid "Listen port"
 msgstr ""
 
 #. 0 - 65535
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:152
-msgid "lucistatistics_collectdnetworklisten_port_desc"
+msgid "0 - 65535"
 msgstr ""
 
 #. server interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:153
-msgid "lucistatistics_collectdnetworkserver"
+msgid "server interfaces"
 msgstr ""
 
 #. This section defines to which servers the locally collected data is sent to.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:154
-msgid "lucistatistics_collectdnetworkserver_desc"
+msgid "This section defines to which servers the locally collected data is sent to."
 msgstr ""
 
 #. Server host
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:155
-msgid "lucistatistics_collectdnetworkserver_host"
+msgid "Server host"
 msgstr ""
 
 #. host-, ip- or ip6 address
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:156
-msgid "lucistatistics_collectdnetworkserver_host_desc"
+msgid "host-, ip- or ip6 address"
 msgstr ""
 
 #. Server port
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:157
-msgid "lucistatistics_collectdnetworkserver_port"
+msgid "Server port"
 msgstr ""
 
 #. 0 - 65535
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:158
-msgid "lucistatistics_collectdnetworkserver_port_desc"
+msgid "0 - 65535"
 msgstr ""
 
 #. TTL for network packets
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:159
-msgid "lucistatistics_collectdnetwork_timetolive"
+msgid "TTL for network packets"
 msgstr ""
 
 #. 0 - 255
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:160
-msgid "lucistatistics_collectdnetwork_timetolive_desc"
+msgid "0 - 255"
 msgstr ""
 
 #. Forwarding between listen and server addresses
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:161
-msgid "lucistatistics_collectdnetwork_forward"
+msgid "Forwarding between listen and server addresses"
 msgstr ""
 
 #. Cache flush interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:162
-msgid "lucistatistics_collectdnetwork_cacheflush"
+msgid "Cache flush interval"
 msgstr ""
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:163
-msgid "lucistatistics_collectdnetwork_cacheflush_desc"
+msgid "seconds"
 msgstr ""
 
 #. Ping Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:164
-msgid "lucistatistics_collectdping"
+msgid "Ping Plugin Configuration"
 msgstr ""
 
 #. The ping plugin will send icmp echo replies to selected hosts and measure the roundtrip time for each host.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:165
-msgid "lucistatistics_collectdping_desc"
+msgid "The ping plugin will send icmp echo replies to selected hosts and measure the roundtrip time for each host."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:166
-msgid "lucistatistics_collectdping_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Monitor hosts
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:167
-msgid "lucistatistics_collectdping_hosts"
+msgid "Monitor hosts"
 msgstr ""
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:168
-msgid "lucistatistics_collectdping_hosts_desc"
+msgid "multiple separated by space"
 msgstr ""
 
 #. TTL for ping packets
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:169
-msgid "lucistatistics_collectdping_ttl"
+msgid "TTL for ping packets"
 msgstr ""
 
 #. 0 - 255
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:170
-msgid "lucistatistics_collectdping_ttl_desc"
+msgid "0 - 255"
 msgstr ""
 
 #. Processes Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:171
-msgid "lucistatistics_collectdprocesses"
+msgid "Processes Plugin Configuration"
 msgstr ""
 
 #. The processes plugin collects informations like cpu time, page faults and memory usage of selected processes.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:172
-msgid "lucistatistics_collectdprocesses_desc"
+msgid "The processes plugin collects informations like cpu time, page faults and memory usage of selected processes."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:173
-msgid "lucistatistics_collectdprocesses_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Monitor processes
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:174
-msgid "lucistatistics_collectdprocesses_processes"
+msgid "Monitor processes"
 msgstr ""
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:175
-msgid "lucistatistics_collectdprocesses_processes_desc"
+msgid "multiple separated by space"
 msgstr ""
 
 #. RRDTool Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:176
-msgid "lucistatistics_collectdrrdtool"
+msgid "RRDTool Plugin Configuration"
 msgstr ""
 
 #. The rrdtool plugin stores the collected data in rrd database files, the foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong values will result in a very high memory consumption in the temporary directory. This can render the device unusable!</strong>
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:177
-msgid "lucistatistics_collectdrrdtool_desc"
+msgid "The rrdtool plugin stores the collected data in rrd database files, the foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong values will result in a very high memory consumption in the temporary directory. This can render the device unusable!</strong>"
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:178
-msgid "lucistatistics_collectdrrdtool_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Storage directory
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:179
-msgid "lucistatistics_collectdrrdtool_datadir"
+msgid "Storage directory"
 msgstr ""
 
 #. RRD step interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:180
-msgid "lucistatistics_collectdrrdtool_stepsize"
+msgid "RRD step interval"
 msgstr ""
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:181
-msgid "lucistatistics_collectdrrdtool_stepsize_desc"
+msgid "seconds"
 msgstr ""
 
 #. RRD heart beat interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:182
-msgid "lucistatistics_collectdrrdtool_heartbeat"
+msgid "RRD heart beat interval"
 msgstr ""
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:183
-msgid "lucistatistics_collectdrrdtool_heartbeat_desc"
+msgid "seconds"
 msgstr ""
 
 #. Only create average RRAs
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:184
-msgid "lucistatistics_collectdrrdtool_rrasingle"
+msgid "Only create average RRAs"
 msgstr ""
 
 #. reduces rrd size
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:185
-msgid "lucistatistics_collectdrrdtool_rrasingle_desc"
+msgid "reduces rrd size"
 msgstr ""
 
 #. Stored timespans
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:186
-msgid "lucistatistics_collectdrrdtool_rratimespans"
+msgid "Stored timespans"
 msgstr ""
 
 #. seconds; multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:187
-msgid "lucistatistics_collectdrrdtool_rratimespans_desc"
+msgid "seconds; multiple separated by space"
 msgstr ""
 
 #. Rows per RRA
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:188
-msgid "lucistatistics_collectdrrdtool_rrarows"
+msgid "Rows per RRA"
 msgstr ""
 
 #. RRD XFiles Factor
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:189
-msgid "lucistatistics_collectdrrdtool_xff"
+msgid "RRD XFiles Factor"
 msgstr ""
 
 #. Cache collected data for
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:190
-msgid "lucistatistics_collectdrrdtool_cachetimeout"
+msgid "Cache collected data for"
 msgstr ""
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:191
-msgid "lucistatistics_collectdrrdtool_cachetimeout_desc"
+msgid "seconds"
 msgstr ""
 
 #. Flush cache after
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:192
-msgid "lucistatistics_collectdrrdtool_cacheflush"
+msgid "Flush cache after"
 msgstr ""
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:193
-msgid "lucistatistics_collectdrrdtool_cacheflush_desc"
+msgid "seconds"
 msgstr ""
 
 #. TCPConns Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:194
-msgid "lucistatistics_collectdtcpconns"
+msgid "TCPConns Plugin Configuration"
 msgstr ""
 
 #. The tcpconns plugin collects informations about open tcp connections on selected ports.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:195
-msgid "lucistatistics_collectdtcpconns_desc"
+msgid "The tcpconns plugin collects informations about open tcp connections on selected ports."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:196
-msgid "lucistatistics_collectdtcpconns_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Monitor all local listen ports
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:197
-msgid "lucistatistics_collectdtcpconns_listeningports"
+msgid "Monitor all local listen ports"
 msgstr ""
 
 #. Monitor local ports
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:198
-msgid "lucistatistics_collectdtcpconns_localports"
+msgid "Monitor local ports"
 msgstr ""
 
 #. 0 - 65535; multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:199
-msgid "lucistatistics_collectdtcpconns_localports_desc"
+msgid "0 - 65535; multiple separated by space"
 msgstr ""
 
 #. Monitor remote ports
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:200
-msgid "lucistatistics_collectdtcpconns_remoteports"
+msgid "Monitor remote ports"
 msgstr ""
 
 #. 0 - 65535; multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:201
-msgid "lucistatistics_collectdtcpconns_remoteports_desc"
+msgid "0 - 65535; multiple separated by space"
 msgstr ""
 
 #. Unixsock Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:202
-msgid "lucistatistics_collectdunixsock"
+msgid "Unixsock Plugin Configuration"
 msgstr ""
 
 #. The unixsock plugin creates a unix socket which can be used to read collected data from a running collectd instance.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:203
-msgid "lucistatistics_collectdunixsock_desc"
+msgid "The unixsock plugin creates a unix socket which can be used to read collected data from a running collectd instance."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:204
-msgid "lucistatistics_collectdunixsock_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Filepath of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:205
-msgid "lucistatistics_collectdunixsock_socketfile"
+msgid "Filepath of the unix socket"
 msgstr ""
 
 #. Group ownership of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:206
-msgid "lucistatistics_collectdunixsock_socketgroup"
+msgid "Group ownership of the unix socket"
 msgstr ""
 
 #. group name
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:207
-msgid "lucistatistics_collectdunixsock_socketgroup_desc"
+msgid "group name"
 msgstr ""
 
 #. File permissions of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:208
-msgid "lucistatistics_collectdunixsock_socketperms"
+msgid "File permissions of the unix socket"
 msgstr ""
 
 #. octal
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:209
-msgid "lucistatistics_collectdunixsock_socketperms_desc"
+msgid "octal"
 msgstr ""
 
 #. Wireless Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:210
-msgid "lucistatistics_collectdwireless"
+msgid "Wireless Plugin Configuration"
 msgstr ""
 
 #. The wireless plugin collects statistics about wireless signal strength, noise and quality.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:211
-msgid "lucistatistics_collectdwireless_desc"
+msgid "The wireless plugin collects statistics about wireless signal strength, noise and quality."
 msgstr ""
 
 #. Enable this plugin
diff --git a/po/fr/sysauth.po b/po/fr/sysauth.po
index 4047120b4..46a173fc5 100644
--- a/po/fr/sysauth.po
+++ b/po/fr/sysauth.po
@@ -14,12 +14,12 @@ msgstr ""
 
 #. Authorization Required
 #: i18n/english/luasrc/i18n/sysauth.en.lua:1
-msgid "sysauth_head"
+msgid "Authorization Required"
 msgstr "Authorisation requise"
 
 #. Please enter your username and password.
 #: i18n/english/luasrc/i18n/sysauth.en.lua:2
-msgid "sysauth_prompt"
+msgid "Please enter your username and password."
 msgstr "Saisissez votre nom d'utilisateur et mot de passe."
 
 #. Invalid username and/or password! Please try again.
diff --git a/po/fr/tinyproxy.po b/po/fr/tinyproxy.po
index 27e52f4cb..1fdb7e273 100644
--- a/po/fr/tinyproxy.po
+++ b/po/fr/tinyproxy.po
@@ -14,157 +14,157 @@ msgstr ""
 
 #. Tinyproxy
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:1
-msgid "tinyproxy"
+msgid "Tinyproxy"
 msgstr "Tinyproxy"
 
 #. Tinyproxy is a small and fast non-caching HTTP(S)-Proxy
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:2
-msgid "tinyproxy_desc"
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
 msgstr "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
 
 #. Allow access from
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:3
-msgid "tinyproxy_tinyproxy_allow"
+msgid "Allow access from"
 msgstr "Allow access from"
 
 #. Allowed headers for anonymous proxy
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:4
-msgid "tinyproxy_tinyproxy_anonymous"
+msgid "Allowed headers for anonymous proxy"
 msgstr "Allowed headers for anonymous proxy"
 
 #. Bind outgoing traffic to address
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:5
-msgid "tinyproxy_tinyproxy_bind"
+msgid "Bind outgoing traffic to address"
 msgstr "Lier le trafic sortant à l'adresse ip"
 
 #. Ports allowed for CONNECT method
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:6
-msgid "tinyproxy_tinyproxy_connectport"
+msgid "Ports allowed for CONNECT method"
 msgstr "Ports allowed for CONNECT method"
 
 #. 0 = disabled, empty = all
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:7
-msgid "tinyproxy_tinyproxy_connectport_desc"
+msgid "0 = disabled, empty = all"
 msgstr "0 = disabled, empty = all"
 
 #. Error document
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:8
-msgid "tinyproxy_tinyproxy_defaulterrorfile"
+msgid "Error document"
 msgstr "Fichier d'erreur"
 
 #. Filter list
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:9
-msgid "tinyproxy_tinyproxy_filter"
+msgid "Filter list"
 msgstr "Liste de filtres"
 
 #. Case sensitive filters
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:10
-msgid "tinyproxy_tinyproxy_filtercasesensitive"
+msgid "Case sensitive filters"
 msgstr "Case sensitive filters"
 
 #. Filter list is a whitelist
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:11
-msgid "tinyproxy_tinyproxy_filterdefaultdeny"
+msgid "Filter list is a whitelist"
 msgstr "Filter list is a whitelist"
 
 #. Extended regular expression filters
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:12
-msgid "tinyproxy_tinyproxy_filterextended"
+msgid "Extended regular expression filters"
 msgstr "Extended regular expression filters"
 
 #. Filter URLs instead of domains
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:13
-msgid "tinyproxy_tinyproxy_filterurls"
+msgid "Filter URLs instead of domains"
 msgstr "Filter URLs instead of domains"
 
 #. Listen on address
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:14
-msgid "tinyproxy_tinyproxy_listen"
+msgid "Listen on address"
 msgstr "Listen on address"
 
 #. Logfile
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:15
-msgid "tinyproxy_tinyproxy_logfile"
+msgid "Logfile"
 msgstr "Chemin du fichier de log"
 
 #. Log level
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:16
-msgid "tinyproxy_tinyproxy_loglevel"
+msgid "Log level"
 msgstr "Niveau de log"
 
 #. Maximum number of clients
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:17
-msgid "tinyproxy_tinyproxy_maxclients"
+msgid "Maximum number of clients"
 msgstr "Nombre maximum de clients"
 
 #. Maximum requests per thread
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:18
-msgid "tinyproxy_tinyproxy_maxrequestsperchild"
+msgid "Maximum requests per thread"
 msgstr "Maximum de connexion par processus"
 
 #. Max. spare servers
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:19
-msgid "tinyproxy_tinyproxy_maxspareservers"
+msgid "Max. spare servers"
 msgstr "Nombre Maximum de processus serveur"
 
 #. Min. spare servers
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:20
-msgid "tinyproxy_tinyproxy_minspareservers"
+msgid "Min. spare servers"
 msgstr "Nombre Minimum de processus serveur"
 
 #. Spare servers to start with
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:21
-msgid "tinyproxy_tinyproxy_startservers"
+msgid "Spare servers to start with"
 msgstr "Nombre de processus serveur lancés au demarrage"
 
 #. Statistic document
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:22
-msgid "tinyproxy_tinyproxy_statfile"
+msgid "Statistic document"
 msgstr "Fichier de statistiques"
 
 #. Write to syslog
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:23
-msgid "tinyproxy_tinyproxy_syslog"
+msgid "Write to syslog"
 msgstr "Écrire dans le journal système (Syslog)"
 
 #. Connection Timeout
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:24
-msgid "tinyproxy_tinyproxy_timeout"
+msgid "Connection Timeout"
 msgstr "Délai de connexion"
 
 #. Value of Via-Header
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:25
-msgid "tinyproxy_tinyproxy_viaproxyname"
+msgid "Value of Via-Header"
 msgstr "Valeur de l'entête &quot;VIA&quot; utilisée comme nom d'hôte"
 
 #. Include client IP
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:26
-msgid "tinyproxy_tinyproxy_xtinyproxy"
+msgid "Include client IP"
 msgstr "Inclure l'ip du client"
 
 #. Via proxy
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:27
-msgid "tinyproxy_type_proxy"
+msgid "Via proxy"
 msgstr "Via proxy"
 
 #. Reject access
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:28
-msgid "tinyproxy_type_reject"
+msgid "Reject access"
 msgstr "Refuser l'accès"
 
 #. Upstream Control
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:29
-msgid "tinyproxy_upstream"
+msgid "Upstream Control"
 msgstr "Upstream Control"
 
 #. Target host
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:30
-msgid "tinyproxy_upstream_target"
+msgid "Target host"
 msgstr "Hôte de destination"
 
 #. Type
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:31
-msgid "tinyproxy_upstream_type"
+msgid "Type"
 msgstr "Type"
 
 #. Upstream Proxy
diff --git a/po/fr/upnp.po b/po/fr/upnp.po
index e4a9d22eb..e70302883 100644
--- a/po/fr/upnp.po
+++ b/po/fr/upnp.po
@@ -14,32 +14,32 @@ msgstr ""
 
 #. Universal Plug &amp; Play
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:1
-msgid "upnpd"
+msgid "Universal Plug & Play"
 msgstr ""
 
 #. UPNP allows clients in the local network to automatically configure the router.
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:2
-msgid "upnpd_desc"
+msgid "UPNP allows clients in the local network to automatically configure the router."
 msgstr ""
 
 #. UPNP should only be enabled if absolutely necessary as it can result in high security risks for your network.
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:3
-msgid "upnpd_config_desc"
+msgid "UPNP should only be enabled if absolutely necessary as it can result in high security risks for your network."
 msgstr ""
 
 #. Enable secure mode
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:4
-msgid "upnpd_config_securemode"
+msgid "Enable secure mode"
 msgstr ""
 
 #. Log output
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:5
-msgid "upnpd_config_logoutput"
+msgid "Log output"
 msgstr ""
 
 #. Downlink
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:6
-msgid "upnpd_config_download"
+msgid "Downlink"
 msgstr ""
 
 #. Uplink
diff --git a/po/fr/ushare.po b/po/fr/ushare.po
index f3acd43e5..c0ff09ca1 100644
--- a/po/fr/ushare.po
+++ b/po/fr/ushare.po
@@ -14,37 +14,37 @@ msgstr ""
 
 #. Content directories
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:1
-msgid "content_directories"
+msgid "Content directories"
 msgstr ""
 
 #. Disable telnet console
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:2
-msgid "disable_telnet"
+msgid "Disable telnet console"
 msgstr ""
 
 #. Disable webinterface
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:3
-msgid "disable_webif"
+msgid "Disable webinterface"
 msgstr ""
 
 #. Options
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:4
-msgid "options"
+msgid "Options"
 msgstr ""
 
 #. Servername
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:5
-msgid "servername"
+msgid "Servername"
 msgstr ""
 
 #. Settings
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:6
-msgid "settings"
+msgid "Settings"
 msgstr ""
 
 #. uShare
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:7
-msgid "ushare"
+msgid "uShare"
 msgstr ""
 
 #. uShare
diff --git a/po/fr/uvc_streamer.po b/po/fr/uvc_streamer.po
index 49e523be4..5e8cd252f 100644
--- a/po/fr/uvc_streamer.po
+++ b/po/fr/uvc_streamer.po
@@ -14,22 +14,22 @@ msgstr ""
 
 #. Frames per second
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
-msgid "framespersecond"
+msgid "Frames per second"
 msgstr "Images par seconde"
 
 #. Resolution
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
-msgid "resolution"
+msgid "Resolution"
 msgstr "Résolution"
 
 #. Settings
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
-msgid "settings"
+msgid "Settings"
 msgstr "Paramètres"
 
 #. Webcam streaming
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
-msgid "uvc_streamer"
+msgid "Webcam streaming"
 msgstr "Webcam streaming"
 
 #. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
diff --git a/po/fr/uvl.po b/po/fr/uvl.po
index fac3aa150..e8fadab38 100644
--- a/po/fr/uvl.po
+++ b/po/fr/uvl.po
@@ -14,192 +14,192 @@ msgstr ""
 
 #. Unable to load config \"%p\": %1
 #: libs/uvl/luasrc/i18n/uvl.en.lua:1
-msgid "uvl_err_uciload"
+msgid "Unable to load config \"%p\": %1"
 msgstr ""
 
 #. Error in scheme \"%p\":\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:2
-msgid "uvl_err_scheme"
+msgid "Error in scheme \"%p\":\\n%c"
 msgstr ""
 
 #. Error in config \"%p\":\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:3
-msgid "uvl_err_config"
+msgid "Error in config \"%p\":\\n%c"
 msgstr ""
 
 #. Error in section \"%i\" (%I):\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:4
-msgid "uvl_err_section"
+msgid "Error in section \"%i\" (%I):\\n%c"
 msgstr ""
 
 #. Error in option \"%i\" (%I):\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:5
-msgid "uvl_err_option"
+msgid "Error in option \"%i\" (%I):\\n%c"
 msgstr ""
 
 #. Option \"%i\" has invalid reference specification %1:\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:6
-msgid "uvl_err_reference"
+msgid "Option \"%i\" has invalid reference specification %1:\\n%c"
 msgstr ""
 
 #. In dependency check for %t \"%i\":\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:7
-msgid "uvl_err_dependency"
+msgid "In dependency check for %t \"%i\":\\n%c"
 msgstr ""
 
 #. Can not find scheme \"%p\" in \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:8
-msgid "uvl_err_sme_find"
+msgid "Can not find scheme \"%p\" in \"%1\""
 msgstr ""
 
 #. Can not access file \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:9
-msgid "uvl_err_sme_read"
+msgid "Can not access file \"%1\""
 msgstr ""
 
 #. Missing required scheme field \"%1\" in \"%i\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:10
-msgid "uvl_err_sme_reqfld"
+msgid "Missing required scheme field \"%1\" in \"%i\""
 msgstr ""
 
 #. Illegal reference \"%1\" to an anonymous section
 #: libs/uvl/luasrc/i18n/uvl.en.lua:11
-msgid "uvl_err_sme_invref"
+msgid "Illegal reference \"%1\" to an anonymous section"
 msgstr ""
 
 #. Malformed reference in \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:12
-msgid "uvl_err_sme_badref"
+msgid "Malformed reference in \"%1\""
 msgstr ""
 
 #. Malformed dependency specification \"%1\" in \"%i\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:13
-msgid "uvl_err_sme_baddep"
+msgid "Malformed dependency specification \"%1\" in \"%i\""
 msgstr ""
 
 #. Malformed validator specification \"%1\" in \"%i\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:14
-msgid "uvl_err_sme_badval"
+msgid "Malformed validator specification \"%1\" in \"%i\""
 msgstr ""
 
 #. External validator \"%1\" failed: %2
 #: libs/uvl/luasrc/i18n/uvl.en.lua:15
-msgid "uvl_err_sme_errval"
+msgid "External validator \"%1\" failed: %2"
 msgstr ""
 
 #. Variable \"%o\" in scheme \"%p\" references unknown package \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:16
-msgid "uvl_err_sme_vbadpack"
+msgid "Variable \"%o\" in scheme \"%p\" references unknown package \"%1\""
 msgstr ""
 
 #. Variable \"%o\" in scheme \"%p\" references unknown section \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:17
-msgid "uvl_err_sme_vbadsect"
+msgid "Variable \"%o\" in scheme \"%p\" references unknown section \"%1\""
 msgstr ""
 
 #. Enum \"%v\" in scheme \"%p\" references unknown package \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:18
-msgid "uvl_err_sme_ebadpack"
+msgid "Enum \"%v\" in scheme \"%p\" references unknown package \"%1\""
 msgstr ""
 
 #. Enum \"%v\" in scheme \"%p\" references unknown section \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:19
-msgid "uvl_err_sme_ebadsect"
+msgid "Enum \"%v\" in scheme \"%p\" references unknown section \"%1\""
 msgstr ""
 
 #. Enum \"%v\" in scheme \"%p\" references unknown option \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:20
-msgid "uvl_err_sme_ebadopt"
+msgid "Enum \"%v\" in scheme \"%p\" references unknown option \"%1\""
 msgstr ""
 
 #. Enum \"%v\" in scheme \"%p\" references non-enum option \"%p.%s.%o\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:21
-msgid "uvl_err_sme_ebadtype"
+msgid "Enum \"%v\" in scheme \"%p\" references non-enum option \"%p.%s.%o\""
 msgstr ""
 
 #. Enum \"%v\" in scheme \"%p\" redeclares the default value of \"%p.%s.%o\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:22
-msgid "uvl_err_sme_ebaddef"
+msgid "Enum \"%v\" in scheme \"%p\" redeclares the default value of \"%p.%s.%o\""
 msgstr ""
 
 #. Section \"%i\" (%I) not found in scheme
 #: libs/uvl/luasrc/i18n/uvl.en.lua:23
-msgid "uvl_err_sect_unknown"
+msgid "Section \"%i\" (%I) not found in scheme"
 msgstr ""
 
 #. Required section \"%p.%s\" not found in config
 #: libs/uvl/luasrc/i18n/uvl.en.lua:24
-msgid "uvl_err_sect_required"
+msgid "Required section \"%p.%s\" not found in config"
 msgstr ""
 
 #. Unique section \"%p.%s\" occurs multiple times in config
 #: libs/uvl/luasrc/i18n/uvl.en.lua:25
-msgid "uvl_err_sect_unique"
+msgid "Unique section \"%p.%s\" occurs multiple times in config"
 msgstr ""
 
 #. The section of type \"%p.%s\" is stored anonymously in config but must be named
 #: libs/uvl/luasrc/i18n/uvl.en.lua:26
-msgid "uvl_err_sect_named"
+msgid "The section of type \"%p.%s\" is stored anonymously in config but must be named"
 msgstr ""
 
 #. Section \"%p.%s\" not found in config
 #: libs/uvl/luasrc/i18n/uvl.en.lua:27
-msgid "uvl_err_sect_notfound"
+msgid "Section \"%p.%s\" not found in config"
 msgstr ""
 
 #. Option \"%i\" (%I) not found in scheme
 #: libs/uvl/luasrc/i18n/uvl.en.lua:28
-msgid "uvl_err_opt_unknown"
+msgid "Option \"%i\" (%I) not found in scheme"
 msgstr ""
 
 #. Required option \"%i\" has no value
 #: libs/uvl/luasrc/i18n/uvl.en.lua:29
-msgid "uvl_err_opt_required"
+msgid "Required option \"%i\" has no value"
 msgstr ""
 
 #. Value \"%1\" of option \"%i\" is not defined in enum %2
 #: libs/uvl/luasrc/i18n/uvl.en.lua:30
-msgid "uvl_err_opt_badvalue"
+msgid "Value \"%1\" of option \"%i\" is not defined in enum %2"
 msgstr ""
 
 #. Value \"%1\" of option \"%i\" does not validate as datatype \"%2\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:31
-msgid "uvl_err_opt_invvalue"
+msgid "Value \"%1\" of option \"%i\" does not validate as datatype \"%2\""
 msgstr ""
 
 #. Option \"%i\" is defined as list but stored as plain value
 #: libs/uvl/luasrc/i18n/uvl.en.lua:32
-msgid "uvl_err_opt_notlist"
+msgid "Option \"%i\" is defined as list but stored as plain value"
 msgstr ""
 
 #. Option \"%i\" has unknown datatype \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:33
-msgid "uvl_err_opt_datatype"
+msgid "Option \"%i\" has unknown datatype \"%1\""
 msgstr ""
 
 #. Option \"%p.%s.%o\" not found in config
 #: libs/uvl/luasrc/i18n/uvl.en.lua:34
-msgid "uvl_err_opt_notfound"
+msgid "Option \"%p.%s.%o\" not found in config"
 msgstr ""
 
 #. Dependency (%1) failed:\noption \"%i\" is not eqal \"%2\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:35
-msgid "uvl_err_dep_notequal"
+msgid "Dependency (%1) failed:\\noption \"%i\" is not eqal \"%2\""
 msgstr ""
 
 #. Dependency (%1) failed:\noption \"%i\" has no value
 #: libs/uvl/luasrc/i18n/uvl.en.lua:36
-msgid "uvl_err_dep_novalue"
+msgid "Dependency (%1) failed:\\noption \"%i\" has no value"
 msgstr ""
 
 #. Dependency (%1) failed:\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:37
-msgid "uvl_err_dep_notvalid"
+msgid "Dependency (%1) failed:\\n%c"
 msgstr ""
 
 #. Recursive dependency for option \"%i\" detected
 #: libs/uvl/luasrc/i18n/uvl.en.lua:38
-msgid "uvl_err_dep_recursive"
+msgid "Recursive dependency for option \"%i\" detected"
 msgstr ""
 
 #. In dependency check for enum value \"%i\":\n%c
diff --git a/po/fr/wifi.po b/po/fr/wifi.po
index cb9169fab..cf5f8c9d4 100644
--- a/po/fr/wifi.po
+++ b/po/fr/wifi.po
@@ -14,192 +14,192 @@ msgstr ""
 
 #. auto
 #: i18n/english/luasrc/i18n/wifi.en.lua:1
-msgid "wifi_auto"
+msgid "auto"
 msgstr ""
 
 #. Frequency Hopping
 #: i18n/english/luasrc/i18n/wifi.en.lua:2
-msgid "wifi_fh"
+msgid "Frequency Hopping"
 msgstr ""
 
 #. Diversity
 #: i18n/english/luasrc/i18n/wifi.en.lua:3
-msgid "wifi_diversity"
+msgid "Diversity"
 msgstr ""
 
 #. Transmitter Antenna
 #: i18n/english/luasrc/i18n/wifi.en.lua:4
-msgid "wifi_txantenna"
+msgid "Transmitter Antenna"
 msgstr ""
 
 #. Receiver Antenna
 #: i18n/english/luasrc/i18n/wifi.en.lua:5
-msgid "wifi_rxantenna"
+msgid "Receiver Antenna"
 msgstr ""
 
 #. Distance Optimization
 #: i18n/english/luasrc/i18n/wifi.en.lua:6
-msgid "wifi_distance"
+msgid "Distance Optimization"
 msgstr ""
 
 #. Distance to farthest network member in meters.
 #: i18n/english/luasrc/i18n/wifi.en.lua:7
-msgid "wifi_distance_desc"
+msgid "Distance to farthest network member in meters."
 msgstr ""
 
 #. MAC-Address Filter
 #: i18n/english/luasrc/i18n/wifi.en.lua:8
-msgid "wifi_macpolicy"
+msgid "MAC-Address Filter"
 msgstr ""
 
 #. Allow listed only
 #: i18n/english/luasrc/i18n/wifi.en.lua:9
-msgid "wifi_whitelist"
+msgid "Allow listed only"
 msgstr ""
 
 #. Allow all except listed
 #: i18n/english/luasrc/i18n/wifi.en.lua:10
-msgid "wifi_blacklist"
+msgid "Allow all except listed"
 msgstr ""
 
 #. MAC-List
 #: i18n/english/luasrc/i18n/wifi.en.lua:11
-msgid "wifi_maclist"
+msgid "MAC-List"
 msgstr ""
 
 #. Frame Bursting
 #: i18n/english/luasrc/i18n/wifi.en.lua:12
-msgid "wifi_bursting"
+msgid "Frame Bursting"
 msgstr ""
 
 #. Regulatory Domain
 #: i18n/english/luasrc/i18n/wifi.en.lua:13
-msgid "wifi_regdomain"
+msgid "Regulatory Domain"
 msgstr ""
 
 #. Country Code
 #: i18n/english/luasrc/i18n/wifi.en.lua:14
-msgid "wifi_country"
+msgid "Country Code"
 msgstr ""
 
 #. Outdoor Channels
 #: i18n/english/luasrc/i18n/wifi.en.lua:15
-msgid "wifi_outdoor"
+msgid "Outdoor Channels"
 msgstr ""
 
 #. Connection Limit
 #: i18n/english/luasrc/i18n/wifi.en.lua:16
-msgid "wifi_maxassoc"
+msgid "Connection Limit"
 msgstr ""
 
 #. <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:17
-msgid "wifi_essid"
+msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 
 #. <abbr title=\"Basic Service Set Identifier\">BSSID</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:18
-msgid "wifi_bssid"
+msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr ""
 
 #. Fragmentation Threshold
 #: i18n/english/luasrc/i18n/wifi.en.lua:19
-msgid "wifi_frag"
+msgid "Fragmentation Threshold"
 msgstr ""
 
 #. RTS/CTS Threshold
 #: i18n/english/luasrc/i18n/wifi.en.lua:20
-msgid "wifi_rts"
+msgid "RTS/CTS Threshold"
 msgstr ""
 
 #. <abbr title=\"Wireless Distribution System\">WDS</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:21
-msgid "wifi_wds"
+msgid "<abbr title=\"Wireless Distribution System\">WDS</abbr>"
 msgstr ""
 
 #. Separate WDS
 #: i18n/english/luasrc/i18n/wifi.en.lua:22
-msgid "wifi_wdssep"
+msgid "Separate WDS"
 msgstr ""
 
 #. Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:23
-msgid "wifi_hidden"
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 
 #. Isolate Clients
 #: i18n/english/luasrc/i18n/wifi.en.lua:24
-msgid "wifi_isloate"
+msgid "Isolate Clients"
 msgstr ""
 
 #. Prevent Client to Client Communication
 #: i18n/english/luasrc/i18n/wifi.en.lua:25
-msgid "wifi_isloate_desc"
+msgid "Prevent Client to Client Communication"
 msgstr ""
 
 #. Background Scan
 #: i18n/english/luasrc/i18n/wifi.en.lua:26
-msgid "wifi_bgscan"
+msgid "Background Scan"
 msgstr ""
 
 #. Transmission Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:27
-msgid "wifi_rate"
+msgid "Transmission Rate"
 msgstr ""
 
 #. Multicast Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:28
-msgid "wifi_mcast_rate"
+msgid "Multicast Rate"
 msgstr ""
 
 #. Minimum Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:29
-msgid "wifi_minrate"
+msgid "Minimum Rate"
 msgstr ""
 
 #. Maximum Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:30
-msgid "wifi_maxrate"
+msgid "Maximum Rate"
 msgstr ""
 
 #. Compression
 #: i18n/english/luasrc/i18n/wifi.en.lua:31
-msgid "wifi_compression"
+msgid "Compression"
 msgstr ""
 
 #. Turbo Mode
 #: i18n/english/luasrc/i18n/wifi.en.lua:32
-msgid "wifi_turbo"
+msgid "Turbo Mode"
 msgstr ""
 
 #. Fast Frames
 #: i18n/english/luasrc/i18n/wifi.en.lua:33
-msgid "wifi_ff"
+msgid "Fast Frames"
 msgstr ""
 
 #. WMM Mode
 #: i18n/english/luasrc/i18n/wifi.en.lua:34
-msgid "wifi_wmm"
+msgid "WMM Mode"
 msgstr ""
 
 #. XR Support
 #: i18n/english/luasrc/i18n/wifi.en.lua:35
-msgid "wifi_xr"
+msgid "XR Support"
 msgstr ""
 
 #. AR Support
 #: i18n/english/luasrc/i18n/wifi.en.lua:36
-msgid "wifi_ar"
+msgid "AR Support"
 msgstr ""
 
 #. Disable HW-Beacon timer
 #: i18n/english/luasrc/i18n/wifi.en.lua:37
-msgid "wifi_nosbeacon"
+msgid "Disable HW-Beacon timer"
 msgstr ""
 
 #. Do not send probe responses
 #: i18n/english/luasrc/i18n/wifi.en.lua:38
-msgid "wifi_noprobereq"
+msgid "Do not send probe responses"
 msgstr ""
 
 #. WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP and ad-hoc mode) to be installed.
diff --git a/po/it/admin-core.po b/po/it/admin-core.po
index 8ca214912..1473f5800 100644
--- a/po/it/admin-core.po
+++ b/po/it/admin-core.po
@@ -14,22 +14,22 @@ msgstr ""
 
 #. The following changes have been applied
 #: i18n/english/luasrc/i18n/admin-core.en.lua:1
-msgid "uci_applied"
+msgid "The following changes have been applied"
 msgstr "Le seguenti modifiche sono state applicate"
 
 #. The following changes have been reverted
 #: i18n/english/luasrc/i18n/admin-core.en.lua:2
-msgid "uci_reverted"
+msgid "The following changes have been reverted"
 msgstr "Le seguenti modifiche sono state annullate"
 
 #. User Interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:3
-msgid "a_i_ui"
+msgid "User Interface"
 msgstr "Interfaccia utente"
 
 #. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a collection of free Lua software including an <abbr title=\"Model-View-Controller\">MVC</abbr>-Webframework and webinterface for embedded devices. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is licensed under the Apache-License.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:4
-msgid "c_lucidesc"
+msgid "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a collection of free Lua software including an <abbr title=\"Model-View-Controller\">MVC</abbr>-Webframework and webinterface for embedded devices. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is licensed under the Apache-License."
 msgstr ""
 "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> è una collezione di "
 "software libero scritto in Lua comprendente un Webframework e interfaccia "
@@ -39,53 +39,53 @@ msgstr ""
 
 #. Project Homepage
 #: i18n/english/luasrc/i18n/admin-core.en.lua:5
-msgid "c_projecthome"
+msgid "Project Homepage"
 msgstr "Sito del progetto"
 
 #. Lead Development
 #: i18n/english/luasrc/i18n/admin-core.en.lua:6
-msgid "c_leaddev"
+msgid "Lead Development"
 msgstr "Lead Development"
 
 #. Contributing Developers
 #: i18n/english/luasrc/i18n/admin-core.en.lua:7
-msgid "c_contributors"
+msgid "Contributing Developers"
 msgstr "Contributing Developers"
 
 #. Thanks To
 #: i18n/english/luasrc/i18n/admin-core.en.lua:8
-msgid "c_thanksto"
+msgid "Thanks To"
 msgstr "Ringraziamenti"
 
 #. Hello!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:9
-msgid "a_i_i_hello"
+msgid "Hello!"
 msgstr "Ciao!"
 
 #. This is the administration area of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:10
-msgid "a_i_i_admin1"
+msgid "This is the administration area of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>."
 msgstr ""
 "Questa è l&#39;area d&#39;amministrazione di <abbr title=\"Lua Configuration "
 "Interface\">LuCI</abbr>."
 
 #. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a free, flexible, and user friendly graphical interface for configuring OpenWrt Kamikaze.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:11
-msgid "a_i_i_admin2"
+msgid "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a free, flexible, and user friendly graphical interface for configuring OpenWrt Kamikaze."
 msgstr ""
 "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> è un&#39;interfaccia "
 "grafica gratuita, flessibile, e amichevole per configurare OpenWrt Kamikaze."
 
 #. On the following pages you can adjust all important settings of your router.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:12
-msgid "a_i_i_admin3"
+msgid "On the following pages you can adjust all important settings of your router."
 msgstr ""
 "Nelle seguenti pagine puoi impostare tutti i settaggi più importanti del tuo "
 "router"
 
 #. Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> changes have to be confirmed by clicking Changes - Save &amp; Apply before being applied.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:13
-msgid "a_i_i_admin4"
+msgid "Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> changes have to be confirmed by clicking Changes - Save & Apply before being applied."
 msgstr ""
 "Nota: Le modifiche devono essere confermate in <abbr title=\"Lua "
 "Configuration Interface\">LuCI</abbr> cliccando Modifiche - Salva e Applica "
@@ -93,36 +93,36 @@ msgstr ""
 
 #. As we always want to improve this interface we are looking forward to your feedback and suggestions.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:14
-msgid "a_i_i_admin5"
+msgid "As we always want to improve this interface we are looking forward to your feedback and suggestions."
 msgstr ""
 "dal momento che vogliamo migliorare quest&#39;interfaccia accettiamo "
 "suggerimenti."
 
 #. And now have fun with your router!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:15
-msgid "a_i_i_admin6"
+msgid "And now have fun with your router!"
 msgstr "Ed ora buon divertimento con il tuo router!"
 
 #. The <abbr title=\"Lua Configuration Interface\">LuCI</abbr> Team
 #: i18n/english/luasrc/i18n/admin-core.en.lua:16
-msgid "a_i_i_team"
+msgid "The <abbr title=\"Lua Configuration Interface\">LuCI</abbr> Team"
 msgstr "Il Team di <abbr title=\"Lua Configuration Interface\">LuCI</abbr>"
 
 #. Here you can customize the settings and the functionality of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:17
-msgid "a_i_luci1"
+msgid "Here you can customize the settings and the functionality of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>."
 msgstr ""
 "Qui puoi personalizzare i settaggi e le funzionalità di <abbr title=\"Lua "
 "Configuration Interface\">LuCI</abbr>."
 
 #. Post-commit actions
 #: i18n/english/luasrc/i18n/admin-core.en.lua:18
-msgid "a_i_ucicommit"
+msgid "Post-commit actions"
 msgstr "Azioni post-modifica"
 
 #. These commands will be executed automatically when a given <abbr title=\"Unified Configuration Interface\">UCI</abbr> configuration is committed allowing changes to be applied instantly.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:19
-msgid "a_i_ucicommit1"
+msgid "These commands will be executed automatically when a given <abbr title=\"Unified Configuration Interface\">UCI</abbr> configuration is committed allowing changes to be applied instantly."
 msgstr ""
 "Questi comandi verranno eseguiti automaticamente quando un comando di "
 "configurazione <abbr title=\"Unified Configuration Interface\">UCI</abbr> "
@@ -131,19 +131,19 @@ msgstr ""
 
 #. Files to be kept when flashing a new firmware
 #: i18n/english/luasrc/i18n/admin-core.en.lua:20
-msgid "a_i_keepflash"
+msgid "Files to be kept when flashing a new firmware"
 msgstr "Files da conservare quando si aggiorna un nuovo firmware"
 
 #. When flashing a new firmware with <abbr title=\"Lua Configuration Interface\">LuCI</abbr> these files will be added to the new firmware installation.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:21
-msgid "a_i_keepflash1"
+msgid "When flashing a new firmware with <abbr title=\"Lua Configuration Interface\">LuCI</abbr> these files will be added to the new firmware installation."
 msgstr ""
 "Quando si aggiorna un firmware con <abbr title=\"Lua Configuration "
 "Interface\">LuCI</abbr> questi files verranno aggiunti al nuovo firmware."
 
 #. Here you can find information about the current system status like <abbr title=\"Central Processing Unit\">CPU</abbr> clock frequency, memory usage or network interface data.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:22
-msgid "a_st_i_status1"
+msgid "Here you can find information about the current system status like <abbr title=\"Central Processing Unit\">CPU</abbr> clock frequency, memory usage or network interface data."
 msgstr ""
 "Qui puoi trovare informazione sullo stato del sistema come frequenza di "
 "clock della <abbr title=\"Central Processing Unit\">CPU</abbr>, uso della "
@@ -151,261 +151,261 @@ msgstr ""
 
 #. Also kernel or service logfiles can be viewed here to get an overview over their current state.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:23
-msgid "a_st_i_status2"
+msgid "Also kernel or service logfiles can be viewed here to get an overview over their current state."
 msgstr ""
 "Inoltre i log del kernel o dei servizi sono visualizzabili qui per avere un "
 "riassunto dello stato attuale."
 
 #. <abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan
 #: i18n/english/luasrc/i18n/admin-core.en.lua:24
-msgid "iwscan"
+msgid "<abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan"
 msgstr "<abbr title=\"Wireless Local Area Network\">Scansione WLAN</abbr>"
 
 #. Wifi networks in your local environment
 #: i18n/english/luasrc/i18n/admin-core.en.lua:25
-msgid "iwscan1"
+msgid "Wifi networks in your local environment"
 msgstr "Reti Wifi nell&#39;ambiente circostante"
 
 #. <abbr title=\"Encrypted\">Encr.</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:26
-msgid "iwscan_encr"
+msgid "<abbr title=\"Encrypted\">Encr.</abbr>"
 msgstr "<abbr title=\"Encrypted\">Encr.</abbr>"
 
 #. Link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:27
-msgid "iwscan_link"
+msgid "Link"
 msgstr "Collegamento"
 
 #. Signal
 #: i18n/english/luasrc/i18n/admin-core.en.lua:28
-msgid "iwscan_signal"
+msgid "Signal"
 msgstr "Segnale"
 
 #. Noise
 #: i18n/english/luasrc/i18n/admin-core.en.lua:29
-msgid "iwscan_noise"
+msgid "Noise"
 msgstr "Disturbo"
 
 #. Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:30
-msgid "routes"
+msgid "Routes"
 msgstr "Route"
 
 #. Netmask
 #: i18n/english/luasrc/i18n/admin-core.en.lua:31
-msgid "routes_netmask"
+msgid "Netmask"
 msgstr "Maschera di rete"
 
 #. Gateway
 #: i18n/english/luasrc/i18n/admin-core.en.lua:32
-msgid "routes_gateway"
+msgid "Gateway"
 msgstr "Gateway"
 
 #. Metric
 #: i18n/english/luasrc/i18n/admin-core.en.lua:33
-msgid "routes_metric"
+msgid "Metric"
 msgstr "Metrica"
 
 #. Here you can configure the basic aspects of your device like its hostname or the timezone.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:34
-msgid "a_s_desc"
+msgid "Here you can configure the basic aspects of your device like its hostname or the timezone."
 msgstr ""
 "Qui puoi configurare gli aspetti base del tuo dispositivo come "
 "l&#39;hostname o il fuso orario."
 
 #. Software
 #: i18n/english/luasrc/i18n/admin-core.en.lua:35
-msgid "a_s_packages"
+msgid "Software"
 msgstr "Software"
 
 #. Admin Password
 #: i18n/english/luasrc/i18n/admin-core.en.lua:36
-msgid "a_s_changepw"
+msgid "Admin Password"
 msgstr "Password di Amministratore"
 
 #. OPKG-Configuration
 #: i18n/english/luasrc/i18n/admin-core.en.lua:37
-msgid "a_s_p_ipkg"
+msgid "OPKG-Configuration"
 msgstr "Configurazione di OPKG"
 
 #. <abbr title=\"Secure Shell\">SSH</abbr>-Keys
 #: i18n/english/luasrc/i18n/admin-core.en.lua:38
-msgid "a_s_sshkeys"
+msgid "<abbr title=\"Secure Shell\">SSH</abbr>-Keys"
 msgstr "Chiavi <abbr title=\"Secure Shell\">SSH</abbr>s"
 
 #. Mount Points
 #: i18n/english/luasrc/i18n/admin-core.en.lua:39
-msgid "a_s_fstab"
+msgid "Mount Points"
 msgstr "Punti di mount"
 
 #. Change settings related to the system itself, its identification, installed hard- and software, authentication or mount points.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:40
-msgid "a_s_i_system1"
+msgid "Change settings related to the system itself, its identification, installed hard- and software, authentication or mount points."
 msgstr ""
 "Modifica impostazioni relative al sistema, la sua identificazione, "
 "installazioni hardware e software, autenticazione o punti di mount."
 
 #. These settings define the base of your system.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:41
-msgid "a_s_i_system2"
+msgid "These settings define the base of your system."
 msgstr "Queste impostazioni definiscono la base del tuo sistema."
 
 #. Pay attention as any misconfiguration here may prevent your device from booting or may lock yourself out of it.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:42
-msgid "a_s_i_system3"
+msgid "Pay attention as any misconfiguration here may prevent your device from booting or may lock yourself out of it."
 msgstr ""
 "Fai attenzione perchè una cattiva configurazione qui può impedire al tuo "
 "dispositivo di avviarsi o impedirti di entrarvi."
 
 #. Interfaces
 #: i18n/english/luasrc/i18n/admin-core.en.lua:43
-msgid "a_s_if"
+msgid "Interfaces"
 msgstr ""
 
 #. Bridge
 #: i18n/english/luasrc/i18n/admin-core.en.lua:44
 #, fuzzy
-msgid "a_s_if_bridge"
+msgid "Bridge"
 msgstr "Unisci interfacce"
 
 #. ID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:45
 #, fuzzy
-msgid "a_s_if_bridge_id"
+msgid "ID"
 msgstr "Unisci interfacce"
 
 #. Bridge Port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:46
 #, fuzzy
-msgid "a_s_if_bridge_port"
+msgid "Bridge Port"
 msgstr "Unisci interfacce"
 
 #. STP
 #: i18n/english/luasrc/i18n/admin-core.en.lua:47
 #, fuzzy
-msgid "a_s_if_bridge_stp"
+msgid "STP"
 msgstr "Unisci interfacce"
 
 #. Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:48
-msgid "a_s_if_device"
+msgid "Device"
 msgstr ""
 
 #. Ethernet Bridge
 #: i18n/english/luasrc/i18n/admin-core.en.lua:49
 #, fuzzy
-msgid "a_s_if_ethbridge"
+msgid "Ethernet Bridge"
 msgstr "Unisci interfacce"
 
 #. Ethernet Adapter
 #: i18n/english/luasrc/i18n/admin-core.en.lua:50
-msgid "a_s_if_ethdev"
+msgid "Ethernet Adapter"
 msgstr ""
 
 #. Ethernet Switch
 #: i18n/english/luasrc/i18n/admin-core.en.lua:51
-msgid "a_s_if_ethswitch"
+msgid "Ethernet Switch"
 msgstr ""
 
 #. Interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:52
-msgid "a_s_if_interface"
+msgid "Interface"
 msgstr ""
 
 #. IP Configuration
 #: i18n/english/luasrc/i18n/admin-core.en.lua:53
-msgid "a_s_if_ipconfig"
+msgid "IP Configuration"
 msgstr ""
 
 #. Alias
 #: i18n/english/luasrc/i18n/admin-core.en.lua:54
-msgid "a_s_if_ipconfig_alias"
+msgid "Alias"
 msgstr ""
 
 #. DHCP assigned
 #: i18n/english/luasrc/i18n/admin-core.en.lua:55
-msgid "a_s_if_ipconfig_dhcp"
+msgid "DHCP assigned"
 msgstr ""
 
 #. IPv6
 #: i18n/english/luasrc/i18n/admin-core.en.lua:56
-msgid "a_s_if_ipconfig_ipv6"
+msgid "IPv6"
 msgstr ""
 
 #. Not configured
 #: i18n/english/luasrc/i18n/admin-core.en.lua:57
-msgid "a_s_if_ipconfig_none"
+msgid "Not configured"
 msgstr ""
 
 #. Primary
 #: i18n/english/luasrc/i18n/admin-core.en.lua:58
-msgid "a_s_if_ipconfig_primary"
+msgid "Primary"
 msgstr ""
 
 #. Channel
 #: i18n/english/luasrc/i18n/admin-core.en.lua:59
-msgid "a_s_if_iwchannel"
+msgid "Channel"
 msgstr ""
 
 #. Mode
 #: i18n/english/luasrc/i18n/admin-core.en.lua:60
-msgid "a_s_if_iwmode"
+msgid "Mode"
 msgstr ""
 
 #. Ad-Hoc
 #: i18n/english/luasrc/i18n/admin-core.en.lua:61
-msgid "a_s_if_iwmode_adhoc"
+msgid "Ad-Hoc"
 msgstr ""
 
 #. Pseudo Ad-Hoc
 #: i18n/english/luasrc/i18n/admin-core.en.lua:62
-msgid "a_s_if_iwmode_ahdemo"
+msgid "Pseudo Ad-Hoc"
 msgstr ""
 
 #. Master
 #: i18n/english/luasrc/i18n/admin-core.en.lua:63
-msgid "a_s_if_iwmode_ap"
+msgid "Master"
 msgstr ""
 
 #. Master + WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:64
-msgid "a_s_if_iwmode_apwds"
+msgid "Master + WDS"
 msgstr ""
 
 #. Client
 #: i18n/english/luasrc/i18n/admin-core.en.lua:65
-msgid "a_s_if_iwmode_sta"
+msgid "Client"
 msgstr ""
 
 #. Client + WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:66
-msgid "a_s_if_iwmode_stawds"
+msgid "Client + WDS"
 msgstr ""
 
 #. WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:67
-msgid "a_s_if_iwmode_wds"
+msgid "WDS"
 msgstr ""
 
 #. SSID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:68
-msgid "a_s_if_iwssid"
+msgid "SSID"
 msgstr ""
 
 #. MAC
 #: i18n/english/luasrc/i18n/admin-core.en.lua:69
-msgid "a_s_if_mac"
+msgid "MAC"
 msgstr ""
 
 #. Pkts.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:70
-msgid "a_s_if_pkts"
+msgid "Pkts."
 msgstr ""
 
 #. Interface Status
 #: i18n/english/luasrc/i18n/admin-core.en.lua:71
 #, fuzzy
-msgid "a_s_if_status"
+msgid "Interface Status"
 msgstr ""
 "Qui puoi trovare informazione sullo stato del sistema come frequenza di "
 "clock della <abbr title=\"Central Processing Unit\">CPU</abbr>, uso della "
@@ -413,143 +413,143 @@ msgstr ""
 
 #. Transfer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:72
-msgid "a_s_if_transfer"
+msgid "Transfer"
 msgstr ""
 
 #. RX
 #: i18n/english/luasrc/i18n/admin-core.en.lua:73
-msgid "a_s_if_transfer_rx"
+msgid "RX"
 msgstr ""
 
 #. TX
 #: i18n/english/luasrc/i18n/admin-core.en.lua:74
-msgid "a_s_if_transfer_tx"
+msgid "TX"
 msgstr ""
 
 #. Type
 #: i18n/english/luasrc/i18n/admin-core.en.lua:75
-msgid "a_s_if_type"
+msgid "Type"
 msgstr ""
 
 #. VLAN
 #: i18n/english/luasrc/i18n/admin-core.en.lua:76
-msgid "a_s_if_vlan"
+msgid "VLAN"
 msgstr ""
 
 #. Ports
 #: i18n/english/luasrc/i18n/admin-core.en.lua:77
-msgid "a_s_if_vlanports"
+msgid "Ports"
 msgstr ""
 
 #. Wireless Adapter
 #: i18n/english/luasrc/i18n/admin-core.en.lua:78
-msgid "a_s_if_wifidev"
+msgid "Wireless Adapter"
 msgstr ""
 
 #. Firewall
 #: i18n/english/luasrc/i18n/admin-core.en.lua:79
-msgid "a_s_ipt"
+msgid "Firewall"
 msgstr ""
 
 #. Actions
 #: i18n/english/luasrc/i18n/admin-core.en.lua:80
-msgid "a_s_ipt_actions"
+msgid "Actions"
 msgstr ""
 
 #. Traffic
 #: i18n/english/luasrc/i18n/admin-core.en.lua:81
-msgid "a_s_ipt_bytes"
+msgid "Traffic"
 msgstr ""
 
 #. Chain
 #: i18n/english/luasrc/i18n/admin-core.en.lua:82
-msgid "a_s_ipt_chain"
+msgid "Chain"
 msgstr ""
 
 #. Destination
 #: i18n/english/luasrc/i18n/admin-core.en.lua:83
-msgid "a_s_ipt_destination"
+msgid "Destination"
 msgstr ""
 
 #. Flags
 #: i18n/english/luasrc/i18n/admin-core.en.lua:84
-msgid "a_s_ipt_flags"
+msgid "Flags"
 msgstr ""
 
 #. In
 #: i18n/english/luasrc/i18n/admin-core.en.lua:85
-msgid "a_s_ipt_inputif"
+msgid "In"
 msgstr ""
 
 #. No chains in this table
 #: i18n/english/luasrc/i18n/admin-core.en.lua:86
-msgid "a_s_ipt_nochains"
+msgid "No chains in this table"
 msgstr ""
 
 #. No Rules in this chain
 #: i18n/english/luasrc/i18n/admin-core.en.lua:87
-msgid "a_s_ipt_norules"
+msgid "No Rules in this chain"
 msgstr ""
 
 #. Options
 #: i18n/english/luasrc/i18n/admin-core.en.lua:88
-msgid "a_s_ipt_options"
+msgid "Options"
 msgstr ""
 
 #. Out
 #: i18n/english/luasrc/i18n/admin-core.en.lua:89
-msgid "a_s_ipt_outputif"
+msgid "Out"
 msgstr ""
 
 #. Packets
 #: i18n/english/luasrc/i18n/admin-core.en.lua:90
-msgid "a_s_ipt_packets"
+msgid "Packets"
 msgstr ""
 
 #. Pkts.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:91
-msgid "a_s_ipt_pkts"
+msgid "Pkts."
 msgstr ""
 
 #. Policy
 #: i18n/english/luasrc/i18n/admin-core.en.lua:92
-msgid "a_s_ipt_policy"
+msgid "Policy"
 msgstr ""
 
 #. Prot.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:93
-msgid "a_s_ipt_prot"
+msgid "Prot."
 msgstr ""
 
 #. References
 #: i18n/english/luasrc/i18n/admin-core.en.lua:94
-msgid "a_s_ipt_references"
+msgid "References"
 msgstr ""
 
 #. Reset Counters
 #: i18n/english/luasrc/i18n/admin-core.en.lua:95
-msgid "a_s_ipt_reset"
+msgid "Reset Counters"
 msgstr ""
 
 #. Restart Firewall
 #: i18n/english/luasrc/i18n/admin-core.en.lua:96
-msgid "a_s_ipt_restart"
+msgid "Restart Firewall"
 msgstr ""
 
 #. #
 #: i18n/english/luasrc/i18n/admin-core.en.lua:97
-msgid "a_s_ipt_rulenum"
+msgid "#"
 msgstr ""
 
 #. Source
 #: i18n/english/luasrc/i18n/admin-core.en.lua:98
-msgid "a_s_ipt_source"
+msgid "Source"
 msgstr ""
 
 #. Firewall Status
 #: i18n/english/luasrc/i18n/admin-core.en.lua:99
 #, fuzzy
-msgid "a_s_ipt_status"
+msgid "Firewall Status"
 msgstr ""
 "Qui puoi trovare informazione sullo stato del sistema come frequenza di "
 "clock della <abbr title=\"Central Processing Unit\">CPU</abbr>, uso della "
@@ -557,208 +557,208 @@ msgstr ""
 
 #. Table
 #: i18n/english/luasrc/i18n/admin-core.en.lua:100
-msgid "a_s_ipt_table"
+msgid "Table"
 msgstr ""
 
 #. Target
 #: i18n/english/luasrc/i18n/admin-core.en.lua:101
-msgid "a_s_ipt_target"
+msgid "Target"
 msgstr ""
 
 #. Perform Actions
 #: i18n/english/luasrc/i18n/admin-core.en.lua:102
-msgid "a_s_packages_do"
+msgid "Perform Actions"
 msgstr "Esegui azioni"
 
 #. Install
 #: i18n/english/luasrc/i18n/admin-core.en.lua:103
-msgid "a_s_packages_install"
+msgid "Install"
 msgstr "Installa"
 
 #. Download and install package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:104
-msgid "a_s_packages_installurl"
+msgid "Download and install package"
 msgstr "Scarica e installa pacchetto"
 
 #. Edit package lists and installation targets
 #: i18n/english/luasrc/i18n/admin-core.en.lua:105
-msgid "a_s_packages_ipkg"
+msgid "Edit package lists and installation targets"
 msgstr "Modifica lista dei pacchetti e destinazione dell&#39;installazione"
 
 #. Package name
 #: i18n/english/luasrc/i18n/admin-core.en.lua:106
-msgid "a_s_packages_name"
+msgid "Package name"
 msgstr "Nome pacchetto"
 
 #. Remove
 #: i18n/english/luasrc/i18n/admin-core.en.lua:107
-msgid "a_s_packages_remove"
+msgid "Remove"
 msgstr "Rimuovi"
 
 #. Find package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:108
-msgid "a_s_packages_search"
+msgid "Find package"
 msgstr "Cerca pacchetto"
 
 #. Package lists updated
 #: i18n/english/luasrc/i18n/admin-core.en.lua:109
-msgid "a_s_packages_update"
+msgid "Package lists updated"
 msgstr "Lista pacchetti aggiornata"
 
 #. Update package lists
 #: i18n/english/luasrc/i18n/admin-core.en.lua:110
-msgid "a_s_packages_updatelist"
+msgid "Update package lists"
 msgstr "Aggiorna lista pacchetti"
 
 #. Upgrade installed packages
 #: i18n/english/luasrc/i18n/admin-core.en.lua:111
-msgid "a_s_packages_upgrade"
+msgid "Upgrade installed packages"
 msgstr "Upgrade installed packages"
 
 #. Could not set default destination
 #: i18n/english/luasrc/i18n/admin-core.en.lua:112
 #, fuzzy
-msgid "a_s_packages_code1"
+msgid "Could not set default destination"
 msgstr "Esegui azioni"
 
 #. Error parsing config file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:113
 #, fuzzy
-msgid "a_s_packages_code2"
+msgid "Error parsing config file"
 msgstr "Esegui azioni"
 
 #. Could not create temporary directory (ran out of space?)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:114
 #, fuzzy
-msgid "a_s_packages_code3"
+msgid "Could not create temporary directory (ran out of space?)"
 msgstr "Esegui azioni"
 
 #. Could not get adminstrative lock (ran out of space?)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:115
 #, fuzzy
-msgid "a_s_packages_code4"
+msgid "Could not get adminstrative lock (ran out of space?)"
 msgstr "Esegui azioni"
 
 #. Unsatisfied Dependencies
 #: i18n/english/luasrc/i18n/admin-core.en.lua:116
 #, fuzzy
-msgid "a_s_packages_code5"
+msgid "Unsatisfied Dependencies"
 msgstr "Esegui azioni"
 
 #. Refused to remove essential package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:117
 #, fuzzy
-msgid "a_s_packages_code6"
+msgid "Refused to remove essential package"
 msgstr "Esegui azioni"
 
 #. Package has dependents
 #: i18n/english/luasrc/i18n/admin-core.en.lua:118
 #, fuzzy
-msgid "a_s_packages_code7"
+msgid "Package has dependents"
 msgstr "Esegui azioni"
 
 #. Package has no installation candidate (wrong name?)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:119
 #, fuzzy
-msgid "a_s_packages_code8"
+msgid "Package has no installation candidate (wrong name?)"
 msgstr "Esegui azioni"
 
 #. Package has no available architecture 
 #: i18n/english/luasrc/i18n/admin-core.en.lua:120
 #, fuzzy
-msgid "a_s_packages_code9"
+msgid "Package has no available architecture "
 msgstr "Esegui azioni"
 
 #. Package is not trusted
 #: i18n/english/luasrc/i18n/admin-core.en.lua:121
 #, fuzzy
-msgid "a_s_packages_code10"
+msgid "Package is not trusted"
 msgstr "Esegui azioni"
 
 #. Error while downloading
 #: i18n/english/luasrc/i18n/admin-core.en.lua:122
 #, fuzzy
-msgid "a_s_packages_code11"
+msgid "Error while downloading"
 msgstr "Esegui azioni"
 
 #. Conflicts with other packages
 #: i18n/english/luasrc/i18n/admin-core.en.lua:123
 #, fuzzy
-msgid "a_s_packages_code12"
+msgid "Conflicts with other packages"
 msgstr "Esegui azioni"
 
 #. Package is already installed
 #: i18n/english/luasrc/i18n/admin-core.en.lua:124
 #, fuzzy
-msgid "a_s_packages_code13"
+msgid "Package is already installed"
 msgstr "Esegui azioni"
 
 #. Package has unresolved dependencies
 #: i18n/english/luasrc/i18n/admin-core.en.lua:125
 #, fuzzy
-msgid "a_s_packages_code14"
+msgid "Package has unresolved dependencies"
 msgstr "Esegui azioni"
 
 #. Refused to downgrade package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:126
 #, fuzzy
-msgid "a_s_packages_code15"
+msgid "Refused to downgrade package"
 msgstr "Esegui azioni"
 
 #. Package manager ran out of space
 #: i18n/english/luasrc/i18n/admin-core.en.lua:127
 #, fuzzy
-msgid "a_s_packages_code16"
+msgid "Package manager ran out of space"
 msgstr "Esegui azioni"
 
 #. Bad signature while verifiying package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:128
 #, fuzzy
-msgid "a_s_packages_code17"
+msgid "Bad signature while verifiying package"
 msgstr "Esegui azioni"
 
 #. MD5 error while verifiying package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:129
 #, fuzzy
-msgid "a_s_packages_code18"
+msgid "MD5 error while verifiying package"
 msgstr "Esegui azioni"
 
 #. Internal error occured
 #: i18n/english/luasrc/i18n/admin-core.en.lua:130
 #, fuzzy
-msgid "a_s_packages_code19"
+msgid "Internal error occured"
 msgstr "Esegui azioni"
 
 #. Package lists
 #: i18n/english/luasrc/i18n/admin-core.en.lua:131
-msgid "a_s_p_ipkg_pkglists"
+msgid "Package lists"
 msgstr "Lista pacchetti"
 
 #. Installation targets
 #: i18n/english/luasrc/i18n/admin-core.en.lua:132
-msgid "a_s_p_ipkg_targets"
+msgid "Installation targets"
 msgstr "Destinazione installazione"
 
 #. Change the password of the system administrator (User <code>root</code>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:133
-msgid "a_s_changepw1"
+msgid "Change the password of the system administrator (User <code>root</code>)"
 msgstr ""
 "Cambia la password dell&#39;amministratore di sistema (Utente "
 "<code>root</code>)"
 
 #. Password successfully changed
 #: i18n/english/luasrc/i18n/admin-core.en.lua:134
-msgid "a_s_changepw_changed"
+msgid "Password successfully changed"
 msgstr "Password cambiata con successo"
 
 #. Error: Passwords do not match
 #: i18n/english/luasrc/i18n/admin-core.en.lua:135
-msgid "a_s_changepw_nomatch"
+msgid "Error: Passwords do not match"
 msgstr "Errore: le password non corrispondono"
 
 #. Here you can paste public <abbr title=\"Secure Shell\">SSH</abbr>-Keys (one per line) for <abbr title=\"Secure Shell\">SSH</abbr> public-key authentication.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:136
-msgid "a_s_sshkeys1"
+msgid "Here you can paste public <abbr title=\"Secure Shell\">SSH</abbr>-Keys (one per line) for <abbr title=\"Secure Shell\">SSH</abbr> public-key authentication."
 msgstr ""
 "Qui puoi incollare le tue chiavi <abbr title=\"Secure Shell\">SSH</abbr> (una "
 "per linea) per l&#39;autenticazione <abbr title=\"Secure Shell\">SSH</abbr> a "
@@ -766,46 +766,46 @@ msgstr ""
 
 #. Mount Points
 #: i18n/english/luasrc/i18n/admin-core.en.lua:137
-msgid "a_s_fstab_mountpoints"
+msgid "Mount Points"
 msgstr "Punti di mount"
 
 #. Mount Points define at which point a memory device will be attached to the filesystem
 #: i18n/english/luasrc/i18n/admin-core.en.lua:138
-msgid "a_s_fstab_mountpoints1"
+msgid "Mount Points define at which point a memory device will be attached to the filesystem"
 msgstr ""
 "I punti di mount definiscono in quale punto un dispositivo di memoria verrà "
 "attaccato al tuo filesystem"
 
 #. Mounted file systems
 #: i18n/english/luasrc/i18n/admin-core.en.lua:139
-msgid "a_s_fstab_active"
+msgid "Mounted file systems"
 msgstr "File system montati"
 
 #. Used
 #: i18n/english/luasrc/i18n/admin-core.en.lua:140
-msgid "a_s_fstab_used"
+msgid "Used"
 msgstr "Usati"
 
 #. Available
 #: i18n/english/luasrc/i18n/admin-core.en.lua:141
-msgid "a_s_fstab_avail"
+msgid "Available"
 msgstr "Disponibili"
 
 #. Mount Point
 #: i18n/english/luasrc/i18n/admin-core.en.lua:142
-msgid "a_s_fstab_mountpoint"
+msgid "Mount Point"
 msgstr "Punto di mount"
 
 #. The device file of the memory or partition (<abbr title=\"for example\">e.g.</abbr> <code>/dev/sda1</code>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:143
-msgid "a_s_fstab_device1"
+msgid "The device file of the memory or partition (<abbr title=\"for example\">e.g.</abbr> <code>/dev/sda1</code>)"
 msgstr ""
 "Il file del dispositivo di memoria o della partizione (<abbr title=\"per "
 "esempio\">e.s.</abbr> <code>/dev/sda1</code>)"
 
 #. The filesystem that was used to format the memory (<abbr title=\"for example\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></samp>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:144
-msgid "a_s_fstab_fs1"
+msgid "The filesystem that was used to format the memory (<abbr title=\"for example\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></samp>)"
 msgstr ""
 "Il filesystem usato per formattare la memoria (<abbr title=\"per "
 "esempio\">e.s.</abbr> <samp><abbr title=\"Third Extended "
@@ -813,7 +813,7 @@ msgstr ""
 
 #. If your physical memory is insufficient unused data can be temporarily swapped to a swap-device resulting in a higher amount of usable <abbr title=\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very slow process as the swap-device cannot be accessed with the high datarates of the <abbr title=\"Random Access Memory\">RAM</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:145
-msgid "a_s_fstab_swap1"
+msgid "If your physical memory is insufficient unused data can be temporarily swapped to a swap-device resulting in a higher amount of usable <abbr title=\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very slow process as the swap-device cannot be accessed with the high datarates of the <abbr title=\"Random Access Memory\">RAM</abbr>."
 msgstr ""
 "Se la tua memoria è insufficiente i dati non usati possono venire "
 "temporaneamente spostati in un&#39;area di swap risultando in un più grande "
@@ -824,87 +824,87 @@ msgstr ""
 
 #. Reboots the operating system of your device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:146
-msgid "a_s_reboot1"
+msgid "Reboots the operating system of your device"
 msgstr "Riavvia il sistema operativo del tuo dispositivo"
 
 #. Perform reboot
 #: i18n/english/luasrc/i18n/admin-core.en.lua:147
-msgid "a_s_reboot_do"
+msgid "Perform reboot"
 msgstr "Esegui un riavvio"
 
 #. Please wait: Device rebooting...
 #: i18n/english/luasrc/i18n/admin-core.en.lua:148
-msgid "a_s_reboot_running"
+msgid "Please wait: Device rebooting..."
 msgstr "Per favore attendi: Riavvio del dispositivo..."
 
 #. Warning: There are unsaved changes that will be lost while rebooting!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:149
-msgid "a_s_reboot_u"
+msgid "Warning: There are unsaved changes that will be lost while rebooting!"
 msgstr ""
 "Attenzione: Ci sono modifiche non salvate che verranno persi riavviando!"
 
 #. Changes applied.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:150
-msgid "a_s_applyreboot1"
+msgid "Changes applied."
 msgstr "Modifiche applicate."
 
 #. Backup / Restore
 #: i18n/english/luasrc/i18n/admin-core.en.lua:151
-msgid "a_s_backup"
+msgid "Backup / Restore"
 msgstr "Backup / Ripristina"
 
 #. Create backup
 #: i18n/english/luasrc/i18n/admin-core.en.lua:152
-msgid "a_s_backup_backup"
+msgid "Create backup"
 msgstr "Crea un backup"
 
 #. Backup Archive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:153
-msgid "a_s_backup_archive"
+msgid "Backup Archive"
 msgstr "Archivio di backup"
 
 #. Reset router to defaults
 #: i18n/english/luasrc/i18n/admin-core.en.lua:154
-msgid "a_s_backup_reset"
+msgid "Reset router to defaults"
 msgstr "Ripristina il router come predefinito"
 
 #. Proceed reverting all settings and resetting to firmware defaults?
 #: i18n/english/luasrc/i18n/admin-core.en.lua:155
-msgid "a_s_backup_reset1"
+msgid "Proceed reverting all settings and resetting to firmware defaults?"
 msgstr ""
 "Procedi annullando tutte le modifiche e resettando ai predefiniti del "
 "firmware?"
 
 #. Restore backup
 #: i18n/english/luasrc/i18n/admin-core.en.lua:156
-msgid "a_s_backup_restore"
+msgid "Restore backup"
 msgstr "Ripristina backup"
 
 #. Here you can backup and restore your router configuration and - if possible - reset the router to the default settings.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:157
-msgid "a_s_backup1"
+msgid "Here you can backup and restore your router configuration and - if possible - reset the router to the default settings."
 msgstr ""
 "Qui puoi salvare e ripristinare la configurazione del tuo router e - se "
 "possibile - resettare il router con le impostazioni predefinite."
 
 #. <abbr title=\"Hypertext Transfer Protocol\">HTTP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:158
-msgid "a_srv_http"
+msgid "<abbr title=\"Hypertext Transfer Protocol\">HTTP</abbr>-Server"
 msgstr "Server <abbr title=\"Hypertext Transfer Protocol\">HTTP</abbr>"
 
 #. <abbr title=\"Secure Shell\">SSH</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:159
-msgid "a_srv_ssh"
+msgid "<abbr title=\"Secure Shell\">SSH</abbr>-Server"
 msgstr "Server <abbr title=\"Secure Shell\">SSH</abbr>"
 
 #. Services and daemons perform certain tasks on your device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:160
-msgid "a_srv_services1"
+msgid "Services and daemons perform certain tasks on your device."
 msgstr "Servizi e demoni svolgono alcune azioni sul tuo dispositivo."
 
 #. Most of them are network servers, that offer a certain service for your device or network like shell access, serving webpages like <abbr title=\"Lua Configuration Interface\">LuCI</abbr>, doing mesh routing, sending e-mails, ...
 #: i18n/english/luasrc/i18n/admin-core.en.lua:161
-msgid "a_srv_services2"
+msgid "Most of them are network servers, that offer a certain service for your device or network like shell access, serving webpages like <abbr title=\"Lua Configuration Interface\">LuCI</abbr>, doing mesh routing, sending e-mails, ..."
 msgstr ""
 "Molti di loro sono servers, che offrono un determinato servizio al tuo "
 "dispositivo o alla tua rete come accesso shell, servire pagine web come "
@@ -913,87 +913,87 @@ msgstr ""
 
 #. A small webserver which can be used to serve <abbr title=\"Lua Configuration Interface\">LuCI</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:162
-msgid "a_srv_http1"
+msgid "A small webserver which can be used to serve <abbr title=\"Lua Configuration Interface\">LuCI</abbr>."
 msgstr ""
 "Un piccolo webserver che può essere usato per servire <abbr title=\"Lua "
 "Configuration Interface\">LuCI</abbr>."
 
 #. Authentication Realm
 #: i18n/english/luasrc/i18n/admin-core.en.lua:163
-msgid "a_srv_http_authrealm"
+msgid "Authentication Realm"
 msgstr "Authentication Realm"
 
 #. The realm which will be displayed at the authentication prompt for protected pages.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:164
-msgid "a_srv_http_authrealm1"
+msgid "The realm which will be displayed at the authentication prompt for protected pages."
 msgstr ""
 "Il realm che verrà visualizzato al prompt di autenticazione per le pagine "
 "protette."
 
 #. defaults to <code>/etc/httpd.conf</code>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:165
-msgid "a_srv_http_config1"
+msgid "defaults to <code>/etc/httpd.conf</code>"
 msgstr "predefinito <code>/etc/httpd.conf</code>"
 
 #. Document root
 #: i18n/english/luasrc/i18n/admin-core.en.lua:166
-msgid "a_srv_http_root"
+msgid "Document root"
 msgstr "Radice dei documenti"
 
 #. Enable Keep-Alive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:167
-msgid "a_srv_http_keepalive"
+msgid "Enable Keep-Alive"
 msgstr ""
 
 #. Connection timeout
 #: i18n/english/luasrc/i18n/admin-core.en.lua:168
-msgid "a_srv_http_timeout"
+msgid "Connection timeout"
 msgstr ""
 
 #. Plugin path
 #: i18n/english/luasrc/i18n/admin-core.en.lua:169
-msgid "a_srv_http_path"
+msgid "Plugin path"
 msgstr ""
 
 #. A lightweight HTTP/1.1 webserver written in C and Lua designed to serve LuCI
 #: i18n/english/luasrc/i18n/admin-core.en.lua:170
-msgid "a_srv_lucittpd"
+msgid "A lightweight HTTP/1.1 webserver written in C and Lua designed to serve LuCI"
 msgstr ""
 
 #. Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:171
-msgid "a_srv_dropbear1"
+msgid "Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
 msgstr ""
 "Dropbear offre accesso <abbr title=\"Secure Shell\">SSH</abbr> e integra un "
 "server <abbr title=\"Secure Copy\">SCP</abbr>"
 
 #. Password authentication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:172
-msgid "a_srv_d_pwauth"
+msgid "Password authentication"
 msgstr "Password di authenticazione"
 
 #. Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:173
-msgid "a_srv_d_pwauth1"
+msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
 msgstr ""
 "Permetti autenticazione <abbr title=\"Secure Shell\">SSH</abbr> tramite "
 "password"
 
 #. Channel
 #: i18n/english/luasrc/i18n/admin-core.en.lua:174
-msgid "a_w_channel"
+msgid "Channel"
 msgstr "Canale"
 
 #. On this pages you can find configuration options for <abbr title=\"Wireless Local Area Network\">WLAN</abbr> based wireless networks.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:175
-msgid "a_w_wifi1"
+msgid "On this pages you can find configuration options for <abbr title=\"Wireless Local Area Network\">WLAN</abbr> based wireless networks."
 msgstr ""
 "In questa pagina puoi trovare impostazioni di configurazione per reti <abbr "
 "title=\"Wireless Local Area Network\">WLAN</abbr>."
 
 #. You can easily integrate your 802.11a/b/g/n-devices into your physical network and use the virtual adapter support to build wireless repeaters or offer several networks with one device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:176
-msgid "a_w_wifi2"
+msgid "You can easily integrate your 802.11a/b/g/n-devices into your physical network and use the virtual adapter support to build wireless repeaters or offer several networks with one device."
 msgstr ""
 "Puoi facilmente integrare i tuoi dispositivi 802.11a/b/g/n-devices nella tua "
 "rete fisica e usare la scheda di rete virtuale per costruire ripetitori "
@@ -1001,7 +1001,7 @@ msgstr ""
 
 #. There is support for Managed, Client, Ad-Hoc and <abbr title=\"Wireless Distribution System\">WDS</abbr> operating modes as well as <abbr title=\"Wi-Fi Protected Access\">WPA</abbr> and <abbr title=\"Wi-Fi Protected Access 2\">WPA2</abbr> encryption for secure communnication.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:177
-msgid "a_w_wifi3"
+msgid "There is support for Managed, Client, Ad-Hoc and <abbr title=\"Wireless Distribution System\">WDS</abbr> operating modes as well as <abbr title=\"Wi-Fi Protected Access\">WPA</abbr> and <abbr title=\"Wi-Fi Protected Access 2\">WPA2</abbr> encryption for secure communnication."
 msgstr ""
 "Sono supportate le modalità operative Managed, Client, Ad-Hoc and <abbr "
 "title=\"Wireless Distribution System\">WDS</abbr> come per la crittografia "
@@ -1010,42 +1010,42 @@ msgstr ""
 
 #. Here you can configure installed wifi devices.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:178
-msgid "a_w_devices1"
+msgid "Here you can configure installed wifi devices."
 msgstr "Qui puoi configurare i tuoi dispositivi wireless installati."
 
 #. Transmit Antenna
 #: i18n/english/luasrc/i18n/admin-core.en.lua:179
-msgid "a_w_txantenna"
+msgid "Transmit Antenna"
 msgstr "Antenna trasmittente"
 
 #. Receive Antenna
 #: i18n/english/luasrc/i18n/admin-core.en.lua:180
-msgid "a_w_rxantenna"
+msgid "Receive Antenna"
 msgstr "Antenna ricevente"
 
 #. Distance to furthest station (in meter)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:181
-msgid "a_w_distance1"
+msgid "Distance to furthest station (in meter)"
 msgstr "Distanza della stazione più lontana (in metri)"
 
 #. Diversity
 #: i18n/english/luasrc/i18n/admin-core.en.lua:182
-msgid "a_w_diversity"
+msgid "Diversity"
 msgstr "Diversity"
 
 #. Country Code
 #: i18n/english/luasrc/i18n/admin-core.en.lua:183
-msgid "a_w_countrycode"
+msgid "Country Code"
 msgstr "Codice nazione"
 
 #. Connection Limit
 #: i18n/english/luasrc/i18n/admin-core.en.lua:184
-msgid "a_w_connlimit"
+msgid "Connection Limit"
 msgstr "Limite connessioni"
 
 #. You can run several wifi networks with one device. Be aware that there are certain hardware and driverspecific restrictions. Normally you can operate 1 Ad-Hoc or up to 3 Master-Mode and 1 Client-Mode network simultaneously.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:185
-msgid "a_w_networks1"
+msgid "You can run several wifi networks with one device. Be aware that there are certain hardware and driverspecific restrictions. Normally you can operate 1 Ad-Hoc or up to 3 Master-Mode and 1 Client-Mode network simultaneously."
 msgstr ""
 "Puoi avere più reti wifi con un solo dispositivo. Sappi ceh ci sono alcune "
 "restrizioni relative all&#39;hardware ed al driver.Normalmente puoi avere 1 "
@@ -1054,92 +1054,92 @@ msgstr ""
 
 #. Network Name (<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:186
-msgid "a_w_netid"
+msgid "Network Name (<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>)"
 msgstr "Nome rete (<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>)"
 
 #. Add the Wifi network to physical network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:187
-msgid "a_w_network1"
+msgid "Add the Wifi network to physical network"
 msgstr "Aggiungi la rete Wifi alla rete fisica"
 
 #.  - Create new Network - 
 #: i18n/english/luasrc/i18n/admin-core.en.lua:188
-msgid "a_w_netmanual"
+msgid " - Create new Network - "
 msgstr " - Crea nuova rete - "
 
 #. Transmit Power
 #: i18n/english/luasrc/i18n/admin-core.en.lua:189
-msgid "a_w_txpwr"
+msgid "Transmit Power"
 msgstr "Potenza di trasmissione"
 
 #. Broadcom Frameburst
 #: i18n/english/luasrc/i18n/admin-core.en.lua:190
-msgid "a_w_brcmburst"
+msgid "Broadcom Frameburst"
 msgstr "Frameburst Broadcom"
 
 #. Atheros Frameburst
 #: i18n/english/luasrc/i18n/admin-core.en.lua:191
-msgid "a_w_athburst"
+msgid "Atheros Frameburst"
 msgstr "Frameburst Atheros"
 
 #. RadiusServer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:192
-msgid "a_w_radiussrv"
+msgid "RadiusServer"
 msgstr "Server Radius"
 
 #. Radius-Port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:193
-msgid "a_w_radiusport"
+msgid "Radius-Port"
 msgstr "Porta Radius"
 
 #. AP-Isolation
 #: i18n/english/luasrc/i18n/admin-core.en.lua:194
-msgid "a_w_apisolation"
+msgid "AP-Isolation"
 msgstr "Isolazione AP"
 
 #. Prevents Client to Client communication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:195
-msgid "a_w_apisolation1"
+msgid "Prevents Client to Client communication"
 msgstr "Impedisci la comunicazione fra Client"
 
 #. Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:196
-msgid "a_w_hideessid"
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "Nascondi <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
 #. Access Point
 #: i18n/english/luasrc/i18n/admin-core.en.lua:197
-msgid "a_w_ap"
+msgid "Access Point"
 msgstr "Access Point"
 
 #. Ad-Hoc
 #: i18n/english/luasrc/i18n/admin-core.en.lua:198
-msgid "a_w_adhoc"
+msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
 #. Pseudo Ad-Hoc (ahdemo)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:199
-msgid "a_w_ahdemo"
+msgid "Pseudo Ad-Hoc (ahdemo)"
 msgstr "Pseudo Ad-Hoc (ahdemo)"
 
 #. Client
 #: i18n/english/luasrc/i18n/admin-core.en.lua:200
-msgid "a_w_client"
+msgid "Client"
 msgstr "Client"
 
 #. WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:201
-msgid "a_w_wds"
+msgid "WDS"
 msgstr "WDS"
 
 #. Monitor
 #: i18n/english/luasrc/i18n/admin-core.en.lua:202
-msgid "a_w_monitor"
+msgid "Monitor"
 msgstr "Monitor"
 
 #. Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> firewalls
 #: i18n/english/luasrc/i18n/admin-core.en.lua:203
-msgid "dhcp_dnsmasq_desc"
+msgid "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> firewalls"
 msgstr ""
 "Dnsmasq è un server <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> e forwarder <abbr title=\"Domain Name "
@@ -1148,248 +1148,248 @@ msgstr ""
 
 #. Domain required
 #: i18n/english/luasrc/i18n/admin-core.en.lua:204
-msgid "dhcp_dnsmasq_domainneeded"
+msgid "Domain required"
 msgstr "Dominio richiesto"
 
 #. Don&#39;t forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without <abbr title=\"Domain Name System\">DNS</abbr>-Name
 #: i18n/english/luasrc/i18n/admin-core.en.lua:205
-msgid "dhcp_dnsmasq_domainneeded_desc"
+msgid "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without <abbr title=\"Domain Name System\">DNS</abbr>-Name"
 msgstr ""
 "Non inoltrare le richieste <abbr title=\"Domain Name System\">DNS</abbr> senza "
 "nome <abbr title=\"Domain Name System\">DNS</abbr>"
 
 #. Authoritative
 #: i18n/english/luasrc/i18n/admin-core.en.lua:206
-msgid "dhcp_dnsmasq_authoritative"
+msgid "Authoritative"
 msgstr "Autoritativo"
 
 #. This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> in the local network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:207
-msgid "dhcp_dnsmasq_authoritative_desc"
+msgid "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> in the local network"
 msgstr ""
 "Questo è l&#39;unico server <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> nella tua rete locale"
 
 #. Filter private
 #: i18n/english/luasrc/i18n/admin-core.en.lua:208
-msgid "dhcp_dnsmasq_boguspriv"
+msgid "Filter private"
 msgstr "Filtra privati"
 
 #. Don&#39;t forward reverse lookups for local networks
 #: i18n/english/luasrc/i18n/admin-core.en.lua:209
-msgid "dhcp_dnsmasq_boguspriv_desc"
+msgid "Don't forward reverse lookups for local networks"
 msgstr "Non inoltrare richieste per le reti locali"
 
 #. Filter useless
 #: i18n/english/luasrc/i18n/admin-core.en.lua:210
-msgid "dhcp_dnsmasq_filterwin2k"
+msgid "Filter useless"
 msgstr "Filtra inutili"
 
 #. filter useless <abbr title=\"Domain Name System\">DNS</abbr>-queries of Windows-systems
 #: i18n/english/luasrc/i18n/admin-core.en.lua:211
-msgid "dhcp_dnsmasq_filterwin2k_desc"
+msgid "filter useless <abbr title=\"Domain Name System\">DNS</abbr>-queries of Windows-systems"
 msgstr ""
 "Filtra richieste <abbr title=\"Domain Name System\">DNS</abbr> inutili di "
 "sistemi windows"
 
 #. Localise queries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:212
-msgid "dhcp_dnsmasq_localisequeries"
+msgid "Localise queries"
 msgstr "Localizza richieste"
 
 #. localises the hostname depending on its subnet
 #: i18n/english/luasrc/i18n/admin-core.en.lua:213
-msgid "dhcp_dnsmasq_localisequeries_desc"
+msgid "localises the hostname depending on its subnet"
 msgstr "localizza l&#39;hostname a seconda delle sue sottoreti"
 
 #. Local Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:214
-msgid "dhcp_dnsmasq_local"
+msgid "Local Server"
 msgstr "Server locale"
 
 #. Local Domain
 #: i18n/english/luasrc/i18n/admin-core.en.lua:215
-msgid "dhcp_dnsmasq_domain"
+msgid "Local Domain"
 msgstr "Dominio locale"
 
 #. Expand Hosts
 #: i18n/english/luasrc/i18n/admin-core.en.lua:216
-msgid "dhcp_dnsmasq_expandhosts"
+msgid "Expand Hosts"
 msgstr "Espandi host"
 
 #. adds domain names to hostentries in the resolv file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:217
-msgid "dhcp_dnsmasq_expandhosts_desc"
+msgid "adds domain names to hostentries in the resolv file"
 msgstr "aggiungi nomi di dominio nel file resolv"
 
 #. don&#39;t cache unknown
 #: i18n/english/luasrc/i18n/admin-core.en.lua:218
-msgid "dhcp_dnsmasq_nonegcache"
+msgid "don't cache unknown"
 msgstr "non tenere sconosciuti in cache"
 
 #. prevents caching of negative <abbr title=\"Domain Name System\">DNS</abbr>-replies
 #: i18n/english/luasrc/i18n/admin-core.en.lua:219
-msgid "dhcp_dnsmasq_nonegcache_desc"
+msgid "prevents caching of negative <abbr title=\"Domain Name System\">DNS</abbr>-replies"
 msgstr ""
 "impedisci la cache di risposte <abbr title=\"Domain Name System\">DNS</abbr> "
 "negative"
 
 #. Use <code>/etc/ethers</code>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:220
-msgid "dhcp_dnsmasq_readethers"
+msgid "Use <code>/etc/ethers</code>"
 msgstr "Usa <code>/etc/ethers</code>"
 
 #. Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:221
-msgid "dhcp_dnsmasq_readethers_desc"
+msgid "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server"
 msgstr ""
 "Leggi <code>/etc/ethers</code> per configurare il server <abbr "
 "title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 
 #. Leasefile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:222
-msgid "dhcp_dnsmasq_leasefile"
+msgid "Leasefile"
 msgstr "File di lease"
 
 #. file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-leases will be stored
 #: i18n/english/luasrc/i18n/admin-core.en.lua:223
-msgid "dhcp_dnsmasq_leasefile_desc"
+msgid "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-leases will be stored"
 msgstr ""
 "file dove vengono salvati i lease <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> assegnati"
 
 #. Resolvfile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:224
-msgid "dhcp_dnsmasq_resolvfile"
+msgid "Resolvfile"
 msgstr "File resolv"
 
 #. local <abbr title=\"Domain Name System\">DNS</abbr> file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:225
-msgid "dhcp_dnsmasq_resolvfile_desc"
+msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "File <abbr title=\"Domain Name System\">DNS</abbr> locale"
 
 #. Ignore <code>/etc/hosts</code>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:226
-msgid "dhcp_dnsmasq_nohosts"
+msgid "Ignore <code>/etc/hosts</code>"
 msgstr "Ignora <code>/etc/hosts</code>"
 
 #. Strict order
 #: i18n/english/luasrc/i18n/admin-core.en.lua:227
-msgid "dhcp_dnsmasq_strictorder"
+msgid "Strict order"
 msgstr "Ordine severo"
 
 #. <abbr title=\"Domain Name System\">DNS</abbr>-Server will be queried in the order of the resolvfile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:228
-msgid "dhcp_dnsmasq_strictorder_desc"
+msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Server will be queried in the order of the resolvfile"
 msgstr ""
 "I server <abbr title=\"Domain Name System\">DNS</abbr> verranno contattati "
 "nell&#39;ordine del file resolv"
 
 #. Log queries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:229
-msgid "dhcp_dnsmasq_logqueries"
+msgid "Log queries"
 msgstr "Logga richieste"
 
 #. Ignore resolve file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:230
-msgid "dhcp_dnsmasq_noresolv"
+msgid "Ignore resolve file"
 msgstr "Ignora file resolv"
 
 #. concurrent queries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:231
-msgid "dhcp_dnsmasq_dnsforwardmax"
+msgid "concurrent queries"
 msgstr "richieste contemporanee"
 
 #. <abbr title=\"Domain Name System\">DNS</abbr>-Port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:232
-msgid "dhcp_dnsmasq_port"
+msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Port"
 msgstr "Porta <abbr title=\"Domain Name System\">DNS</abbr>"
 
 #. <abbr title=\"maximal\">max.</abbr> <abbr title=\"Extension Mechanisms for Domain Name System\">EDNS0</abbr> paket size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:233
-msgid "dhcp_dnsmasq_ednspacket_max"
+msgid "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Extension Mechanisms for Domain Name System\">EDNS0</abbr> paket size"
 msgstr ""
 "Dimensione massima pacchetto <abbr title=\"Extension Mechanisms for Domain "
 "Name System\">EDNS0</abbr>"
 
 #. <abbr title=\"maximal\">max.</abbr> <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:234
-msgid "dhcp_dnsmasq_dhcpleasemax"
+msgid "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Leases"
 msgstr ""
 "Numero massimo di lease <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr>"
 
 #. additional hostfile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:235
-msgid "dhcp_dnsmasq_addnhosts"
+msgid "additional hostfile"
 msgstr "file hosts aggiuntivo"
 
 #. query port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:236
-msgid "dhcp_dnsmasq_queryport"
+msgid "query port"
 msgstr "porta per le richieste"
 
 #. Enable TFTP-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:237
-msgid "dhcp_dnsmasq_enabletftp"
+msgid "Enable TFTP-Server"
 msgstr "Abilita server TFTP"
 
 #. TFTP-Server Root
 #: i18n/english/luasrc/i18n/admin-core.en.lua:238
-msgid "dhcp_dnsmasq_tftproot"
+msgid "TFTP-Server Root"
 msgstr "Radice del server TFTP"
 
 #. Network Boot Image
 #: i18n/english/luasrc/i18n/admin-core.en.lua:239
-msgid "dhcp_dnsmasq_dhcpboot"
+msgid "Network Boot Image"
 msgstr "Immagine boot da rete"
 
 #. Switch
 #: i18n/english/luasrc/i18n/admin-core.en.lua:240
-msgid "a_n_switch"
+msgid "Switch"
 msgstr "Switch"
 
 #. Active Connections
 #: i18n/english/luasrc/i18n/admin-core.en.lua:241
-msgid "a_n_conntrack"
+msgid "Active Connections"
 msgstr "Connessioni attive"
 
 #. This page gives an overview over currently active network connections.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:242
-msgid "a_n_conntrack_desc"
+msgid "This page gives an overview over currently active network connections."
 msgstr "Questa pagina ti da una riassunto delle connessioni adesso attive."
 
 #. Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:243
-msgid "a_n_routes"
+msgid "Routes"
 msgstr "Route"
 
 #. IPv4 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:244
-msgid "a_n_routes4"
+msgid "IPv4 Routes"
 msgstr "Route IPv4"
 
 #. IPv6 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:245
-msgid "a_n_routes6"
+msgid "IPv6 Routes"
 msgstr "Route IPv6"
 
 #. In this area you find all network-related settings.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:246
-msgid "a_network1"
+msgid "In this area you find all network-related settings."
 msgstr ""
 "In quest&#39;area puoi trovare tutte le impostazioni relative alla rete."
 
 #. On most routers the network switch can be freely configured and splitted up into several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:247
-msgid "a_network2"
+msgid "On most routers the network switch can be freely configured and splitted up into several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s."
 msgstr ""
 "Su molti router lo switch può essere suddiviso liberamente in molte <abbr "
 "title=\"Virtual Local Area Network\">VLAN</abbr>s."
 
 #. Interfaces and <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> / <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Settings allow a custom organisation of the network and connections to other networks like the internet.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:248
-msgid "a_network3"
+msgid "Interfaces and <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> / <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Settings allow a custom organisation of the network and connections to other networks like the internet."
 msgstr ""
 "Le impostazioni delle interfacce e di <abbr title=\"Point-to-Point Protocol "
 "over Ethernet\">PPPoE</abbr> / <abbr title=\"Point-to-Point Tunneling "
@@ -1398,7 +1398,7 @@ msgstr ""
 
 #. With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> devices in your local network can be automatically configured for network communication.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:249
-msgid "a_network4"
+msgid "With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> devices in your local network can be automatically configured for network communication."
 msgstr ""
 "Con <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> i "
 "dispositivi nella tua rete locale possono venire automaticamente configurati "
@@ -1406,14 +1406,14 @@ msgstr ""
 
 #. Firewall and portforwarding can be used to secure your network while providing services to external networks.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:250
-msgid "a_network5"
+msgid "Firewall and portforwarding can be used to secure your network while providing services to external networks."
 msgstr ""
 "Firewall e portforwarding possono essere usati per proteggere la tua rete "
 "offrendo servizi alle reti esterne."
 
 #. The network ports on your router can be combined to several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s in which computers can communicate directly with each other. <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s are often used to separate different network segments. Often there is by default one Uplink port for a connection to the next greater network like the internet and other ports for a local network.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:251
-msgid "a_n_switch1"
+msgid "The network ports on your router can be combined to several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s in which computers can communicate directly with each other. <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s are often used to separate different network segments. Often there is by default one Uplink port for a connection to the next greater network like the internet and other ports for a local network."
 msgstr ""
 "Le porte di rete del tuo router possono essere combinate in molte <abbr "
 "title=\"Virtual Local Area Network\">VLAN</abbr> nelle quali i computer "
@@ -1425,7 +1425,7 @@ msgstr ""
 
 #. Ports belonging to a <abbr title=\"Virtual Local Area Network\">VLAN</abbr> are separated with spaces. The port with the highest number (usually 5) is oftern the connection to the internal network interface of the router. On devices with 5 ports often the one with the lowest number (0) is the predefined Uplink port.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:252
-msgid "network_switch_desc"
+msgid "Ports belonging to a <abbr title=\"Virtual Local Area Network\">VLAN</abbr> are separated with spaces. The port with the highest number (usually 5) is oftern the connection to the internal network interface of the router. On devices with 5 ports often the one with the lowest number (0) is the predefined Uplink port."
 msgstr ""
 "Le porte che appartengono ad una <abbr title=\"Virtual Local Area "
 "Network\">VLAN</abbr> sono separate con spazi. La porta con priorità più alta "
@@ -1435,7 +1435,7 @@ msgstr ""
 
 #. On this page you can configure the network interfaces. You can bridge several interfaces by ticking the &quot;bridge interfaces&quot; field and enter the names of several network interfaces separated by spaces. You can also use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation <samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: <samp>eth0.1</samp>).
 #: i18n/english/luasrc/i18n/admin-core.en.lua:253
-msgid "a_n_ifaces1"
+msgid "On this page you can configure the network interfaces. You can bridge several interfaces by ticking the \"bridge interfaces\" field and enter the names of several network interfaces separated by spaces. You can also use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation <samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: <samp>eth0.1</samp>)."
 msgstr ""
 "In questa pagina puoi configurare le interfacce di rete.Puoi unire più "
 "interfacce spuntando la voce &quot;unisci interfacce&quot; e inserendo i "
@@ -1446,25 +1446,25 @@ msgstr ""
 
 #. Bridge interfaces
 #: i18n/english/luasrc/i18n/admin-core.en.lua:254
-msgid "a_n_i_bridge"
+msgid "Bridge interfaces"
 msgstr "Unisci interfacce"
 
 #. creates a bridge over specified interface(s)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:255
-msgid "a_n_i_bridge1"
+msgid "creates a bridge over specified interface(s)"
 msgstr "Crea un bridge sulle interfacce selezionate"
 
 #. Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>
-msgid "a_n_i_stp"
+msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 msgstr ""
 
 #. Enables the Spanning Tree Protocol on this bridge
-msgid "a_n_i_stp1"
+msgid "Enables the Spanning Tree Protocol on this bridge"
 msgstr ""
 
 #. With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> network members can automatically receive their network settings (<abbr title=\"Internet Protocol\">IP</abbr>-address, netmask, <abbr title=\"Domain Name System\">DNS</abbr>-server, ...).
 #: i18n/english/luasrc/i18n/admin-core.en.lua:256
-msgid "dhcp_desc"
+msgid "With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> network members can automatically receive their network settings (<abbr title=\"Internet Protocol\">IP</abbr>-address, netmask, <abbr title=\"Domain Name System\">DNS</abbr>-server, ...)."
 msgstr ""
 "Con <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> i membri "
 "della rete possono ricevere automaticamente le loro impostazioni di rete "
@@ -1473,80 +1473,80 @@ msgstr ""
 
 #. Leasetime
 #: i18n/english/luasrc/i18n/admin-core.en.lua:257
-msgid "dhcp_dhcp_leasetime"
+msgid "Leasetime"
 msgstr "Tempo di lease"
 
 #. Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:258
-msgid "dhcp_dhcp_dynamicdhcp"
+msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 msgstr "<abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> dinamico"
 
 #. Ignore interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:259
-msgid "dhcp_dhcp_ignore"
+msgid "Ignore interface"
 msgstr "Ignora interfaccia"
 
 #. disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for this interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:260
-msgid "dhcp_dhcp_ignore_desc"
+msgid "disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for this interface"
 msgstr ""
 "disabilita <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> per "
 "queste interfacce"
 
 #. Force
 #: i18n/english/luasrc/i18n/admin-core.en.lua:261
-msgid "dhcp_dhcp_force"
+msgid "Force"
 msgstr "Forza"
 
 #. first address (last octet)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:262
-msgid "dhcp_dhcp_start_desc"
+msgid "first address (last octet)"
 msgstr "primo indirizzo (ultimo ottetto)"
 
 #. number of leased addresses -1
 #: i18n/english/luasrc/i18n/admin-core.en.lua:263
-msgid "dhcp_dhcp_limit_desc"
+msgid "number of leased addresses -1"
 msgstr "numero di indirizzi serviti -1"
 
 #. DHCP-Options
 #: i18n/english/luasrc/i18n/admin-core.en.lua:264
-msgid "dhcp_dhcp_dhcpoption"
+msgid "DHCP-Options"
 msgstr "Opzioni DHCP"
 
 #. See &quot;dnsmasq --help dhcp&quot; for a list of available options.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:265
-msgid "dhcp_dhcp_dhcpoption_desc"
+msgid "See \"dnsmasq --help dhcp\" for a list of available options."
 msgstr ""
 "Vedi &quot;dnsmasq --help dhcp&quot; per una lista di opzioni disponibile."
 
 #. Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:266
-msgid "dhcp_leases"
+msgid "Leases"
 msgstr "Lease"
 
 #. Static Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:267
-msgid "luci_ethers"
+msgid "Static Leases"
 msgstr "Leases statici"
 
 #. Leasetime remaining
 #: i18n/english/luasrc/i18n/admin-core.en.lua:268
-msgid "dhcp_timeremain"
+msgid "Leasetime remaining"
 msgstr "Tempo lease residuo"
 
 #. Active Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:269
-msgid "dhcp_leases_active"
+msgid "Active Leases"
 msgstr "Lease attivi"
 
 #. Point-to-Point Connections
 #: i18n/english/luasrc/i18n/admin-core.en.lua:270
-msgid "a_n_ptp"
+msgid "Point-to-Point Connections"
 msgstr "Connessioni Point-to-Point"
 
 #. Point-to-Point connections with <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> or <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr> are often used to connect a device over <abbr title=\"Digital Subscriber Line\">DSL</abbr> or similar technologies to an internet access point.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:271
-msgid "a_n_ptp1"
+msgid "Point-to-Point connections with <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> or <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr> are often used to connect a device over <abbr title=\"Digital Subscriber Line\">DSL</abbr> or similar technologies to an internet access point."
 msgstr ""
 "Connessioni Point-to-Point con <abbr title=\"Point-to-Point Protocol over "
 "Ethernet\">PPPoE</abbr> o <abbr title=\"Point-to-Point Tunneling "
@@ -1556,7 +1556,7 @@ msgstr ""
 
 #. You need to install &quot;comgt&quot; for UMTS/GPRS, &quot;ppp-mod-pppoe&quot; for PPPoE, &quot;ppp-mod-pppoa&quot; for PPPoA or &quot;pptp&quot; for PPtP support
 #: i18n/english/luasrc/i18n/admin-core.en.lua:272
-msgid "network_interface_prereq"
+msgid "You need to install \"comgt\" for UMTS/GPRS, \"ppp-mod-pppoe\" for PPPoE, \"ppp-mod-pppoa\" for PPPoA or \"pptp\" for PPtP support"
 msgstr ""
 "Devi installare &quot;comgt&quot; per il supporto UMTS/GPRS, &quot;ppp-mod-"
 "pppoe&quot; per PPPoE, &quot;ppp-mod-pppoa&quot; per PPPoA e "
@@ -1564,711 +1564,711 @@ msgstr ""
 
 #. You need to install &quot;ppp-mod-pppoe&quot; for PPPoE or &quot;pptp&quot; for PPtP support
 #: i18n/english/luasrc/i18n/admin-core.en.lua:273
-msgid "network_interface_prereq_mini"
+msgid "You need to install \"ppp-mod-pppoe\" for PPPoE or \"pptp\" for PPtP support"
 msgstr ""
 "Devi installare &quot;ppp-mod-pppoe&quot; per il supporto PPPoE e "
 "&quot;pptp&quot; per PPtP"
 
 #. <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:274
-msgid "network_interface_server"
+msgid "<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"
 msgstr "Server <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>"
 
 #. Automatic Disconnect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:275
-msgid "network_interface_demand"
+msgid "Automatic Disconnect"
 msgstr "Disconnetti automaticamente"
 
 #. Time (in seconds) after which an unused connection will be closed
 #: i18n/english/luasrc/i18n/admin-core.en.lua:276
-msgid "network_interface_demand_desc"
+msgid "Time (in seconds) after which an unused connection will be closed"
 msgstr "Tempo (in secondi) dopo il quale una connessione inattiva verrà chiusa"
 
 #. Keep-Alive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:277
-msgid "network_interface_keepalive"
+msgid "Keep-Alive"
 msgstr "Keep-Alive"
 
 #. Number of failed connection tests to initiate automatic reconnect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:278
-msgid "network_interface_keepalive_desc"
+msgid "Number of failed connection tests to initiate automatic reconnect"
 msgstr "Numero di test di connettività falliti prima di una riconnessione"
 
 #. Modem device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:279
-msgid "network_interface_device"
+msgid "Modem device"
 msgstr "Dispositivo modem"
 
 #. The device node of your modem, e.g. /dev/ttyUSB0
 #: i18n/english/luasrc/i18n/admin-core.en.lua:280
-msgid "network_interface_device_desc"
+msgid "The device node of your modem, e.g. /dev/ttyUSB0"
 msgstr "Il device node del tuo modem, e.s. /dev/ttyUSB0"
 
 #. Replace default route
 #: i18n/english/luasrc/i18n/admin-core.en.lua:281
-msgid "network_interface_defaultroute"
+msgid "Replace default route"
 msgstr "Sostituisci route di default"
 
 #. Let pppd replace the current default route to use the PPP interface after successful connect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:282
-msgid "network_interface_defaultroute_desc"
+msgid "Let pppd replace the current default route to use the PPP interface after successful connect"
 msgstr ""
 "Consenti a pppd di sostituire la route di default con la route corrente per "
 "usare l&#39;interfaccia PPP dopo una connessione riuscita"
 
 #. Use peer DNS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:283
-msgid "network_interface_peerdns"
+msgid "Use peer DNS"
 msgstr "Usa DNS ottenuti"
 
 #. Configure the local DNS server to use the name servers adverticed by the PPP peer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:284
-msgid "network_interface_peerdns_desc"
+msgid "Configure the local DNS server to use the name servers adverticed by the PPP peer"
 msgstr "Configura il server DNS locale per usare i server DNSnegoziati da PPP"
 
 #. Enable IPv6 on PPP link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:285
-msgid "network_interface_ipv6"
+msgid "Enable IPv6 on PPP link"
 msgstr "Attiva IPv6 sul collegamento PPP"
 
 #. Connect script
 #: i18n/english/luasrc/i18n/admin-core.en.lua:286
-msgid "network_interface_connect"
+msgid "Connect script"
 msgstr "Script connessione"
 
 #. Let pppd run this script after establishing the PPP link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:287
-msgid "network_interface_connect_desc"
+msgid "Let pppd run this script after establishing the PPP link"
 msgstr ""
 "Permette a pppd di avviare questo script dopo l&#39;avvenuta connessione PPP"
 
 #. Disconnect script
 #: i18n/english/luasrc/i18n/admin-core.en.lua:288
-msgid "network_interface_disconnect"
+msgid "Disconnect script"
 msgstr "Script disconnessione"
 
 #. Let pppd run this script before tearing down the PPP link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:289
-msgid "network_interface_disconnect_desc"
+msgid "Let pppd run this script before tearing down the PPP link"
 msgstr "Permette a pppd di avviare questo script prima della disconnessione PPP"
 
 #. Additional pppd options
 #: i18n/english/luasrc/i18n/admin-core.en.lua:290
-msgid "network_interface_pppd_options"
+msgid "Additional pppd options"
 msgstr "Opzioni pppd aggiuntive"
 
 #. Specify additional command line arguments for pppd here
 #: i18n/english/luasrc/i18n/admin-core.en.lua:291
-msgid "network_interface_pppd_options_desc"
+msgid "Specify additional command line arguments for pppd here"
 msgstr "Specifica opzioni linea di comando aggiuntive per pppd qui"
 
 #. Access point (APN)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:292
-msgid "network_interface_apn"
+msgid "Access point (APN)"
 msgstr "Access point (APN)"
 
 #. PIN code
 #: i18n/english/luasrc/i18n/admin-core.en.lua:293
-msgid "network_interface_pincode"
+msgid "PIN code"
 msgstr "Codice PIN"
 
 #. Make sure that you provide the correct pin code here or you might lock your sim card!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:294
-msgid "network_interface_pincode_desc"
+msgid "Make sure that you provide the correct pin code here or you might lock your sim card!"
 msgstr ""
 "Fai attenzione di inserire il codice PIN corretto qui o potresti bloccare la "
 "tua sim card!"
 
 #. Service type
 #: i18n/english/luasrc/i18n/admin-core.en.lua:295
-msgid "network_interface_service"
+msgid "Service type"
 msgstr "Tipo di servizio"
 
 #. Setup wait time
 #: i18n/english/luasrc/i18n/admin-core.en.lua:296
-msgid "network_interface_maxwait"
+msgid "Setup wait time"
 msgstr "Tempo di attesa inizializzazione"
 
 #. Seconds to wait for the modem to become ready before attempting to connect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:297
-msgid "network_interface_maxwait_desc"
+msgid "Seconds to wait for the modem to become ready before attempting to connect"
 msgstr ""
 "Secondi da attendere prima che il modem diventi pronto prima di provare a "
 "connettersi"
 
 #. PPPoA Encapsulation
 #: i18n/english/luasrc/i18n/admin-core.en.lua:298
-msgid "network_interface_encaps"
+msgid "PPPoA Encapsulation"
 msgstr "PPPoA Encapsulation"
 
 #. Routes specify over which interface and gateway a certain host or network can be reached.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:299
-msgid "a_n_r_routes1"
+msgid "Routes specify over which interface and gateway a certain host or network can be reached."
 msgstr ""
 "Le route specificano attraverso quale interfaccia e gateway un certo host o "
 "rete può essere raggiunto."
 
 #. Static Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:300
-msgid "a_n_routes_static"
+msgid "Static Routes"
 msgstr "Route statiche"
 
 #. Static IPv4 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:301
-msgid "a_n_routes_static4"
+msgid "Static IPv4 Routes"
 msgstr "Route statiche IPv4"
 
 #. Static IPv6 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:302
-msgid "a_n_routes_static6"
+msgid "Static IPv6 Routes"
 msgstr "Route statiche IPv6"
 
 #. Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:303
-msgid "a_n_routes_kernel4"
+msgid "Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes"
 msgstr "Route <abbr title=\"Internet Protocol Version 4\">IPv4</abbr> attive"
 
 #. Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:304
-msgid "a_n_routes_kernel6"
+msgid "Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes"
 msgstr "Route <abbr title=\"Internet Protocol Version 6\">IPv6</abbr> attive"
 
 #. Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:305
-msgid "a_n_r_target1"
+msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
 msgstr "<abbr title=\"Internet Protocol Address\">IP</abbr> dell&#39;host o rete"
 
 #. <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network (CIDR)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:306
-msgid "a_n_r_target6"
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network (CIDR)"
 msgstr ""
 "Indirizzo <abbr title=\"Internet Protocol Version 6\">IPv6</abbr> o rete "
 "(CIDR)"
 
 #. if target is a network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:307
-msgid "a_n_r_netmask1"
+msgid "if target is a network"
 msgstr "se la destinazione è una rete"
 
 #. Internet Connection
 #: i18n/english/luasrc/i18n/admin-core.en.lua:308
-msgid "m_n_inet"
+msgid "Internet Connection"
 msgstr "Connessione Internet"
 
 #. Local Network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:309
-msgid "m_n_local"
+msgid "Local Network"
 msgstr "Rete locale"
 
 #. Route
 #: i18n/english/luasrc/i18n/admin-core.en.lua:310
-msgid "m_n_route"
+msgid "Route"
 msgstr "Route"
 
 #. Bridge
 #: i18n/english/luasrc/i18n/admin-core.en.lua:311
-msgid "m_n_brdige"
+msgid "Bridge"
 msgstr "Bridge"
 
 #. Provide (Access Point)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:312
-msgid "m_w_ap"
+msgid "Provide (Access Point)"
 msgstr "Offri (Access Point)"
 
 #. Independent (Ad-Hoc)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:313
-msgid "m_w_adhoc"
+msgid "Independent (Ad-Hoc)"
 msgstr "Independente (Ad-Hoc)"
 
 #. Join (Client)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:314
-msgid "m_w_client"
+msgid "Join (Client)"
 msgstr "Partecipa (Client)"
 
 #. Distributed (<abbr title=\"Wireless Distribution System\">WDS</abbr>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:315
-msgid "m_w_wds"
+msgid "Distributed (<abbr title=\"Wireless Distribution System\">WDS</abbr>)"
 msgstr "Distribuita (<abbr title=\"Wireless Distribution System\">WDS</abbr>)"
 
 #. Clientmode
 #: i18n/english/luasrc/i18n/admin-core.en.lua:316
-msgid "m_w_clientmode"
+msgid "Clientmode"
 msgstr "Modalità client"
 
 #. System log buffer size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:317
-msgid "system_system_logsize"
+msgid "System log buffer size"
 msgstr "Dimensione buffer log di sistema"
 
 #. External system log server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:318
-msgid "system_system_logip"
+msgid "External system log server"
 msgstr "Server log di sistema esterno"
 
 #. Log output level
 #: i18n/english/luasrc/i18n/admin-core.en.lua:319
-msgid "system_system_conloglevel"
+msgid "Log output level"
 msgstr "Livello output di log"
 
 #. Level of log messages on the console
 #: i18n/english/luasrc/i18n/admin-core.en.lua:320
-msgid "system_system_conloglevel_desc"
+msgid "Level of log messages on the console"
 msgstr "Livello output di log sulla console"
 
 #. Processor
 #: i18n/english/luasrc/i18n/admin-core.en.lua:321
-msgid "m_i_processor"
+msgid "Processor"
 msgstr "Processore"
 
 #. Memory
 #: i18n/english/luasrc/i18n/admin-core.en.lua:322
-msgid "m_i_memory"
+msgid "Memory"
 msgstr "Memoria"
 
 #. Local Time
 #: i18n/english/luasrc/i18n/admin-core.en.lua:323
-msgid "m_i_systemtime"
+msgid "Local Time"
 msgstr "Ora locale"
 
 #. Uptime
 #: i18n/english/luasrc/i18n/admin-core.en.lua:324
-msgid "m_i_uptime"
+msgid "Uptime"
 msgstr "Uptime"
 
 #. First leased address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:325
-msgid "m_n_d_firstaddress"
+msgid "First leased address"
 msgstr "Primo indirizzo offerto"
 
 #. Number of leased addresses
 #: i18n/english/luasrc/i18n/admin-core.en.lua:326
-msgid "m_n_d_numleases"
+msgid "Number of leased addresses"
 msgstr "Numero di indirizzi offerti"
 
 #. Routing table
 #: i18n/english/luasrc/i18n/admin-core.en.lua:327
-msgid "routingtable"
+msgid "Routing table"
 msgstr "Tabella di routing"
 
 #. Wifi scan
 #: i18n/english/luasrc/i18n/admin-core.en.lua:328
-msgid "wlanscan"
+msgid "Wifi scan"
 msgstr "Scansione Wifi"
 
 #. Frequency
 #: i18n/english/luasrc/i18n/admin-core.en.lua:329
-msgid "frequency"
+msgid "Frequency"
 msgstr "Frequenza"
 
 #. Power
 #: i18n/english/luasrc/i18n/admin-core.en.lua:330
-msgid "power"
+msgid "Power"
 msgstr "Potenza"
 
 #. Noise
 #: i18n/english/luasrc/i18n/admin-core.en.lua:331
-msgid "noise"
+msgid "Noise"
 msgstr "Rumore"
 
 #. Signal
 #: i18n/english/luasrc/i18n/admin-core.en.lua:332
-msgid "signal"
+msgid "Signal"
 msgstr "Segnale"
 
 #. Link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:333
-msgid "link"
+msgid "Link"
 msgstr "Collegamento"
 
 #. <abbr title=\"Fragmentation\">Frag.</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:334
-msgid "frag"
+msgid "<abbr title=\"Fragmentation\">Frag.</abbr>"
 msgstr "<abbr title=\"Fragmentation\">Framm.</abbr>"
 
 #. <abbr title=\"Request To Send\">RTS</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:335
-msgid "rts"
+msgid "<abbr title=\"Request To Send\">RTS</abbr>"
 msgstr "<abbr title=\"Request To Send\">RTS</abbr>"
 
 #. Bitrate
 #: i18n/english/luasrc/i18n/admin-core.en.lua:336
-msgid "bitrate"
+msgid "Bitrate"
 msgstr "Bitrate"
 
 #. automatically reconnect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:337
-msgid "m_n_keepalive"
+msgid "automatically reconnect"
 msgstr "riconnetti automaticamente"
 
 #. disconnect when idle for
 #: i18n/english/luasrc/i18n/admin-core.en.lua:338
-msgid "m_n_dialondemand"
+msgid "disconnect when idle for"
 msgstr "disconnetti quando non usata per"
 
 #. <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:339
-msgid "m_n_pptp_server"
+msgid "<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"
 msgstr "Server <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>"
 
 #. <abbr title=\"Light Emitting Diode\">LED</abbr> Configuration
 #: i18n/english/luasrc/i18n/admin-core.en.lua:340
-msgid "leds"
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "Configurazione <abbr title=\"Light Emitting Diode\">LED</abbr>"
 
 #. Customizes the behaviour of the device <abbr title=\"Light Emitting Diode\">LED</abbr>s if possible.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:341
-msgid "leds_desc"
+msgid "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode\">LED</abbr>s if possible."
 msgstr ""
 "Personalizza la configurazione dei <abbr title=\"Light Emitting "
 "Diode\">LED</abbr> del sistema se possibile."
 
 #. <abbr title=\"Light Emitting Diode\">LED</abbr> Name
 #: i18n/english/luasrc/i18n/admin-core.en.lua:342
-msgid "system_led_name"
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr "Nome <abbr title=\"Light Emitting Diode\">LED</abbr>"
 
 #. <abbr title=\"Light Emitting Diode\">LED</abbr> Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:343
-msgid "system_led_sysfs"
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Device"
 msgstr "Dispositivo <abbr title=\"Light Emitting Diode\">LED</abbr>"
 
 #. Default state
 #: i18n/english/luasrc/i18n/admin-core.en.lua:344
-msgid "system_led_default"
+msgid "Default state"
 msgstr "Stato predefinito"
 
 #. ticked = on
 #: i18n/english/luasrc/i18n/admin-core.en.lua:345
-msgid "system_led_default_desc"
+msgid "ticked = on"
 msgstr "spuntato = on"
 
 #. Trigger
 #: i18n/english/luasrc/i18n/admin-core.en.lua:346
-msgid "system_led_trigger"
+msgid "Trigger"
 msgstr "Causa"
 
 #. None
 #: i18n/english/luasrc/i18n/admin-core.en.lua:347
-msgid "system_led_trigger_none"
+msgid "None"
 msgstr "Nessuna"
 
 #. Default On
 #: i18n/english/luasrc/i18n/admin-core.en.lua:348
-msgid "system_led_trigger_defaulton"
+msgid "Default On"
 msgstr "Predefinito on"
 
 #. Timer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:349
-msgid "system_led_trigger_timer"
+msgid "Timer"
 msgstr "Timer"
 
 #. Heartbeat (Load Average)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:350
-msgid "system_led_trigger_heartbeat"
+msgid "Heartbeat (Load Average)"
 msgstr "Battito (Carico medio)"
 
 #. Network Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:351
-msgid "system_led_trigger_netdev"
+msgid "Network Device"
 msgstr "Dispositivo di rete"
 
 #. Off-State Delay
 #: i18n/english/luasrc/i18n/admin-core.en.lua:352
-msgid "system_led_delayoff"
+msgid "Off-State Delay"
 msgstr "Tempo dello stato off"
 
 #. Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is off
 #: i18n/english/luasrc/i18n/admin-core.en.lua:353
-msgid "system_led_delayoff_desc"
+msgid "Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is off"
 msgstr ""
 "Per quanto tempo (in ms) il <abbr title=\"Light Emitting Diode\">LED</abbr> è "
 "off"
 
 #. On-State Delay
 #: i18n/english/luasrc/i18n/admin-core.en.lua:354
-msgid "system_led_delayon"
+msgid "On-State Delay"
 msgstr "Tempo dello stato on"
 
 #. Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is on
 #: i18n/english/luasrc/i18n/admin-core.en.lua:355
-msgid "system_led_delayon_desc"
+msgid "Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is on"
 msgstr ""
 "Per quanto tempo (in ms) il <abbr title=\"Light Emitting Diode\">LED</abbr> è "
 "on"
 
 #. Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:356
-msgid "system_led_dev"
+msgid "Device"
 msgstr "Dispositivo"
 
 #. Trigger Mode
 #: i18n/english/luasrc/i18n/admin-core.en.lua:357
-msgid "system_led_mode"
+msgid "Trigger Mode"
 msgstr "Modalità causa"
 
 #. Link On
 #: i18n/english/luasrc/i18n/admin-core.en.lua:358
-msgid "system_led_mode_link"
+msgid "Link On"
 msgstr "Collegamento on"
 
 #. Transmit
 #: i18n/english/luasrc/i18n/admin-core.en.lua:359
-msgid "system_led_mode_tx"
+msgid "Transmit"
 msgstr "Trasmissione"
 
 #. Receive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:360
-msgid "system_led_mode_rx"
+msgid "Receive"
 msgstr "Ricezione"
 
 #. Active
 #: i18n/english/luasrc/i18n/admin-core.en.lua:361
-msgid "network_interface_up"
+msgid "Active"
 msgstr "Attiva"
 
 #. <abbr title=\"Media Access Control\">MAC</abbr>-Address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:362
-msgid "network_interface_hwaddr"
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr "Indirizzo <abbr title=\"Media Access Control\">MAC</abbr>"
 
 #. Hardware Address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:363
-msgid "network_interface_hwaddr_desc"
+msgid "Hardware Address"
 msgstr "Hardware Address"
 
 #. Traffic
 #: i18n/english/luasrc/i18n/admin-core.en.lua:364
-msgid "network_interface_txrx"
+msgid "Traffic"
 msgstr "Traffico"
 
 #. transmitted / received
 #: i18n/english/luasrc/i18n/admin-core.en.lua:365
-msgid "network_interface_txrx_desc"
+msgid "transmitted / received"
 msgstr "transmessi / ricevuti"
 
 #. Errors
 #: i18n/english/luasrc/i18n/admin-core.en.lua:366
-msgid "network_interface_err"
+msgid "Errors"
 msgstr "Errori"
 
 #. TX / RX
 #: i18n/english/luasrc/i18n/admin-core.en.lua:367
-msgid "network_interface_err_desc"
+msgid "TX / RX"
 msgstr "TX / RX"
 
 #. Create / Assign firewall-zone
 #: i18n/english/luasrc/i18n/admin-core.en.lua:368
-msgid "network_interface_fwzone"
+msgid "Create / Assign firewall-zone"
 msgstr "Crea / Assegna zona firewall"
 
 #. This interface does not belong to any firewall zone yet.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:369
-msgid "network_interface_fwzone_desc"
+msgid "Choose the firewall zone you want to assign to this interface. Select <em>unspecified</em> to remove the interface from the associated zone or fill out the <em>create</em> field to define a new zone and attach the interface to it."
 msgstr "Questa interfaccia non appartiene a nessuna zona del firewall ancora."
 
 #. Processes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:370
-msgid "process_head"
+msgid "Processes"
 msgstr "Processi"
 
 #. This list gives an overview over currently running system processes and their status.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:371
-msgid "process_descr"
+msgid "This list gives an overview over currently running system processes and their status."
 msgstr ""
 "Questa lista da un riassunto dei processi correntemente attivi e del loro "
 "stato."
 
 #. PID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:372
-msgid "process_pid"
+msgid "PID"
 msgstr "PID"
 
 #. Owner
 #: i18n/english/luasrc/i18n/admin-core.en.lua:373
-msgid "process_owner"
+msgid "Owner"
 msgstr "Proprietario"
 
 #. Command
 #: i18n/english/luasrc/i18n/admin-core.en.lua:374
-msgid "process_command"
+msgid "Command"
 msgstr "Comando"
 
 #. CPU usage (%)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:375
-msgid "process_cpu"
+msgid "CPU usage (%)"
 msgstr "Uso CPU (%)"
 
 #. Memory usage (%)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:376
-msgid "process_mem"
+msgid "Memory usage (%)"
 msgstr "Uso Memory (%)"
 
 #. Hang Up
 #: i18n/english/luasrc/i18n/admin-core.en.lua:377
-msgid "process_hup"
+msgid "Hang Up"
 msgstr "Hangup"
 
 #. Terminate
 #: i18n/english/luasrc/i18n/admin-core.en.lua:378
-msgid "process_term"
+msgid "Terminate"
 msgstr "Termina"
 
 #. Kill
 #: i18n/english/luasrc/i18n/admin-core.en.lua:379
-msgid "process_kill"
+msgid "Kill"
 msgstr "Uccidi"
 
 #. cached
 #: i18n/english/luasrc/i18n/admin-core.en.lua:380
-msgid "mem_cached"
+msgid "cached"
 msgstr "in cache"
 
 #. buffered
 #: i18n/english/luasrc/i18n/admin-core.en.lua:381
-msgid "mem_buffered"
+msgid "buffered"
 msgstr "in buffer"
 
 #. free
 #: i18n/english/luasrc/i18n/admin-core.en.lua:382
-msgid "mem_free"
+msgid "free"
 msgstr "libera"
 
 #. Scheduled Tasks
 #: i18n/english/luasrc/i18n/admin-core.en.lua:383
-msgid "a_s_crontab"
+msgid "Scheduled Tasks"
 msgstr "Operazioni programmate"
 
 #. This is the system crontab in which scheduled tasks can be defined.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:384
-msgid "a_s_crontab1"
+msgid "This is the system crontab in which scheduled tasks can be defined."
 msgstr ""
 "Questa è la crontab del sistema nella quale possono essere definiti le "
 "operazioni da programmare."
 
 #. NAS ID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:385
-msgid "a_w_nasid"
+msgid "NAS ID"
 msgstr "ID della NAS"
 
 #. Path to CA-Certificate
 #: i18n/english/luasrc/i18n/admin-core.en.lua:386
-msgid "a_w_cacert"
+msgid "Path to CA-Certificate"
 msgstr "Percorso al certificato CA"
 
 #. EAP-Method
 #: i18n/english/luasrc/i18n/admin-core.en.lua:387
-msgid "a_w_eaptype"
+msgid "EAP-Method"
 msgstr "Metodo EAP"
 
 #. Path to Private Key
 #: i18n/english/luasrc/i18n/admin-core.en.lua:388
-msgid "a_w_tlsprivkey"
+msgid "Path to Private Key"
 msgstr "Percorso alla chiave privata"
 
 #. Password of Private Key
 #: i18n/english/luasrc/i18n/admin-core.en.lua:389
-msgid "a_w_tlsprivkeypwd"
+msgid "Password of Private Key"
 msgstr "Password della chiave privata"
 
 #. Authentication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:390
-msgid "a_w_peapauth"
+msgid "Authentication"
 msgstr "Autenticazione PEAP"
 
 #. Identity
 #: i18n/english/luasrc/i18n/admin-core.en.lua:391
-msgid "a_w_peapidentity"
+msgid "Identity"
 msgstr "Identità PEAP"
 
 #. Password
 #: i18n/english/luasrc/i18n/admin-core.en.lua:392
-msgid "a_w_peappassword"
+msgid "Password"
 msgstr "Password PEAP"
 
 #. Create Network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:393
-msgid "a_w_create"
+msgid "Create Network"
 msgstr "Crea rete"
 
 #. Hostnames
 #: i18n/english/luasrc/i18n/admin-core.en.lua:394
-msgid "hostnames"
+msgid "Hostnames"
 msgstr "Hostname"
 
 #. Host entries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:395
-msgid "hostnames_entries"
+msgid "Host entries"
 msgstr "Campi host"
 
 #. Hostname
 #: i18n/english/luasrc/i18n/admin-core.en.lua:396
-msgid "hostnames_hostname"
+msgid "Hostname"
 msgstr "Hostname"
 
 #. IP address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:397
-msgid "hostnames_address"
+msgid "IP address"
 msgstr "Indirizzo IP"
 
 #. Clamp Segment Size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:398
-msgid "m_n_mssfix"
+msgid "Clamp Segment Size"
 msgstr "Clamp Segment Size"
 
 #. Fixes problems with unreachable websites, submitting forms or other unexpected behaviour for some ISPs.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:399
-msgid "m_n_mssfix_desc"
+msgid "Fixes problems with unreachable websites, submitting forms or other unexpected behaviour for some ISPs."
 msgstr ""
 "Fixes problems with unreachable websites, submitting forms or other "
 "unexpected behaviour for some ISPs."
 
 #. Flash Firmware
 #: i18n/english/luasrc/i18n/admin-core.en.lua:400
-msgid "admin_upgrade"
+msgid "Flash Firmware"
 msgstr "Flash Firmware"
 
 #. The uploaded image file does not contain a supported format. Make sure that you choose the generic image format for your platform.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:401
-msgid "admin_upgrade_badimage"
+msgid "The uploaded image file does not contain a supported format. Make sure that you choose the generic image format for your platform."
 msgstr ""
 "The uploaded image file does not contain a supported format. Make sure that "
 "you choose the generic image format for your platform."
 
 #. Checksum
 #: i18n/english/luasrc/i18n/admin-core.en.lua:402
-msgid "admin_upgrade_checksum"
+msgid "Checksum"
 msgstr "Checksum"
 
 #. Upload an OpenWrt image file to reflash the device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:403
-msgid "admin_upgrade_desc"
+msgid "Upload an OpenWrt image file to reflash the device."
 msgstr "Upload an OpenWrt image file to reflash the device."
 
 #. Size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:404
-msgid "admin_upgrade_filesize"
+msgid "Size"
 msgstr "Size"
 
 #. Firmware image
 #: i18n/english/luasrc/i18n/admin-core.en.lua:405
-msgid "admin_upgrade_fwimage"
+msgid "Firmware image"
 msgstr "Firmware image"
 
 #. Keep configuration files
 #: i18n/english/luasrc/i18n/admin-core.en.lua:406
-msgid "admin_upgrade_keepcfg"
+msgid "Keep configuration files"
 msgstr "Keep configuration files"
 
 #. Sorry. OpenWrt does not support a system upgrade on this platform.<br /> You need to manually flash your device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:407
-msgid "admin_upgrade_nosupport"
+msgid "Sorry. OpenWrt does not support a system upgrade on this platform.<br /> You need to manually flash your device."
 msgstr ""
 "Sorry. OpenWrt does not support a system upgrade on this platform.<br /> You "
 "need to manually flash your device."
 
 #. The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a few minutes until you try to reconnect. It might be necessary to renew the address of your computer to reach the device again, depending on your settings.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:408
-msgid "admin_upgrade_running"
+msgid "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a few minutes until you try to reconnect. It might be necessary to renew the address of your computer to reach the device again, depending on your settings."
 msgstr ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
 "few minutes until you try to reconnect. It might be necessary to renew the "
@@ -2277,19 +2277,19 @@ msgstr ""
 
 #.  (%s available)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:409
-msgid "admin_upgrade_spaceavail"
+msgid " (%s available)"
 msgstr " (%s available)"
 
 #. It appears that you try to flash an image that does not fit into the flash memory, please verify the image file!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:410
-msgid "admin_upgrade_toolarge"
+msgid "It appears that you try to flash an image that does not fit into the flash memory, please verify the image file!"
 msgstr ""
 "It appears that you try to flash an image that does not fit into the flash "
 "memory, please verify the image file!"
 
 #. Upload image
 #: i18n/english/luasrc/i18n/admin-core.en.lua:411
-msgid "admin_upgrade_upload"
+msgid "Upload image"
 msgstr "Upload image"
 
 #. The flash image was uploaded. Below is the checksum and file size listed, compare them with the original file to ensure data integrity.<br /> Click \"Proceed\" below to start the flash procedure.
diff --git a/po/it/asterisk.po b/po/it/asterisk.po
index 9af630f92..b47d78179 100644
--- a/po/it/asterisk.po
+++ b/po/it/asterisk.po
@@ -14,1252 +14,1252 @@ msgstr ""
 
 #. Asterisk General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:1
-msgid "asterisk_asterisk"
+msgid "Asterisk General Options"
 msgstr ""
 
 #. AGI directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:2
-msgid "asterisk_asterisk_agidir"
+msgid "AGI directory"
 msgstr ""
 
 #. Cache recorded sound files during recording
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:3
-msgid "asterisk_asterisk_cacherecordfiles"
+msgid "Cache recorded sound files during recording"
 msgstr ""
 
 #. Debug Level
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:4
-msgid "asterisk_asterisk_debug"
+msgid "Debug Level"
 msgstr ""
 
 #. Disable some warnings
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:5
-msgid "asterisk_asterisk_dontwarn"
+msgid "Disable some warnings"
 msgstr ""
 
 #. Dump core on crash
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:6
-msgid "asterisk_asterisk_dumpcore"
+msgid "Dump core on crash"
 msgstr ""
 
 #. High Priority
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:7
-msgid "asterisk_asterisk_highpriority"
+msgid "High Priority"
 msgstr ""
 
 #. Initialise Crypto
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:8
-msgid "asterisk_asterisk_initcrypto"
+msgid "Initialise Crypto"
 msgstr ""
 
 #. Use Internal Timing
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:9
-msgid "asterisk_asterisk_internaltiming"
+msgid "Use Internal Timing"
 msgstr ""
 
 #. Log directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:10
-msgid "asterisk_asterisk_logdir"
+msgid "Log directory"
 msgstr ""
 
 #. Maximum number of calls allowed
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:11
-msgid "asterisk_asterisk_maxcalls"
+msgid "Maximum number of calls allowed"
 msgstr ""
 
 #. Maximum load to stop accepting new calls
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:12
-msgid "asterisk_asterisk_maxload"
+msgid "Maximum load to stop accepting new calls"
 msgstr ""
 
 #. Disable console colors
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:13
-msgid "asterisk_asterisk_nocolor"
+msgid "Disable console colors"
 msgstr ""
 
 #. Sound files Cache directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:14
-msgid "asterisk_asterisk_recordcachedir"
+msgid "Sound files Cache directory"
 msgstr ""
 
 #. The Group to run as
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:15
-msgid "asterisk_asterisk_rungroup"
+msgid "The Group to run as"
 msgstr ""
 
 #. The User to run as
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:16
-msgid "asterisk_asterisk_runuser"
+msgid "The User to run as"
 msgstr ""
 
 #. Voicemail Spool directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:17
-msgid "asterisk_asterisk_spooldir"
+msgid "Voicemail Spool directory"
 msgstr ""
 
 #. Prefix UniquID with system name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:18
-msgid "asterisk_asterisk_systemname"
+msgid "Prefix UniquID with system name"
 msgstr ""
 
 #. Build transcode paths via SLINEAR, not directly
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:19
-msgid "asterisk_asterisk_transcodeviasln"
+msgid "Build transcode paths via SLINEAR, not directly"
 msgstr ""
 
 #. Transmit SLINEAR silence while recording a channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:20
-msgid "asterisk_asterisk_transmitsilenceduringrecord"
+msgid "Transmit SLINEAR silence while recording a channel"
 msgstr ""
 
 #. Verbose Level
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:21
-msgid "asterisk_asterisk_verbose"
+msgid "Verbose Level"
 msgstr ""
 
 #. Time Zone
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:22
-msgid "asterisk_asterisk_zone"
+msgid "Time Zone"
 msgstr ""
 
 #. Section dialplan
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:23
-msgid "asterisk_dialplan"
+msgid "Section dialplan"
 msgstr ""
 
 #. include
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:24
-msgid "asterisk_dialplan_include"
+msgid "include"
 msgstr ""
 
 #. Dialplan Extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:25
-msgid "asterisk_dialplanexten"
+msgid "Dialplan Extension"
 msgstr ""
 
 #. Dialplan General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:26
-msgid "asterisk_dialplangeneral"
+msgid "Dialplan General Options"
 msgstr ""
 
 #. Allow transfer
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:27
-msgid "asterisk_dialplangeneral_allowtransfer"
+msgid "Allow transfer"
 msgstr ""
 
 #. Reinvite/redirect media connections
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:28
-msgid "asterisk_dialplangeneral_canreinvite"
+msgid "Reinvite/redirect media connections"
 msgstr ""
 
 #. Clear global vars
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:29
-msgid "asterisk_dialplangeneral_clearglobalvars"
+msgid "Clear global vars"
 msgstr ""
 
 #. Dialplan Goto
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:30
-msgid "asterisk_dialplangoto"
+msgid "Dialplan Goto"
 msgstr ""
 
 #. Dialplan Conference
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:31
-msgid "asterisk_dialplanmeetme"
+msgid "Dialplan Conference"
 msgstr ""
 
 #. Dialplan Time
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:32
-msgid "asterisk_dialplansaytime"
+msgid "Dialplan Time"
 msgstr ""
 
 #. Dialplan Voicemail
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:33
-msgid "asterisk_dialplanvoice"
+msgid "Dialplan Voicemail"
 msgstr ""
 
 #. Dial Zones for Dialplan
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:34
-msgid "asterisk_dialzone"
+msgid "Dial Zones for Dialplan"
 msgstr ""
 
 #. Prefix to add matching dialplans
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:35
-msgid "asterisk_dialzone_addprefix"
+msgid "Prefix to add matching dialplans"
 msgstr ""
 
 #. Match International prefix
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:36
-msgid "asterisk_dialzone_international"
+msgid "Match International prefix"
 msgstr ""
 
 #. Prefix (0) to add/remove to/from international numbers
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:37
-msgid "asterisk_dialzone_localprefix"
+msgid "Prefix (0) to add/remove to/from international numbers"
 msgstr ""
 
 #. localzone
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:38
-msgid "asterisk_dialzone_localzone"
+msgid "localzone"
 msgstr ""
 
 #. Match plan
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:39
-msgid "asterisk_dialzone_match"
+msgid "Match plan"
 msgstr ""
 
 #. Connection to use
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:40
-msgid "asterisk_dialzone_uses"
+msgid "Connection to use"
 msgstr ""
 
 #. Feature Key maps
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:41
-msgid "asterisk_featuremap"
+msgid "Feature Key maps"
 msgstr ""
 
 #. Attended transfer key
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:42
-msgid "asterisk_featuremap_atxfer"
+msgid "Attended transfer key"
 msgstr ""
 
 #. Blind transfer key
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:43
-msgid "asterisk_featuremap_blindxfer"
+msgid "Blind transfer key"
 msgstr ""
 
 #. Key to Disconnect call
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:44
-msgid "asterisk_featuremap_disconnect"
+msgid "Key to Disconnect call"
 msgstr ""
 
 #. Key to Park call
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:45
-msgid "asterisk_featuremap_parkcall"
+msgid "Key to Park call"
 msgstr ""
 
 #. Parking Feature
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:46
-msgid "asterisk_featurepark"
+msgid "Parking Feature"
 msgstr ""
 
 #. ADSI Park
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:47
-msgid "asterisk_featurepark_adsipark"
+msgid "ADSI Park"
 msgstr ""
 
 #. Attended transfer timeout (sec)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:48
-msgid "asterisk_featurepark_atxfernoanswertimeout"
+msgid "Attended transfer timeout (sec)"
 msgstr ""
 
 #. One touch record key
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:49
-msgid "asterisk_featurepark_automon"
+msgid "One touch record key"
 msgstr ""
 
 #. Name of call context for parking
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:50
-msgid "asterisk_featurepark_context"
+msgid "Name of call context for parking"
 msgstr ""
 
 #. Sound file to play to parked caller
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:51
-msgid "asterisk_featurepark_courtesytone"
+msgid "Sound file to play to parked caller"
 msgstr ""
 
 #. Max time (ms) between digits for feature activation
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:52
-msgid "asterisk_featurepark_featuredigittimeout"
+msgid "Max time (ms) between digits for feature activation"
 msgstr ""
 
 #. Method to Find Parking slot
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:53
-msgid "asterisk_featurepark_findslot"
+msgid "Method to Find Parking slot"
 msgstr ""
 
 #. parkedmusicclass
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:54
-msgid "asterisk_featurepark_parkedmusicclass"
+msgid "parkedmusicclass"
 msgstr ""
 
 #. Play courtesy tone to
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:55
-msgid "asterisk_featurepark_parkedplay"
+msgid "Play courtesy tone to"
 msgstr ""
 
 #. Enable Parking
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:56
-msgid "asterisk_featurepark_parkenabled"
+msgid "Enable Parking"
 msgstr ""
 
 #. Extension to dial to park
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:57
-msgid "asterisk_featurepark_parkext"
+msgid "Extension to dial to park"
 msgstr ""
 
 #. Parking time (secs)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:58
-msgid "asterisk_featurepark_parkingtime"
+msgid "Parking time (secs)"
 msgstr ""
 
 #. Range of extensions for call parking
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:59
-msgid "asterisk_featurepark_parkpos"
+msgid "Range of extensions for call parking"
 msgstr ""
 
 #. Pickup extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:60
-msgid "asterisk_featurepark_pickupexten"
+msgid "Pickup extension"
 msgstr ""
 
 #. Seconds to wait bewteen digits when transferring
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:61
-msgid "asterisk_featurepark_transferdigittimeout"
+msgid "Seconds to wait bewteen digits when transferring"
 msgstr ""
 
 #. sound when attended transfer is complete
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:62
-msgid "asterisk_featurepark_xferfailsound"
+msgid "sound when attended transfer is complete"
 msgstr ""
 
 #. Sound when attended transfer fails
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:63
-msgid "asterisk_featurepark_xfersound"
+msgid "Sound when attended transfer fails"
 msgstr ""
 
 #. Reload Hardware Config
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:64
-msgid "asterisk_hardwarereboot"
+msgid "Reload Hardware Config"
 msgstr ""
 
 #. Reboot Method
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:65
-msgid "asterisk_hardwarereboot_method"
+msgid "Reboot Method"
 msgstr ""
 
 #. Parameter
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:66
-msgid "asterisk_hardwarereboot_param"
+msgid "Parameter"
 msgstr ""
 
 #. SIP Connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:67
-msgid "asterisk_iax"
+msgid "SIP Connection"
 msgstr ""
 
 #. Always Dial International
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:68
-msgid "asterisk_iax_alwaysinternational"
+msgid "Always Dial International"
 msgstr ""
 
 #. context
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:69
-msgid "asterisk_iax_context"
+msgid "context"
 msgstr ""
 
 #. Country Code for connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:70
-msgid "asterisk_iax_countrycode"
+msgid "Country Code for connection"
 msgstr ""
 
 #. Add as Extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:71
-msgid "asterisk_iax_extension"
+msgid "Add as Extension"
 msgstr ""
 
 #. Host name (or blank)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:72
-msgid "asterisk_iax_host"
+msgid "Host name (or blank)"
 msgstr ""
 
 #. International Dial Prefix
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:73
-msgid "asterisk_iax_internationalprefix"
+msgid "International Dial Prefix"
 msgstr ""
 
 #. Dial Prefix (for external line)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:74
-msgid "asterisk_iax_prefix"
+msgid "Dial Prefix (for external line)"
 msgstr ""
 
 #. Secret
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:75
-msgid "asterisk_iax_secret"
+msgid "Secret"
 msgstr ""
 
 #. Dial Timeout (sec)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:76
-msgid "asterisk_iax_timeout"
+msgid "Dial Timeout (sec)"
 msgstr ""
 
 #. Option type
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:77
-msgid "asterisk_iax_type"
+msgid "Option type"
 msgstr ""
 
 #. User name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:78
-msgid "asterisk_iax_username"
+msgid "User name"
 msgstr ""
 
 #. IAX General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:79
-msgid "asterisk_iaxgeneral"
+msgid "IAX General Options"
 msgstr ""
 
 #. Allow Codecs
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:80
-msgid "asterisk_iaxgeneral_allow"
+msgid "Allow Codecs"
 msgstr ""
 
 #. Reinvite/redirect media connections
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:81
-msgid "asterisk_iaxgeneral_canreinvite"
+msgid "Reinvite/redirect media connections"
 msgstr ""
 
 #. Static
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:82
-msgid "asterisk_iaxgeneral_static"
+msgid "Static"
 msgstr ""
 
 #. Write Protect
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:83
-msgid "asterisk_iaxgeneral_writeprotect"
+msgid "Write Protect"
 msgstr ""
 
 #. Meetme Conference
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:84
-msgid "asterisk_meetme"
+msgid "Meetme Conference"
 msgstr ""
 
 #. Admin PIN
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:85
-msgid "asterisk_meetme_adminpin"
+msgid "Admin PIN"
 msgstr ""
 
 #. Meeting PIN
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:86
-msgid "asterisk_meetme_pin"
+msgid "Meeting PIN"
 msgstr ""
 
 #. Meetme Conference General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:87
-msgid "asterisk_meetmegeneral"
+msgid "Meetme Conference General Options"
 msgstr ""
 
 #. Number of 20ms audio buffers to be used
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:88
-msgid "asterisk_meetmegeneral_audiobuffers"
+msgid "Number of 20ms audio buffers to be used"
 msgstr ""
 
 #. Modules
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:89
-msgid "asterisk_module"
+msgid "Modules"
 msgstr ""
 
 #. Alarm Receiver Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:90
-msgid "asterisk_module_appalarmreceiver"
+msgid "Alarm Receiver Application"
 msgstr ""
 
 #. Authentication Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:91
-msgid "asterisk_module_appauthenticate"
+msgid "Authentication Application"
 msgstr ""
 
 #. Make sure asterisk doesnt save CDR
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:92
-msgid "asterisk_module_appcdr"
+msgid "Make sure asterisk doesnt save CDR"
 msgstr ""
 
 #. Check if channel is available
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:93
-msgid "asterisk_module_appchanisavail"
+msgid "Check if channel is available"
 msgstr ""
 
 #. Listen in on any channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:94
-msgid "asterisk_module_appchanspy"
+msgid "Listen in on any channel"
 msgstr ""
 
 #. Control Playback Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:95
-msgid "asterisk_module_appcontrolplayback"
+msgid "Control Playback Application"
 msgstr ""
 
 #. Cuts up variables
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:96
-msgid "asterisk_module_appcut"
+msgid "Cuts up variables"
 msgstr ""
 
 #. Database access functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:97
-msgid "asterisk_module_appdb"
+msgid "Database access functions"
 msgstr ""
 
 #. Dialing Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:98
-msgid "asterisk_module_appdial"
+msgid "Dialing Application"
 msgstr ""
 
 #. Virtual Dictation Machine Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:99
-msgid "asterisk_module_appdictate"
+msgid "Virtual Dictation Machine Application"
 msgstr ""
 
 #. Directed Call Pickup Support
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:100
-msgid "asterisk_module_appdirectedpickup"
+msgid "Directed Call Pickup Support"
 msgstr ""
 
 #. Extension Directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:101
-msgid "asterisk_module_appdirectory"
+msgid "Extension Directory"
 msgstr ""
 
 #. DISA (Direct Inward System Access) Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:102
-msgid "asterisk_module_appdisa"
+msgid "DISA (Direct Inward System Access) Application"
 msgstr ""
 
 #. Dump channel variables Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:103
-msgid "asterisk_module_appdumpchan"
+msgid "Dump channel variables Application"
 msgstr ""
 
 #. Simple Echo Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:104
-msgid "asterisk_module_appecho"
+msgid "Simple Echo Application"
 msgstr ""
 
 #. ENUM Lookup
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:105
-msgid "asterisk_module_appenumlookup"
+msgid "ENUM Lookup"
 msgstr ""
 
 #. Reevaluates strings
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:106
-msgid "asterisk_module_appeval"
+msgid "Reevaluates strings"
 msgstr ""
 
 #. Executes applications
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:107
-msgid "asterisk_module_appexec"
+msgid "Executes applications"
 msgstr ""
 
 #. External IVR application interface
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:108
-msgid "asterisk_module_appexternalivr"
+msgid "External IVR application interface"
 msgstr ""
 
 #. Fork The CDR into 2 seperate entities
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:109
-msgid "asterisk_module_appforkcdr"
+msgid "Fork The CDR into 2 seperate entities"
 msgstr ""
 
 #. Get ADSI CPE ID
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:110
-msgid "asterisk_module_appgetcpeid"
+msgid "Get ADSI CPE ID"
 msgstr ""
 
 #. Group Management Routines
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:111
-msgid "asterisk_module_appgroupcount"
+msgid "Group Management Routines"
 msgstr ""
 
 #. Encode and Stream via icecast and ices
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:112
-msgid "asterisk_module_appices"
+msgid "Encode and Stream via icecast and ices"
 msgstr ""
 
 #. Image Transmission Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:113
-msgid "asterisk_module_appimage"
+msgid "Image Transmission Application"
 msgstr ""
 
 #. Look up Caller*ID name/number from black
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:114
-msgid "asterisk_module_applookupblacklist"
+msgid "Look up Caller*ID name/number from black"
 msgstr ""
 
 #. Look up CallerID Name from local databas
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:115
-msgid "asterisk_module_applookupcidname"
+msgid "Look up CallerID Name from local databas"
 msgstr ""
 
 #. Extension Macros
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:116
-msgid "asterisk_module_appmacro"
+msgid "Extension Macros"
 msgstr ""
 
 #. A simple math Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:117
-msgid "asterisk_module_appmath"
+msgid "A simple math Application"
 msgstr ""
 
 #. MD5 checksum Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:118
-msgid "asterisk_module_appmd5"
+msgid "MD5 checksum Application"
 msgstr ""
 
 #. Digital Milliwatt (mu-law) Test Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:119
-msgid "asterisk_module_appmilliwatt"
+msgid "Digital Milliwatt (mu-law) Test Application"
 msgstr ""
 
 #. Record a call and mix the audio during the recording
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:120
-msgid "asterisk_module_appmixmonitor"
+msgid "Record a call and mix the audio during the recording"
 msgstr ""
 
 #. Call Parking and Announce Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:121
-msgid "asterisk_module_appparkandannounce"
+msgid "Call Parking and Announce Application"
 msgstr ""
 
 #. Trivial Playback Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:122
-msgid "asterisk_module_appplayback"
+msgid "Trivial Playback Application"
 msgstr ""
 
 #. Require phone number to be entered
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:123
-msgid "asterisk_module_appprivacy"
+msgid "Require phone number to be entered"
 msgstr ""
 
 #. True Call Queueing
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:124
-msgid "asterisk_module_appqueue"
+msgid "True Call Queueing"
 msgstr ""
 
 #. Random goto
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:125
-msgid "asterisk_module_apprandom"
+msgid "Random goto"
 msgstr ""
 
 #. Read Variable Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:126
-msgid "asterisk_module_appread"
+msgid "Read Variable Application"
 msgstr ""
 
 #. Read in a file
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:127
-msgid "asterisk_module_appreadfile"
+msgid "Read in a file"
 msgstr ""
 
 #. Realtime Data Lookup/Rewrite
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:128
-msgid "asterisk_module_apprealtime"
+msgid "Realtime Data Lookup/Rewrite"
 msgstr ""
 
 #. Trivial Record Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:129
-msgid "asterisk_module_apprecord"
+msgid "Trivial Record Application"
 msgstr ""
 
 #. Say time
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:130
-msgid "asterisk_module_appsayunixtime"
+msgid "Say time"
 msgstr ""
 
 #. Send DTMF digits Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:131
-msgid "asterisk_module_appsenddtmf"
+msgid "Send DTMF digits Application"
 msgstr ""
 
 #. Send Text Applications
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:132
-msgid "asterisk_module_appsendtext"
+msgid "Send Text Applications"
 msgstr ""
 
 #. Set CallerID Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:133
-msgid "asterisk_module_appsetcallerid"
+msgid "Set CallerID Application"
 msgstr ""
 
 #. CDR user field apps
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:134
-msgid "asterisk_module_appsetcdruserfield"
+msgid "CDR user field apps"
 msgstr ""
 
 #. load =&gt; .so ; Set CallerID Name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:135
-msgid "asterisk_module_appsetcidname"
+msgid "load => .so ; Set CallerID Name"
 msgstr ""
 
 #. load =&gt; .so ; Set CallerID Number
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:136
-msgid "asterisk_module_appsetcidnum"
+msgid "load => .so ; Set CallerID Number"
 msgstr ""
 
 #. Set RDNIS Number
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:137
-msgid "asterisk_module_appsetrdnis"
+msgid "Set RDNIS Number"
 msgstr ""
 
 #. Set ISDN Transfer Capability
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:138
-msgid "asterisk_module_appsettransfercapability"
+msgid "Set ISDN Transfer Capability"
 msgstr ""
 
 #. SMS/PSTN handler
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:139
-msgid "asterisk_module_appsms"
+msgid "SMS/PSTN handler"
 msgstr ""
 
 #. Hangs up the requested channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:140
-msgid "asterisk_module_appsofthangup"
+msgid "Hangs up the requested channel"
 msgstr ""
 
 #. Stack Routines
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:141
-msgid "asterisk_module_appstack"
+msgid "Stack Routines"
 msgstr ""
 
 #. Generic System() application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:142
-msgid "asterisk_module_appsystem"
+msgid "Generic System() application"
 msgstr ""
 
 #. Playback with Talk Detection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:143
-msgid "asterisk_module_apptalkdetect"
+msgid "Playback with Talk Detection"
 msgstr ""
 
 #. Interface Test Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:144
-msgid "asterisk_module_apptest"
+msgid "Interface Test Application"
 msgstr ""
 
 #. Transfer
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:145
-msgid "asterisk_module_apptransfer"
+msgid "Transfer"
 msgstr ""
 
 #. TXTCIDName
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:146
-msgid "asterisk_module_apptxtcidname"
+msgid "TXTCIDName"
 msgstr ""
 
 #. Send URL Applications
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:147
-msgid "asterisk_module_appurl"
+msgid "Send URL Applications"
 msgstr ""
 
 #. Custom User Event Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:148
-msgid "asterisk_module_appuserevent"
+msgid "Custom User Event Application"
 msgstr ""
 
 #. Send verbose output
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:149
-msgid "asterisk_module_appverbose"
+msgid "Send verbose output"
 msgstr ""
 
 #. Voicemail
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:150
-msgid "asterisk_module_appvoicemail"
+msgid "Voicemail"
 msgstr ""
 
 #. Waits until first ring after time
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:151
-msgid "asterisk_module_appwaitforring"
+msgid "Waits until first ring after time"
 msgstr ""
 
 #. Wait For Silence Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:152
-msgid "asterisk_module_appwaitforsilence"
+msgid "Wait For Silence Application"
 msgstr ""
 
 #. While Loops and Conditional Execution
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:153
-msgid "asterisk_module_appwhile"
+msgid "While Loops and Conditional Execution"
 msgstr ""
 
 #. Comma Separated Values CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:154
-msgid "asterisk_module_cdrcsv"
+msgid "Comma Separated Values CDR Backend"
 msgstr ""
 
 #. Customizable Comma Separated Values CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:155
-msgid "asterisk_module_cdrcustom"
+msgid "Customizable Comma Separated Values CDR Backend"
 msgstr ""
 
 #. Asterisk Call Manager CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:156
-msgid "asterisk_module_cdrmanager"
+msgid "Asterisk Call Manager CDR Backend"
 msgstr ""
 
 #. MySQL CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:157
-msgid "asterisk_module_cdrmysql"
+msgid "MySQL CDR Backend"
 msgstr ""
 
 #. PostgreSQL CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:158
-msgid "asterisk_module_cdrpgsql"
+msgid "PostgreSQL CDR Backend"
 msgstr ""
 
 #. SQLite CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:159
-msgid "asterisk_module_cdrsqlite"
+msgid "SQLite CDR Backend"
 msgstr ""
 
 #. Agent Proxy Channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:160
-msgid "asterisk_module_chanagent"
+msgid "Agent Proxy Channel"
 msgstr ""
 
 #. Channel driver for GTalk
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:161
-msgid "asterisk_module_chanalsa"
+msgid "Channel driver for GTalk"
 msgstr ""
 
 #. Channel driver for GTalk
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:162
-msgid "asterisk_module_changtalk"
+msgid "Channel driver for GTalk"
 msgstr ""
 
 #. Option chan_iax2
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:163
-msgid "asterisk_module_chaniax2"
+msgid "Option chan_iax2"
 msgstr ""
 
 #. Local Proxy Channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:164
-msgid "asterisk_module_chanlocal"
+msgid "Local Proxy Channel"
 msgstr ""
 
 #. Session Initiation Protocol (SIP)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:165
-msgid "asterisk_module_chansip"
+msgid "Session Initiation Protocol (SIP)"
 msgstr ""
 
 #. Adaptive Differential PCM Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:166
-msgid "asterisk_module_codecadpcm"
+msgid "Adaptive Differential PCM Coder/Decoder"
 msgstr ""
 
 #. A-law Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:167
-msgid "asterisk_module_codecalaw"
+msgid "A-law Coder/Decoder"
 msgstr ""
 
 #. A-law and Mulaw direct Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:168
-msgid "asterisk_module_codecamu"
+msgid "A-law and Mulaw direct Coder/Decoder"
 msgstr ""
 
 #. ITU G.726-32kbps G726 Transcoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:169
-msgid "asterisk_module_codecg726"
+msgid "ITU G.726-32kbps G726 Transcoder"
 msgstr ""
 
 #. GSM/PCM16 (signed linear) Codec Translation
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:170
-msgid "asterisk_module_codecgsm"
+msgid "GSM/PCM16 (signed linear) Codec Translation"
 msgstr ""
 
 #. Speex/PCM16 (signed linear) Codec Translator
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:171
-msgid "asterisk_module_codecspeex"
+msgid "Speex/PCM16 (signed linear) Codec Translator"
 msgstr ""
 
 #. Mu-law Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:172
-msgid "asterisk_module_codeculaw"
+msgid "Mu-law Coder/Decoder"
 msgstr ""
 
 #. Sun Microsystems AU format (signed linear)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:173
-msgid "asterisk_module_formatau"
+msgid "Sun Microsystems AU format (signed linear)"
 msgstr ""
 
 #. G.723.1 Simple Timestamp File Format
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:174
-msgid "asterisk_module_formatg723"
+msgid "G.723.1 Simple Timestamp File Format"
 msgstr ""
 
 #. Raw G.726 (16/24/32/40kbps) data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:175
-msgid "asterisk_module_formatg726"
+msgid "Raw G.726 (16/24/32/40kbps) data"
 msgstr ""
 
 #. Raw G729 data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:176
-msgid "asterisk_module_formatg729"
+msgid "Raw G729 data"
 msgstr ""
 
 #. Raw GSM data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:177
-msgid "asterisk_module_formatgsm"
+msgid "Raw GSM data"
 msgstr ""
 
 #. Raw h263 data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:178
-msgid "asterisk_module_formath263"
+msgid "Raw h263 data"
 msgstr ""
 
 #. JPEG (Joint Picture Experts Group) Image
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:179
-msgid "asterisk_module_formatjpeg"
+msgid "JPEG (Joint Picture Experts Group) Image"
 msgstr ""
 
 #. Raw uLaw 8khz Audio support (PCM)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:180
-msgid "asterisk_module_formatpcm"
+msgid "Raw uLaw 8khz Audio support (PCM)"
 msgstr ""
 
 #. load =&gt; .so ; Raw aLaw 8khz PCM Audio support
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:181
-msgid "asterisk_module_formatpcmalaw"
+msgid "load => .so ; Raw aLaw 8khz PCM Audio support"
 msgstr ""
 
 #. Raw Signed Linear Audio support (SLN)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:182
-msgid "asterisk_module_formatsln"
+msgid "Raw Signed Linear Audio support (SLN)"
 msgstr ""
 
 #. Dialogic VOX (ADPCM) File Format
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:183
-msgid "asterisk_module_formatvox"
+msgid "Dialogic VOX (ADPCM) File Format"
 msgstr ""
 
 #. Microsoft WAV format (8000hz Signed Line
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:184
-msgid "asterisk_module_formatwav"
+msgid "Microsoft WAV format (8000hz Signed Line"
 msgstr ""
 
 #. Microsoft WAV format (Proprietary GSM)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:185
-msgid "asterisk_module_formatwavgsm"
+msgid "Microsoft WAV format (Proprietary GSM)"
 msgstr ""
 
 #. Caller ID related dialplan functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:186
-msgid "asterisk_module_funccallerid"
+msgid "Caller ID related dialplan functions"
 msgstr ""
 
 #. ENUM Functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:187
-msgid "asterisk_module_funcenum"
+msgid "ENUM Functions"
 msgstr ""
 
 #. URI encoding / decoding functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:188
-msgid "asterisk_module_funcuri"
+msgid "URI encoding / decoding functions"
 msgstr ""
 
 #. Asterisk Extension Language Compiler
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:189
-msgid "asterisk_module_pbxael"
+msgid "Asterisk Extension Language Compiler"
 msgstr ""
 
 #. Text Extension Configuration
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:190
-msgid "asterisk_module_pbxconfig"
+msgid "Text Extension Configuration"
 msgstr ""
 
 #. load =&gt; .so ; Builtin dialplan functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:191
-msgid "asterisk_module_pbxfunctions"
+msgid "load => .so ; Builtin dialplan functions"
 msgstr ""
 
 #. Loopback Switch
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:192
-msgid "asterisk_module_pbxloopback"
+msgid "Loopback Switch"
 msgstr ""
 
 #. Realtime Switch
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:193
-msgid "asterisk_module_pbxrealtime"
+msgid "Realtime Switch"
 msgstr ""
 
 #. Outgoing Spool Support
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:194
-msgid "asterisk_module_pbxspool"
+msgid "Outgoing Spool Support"
 msgstr ""
 
 #. Wil Cal U (Auto Dialer)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:195
-msgid "asterisk_module_pbxwilcalu"
+msgid "Wil Cal U (Auto Dialer)"
 msgstr ""
 
 #. MySQL Config Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:196
-msgid "asterisk_module_resconfigmysql"
+msgid "MySQL Config Resource"
 msgstr ""
 
 #. ODBC Config Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:197
-msgid "asterisk_module_resconfigodbc"
+msgid "ODBC Config Resource"
 msgstr ""
 
 #. PGSQL Module
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:198
-msgid "asterisk_module_resconfigpgsql"
+msgid "PGSQL Module"
 msgstr ""
 
 #. Cryptographic Digital Signatures
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:199
-msgid "asterisk_module_rescrypto"
+msgid "Cryptographic Digital Signatures"
 msgstr ""
 
 #. Call Parking Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:200
-msgid "asterisk_module_resfeatures"
+msgid "Call Parking Resource"
 msgstr ""
 
 #. Indications Configuration
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:201
-msgid "asterisk_module_resindications"
+msgid "Indications Configuration"
 msgstr ""
 
 #. Call Monitoring Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:202
-msgid "asterisk_module_resmonitor"
+msgid "Call Monitoring Resource"
 msgstr ""
 
 #. Music On Hold Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:203
-msgid "asterisk_module_resmusiconhold"
+msgid "Music On Hold Resource"
 msgstr ""
 
 #. ODBC Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:204
-msgid "asterisk_module_resodbc"
+msgid "ODBC Resource"
 msgstr ""
 
 #. SMDI Module
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:205
-msgid "asterisk_module_ressmdi"
+msgid "SMDI Module"
 msgstr ""
 
 #. SNMP Module
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:206
-msgid "asterisk_module_ressnmp"
+msgid "SNMP Module"
 msgstr ""
 
 #. Music On Hold
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:207
-msgid "asterisk_moh"
+msgid "Music On Hold"
 msgstr ""
 
 #. Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:208
-msgid "asterisk_moh_application"
+msgid "Application"
 msgstr ""
 
 #. Directory of Music
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:209
-msgid "asterisk_moh_directory"
+msgid "Directory of Music"
 msgstr ""
 
 #. Option mode
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:210
-msgid "asterisk_moh_mode"
+msgid "Option mode"
 msgstr ""
 
 #. Random Play
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:211
-msgid "asterisk_moh_random"
+msgid "Random Play"
 msgstr ""
 
 #. SIP Connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:212
-msgid "asterisk_sip"
+msgid "SIP Connection"
 msgstr ""
 
 #. Always Dial International
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:213
-msgid "asterisk_sip_alwaysinternational"
+msgid "Always Dial International"
 msgstr ""
 
 #. Reinvite/redirect media connections
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:214
-msgid "asterisk_sip_canreinvite"
+msgid "Reinvite/redirect media connections"
 msgstr ""
 
 #. context
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:215
-msgid "asterisk_sip_context"
+msgid "context"
 msgstr ""
 
 #. Country Code for connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:216
-msgid "asterisk_sip_countrycode"
+msgid "Country Code for connection"
 msgstr ""
 
 #. DTMF mode
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:217
-msgid "asterisk_sip_dtmfmode"
+msgid "DTMF mode"
 msgstr ""
 
 #. Add as Extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:218
-msgid "asterisk_sip_extension"
+msgid "Add as Extension"
 msgstr ""
 
 #. Primary domain identity for From: headers
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:219
-msgid "asterisk_sip_fromdomain"
+msgid "Primary domain identity for From: headers"
 msgstr ""
 
 #. From user (required by many SIP providers)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:220
-msgid "asterisk_sip_fromuser"
+msgid "From user (required by many SIP providers)"
 msgstr ""
 
 #. Host name (or blank)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:221
-msgid "asterisk_sip_host"
+msgid "Host name (or blank)"
 msgstr ""
 
 #. Ring on incoming dialplan contexts
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:222
-msgid "asterisk_sip_incoming"
+msgid "Ring on incoming dialplan contexts"
 msgstr ""
 
 #. Allow Insecure for
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:223
-msgid "asterisk_sip_insecure"
+msgid "Allow Insecure for"
 msgstr ""
 
 #. International Dial Prefix
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:224
-msgid "asterisk_sip_internationalprefix"
+msgid "International Dial Prefix"
 msgstr ""
 
 #. Mailbox for MWI
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:225
-msgid "asterisk_sip_mailbox"
+msgid "Mailbox for MWI"
 msgstr ""
 
 #. NAT between phone and Asterisk
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:226
-msgid "asterisk_sip_nat"
+msgid "NAT between phone and Asterisk"
 msgstr ""
 
 #. Check tags in headers
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:227
-msgid "asterisk_sip_pedantic"
+msgid "Check tags in headers"
 msgstr ""
 
 #. SIP Port
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:228
-msgid "asterisk_sip_port"
+msgid "SIP Port"
 msgstr ""
 
 #. Dial Prefix (for external line)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:229
-msgid "asterisk_sip_prefix"
+msgid "Dial Prefix (for external line)"
 msgstr ""
 
 #. Reply Timeout (ms) for down connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:230
-msgid "asterisk_sip_qualify"
+msgid "Reply Timeout (ms) for down connection"
 msgstr ""
 
 #. Register connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:231
-msgid "asterisk_sip_register"
+msgid "Register connection"
 msgstr ""
 
 #. Secret
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:232
-msgid "asterisk_sip_secret"
+msgid "Secret"
 msgstr ""
 
 #. Dial own extension for mailbox
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:233
-msgid "asterisk_sip_selfmailbox"
+msgid "Dial own extension for mailbox"
 msgstr ""
 
 #. Dial Timeout (sec)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:234
-msgid "asterisk_sip_timeout"
+msgid "Dial Timeout (sec)"
 msgstr ""
 
 #. Client Type
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:235
-msgid "asterisk_sip_type"
+msgid "Client Type"
 msgstr ""
 
 #. Username
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:236
-msgid "asterisk_sip_username"
+msgid "Username"
 msgstr ""
 
 #. Section sipgeneral
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:237
-msgid "asterisk_sipgeneral"
+msgid "Section sipgeneral"
 msgstr ""
 
 #. Allow codecs
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:238
-msgid "asterisk_sipgeneral_allow"
+msgid "Allow codecs"
 msgstr ""
 
 #. SIP Port
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:239
-msgid "asterisk_sipgeneral_port"
+msgid "SIP Port"
 msgstr ""
 
 #. SIP realm
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:240
-msgid "asterisk_sipgeneral_realm"
+msgid "SIP realm"
 msgstr ""
 
 #. Voicemail general options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:241
-msgid "asterisk_voicegeneral"
+msgid "Voicemail general options"
 msgstr ""
 
 #. From Email address of server
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:242
-msgid "asterisk_voicegeneral_serveremail"
+msgid "From Email address of server"
 msgstr ""
 
 #. Voice Mail boxes
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:243
-msgid "asterisk_voicemail"
+msgid "Voice Mail boxes"
 msgstr ""
 
 #. Email contains attachment
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:244
-msgid "asterisk_voicemail_attach"
+msgid "Email contains attachment"
 msgstr ""
 
 #. Email
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:245
-msgid "asterisk_voicemail_email"
+msgid "Email"
 msgstr ""
 
 #. Display Name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:246
-msgid "asterisk_voicemail_name"
+msgid "Display Name"
 msgstr ""
 
 #. Password
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:247
-msgid "asterisk_voicemail_password"
+msgid "Password"
 msgstr ""
 
 #. zone
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:248
-msgid "asterisk_voicemail_zone"
+msgid "zone"
 msgstr ""
 
 #. Voice Zone settings
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:249
-msgid "asterisk_voicezone"
+msgid "Voice Zone settings"
 msgstr ""
 
 #. Message Format
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:250
-msgid "asterisk_voicezone_message"
+msgid "Message Format"
 msgstr ""
 
 #. Time Zone
diff --git a/po/it/cbi.po b/po/it/cbi.po
index a0365070a..6a5411f29 100644
--- a/po/it/cbi.po
+++ b/po/it/cbi.po
@@ -14,85 +14,85 @@ msgstr ""
 
 #. Add entry
 #: i18n/english/luasrc/i18n/cbi.en.lua:1
-msgid "cbi_add"
+msgid "Add"
 msgstr "Aggiungi campo"
 
 #. Remove entry
 #: i18n/english/luasrc/i18n/cbi.en.lua:2
-msgid "cbi_del"
+msgid "Delete"
 msgstr "Rimuovi campo"
 
 #. Replace entry
 #: i18n/english/luasrc/i18n/cbi.en.lua:3
-msgid "cbi_replace"
+msgid "Replace entry"
 msgstr "Sostituisci campo"
 
 #. Invalid input value
 #: i18n/english/luasrc/i18n/cbi.en.lua:4
-msgid "cbi_invalid"
+msgid "Invalid"
 msgstr "Valore immesso non valido"
 
 #. <strong>Validation failed:</strong> Please check any input fields for mistakes.
 #: i18n/english/luasrc/i18n/cbi.en.lua:5
-msgid "cbi_invalid_section"
+msgid "<strong>Validation failed:</strong> Please check any input fields for mistakes."
 msgstr ""
 "<strong>Validazione fallita:</strong> Per favore controlla i campi immessi."
 
 #. This field is mandatory
 #: i18n/english/luasrc/i18n/cbi.en.lua:6
-msgid "cbi_missing"
+msgid "This field is mandatory"
 msgstr "Questo campo è obbligatorio"
 
 #. <strong>Validation failed:</strong> At least one mandatory field has no or an invalid value
 #: i18n/english/luasrc/i18n/cbi.en.lua:7
-msgid "cbi_deperror"
+msgid "<strong>Validation failed:</strong> At least one mandatory field has no or an invalid value"
 msgstr ""
 "<strong>Validazione fallita:</strong> Almeno un campo obbligatorio manca o è "
 "invalido"
 
 #. A requirement for this option was not met
 #: i18n/english/luasrc/i18n/cbi.en.lua:8
-msgid "cbi_reqerror"
+msgid "A requirement for this option was not met"
 msgstr "Un requisito per questa opzione non è stato soddisfatto"
 
 #. -- Additional Field --
 #: i18n/english/luasrc/i18n/cbi.en.lua:9
-msgid "cbi_addopt"
+msgid "-- Additional Field --"
 msgstr "-- Campo aggiuntivo --"
 
 #.  (optional)
 #: i18n/english/luasrc/i18n/cbi.en.lua:10
-msgid "cbi_optional"
+msgid " (optional)"
 msgstr " (opzionale)"
 
 #. This section contains no values yet
 #: i18n/english/luasrc/i18n/cbi.en.lua:11
-msgid "cbi_sectempty"
+msgid "This section contains no values yet"
 msgstr "Questa sezione non contiene ancora valori"
 
 #. -- custom --
 #: i18n/english/luasrc/i18n/cbi.en.lua:12
-msgid "cbi_manual"
+msgid "-- custom --"
 msgstr "-- personalizzato --"
 
 #. -- Please choose --
 #: i18n/english/luasrc/i18n/cbi.en.lua:13
-msgid "cbi_select"
+msgid "-- Please choose --"
 msgstr "-- Per favore scegli --"
 
 #. Go to relevant configuration page
 #: i18n/english/luasrc/i18n/cbi.en.lua:14
-msgid "cbi_gorel"
+msgid " "
 msgstr "Vai alla pagina di configurazione relativa"
 
 #. Applying changes
 #: i18n/english/luasrc/i18n/cbi.en.lua:15
-msgid "cbi_applying"
+msgid "Applying changes"
 msgstr "Applica modifiche"
 
 #. Uploaded File
 #: i18n/english/luasrc/i18n/cbi.en.lua:16
-msgid "cbi_upload"
+msgid "Uploaded File"
 msgstr "Invia file"
 
 #. Search file...
diff --git a/po/it/coovachilli.po b/po/it/coovachilli.po
index 4a1cfd9f7..efaf2c7e6 100644
--- a/po/it/coovachilli.po
+++ b/po/it/coovachilli.po
@@ -14,882 +14,882 @@ msgstr ""
 
 #. CoovaChilli
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:1
-msgid "coovachilli"
+msgid "CoovaChilli"
 msgstr ""
 
 #. General configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:2
-msgid "coovachilli_general"
+msgid "General configuration"
 msgstr ""
 
 #. General CoovaChilli settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:3
-msgid "coovachilli_general_desc"
+msgid "General CoovaChilli settings"
 msgstr ""
 
 #. Command socket
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:4
-msgid "coovachilli_general_cmdsock"
+msgid "Command socket"
 msgstr ""
 
 #. UNIX socket used for communication with chilli_query
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:5
-msgid "coovachilli_general_cmdsock_desc"
+msgid "UNIX socket used for communication with chilli_query"
 msgstr ""
 
 #. Config refresh interval
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:6
-msgid "coovachilli_general_interval"
+msgid "Config refresh interval"
 msgstr ""
 
 #. Re-read configuration file and do DNS lookups every interval seconds. This has the same effect as sending the HUP signal. If interval is 0 (zero) this feature is disabled. 
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:7
-msgid "coovachilli_general_interval_desc"
+msgid "Re-read configuration file and do DNS lookups every interval seconds. This has the same effect as sending the HUP signal. If interval is 0 (zero) this feature is disabled. "
 msgstr ""
 
 #. Pid file
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:8
-msgid "coovachilli_general_pidfile"
+msgid "Pid file"
 msgstr ""
 
 #. Filename to put the process id
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:9
-msgid "coovachilli_general_pidfile_desc"
+msgid "Filename to put the process id"
 msgstr ""
 
 #. State directory
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:10
-msgid "coovachilli_general_statedir"
+msgid "State directory"
 msgstr ""
 
 #. Directory of non-volatile data
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:11
-msgid "coovachilli_general_statedir_desc"
+msgid "Directory of non-volatile data"
 msgstr ""
 
 #. TUN/TAP configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:12
-msgid "coovachilli_tun"
+msgid "TUN/TAP configuration"
 msgstr ""
 
 #. Network/Tun configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:13
-msgid "coovachilli_tun_desc"
+msgid "Network/Tun configuration"
 msgstr ""
 
 #. Network down script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:14
-msgid "coovachilli_tun_condown"
+msgid "Network down script"
 msgstr ""
 
 #. Script executed after a session has moved from authorized state to unauthorized
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:15
-msgid "coovachilli_tun_condown_desc"
+msgid "Script executed after a session has moved from authorized state to unauthorized"
 msgstr ""
 
 #. Network up script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:16
-msgid "coovachilli_tun_conup"
+msgid "Network up script"
 msgstr ""
 
 #. Script executed after the tun network interface has been brought up
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:17
-msgid "coovachilli_tun_conup_desc"
+msgid "Script executed after the tun network interface has been brought up"
 msgstr ""
 
 #. Primary DNS Server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:18
-msgid "coovachilli_tun_dns1"
+msgid "Primary DNS Server"
 msgstr ""
 
 #. Is used to inform the client about the DNS address to use for host name resolution
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:19
-msgid "coovachilli_tun_dns1_desc"
+msgid "Is used to inform the client about the DNS address to use for host name resolution"
 msgstr ""
 
 #. Secondary DNS Server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:20
-msgid "coovachilli_tun_dns2"
+msgid "Secondary DNS Server"
 msgstr ""
 
 #. Is used to inform the client about the DNS address to use for host name resolution
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:21
-msgid "coovachilli_tun_dns2_desc"
+msgid "Is used to inform the client about the DNS address to use for host name resolution"
 msgstr ""
 
 #. Domain name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:22
-msgid "coovachilli_tun_domain"
+msgid "Domain name"
 msgstr ""
 
 #. Is used to inform the client about the domain name to use for DNS lookups
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:23
-msgid "coovachilli_tun_domain_desc"
+msgid "Is used to inform the client about the domain name to use for DNS lookups"
 msgstr ""
 
 #. Dynamic IP address pool
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:24
-msgid "coovachilli_tun_dynip"
+msgid "Dynamic IP address pool"
 msgstr ""
 
 #. Specifies a pool of dynamic IP addresses
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:25
-msgid "coovachilli_tun_dynip_desc"
+msgid "Specifies a pool of dynamic IP addresses"
 msgstr ""
 
 #. IP down script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:26
-msgid "coovachilli_tun_ipdown"
+msgid "IP down script"
 msgstr ""
 
 #. Script executed after the tun network interface has been taken down
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:27
-msgid "coovachilli_tun_ipdown_desc"
+msgid "Script executed after the tun network interface has been taken down"
 msgstr ""
 
 #. IP up script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:28
-msgid "coovachilli_tun_ipup"
+msgid "IP up script"
 msgstr ""
 
 #. Script executed after the TUN/TAP network interface has been brought up
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:29
-msgid "coovachilli_tun_ipup_desc"
+msgid "Script executed after the TUN/TAP network interface has been brought up"
 msgstr ""
 
 #. Uplink subnet
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:30
-msgid "coovachilli_tun_net"
+msgid "Uplink subnet"
 msgstr ""
 
 #. Network address of the uplink interface (CIDR notation)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:31
-msgid "coovachilli_tun_net_desc"
+msgid "Network address of the uplink interface (CIDR notation)"
 msgstr ""
 
 #. Static IP address pool
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:32
-msgid "coovachilli_tun_statip"
+msgid "Static IP address pool"
 msgstr ""
 
 #. Specifies a pool of static IP addresses
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:33
-msgid "coovachilli_tun_statip_desc"
+msgid "Specifies a pool of static IP addresses"
 msgstr ""
 
 #. TUN/TAP device
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:34
-msgid "coovachilli_tun_tundev"
+msgid "TUN/TAP device"
 msgstr ""
 
 #. The specific device to use for the TUN/TAP interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:35
-msgid "coovachilli_tun_tundev_desc"
+msgid "The specific device to use for the TUN/TAP interface"
 msgstr ""
 
 #. TX queue length
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:36
-msgid "coovachilli_tun_txqlen"
+msgid "TX queue length"
 msgstr ""
 
 #. The TX queue length to set on the TUN/TAP interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:37
-msgid "coovachilli_tun_txqlen_desc"
+msgid "The TX queue length to set on the TUN/TAP interface"
 msgstr ""
 
 #. Use TAP device
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:38
-msgid "coovachilli_tun_usetap"
+msgid "Use TAP device"
 msgstr ""
 
 #. Use the TAP interface instead of TUN
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:39
-msgid "coovachilli_tun_usetap_desc"
+msgid "Use the TAP interface instead of TUN"
 msgstr ""
 
 #. DHCP configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:40
-msgid "coovachilli_dhcp"
+msgid "DHCP configuration"
 msgstr ""
 
 #. Set DHCP options for connecting clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:41
-msgid "coovachilli_dhcp_desc"
+msgid "Set DHCP options for connecting clients"
 msgstr ""
 
 #. DHCP end number
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:42
-msgid "coovachilli_dhcp_dhcpend"
+msgid "DHCP end number"
 msgstr ""
 
 #. Where to stop assigning IP addresses (default 254)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:43
-msgid "coovachilli_dhcp_dhcpend_desc"
+msgid "Where to stop assigning IP addresses (default 254)"
 msgstr ""
 
 #. DHCP interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:44
-msgid "coovachilli_dhcp_dhcpif"
+msgid "DHCP interface"
 msgstr ""
 
 #. Ethernet interface to listen to for the downlink interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:45
-msgid "coovachilli_dhcp_dhcpif_desc"
+msgid "Ethernet interface to listen to for the downlink interface"
 msgstr ""
 
 #. Listen MAC address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:46
-msgid "coovachilli_dhcp_dhcpmac"
+msgid "Listen MAC address"
 msgstr ""
 
 #. MAC address to listen to. If not specified the MAC address of the interface will be used
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:47
-msgid "coovachilli_dhcp_dhcpmac_desc"
+msgid "MAC address to listen to. If not specified the MAC address of the interface will be used"
 msgstr ""
 
 #. DHCP start number
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:48
-msgid "coovachilli_dhcp_dhcpstart"
+msgid "DHCP start number"
 msgstr ""
 
 #. Where to start assigning IP addresses (default 10)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:49
-msgid "coovachilli_dhcp_dhcpstart_desc"
+msgid "Where to start assigning IP addresses (default 10)"
 msgstr ""
 
 #. Enable IEEE 802.1x
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:50
-msgid "coovachilli_dhcp_eapolenable"
+msgid "Enable IEEE 802.1x"
 msgstr ""
 
 #. Enable IEEE 802.1x authentication and listen for EAP requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:51
-msgid "coovachilli_dhcp_eapolenable_desc"
+msgid "Enable IEEE 802.1x authentication and listen for EAP requests"
 msgstr ""
 
 #. Leasetime
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:52
-msgid "coovachilli_dhcp_lease"
+msgid "Leasetime"
 msgstr ""
 
 #. Use a DHCP lease of seconds (default 600)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:53
-msgid "coovachilli_dhcp_lease_desc"
+msgid "Use a DHCP lease of seconds (default 600)"
 msgstr ""
 
 #. RADIUS configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:54
-msgid "coovachilli_radius"
+msgid "RADIUS configuration"
 msgstr ""
 
 #. RADIUS configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:55
-msgid "coovachilli_radius_desc"
+msgid "RADIUS configuration"
 msgstr ""
 
 #. Allow session update through RADIUS
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:56
-msgid "coovachilli_radius_acctupdate"
+msgid "Allow session update through RADIUS"
 msgstr ""
 
 #. Allow updating of session parameters with RADIUS attributes sent in Accounting-Response
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:57
-msgid "coovachilli_radius_acctupdate_desc"
+msgid "Allow updating of session parameters with RADIUS attributes sent in Accounting-Response"
 msgstr ""
 
 #. Admin password
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:58
-msgid "coovachilli_radius_adminpasswd"
+msgid "Admin password"
 msgstr ""
 
 #. Password to use for Administrative-User authentication in order to pick up chilli configurations and establish a device &quot;system&quot; session
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:59
-msgid "coovachilli_radius_adminpasswd_desc"
+msgid "Password to use for Administrative-User authentication in order to pick up chilli configurations and establish a device \"system\" session"
 msgstr ""
 
 #. Admin user
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:60
-msgid "coovachilli_radius_adminuser"
+msgid "Admin user"
 msgstr ""
 
 #. User-name to use for Administrative-User authentication in order to pick up chilli configurations and establish a device &quot;system&quot; session
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:61
-msgid "coovachilli_radius_adminuser_desc"
+msgid "User-name to use for Administrative-User authentication in order to pick up chilli configurations and establish a device \"system\" session"
 msgstr ""
 
 #. Do not check disconnection requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:62
-msgid "coovachilli_radius_coanoipcheck"
+msgid "Do not check disconnection requests"
 msgstr ""
 
 #. Do not check the source IP address of radius disconnect requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:63
-msgid "coovachilli_radius_coanoipcheck_desc"
+msgid "Do not check the source IP address of radius disconnect requests"
 msgstr ""
 
 #. RADIUS disconnect port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:64
-msgid "coovachilli_radius_coaport"
+msgid "RADIUS disconnect port"
 msgstr ""
 
 #. UDP port to listen to for accepting radius disconnect requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:65
-msgid "coovachilli_radius_coaport_desc"
+msgid "UDP port to listen to for accepting radius disconnect requests"
 msgstr ""
 
 #. NAS IP
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:66
-msgid "coovachilli_radius_nasip"
+msgid "NAS IP"
 msgstr ""
 
 #. Value to use in RADIUS NAS-IP-Address attribute
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:67
-msgid "coovachilli_radius_nasip_desc"
+msgid "Value to use in RADIUS NAS-IP-Address attribute"
 msgstr ""
 
 #. NAS MAC
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:68
-msgid "coovachilli_radius_nasmac"
+msgid "NAS MAC"
 msgstr ""
 
 #. MAC address value to use in RADIUS Called-Station-ID attribute
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:69
-msgid "coovachilli_radius_nasmac_desc"
+msgid "MAC address value to use in RADIUS Called-Station-ID attribute"
 msgstr ""
 
 #. Allow OpenID authentication
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:70
-msgid "coovachilli_radius_openidauth"
+msgid "Allow OpenID authentication"
 msgstr ""
 
 #. Allows OpenID authentication by sending ChilliSpot-Config=allow-openidauth in RADIUS Access-Requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:71
-msgid "coovachilli_radius_openidauth_desc"
+msgid "Allows OpenID authentication by sending ChilliSpot-Config=allow-openidauth in RADIUS Access-Requests"
 msgstr ""
 
 #. RADIUS accounting port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:72
-msgid "coovachilli_radius_radiusacctport"
+msgid "RADIUS accounting port"
 msgstr ""
 
 #. The UDP port number to use for radius accounting requests (default 1813)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:73
-msgid "coovachilli_radius_radiusacctport_desc"
+msgid "The UDP port number to use for radius accounting requests (default 1813)"
 msgstr ""
 
 #. RADIUS authentication port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:74
-msgid "coovachilli_radius_radiusauthport"
+msgid "RADIUS authentication port"
 msgstr ""
 
 #. The UDP port number to use for radius authentication requests (default 1812)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:75
-msgid "coovachilli_radius_radiusauthport_desc"
+msgid "The UDP port number to use for radius authentication requests (default 1812)"
 msgstr ""
 
 #. Option radiuscalled
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:76
-msgid "coovachilli_radius_radiuscalled"
+msgid "Option radiuscalled"
 msgstr ""
 
 #. RADIUS listen address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:77
-msgid "coovachilli_radius_radiuslisten"
+msgid "RADIUS listen address"
 msgstr ""
 
 #. Local interface IP address to use for the radius interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:78
-msgid "coovachilli_radius_radiuslisten_desc"
+msgid "Local interface IP address to use for the radius interface"
 msgstr ""
 
 #. RADIUS location ID
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:79
-msgid "coovachilli_radius_radiuslocationid"
+msgid "RADIUS location ID"
 msgstr ""
 
 #. WISPr Location ID
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:80
-msgid "coovachilli_radius_radiuslocationid_desc"
+msgid "WISPr Location ID"
 msgstr ""
 
 #. RADIUS location name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:81
-msgid "coovachilli_radius_radiuslocationname"
+msgid "RADIUS location name"
 msgstr ""
 
 #. WISPr Location Name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:82
-msgid "coovachilli_radius_radiuslocationname_desc"
+msgid "WISPr Location Name"
 msgstr ""
 
 #. NAS ID
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:83
-msgid "coovachilli_radius_radiusnasid"
+msgid "NAS ID"
 msgstr ""
 
 #. Network access server identifier
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:84
-msgid "coovachilli_radius_radiusnasid_desc"
+msgid "Network access server identifier"
 msgstr ""
 
 #. Option radiusnasip
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:85
-msgid "coovachilli_radius_radiusnasip"
+msgid "Option radiusnasip"
 msgstr ""
 
 #. NAS port type
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:86
-msgid "coovachilli_radius_radiusnasporttype"
+msgid "NAS port type"
 msgstr ""
 
 #. Value of NAS-Port-Type attribute. Defaults to 19 (Wireless-IEEE-802.11)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:87
-msgid "coovachilli_radius_radiusnasporttype_desc"
+msgid "Value of NAS-Port-Type attribute. Defaults to 19 (Wireless-IEEE-802.11)"
 msgstr ""
 
 #. Send RADIUS VSA
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:88
-msgid "coovachilli_radius_radiusoriginalurl"
+msgid "Send RADIUS VSA"
 msgstr ""
 
 #. Send the ChilliSpot-OriginalURL RADIUS VSA in Access-Request
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:89
-msgid "coovachilli_radius_radiusoriginalurl_desc"
+msgid "Send the ChilliSpot-OriginalURL RADIUS VSA in Access-Request"
 msgstr ""
 
 #. RADIUS secret
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:90
-msgid "coovachilli_radius_radiussecret"
+msgid "RADIUS secret"
 msgstr ""
 
 #. Radius shared secret for both servers
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:91
-msgid "coovachilli_radius_radiussecret_desc"
+msgid "Radius shared secret for both servers"
 msgstr ""
 
 #. RADIUS server 1
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:92
-msgid "coovachilli_radius_radiusserver1"
+msgid "RADIUS server 1"
 msgstr ""
 
 #. The IP address of radius server 1
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:93
-msgid "coovachilli_radius_radiusserver1_desc"
+msgid "The IP address of radius server 1"
 msgstr ""
 
 #. RADIUS server 2
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:94
-msgid "coovachilli_radius_radiusserver2"
+msgid "RADIUS server 2"
 msgstr ""
 
 #. The IP address of radius server 2
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:95
-msgid "coovachilli_radius_radiusserver2_desc"
+msgid "The IP address of radius server 2"
 msgstr ""
 
 #. Swap octets
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:96
-msgid "coovachilli_radius_swapoctets"
+msgid "Swap octets"
 msgstr ""
 
 #. Swap the meaning of &quot;input octets&quot; and &quot;output octets&quot; as it related to RADIUS attribtues
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:97
-msgid "coovachilli_radius_swapoctets_desc"
+msgid "Swap the meaning of \"input octets\" and \"output octets\" as it related to RADIUS attribtues"
 msgstr ""
 
 #. Allow WPA guests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:98
-msgid "coovachilli_radius_wpaguests"
+msgid "Allow WPA guests"
 msgstr ""
 
 #. Allows WPA Guest authentication by sending ChilliSpot-Config=allow-wpa-guests in RADIUS Access-Requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:99
-msgid "coovachilli_radius_wpaguests_desc"
+msgid "Allows WPA Guest authentication by sending ChilliSpot-Config=allow-wpa-guests in RADIUS Access-Requests"
 msgstr ""
 
 #. RADIUS proxy settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:100
-msgid "coovachilli_proxy"
+msgid "RADIUS proxy settings"
 msgstr ""
 
 #. RADIUS proxy settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:101
-msgid "coovachilli_proxy_desc"
+msgid "RADIUS proxy settings"
 msgstr ""
 
 #. Proxy client
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:102
-msgid "coovachilli_proxy_proxyclient"
+msgid "Proxy client"
 msgstr ""
 
 #. IP address from which radius requests are accepted. If omitted the server will not accept radius requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:103
-msgid "coovachilli_proxy_proxyclient_desc"
+msgid "IP address from which radius requests are accepted. If omitted the server will not accept radius requests"
 msgstr ""
 
 #. Proxy listen address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:104
-msgid "coovachilli_proxy_proxylisten"
+msgid "Proxy listen address"
 msgstr ""
 
 #. Local interface IP address to use for accepting radius requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:105
-msgid "coovachilli_proxy_proxylisten_desc"
+msgid "Local interface IP address to use for accepting radius requests"
 msgstr ""
 
 #. Proxy port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:106
-msgid "coovachilli_proxy_proxyport"
+msgid "Proxy port"
 msgstr ""
 
 #. UDP Port to listen to for accepting radius requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:107
-msgid "coovachilli_proxy_proxyport_desc"
+msgid "UDP Port to listen to for accepting radius requests"
 msgstr ""
 
 #. Proxy secret
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:108
-msgid "coovachilli_proxy_proxysecret"
+msgid "Proxy secret"
 msgstr ""
 
 #. Radius shared secret for clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:109
-msgid "coovachilli_proxy_proxysecret_desc"
+msgid "Radius shared secret for clients"
 msgstr ""
 
 #. UAM configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:110
-msgid "coovachilli_uam"
+msgid "UAM configuration"
 msgstr ""
 
 #. Unified Configuration Method settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:111
-msgid "coovachilli_uam_desc"
+msgid "Unified Configuration Method settings"
 msgstr ""
 
 #. Use Chilli XML
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:112
-msgid "coovachilli_uam_chillixml"
+msgid "Use Chilli XML"
 msgstr ""
 
 #. Return the so-called Chilli XML along with WISPr XML
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:113
-msgid "coovachilli_uam_chillixml_desc"
+msgid "Return the so-called Chilli XML along with WISPr XML"
 msgstr ""
 
 #. Default idle timeout
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:114
-msgid "coovachilli_uam_defidletimeout"
+msgid "Default idle timeout"
 msgstr ""
 
 #. Default idle timeout unless otherwise set by RADIUS (defaults to 0)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:115
-msgid "coovachilli_uam_defidletimeout_desc"
+msgid "Default idle timeout unless otherwise set by RADIUS (defaults to 0)"
 msgstr ""
 
 #. Default interim interval
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:116
-msgid "coovachilli_uam_definteriminterval"
+msgid "Default interim interval"
 msgstr ""
 
 #. Default interim-interval for RADIUS accounting unless otherwise set by RADIUS (defaults to 0)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:117
-msgid "coovachilli_uam_definteriminterval_desc"
+msgid "Default interim-interval for RADIUS accounting unless otherwise set by RADIUS (defaults to 0)"
 msgstr ""
 
 #. Default session timeout
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:118
-msgid "coovachilli_uam_defsessiontimeout"
+msgid "Default session timeout"
 msgstr ""
 
 #. Default session timeout unless otherwise set by RADIUS (defaults to 0)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:119
-msgid "coovachilli_uam_defsessiontimeout_desc"
+msgid "Default session timeout unless otherwise set by RADIUS (defaults to 0)"
 msgstr ""
 
 #. Inspect DNS traffic
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:120
-msgid "coovachilli_uam_dnsparanoia"
+msgid "Inspect DNS traffic"
 msgstr ""
 
 #. Inspect DNS packets and drop responses with any non- A, CNAME, SOA, or MX records to prevent dns tunnels (experimental)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:121
-msgid "coovachilli_uam_dnsparanoia_desc"
+msgid "Inspect DNS packets and drop responses with any non- A, CNAME, SOA, or MX records to prevent dns tunnels (experimental)"
 msgstr ""
 
 #. Local users file
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:122
-msgid "coovachilli_uam_localusers"
+msgid "Local users file"
 msgstr ""
 
 #. A colon seperated file containing usernames and passwords of locally authenticated users
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:123
-msgid "coovachilli_uam_localusers_desc"
+msgid "A colon seperated file containing usernames and passwords of locally authenticated users"
 msgstr ""
 
 #. Location name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:124
-msgid "coovachilli_uam_locationname"
+msgid "Location name"
 msgstr ""
 
 #. Human readable location name used in JSON interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:125
-msgid "coovachilli_uam_locationname_desc"
+msgid "Human readable location name used in JSON interface"
 msgstr ""
 
 #. Do not redirect to UAM server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:126
-msgid "coovachilli_uam_nouamsuccess"
+msgid "Do not redirect to UAM server"
 msgstr ""
 
 #. Do not return to UAM server on login success, just redirect to original URL
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:127
-msgid "coovachilli_uam_nouamsuccess_desc"
+msgid "Do not return to UAM server on login success, just redirect to original URL"
 msgstr ""
 
 #. Do not do WISPr
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:128
-msgid "coovachilli_uam_nouamwispr"
+msgid "Do not do WISPr"
 msgstr ""
 
 #. Do not do any WISPr XML, assume the back-end is doing this instead
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:129
-msgid "coovachilli_uam_nouamwispr_desc"
+msgid "Do not do any WISPr XML, assume the back-end is doing this instead"
 msgstr ""
 
 #. Post auth proxy
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:130
-msgid "coovachilli_uam_postauthproxy"
+msgid "Post auth proxy"
 msgstr ""
 
 #. Used with postauthproxyport to define a post authentication HTTP proxy server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:131
-msgid "coovachilli_uam_postauthproxy_desc"
+msgid "Used with postauthproxyport to define a post authentication HTTP proxy server"
 msgstr ""
 
 #. Post auth proxy port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:132
-msgid "coovachilli_uam_postauthproxyport"
+msgid "Post auth proxy port"
 msgstr ""
 
 #. Used with postauthproxy to define a post authentication HTTP proxy server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:133
-msgid "coovachilli_uam_postauthproxyport_desc"
+msgid "Used with postauthproxy to define a post authentication HTTP proxy server"
 msgstr ""
 
 #. Allowed resources
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:134
-msgid "coovachilli_uam_uamallowed"
+msgid "Allowed resources"
 msgstr ""
 
 #. List of resources the client can access without first authenticating
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:135
-msgid "coovachilli_uam_uamallowed_desc"
+msgid "List of resources the client can access without first authenticating"
 msgstr ""
 
 #. Allow any DNS server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:136
-msgid "coovachilli_uam_uamanydns"
+msgid "Allow any DNS server"
 msgstr ""
 
 #. Allow any DNS server for unauthenticated clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:137
-msgid "coovachilli_uam_uamanydns_desc"
+msgid "Allow any DNS server for unauthenticated clients"
 msgstr ""
 
 #. Allow any IP address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:138
-msgid "coovachilli_uam_uamanyip"
+msgid "Allow any IP address"
 msgstr ""
 
 #. Allow clients to use any IP settings they wish by spoofing ARP (experimental)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:139
-msgid "coovachilli_uam_uamanyip_desc"
+msgid "Allow clients to use any IP settings they wish by spoofing ARP (experimental)"
 msgstr ""
 
 #. Allowed domains
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:140
-msgid "coovachilli_uam_uamdomain"
+msgid "Allowed domains"
 msgstr ""
 
 #. Defines a list of domain names to automatically add to the walled garden
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:141
-msgid "coovachilli_uam_uamdomain_desc"
+msgid "Defines a list of domain names to automatically add to the walled garden"
 msgstr ""
 
 #. UAM homepage
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:142
-msgid "coovachilli_uam_uamhomepage"
+msgid "UAM homepage"
 msgstr ""
 
 #. URL of homepage to redirect unauthenticated users to
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:143
-msgid "coovachilli_uam_uamhomepage_desc"
+msgid "URL of homepage to redirect unauthenticated users to"
 msgstr ""
 
 #. UAM static content port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:144
-msgid "coovachilli_uam_uamiport"
+msgid "UAM static content port"
 msgstr ""
 
 #. TCP port to bind to for only serving embedded content
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:145
-msgid "coovachilli_uam_uamiport_desc"
+msgid "TCP port to bind to for only serving embedded content"
 msgstr ""
 
 #. UAM listening address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:146
-msgid "coovachilli_uam_uamlisten"
+msgid "UAM listening address"
 msgstr ""
 
 #. IP address to listen to for authentication of clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:147
-msgid "coovachilli_uam_uamlisten_desc"
+msgid "IP address to listen to for authentication of clients"
 msgstr ""
 
 #. UAM logout IP
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:148
-msgid "coovachilli_uam_uamlogoutip"
+msgid "UAM logout IP"
 msgstr ""
 
 #. Use this IP address to instantly logout a client accessing it (defaults to 1.1.1.1)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:149
-msgid "coovachilli_uam_uamlogoutip_desc"
+msgid "Use this IP address to instantly logout a client accessing it (defaults to 1.1.1.1)"
 msgstr ""
 
 #. UAM listening port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:150
-msgid "coovachilli_uam_uamport"
+msgid "UAM listening port"
 msgstr ""
 
 #. TCP port to bind to for authenticating clients (default 3990)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:151
-msgid "coovachilli_uam_uamport_desc"
+msgid "TCP port to bind to for authenticating clients (default 3990)"
 msgstr ""
 
 #. UAM secret
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:152
-msgid "coovachilli_uam_uamsecret"
+msgid "UAM secret"
 msgstr ""
 
 #. Shared secret between uamserver and chilli
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:153
-msgid "coovachilli_uam_uamsecret_desc"
+msgid "Shared secret between uamserver and chilli"
 msgstr ""
 
 #. UAM server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:154
-msgid "coovachilli_uam_uamserver"
+msgid "UAM server"
 msgstr ""
 
 #. URL of web server to use for authenticating clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:155
-msgid "coovachilli_uam_uamserver_desc"
+msgid "URL of web server to use for authenticating clients"
 msgstr ""
 
 #. UAM user interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:156
-msgid "coovachilli_uam_uamui"
+msgid "UAM user interface"
 msgstr ""
 
 #. An init.d style program to handle local content on the uamuiport web server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:157
-msgid "coovachilli_uam_uamui_desc"
+msgid "An init.d style program to handle local content on the uamuiport web server"
 msgstr ""
 
 #. Use status file
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:158
-msgid "coovachilli_uam_usestatusfile"
+msgid "Use status file"
 msgstr ""
 
 #. Write the status of clients in a non-volatile state file (experimental)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:159
-msgid "coovachilli_uam_usestatusfile_desc"
+msgid "Write the status of clients in a non-volatile state file (experimental)"
 msgstr ""
 
 #. WISPr login url
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:160
-msgid "coovachilli_uam_wisprlogin"
+msgid "WISPr login url"
 msgstr ""
 
 #. Specific URL to be given in WISPr XML LoginURL
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:161
-msgid "coovachilli_uam_wisprlogin_desc"
+msgid "Specific URL to be given in WISPr XML LoginURL"
 msgstr ""
 
 #. CGI program
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:162
-msgid "coovachilli_uam_wwwbin"
+msgid "CGI program"
 msgstr ""
 
 #. Executable to run as a CGI type program (like haserl) for URLs with extention .chi
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:163
-msgid "coovachilli_uam_wwwbin_desc"
+msgid "Executable to run as a CGI type program (like haserl) for URLs with extention .chi"
 msgstr ""
 
 #. Web content directory
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:164
-msgid "coovachilli_uam_wwwdir"
+msgid "Web content directory"
 msgstr ""
 
 #. Directory where embedded local web content is placed
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:165
-msgid "coovachilli_uam_wwwdir_desc"
+msgid "Directory where embedded local web content is placed"
 msgstr ""
 
 #. MAC configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:166
-msgid "coovachilli_macauth"
+msgid "MAC configuration"
 msgstr ""
 
 #. Configure MAC authentication
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:167
-msgid "coovachilli_macauth_desc"
+msgid "Configure MAC authentication"
 msgstr ""
 
 #. Allowed MAC addresses
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:168
-msgid "coovachilli_macauth_macallowed"
+msgid "Allowed MAC addresses"
 msgstr ""
 
 #. List of MAC addresses for which MAC authentication will be performed
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:169
-msgid "coovachilli_macauth_macallowed_desc"
+msgid "List of MAC addresses for which MAC authentication will be performed"
 msgstr ""
 
 #. Authenticate locally allowed MACs
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:170
-msgid "coovachilli_macauth_macallowlocal"
+msgid "Authenticate locally allowed MACs"
 msgstr ""
 
 #. Authenticate allowed MAC addresses without the use of RADIUS
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:171
-msgid "coovachilli_macauth_macallowlocal_desc"
+msgid "Authenticate allowed MAC addresses without the use of RADIUS"
 msgstr ""
 
 #. Enable MAC authentification
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:172
-msgid "coovachilli_macauth_macauth"
+msgid "Enable MAC authentification"
 msgstr ""
 
 #. Try to authenticate all users based on their mac address alone
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:173
-msgid "coovachilli_macauth_macauth_desc"
+msgid "Try to authenticate all users based on their mac address alone"
 msgstr ""
 
 #. Password
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:174
-msgid "coovachilli_macauth_macpasswd"
+msgid "Password"
 msgstr ""
 
 #. Password used when performing MAC authentication
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:175
-msgid "coovachilli_macauth_macpasswd_desc"
+msgid "Password used when performing MAC authentication"
 msgstr ""
 
 #. Suffix
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:176
-msgid "coovachilli_macauth_macsuffix"
+msgid "Suffix"
 msgstr ""
 
 #. Suffix to add to the MAC address in order to form the User-Name, which is sent to the radius server
diff --git a/po/it/ddns.po b/po/it/ddns.po
index 3f4bee57b..8ea30f4cb 100644
--- a/po/it/ddns.po
+++ b/po/it/ddns.po
@@ -14,37 +14,37 @@ msgstr ""
 
 #. Dynamic DNS
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:1
-msgid "ddns"
+msgid "Dynamic DNS"
 msgstr ""
 
 #. Dynamic DNS allows that your router can be reached with a fixed hostname while having a dynamically changing IP-Address.
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:2
-msgid "ddns_desc"
+msgid "Dynamic DNS allows that your router can be reached with a fixed hostname while having a dynamically changing IP-Address."
 msgstr ""
 
 #. Source of IP-Address
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:3
-msgid "ddns_service_ipsource"
+msgid "Source of IP-Address"
 msgstr ""
 
 #. Check for changed IP every
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:4
-msgid "ddns_service_checkinterval"
+msgid "Check for changed IP every"
 msgstr ""
 
 #. Check-Time unit
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:5
-msgid "ddns_service_checkunit"
+msgid "Check-Time unit"
 msgstr ""
 
 #. Force update every
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:6
-msgid "ddns_service_forceinterval"
+msgid "Force update every"
 msgstr ""
 
 #. Force-Time unit
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:7
-msgid "ddns_service_forceunit"
+msgid "Force-Time unit"
 msgstr ""
 
 #. Custom Update-URL
diff --git a/po/it/default.po b/po/it/default.po
index 5e18ea540..971247844 100644
--- a/po/it/default.po
+++ b/po/it/default.po
@@ -14,37 +14,37 @@ msgstr ""
 
 #. Skip to navigation
 #: i18n/english/luasrc/i18n/default.en.lua:1
-msgid "skiplink1"
+msgid "Skip to navigation"
 msgstr "Salta a navigazione"
 
 #. Skip to content
 #: i18n/english/luasrc/i18n/default.en.lua:2
-msgid "skiplink2"
+msgid "Skip to content"
 msgstr "Salta a contenuto"
 
 #. Navigation
 #: i18n/english/luasrc/i18n/default.en.lua:3
-msgid "navigation"
+msgid "Navigation"
 msgstr "Navigazione"
 
 #. About
 #: i18n/english/luasrc/i18n/default.en.lua:4
-msgid "about"
+msgid "About"
 msgstr "Informazioni su"
 
 #. Add
 #: i18n/english/luasrc/i18n/default.en.lua:5
-msgid "add"
+msgid "Add"
 msgstr "Aggiungi"
 
 #. Addresses
 #: i18n/english/luasrc/i18n/default.en.lua:6
-msgid "addresses"
+msgid "Addresses"
 msgstr "Indirizzi"
 
 #. Aliases
 #: i18n/english/luasrc/i18n/default.en.lua:7
-msgid "aliases"
+msgid "Aliases"
 msgstr "Alias"
 
 #. all
@@ -59,99 +59,99 @@ msgstr "indietro"
 
 #. Administration
 #: i18n/english/luasrc/i18n/default.en.lua:10
-msgid "administration"
+msgid "Administration"
 msgstr "Amministrazione"
 
 #. Essentials
 #: i18n/english/luasrc/i18n/default.en.lua:11
-msgid "essentials"
+msgid "Essentials"
 msgstr "Essenziali"
 
 #. Apply
 #: i18n/english/luasrc/i18n/default.en.lua:12
-msgid "apply"
+msgid "Apply"
 msgstr "Applica"
 
 #. Basic Settings
 #: i18n/english/luasrc/i18n/default.en.lua:13
-msgid "basicsettings"
+msgid "Basic Settings"
 msgstr "Impostazioni di base"
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast
 #: i18n/english/luasrc/i18n/default.en.lua:14
-msgid "broadcast"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"
 msgstr "Broadcast <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
 
 #. Cancel
 #: i18n/english/luasrc/i18n/default.en.lua:15
-msgid "cancel"
+msgid "Cancel"
 msgstr "Cancella"
 
 #. Changes
 #: i18n/english/luasrc/i18n/default.en.lua:16
-msgid "changes"
+msgid "Changes"
 msgstr "Modifiche"
 
 #. Channel
 #: i18n/english/luasrc/i18n/default.en.lua:17
-msgid "channel"
+msgid "Channel"
 msgstr "Canale"
 
 #. <abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/prefix
 #: i18n/english/luasrc/i18n/default.en.lua:18
-msgid "cidr6"
+msgid "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/prefix"
 msgstr ""
 "Notazione <abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>: "
 "indirizzo/prefisso"
 
 #. Code
 #: i18n/english/luasrc/i18n/default.en.lua:19
-msgid "code"
+msgid "Code"
 msgstr "Codice"
 
 #. Configuration
 #: i18n/english/luasrc/i18n/default.en.lua:20
-msgid "config"
+msgid "Configuration"
 msgstr "Configurazione"
 
 #. Configuration file
 #: i18n/english/luasrc/i18n/default.en.lua:21
-msgid "configfile"
+msgid "Configuration file"
 msgstr "File di configurazione"
 
 #. Confirmation
 #: i18n/english/luasrc/i18n/default.en.lua:22
-msgid "confirmation"
+msgid "Confirmation"
 msgstr "Conferma"
 
 #. Delete
 #: i18n/english/luasrc/i18n/default.en.lua:23
-msgid "delete"
+msgid "Delete"
 msgstr "Cancella"
 
 #. Description
 #: i18n/english/luasrc/i18n/default.en.lua:24
-msgid "descr"
+msgid "Description"
 msgstr "Descrizione"
 
 #. Design
 #: i18n/english/luasrc/i18n/default.en.lua:25
-msgid "design"
+msgid "Design"
 msgstr "Design"
 
 #. Destination
 #: i18n/english/luasrc/i18n/default.en.lua:26
-msgid "destination"
+msgid "Destination"
 msgstr "Destinazione"
 
 #. Device
 #: i18n/english/luasrc/i18n/default.en.lua:27
-msgid "device"
+msgid "Device"
 msgstr "Dispositivo"
 
 #. Devices
 #: i18n/english/luasrc/i18n/default.en.lua:28
-msgid "devices"
+msgid "Devices"
 msgstr "Dispositivi"
 
 #. disable
@@ -161,22 +161,22 @@ msgstr "disabilita"
 
 #. Distance
 #: i18n/english/luasrc/i18n/default.en.lua:30
-msgid "distance"
+msgid "Distance"
 msgstr "Distanza"
 
 #. Kernel Log
 #: i18n/english/luasrc/i18n/default.en.lua:31
-msgid "dmesg"
+msgid "Kernel Log"
 msgstr "Log del kernel"
 
 #. <abbr title=\"Domain Name System\">DNS</abbr>-Server
 #: i18n/english/luasrc/i18n/default.en.lua:32
-msgid "dnsserver"
+msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Server"
 msgstr "Server <abbr title=\"Domain Name System\">DNS</abbr>"
 
 #. Edit
 #: i18n/english/luasrc/i18n/default.en.lua:33
-msgid "edit"
+msgid "Edit"
 msgstr "Modifica"
 
 #. enable
@@ -186,47 +186,47 @@ msgstr "abilita"
 
 #. Encryption
 #: i18n/english/luasrc/i18n/default.en.lua:35
-msgid "encryption"
+msgid "Encryption"
 msgstr "Crittografia"
 
 #. Error
 #: i18n/english/luasrc/i18n/default.en.lua:36
-msgid "error"
+msgid "Error"
 msgstr "Errore"
 
 #. Filesystem
 #: i18n/english/luasrc/i18n/default.en.lua:37
-msgid "filesystem"
+msgid "Filesystem"
 msgstr "Filesystem"
 
 #. Filter
 #: i18n/english/luasrc/i18n/default.en.lua:38
-msgid "filter"
+msgid "Filter"
 msgstr "Filtro"
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway
 #: i18n/english/luasrc/i18n/default.en.lua:39
-msgid "gateway"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
 msgstr "Gateway <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
 
 #. <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway
 #: i18n/english/luasrc/i18n/default.en.lua:40
-msgid "gateway6"
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 msgstr "Gateway <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>"
 
 #. General
 #: i18n/english/luasrc/i18n/default.en.lua:41
-msgid "general"
+msgid "General"
 msgstr "Generale"
 
 #. Hostname
 #: i18n/english/luasrc/i18n/default.en.lua:42
-msgid "hostname"
+msgid "Hostname"
 msgstr "Hostname"
 
 #. Install
 #: i18n/english/luasrc/i18n/default.en.lua:43
-msgid "install"
+msgid "Install"
 msgstr "Installa"
 
 #. installed
@@ -236,102 +236,102 @@ msgstr "installato"
 
 #. Interface
 #: i18n/english/luasrc/i18n/default.en.lua:45
-msgid "interface"
+msgid "Interface"
 msgstr "Interfaccia"
 
 #. Interfaces
 #: i18n/english/luasrc/i18n/default.en.lua:46
-msgid "interfaces"
+msgid "Interfaces"
 msgstr "Interfacce"
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address
 #: i18n/english/luasrc/i18n/default.en.lua:47
-msgid "ipaddress"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
 msgstr "Indirizzo <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
 
 #. <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address
 #: i18n/english/luasrc/i18n/default.en.lua:48
-msgid "ip6address"
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address"
 msgstr "Indirizzo <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>"
 
 #. Legend
 #: i18n/english/luasrc/i18n/default.en.lua:49
-msgid "legend"
+msgid "Legend"
 msgstr "Legenda"
 
 #. Library
 #: i18n/english/luasrc/i18n/default.en.lua:50
-msgid "library"
+msgid "Library"
 msgstr "Libreria"
 
 #. Logout
 #: i18n/english/luasrc/i18n/default.en.lua:51
-msgid "logout"
+msgid "Logout"
 msgstr "Logout"
 
 #. Key
 #: i18n/english/luasrc/i18n/default.en.lua:52
-msgid "key"
+msgid "Key"
 msgstr "Chiave"
 
 #. Language
 #: i18n/english/luasrc/i18n/default.en.lua:53
-msgid "language"
+msgid "Language"
 msgstr "Lingua"
 
 #. Limit
 #: i18n/english/luasrc/i18n/default.en.lua:54
-msgid "limit"
+msgid "Limit"
 msgstr "Limite"
 
 #. Load
 #: i18n/english/luasrc/i18n/default.en.lua:55
-msgid "load"
+msgid "Load"
 msgstr "Carico"
 
 #. Login
 #: i18n/english/luasrc/i18n/default.en.lua:56
-msgid "login"
+msgid "Login"
 msgstr "Login"
 
 #. <abbr title=\"Media Access Control\">MAC</abbr>-Address
 #: i18n/english/luasrc/i18n/default.en.lua:57
-msgid "macaddress"
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr "Indirizzo <abbr title=\"Media Access Control\">MAC</abbr>"
 
 #. see &#39;%s&#39; manpage
 #: i18n/english/luasrc/i18n/default.en.lua:58
-msgid "manpage"
+msgid "see '%s' manpage"
 msgstr "leggi il manuale di &#39;%s&#39;"
 
 #. Metric
 #: i18n/english/luasrc/i18n/default.en.lua:59
-msgid "metric"
+msgid "Metric"
 msgstr "Metrica"
 
 #. Mode
 #: i18n/english/luasrc/i18n/default.en.lua:60
-msgid "mode"
+msgid "Mode"
 msgstr "Modalità"
 
 #. Name
 #: i18n/english/luasrc/i18n/default.en.lua:61
-msgid "name"
+msgid "Name"
 msgstr "Nome"
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask
 #: i18n/english/luasrc/i18n/default.en.lua:62
-msgid "netmask"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr "Maschera di rete <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>"
 
 #. Network
 #: i18n/english/luasrc/i18n/default.en.lua:63
-msgid "network"
+msgid "Network"
 msgstr "Rete"
 
 #. Networks
 #: i18n/english/luasrc/i18n/default.en.lua:64
-msgid "networks"
+msgid "Networks"
 msgstr "Reti"
 
 #. none
@@ -341,117 +341,117 @@ msgstr "nessuna"
 
 #. not installed
 #: i18n/english/luasrc/i18n/default.en.lua:66
-msgid "notinstalled"
+msgid "not installed"
 msgstr "non installato"
 
 #. OK
 #: i18n/english/luasrc/i18n/default.en.lua:67
-msgid "ok"
+msgid "OK"
 msgstr "OK"
 
 #. Options
 #: i18n/english/luasrc/i18n/default.en.lua:68
-msgid "options"
+msgid "Options"
 msgstr "Opzioni"
 
 #. Overview
 #: i18n/english/luasrc/i18n/default.en.lua:69
-msgid "overview"
+msgid "Overview"
 msgstr "Riassunto"
 
 #. Package Manager
 #: i18n/english/luasrc/i18n/default.en.lua:70
-msgid "packagemanager"
+msgid "Package Manager"
 msgstr "Gestore pacchetti"
 
 #. Password
 #: i18n/english/luasrc/i18n/default.en.lua:71
-msgid "password"
+msgid "Password"
 msgstr "Password"
 
 #. Path
 #: i18n/english/luasrc/i18n/default.en.lua:72
-msgid "path"
+msgid "Path"
 msgstr "Percorso"
 
 #. Port
 #: i18n/english/luasrc/i18n/default.en.lua:73
-msgid "port"
+msgid "Port"
 msgstr "Porta"
 
 #. Ports
 #: i18n/english/luasrc/i18n/default.en.lua:74
-msgid "ports"
+msgid "Ports"
 msgstr "Porte"
 
 #. Proceed
 #: i18n/english/luasrc/i18n/default.en.lua:75
-msgid "proceed"
+msgid "Proceed"
 msgstr "Continuare"
 
 #. Protocol
 #: i18n/english/luasrc/i18n/default.en.lua:76
-msgid "protocol"
+msgid "Protocol"
 msgstr "Protocollo"
 
 #. Reboot
 #: i18n/english/luasrc/i18n/default.en.lua:77
-msgid "reboot"
+msgid "Reboot"
 msgstr "Riavvia"
 
 #. Reset
 #: i18n/english/luasrc/i18n/default.en.lua:78
-msgid "reset"
+msgid "Reset"
 msgstr "Reset"
 
 #. Revert
 #: i18n/english/luasrc/i18n/default.en.lua:79
-msgid "revert"
+msgid "Revert"
 msgstr "Ripristina"
 
 #. Save
 #: i18n/english/luasrc/i18n/default.en.lua:80
-msgid "save"
+msgid "Save"
 msgstr "Salva"
 
 #. Save &amp; Apply
 #: i18n/english/luasrc/i18n/default.en.lua:81
-msgid "saveapply"
+msgid "Save & Apply"
 msgstr "Salva &amp; applica"
 
 #. Scan
 #: i18n/english/luasrc/i18n/default.en.lua:82
-msgid "scan"
+msgid "Scan"
 msgstr "Scan"
 
 #. Service
 #: i18n/english/luasrc/i18n/default.en.lua:83
-msgid "service"
+msgid "Service"
 msgstr "Servizio"
 
 #. Services
 #: i18n/english/luasrc/i18n/default.en.lua:84
-msgid "services"
+msgid "Services"
 msgstr "Servizi"
 
 #. Settings
 #: i18n/english/luasrc/i18n/default.en.lua:85
-msgid "settings"
+msgid "Settings"
 msgstr "Impostazioni"
 
 #. Size
 #: i18n/english/luasrc/i18n/default.en.lua:86
-msgid "size"
+msgid "Size"
 msgstr "Dimensione"
 
 #. Source
 #: i18n/english/luasrc/i18n/default.en.lua:87
-msgid "source"
+msgid "Source"
 msgstr "Origine"
 
 #. Start
 #: i18n/english/luasrc/i18n/default.en.lua:88
-msgid "start"
+msgid "Start"
 msgstr "Inizio"
 
 #. static
@@ -461,72 +461,72 @@ msgstr "statico"
 
 #. Status
 #: i18n/english/luasrc/i18n/default.en.lua:90
-msgid "status"
+msgid "Status"
 msgstr "Stato"
 
 #. Statistics
 #: i18n/english/luasrc/i18n/default.en.lua:91
-msgid "statistics"
+msgid "Statistics"
 msgstr "Statistiche"
 
 #. Submit
 #: i18n/english/luasrc/i18n/default.en.lua:92
-msgid "submit"
+msgid "Submit"
 msgstr "Invia"
 
 #. System Log
 #: i18n/english/luasrc/i18n/default.en.lua:93
-msgid "syslog"
+msgid "System Log"
 msgstr "Log di sistema"
 
 #. System
 #: i18n/english/luasrc/i18n/default.en.lua:94
-msgid "system"
+msgid "System"
 msgstr "Sistema"
 
 #. Target
 #: i18n/english/luasrc/i18n/default.en.lua:95
-msgid "target"
+msgid "Target"
 msgstr "Destinazione"
 
 #. Timezone
 #: i18n/english/luasrc/i18n/default.en.lua:96
-msgid "timezone"
+msgid "Timezone"
 msgstr "Fuso orario"
 
 #. Type
 #: i18n/english/luasrc/i18n/default.en.lua:97
-msgid "type"
+msgid "Type"
 msgstr "Tipo"
 
 #. Unknown Error
 #: i18n/english/luasrc/i18n/default.en.lua:98
-msgid "unknownerror"
+msgid "Unknown Error"
 msgstr "Errore sconosciuto"
 
 #. Unsaved Changes
 #: i18n/english/luasrc/i18n/default.en.lua:99
-msgid "unsavedchanges"
+msgid "Unsaved Changes"
 msgstr "Modifiche non salvate"
 
 #. Username
 #: i18n/english/luasrc/i18n/default.en.lua:100
-msgid "username"
+msgid "Username"
 msgstr "Username"
 
 #. Version
 #: i18n/english/luasrc/i18n/default.en.lua:101
-msgid "version"
+msgid "Version"
 msgstr "Versione"
 
 #. Web <abbr title=\"User Interface\">UI</abbr>
 #: i18n/english/luasrc/i18n/default.en.lua:102
-msgid "webui"
+msgid "Web <abbr title=\"User Interface\">UI</abbr>"
 msgstr "<abbr title=\"User Interface\">UI</abbr> web"
 
 #. Wifi
 #: i18n/english/luasrc/i18n/default.en.lua:103
-msgid "wifi"
+msgid "Wifi"
 msgstr "Wifi"
 
 #. Zone
diff --git a/po/it/freifunk.po b/po/it/freifunk.po
index 01af3dde7..017e3b9e2 100644
--- a/po/it/freifunk.po
+++ b/po/it/freifunk.po
@@ -14,201 +14,201 @@ msgstr ""
 
 #. Hello and welcome in the network of
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:1
-msgid "ff_hellonet"
+msgid "Hello and welcome in the network of"
 msgstr ""
 
 #. We are an initiative to establish a free, independent and open wireless mesh network.
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:2
-msgid "ff_public1"
+msgid "We are an initiative to establish a free, independent and open wireless mesh network."
 msgstr ""
 
 #. This is the access point
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:3
-msgid "ff_public2"
+msgid "This is the access point"
 msgstr ""
 
 #. It is operated by
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:4
-msgid "ff_public3"
+msgid "It is operated by"
 msgstr ""
 
 #. You can find further information about the global Freifunk initiative at
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:5
-msgid "ff_public4"
+msgid "You can find further information about the global Freifunk initiative at"
 msgstr ""
 
 #. If you are interested in our project then contact the local community
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:6
-msgid "ff_public5"
+msgid "If you are interested in our project then contact the local community"
 msgstr ""
 
 #. Internet access depends on technical and organisational conditions and may or may not work for you.
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:7
-msgid "ff_public6"
+msgid "Internet access depends on technical and organisational conditions and may or may not work for you."
 msgstr ""
 
 #. Location
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:8
-msgid "ff_location"
+msgid "Location"
 msgstr ""
 
 #. E-Mail
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:9
-msgid "ff_mail"
+msgid "E-Mail"
 msgstr ""
 
 #. You really should provide your address here!
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:10
-msgid "ff_mail1"
+msgid "You really should provide your address here!"
 msgstr ""
 
 #. Nickname
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:11
-msgid "ff_nickname"
+msgid "Nickname"
 msgstr ""
 
 #. Realname
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:12
-msgid "ff_name"
+msgid "Realname"
 msgstr ""
 
 #. Node
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:13
-msgid "ff_node"
+msgid "Node"
 msgstr ""
 
 #. Notice
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:14
-msgid "ff_note"
+msgid "Notice"
 msgstr ""
 
 #. Phone
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:15
-msgid "ff_phone"
+msgid "Phone"
 msgstr ""
 
 #. Memory
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:16
-msgid "ff_ram"
+msgid "Memory"
 msgstr ""
 
 #. Free
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:17
-msgid "ff_free"
+msgid "Free"
 msgstr ""
 
 #. Buffers
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:18
-msgid "ff_buffers"
+msgid "Buffers"
 msgstr ""
 
 #. Cached
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:19
-msgid "ff_cached"
+msgid "Cached"
 msgstr ""
 
 #. Total
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:20
-msgid "ff_total"
+msgid "Total"
 msgstr ""
 
 #. Coordinates
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:21
-msgid "ff_geocoord"
+msgid "Coordinates"
 msgstr ""
 
 #. Client-Splash
-msgid "ff_splash"
+msgid "Client-Splash"
 msgstr ""
 
 #. Active Clients
-msgid "ff_splash_clients"
+msgid "Active Clients"
 msgstr ""
 
 #. Hostname
-msgid "ff_splash_hostname"
+msgid "Hostname"
 msgstr ""
 
 #. IP Address
-msgid "ff_splash_ip"
+msgid "IP Address"
 msgstr ""
 
 #. MAC Address
-msgid "ff_splash_mac"
+msgid "MAC Address"
 msgstr ""
 
 #. Time remaining
-msgid "ff_splash_timeleft"
+msgid "Time remaining"
 msgstr ""
 
 #. Outgoing traffic
-msgid "ff_splash_traffic"
+msgid "Traffic (down/up)"
 msgstr ""
 
 #. Policy
-msgid "ff_splash_policy"
+msgid "Policy"
 msgstr ""
 
 #. unknown
-msgid "ff_splash_unknown"
+msgid "unknown"
 msgstr ""
 
 #. expired
-msgid "ff_splash_expired"
+msgid "expired"
 msgstr ""
 
 #. whitelisted
-msgid "ff_splash_whitelisted"
+msgid "whitelisted"
 msgstr ""
 
 #. splashed
-msgid "ff_splash_splashed"
+msgid "splashed"
 msgstr ""
 
 #. blacklisted
-msgid "ff_splash_blacklisted"
+msgid "blacklisted"
 msgstr ""
 
 #. temporarily blocked
-msgid "ff_splash_tempblock"
+msgid "temporarily blocked"
 msgstr ""
 
 #. No clients connected
-msgid "ff_splash_noclients"
+msgid "No clients connected"
 msgstr ""
 
 #. P2P-Block
-msgid "ff_p2pblock"
+msgid "P2P-Block"
 msgstr ""
 
 #. P2P-Block is a greylisting mechanism to block various peer-to-peer protocols for non-whitelisted clients.
-msgid "ff_p2pblock_desc"
+msgid "P2P-Block is a greylisting mechanism to block various peer-to-peer protocols for non-whitelisted clients."
 msgstr ""
 
 #. Enable P2P-Block
-msgid "ff_p2pblock_enabled"
+msgid "Enable P2P-Block"
 msgstr ""
 
 #. Portrange
-msgid "ff_p2pblock_portrange"
+msgid "Portrange"
 msgstr ""
 
 #. Block Time
-msgid "ff_p2pblock_blocktime"
+msgid "Block Time"
 msgstr ""
 
 #. seconds
-msgid "ff_p2pblock_blocktime_desc"
+msgid "seconds"
 msgstr ""
 
 #. Whitelisted IPs
-msgid "ff_p2pblock_whitelist"
+msgid "Whitelisted IPs"
 msgstr ""
 
 #. Layer7-Protokolle
-msgid "ff_p2pblock_layer7"
+msgid "Layer7-Protocols"
 msgstr ""
 
 #. IP-P2P
-msgid "ff_p2pblock_ipp2p"
+msgid "IP-P2P"
 msgstr ""
diff --git a/po/it/hd_idle.po b/po/it/hd_idle.po
index 35c16523e..7894415e2 100644
--- a/po/it/hd_idle.po
+++ b/po/it/hd_idle.po
@@ -14,35 +14,35 @@ msgstr ""
 
 #. Disk
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:1
-msgid "disk"
+msgid "Disk"
 msgstr ""
 
 #. Enable debug
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:2
-msgid "enable_debug"
+msgid "Enable debug"
 msgstr ""
 
 #. hd-idle
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:3
-msgid "hd_idle"
+msgid "hd-idle"
 msgstr ""
 
 #. hd-idle is a utility program for spinning-down external disks after a period of idle time.
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:4
-msgid "hd_idle_desc"
+msgid "hd-idle is a utility program for spinning-down external disks after a period of idle time."
 msgstr ""
 
 #. Idle-Time
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:5
-msgid "idle_time_interval"
+msgid "Idle-Time"
 msgstr ""
 
 #. Idle-Time unit
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:6
-msgid "idle_time_unit"
+msgid "Idle-Time unit"
 msgstr ""
 
 #. Settings
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:7
-msgid "settings"
+msgid "Settings"
 msgstr ""
diff --git a/po/it/initmgr.po b/po/it/initmgr.po
index f7670caa9..53b6e9e1d 100644
--- a/po/it/initmgr.po
+++ b/po/it/initmgr.po
@@ -14,22 +14,22 @@ msgstr ""
 
 #. Initscripts
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:1
-msgid "initmgr"
+msgid "Initscripts"
 msgstr ""
 
 #. You can enable or disable installed init scripts here. Changes will applied after a device reboot.<br /><strong>Warning: If you disable essential init scripts like &quot;network&quot;, your device might become inaccesable!</strong>
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:2
-msgid "initmgr_desc"
+msgid "You can enable or disable installed init scripts here. Changes will applied after a device reboot.<br /><strong>Warning: If you disable essential init scripts like \"network\", your device might become inaccesable!</strong>"
 msgstr ""
 
 #. Start priority
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:3
-msgid "initmgr_index"
+msgid "Start priority"
 msgstr ""
 
 #. Initscript
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:4
-msgid "initmgr_name"
+msgid "Initscript"
 msgstr ""
 
 #. Enable/Disable
diff --git a/po/it/livestats.po b/po/it/livestats.po
index d14541ae1..5a1b08d37 100644
--- a/po/it/livestats.po
+++ b/po/it/livestats.po
@@ -14,32 +14,32 @@ msgstr ""
 
 #. incoming
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:1
-msgid "livestats_incoming"
+msgid "incoming"
 msgstr ""
 
 #. outgoing
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:2
-msgid "livestats_outgoing"
+msgid "outgoing"
 msgstr ""
 
 #. traffic on
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:3
-msgid "livestats_traffic"
+msgid "traffic on"
 msgstr ""
 
 #. signal-to-noise ratio for
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:4
-msgid "livestats_wifi"
+msgid "signal-to-noise ratio for"
 msgstr ""
 
 #. load average
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:5
-msgid "livestats_loadavg"
+msgid "load average"
 msgstr ""
 
 #. Realtime Wireless Status
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:6
-msgid "livestats_stat_wireless"
+msgid "Realtime Wireless Status"
 msgstr ""
 
 #. Realtime Network Traffic
diff --git a/po/it/luci-fw.po b/po/it/luci-fw.po
index 8a98514d6..a40effdc3 100644
--- a/po/it/luci-fw.po
+++ b/po/it/luci-fw.po
@@ -14,277 +14,277 @@ msgstr ""
 
 #. Port forwarding
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:1
-msgid "fw_portfw"
+msgid "Port forwarding"
 msgstr ""
 
 #. Traffic Redirection
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:2
-msgid "fw_redirect"
+msgid "Traffic Redirection"
 msgstr ""
 
 #. Traffic redirection allows you to change the destination address of forwarded packets.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:3
-msgid "fw_redirect_desc"
+msgid "Traffic redirection allows you to change the destination address of forwarded packets."
 msgstr ""
 
 #. Zone-to-Zone traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:4
-msgid "fw_forwarding"
+msgid "Zone-to-Zone traffic"
 msgstr ""
 
 #. Firewall
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:5
-msgid "fw_fw"
+msgid "Firewall"
 msgstr ""
 
 #. Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:6
-msgid "fw_zone"
+msgid "Zone"
 msgstr ""
 
 #. Zones
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:7
-msgid "fw_zones"
+msgid "Zones"
 msgstr ""
 
 #. Custom forwarding
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:8
-msgid "fw_custfwd"
+msgid "Custom forwarding"
 msgstr ""
 
 #. The firewall creates zones over your network interfaces to control network traffic flow.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:9
-msgid "fw_fw1"
+msgid "The firewall creates zones over your network interfaces to control network traffic flow."
 msgstr ""
 
 #. Advanced Rules
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:10
-msgid "firewall_rule"
+msgid "Advanced Rules"
 msgstr ""
 
 #. Advanced rules let you customize the firewall to your needs. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:11
-msgid "firewall_rule_desc"
+msgid "Advanced rules let you customize the firewall to your needs. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall."
 msgstr ""
 
 #. Input Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:12
-msgid "firewall_rule_src"
+msgid "Input Zone"
 msgstr ""
 
 #. Output Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:13
-msgid "firewall_rule_dest"
+msgid "Output Zone"
 msgstr ""
 
 #. Source address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:14
-msgid "firewall_rule_srcip"
+msgid "Source address"
 msgstr ""
 
 #. Destination address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:15
-msgid "firewall_rule_destip"
+msgid "Destination address"
 msgstr ""
 
 #. Source MAC-Address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:16
-msgid "firewall_rule_srcmac"
+msgid "Source MAC-Address"
 msgstr ""
 
 #. Source port
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:17
-msgid "firewall_rule_srcport"
+msgid "Source port"
 msgstr ""
 
 #. Destination port
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:18
-msgid "firewall_rule_destport"
+msgid "Destination port"
 msgstr ""
 
 #. Action
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:19
-msgid "firewall_rule_target"
+msgid "Action"
 msgstr ""
 
 #. accept
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:20
-msgid "fw_accept"
+msgid "accept"
 msgstr ""
 
 #. reject
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:21
-msgid "fw_reject"
+msgid "reject"
 msgstr ""
 
 #. drop
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:22
-msgid "fw_drop"
+msgid "drop"
 msgstr ""
 
 #. Source
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:23
-msgid "fw_src"
+msgid "Source"
 msgstr ""
 
 #. Destination
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:24
-msgid "fw_dest"
+msgid "Destination"
 msgstr ""
 
 #. Traffic Control
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:25
-msgid "fw_traffic"
+msgid "Traffic Control"
 msgstr ""
 
 #. MSS Clamping
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:26
-msgid "fw_mtufix"
+msgid "MSS Clamping"
 msgstr ""
 
 #. Drop invalid packets
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:27
-msgid "fw_dropinvalid"
+msgid "Drop invalid packets"
 msgstr ""
 
 #. Port forwarding allows to provide network services in the internal network to an external network.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:28
-msgid "fw_portfw1"
+msgid "Port forwarding allows to provide network services in the internal network to an external network."
 msgstr ""
 
 #. External Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:29
-msgid "firewall_redirect_src_desc"
+msgid "External Zone"
 msgstr ""
 
 #. External port
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:30
-msgid "firewall_redirect_srcdport"
+msgid "External port"
 msgstr ""
 
 #. port or range as first-last
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:31
-msgid "firewall_redirect_srcdport_desc"
+msgid "port or range as first-last"
 msgstr ""
 
 #. Source address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:32
-msgid "firewall_redirect_srcip"
+msgid "Source address"
 msgstr ""
 
 #. Source MAC
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:33
-msgid "firewall_redirect_srcmac"
+msgid "Source MAC"
 msgstr ""
 
 #. Internal address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:34
-msgid "firewall_redirect_destip"
+msgid "Internal address"
 msgstr ""
 
 #. IP-Address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:35
-msgid "firewall_redirect_destip_desc"
+msgid "IP-Address"
 msgstr ""
 
 #. Internal port (optional)
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:36
-msgid "firewall_redirect_destport"
+msgid "Internal port (optional)"
 msgstr ""
 
 #. port or range as first-last
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:37
-msgid "firewall_redirect_destport_desc"
+msgid "port or range as first-last"
 msgstr ""
 
 #. Here you can specify which network traffic is allowed to flow between network zones. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall. If you experience occasional connection problems try enabling MSS Clamping otherwise disable it for performance reasons.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:38
-msgid "fw_forwarding1"
+msgid "Here you can specify which network traffic is allowed to flow between network zones. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall. If you experience occasional connection problems try enabling MSS Clamping otherwise disable it for performance reasons."
 msgstr ""
 
 #. Input
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:39
-msgid "firewall_forwarding_src"
+msgid "Input"
 msgstr ""
 
 #. Output
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:40
-msgid "firewall_forwarding_dest"
+msgid "Output"
 msgstr ""
 
 #. Defaults
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:41
-msgid "firewall_defaults"
+msgid "Defaults"
 msgstr ""
 
 #. These are the default settings that are used if no other rules match.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:42
-msgid "firewall_defaults_desc"
+msgid "These are the default settings that are used if no other rules match."
 msgstr ""
 
 #. SYN-flood protection
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:43
-msgid "firewall_defaults_synflood"
+msgid "SYN-flood protection"
 msgstr ""
 
 #. Incoming Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:44
-msgid "firewall_defaults_input"
+msgid "Incoming Traffic"
 msgstr ""
 
 #. Outgoing Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:45
-msgid "firewall_defaults_output"
+msgid "Outgoing Traffic"
 msgstr ""
 
 #. Forwarded Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:46
-msgid "firewall_defaults_forward"
+msgid "Forwarded Traffic"
 msgstr ""
 
 #. Zones part the network interfaces into certain isolated areas to separate network traffic. One or more networks can belong to a zone. The MASQ-flag enables NAT masquerading for all outgoing traffic on this zone.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:47
-msgid "firewall_zone_desc"
+msgid "Zones part the network interfaces into certain isolated areas to separate network traffic. One or more networks can belong to a zone. The MASQ-flag enables NAT masquerading for all outgoing traffic on this zone."
 msgstr ""
 
 #. Incoming Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:48
-msgid "firewall_zone_input"
+msgid "Incoming Traffic"
 msgstr ""
 
 #. Default Policy
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:49
-msgid "firewall_zone_input_desc"
+msgid "Default Policy"
 msgstr ""
 
 #. Outgoing Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:50
-msgid "firewall_zone_output"
+msgid "Outgoing Traffic"
 msgstr ""
 
 #. Default Policy
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:51
-msgid "firewall_zone_output_desc"
+msgid "Default Policy"
 msgstr ""
 
 #. Forwarded Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:52
-msgid "firewall_zone_forward"
+msgid "Forwarded Traffic"
 msgstr ""
 
 #. Default Policy
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:53
-msgid "firewall_zone_forward_desc"
+msgid "Default Policy"
 msgstr ""
 
 #. MASQ
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:54
-msgid "firewall_zone_masq"
+msgid "MASQ"
 msgstr ""
 
 #. Networks
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:55
-msgid "firewall_zone_network"
+msgid "Networks"
 msgstr ""
 
 #. contained networks
diff --git a/po/it/mmc_over_gpio.po b/po/it/mmc_over_gpio.po
index a3f97bdab..62b202a9e 100644
--- a/po/it/mmc_over_gpio.po
+++ b/po/it/mmc_over_gpio.po
@@ -14,15 +14,15 @@ msgstr ""
 
 #. MMC/SD driver configuration
 #: applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua:1
-msgid "mmc_over_gpio"
+msgid "MMC/SD driver configuration"
 msgstr ""
 
 #. MMC/SD driver configuration
 #: applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua:2
-msgid "mmc_over_gpio_desc"
+msgid "MMC/SD driver configuration"
 msgstr ""
 
 #. Settings
 #: applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua:3
-msgid "settings"
+msgid "Settings"
 msgstr ""
diff --git a/po/it/ntpc.po b/po/it/ntpc.po
index d349e7ebc..b1e6417dc 100644
--- a/po/it/ntpc.po
+++ b/po/it/ntpc.po
@@ -14,42 +14,42 @@ msgstr ""
 
 #. Time Synchronisation
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:1
-msgid "ntpc"
+msgid "Time Synchronisation"
 msgstr ""
 
 #. Synchronizes the system time
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:2
-msgid "ntpc_desc"
+msgid "Synchronizes the system time"
 msgstr ""
 
 #. Time Server
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:3
-msgid "ntpc_timeserver"
+msgid "Time Server"
 msgstr ""
 
 #. Update Interval (in s)
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:4
-msgid "ntpc_interval"
+msgid "Update Interval (in s)"
 msgstr ""
 
 #. Count of Time Measurements
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:5
-msgid "ntpc_count"
+msgid "Count of Time Measurements"
 msgstr ""
 
 #. empty = infinite
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:6
-msgid "ntpc_count_desc"
+msgid "empty = infinite"
 msgstr ""
 
 #. Clock Adjustment
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:7
-msgid "ntpc_drift"
+msgid "Clock Adjustment"
 msgstr ""
 
 #. Offset Frequency
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:8
-msgid "ntpc_drift_freq"
+msgid "Offset Frequency"
 msgstr ""
 
 #. Current system time
diff --git a/po/it/olsr.po b/po/it/olsr.po
index 95dfeb8dd..c1fe81b99 100644
--- a/po/it/olsr.po
+++ b/po/it/olsr.po
@@ -14,637 +14,637 @@ msgstr ""
 
 #. OLSR Daemon
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:1
-msgid "olsrd"
+msgid "OLSR Daemon"
 msgstr ""
 
 #. Neighbour IP
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:2
-msgid "olsrd_neighbour_ip"
+msgid "Neighbour IP"
 msgstr ""
 
 #. Local interface IP
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:3
-msgid "olsrd_local_ip"
+msgid "Local interface IP"
 msgstr ""
 
 #. Announced network
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:4
-msgid "olsrd_network"
+msgid "Announced network"
 msgstr ""
 
 #. OLSR gateway
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:5
-msgid "olsrd_gateway"
+msgid "OLSR gateway"
 msgstr ""
 
 #. OLSR node
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:6
-msgid "olsrd_node"
+msgid "OLSR node"
 msgstr ""
 
 #. Unable to connect to the OLSR daemon!
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:7
-msgid "olsrd_error"
+msgid "Unable to connect to the OLSR daemon!"
 msgstr ""
 
 #. Make sure that OLSRd is running, the &quot;txtinfo&quot; plugin is loaded, configured on port 2006 and accepts connections from &quot;127.0.0.1&quot;.
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:8
-msgid "olsrd_error_desc"
+msgid "Make sure that OLSRd is running, the \"txtinfo\" plugin is loaded, configured on port 2006 and accepts connections from \"127.0.0.1\"."
 msgstr ""
 
 #. OLSR - HNA-Announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:9
-msgid "olsrd_hna"
+msgid "OLSR - HNA-Announcements"
 msgstr ""
 
 #. OLSR - Plugins
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:10
-msgid "olsrd_plugins"
+msgid "OLSR - Plugins"
 msgstr ""
 
 #. OLSR connections
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:11
-msgid "olsrd_links"
+msgid "OLSR connections"
 msgstr ""
 
 #. Overview of currently established OLSR connections
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:12
-msgid "olsrd_links_desc"
+msgid "Overview of currently established OLSR connections"
 msgstr ""
 
 #. Expected retransmission count
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:13
-msgid "olsrd_links_etx_desc"
+msgid "Expected retransmission count"
 msgstr ""
 
 #. Success rate of sent packages
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:14
-msgid "olsrd_links_lq_desc"
+msgid "Success rate of sent packages"
 msgstr ""
 
 #. Success rate of received packages
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:15
-msgid "olsrd_links_nlq_desc"
+msgid "Success rate of received packages"
 msgstr ""
 
 #. Known OLSR routes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:16
-msgid "olsrd_routes"
+msgid "Known OLSR routes"
 msgstr ""
 
 #. Overview of currently known routes to other OLSR nodes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:17
-msgid "olsrd_routes_desc"
+msgid "Overview of currently known routes to other OLSR nodes"
 msgstr ""
 
 #. Active OLSR nodes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:18
-msgid "olsrd_topology"
+msgid "Active OLSR nodes"
 msgstr ""
 
 #. Overview of currently known OLSR nodes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:19
-msgid "olsrd_topology_desc"
+msgid "Overview of currently known OLSR nodes"
 msgstr ""
 
 #. Last hop
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:20
-msgid "olsrd_topology_lasthop"
+msgid "Last hop"
 msgstr ""
 
 #. Active host net announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:21
-msgid "olsrd_hna2"
+msgid "Active host net announcements"
 msgstr ""
 
 #. Overview of currently active OLSR host net announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:22
-msgid "olsrd_hna_desc"
+msgid "Overview of currently active OLSR host net announcements"
 msgstr ""
 
 #. Active MID announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:23
-msgid "olsrd_mid"
+msgid "Active MID announcements"
 msgstr ""
 
 #. Overview of known multiple interface announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:24
-msgid "olsrd_mid_desc"
+msgid "Overview of known multiple interface announcements"
 msgstr ""
 
 #. Secondary OLSR interfaces
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:25
-msgid "olsrd_mid_aliases"
+msgid "Secondary OLSR interfaces"
 msgstr ""
 
 #. Freifunk
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:26
-msgid "olsrd_etx_ff"
+msgid "Freifunk"
 msgstr ""
 
 #. floating point
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:27
-msgid "olsrd_etx_float"
+msgid "floating point"
 msgstr ""
 
 #. fixed point math
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:28
-msgid "olsrd_etx_fpm"
+msgid "fixed point math"
 msgstr ""
 
 #. General settings
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:29
-msgid "olsrd_olsrd"
+msgid "General settings"
 msgstr ""
 
 #. Start without network
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:30
-msgid "olsrd_olsrd_allownoint"
+msgid "Start without network"
 msgstr ""
 
 #. Clear screen
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:31
-msgid "olsrd_olsrd_clearscreen"
+msgid "Clear screen"
 msgstr ""
 
 #. Debugmode
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:32
-msgid "olsrd_olsrd_debuglevel"
+msgid "Debugmode"
 msgstr ""
 
 #. FIB metric
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:33
-msgid "olsrd_olsrd_fibmetric"
+msgid "FIB metric"
 msgstr ""
 
 #. Internet protocol
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:34
-msgid "olsrd_olsrd_ipversion"
+msgid "Internet protocol"
 msgstr ""
 
 #. LQ aging
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:35
-msgid "olsrd_olsrd_linkqualityaging"
+msgid "LQ aging"
 msgstr ""
 
 #. LQ algorithm
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:36
-msgid "olsrd_olsrd_linkqualityalgorithm"
+msgid "LQ algorithm"
 msgstr ""
 
 #. LQ Dijkstra limit
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:37
-msgid "olsrd_olsrd_linkqualitydijkstralimit"
+msgid "LQ Dijkstra limit"
 msgstr ""
 
 #. LQ fisheye
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:38
-msgid "olsrd_olsrd_linkqualityfisheye"
+msgid "LQ fisheye"
 msgstr ""
 
 #. LQ level
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:39
-msgid "olsrd_olsrd_linkqualitylevel"
+msgid "LQ level"
 msgstr ""
 
 #. MPR selection
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:40
-msgid "olsrd_olsrd_linkqualitylevel_1"
+msgid "MPR selection"
 msgstr ""
 
 #. MPR selection and routing
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:41
-msgid "olsrd_olsrd_linkqualitylevel_2"
+msgid "MPR selection and routing"
 msgstr ""
 
 #. LQ window size
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:42
-msgid "olsrd_olsrd_linkqualitywinsize"
+msgid "LQ window size"
 msgstr ""
 
 #. MPR coverage
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:43
-msgid "olsrd_olsrd_mprcoverage"
+msgid "MPR coverage"
 msgstr ""
 
 #. Pollrate
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:44
-msgid "olsrd_olsrd_pollrate"
+msgid "Pollrate"
 msgstr ""
 
 #. TC redundancy
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:45
-msgid "olsrd_olsrd_tcredundancy"
+msgid "TC redundancy"
 msgstr ""
 
 #. MPR selectors
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:46
-msgid "olsrd_olsrd_tcredundancy_0"
+msgid "MPR selectors"
 msgstr ""
 
 #. MPR selectors and MPR
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:47
-msgid "olsrd_olsrd_tcredundancy_1"
+msgid "MPR selectors and MPR"
 msgstr ""
 
 #. all neighbours
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:48
-msgid "olsrd_olsrd_tcredundancy_2"
+msgid "all neighbours"
 msgstr ""
 
 #. Use hysteresis
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:49
-msgid "olsrd_olsrd_usehysteresis"
+msgid "Use hysteresis"
 msgstr ""
 
 #. Willingness
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:50
-msgid "olsrd_olsrd_willingness"
+msgid "Willingness"
 msgstr ""
 
 #. Hello interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:51
-msgid "olsrd_interface_hellointerval"
+msgid "Hello interval"
 msgstr ""
 
 #. Hello validity time
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:52
-msgid "olsrd_interface_hellovaliditytime"
+msgid "Hello validity time"
 msgstr ""
 
 #. HNA interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:53
-msgid "olsrd_interface_hnainterval"
+msgid "HNA interval"
 msgstr ""
 
 #. HNA validity time
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:54
-msgid "olsrd_interface_hnavaliditytime"
+msgid "HNA validity time"
 msgstr ""
 
 #. IPv4 broadcast
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:55
-msgid "olsrd_interface_ip4broadcast"
+msgid "IPv4 broadcast"
 msgstr ""
 
 #. MID interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:56
-msgid "olsrd_interface_midinterval"
+msgid "MID interval"
 msgstr ""
 
 #. MID validity time
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:57
-msgid "olsrd_interface_midvaliditytime"
+msgid "MID validity time"
 msgstr ""
 
 #. TC interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:58
-msgid "olsrd_interface_tcinterval"
+msgid "TC interval"
 msgstr ""
 
 #. TC validity time
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:59
-msgid "olsrd_interface_tcvaliditytime"
+msgid "TC validity time"
 msgstr ""
 
 #. IPv6 address type
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:60
-msgid "olsrd_interface_ip6addrtype"
+msgid "IPv6 address type"
 msgstr ""
 
 #. IPC settings
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:61
-msgid "olsrd_ipcconnect"
+msgid "IPC settings"
 msgstr ""
 
 #. IPC connections enable you to remote-control the local OLSRd instance using external programs
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:62
-msgid "olsrd_ipcconnect_desc"
+msgid "IPC connections enable you to remote-control the local OLSRd instance using external programs"
 msgstr ""
 
 #. Allowed host addresses
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:63
-msgid "olsrd_ipcconnect_host"
+msgid "Allowed host addresses"
 msgstr ""
 
 #. Multiple separated by spaces
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:64
-msgid "olsrd_ipcconnect_host_desc"
+msgid "Multiple separated by spaces"
 msgstr ""
 
 #. Maxmimum connection count
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:65
-msgid "olsrd_ipcconnect_maxconnections"
+msgid "Maxmimum connection count"
 msgstr ""
 
 #. Set to 0 to disable IPC
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:66
-msgid "olsrd_ipcconnect_maxconnections_desc"
+msgid "Set to 0 to disable IPC"
 msgstr ""
 
 #. Allowed subnets
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:67
-msgid "olsrd_ipcconnect_net"
+msgid "Allowed subnets"
 msgstr ""
 
 #. Address Mask; multiple separated by space
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:68
-msgid "olsrd_ipcconnect_net_desc"
+msgid "Address Mask; multiple separated by space"
 msgstr ""
 
 #. IPv4 HNA announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:69
-msgid "olsrd_hna4"
+msgid "IPv4 HNA announcements"
 msgstr ""
 
 #. Hna4 entries allow you to propagate local IPv4 host- and network-routes into the mesh network
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:70
-msgid "olsrd_hna4_desc"
+msgid "Hna4 entries allow you to propagate local IPv4 host- and network-routes into the mesh network"
 msgstr ""
 
 #. Network address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:71
-msgid "olsrd_hna4_netaddr"
+msgid "Network address"
 msgstr ""
 
 #. IPv4 address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:72
-msgid "olsrd_hna4_netaddr_desc"
+msgid "IPv4 address"
 msgstr ""
 
 #. Netmask
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:73
-msgid "olsrd_hna4_netmask"
+msgid "Netmask"
 msgstr ""
 
 #. IPv4 address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:74
-msgid "olsrd_hna4_netmask_desc"
+msgid "IPv4 address"
 msgstr ""
 
 #. IPv6 HNA announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:75
-msgid "olsrd_hna6"
+msgid "IPv6 HNA announcements"
 msgstr ""
 
 #. Hna6 entries allow you to propagate local IPv6 host- and network-routes into the mesh network
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:76
-msgid "olsrd_hna6_desc"
+msgid "Hna6 entries allow you to propagate local IPv6 host- and network-routes into the mesh network"
 msgstr ""
 
 #. Network address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:77
-msgid "olsrd_hna6_netaddr"
+msgid "Network address"
 msgstr ""
 
 #. IPv6 address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:78
-msgid "olsrd_hna6_netaddr_desc"
+msgid "IPv6 address"
 msgstr ""
 
 #. Prefix
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:79
-msgid "olsrd_hna6_prefix"
+msgid "Prefix"
 msgstr ""
 
 #. IPv6 prefix
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:80
-msgid "olsrd_hna6_prefix_desc"
+msgid "IPv6 prefix"
 msgstr ""
 
 #. Plugin configuration
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:81
-msgid "olsrd_loadplugin"
+msgid "Plugin configuration"
 msgstr ""
 
 #. Enable plugin
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:82
-msgid "olsrd_loadplugin_ignore"
+msgid "Enable plugin"
 msgstr ""
 
 #. Library
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:83
-msgid "olsrd_loadplugin_library"
+msgid "Library"
 msgstr ""
 
 #. Allow connections from this hosts
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:84
-msgid "olsrd_loadplugin_accept"
+msgid "Allow connections from this hosts"
 msgstr ""
 
 #. Ping test addresses
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:85
-msgid "olsrd_loadplugin_ping"
+msgid "Ping test addresses"
 msgstr ""
 
 #. Interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:86
-msgid "olsrd_loadplugin_interval"
+msgid "Refresh interval in seconds"
 msgstr ""
 
 #. HNA announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:87
-msgid "olsrd_loadplugin_hna"
+msgid "HNA announcements"
 msgstr ""
 
 #. Format: IP-Address Netmask / OLSR will announce this network once it is reachable
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:88
-msgid "olsrd_loadplugin_hna_desc"
+msgid "Format: IP-Address Netmask / OLSR will announce this network once it is reachable"
 msgstr ""
 
 #. Alternative \"hosts\" file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:89
-msgid "olsrd_loadplugin_addhosts"
+msgid "Alternative \"hosts\" file"
 msgstr ""
 
 #. The contents of this file will be appended to the autogenerated \"hosts\" file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:90
-msgid "olsrd_loadplugin_addhosts_desc"
+msgid "The contents of this file will be appended to the autogenerated \"hosts\" file"
 msgstr ""
 
 #. DNS server
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:91
-msgid "olsrd_loadplugin_dnsserver"
+msgid "DNS server"
 msgstr ""
 
 #. Alternative hostnames
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:92
-msgid "olsrd_loadplugin_hosts"
+msgid "Alternative hostnames"
 msgstr ""
 
 #. Format: Interface-IP Hostname
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:93
-msgid "olsrd_loadplugin_hosts_desc"
+msgid "Format: Interface-IP Hostname"
 msgstr ""
 
 #. Path to the \"hosts\" file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:94
-msgid "olsrd_loadplugin_hostsfile"
+msgid "Path to the \"hosts\" file"
 msgstr ""
 
 #. Latitude
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:95
-msgid "olsrd_loadplugin_lat"
+msgid "Latitude"
 msgstr ""
 
 #. Output file for coordinates
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:96
-msgid "olsrd_loadplugin_latlonfile"
+msgid "Output file for coordinates"
 msgstr ""
 
 #. OLSR will write received coordinates of other nodes to this file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:97
-msgid "olsrd_loadplugin_latlonfile_desc"
+msgid "OLSR will write received coordinates of other nodes to this file"
 msgstr ""
 
 #. Input file for coordinates
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:98
-msgid "olsrd_loadplugin_latloninfile"
+msgid "Input file for coordinates"
 msgstr ""
 
 #. OLSR periodically checks this file for new coordinates and propagates them
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:99
-msgid "olsrd_loadplugin_latloninfile_desc"
+msgid "OLSR periodically checks this file for new coordinates and propagates them"
 msgstr ""
 
 #. Longitude
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:100
-msgid "olsrd_loadplugin_lon"
+msgid "Longitude"
 msgstr ""
 
 #. Hostnames
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:101
-msgid "olsrd_loadplugin_name"
+msgid "Hostnames"
 msgstr ""
 
 #. Command for name changes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:102
-msgid "olsrd_loadplugin_namechangescript"
+msgid "Command for name changes"
 msgstr ""
 
 #. OLSR executes this command once entries in the \"hosts\" are changed
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:103
-msgid "olsrd_loadplugin_namechangescript_desc"
+msgid "OLSR executes this command once entries in the \"hosts\" are changed"
 msgstr ""
 
 #. Path to the \"resolv\" file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:104
-msgid "olsrd_loadplugin_resolvfile"
+msgid "Path to the \"resolv\" file"
 msgstr ""
 
 #. Command for service changes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:105
-msgid "olsrd_loadplugin_serviceschangescript"
+msgid "Command for service changes"
 msgstr ""
 
 #. OLSR excutes this command once new service announcements are received
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:106
-msgid "olsrd_loadplugin_serviceschangescript_desc"
+msgid "OLSR excutes this command once new service announcements are received"
 msgstr ""
 
 #. PID file for SIGHUP signals
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:107
-msgid "olsrd_loadplugin_sighuppidfile"
+msgid "PID file for SIGHUP signals"
 msgstr ""
 
 #. OLSR sends a HUP signal to this PID once the \"hosts\" oder \"resolv\" file is changed
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:108
-msgid "olsrd_loadplugin_sighuppidfile_desc"
+msgid "OLSR sends a HUP signal to this PID once the \"hosts\" oder \"resolv\" file is changed"
 msgstr ""
 
 #. Domain suffix
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:109
-msgid "olsrd_loadplugin_suffix"
+msgid "Domain suffix"
 msgstr ""
 
 #. Timeout
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:110
-msgid "olsrd_loadplugin_timeout"
+msgid "Timeout"
 msgstr ""
 
 #. Name of the BMF interface
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:111
-msgid "olsrd_loadplugin_bmfinterface"
+msgid "Name of the BMF interface"
 msgstr ""
 
 #. IP address of the BMF interface
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:112
-msgid "olsrd_loadplugin_bmfinterfaceid"
+msgid "IP address of the BMF interface"
 msgstr ""
 
 #. Redirect local broadcasts
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:113
-msgid "olsrd_loadplugin_dolocalbroadcast"
+msgid "Redirect local broadcasts"
 msgstr ""
 
 #. Also redirect broadcasts from OLSR interfaces
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:114
-msgid "olsrd_loadplugin_capturepacketsonolsrinterfaces"
+msgid "Also redirect broadcasts from OLSR interfaces"
 msgstr ""
 
 #. Propagation mechanism
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:115
-msgid "olsrd_loadplugin_bmfmechanism"
+msgid "Propagation mechanism"
 msgstr ""
 
 #. Number of retransmissions per package
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:116
-msgid "olsrd_loadplugin_broadcastretransmitcount"
+msgid "Number of retransmissions per package"
 msgstr ""
 
 #. Minimum number of neighbours for broadcast redirection
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:117
-msgid "olsrd_loadplugin_fanoutlimit"
+msgid "Minimum number of neighbours for broadcast redirection"
 msgstr ""
 
 #. Non-OLSR interfaces
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:118
-msgid "olsrd_loadplugin_nonolsrif"
+msgid "Non-OLSR interfaces"
 msgstr ""
 
 #. Used port
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:119
-msgid "olsrd_loadplugin_port"
+msgid "Used port"
 msgstr ""
 
 #. Allow connections from hosts
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:120
-msgid "olsrd_loadplugin_host"
+msgid "Allow connections from hosts"
 msgstr ""
 
 #. Allow connections from subnets
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:121
-msgid "olsrd_loadplugin_net"
+msgid "Allow connections from subnets"
 msgstr ""
 
 #. Format: IP-AddresseNetmask
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:122
-msgid "olsrd_loadplugin_net_desc"
+msgid "Format: IP-AddresseNetmask"
 msgstr ""
 
 #. Used protocols
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:123
-msgid "olsrd_loadplugin_redistribute"
+msgid "Used protocols"
 msgstr ""
 
 #. Only export routes to Quagga or to kernel too
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:124
-msgid "olsrd_loadplugin_exportroutes"
+msgid "Only export routes to Quagga or to kernel too"
 msgstr ""
 
 #. Always prefer local routes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:125
-msgid "olsrd_loadplugin_localpref"
+msgid "Always prefer local routes"
 msgstr ""
 
 #. Distance of exported routes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:126
-msgid "olsrd_loadplugin_distance"
+msgid "Distance of exported routes"
 msgstr ""
 
 #. Key file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:127
-msgid "olsrd_loadplugin_keyfile"
+msgid "Key file"
 msgstr ""
 
 #. Watchdog timestamp file
diff --git a/po/it/openvpn.po b/po/it/openvpn.po
index 418079656..3883ec08e 100644
--- a/po/it/openvpn.po
+++ b/po/it/openvpn.po
@@ -14,947 +14,947 @@ msgstr ""
 
 #. OpenVPN
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:1
-msgid "openvpn"
+msgid "OpenVPN"
 msgstr ""
 
 #. Switch to basic configuration
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:3
-msgid "openvpn_switch_basic"
+msgid "« Switch to basic configuration"
 msgstr ""
 
 #. Switch to advanced configuration
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:4
-msgid "openvpn_switch_advanced"
+msgid "Switch to advanced configuration »"
 msgstr ""
 
 #. Enabled
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:6
-msgid "openvpn_enable"
+msgid "Enabled"
 msgstr ""
 
 #. Started
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:7
-msgid "openvpn_active"
+msgid "Started"
 msgstr ""
 
 #. no
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:8
-msgid "openvpn_active_no"
+msgid "no"
 msgstr ""
 
 #. yes (%i)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:9
-msgid "openvpn_active_yes"
+msgid "yes (%i)"
 msgstr ""
 
 #. Port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:10
-msgid "openvpn_port"
+msgid "Port"
 msgstr ""
 
 #. Protocol
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:11
-msgid "openvpn_proto"
+msgid "Protocol"
 msgstr ""
 
 #. Instance \"%s\"
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:13
-msgid "openvpn_instance"
+msgid "Instance \"%s\""
 msgstr ""
 
 #. OpenVPN instances
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:15
-msgid "openvpn_overview"
+msgid "OpenVPN instances"
 msgstr ""
 
 #. Below is a list of configured OpenVPN instances and their current state
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:16
-msgid "openvpn_overview_desc"
+msgid "Below is a list of configured OpenVPN instances and their current state"
 msgstr ""
 
 #. Daemon configuration
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:18
-msgid "openvpn_service"
+msgid "Daemon configuration"
 msgstr ""
 
 #. Networking options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:19
-msgid "openvpn_networking"
+msgid "Networking options"
 msgstr ""
 
 #. VPN options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:20
-msgid "openvpn_vpn"
+msgid "VPN options"
 msgstr ""
 
 #. Cryptography settings
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:21
-msgid "openvpn_cryptography"
+msgid "Cryptography settings"
 msgstr ""
 
 #. Read configuration options from file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:23
-msgid "openvpn_param_config"
+msgid "Read configuration options from file"
 msgstr ""
 
 #. Local host name or ip address
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:24
-msgid "openvpn_param_local"
+msgid "Local host name or ip address"
 msgstr ""
 
 #. Remote host name or ip address
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:25
-msgid "openvpn_param_remote"
+msgid "Remote host name or ip address"
 msgstr ""
 
 #. Randomly choose remote server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:26
-msgid "openvpn_param_remote_random"
+msgid "Randomly choose remote server"
 msgstr ""
 
 #. Major mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:27
-msgid "openvpn_param_mode"
+msgid "Major mode"
 msgstr ""
 
 #. Use protocol
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:28
-msgid "openvpn_param_proto"
+msgid "Use protocol"
 msgstr ""
 
 #. Connection retry interval
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:29
-msgid "openvpn_param_connect_retry"
+msgid "Connection retry interval"
 msgstr ""
 
 #. Connection timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:30
-msgid "openvpn_param_connect_timeout"
+msgid "Connection timeout"
 msgstr ""
 
 #. Maximum connection attempt retries
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:31
-msgid "openvpn_param_connect_retry_max"
+msgid "Maximum connection attempt retries"
 msgstr ""
 
 #. Try to sense proxy settings automatically
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:32
-msgid "openvpn_param_auto_proxy"
+msgid "Try to sense proxy settings automatically"
 msgstr ""
 
 #. Connect to remote host
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:33
-msgid "openvpn_param_http_proxy"
+msgid "Connect to remote host"
 msgstr ""
 
 #. Retry indefinitely on HTTP proxy errors
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:34
-msgid "openvpn_param_http_proxy_retry"
+msgid "Retry indefinitely on HTTP proxy errors"
 msgstr ""
 
 #. Proxy timeout in seconds
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:35
-msgid "openvpn_param_http_proxy_timeout"
+msgid "Proxy timeout in seconds"
 msgstr ""
 
 #. Set extended HTTP proxy options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:36
-msgid "openvpn_param_http_proxy_option"
+msgid "Set extended HTTP proxy options"
 msgstr ""
 
 #. Connect through Socks5 proxy
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:37
-msgid "openvpn_param_socks_proxy"
+msgid "Connect through Socks5 proxy"
 msgstr ""
 
 #. Retry indefinitely on Socks proxy errors
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:38
-msgid "openvpn_param_socks_proxy_retry"
+msgid "Retry indefinitely on Socks proxy errors"
 msgstr ""
 
 #. If hostname resolve fails, retry
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:39
-msgid "openvpn_param_resolv_retry"
+msgid "If hostname resolve fails, retry"
 msgstr ""
 
 #. Allow remote to change its IP or port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:40
-msgid "openvpn_param_float"
+msgid "Allow remote to change its IP or port"
 msgstr ""
 
 #. Execute shell command on remote ip change
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:41
-msgid "openvpn_param_ipchange"
+msgid "Execute shell command on remote ip change"
 msgstr ""
 
 #. TCP/UDP port # for both local and remote
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:42
-msgid "openvpn_param_port"
+msgid "TCP/UDP port # for both local and remote"
 msgstr ""
 
 #. TCP/UDP port # for local (default=1194)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:43
-msgid "openvpn_param_lport"
+msgid "TCP/UDP port # for local (default=1194)"
 msgstr ""
 
 #. TCP/UDP port # for remote (default=1194)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:44
-msgid "openvpn_param_rport"
+msgid "TCP/UDP port # for remote (default=1194)"
 msgstr ""
 
 #. Bind to local address and port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:45
-msgid "openvpn_param_bind"
+msgid "Bind to local address and port"
 msgstr ""
 
 #. Do not bind to local address and port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:46
-msgid "openvpn_param_nobind"
+msgid "Do not bind to local address and port"
 msgstr ""
 
 #. tun/tap device
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:47
-msgid "openvpn_param_dev"
+msgid "tun/tap device"
 msgstr ""
 
 #. Type of used device
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:48
-msgid "openvpn_param_dev_type"
+msgid "Type of used device"
 msgstr ""
 
 #. Use tun/tap device node
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:49
-msgid "openvpn_param_dev_node"
+msgid "Use tun/tap device node"
 msgstr ""
 
 #. Set the link layer address of the tap device
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:50
-msgid "openvpn_param_lladdr"
+msgid "Set the link layer address of the tap device"
 msgstr ""
 
 #. 'net30', 'p2p', or 'subnet'
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:51
-msgid "openvpn_param_topology"
+msgid "'net30', 'p2p', or 'subnet'"
 msgstr ""
 
 #. Make tun device IPv6 capable
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:52
-msgid "openvpn_param_tun_ipv6"
+msgid "Make tun device IPv6 capable"
 msgstr ""
 
 #. Configure device to use IP address
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:53
-msgid "openvpn_param_ifconfig"
+msgid "Configure device to use IP address"
 msgstr ""
 
 #. Don't actually execute ifconfig
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:54
-msgid "openvpn_param_ifconfig_noexec"
+msgid "Don't actually execute ifconfig"
 msgstr ""
 
 #. Don't warn on ifconfig inconsistencies
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:55
-msgid "openvpn_param_ifconfig_nowarn"
+msgid "Don't warn on ifconfig inconsistencies"
 msgstr ""
 
 #. Add route after establishing connection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:56
-msgid "openvpn_param_route"
+msgid "Add route after establishing connection"
 msgstr ""
 
 #. Specify a default gateway for routes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:57
-msgid "openvpn_param_route_gateway"
+msgid "Specify a default gateway for routes"
 msgstr ""
 
 #. Specify a default metric for routes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:58
-msgid "openvpn_param_route_metric"
+msgid "Specify a default metric for routes"
 msgstr ""
 
 #. Delay n seconds after connection 
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:59
-msgid "openvpn_param_route_delay"
+msgid "Delay n seconds after connection "
 msgstr ""
 
 #. Execute shell cmd after routes are added
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:60
-msgid "openvpn_param_route_up"
+msgid "Execute shell cmd after routes are added"
 msgstr ""
 
 #. Don't add routes automatically
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:61
-msgid "openvpn_param_route_noexec"
+msgid "Don't add routes automatically"
 msgstr ""
 
 #. Don't pull options from server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:62
-msgid "openvpn_param_route_nopull"
+msgid "Don't pull options from server"
 msgstr ""
 
 #. Automatically redirect default route
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:63
-msgid "openvpn_param_redirect_gateway"
+msgid "Automatically redirect default route"
 msgstr ""
 
 #. Pass environment variables to script
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:64
-msgid "openvpn_param_setenv"
+msgid "Pass environment variables to script"
 msgstr ""
 
 #. Shaping for peer bandwidth
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:65
-msgid "openvpn_param_shaper"
+msgid "Shaping for peer bandwidth"
 msgstr ""
 
 #. Set timeouts in server mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:66
-msgid "openvpn_param_keepalive"
+msgid "Set timeouts in server mode"
 msgstr ""
 
 #. tun/tap inactivity timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:67
-msgid "openvpn_param_inactive"
+msgid "tun/tap inactivity timeout"
 msgstr ""
 
 #. Remote ping timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:68
-msgid "openvpn_param_ping_exit"
+msgid "Remote ping timeout"
 msgstr ""
 
 #. Restart after remote ping timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:69
-msgid "openvpn_param_ping_restart"
+msgid "Restart after remote ping timeout"
 msgstr ""
 
 #. Only process ping timeouts if routes exist
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:70
-msgid "openvpn_param_ping_timer_rem"
+msgid "Only process ping timeouts if routes exist"
 msgstr ""
 
 #. Ping remote every n seconds over TCP/UDP port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:71
-msgid "openvpn_param_ping"
+msgid "Ping remote every n seconds over TCP/UDP port"
 msgstr ""
 
 #. Configure a multi-homed UDP server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:72
-msgid "openvpn_param_multihome"
+msgid "Configure a multi-homed UDP server"
 msgstr ""
 
 #. Optimize TUN/TAP/UDP writes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:73
-msgid "openvpn_param_fast_io"
+msgid "Optimize TUN/TAP/UDP writes"
 msgstr ""
 
 #. Remap SIGUSR1 signals
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:74
-msgid "openvpn_param_remap_usr1"
+msgid "Remap SIGUSR1 signals"
 msgstr ""
 
 #. Keep tun/tap device open on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:75
-msgid "openvpn_param_persist_tun"
+msgid "Keep tun/tap device open on restart"
 msgstr ""
 
 #. Keep remote IP address on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:76
-msgid "openvpn_param_persist_remote_ip"
+msgid "Keep remote IP address on restart"
 msgstr ""
 
 #. Keep local IP address on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:77
-msgid "openvpn_param_persist_local_ip"
+msgid "Keep local IP address on restart"
 msgstr ""
 
 #. Don't re-read key on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:78
-msgid "openvpn_param_persist_key"
+msgid "Don't re-read key on restart"
 msgstr ""
 
 #. TOS passthrough (applies to IPv4 only)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:79
-msgid "openvpn_param_passtos"
+msgid "TOS passthrough (applies to IPv4 only)"
 msgstr ""
 
 #. Set tun/tap device MTU
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:80
-msgid "openvpn_param_tun_mtu"
+msgid "Set tun/tap device MTU"
 msgstr ""
 
 #. Set tun/tap device overhead
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:81
-msgid "openvpn_param_tun_mtu_extra"
+msgid "Set tun/tap device overhead"
 msgstr ""
 
 #. Set TCP/UDP MTU
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:82
-msgid "openvpn_param_link_mtu"
+msgid "Set TCP/UDP MTU"
 msgstr ""
 
 #. Enable Path MTU discovery
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:83
-msgid "openvpn_param_mtu_disc"
+msgid "Enable Path MTU discovery"
 msgstr ""
 
 #. Empirically measure MTU
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:84
-msgid "openvpn_param_mtu_test"
+msgid "Empirically measure MTU"
 msgstr ""
 
 #. Enable internal datagram fragmentation
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:85
-msgid "openvpn_param_fragment"
+msgid "Enable internal datagram fragmentation"
 msgstr ""
 
 #. Set upper bound on TCP MSS
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:86
-msgid "openvpn_param_mssfix"
+msgid "Set upper bound on TCP MSS"
 msgstr ""
 
 #. Set the TCP/UDP send buffer size
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:87
-msgid "openvpn_param_sndbuf"
+msgid "Set the TCP/UDP send buffer size"
 msgstr ""
 
 #. Set the TCP/UDP receive buffer size
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:88
-msgid "openvpn_param_rcvbuf"
+msgid "Set the TCP/UDP receive buffer size"
 msgstr ""
 
 #. Set tun/tap TX queue length
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:89
-msgid "openvpn_param_txqueuelen"
+msgid "Set tun/tap TX queue length"
 msgstr ""
 
 #. Disable Paging
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:90
-msgid "openvpn_param_mlock"
+msgid "Disable Paging"
 msgstr ""
 
 #. Shell cmd to execute after tun device open
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:91
-msgid "openvpn_param_up"
+msgid "Shell cmd to execute after tun device open"
 msgstr ""
 
 #. Delay tun/tap open and up script execution
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:92
-msgid "openvpn_param_up_delay"
+msgid "Delay tun/tap open and up script execution"
 msgstr ""
 
 #. Shell cmd to run after tun device close
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:93
-msgid "openvpn_param_down"
+msgid "Shell cmd to run after tun device close"
 msgstr ""
 
 #. Call down cmd/script before TUN/TAP close
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:94
-msgid "openvpn_param_down_pre"
+msgid "Call down cmd/script before TUN/TAP close"
 msgstr ""
 
 #. Run up/down scripts for all restarts
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:95
-msgid "openvpn_param_up_restart"
+msgid "Run up/down scripts for all restarts"
 msgstr ""
 
 #. Set UID to user
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:96
-msgid "openvpn_param_user"
+msgid "Set UID to user"
 msgstr ""
 
 #. Set GID to group
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:97
-msgid "openvpn_param_group"
+msgid "Set GID to group"
 msgstr ""
 
 #. Chroot to directory after initialization
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:98
-msgid "openvpn_param_chroot"
+msgid "Chroot to directory after initialization"
 msgstr ""
 
 #. Change to directory before initialization
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:99
-msgid "openvpn_param_cd"
+msgid "Change to directory before initialization"
 msgstr ""
 
 #. Daemonize after initialization
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:100
-msgid "openvpn_param_daemon"
+msgid "Daemonize after initialization"
 msgstr ""
 
 #. Output to syslog and do not daemonize
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:101
-msgid "openvpn_param_syslog"
+msgid "Output to syslog and do not daemonize"
 msgstr ""
 
 #. Run as an inetd or xinetd server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:102
-msgid "openvpn_param_inetd"
+msgid "Run as an inetd or xinetd server"
 msgstr ""
 
 #. Write log to file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:103
-msgid "openvpn_param_log"
+msgid "Write log to file"
 msgstr ""
 
 #. Append log to file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:104
-msgid "openvpn_param_log_append"
+msgid "Append log to file"
 msgstr ""
 
 #. Don't log timestamps
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:105
-msgid "openvpn_param_suppress_timestamps"
+msgid "Don't log timestamps"
 msgstr ""
 
 #. Write process ID to file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:106
-msgid "openvpn_param_writepid"
+msgid "Write process ID to file"
 msgstr ""
 
 #. Change process priority
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:107
-msgid "openvpn_param_nice"
+msgid "Change process priority"
 msgstr ""
 
 #. Echo parameters to log
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:108
-msgid "openvpn_param_echo"
+msgid "Echo parameters to log"
 msgstr ""
 
 #. Set output verbosity
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:109
-msgid "openvpn_param_verb"
+msgid "Set output verbosity"
 msgstr ""
 
 #. Limit repeated log messages
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:110
-msgid "openvpn_param_mute"
+msgid "Limit repeated log messages"
 msgstr ""
 
 #. Write status to file every n seconds
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:111
-msgid "openvpn_param_status"
+msgid "Write status to file every n seconds"
 msgstr ""
 
 #. Status file format version
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:112
-msgid "openvpn_param_status_version"
+msgid "Status file format version"
 msgstr ""
 
 #. Disable options consistency check
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:113
-msgid "openvpn_param_disable_occ"
+msgid "Disable options consistency check"
 msgstr ""
 
 #. Special stress testing mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:114
-msgid "openvpn_param_gremlin"
+msgid "Special stress testing mode"
 msgstr ""
 
 #. Use fast LZO compression
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:115
-msgid "openvpn_param_comp_lzo"
+msgid "Use fast LZO compression"
 msgstr ""
 
 #. Don't use adaptive lzo compression
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:116
-msgid "openvpn_param_comp_noadapt"
+msgid "Don't use adaptive lzo compression"
 msgstr ""
 
 #. Enable management interface on <em>IP</em> <em>port</em>
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:117
-msgid "openvpn_param_management"
+msgid "Enable management interface on <em>IP</em> <em>port</em>"
 msgstr ""
 
 #. Management interface will connect as a TCP client
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:118
-msgid "openvpn_param_management_client"
+msgid "Management interface will connect as a TCP client"
 msgstr ""
 
 #. Query management channel for private key
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:119
-msgid "openvpn_param_management_query_passwords"
+msgid "Query management channel for private key"
 msgstr ""
 
 #. Start OpenVPN in a hibernating state
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:120
-msgid "openvpn_param_management_hold"
+msgid "Start OpenVPN in a hibernating state"
 msgstr ""
 
 #. Issue SIGUSR1 on management disconnect
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:121
-msgid "openvpn_param_management_signal"
+msgid "Issue SIGUSR1 on management disconnect"
 msgstr ""
 
 #. Forget passwords on management disconnect
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:122
-msgid "openvpn_param_management_forget_disconnect"
+msgid "Forget passwords on management disconnect"
 msgstr ""
 
 #. Number of lines for log file history
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:123
-msgid "openvpn_param_management_log_cache"
+msgid "Number of lines for log file history"
 msgstr ""
 
 #. Load plug-in module
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:124
-msgid "openvpn_param_plugin"
+msgid "Load plug-in module"
 msgstr ""
 
 #. Configure server mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:125
-msgid "openvpn_param_server"
+msgid "Configure server mode"
 msgstr ""
 
 #. Configure server bridge
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:126
-msgid "openvpn_param_server_bridge"
+msgid "Configure server bridge"
 msgstr ""
 
 #. Push options to peer
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:127
-msgid "openvpn_param_push"
+msgid "Push options to peer"
 msgstr ""
 
 #. Don't inherit global push options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:128
-msgid "openvpn_param_push_reset"
+msgid "Don't inherit global push options"
 msgstr ""
 
 #. Set aside a pool of subnets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:129
-msgid "openvpn_param_ifconfig_pool"
+msgid "Set aside a pool of subnets"
 msgstr ""
 
 #. Use individual addresses rather than /30 subnets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:130
-msgid "openvpn_param_ifconfig_pool_linear"
+msgid "Use individual addresses rather than /30 subnets"
 msgstr ""
 
 #. Persist/unpersist ifconfig-pool
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:131
-msgid "openvpn_param_ifconfig_pool_persist"
+msgid "Persist/unpersist ifconfig-pool"
 msgstr ""
 
 #. Push an ifconfig option to remote
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:132
-msgid "openvpn_param_ifconfig_push"
+msgid "Push an ifconfig option to remote"
 msgstr ""
 
 #. Route subnet to client
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:133
-msgid "openvpn_param_iroute"
+msgid "Route subnet to client"
 msgstr ""
 
 #. Client is disabled
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:134
-msgid "openvpn_param_disable"
+msgid "Client is disabled"
 msgstr ""
 
 #. Don't require client certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:135
-msgid "openvpn_param_client_cert_not_required"
+msgid "Don't require client certificate"
 msgstr ""
 
 #. Use username as common name
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:136
-msgid "openvpn_param_username_as_common_name"
+msgid "Use username as common name"
 msgstr ""
 
 #. Script to verify interactive authentication
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:137
-msgid "openvpn_param_auth_user_pass_verify"
+msgid "Script to verify interactive authentication"
 msgstr ""
 
 #. Allow client-to-client traffic
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:138
-msgid "openvpn_param_client_to_client"
+msgid "Allow client-to-client traffic"
 msgstr ""
 
 #. Allow multiple clients with same certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:139
-msgid "openvpn_param_duplicate_cn"
+msgid "Allow multiple clients with same certificate"
 msgstr ""
 
 #. Run script cmd on client connection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:140
-msgid "openvpn_param_client_connect"
+msgid "Run script cmd on client connection"
 msgstr ""
 
 #. Run script cmd on client disconnection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:141
-msgid "openvpn_param_client_disconnect"
+msgid "Run script cmd on client disconnection"
 msgstr ""
 
 #. Directory for custom client config files
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:142
-msgid "openvpn_param_client_config_dir"
+msgid "Directory for custom client config files"
 msgstr ""
 
 #. Refuse connection if no custom client config
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:143
-msgid "openvpn_param_ccd_exclusive"
+msgid "Refuse connection if no custom client config"
 msgstr ""
 
 #. Temporary directory for client-connect return file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:144
-msgid "openvpn_param_tmp_dir"
+msgid "Temporary directory for client-connect return file"
 msgstr ""
 
 #. Set size of real and virtual address hash tables
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:145
-msgid "openvpn_param_hash_size"
+msgid "Set size of real and virtual address hash tables"
 msgstr ""
 
 #. Number of allocated broadcast buffers
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:146
-msgid "openvpn_param_bcast_buffers"
+msgid "Number of allocated broadcast buffers"
 msgstr ""
 
 #. Maximum number of queued TCP output packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:147
-msgid "openvpn_param_tcp_queue_limit"
+msgid "Maximum number of queued TCP output packets"
 msgstr ""
 
 #. Script to validate client virtual addresses
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:148
-msgid "openvpn_param_learn_address"
+msgid "Script to validate client virtual addresses"
 msgstr ""
 
 #. Allowed maximum of new connections
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:149
-msgid "openvpn_param_connect_freq"
+msgid "Allowed maximum of new connections"
 msgstr ""
 
 #. Allowed maximum of connected clients
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:150
-msgid "openvpn_param_max_clients"
+msgid "Allowed maximum of connected clients"
 msgstr ""
 
 #. Allowed maximum of internal
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:151
-msgid "openvpn_param_max_routes_per_client"
+msgid "Allowed maximum of internal"
 msgstr ""
 
 #. Proxy incoming HTTPS sessions
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:152
-msgid "openvpn_param_port_share"
+msgid "Proxy incoming HTTPS sessions"
 msgstr ""
 
 #. Configure client mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:153
-msgid "openvpn_param_client"
+msgid "Configure client mode"
 msgstr ""
 
 #. Authenticate using username/password
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:154
-msgid "openvpn_param_auth_user_pass"
+msgid "Authenticate using username/password"
 msgstr ""
 
 #. Accept options pushed from server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:155
-msgid "openvpn_param_pull"
+msgid "Accept options pushed from server"
 msgstr ""
 
 #. Handling of authentication failures
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:156
-msgid "openvpn_param_auth_retry"
+msgid "Handling of authentication failures"
 msgstr ""
 
 #. Send notification to peer on disconnect
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:157
-msgid "openvpn_param_explicit_exit_notify"
+msgid "Send notification to peer on disconnect"
 msgstr ""
 
 #. Enable Static Key encryption mode (non-TLS)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:158
-msgid "openvpn_param_secret"
+msgid "Enable Static Key encryption mode (non-TLS)"
 msgstr ""
 
 #. HMAC authentication for packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:159
-msgid "openvpn_param_auth"
+msgid "HMAC authentication for packets"
 msgstr ""
 
 #. Encryption cipher for packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:160
-msgid "openvpn_param_cipher"
+msgid "Encryption cipher for packets"
 msgstr ""
 
 #. Size of cipher key
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:161
-msgid "openvpn_param_keysize"
+msgid "Size of cipher key"
 msgstr ""
 
 #. Enable OpenSSL hardware crypto engines
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:162
-msgid "openvpn_param_engine"
+msgid "Enable OpenSSL hardware crypto engines"
 msgstr ""
 
 #. Disable replay protection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:163
-msgid "openvpn_param_no_replay"
+msgid "Disable replay protection"
 msgstr ""
 
 #. Silence the output of replay warnings
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:164
-msgid "openvpn_param_mute_replay_warnings"
+msgid "Silence the output of replay warnings"
 msgstr ""
 
 #. Replay protection sliding window size
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:165
-msgid "openvpn_param_replay_window"
+msgid "Replay protection sliding window size"
 msgstr ""
 
 #. Disable cipher initialisation vector
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:166
-msgid "openvpn_param_no_iv"
+msgid "Disable cipher initialisation vector"
 msgstr ""
 
 #. Persist replay-protection state
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:167
-msgid "openvpn_param_replay_persist"
+msgid "Persist replay-protection state"
 msgstr ""
 
 #. Run a self-test of crypto features
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:168
-msgid "openvpn_param_test_crypto"
+msgid "Run a self-test of crypto features"
 msgstr ""
 
 #. Enable TLS and assume server role
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:169
-msgid "openvpn_param_tls_server"
+msgid "Enable TLS and assume server role"
 msgstr ""
 
 #. Enable TLS and assume client role
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:170
-msgid "openvpn_param_tls_client"
+msgid "Enable TLS and assume client role"
 msgstr ""
 
 #. Data channel key exchange method
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:171
-msgid "openvpn_param_key_method"
+msgid "Data channel key exchange method"
 msgstr ""
 
 #. Certificate authority
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:172
-msgid "openvpn_param_ca"
+msgid "Certificate authority"
 msgstr ""
 
 #. Directory of trusted certificates (CAs and CRLs)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:173
-msgid "openvpn_param_capath"
+msgid "Directory of trusted certificates (CAs and CRLs)"
 msgstr ""
 
 #. Diffie Hellman parameters
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:174
-msgid "openvpn_param_dh"
+msgid "Diffie Hellman parameters"
 msgstr ""
 
 #. Local certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:175
-msgid "openvpn_param_cert"
+msgid "Local certificate"
 msgstr ""
 
 #. Local private key
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:176
-msgid "openvpn_param_key"
+msgid "Local private key"
 msgstr ""
 
 #. PKCS#12 file containing keys
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:177
-msgid "openvpn_param_pkcs12"
+msgid "PKCS#12 file containing keys"
 msgstr ""
 
 #. TLS cipher
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:178
-msgid "openvpn_param_tls_cipher"
+msgid "TLS cipher"
 msgstr ""
 
 #. Retransmit timeout on TLS control channel
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:179
-msgid "openvpn_param_tls_timeout"
+msgid "Retransmit timeout on TLS control channel"
 msgstr ""
 
 #. Renegotiate data chan. key after bytes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:180
-msgid "openvpn_param_reneg_bytes"
+msgid "Renegotiate data chan. key after bytes"
 msgstr ""
 
 #. Renegotiate data chan. key after packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:181
-msgid "openvpn_param_reneg_pkts"
+msgid "Renegotiate data chan. key after packets"
 msgstr ""
 
 #. Renegotiate data chan. key after seconds
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:182
-msgid "openvpn_param_reneg_sec"
+msgid "Renegotiate data chan. key after seconds"
 msgstr ""
 
 #. Timeframe for key exchange
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:183
-msgid "openvpn_param_hand_window"
+msgid "Timeframe for key exchange"
 msgstr ""
 
 #. Key transition window
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:184
-msgid "openvpn_param_tran_window"
+msgid "Key transition window"
 msgstr ""
 
 #. Allow only one session
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:185
-msgid "openvpn_param_single_session"
+msgid "Allow only one session"
 msgstr ""
 
 #. Exit on TLS negotiation failure
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:186
-msgid "openvpn_param_tls_exit"
+msgid "Exit on TLS negotiation failure"
 msgstr ""
 
 #. Additional authentication over TLS
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:187
-msgid "openvpn_param_tls_auth"
+msgid "Additional authentication over TLS"
 msgstr ""
 
 #. Get PEM password from controlling tty before we daemonize
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:188
-msgid "openvpn_param_askpass"
+msgid "Get PEM password from controlling tty before we daemonize"
 msgstr ""
 
 #. Don't cache --askpass or --auth-user-pass passwords
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:189
-msgid "openvpn_param_auth_nocache"
+msgid "Don't cache --askpass or --auth-user-pass passwords"
 msgstr ""
 
 #. Check peer certificate against a CRL
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:190
-msgid "openvpn_param_crl_verify"
+msgid "Check peer certificate against a CRL"
 msgstr ""
 
 #. Shell command to verify X509 name
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:191
-msgid "openvpn_param_tls_verify"
+msgid "Shell command to verify X509 name"
 msgstr ""
 
 #. Only accept connections from given X509 name
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:192
-msgid "openvpn_param_tls_remote"
+msgid "Only accept connections from given X509 name"
 msgstr ""
 
 #. Require explicit designation on certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:193
-msgid "openvpn_param_ns_cert_type"
+msgid "Require explicit designation on certificate"
 msgstr ""
 
 #. Require explicit key usage on certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:194
-msgid "openvpn_param_remote_cert_ku"
+msgid "Require explicit key usage on certificate"
 msgstr ""
 
 #. Require extended explicit key usage on certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:195
-msgid "openvpn_param_remote_cert_eku"
+msgid "Require extended explicit key usage on certificate"
 msgstr ""
 
 #. Require normal and extended key usage on certificate
diff --git a/po/it/p910nd.po b/po/it/p910nd.po
index a8b125c5f..9a5e7e0c0 100644
--- a/po/it/p910nd.po
+++ b/po/it/p910nd.po
@@ -14,17 +14,17 @@ msgstr ""
 
 #. p910nd - Printer server
 #: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:1
-msgid "p910nd"
+msgid "p910nd - Printer server"
 msgstr ""
 
 #. First you have to install the packages to get support for USB (kmod-usb-printer) or parallel port (kmod-lp).
 #: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:2
-msgid "p910nd_desc"
+msgid "First you have to install the packages to get support for USB (kmod-usb-printer) or parallel port (kmod-lp)."
 msgstr ""
 
 #. Bidirectional mode
 #: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:3
-msgid "bidirectional"
+msgid "Bidirectional mode"
 msgstr ""
 
 #. p910nd listens on port 910+N. E.g. 9100 for the first printer.
diff --git a/po/it/polipo.po b/po/it/polipo.po
index 82b0d7db3..d8f454a1c 100644
--- a/po/it/polipo.po
+++ b/po/it/polipo.po
@@ -14,212 +14,212 @@ msgstr ""
 
 #. Polipo
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:1
-msgid "polipo"
+msgid "Polipo"
 msgstr ""
 
 #. On-Disk Cache
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:2
-msgid "polipo_cache"
+msgid "On-Disk Cache"
 msgstr ""
 
 #. Shared cache
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:3
-msgid "polipo_cache_cacheisshared"
+msgid "Shared cache"
 msgstr ""
 
 #. Enable if cache (proxy) is shared by multiple users.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:4
-msgid "polipo_cache_cacheisshared_desc"
+msgid "Enable if cache (proxy) is shared by multiple users."
 msgstr ""
 
 #. To enable polipo on-disk cache cleaning (highly recommended), you should add a cron job in Scheduled Tasks services that will execute /usr/sbin/polipo_purge script. For example to perform disk cache cleanup every day at 6:00 in the morning you should add the following line in Scheduled Tasks &quot;0 6 * * *	/usr/sbin/polipo_purge&quot; (without quotes).
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:5
-msgid "polipo_cache_desc"
+msgid "To enable polipo on-disk cache cleaning (highly recommended), you should add a cron job in Scheduled Tasks services that will execute /usr/sbin/polipo_purge script. For example to perform disk cache cleanup every day at 6:00 in the morning you should add the following line in Scheduled Tasks \"0 6 * * *\\t/usr/sbin/polipo_purge\" (without quotes)."
 msgstr ""
 
 #. Disk cache location
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:6
-msgid "polipo_cache_diskcacheroot"
+msgid "Disk cache location"
 msgstr ""
 
 #. Location where polipo will cache files permanently. Use of external storage devices is recommended, because the cache can grow considerably. Leave it empty to disable on-disk cache.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:7
-msgid "polipo_cache_diskcacheroot_desc"
+msgid "Location where polipo will cache files permanently. Use of external storage devices is recommended, because the cache can grow considerably. Leave it empty to disable on-disk cache."
 msgstr ""
 
 #. Truncate cache files size (in bytes)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:8
-msgid "polipo_cache_diskcachetruncatesize"
+msgid "Truncate cache files size (in bytes)"
 msgstr ""
 
 #. Size to which cached files should be truncated. (default value: 1048576)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:9
-msgid "polipo_cache_diskcachetruncatesize_desc"
+msgid "Size to which cached files should be truncated. (default value: 1048576)"
 msgstr ""
 
 #. Truncate cache files time
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:10
-msgid "polipo_cache_diskcachetruncatetime"
+msgid "Truncate cache files time"
 msgstr ""
 
 #. Time after which cached files will be truncated. (default value: 4d12h)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:11
-msgid "polipo_cache_diskcachetruncatetime_desc"
+msgid "Time after which cached files will be truncated. (default value: 4d12h)"
 msgstr ""
 
 #. Delete cache files time
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:12
-msgid "polipo_cache_diskcacheunlinktime"
+msgid "Delete cache files time"
 msgstr ""
 
 #. Time after which cached files will be deleted. (default value: 32d)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:13
-msgid "polipo_cache_diskcacheunlinktime_desc"
+msgid "Time after which cached files will be deleted. (default value: 32d)"
 msgstr ""
 
 #. Polipo is a small and fast caching web proxy.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:14
-msgid "polipo_desc"
+msgid "Polipo is a small and fast caching web proxy."
 msgstr ""
 
 #. General
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:15
-msgid "polipo_general"
+msgid "General"
 msgstr ""
 
 #. Allowed clients
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:16
-msgid "polipo_general_allowedclients"
+msgid "Allowed clients"
 msgstr ""
 
 #. When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients that are allowed to connect. The format is IP address or network address (192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6)).
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:17
-msgid "polipo_general_allowedclients_desc"
+msgid "When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients that are allowed to connect. The format is IP address or network address (192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))."
 msgstr ""
 
 #. In RAM cache size (in bytes)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:18
-msgid "polipo_general_chunkhighmark"
+msgid "In RAM cache size (in bytes)"
 msgstr ""
 
 #. How much RAM should Polipo use for its cache.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:19
-msgid "polipo_general_chunkhighmark_desc"
+msgid "How much RAM should Polipo use for its cache."
 msgstr ""
 
 #. DNS server address
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:20
-msgid "polipo_general_dnsnameserver"
+msgid "DNS server address"
 msgstr ""
 
 #. Set the DNS server address to use, if you want Polipo to use different DNS server than the host system.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:21
-msgid "polipo_general_dnsnameserver_desc"
+msgid "Set the DNS server address to use, if you want Polipo to use different DNS server than the host system."
 msgstr ""
 
 #. Query DNS for IPv6
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:22
-msgid "polipo_general_dnsqueryipv6"
+msgid "Query DNS for IPv6"
 msgstr ""
 
 #. false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = Query both, prefer IPv6; true = Query only IPv6
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:23
-msgid "polipo_general_dnsqueryipv6_desc"
+msgid "false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = Query both, prefer IPv6; true = Query only IPv6"
 msgstr ""
 
 #. Query DNS by hostname
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:24
-msgid "polipo_general_dnsusegethostbyname"
+msgid "Query DNS by hostname"
 msgstr ""
 
 #. false = Never use system DNS resolver; reluctantly = Query DNS directly, if DNS server is unavailable fail to system DNS resolver; happily = Query DNS directly, if host could not be found fallback to system DNS resolver; true = Always use system DNS resolver
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:25
-msgid "polipo_general_dnsusegethostbyname_desc"
+msgid "false = Never use system DNS resolver; reluctantly = Query DNS directly, if DNS server is unavailable fail to system DNS resolver; happily = Query DNS directly, if host could not be found fallback to system DNS resolver; true = Always use system DNS resolver"
 msgstr ""
 
 #. Syslog facility
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:26
-msgid "polipo_general_logfacility"
+msgid "Syslog facility"
 msgstr ""
 
 #. Log file location
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:27
-msgid "polipo_general_logfile"
+msgid "Log file location"
 msgstr ""
 
 #. Use of external storage device is recommended, because the log file is written frequently and can grow considerably.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:28
-msgid "polipo_general_logfile_desc"
+msgid "Use of external storage device is recommended, because the log file is written frequently and can grow considerably."
 msgstr ""
 
 #. Log to syslog
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:29
-msgid "polipo_general_logsyslog"
+msgid "Log to syslog"
 msgstr ""
 
 #. Parent proxy authentication
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:30
-msgid "polipo_general_parentauthcredentials"
+msgid "Parent proxy authentication"
 msgstr ""
 
 #. Basic HTTP authentication supported. Provide username and password in username:password format.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:31
-msgid "polipo_general_parentauthcredentials_desc"
+msgid "Basic HTTP authentication supported. Provide username and password in username:password format."
 msgstr ""
 
 #. Parent proxy address
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:32
-msgid "polipo_general_parentproxy"
+msgid "Parent proxy address"
 msgstr ""
 
 #. Parent proxy address (in host:port format), to which Polipo will forward the requests.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:33
-msgid "polipo_general_parentproxy_desc"
+msgid "Parent proxy address (in host:port format), to which Polipo will forward the requests."
 msgstr ""
 
 #. Listen address
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:34
-msgid "polipo_general_proxyaddress"
+msgid "Listen address"
 msgstr ""
 
 #. The interface on which Polipo will listen. To listen on all interfaces use 0.0.0.0 or :: (IPv6).
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:35
-msgid "polipo_general_proxyaddress_desc"
+msgid "The interface on which Polipo will listen. To listen on all interfaces use 0.0.0.0 or :: (IPv6)."
 msgstr ""
 
 #. Listen port
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:36
-msgid "polipo_general_proxyport"
+msgid "Listen port"
 msgstr ""
 
 #. Port on which Polipo will listen. (default value: 8123)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:37
-msgid "polipo_general_proxyport_desc"
+msgid "Port on which Polipo will listen. (default value: 8123)"
 msgstr ""
 
 #. Poor Man&#39;s Multiplexing
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:38
-msgid "polipo_pmm"
+msgid "Poor Man's Multiplexing"
 msgstr ""
 
 #. Poor Man&#39;s Multiplexing (PMM) is a technique that simulates multiplexing by requesting an instance in multiple segments. It tries to lower the latency caused by the weakness of HTTP protocol. NOTE: some sites may not work with PMM enabled.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:39
-msgid "polipo_pmm_desc"
+msgid "Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by requesting an instance in multiple segments. It tries to lower the latency caused by the weakness of HTTP protocol. NOTE: some sites may not work with PMM enabled."
 msgstr ""
 
 #. First PMM segment size (in bytes)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:40
-msgid "polipo_pmm_pmmfirstsize"
+msgid "First PMM segment size (in bytes)"
 msgstr ""
 
 #. Size of the first PMM segment. If not defined, it defaults to twice the PMM segment size.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:41
-msgid "polipo_pmm_pmmfirstsize_desc"
+msgid "Size of the first PMM segment. If not defined, it defaults to twice the PMM segment size."
 msgstr ""
 
 #. PMM segments size (in bytes)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:42
-msgid "polipo_pmm_pmmsize"
+msgid "PMM segments size (in bytes)"
 msgstr ""
 
 #. To enable PMM, PMM segment size must be set to some positive value.
diff --git a/po/it/qos.po b/po/it/qos.po
index ae142a01c..72480aefa 100644
--- a/po/it/qos.po
+++ b/po/it/qos.po
@@ -14,87 +14,87 @@ msgstr ""
 
 #. Quality of Service
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:1
-msgid "qos"
+msgid "Quality of Service"
 msgstr ""
 
 #. With QoS you can priorize network traffic selected by adresses, ports or services.
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:2
-msgid "qos_desc"
+msgid "With QoS you can priorize network traffic selected by adresses, ports or services."
 msgstr ""
 
 #. Classification
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:3
-msgid "qos_interface_classgroup"
+msgid "Classification"
 msgstr ""
 
 #. Calculate Overhead
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:4
-msgid "qos_interface_overhead"
+msgid "Calculate Overhead"
 msgstr ""
 
 #. Downlink
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:5
-msgid "qos_interface_download"
+msgid "Downlink"
 msgstr ""
 
 #. Uplink
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:6
-msgid "qos_interface_upload"
+msgid "Uplink"
 msgstr ""
 
 #. Prioritization
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:7
-msgid "qos_classify"
+msgid "Prioritization"
 msgstr ""
 
 #. Priority
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:8
-msgid "qos_classify_target"
+msgid "Priority"
 msgstr ""
 
 #. Source address
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:9
-msgid "qos_classify_srchost"
+msgid "Source address"
 msgstr ""
 
 #. source network / source host
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:10
-msgid "qos_classify_srchost_dest"
+msgid "source network / source host"
 msgstr ""
 
 #. Target address
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:11
-msgid "qos_classify_dsthost"
+msgid "Target address"
 msgstr ""
 
 #. target network / target host
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:12
-msgid "qos_classify_dsthost_dest"
+msgid "target network / target host"
 msgstr ""
 
 #. portrange
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:13
-msgid "qos_classify_portrange"
+msgid "portrange"
 msgstr ""
 
 #. low
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:14
-msgid "qos_bulk"
+msgid "low"
 msgstr ""
 
 #. normal
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:15
-msgid "qos_normal"
+msgid "normal"
 msgstr ""
 
 #. express
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:16
-msgid "qos_express"
+msgid "express"
 msgstr ""
 
 #. priority
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:17
-msgid "qos_priority"
+msgid "priority"
 msgstr ""
 
 #. Bytes sent
diff --git a/po/it/rrdtool.po b/po/it/rrdtool.po
index 95545db6d..135d1b3f9 100644
--- a/po/it/rrdtool.po
+++ b/po/it/rrdtool.po
@@ -14,342 +14,342 @@ msgstr ""
 
 #. %H: Wireless - Signal Noise Ratio
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:1
-msgid "stat_dg_title_wireless__signal_noise"
+msgid "%H: Wireless - Signal Noise Ratio"
 msgstr ""
 
 #. dBm
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:2
-msgid "stat_dg_label_wireless__signal_noise"
+msgid "dBm"
 msgstr ""
 
 #. Noise Level
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:3
-msgid "stat_ds_signal_noise"
+msgid "Noise Level"
 msgstr ""
 
 #. Signal Strength
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:4
-msgid "stat_ds_signal_power"
+msgid "Signal Strength"
 msgstr ""
 
 #. %H: Wireless - Signal Quality
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:5
-msgid "stat_dg_title_wireless__signal_quality"
+msgid "%H: Wireless - Signal Quality"
 msgstr ""
 
 #. n
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:6
-msgid "stat_dg_label_wireless__signal_quality"
+msgid "n"
 msgstr ""
 
 #. Signal Quality
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:7
-msgid "stat_ds_signal_quality"
+msgid "Signal Quality"
 msgstr ""
 
 #. %H: ICMP Roundtrip Times
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:8
-msgid "stat_dg_title_ping"
+msgid "%H: ICMP Roundtrip Times"
 msgstr ""
 
 #. ms
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:9
-msgid "stat_dg_label_ping"
+msgid "ms"
 msgstr ""
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:10
-msgid "stat_ds_ping"
+msgid "%di"
 msgstr ""
 
 #. %H: Firewall - Processed Packets
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:11
-msgid "stat_dg_title_iptables__ipt_packets"
+msgid "%H: Firewall - Processed Packets"
 msgstr ""
 
 #. Packets/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:12
-msgid "stat_dg_label_iptables__ipt_packets"
+msgid "Packets/s"
 msgstr ""
 
 #. Chain \"%di\"
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:13
-msgid "stat_ds_ipt_packets"
+msgid "Chain \"%di\""
 msgstr ""
 
 #. %H: Netlink - Transfer on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:14
-msgid "stat_dg_title_netlink__if_octets"
+msgid "%H: Netlink - Transfer on %pi"
 msgstr ""
 
 #. Bytes/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:15
-msgid "stat_dg_label_netlink__if_octets"
+msgid "Bytes/s"
 msgstr ""
 
 #. Bytes (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:16
-msgid "stat_ds_if_octets"
+msgid "Bytes (%ds)"
 msgstr ""
 
 #. %H: Netlink - Packets on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:17
-msgid "stat_dg_title_netlink__if_packets"
+msgid "%H: Netlink - Packets on %pi"
 msgstr ""
 
 #. Packets/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:18
-msgid "stat_dg_label_netlink__if_packets"
+msgid "Packets/s"
 msgstr ""
 
 #. Processed (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:19
-msgid "stat_ds_if_packets"
+msgid "Processed (%ds)"
 msgstr ""
 
 #. Dropped   (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:20
-msgid "stat_ds_if_dropped"
+msgid "Dropped (%ds)"
 msgstr ""
 
 #. Errors    (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:21
-msgid "stat_ds_if_errors"
+msgid "Errors (%ds)"
 msgstr ""
 
 #. %H: Netlink - Multicast on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:22
-msgid "stat_dg_title_netlink__if_multicast"
+msgid "%H: Netlink - Multicast on %pi"
 msgstr ""
 
 #. Packets/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:23
-msgid "stat_dg_label_netlink__if_multicast"
+msgid "Packets/s"
 msgstr ""
 
 #. Packets
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:24
-msgid "stat_ds_if_multicast"
+msgid "Packets"
 msgstr ""
 
 #. %H: Netlink - Collisions on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:25
-msgid "stat_dg_title_netlink__if_collisions"
+msgid "%H: Netlink - Collisions on %pi"
 msgstr ""
 
 #. Collisions/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:26
-msgid "stat_dg_label_netlink__if_collisions"
+msgid "Collisions/s"
 msgstr ""
 
 #. Collisions
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:27
-msgid "stat_ds_if_collisions"
+msgid "Collisions"
 msgstr ""
 
 #. %H: Netlink - Errors on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:28
-msgid "stat_dg_title_netlink__if_tx_errors"
+msgid "%H: Netlink - Errors on %pi"
 msgstr ""
 
 #. Errors/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:29
-msgid "stat_dg_label_netlink__if_tx_errors"
+msgid "Errors/s"
 msgstr ""
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:30
-msgid "stat_ds_if_tx_errors"
+msgid "%di"
 msgstr ""
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:31
-msgid "stat_ds_if_rx_errors"
+msgid "%di"
 msgstr ""
 
 #. %H: Processes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:32
-msgid "stat_dg_title_processes"
+msgid "%H: Processes"
 msgstr ""
 
 #. Processes/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:33
-msgid "stat_dg_label_processes"
+msgid "Processes/s"
 msgstr ""
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:34
-msgid "stat_ds_ps_state"
+msgid "%di"
 msgstr ""
 
 #. %H: Process %pi - used cpu time
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:35
-msgid "stat_dg_title_processes__ps_cputime"
+msgid "%H: Process %pi - used cpu time"
 msgstr ""
 
 #. Jiffies
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:36
-msgid "stat_dg_label_processes__ps_cputime"
+msgid "Jiffies"
 msgstr ""
 
 #. system
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:37
-msgid "stat_ds_ps_cputime__syst"
+msgid "System"
 msgstr ""
 
 #. user
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:38
-msgid "stat_ds_ps_cputime__user"
+msgid "user"
 msgstr ""
 
 #. %H: Process %pi - threads and processes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:39
-msgid "stat_dg_title_processes__ps_count"
+msgid "%H: Process %pi - threads and processes"
 msgstr ""
 
 #. Count
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:40
-msgid "stat_dg_label_processes__ps_count"
+msgid "Count"
 msgstr ""
 
 #. %ds
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:41
-msgid "stat_ds_ps_count"
+msgid "%ds"
 msgstr ""
 
 #. %H: Process %pi - page faults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:42
-msgid "stat_dg_title_processes__ps_pagefaults"
+msgid "%H: Process %pi - page faults"
 msgstr ""
 
 #. Pagefaults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:43
-msgid "stat_dg_label_processes__ps_pagefaults"
+msgid "Pagefaults"
 msgstr ""
 
 #. page faults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:44
-msgid "stat_ds_ps_pagefaults"
+msgid "page faults"
 msgstr ""
 
 #. %H: Process %pi - virtual memory size
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:45
-msgid "stat_dg_title_processes__ps_rss"
+msgid "%H: Process %pi - virtual memory size"
 msgstr ""
 
 #. Bytes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:46
-msgid "stat_dg_label_processes__ps_rss"
+msgid "Bytes"
 msgstr ""
 
 #. virtual memory
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:47
-msgid "stat_ds_ps_rss"
+msgid "virtual memory"
 msgstr ""
 
 #. %H: Usage on Processor #%pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:48
-msgid "stat_dg_title_cpu"
+msgid "%H: Usage on Processor #%pi"
 msgstr ""
 
 #. %
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:49
-msgid "stat_dg_label_cpu"
+msgid "%"
 msgstr ""
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:50
-msgid "stat_ds_cpu"
+msgid "%di"
 msgstr ""
 
 #. %H: Transfer on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:51
-msgid "stat_dg_title_interface__if_octets"
+msgid "%H: Transfer on %di"
 msgstr ""
 
 #. Bytes/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:52
-msgid "stat_dg_label_interface__if_octets"
+msgid "Bytes/s"
 msgstr ""
 
 #. %H: Packets on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:53
-msgid "stat_dg_title_interface__if_packets"
+msgid "%H: Packets on %di"
 msgstr ""
 
 #. Packets/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:54
-msgid "stat_dg_label_interface__if_packets"
+msgid "Packets/s"
 msgstr ""
 
 #. %H: TCP-Connections to Port %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:55
-msgid "stat_dg_title_tcpconns"
+msgid "%H: TCP-Connections to Port %pi"
 msgstr ""
 
 #. Connections/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:56
-msgid "stat_dg_label_tcpconns"
+msgid "Connections/s"
 msgstr ""
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:57
-msgid "stat_ds_tcp_connections"
+msgid "%di"
 msgstr ""
 
 #. %H: Disk Space Usage on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:58
-msgid "stat_dg_title_df"
+msgid "%H: Disk Space Usage on %di"
 msgstr ""
 
 #. Bytes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:59
-msgid "stat_dg_label_df"
+msgid "Bytes"
 msgstr ""
 
 #. %ds
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:60
-msgid "stat_ds_df__free"
+msgid "%ds"
 msgstr ""
 
 #. %ds
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:61
-msgid "stat_ds_df__used"
+msgid "%ds"
 msgstr ""
 
 #. %H: Interrupts
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:62
-msgid "stat_dg_title_irq"
+msgid "%H: Interrupts"
 msgstr ""
 
 #. Issues/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:63
-msgid "stat_dg_label_irq"
+msgid "Issues/s"
 msgstr ""
 
 #. IRQ %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:64
-msgid "stat_ds_irq"
+msgid "IRQ %di"
 msgstr ""
 
 #. %H: System Load
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:65
-msgid "stat_dg_title_load"
+msgid "%H: System Load"
 msgstr ""
 
 #. Load
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:66
-msgid "stat_dg_label_load"
+msgid "Load"
 msgstr ""
 
 #. 1 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:67
-msgid "stat_ds_load__shortterm"
+msgid "1 min"
 msgstr ""
 
 #. 5 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:68
-msgid "stat_ds_load__midterm"
+msgid "5 min"
 msgstr ""
 
 #. 15 min
diff --git a/po/it/samba.po b/po/it/samba.po
index c53f03d59..b9d997ea1 100644
--- a/po/it/samba.po
+++ b/po/it/samba.po
@@ -14,82 +14,82 @@ msgstr ""
 
 #. Network Shares
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:1
-msgid "samba"
+msgid "Network Shares"
 msgstr ""
 
 #. Hostname
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:2
-msgid "samba_samba_name"
+msgid "Hostname"
 msgstr ""
 
 #. Description
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:3
-msgid "samba_samba_description"
+msgid "Description"
 msgstr ""
 
 #. Workgroup
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:4
-msgid "samba_samba_workgroup"
+msgid "Workgroup"
 msgstr ""
 
 #. Share home-directories
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:5
-msgid "samba_samba_homes"
+msgid "Share home-directories"
 msgstr ""
 
 #. System users can reach their home directories via network shares.
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:6
-msgid "samba_samba_homes_desc"
+msgid "System users can reach their home directories via network shares."
 msgstr ""
 
 #. Shared Directories
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:7
-msgid "samba_sambashare"
+msgid "Shared Directories"
 msgstr ""
 
 #. Shared Directory
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:8
-msgid "samba_sambashare_path"
+msgid "Shared Directory"
 msgstr ""
 
 #. Physical Path
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:9
-msgid "samba_sambashare_path_desc"
+msgid "Physical Path"
 msgstr ""
 
 #. Allowed Users
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:10
-msgid "samba_sambashare_users"
+msgid "Allowed Users"
 msgstr ""
 
 #. optional
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:11
-msgid "samba_sambashare_users_desc"
+msgid "optional"
 msgstr ""
 
 #. Read Only
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:12
-msgid "samba_sambashare_readonly"
+msgid "Read Only"
 msgstr ""
 
 #. Allow Guests
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:13
-msgid "samba_sambashare_guestok"
+msgid "Allow Guests"
 msgstr ""
 
 #. Create Mask
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:14
-msgid "samba_sambashare_createmask"
+msgid "Create Mask"
 msgstr ""
 
 #. Mask for new files
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:15
-msgid "samba_sambashare_createmask_desc"
+msgid "Mask for new files"
 msgstr ""
 
 #. Directory Mask
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:16
-msgid "samba_sambashare_dirmask"
+msgid "Directory Mask"
 msgstr ""
 
 #. Mask for new directories
diff --git a/po/it/statistics.po b/po/it/statistics.po
index 2bf759906..2d6a6e136 100644
--- a/po/it/statistics.po
+++ b/po/it/statistics.po
@@ -14,1057 +14,1057 @@ msgstr ""
 
 #. Statistics
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:1
-msgid "stat_statistics"
+msgid "Statistics"
 msgstr ""
 
 #. The statistics package is based on <a href=\"http://collectd.org/index.shtml\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD Tool</a> to render diagram images from collected data.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:2
-msgid "stat_desc"
+msgid "The statistics package is based on <a href=\"http://collectd.org/index.shtml\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD Tool</a> to render diagram images from collected data."
 msgstr ""
 
 #. System plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:3
-msgid "stat_systemplugins"
+msgid "System plugins"
 msgstr ""
 
 #. Network plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:4
-msgid "stat_networkplugins"
+msgid "Network plugins"
 msgstr ""
 
 #. Output plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:5
-msgid "stat_outputplugins"
+msgid "Output plugins"
 msgstr ""
 
 #. Display timespan
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:6
-msgid "stat_showtimespan"
+msgid "Display timespan »"
 msgstr ""
 
 #. Graphs
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:7
-msgid "stat_graphs"
+msgid "Graphs"
 msgstr ""
 
 #. Collectd
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:8
-msgid "stat_collectd"
+msgid "Collectd"
 msgstr ""
 
 #. Processor
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:9
-msgid "stat_cpu"
+msgid "Processor"
 msgstr ""
 
 #. Ping
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:10
-msgid "stat_ping"
+msgid "Ping"
 msgstr ""
 
 #. Firewall
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:11
-msgid "stat_iptables"
+msgid "Firewall"
 msgstr ""
 
 #. Netlink
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:12
-msgid "stat_netlink"
+msgid "Netlink"
 msgstr ""
 
 #. Processes
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:13
-msgid "stat_processes"
+msgid "Processes"
 msgstr ""
 
 #. Wireless
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:14
-msgid "stat_wireless"
+msgid "Wireless"
 msgstr ""
 
 #. TCP Connections
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:15
-msgid "stat_tcpconns"
+msgid "TCP Connections"
 msgstr ""
 
 #. Interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:16
-msgid "stat_interface"
+msgid "Interfaces"
 msgstr ""
 
 #. Disk Space Usage
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:17
-msgid "stat_df"
+msgid "Disk Space Usage"
 msgstr ""
 
 #. Interrupts
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:18
-msgid "stat_irq"
+msgid "Interrupts"
 msgstr ""
 
 #. Disk Usage
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:19
-msgid "stat_disk"
+msgid "Disk Usage"
 msgstr ""
 
 #. Exec
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:20
-msgid "stat_exec"
+msgid "Exec"
 msgstr ""
 
 #. RRDTool
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:21
-msgid "stat_rrdtool"
+msgid "RRDTool"
 msgstr ""
 
 #. Network
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:22
-msgid "stat_network"
+msgid "Network"
 msgstr ""
 
 #. CSV Output
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:23
-msgid "stat_csv"
+msgid "CSV Output"
 msgstr ""
 
 #. System Load
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:24
-msgid "stat_load"
+msgid "System Load"
 msgstr ""
 
 #. DNS
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:25
-msgid "stat_dns"
+msgid "DNS"
 msgstr ""
 
 #. Email
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:26
-msgid "stat_email"
+msgid "Email"
 msgstr ""
 
 #. UnixSock
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:27
-msgid "stat_unixsock"
+msgid "UnixSock"
 msgstr ""
 
 #. Statistics
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:28
-msgid "lucistatistics"
+msgid "Statistics"
 msgstr ""
 
 #. Collectd Settings
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:29
-msgid "lucistatistics_collectd"
+msgid "Collectd Settings"
 msgstr ""
 
 #. Collectd is a small daeomon for collecting data from various sources through different plugins. On this page you can change general settings for the collectd daemon.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:30
-msgid "lucistatistics_collectd_desc"
+msgid "Collectd is a small daeomon for collecting data from various sources through different plugins. On this page you can change general settings for the collectd daemon."
 msgstr ""
 
 #. Hostname
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:31
-msgid "lucistatistics_collectd_hostname"
+msgid "Hostname"
 msgstr ""
 
 #. Base Directory
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:32
-msgid "lucistatistics_collectd_basedir"
+msgid "Base Directory"
 msgstr ""
 
 #. Directory for sub-configurations
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:33
-msgid "lucistatistics_collectd_include"
+msgid "Directory for sub-configurations"
 msgstr ""
 
 #. Directory for collectd plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:34
-msgid "lucistatistics_collectd_plugindir"
+msgid "Directory for collectd plugins"
 msgstr ""
 
 #. Used PID file
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:35
-msgid "lucistatistics_collectd_pidfile"
+msgid "Used PID file"
 msgstr ""
 
 #. Datasets definition file
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:36
-msgid "lucistatistics_collectd_typesdb"
+msgid "Datasets definition file"
 msgstr ""
 
 #. Data collection interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:37
-msgid "lucistatistics_collectd_interval"
+msgid "Data collection interval"
 msgstr ""
 
 #. Seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:38
-msgid "lucistatistics_collectd_interval_desc"
+msgid "Seconds"
 msgstr ""
 
 #. Number of threads for data collection
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:39
-msgid "lucistatistics_collectd_readthreads"
+msgid "Number of threads for data collection"
 msgstr ""
 
 #. Try to lookup fully qualified hostname
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:40
-msgid "lucistatistics_collectd_fqdnlookup"
+msgid "Try to lookup fully qualified hostname"
 msgstr ""
 
 #. CPU Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:41
-msgid "lucistatistics_collectdcpu"
+msgid "CPU Plugin Configuration"
 msgstr ""
 
 #. The cpu plugin collects basic statistics about the processor usage.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:42
-msgid "lucistatistics_collectdcpu_desc"
+msgid "The cpu plugin collects basic statistics about the processor usage."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:43
-msgid "lucistatistics_collectdcpu_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. CSV Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:44
-msgid "lucistatistics_collectdcsv"
+msgid "CSV Plugin Configuration"
 msgstr ""
 
 #. The csv plugin stores collected data in csv file format for further processing by external programs.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:45
-msgid "lucistatistics_collectdcsv_desc"
+msgid "The csv plugin stores collected data in csv file format for further processing by external programs."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:46
-msgid "lucistatistics_collectdcsv_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Storage directory for the csv files
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:47
-msgid "lucistatistics_collectdcsv_datadir"
+msgid "Storage directory for the csv files"
 msgstr ""
 
 #. Store data values as rates instead of absolute values
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:48
-msgid "lucistatistics_collectdcsv_storerates"
+msgid "Store data values as rates instead of absolute values"
 msgstr ""
 
 #. DF Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:49
-msgid "lucistatistics_collectddf"
+msgid "DF Plugin Configuration"
 msgstr ""
 
 #. The df plugin collects statistics about the disk space usage on different devices, mount points or filesystem types.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:50
-msgid "lucistatistics_collectddf_desc"
+msgid "The df plugin collects statistics about the disk space usage on different devices, mount points or filesystem types."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:51
-msgid "lucistatistics_collectddf_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Monitor devices
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:52
-msgid "lucistatistics_collectddf_devices"
+msgid "Monitor devices"
 msgstr ""
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:53
-msgid "lucistatistics_collectddf_devices_desc"
+msgid "multiple separated by space"
 msgstr ""
 
 #. Monitor mount points
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:54
-msgid "lucistatistics_collectddf_mountpoints"
+msgid "Monitor mount points"
 msgstr ""
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:55
-msgid "lucistatistics_collectddf_mountpoints_desc"
+msgid "multiple separated by space"
 msgstr ""
 
 #. Monitor filesystem types
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:56
-msgid "lucistatistics_collectddf_fstypes"
+msgid "Monitor filesystem types"
 msgstr ""
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:57
-msgid "lucistatistics_collectddf_fstypes_desc"
+msgid "multiple separated by space"
 msgstr ""
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:58
-msgid "lucistatistics_collectddf_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr ""
 
 #. Disk Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:59
-msgid "lucistatistics_collectddisk"
+msgid "Disk Plugin Configuration"
 msgstr ""
 
 #. The disk plugin collects detailled usage statistics for selected partitions or whole disks.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:60
-msgid "lucistatistics_collectddisk_desc"
+msgid "The disk plugin collects detailled usage statistics for selected partitions or whole disks."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:61
-msgid "lucistatistics_collectddisk_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Monitor disks and partitions
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:62
-msgid "lucistatistics_collectddisk_disks"
+msgid "Monitor disks and partitions"
 msgstr ""
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:63
-msgid "lucistatistics_collectddisk_disks_desc"
+msgid "multiple separated by space"
 msgstr ""
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:64
-msgid "lucistatistics_collectddisk_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr ""
 
 #. DNS Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:65
-msgid "lucistatistics_collectddns"
+msgid "DNS Plugin Configuration"
 msgstr ""
 
 #. The dns plugin collects detailled statistics about dns related traffic on selected interfaces.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:66
-msgid "lucistatistics_collectddns_desc"
+msgid "The dns plugin collects detailled statistics about dns related traffic on selected interfaces."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:67
-msgid "lucistatistics_collectddns_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Monitor interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:68
-msgid "lucistatistics_collectddns_interfaces"
+msgid "Monitor interfaces"
 msgstr ""
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:69
-msgid "lucistatistics_collectddns_interfaces_desc"
+msgid "multiple separated by space"
 msgstr ""
 
 #. Ignore source addresses
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:70
-msgid "lucistatistics_collectddns_ignoresources"
+msgid "Ignore source addresses"
 msgstr ""
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:71
-msgid "lucistatistics_collectddns_ignoresources_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr ""
 
 #. E-Mail Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:72
-msgid "lucistatistics_collectdemail"
+msgid "E-Mail Plugin Configuration"
 msgstr ""
 
 #. The email plugin creates a unix socket which can be used to transmit email-statistics to a running collectd daemon. This plugin is primarily intended to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can be used in other ways as well.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:73
-msgid "lucistatistics_collectdemail_desc"
+msgid "The email plugin creates a unix socket which can be used to transmit email-statistics to a running collectd daemon. This plugin is primarily intended to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can be used in other ways as well."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:74
-msgid "lucistatistics_collectdemail_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Filepath of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:75
-msgid "lucistatistics_collectdemail_socketfile"
+msgid "Filepath of the unix socket"
 msgstr ""
 
 #. Group ownership of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:76
-msgid "lucistatistics_collectdemail_socketgroup"
+msgid "Group ownership of the unix socket"
 msgstr ""
 
 #. group name
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:77
-msgid "lucistatistics_collectdemail_socketgroup_desc"
+msgid "group name"
 msgstr ""
 
 #. File permissions of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:78
-msgid "lucistatistics_collectdemail_socketperms"
+msgid "File permissions of the unix socket"
 msgstr ""
 
 #. octal
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:79
-msgid "lucistatistics_collectdemail_socketperms_desc"
+msgid "octal"
 msgstr ""
 
 #. Maximum allowed connections
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:80
-msgid "lucistatistics_collectdemail_maxconns"
+msgid "Maximum allowed connections"
 msgstr ""
 
 #. Exec Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:81
-msgid "lucistatistics_collectdexec"
+msgid "Exec Plugin Configuration"
 msgstr ""
 
 #. The exec plugin starts external commands to read values from or to notify external processes when certain threshold values have been reached.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:82
-msgid "lucistatistics_collectdexec_desc"
+msgid "The exec plugin starts external commands to read values from or to notify external processes when certain threshold values have been reached."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:83
-msgid "lucistatistics_collectdexec_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Add command for reading values
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:84
-msgid "lucistatistics_collectdexecinput"
+msgid "Add command for reading values"
 msgstr ""
 
 #. Here you can define external commands which will be started by collectd in order to read certain values. The values will be read from stdout.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:85
-msgid "lucistatistics_collectdexecinput_desc"
+msgid "Here you can define external commands which will be started by collectd in order to read certain values. The values will be read from stdout."
 msgstr ""
 
 #. Commandline
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:86
-msgid "lucistatistics_collectdexecinput_cmdline"
+msgid "Commandline"
 msgstr ""
 
 #. Run as user
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:87
-msgid "lucistatistics_collectdexecinput_cmduser"
+msgid "Run as user"
 msgstr ""
 
 #. Run as group
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:88
-msgid "lucistatistics_collectdexecinput_cmdgroup"
+msgid "Run as group"
 msgstr ""
 
 #. Add notification command
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:89
-msgid "lucistatistics_collectdexecnotify"
+msgid "Add notification command"
 msgstr ""
 
 #. Here you can define external commands which will be started by collectd when certain threshold values have been reached. The values leading to invokation will be feeded to the the called programs stdin.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:90
-msgid "lucistatistics_collectdexecnotify_desc"
+msgid "Here you can define external commands which will be started by collectd when certain threshold values have been reached. The values leading to invokation will be feeded to the the called programs stdin."
 msgstr ""
 
 #. Commandline
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:91
-msgid "lucistatistics_collectdexecnotify_cmdline"
+msgid "Commandline"
 msgstr ""
 
 #. Run as user
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:92
-msgid "lucistatistics_collectdexecnotify_cmduser"
+msgid "Run as user"
 msgstr ""
 
 #. Run as group
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:93
-msgid "lucistatistics_collectdexecnotify_cmdgroup"
+msgid "Run as group"
 msgstr ""
 
 #. Interface Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:94
-msgid "lucistatistics_collectdinterface"
+msgid "Interface Plugin Configuration"
 msgstr ""
 
 #. The interface plugin collects traffic statistics on selected interfaces.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:95
-msgid "lucistatistics_collectdinterface_desc"
+msgid "The interface plugin collects traffic statistics on selected interfaces."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:96
-msgid "lucistatistics_collectdinterface_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Monitor interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:97
-msgid "lucistatistics_collectdinterface_interfaces"
+msgid "Monitor interfaces"
 msgstr ""
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:98
-msgid "lucistatistics_collectdinterface_interfaces_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr ""
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:99
-msgid "lucistatistics_collectdinterface_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr ""
 
 #. Iptables Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:100
-msgid "lucistatistics_collectdiptables"
+msgid "Iptables Plugin Configuration"
 msgstr ""
 
 #. The iptables plugin will monitor selected firewall rules and collect informations about processed bytes and packets per rule.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:101
-msgid "lucistatistics_collectdiptables_desc"
+msgid "The iptables plugin will monitor selected firewall rules and collect informations about processed bytes and packets per rule."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:102
-msgid "lucistatistics_collectdiptables_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Add matching rule
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:103
-msgid "lucistatistics_collectdiptablesmatch"
+msgid "Add matching rule"
 msgstr ""
 
 #. Here you can define various criteria by which the monitored iptables rules are selected.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:104
-msgid "lucistatistics_collectdiptablesmatch_desc"
+msgid "Here you can define various criteria by which the monitored iptables rules are selected."
 msgstr ""
 
 #. Name of the rule
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:105
-msgid "lucistatistics_collectdiptablesmatch_name"
+msgid "Name of the rule"
 msgstr ""
 
 #. max. 16 chars
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:106
-msgid "lucistatistics_collectdiptablesmatch_name_desc"
+msgid "max. 16 chars"
 msgstr ""
 
 #. Table
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:107
-msgid "lucistatistics_collectdiptablesmatch_table"
+msgid "Table"
 msgstr ""
 
 #. Chain
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:108
-msgid "lucistatistics_collectdiptablesmatch_chain"
+msgid "Chain"
 msgstr ""
 
 #. Action (target)
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:109
-msgid "lucistatistics_collectdiptablesmatch_target"
+msgid "Action (target)"
 msgstr ""
 
 #. Network protocol
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:110
-msgid "lucistatistics_collectdiptablesmatch_protocol"
+msgid "Network protocol"
 msgstr ""
 
 #. Source ip range
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:111
-msgid "lucistatistics_collectdiptablesmatch_source"
+msgid "Source ip range"
 msgstr ""
 
 #. CIDR notation
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:112
-msgid "lucistatistics_collectdiptablesmatch_source_desc"
+msgid "CIDR notation"
 msgstr ""
 
 #. Destination ip range
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:113
-msgid "lucistatistics_collectdiptablesmatch_destination"
+msgid "Destination ip range"
 msgstr ""
 
 #. CIDR notation
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:114
-msgid "lucistatistics_collectdiptablesmatch_destination_desc"
+msgid "CIDR notation"
 msgstr ""
 
 #. Incoming interface
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:115
-msgid "lucistatistics_collectdiptablesmatch_inputif"
+msgid "Incoming interface"
 msgstr ""
 
 #. e.g. br-lan
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:116
-msgid "lucistatistics_collectdiptablesmatch_inputif_desc"
+msgid "e.g. br-lan"
 msgstr ""
 
 #. Outgoing interface
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:117
-msgid "lucistatistics_collectdiptablesmatch_outputif"
+msgid "Outgoing interface"
 msgstr ""
 
 #. e.g. br-ff
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:118
-msgid "lucistatistics_collectdiptablesmatch_outputif_desc"
+msgid "e.g. br-ff"
 msgstr ""
 
 #. Options
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:119
-msgid "lucistatistics_collectdiptablesmatch_options"
+msgid "Options"
 msgstr ""
 
 #. e.g. reject-with tcp-reset
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:120
-msgid "lucistatistics_collectdiptablesmatch_options_desc"
+msgid "e.g. reject-with tcp-reset"
 msgstr ""
 
 #. IRQ Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:121
-msgid "lucistatistics_collectdirq"
+msgid "IRQ Plugin Configuration"
 msgstr ""
 
 #. The irq plugin will monitor the rate of issues per second for each selected interrupt. If no interrupt is selected then all interrupts are monitored.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:122
-msgid "lucistatistics_collectdirq_desc"
+msgid "The irq plugin will monitor the rate of issues per second for each selected interrupt. If no interrupt is selected then all interrupts are monitored."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:123
-msgid "lucistatistics_collectdirq_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Monitor interrupts
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:124
-msgid "lucistatistics_collectdirq_irqs"
+msgid "Monitor interrupts"
 msgstr ""
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:125
-msgid "lucistatistics_collectdirq_irqs_desc"
+msgid "multiple separated by space"
 msgstr ""
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:126
-msgid "lucistatistics_collectdirq_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr ""
 
 #. Load Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:127
-msgid "lucistatistics_collectdload"
+msgid "Load Plugin Configuration"
 msgstr ""
 
 #. The load plugin collects statistics about the general system load.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:128
-msgid "lucistatistics_collectdload_desc"
+msgid "The load plugin collects statistics about the general system load."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:129
-msgid "lucistatistics_collectdload_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Netlink Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:130
-msgid "lucistatistics_collectdnetlink"
+msgid "Netlink Plugin Configuration"
 msgstr ""
 
 #. The netlink plugin collects extended informations like qdisc-, class- and filter-statistics for selected interfaces.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:131
-msgid "lucistatistics_collectdnetlink_desc"
+msgid "The netlink plugin collects extended informations like qdisc-, class- and filter-statistics for selected interfaces."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:132
-msgid "lucistatistics_collectdnetlink_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Basic monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:133
-msgid "lucistatistics_collectdnetlink_interfaces"
+msgid "Basic monitoring"
 msgstr ""
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:134
-msgid "lucistatistics_collectdnetlink_interfaces_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr ""
 
 #. Verbose monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:135
-msgid "lucistatistics_collectdnetlink_verboseinterfaces"
+msgid "Verbose monitoring"
 msgstr ""
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:136
-msgid "lucistatistics_collectdnetlink_verboseinterfaces_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr ""
 
 #. Qdisc monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:137
-msgid "lucistatistics_collectdnetlink_qdiscs"
+msgid "Qdisc monitoring"
 msgstr ""
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:138
-msgid "lucistatistics_collectdnetlink_qdiscs_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr ""
 
 #. Shaping class monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:139
-msgid "lucistatistics_collectdnetlink_classes"
+msgid "Shaping class monitoring"
 msgstr ""
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:140
-msgid "lucistatistics_collectdnetlink_classes_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr ""
 
 #. Filter class monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:141
-msgid "lucistatistics_collectdnetlink_filters"
+msgid "Filter class monitoring"
 msgstr ""
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:142
-msgid "lucistatistics_collectdnetlink_filters_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr ""
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:143
-msgid "lucistatistics_collectdnetlink_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr ""
 
 #. Network Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:144
-msgid "lucistatistics_collectdnetwork"
+msgid "Network Plugin Configuration"
 msgstr ""
 
 #. The network plugin provides network based communication between different collectd instances. Collectd can operate both in client and server mode. In client mode locally collected date is transferred to a collectd server instance, in server mode the local instance receives data from other hosts.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:145
-msgid "lucistatistics_collectdnetwork_desc"
+msgid "The network plugin provides network based communication between different collectd instances. Collectd can operate both in client and server mode. In client mode locally collected date is transferred to a collectd server instance, in server mode the local instance receives data from other hosts."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:146
-msgid "lucistatistics_collectdnetwork_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Listener interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:147
-msgid "lucistatistics_collectdnetworklisten"
+msgid "Listener interfaces"
 msgstr ""
 
 #. This section defines on which interfaces collectd will wait for incoming connections.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:148
-msgid "lucistatistics_collectdnetworklisten_desc"
+msgid "This section defines on which interfaces collectd will wait for incoming connections."
 msgstr ""
 
 #. Listen host
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:149
-msgid "lucistatistics_collectdnetworklisten_host"
+msgid "Listen host"
 msgstr ""
 
 #. host-, ip- or ip6 address
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:150
-msgid "lucistatistics_collectdnetworklisten_host_desc"
+msgid "host-, ip- or ip6 address"
 msgstr ""
 
 #. Listen port
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:151
-msgid "lucistatistics_collectdnetworklisten_port"
+msgid "Listen port"
 msgstr ""
 
 #. 0 - 65535
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:152
-msgid "lucistatistics_collectdnetworklisten_port_desc"
+msgid "0 - 65535"
 msgstr ""
 
 #. server interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:153
-msgid "lucistatistics_collectdnetworkserver"
+msgid "server interfaces"
 msgstr ""
 
 #. This section defines to which servers the locally collected data is sent to.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:154
-msgid "lucistatistics_collectdnetworkserver_desc"
+msgid "This section defines to which servers the locally collected data is sent to."
 msgstr ""
 
 #. Server host
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:155
-msgid "lucistatistics_collectdnetworkserver_host"
+msgid "Server host"
 msgstr ""
 
 #. host-, ip- or ip6 address
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:156
-msgid "lucistatistics_collectdnetworkserver_host_desc"
+msgid "host-, ip- or ip6 address"
 msgstr ""
 
 #. Server port
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:157
-msgid "lucistatistics_collectdnetworkserver_port"
+msgid "Server port"
 msgstr ""
 
 #. 0 - 65535
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:158
-msgid "lucistatistics_collectdnetworkserver_port_desc"
+msgid "0 - 65535"
 msgstr ""
 
 #. TTL for network packets
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:159
-msgid "lucistatistics_collectdnetwork_timetolive"
+msgid "TTL for network packets"
 msgstr ""
 
 #. 0 - 255
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:160
-msgid "lucistatistics_collectdnetwork_timetolive_desc"
+msgid "0 - 255"
 msgstr ""
 
 #. Forwarding between listen and server addresses
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:161
-msgid "lucistatistics_collectdnetwork_forward"
+msgid "Forwarding between listen and server addresses"
 msgstr ""
 
 #. Cache flush interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:162
-msgid "lucistatistics_collectdnetwork_cacheflush"
+msgid "Cache flush interval"
 msgstr ""
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:163
-msgid "lucistatistics_collectdnetwork_cacheflush_desc"
+msgid "seconds"
 msgstr ""
 
 #. Ping Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:164
-msgid "lucistatistics_collectdping"
+msgid "Ping Plugin Configuration"
 msgstr ""
 
 #. The ping plugin will send icmp echo replies to selected hosts and measure the roundtrip time for each host.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:165
-msgid "lucistatistics_collectdping_desc"
+msgid "The ping plugin will send icmp echo replies to selected hosts and measure the roundtrip time for each host."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:166
-msgid "lucistatistics_collectdping_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Monitor hosts
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:167
-msgid "lucistatistics_collectdping_hosts"
+msgid "Monitor hosts"
 msgstr ""
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:168
-msgid "lucistatistics_collectdping_hosts_desc"
+msgid "multiple separated by space"
 msgstr ""
 
 #. TTL for ping packets
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:169
-msgid "lucistatistics_collectdping_ttl"
+msgid "TTL for ping packets"
 msgstr ""
 
 #. 0 - 255
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:170
-msgid "lucistatistics_collectdping_ttl_desc"
+msgid "0 - 255"
 msgstr ""
 
 #. Processes Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:171
-msgid "lucistatistics_collectdprocesses"
+msgid "Processes Plugin Configuration"
 msgstr ""
 
 #. The processes plugin collects informations like cpu time, page faults and memory usage of selected processes.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:172
-msgid "lucistatistics_collectdprocesses_desc"
+msgid "The processes plugin collects informations like cpu time, page faults and memory usage of selected processes."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:173
-msgid "lucistatistics_collectdprocesses_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Monitor processes
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:174
-msgid "lucistatistics_collectdprocesses_processes"
+msgid "Monitor processes"
 msgstr ""
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:175
-msgid "lucistatistics_collectdprocesses_processes_desc"
+msgid "multiple separated by space"
 msgstr ""
 
 #. RRDTool Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:176
-msgid "lucistatistics_collectdrrdtool"
+msgid "RRDTool Plugin Configuration"
 msgstr ""
 
 #. The rrdtool plugin stores the collected data in rrd database files, the foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong values will result in a very high memory consumption in the temporary directory. This can render the device unusable!</strong>
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:177
-msgid "lucistatistics_collectdrrdtool_desc"
+msgid "The rrdtool plugin stores the collected data in rrd database files, the foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong values will result in a very high memory consumption in the temporary directory. This can render the device unusable!</strong>"
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:178
-msgid "lucistatistics_collectdrrdtool_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Storage directory
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:179
-msgid "lucistatistics_collectdrrdtool_datadir"
+msgid "Storage directory"
 msgstr ""
 
 #. RRD step interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:180
-msgid "lucistatistics_collectdrrdtool_stepsize"
+msgid "RRD step interval"
 msgstr ""
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:181
-msgid "lucistatistics_collectdrrdtool_stepsize_desc"
+msgid "seconds"
 msgstr ""
 
 #. RRD heart beat interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:182
-msgid "lucistatistics_collectdrrdtool_heartbeat"
+msgid "RRD heart beat interval"
 msgstr ""
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:183
-msgid "lucistatistics_collectdrrdtool_heartbeat_desc"
+msgid "seconds"
 msgstr ""
 
 #. Only create average RRAs
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:184
-msgid "lucistatistics_collectdrrdtool_rrasingle"
+msgid "Only create average RRAs"
 msgstr ""
 
 #. reduces rrd size
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:185
-msgid "lucistatistics_collectdrrdtool_rrasingle_desc"
+msgid "reduces rrd size"
 msgstr ""
 
 #. Stored timespans
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:186
-msgid "lucistatistics_collectdrrdtool_rratimespans"
+msgid "Stored timespans"
 msgstr ""
 
 #. seconds; multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:187
-msgid "lucistatistics_collectdrrdtool_rratimespans_desc"
+msgid "seconds; multiple separated by space"
 msgstr ""
 
 #. Rows per RRA
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:188
-msgid "lucistatistics_collectdrrdtool_rrarows"
+msgid "Rows per RRA"
 msgstr ""
 
 #. RRD XFiles Factor
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:189
-msgid "lucistatistics_collectdrrdtool_xff"
+msgid "RRD XFiles Factor"
 msgstr ""
 
 #. Cache collected data for
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:190
-msgid "lucistatistics_collectdrrdtool_cachetimeout"
+msgid "Cache collected data for"
 msgstr ""
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:191
-msgid "lucistatistics_collectdrrdtool_cachetimeout_desc"
+msgid "seconds"
 msgstr ""
 
 #. Flush cache after
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:192
-msgid "lucistatistics_collectdrrdtool_cacheflush"
+msgid "Flush cache after"
 msgstr ""
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:193
-msgid "lucistatistics_collectdrrdtool_cacheflush_desc"
+msgid "seconds"
 msgstr ""
 
 #. TCPConns Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:194
-msgid "lucistatistics_collectdtcpconns"
+msgid "TCPConns Plugin Configuration"
 msgstr ""
 
 #. The tcpconns plugin collects informations about open tcp connections on selected ports.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:195
-msgid "lucistatistics_collectdtcpconns_desc"
+msgid "The tcpconns plugin collects informations about open tcp connections on selected ports."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:196
-msgid "lucistatistics_collectdtcpconns_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Monitor all local listen ports
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:197
-msgid "lucistatistics_collectdtcpconns_listeningports"
+msgid "Monitor all local listen ports"
 msgstr ""
 
 #. Monitor local ports
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:198
-msgid "lucistatistics_collectdtcpconns_localports"
+msgid "Monitor local ports"
 msgstr ""
 
 #. 0 - 65535; multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:199
-msgid "lucistatistics_collectdtcpconns_localports_desc"
+msgid "0 - 65535; multiple separated by space"
 msgstr ""
 
 #. Monitor remote ports
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:200
-msgid "lucistatistics_collectdtcpconns_remoteports"
+msgid "Monitor remote ports"
 msgstr ""
 
 #. 0 - 65535; multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:201
-msgid "lucistatistics_collectdtcpconns_remoteports_desc"
+msgid "0 - 65535; multiple separated by space"
 msgstr ""
 
 #. Unixsock Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:202
-msgid "lucistatistics_collectdunixsock"
+msgid "Unixsock Plugin Configuration"
 msgstr ""
 
 #. The unixsock plugin creates a unix socket which can be used to read collected data from a running collectd instance.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:203
-msgid "lucistatistics_collectdunixsock_desc"
+msgid "The unixsock plugin creates a unix socket which can be used to read collected data from a running collectd instance."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:204
-msgid "lucistatistics_collectdunixsock_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Filepath of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:205
-msgid "lucistatistics_collectdunixsock_socketfile"
+msgid "Filepath of the unix socket"
 msgstr ""
 
 #. Group ownership of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:206
-msgid "lucistatistics_collectdunixsock_socketgroup"
+msgid "Group ownership of the unix socket"
 msgstr ""
 
 #. group name
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:207
-msgid "lucistatistics_collectdunixsock_socketgroup_desc"
+msgid "group name"
 msgstr ""
 
 #. File permissions of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:208
-msgid "lucistatistics_collectdunixsock_socketperms"
+msgid "File permissions of the unix socket"
 msgstr ""
 
 #. octal
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:209
-msgid "lucistatistics_collectdunixsock_socketperms_desc"
+msgid "octal"
 msgstr ""
 
 #. Wireless Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:210
-msgid "lucistatistics_collectdwireless"
+msgid "Wireless Plugin Configuration"
 msgstr ""
 
 #. The wireless plugin collects statistics about wireless signal strength, noise and quality.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:211
-msgid "lucistatistics_collectdwireless_desc"
+msgid "The wireless plugin collects statistics about wireless signal strength, noise and quality."
 msgstr ""
 
 #. Enable this plugin
diff --git a/po/it/sysauth.po b/po/it/sysauth.po
index 1ba5948ef..711b60966 100644
--- a/po/it/sysauth.po
+++ b/po/it/sysauth.po
@@ -14,12 +14,12 @@ msgstr ""
 
 #. Authorization Required
 #: i18n/english/luasrc/i18n/sysauth.en.lua:1
-msgid "sysauth_head"
+msgid "Authorization Required"
 msgstr "Autorizzazione richiesta"
 
 #. Please enter your username and password.
 #: i18n/english/luasrc/i18n/sysauth.en.lua:2
-msgid "sysauth_prompt"
+msgid "Please enter your username and password."
 msgstr "Per favore inserisci i tuoi username e password."
 
 #. Invalid username and/or password! Please try again.
diff --git a/po/it/tinyproxy.po b/po/it/tinyproxy.po
index 527e4ffba..df4b3498e 100644
--- a/po/it/tinyproxy.po
+++ b/po/it/tinyproxy.po
@@ -14,157 +14,157 @@ msgstr ""
 
 #. Tinyproxy
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:1
-msgid "tinyproxy"
+msgid "Tinyproxy"
 msgstr ""
 
 #. Tinyproxy is a small and fast non-caching HTTP(S)-Proxy
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:2
-msgid "tinyproxy_desc"
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
 msgstr ""
 
 #. Allow access from
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:3
-msgid "tinyproxy_tinyproxy_allow"
+msgid "Allow access from"
 msgstr ""
 
 #. Allowed headers for anonymous proxy
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:4
-msgid "tinyproxy_tinyproxy_anonymous"
+msgid "Allowed headers for anonymous proxy"
 msgstr ""
 
 #. Bind outgoing traffic to address
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:5
-msgid "tinyproxy_tinyproxy_bind"
+msgid "Bind outgoing traffic to address"
 msgstr ""
 
 #. Ports allowed for CONNECT method
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:6
-msgid "tinyproxy_tinyproxy_connectport"
+msgid "Ports allowed for CONNECT method"
 msgstr ""
 
 #. 0 = disabled, empty = all
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:7
-msgid "tinyproxy_tinyproxy_connectport_desc"
+msgid "0 = disabled, empty = all"
 msgstr ""
 
 #. Error document
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:8
-msgid "tinyproxy_tinyproxy_defaulterrorfile"
+msgid "Error document"
 msgstr ""
 
 #. Filter list
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:9
-msgid "tinyproxy_tinyproxy_filter"
+msgid "Filter list"
 msgstr ""
 
 #. Case sensitive filters
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:10
-msgid "tinyproxy_tinyproxy_filtercasesensitive"
+msgid "Case sensitive filters"
 msgstr ""
 
 #. Filter list is a whitelist
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:11
-msgid "tinyproxy_tinyproxy_filterdefaultdeny"
+msgid "Filter list is a whitelist"
 msgstr ""
 
 #. Extended regular expression filters
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:12
-msgid "tinyproxy_tinyproxy_filterextended"
+msgid "Extended regular expression filters"
 msgstr ""
 
 #. Filter URLs instead of domains
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:13
-msgid "tinyproxy_tinyproxy_filterurls"
+msgid "Filter URLs instead of domains"
 msgstr ""
 
 #. Listen on address
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:14
-msgid "tinyproxy_tinyproxy_listen"
+msgid "Listen on address"
 msgstr ""
 
 #. Logfile
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:15
-msgid "tinyproxy_tinyproxy_logfile"
+msgid "Logfile"
 msgstr ""
 
 #. Log level
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:16
-msgid "tinyproxy_tinyproxy_loglevel"
+msgid "Log level"
 msgstr ""
 
 #. Maximum number of clients
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:17
-msgid "tinyproxy_tinyproxy_maxclients"
+msgid "Maximum number of clients"
 msgstr ""
 
 #. Maximum requests per thread
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:18
-msgid "tinyproxy_tinyproxy_maxrequestsperchild"
+msgid "Maximum requests per thread"
 msgstr ""
 
 #. Max. spare servers
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:19
-msgid "tinyproxy_tinyproxy_maxspareservers"
+msgid "Max. spare servers"
 msgstr ""
 
 #. Min. spare servers
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:20
-msgid "tinyproxy_tinyproxy_minspareservers"
+msgid "Min. spare servers"
 msgstr ""
 
 #. Spare servers to start with
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:21
-msgid "tinyproxy_tinyproxy_startservers"
+msgid "Spare servers to start with"
 msgstr ""
 
 #. Statistic document
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:22
-msgid "tinyproxy_tinyproxy_statfile"
+msgid "Statistic document"
 msgstr ""
 
 #. Write to syslog
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:23
-msgid "tinyproxy_tinyproxy_syslog"
+msgid "Write to syslog"
 msgstr ""
 
 #. Connection Timeout
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:24
-msgid "tinyproxy_tinyproxy_timeout"
+msgid "Connection Timeout"
 msgstr ""
 
 #. Value of Via-Header
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:25
-msgid "tinyproxy_tinyproxy_viaproxyname"
+msgid "Value of Via-Header"
 msgstr ""
 
 #. Include client IP
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:26
-msgid "tinyproxy_tinyproxy_xtinyproxy"
+msgid "Include client IP"
 msgstr ""
 
 #. Via proxy
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:27
-msgid "tinyproxy_type_proxy"
+msgid "Via proxy"
 msgstr ""
 
 #. Reject access
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:28
-msgid "tinyproxy_type_reject"
+msgid "Reject access"
 msgstr ""
 
 #. Upstream Control
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:29
-msgid "tinyproxy_upstream"
+msgid "Upstream Control"
 msgstr ""
 
 #. Target host
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:30
-msgid "tinyproxy_upstream_target"
+msgid "Target host"
 msgstr ""
 
 #. Type
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:31
-msgid "tinyproxy_upstream_type"
+msgid "Type"
 msgstr ""
 
 #. Upstream Proxy
diff --git a/po/it/upnp.po b/po/it/upnp.po
index e4a9d22eb..e70302883 100644
--- a/po/it/upnp.po
+++ b/po/it/upnp.po
@@ -14,32 +14,32 @@ msgstr ""
 
 #. Universal Plug &amp; Play
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:1
-msgid "upnpd"
+msgid "Universal Plug & Play"
 msgstr ""
 
 #. UPNP allows clients in the local network to automatically configure the router.
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:2
-msgid "upnpd_desc"
+msgid "UPNP allows clients in the local network to automatically configure the router."
 msgstr ""
 
 #. UPNP should only be enabled if absolutely necessary as it can result in high security risks for your network.
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:3
-msgid "upnpd_config_desc"
+msgid "UPNP should only be enabled if absolutely necessary as it can result in high security risks for your network."
 msgstr ""
 
 #. Enable secure mode
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:4
-msgid "upnpd_config_securemode"
+msgid "Enable secure mode"
 msgstr ""
 
 #. Log output
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:5
-msgid "upnpd_config_logoutput"
+msgid "Log output"
 msgstr ""
 
 #. Downlink
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:6
-msgid "upnpd_config_download"
+msgid "Downlink"
 msgstr ""
 
 #. Uplink
diff --git a/po/it/ushare.po b/po/it/ushare.po
index f3acd43e5..c0ff09ca1 100644
--- a/po/it/ushare.po
+++ b/po/it/ushare.po
@@ -14,37 +14,37 @@ msgstr ""
 
 #. Content directories
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:1
-msgid "content_directories"
+msgid "Content directories"
 msgstr ""
 
 #. Disable telnet console
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:2
-msgid "disable_telnet"
+msgid "Disable telnet console"
 msgstr ""
 
 #. Disable webinterface
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:3
-msgid "disable_webif"
+msgid "Disable webinterface"
 msgstr ""
 
 #. Options
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:4
-msgid "options"
+msgid "Options"
 msgstr ""
 
 #. Servername
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:5
-msgid "servername"
+msgid "Servername"
 msgstr ""
 
 #. Settings
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:6
-msgid "settings"
+msgid "Settings"
 msgstr ""
 
 #. uShare
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:7
-msgid "ushare"
+msgid "uShare"
 msgstr ""
 
 #. uShare
diff --git a/po/it/uvc_streamer.po b/po/it/uvc_streamer.po
index db79cd8a8..0431eb192 100644
--- a/po/it/uvc_streamer.po
+++ b/po/it/uvc_streamer.po
@@ -14,22 +14,22 @@ msgstr ""
 
 #. Frames per second
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
-msgid "framespersecond"
+msgid "Frames per second"
 msgstr ""
 
 #. Resolution
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
-msgid "resolution"
+msgid "Resolution"
 msgstr ""
 
 #. Settings
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
-msgid "settings"
+msgid "Settings"
 msgstr ""
 
 #. Webcam streaming
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
-msgid "uvc_streamer"
+msgid "Webcam streaming"
 msgstr ""
 
 #. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
diff --git a/po/it/uvl.po b/po/it/uvl.po
index fac3aa150..e8fadab38 100644
--- a/po/it/uvl.po
+++ b/po/it/uvl.po
@@ -14,192 +14,192 @@ msgstr ""
 
 #. Unable to load config \"%p\": %1
 #: libs/uvl/luasrc/i18n/uvl.en.lua:1
-msgid "uvl_err_uciload"
+msgid "Unable to load config \"%p\": %1"
 msgstr ""
 
 #. Error in scheme \"%p\":\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:2
-msgid "uvl_err_scheme"
+msgid "Error in scheme \"%p\":\\n%c"
 msgstr ""
 
 #. Error in config \"%p\":\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:3
-msgid "uvl_err_config"
+msgid "Error in config \"%p\":\\n%c"
 msgstr ""
 
 #. Error in section \"%i\" (%I):\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:4
-msgid "uvl_err_section"
+msgid "Error in section \"%i\" (%I):\\n%c"
 msgstr ""
 
 #. Error in option \"%i\" (%I):\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:5
-msgid "uvl_err_option"
+msgid "Error in option \"%i\" (%I):\\n%c"
 msgstr ""
 
 #. Option \"%i\" has invalid reference specification %1:\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:6
-msgid "uvl_err_reference"
+msgid "Option \"%i\" has invalid reference specification %1:\\n%c"
 msgstr ""
 
 #. In dependency check for %t \"%i\":\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:7
-msgid "uvl_err_dependency"
+msgid "In dependency check for %t \"%i\":\\n%c"
 msgstr ""
 
 #. Can not find scheme \"%p\" in \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:8
-msgid "uvl_err_sme_find"
+msgid "Can not find scheme \"%p\" in \"%1\""
 msgstr ""
 
 #. Can not access file \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:9
-msgid "uvl_err_sme_read"
+msgid "Can not access file \"%1\""
 msgstr ""
 
 #. Missing required scheme field \"%1\" in \"%i\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:10
-msgid "uvl_err_sme_reqfld"
+msgid "Missing required scheme field \"%1\" in \"%i\""
 msgstr ""
 
 #. Illegal reference \"%1\" to an anonymous section
 #: libs/uvl/luasrc/i18n/uvl.en.lua:11
-msgid "uvl_err_sme_invref"
+msgid "Illegal reference \"%1\" to an anonymous section"
 msgstr ""
 
 #. Malformed reference in \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:12
-msgid "uvl_err_sme_badref"
+msgid "Malformed reference in \"%1\""
 msgstr ""
 
 #. Malformed dependency specification \"%1\" in \"%i\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:13
-msgid "uvl_err_sme_baddep"
+msgid "Malformed dependency specification \"%1\" in \"%i\""
 msgstr ""
 
 #. Malformed validator specification \"%1\" in \"%i\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:14
-msgid "uvl_err_sme_badval"
+msgid "Malformed validator specification \"%1\" in \"%i\""
 msgstr ""
 
 #. External validator \"%1\" failed: %2
 #: libs/uvl/luasrc/i18n/uvl.en.lua:15
-msgid "uvl_err_sme_errval"
+msgid "External validator \"%1\" failed: %2"
 msgstr ""
 
 #. Variable \"%o\" in scheme \"%p\" references unknown package \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:16
-msgid "uvl_err_sme_vbadpack"
+msgid "Variable \"%o\" in scheme \"%p\" references unknown package \"%1\""
 msgstr ""
 
 #. Variable \"%o\" in scheme \"%p\" references unknown section \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:17
-msgid "uvl_err_sme_vbadsect"
+msgid "Variable \"%o\" in scheme \"%p\" references unknown section \"%1\""
 msgstr ""
 
 #. Enum \"%v\" in scheme \"%p\" references unknown package \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:18
-msgid "uvl_err_sme_ebadpack"
+msgid "Enum \"%v\" in scheme \"%p\" references unknown package \"%1\""
 msgstr ""
 
 #. Enum \"%v\" in scheme \"%p\" references unknown section \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:19
-msgid "uvl_err_sme_ebadsect"
+msgid "Enum \"%v\" in scheme \"%p\" references unknown section \"%1\""
 msgstr ""
 
 #. Enum \"%v\" in scheme \"%p\" references unknown option \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:20
-msgid "uvl_err_sme_ebadopt"
+msgid "Enum \"%v\" in scheme \"%p\" references unknown option \"%1\""
 msgstr ""
 
 #. Enum \"%v\" in scheme \"%p\" references non-enum option \"%p.%s.%o\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:21
-msgid "uvl_err_sme_ebadtype"
+msgid "Enum \"%v\" in scheme \"%p\" references non-enum option \"%p.%s.%o\""
 msgstr ""
 
 #. Enum \"%v\" in scheme \"%p\" redeclares the default value of \"%p.%s.%o\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:22
-msgid "uvl_err_sme_ebaddef"
+msgid "Enum \"%v\" in scheme \"%p\" redeclares the default value of \"%p.%s.%o\""
 msgstr ""
 
 #. Section \"%i\" (%I) not found in scheme
 #: libs/uvl/luasrc/i18n/uvl.en.lua:23
-msgid "uvl_err_sect_unknown"
+msgid "Section \"%i\" (%I) not found in scheme"
 msgstr ""
 
 #. Required section \"%p.%s\" not found in config
 #: libs/uvl/luasrc/i18n/uvl.en.lua:24
-msgid "uvl_err_sect_required"
+msgid "Required section \"%p.%s\" not found in config"
 msgstr ""
 
 #. Unique section \"%p.%s\" occurs multiple times in config
 #: libs/uvl/luasrc/i18n/uvl.en.lua:25
-msgid "uvl_err_sect_unique"
+msgid "Unique section \"%p.%s\" occurs multiple times in config"
 msgstr ""
 
 #. The section of type \"%p.%s\" is stored anonymously in config but must be named
 #: libs/uvl/luasrc/i18n/uvl.en.lua:26
-msgid "uvl_err_sect_named"
+msgid "The section of type \"%p.%s\" is stored anonymously in config but must be named"
 msgstr ""
 
 #. Section \"%p.%s\" not found in config
 #: libs/uvl/luasrc/i18n/uvl.en.lua:27
-msgid "uvl_err_sect_notfound"
+msgid "Section \"%p.%s\" not found in config"
 msgstr ""
 
 #. Option \"%i\" (%I) not found in scheme
 #: libs/uvl/luasrc/i18n/uvl.en.lua:28
-msgid "uvl_err_opt_unknown"
+msgid "Option \"%i\" (%I) not found in scheme"
 msgstr ""
 
 #. Required option \"%i\" has no value
 #: libs/uvl/luasrc/i18n/uvl.en.lua:29
-msgid "uvl_err_opt_required"
+msgid "Required option \"%i\" has no value"
 msgstr ""
 
 #. Value \"%1\" of option \"%i\" is not defined in enum %2
 #: libs/uvl/luasrc/i18n/uvl.en.lua:30
-msgid "uvl_err_opt_badvalue"
+msgid "Value \"%1\" of option \"%i\" is not defined in enum %2"
 msgstr ""
 
 #. Value \"%1\" of option \"%i\" does not validate as datatype \"%2\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:31
-msgid "uvl_err_opt_invvalue"
+msgid "Value \"%1\" of option \"%i\" does not validate as datatype \"%2\""
 msgstr ""
 
 #. Option \"%i\" is defined as list but stored as plain value
 #: libs/uvl/luasrc/i18n/uvl.en.lua:32
-msgid "uvl_err_opt_notlist"
+msgid "Option \"%i\" is defined as list but stored as plain value"
 msgstr ""
 
 #. Option \"%i\" has unknown datatype \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:33
-msgid "uvl_err_opt_datatype"
+msgid "Option \"%i\" has unknown datatype \"%1\""
 msgstr ""
 
 #. Option \"%p.%s.%o\" not found in config
 #: libs/uvl/luasrc/i18n/uvl.en.lua:34
-msgid "uvl_err_opt_notfound"
+msgid "Option \"%p.%s.%o\" not found in config"
 msgstr ""
 
 #. Dependency (%1) failed:\noption \"%i\" is not eqal \"%2\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:35
-msgid "uvl_err_dep_notequal"
+msgid "Dependency (%1) failed:\\noption \"%i\" is not eqal \"%2\""
 msgstr ""
 
 #. Dependency (%1) failed:\noption \"%i\" has no value
 #: libs/uvl/luasrc/i18n/uvl.en.lua:36
-msgid "uvl_err_dep_novalue"
+msgid "Dependency (%1) failed:\\noption \"%i\" has no value"
 msgstr ""
 
 #. Dependency (%1) failed:\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:37
-msgid "uvl_err_dep_notvalid"
+msgid "Dependency (%1) failed:\\n%c"
 msgstr ""
 
 #. Recursive dependency for option \"%i\" detected
 #: libs/uvl/luasrc/i18n/uvl.en.lua:38
-msgid "uvl_err_dep_recursive"
+msgid "Recursive dependency for option \"%i\" detected"
 msgstr ""
 
 #. In dependency check for enum value \"%i\":\n%c
diff --git a/po/it/wifi.po b/po/it/wifi.po
index 20a7ccc53..aa7be501f 100644
--- a/po/it/wifi.po
+++ b/po/it/wifi.po
@@ -14,192 +14,192 @@ msgstr ""
 
 #. auto
 #: i18n/english/luasrc/i18n/wifi.en.lua:1
-msgid "wifi_auto"
+msgid "auto"
 msgstr "auto"
 
 #. Frequency Hopping
 #: i18n/english/luasrc/i18n/wifi.en.lua:2
-msgid "wifi_fh"
+msgid "Frequency Hopping"
 msgstr "Frequency Hopping"
 
 #. Diversity
 #: i18n/english/luasrc/i18n/wifi.en.lua:3
-msgid "wifi_diversity"
+msgid "Diversity"
 msgstr "Diversity"
 
 #. Transmitter Antenna
 #: i18n/english/luasrc/i18n/wifi.en.lua:4
-msgid "wifi_txantenna"
+msgid "Transmitter Antenna"
 msgstr "Antenna trasmettente"
 
 #. Receiver Antenna
 #: i18n/english/luasrc/i18n/wifi.en.lua:5
-msgid "wifi_rxantenna"
+msgid "Receiver Antenna"
 msgstr "Antenna ricevente"
 
 #. Distance Optimization
 #: i18n/english/luasrc/i18n/wifi.en.lua:6
-msgid "wifi_distance"
+msgid "Distance Optimization"
 msgstr "Ottimizzazione distanza"
 
 #. Distance to farthest network member in meters.
 #: i18n/english/luasrc/i18n/wifi.en.lua:7
-msgid "wifi_distance_desc"
+msgid "Distance to farthest network member in meters."
 msgstr "Distanza del membro più lontano della rete in metri."
 
 #. MAC-Address Filter
 #: i18n/english/luasrc/i18n/wifi.en.lua:8
-msgid "wifi_macpolicy"
+msgid "MAC-Address Filter"
 msgstr "Filtro dei MAC-Addres"
 
 #. Allow listed only
 #: i18n/english/luasrc/i18n/wifi.en.lua:9
-msgid "wifi_whitelist"
+msgid "Allow listed only"
 msgstr "Consenti solo quelli in lista"
 
 #. Allow all except listed
 #: i18n/english/luasrc/i18n/wifi.en.lua:10
-msgid "wifi_blacklist"
+msgid "Allow all except listed"
 msgstr "Consenti tutti tranne quelli in lista"
 
 #. MAC-List
 #: i18n/english/luasrc/i18n/wifi.en.lua:11
-msgid "wifi_maclist"
+msgid "MAC-List"
 msgstr "Lista MAC"
 
 #. Frame Bursting
 #: i18n/english/luasrc/i18n/wifi.en.lua:12
-msgid "wifi_bursting"
+msgid "Frame Bursting"
 msgstr "Frame Bursting"
 
 #. Regulatory Domain
 #: i18n/english/luasrc/i18n/wifi.en.lua:13
-msgid "wifi_regdomain"
+msgid "Regulatory Domain"
 msgstr ""
 
 #. Country Code
 #: i18n/english/luasrc/i18n/wifi.en.lua:14
-msgid "wifi_country"
+msgid "Country Code"
 msgstr "Codice nazione"
 
 #. Outdoor Channels
 #: i18n/english/luasrc/i18n/wifi.en.lua:15
-msgid "wifi_outdoor"
+msgid "Outdoor Channels"
 msgstr ""
 
 #. Connection Limit
 #: i18n/english/luasrc/i18n/wifi.en.lua:16
-msgid "wifi_maxassoc"
+msgid "Connection Limit"
 msgstr "Limite connessioni"
 
 #. <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:17
-msgid "wifi_essid"
+msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
 #. <abbr title=\"Basic Service Set Identifier\">BSSID</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:18
-msgid "wifi_bssid"
+msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 
 #. Fragmentation Threshold
 #: i18n/english/luasrc/i18n/wifi.en.lua:19
-msgid "wifi_frag"
+msgid "Fragmentation Threshold"
 msgstr "Soglia di frammentazione"
 
 #. RTS/CTS Threshold
 #: i18n/english/luasrc/i18n/wifi.en.lua:20
-msgid "wifi_rts"
+msgid "RTS/CTS Threshold"
 msgstr "Soglia RTS/CTS"
 
 #. <abbr title=\"Wireless Distribution System\">WDS</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:21
-msgid "wifi_wds"
+msgid "<abbr title=\"Wireless Distribution System\">WDS</abbr>"
 msgstr "<abbr title=\"Wireless Distribution System\">WDS</abbr>"
 
 #. Separate WDS
 #: i18n/english/luasrc/i18n/wifi.en.lua:22
-msgid "wifi_wdssep"
+msgid "Separate WDS"
 msgstr "WDS separati"
 
 #. Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:23
-msgid "wifi_hidden"
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "Nascondi <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
 #. Isolate Clients
 #: i18n/english/luasrc/i18n/wifi.en.lua:24
-msgid "wifi_isloate"
+msgid "Isolate Clients"
 msgstr "Isola utenti"
 
 #. Prevent Client to Client Communication
 #: i18n/english/luasrc/i18n/wifi.en.lua:25
-msgid "wifi_isloate_desc"
+msgid "Prevent Client to Client Communication"
 msgstr "Impedisci comunicazione fra utenti"
 
 #. Background Scan
 #: i18n/english/luasrc/i18n/wifi.en.lua:26
-msgid "wifi_bgscan"
+msgid "Background Scan"
 msgstr "Scansione in background"
 
 #. Transmission Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:27
-msgid "wifi_rate"
+msgid "Transmission Rate"
 msgstr "Velocità di transmissione"
 
 #. Multicast Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:28
-msgid "wifi_mcast_rate"
+msgid "Multicast Rate"
 msgstr "Velocità multicast"
 
 #. Minimum Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:29
-msgid "wifi_minrate"
+msgid "Minimum Rate"
 msgstr "Velocità minima"
 
 #. Maximum Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:30
-msgid "wifi_maxrate"
+msgid "Maximum Rate"
 msgstr "Velocità massima"
 
 #. Compression
 #: i18n/english/luasrc/i18n/wifi.en.lua:31
-msgid "wifi_compression"
+msgid "Compression"
 msgstr "Compressione"
 
 #. Turbo Mode
 #: i18n/english/luasrc/i18n/wifi.en.lua:32
-msgid "wifi_turbo"
+msgid "Turbo Mode"
 msgstr "Modalità turbo"
 
 #. Fast Frames
 #: i18n/english/luasrc/i18n/wifi.en.lua:33
-msgid "wifi_ff"
+msgid "Fast Frames"
 msgstr "Frame veloci"
 
 #. WMM Mode
 #: i18n/english/luasrc/i18n/wifi.en.lua:34
-msgid "wifi_wmm"
+msgid "WMM Mode"
 msgstr "Modalità WMM"
 
 #. XR Support
 #: i18n/english/luasrc/i18n/wifi.en.lua:35
-msgid "wifi_xr"
+msgid "XR Support"
 msgstr "Supporto XR"
 
 #. AR Support
 #: i18n/english/luasrc/i18n/wifi.en.lua:36
-msgid "wifi_ar"
+msgid "AR Support"
 msgstr "Supporto AR"
 
 #. Disable HW-Beacon timer
 #: i18n/english/luasrc/i18n/wifi.en.lua:37
-msgid "wifi_nosbeacon"
+msgid "Disable HW-Beacon timer"
 msgstr "Disabilita Timer Beacon HW"
 
 #. Do not send probe responses
 #: i18n/english/luasrc/i18n/wifi.en.lua:38
-msgid "wifi_noprobereq"
+msgid "Do not send probe responses"
 msgstr "Disabilita Probe-Responses"
 
 #. WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP and ad-hoc mode) to be installed.
diff --git a/po/ja/admin-core.po b/po/ja/admin-core.po
index 9de7c111e..027a16081 100644
--- a/po/ja/admin-core.po
+++ b/po/ja/admin-core.po
@@ -14,22 +14,22 @@ msgstr ""
 
 #. The following changes have been applied
 #: i18n/english/luasrc/i18n/admin-core.en.lua:1
-msgid "uci_applied"
+msgid "The following changes have been applied"
 msgstr "以下の変更が適用されました"
 
 #. The following changes have been reverted
 #: i18n/english/luasrc/i18n/admin-core.en.lua:2
-msgid "uci_reverted"
+msgid "The following changes have been reverted"
 msgstr "以下の変更が取り消されました"
 
 #. User Interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:3
-msgid "a_i_ui"
+msgid "User Interface"
 msgstr "ユーザーインターフェース"
 
 #. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a collection of free Lua software including an <abbr title=\"Model-View-Controller\">MVC</abbr>-Webframework and webinterface for embedded devices. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is licensed under the Apache-License.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:4
-msgid "c_lucidesc"
+msgid "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a collection of free Lua software including an <abbr title=\"Model-View-Controller\">MVC</abbr>-Webframework and webinterface for embedded devices. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is licensed under the Apache-License."
 msgstr ""
 "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> は <abbr title=\"Model-"
 "View-Controller\">MVC</abbr> ウェブフレームワークや組み込みデバイスの為のウェブインターフェースを含む、自由な Lua "
@@ -38,747 +38,747 @@ msgstr ""
 
 #. Project Homepage
 #: i18n/english/luasrc/i18n/admin-core.en.lua:5
-msgid "c_projecthome"
+msgid "Project Homepage"
 msgstr "プロジェクトホームページ"
 
 #. Lead Development
 #: i18n/english/luasrc/i18n/admin-core.en.lua:6
-msgid "c_leaddev"
+msgid "Lead Development"
 msgstr "開発リーダー"
 
 #. Contributing Developers
 #: i18n/english/luasrc/i18n/admin-core.en.lua:7
-msgid "c_contributors"
+msgid "Contributing Developers"
 msgstr "貢献者"
 
 #. Thanks To
 #: i18n/english/luasrc/i18n/admin-core.en.lua:8
-msgid "c_thanksto"
+msgid "Thanks To"
 msgstr "ありがとう"
 
 #. Hello!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:9
-msgid "a_i_i_hello"
+msgid "Hello!"
 msgstr "こんにちは!"
 
 #. This is the administration area of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:10
-msgid "a_i_i_admin1"
+msgid "This is the administration area of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>."
 msgstr "ここは <abbr title=\"Lua Configuration Interface\">LuCI</abbr> の管理領域です。"
 
 #. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a free, flexible, and user friendly graphical interface for configuring OpenWrt Kamikaze.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:11
-msgid "a_i_i_admin2"
+msgid "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a free, flexible, and user friendly graphical interface for configuring OpenWrt Kamikaze."
 msgstr ""
 "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> は OpenWrt Kamikaze "
 "の為の自由で、柔軟で、ユーザーフレンドリなグラフィカルインターフェースです。"
 
 #. On the following pages you can adjust all important settings of your router.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:12
-msgid "a_i_i_admin3"
+msgid "On the following pages you can adjust all important settings of your router."
 msgstr "以下のページからルーターの全ての重要な設定を調整することが出来ます。"
 
 #. Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> changes have to be confirmed by clicking Changes - Save &amp; Apply before being applied.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:13
-msgid "a_i_i_admin4"
+msgid "Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> changes have to be confirmed by clicking Changes - Save & Apply before being applied."
 msgstr ""
 "注意: <abbr title=\"Lua Configuration Interface\">LuCI</abbr> で変更を行うには適用前に「保存 "
 "&amp; 適用」をクリックして確認する必要があります。"
 
 #. As we always want to improve this interface we are looking forward to your feedback and suggestions.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:14
-msgid "a_i_i_admin5"
+msgid "As we always want to improve this interface we are looking forward to your feedback and suggestions."
 msgstr "私たちとしては、いつでもこのインターフェースを改良したいと望んでおり、あなたからのフィードバックと提案をお待ちしています。"
 
 #. And now have fun with your router!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:15
-msgid "a_i_i_admin6"
+msgid "And now have fun with your router!"
 msgstr "それでは、あなたのルーターを楽しんでください!"
 
 #. The <abbr title=\"Lua Configuration Interface\">LuCI</abbr> Team
 #: i18n/english/luasrc/i18n/admin-core.en.lua:16
-msgid "a_i_i_team"
+msgid "The <abbr title=\"Lua Configuration Interface\">LuCI</abbr> Team"
 msgstr "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> チーム"
 
 #. Here you can customize the settings and the functionality of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:17
-msgid "a_i_luci1"
+msgid "Here you can customize the settings and the functionality of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>."
 msgstr ""
 "ここでは、<abbr title=\"Lua Configuration Interface\">LuCI</abbr> "
 "の機能と設定をカスタマイズ出来ます。"
 
 #. Post-commit actions
 #: i18n/english/luasrc/i18n/admin-core.en.lua:18
-msgid "a_i_ucicommit"
+msgid "Post-commit actions"
 msgstr "Post-commit actions"
 
 #. These commands will be executed automatically when a given <abbr title=\"Unified Configuration Interface\">UCI</abbr> configuration is committed allowing changes to be applied instantly.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:19
-msgid "a_i_ucicommit1"
+msgid "These commands will be executed automatically when a given <abbr title=\"Unified Configuration Interface\">UCI</abbr> configuration is committed allowing changes to be applied instantly."
 msgstr ""
 "これらのコマンドはコミットされた <abbr title=\"Unified Configuration "
 "Interface\">UCI</abbr>設定の変更を即座に適応する為に自動的に実行されます。"
 
 #. Files to be kept when flashing a new firmware
 #: i18n/english/luasrc/i18n/admin-core.en.lua:20
-msgid "a_i_keepflash"
+msgid "Files to be kept when flashing a new firmware"
 msgstr "新しいファームウェアを書き込んだ時に維持するファイル"
 
 #. When flashing a new firmware with <abbr title=\"Lua Configuration Interface\">LuCI</abbr> these files will be added to the new firmware installation.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:21
-msgid "a_i_keepflash1"
+msgid "When flashing a new firmware with <abbr title=\"Lua Configuration Interface\">LuCI</abbr> these files will be added to the new firmware installation."
 msgstr ""
 "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> "
 "によって新しいファームウェアを書き込んだ時に、これらのファイルは新しいファームウェアインストールでも追加されます。"
 
 #. Here you can find information about the current system status like <abbr title=\"Central Processing Unit\">CPU</abbr> clock frequency, memory usage or network interface data.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:22
-msgid "a_st_i_status1"
+msgid "Here you can find information about the current system status like <abbr title=\"Central Processing Unit\">CPU</abbr> clock frequency, memory usage or network interface data."
 msgstr ""
 "ここでは、<abbr title=\"Central Processing Unit\">CPU</abbr>クロック周波数、メモリ使用量やネットワークイン"
 "ターフェースデータなどの現在のシステムの状態に関する情報を見つけることが出来ます。"
 
 #. Also kernel or service logfiles can be viewed here to get an overview over their current state.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:23
-msgid "a_st_i_status2"
+msgid "Also kernel or service logfiles can be viewed here to get an overview over their current state."
 msgstr "また、カーネルやサービスのログファイルも現在の状態を得るために参照する事が出来ます。"
 
 #. <abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan
 #: i18n/english/luasrc/i18n/admin-core.en.lua:24
-msgid "iwscan"
+msgid "<abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan"
 msgstr "<abbr title=\"Wireless Local Area Network\">WLAN</abbr>スキャン"
 
 #. Wifi networks in your local environment
 #: i18n/english/luasrc/i18n/admin-core.en.lua:25
-msgid "iwscan1"
+msgid "Wifi networks in your local environment"
 msgstr "ローカル環境内の無線ネットワーク"
 
 #. <abbr title=\"Encrypted\">Encr.</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:26
-msgid "iwscan_encr"
+msgid "<abbr title=\"Encrypted\">Encr.</abbr>"
 msgstr "<abbr title=\"Encrypted\">暗号化</abbr>"
 
 #. Link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:27
-msgid "iwscan_link"
+msgid "Link"
 msgstr "リンク"
 
 #. Signal
 #: i18n/english/luasrc/i18n/admin-core.en.lua:28
-msgid "iwscan_signal"
+msgid "Signal"
 msgstr "シグナル"
 
 #. Noise
 #: i18n/english/luasrc/i18n/admin-core.en.lua:29
-msgid "iwscan_noise"
+msgid "Noise"
 msgstr "ノイズ"
 
 #. Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:30
-msgid "routes"
+msgid "Routes"
 msgstr "Routes"
 
 #. Netmask
 #: i18n/english/luasrc/i18n/admin-core.en.lua:31
-msgid "routes_netmask"
+msgid "Netmask"
 msgstr "ネットマスク"
 
 #. Gateway
 #: i18n/english/luasrc/i18n/admin-core.en.lua:32
-msgid "routes_gateway"
+msgid "Gateway"
 msgstr "ゲートウェイ"
 
 #. Metric
 #: i18n/english/luasrc/i18n/admin-core.en.lua:33
-msgid "routes_metric"
+msgid "Metric"
 msgstr "メトリック"
 
 #. Here you can configure the basic aspects of your device like its hostname or the timezone.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:34
-msgid "a_s_desc"
+msgid "Here you can configure the basic aspects of your device like its hostname or the timezone."
 msgstr "ここでは、ホスト名やタイムゾーンなどの基本的な設定を行うことが出来ます。"
 
 #. Software
 #: i18n/english/luasrc/i18n/admin-core.en.lua:35
-msgid "a_s_packages"
+msgid "Software"
 msgstr "ソフトウェア"
 
 #. Admin Password
 #: i18n/english/luasrc/i18n/admin-core.en.lua:36
-msgid "a_s_changepw"
+msgid "Admin Password"
 msgstr "管理者パスワード"
 
 #. OPKG-Configuration
 #: i18n/english/luasrc/i18n/admin-core.en.lua:37
-msgid "a_s_p_ipkg"
+msgid "OPKG-Configuration"
 msgstr "OPKG設定"
 
 #. <abbr title=\"Secure Shell\">SSH</abbr>-Keys
 #: i18n/english/luasrc/i18n/admin-core.en.lua:38
-msgid "a_s_sshkeys"
+msgid "<abbr title=\"Secure Shell\">SSH</abbr>-Keys"
 msgstr "<abbr title=\"Secure Shell\">SSH</abbr>鍵"
 
 #. Mount Points
 #: i18n/english/luasrc/i18n/admin-core.en.lua:39
-msgid "a_s_fstab"
+msgid "Mount Points"
 msgstr "マウントポイント"
 
 #. Change settings related to the system itself, its identification, installed hard- and software, authentication or mount points.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:40
-msgid "a_s_i_system1"
+msgid "Change settings related to the system itself, its identification, installed hard- and software, authentication or mount points."
 msgstr ""
 "Change settings related to the system itself, its identification, installed "
 "hard- and software, authentication or mount points."
 
 #. These settings define the base of your system.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:41
-msgid "a_s_i_system2"
+msgid "These settings define the base of your system."
 msgstr "These settings define the base of your system."
 
 #. Pay attention as any misconfiguration here may prevent your device from booting or may lock yourself out of it.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:42
-msgid "a_s_i_system3"
+msgid "Pay attention as any misconfiguration here may prevent your device from booting or may lock yourself out of it."
 msgstr ""
 "Pay attention as any misconfiguration here may prevent your device from "
 "booting or may lock yourself out of it."
 
 #. Interfaces
 #: i18n/english/luasrc/i18n/admin-core.en.lua:43
-msgid "a_s_if"
+msgid "Interfaces"
 msgstr "インターフェース"
 
 #. Bridge
 #: i18n/english/luasrc/i18n/admin-core.en.lua:44
-msgid "a_s_if_bridge"
+msgid "Bridge"
 msgstr "ブリッジ"
 
 #. ID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:45
-msgid "a_s_if_bridge_id"
+msgid "ID"
 msgstr "ID"
 
 #. Bridge Port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:46
-msgid "a_s_if_bridge_port"
+msgid "Bridge Port"
 msgstr "ブリッジポート"
 
 #. STP
 #: i18n/english/luasrc/i18n/admin-core.en.lua:47
-msgid "a_s_if_bridge_stp"
+msgid "STP"
 msgstr "STP"
 
 #. Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:48
-msgid "a_s_if_device"
+msgid "Device"
 msgstr "デバイス"
 
 #. Ethernet Bridge
 #: i18n/english/luasrc/i18n/admin-core.en.lua:49
-msgid "a_s_if_ethbridge"
+msgid "Ethernet Bridge"
 msgstr "イーサネットブリッジ"
 
 #. Ethernet Adapter
 #: i18n/english/luasrc/i18n/admin-core.en.lua:50
-msgid "a_s_if_ethdev"
+msgid "Ethernet Adapter"
 msgstr "イーサネットアダプタ"
 
 #. Ethernet Switch
 #: i18n/english/luasrc/i18n/admin-core.en.lua:51
-msgid "a_s_if_ethswitch"
+msgid "Ethernet Switch"
 msgstr "イーサネットスイッチ"
 
 #. Interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:52
-msgid "a_s_if_interface"
+msgid "Interface"
 msgstr "インターフェース"
 
 #. IP Configuration
 #: i18n/english/luasrc/i18n/admin-core.en.lua:53
-msgid "a_s_if_ipconfig"
+msgid "IP Configuration"
 msgstr "IP 設定"
 
 #. Alias
 #: i18n/english/luasrc/i18n/admin-core.en.lua:54
-msgid "a_s_if_ipconfig_alias"
+msgid "Alias"
 msgstr "エイリアス"
 
 #. DHCP assigned
 #: i18n/english/luasrc/i18n/admin-core.en.lua:55
-msgid "a_s_if_ipconfig_dhcp"
+msgid "DHCP assigned"
 msgstr "DHCP assigned"
 
 #. IPv6
 #: i18n/english/luasrc/i18n/admin-core.en.lua:56
-msgid "a_s_if_ipconfig_ipv6"
+msgid "IPv6"
 msgstr "IPv6"
 
 #. Not configured
 #: i18n/english/luasrc/i18n/admin-core.en.lua:57
-msgid "a_s_if_ipconfig_none"
+msgid "Not configured"
 msgstr "未設定"
 
 #. Primary
 #: i18n/english/luasrc/i18n/admin-core.en.lua:58
-msgid "a_s_if_ipconfig_primary"
+msgid "Primary"
 msgstr "プライマリ"
 
 #. Channel
 #: i18n/english/luasrc/i18n/admin-core.en.lua:59
-msgid "a_s_if_iwchannel"
+msgid "Channel"
 msgstr "チャンネル"
 
 #. Mode
 #: i18n/english/luasrc/i18n/admin-core.en.lua:60
-msgid "a_s_if_iwmode"
+msgid "Mode"
 msgstr "モード"
 
 #. Ad-Hoc
 #: i18n/english/luasrc/i18n/admin-core.en.lua:61
-msgid "a_s_if_iwmode_adhoc"
+msgid "Ad-Hoc"
 msgstr "アドホック"
 
 #. Pseudo Ad-Hoc
 #: i18n/english/luasrc/i18n/admin-core.en.lua:62
-msgid "a_s_if_iwmode_ahdemo"
+msgid "Pseudo Ad-Hoc"
 msgstr "擬似アドホック"
 
 #. Master
 #: i18n/english/luasrc/i18n/admin-core.en.lua:63
-msgid "a_s_if_iwmode_ap"
+msgid "Master"
 msgstr "マスター"
 
 #. Master + WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:64
-msgid "a_s_if_iwmode_apwds"
+msgid "Master + WDS"
 msgstr "マスター + WDS"
 
 #. Client
 #: i18n/english/luasrc/i18n/admin-core.en.lua:65
-msgid "a_s_if_iwmode_sta"
+msgid "Client"
 msgstr "クライアント"
 
 #. Client + WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:66
-msgid "a_s_if_iwmode_stawds"
+msgid "Client + WDS"
 msgstr "クライアント + WDS"
 
 #. WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:67
-msgid "a_s_if_iwmode_wds"
+msgid "WDS"
 msgstr "WDS"
 
 #. SSID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:68
-msgid "a_s_if_iwssid"
+msgid "SSID"
 msgstr "SSID"
 
 #. MAC
 #: i18n/english/luasrc/i18n/admin-core.en.lua:69
-msgid "a_s_if_mac"
+msgid "MAC"
 msgstr "MAC"
 
 #. Pkts.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:70
-msgid "a_s_if_pkts"
+msgid "Pkts."
 msgstr "Pkts."
 
 #. Interface Status
 #: i18n/english/luasrc/i18n/admin-core.en.lua:71
-msgid "a_s_if_status"
+msgid "Interface Status"
 msgstr "インターフェース・ステータス"
 
 #. Transfer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:72
-msgid "a_s_if_transfer"
+msgid "Transfer"
 msgstr "転送"
 
 #. RX
 #: i18n/english/luasrc/i18n/admin-core.en.lua:73
-msgid "a_s_if_transfer_rx"
+msgid "RX"
 msgstr "RX"
 
 #. TX
 #: i18n/english/luasrc/i18n/admin-core.en.lua:74
-msgid "a_s_if_transfer_tx"
+msgid "TX"
 msgstr "TX"
 
 #. Type
 #: i18n/english/luasrc/i18n/admin-core.en.lua:75
-msgid "a_s_if_type"
+msgid "Type"
 msgstr "タイプ"
 
 #. VLAN
 #: i18n/english/luasrc/i18n/admin-core.en.lua:76
-msgid "a_s_if_vlan"
+msgid "VLAN"
 msgstr "VLAN"
 
 #. Ports
 #: i18n/english/luasrc/i18n/admin-core.en.lua:77
-msgid "a_s_if_vlanports"
+msgid "Ports"
 msgstr "Ports"
 
 #. Wireless Adapter
 #: i18n/english/luasrc/i18n/admin-core.en.lua:78
-msgid "a_s_if_wifidev"
+msgid "Wireless Adapter"
 msgstr "無線アダプタ"
 
 #. Firewall
 #: i18n/english/luasrc/i18n/admin-core.en.lua:79
-msgid "a_s_ipt"
+msgid "Firewall"
 msgstr "ファイアウォール"
 
 #. Actions
 #: i18n/english/luasrc/i18n/admin-core.en.lua:80
-msgid "a_s_ipt_actions"
+msgid "Actions"
 msgstr "動作"
 
 #. Traffic
 #: i18n/english/luasrc/i18n/admin-core.en.lua:81
-msgid "a_s_ipt_bytes"
+msgid "Traffic"
 msgstr "トラフィック"
 
 #. Chain
 #: i18n/english/luasrc/i18n/admin-core.en.lua:82
-msgid "a_s_ipt_chain"
+msgid "Chain"
 msgstr "チェイン"
 
 #. Destination
 #: i18n/english/luasrc/i18n/admin-core.en.lua:83
-msgid "a_s_ipt_destination"
+msgid "Destination"
 msgstr "Destination"
 
 #. Flags
 #: i18n/english/luasrc/i18n/admin-core.en.lua:84
-msgid "a_s_ipt_flags"
+msgid "Flags"
 msgstr "フラグ"
 
 #. In
 #: i18n/english/luasrc/i18n/admin-core.en.lua:85
-msgid "a_s_ipt_inputif"
+msgid "In"
 msgstr "In"
 
 #. No chains in this table
 #: i18n/english/luasrc/i18n/admin-core.en.lua:86
-msgid "a_s_ipt_nochains"
+msgid "No chains in this table"
 msgstr "No chains in this table"
 
 #. No Rules in this chain
 #: i18n/english/luasrc/i18n/admin-core.en.lua:87
-msgid "a_s_ipt_norules"
+msgid "No Rules in this chain"
 msgstr "No Rules in this chain"
 
 #. Options
 #: i18n/english/luasrc/i18n/admin-core.en.lua:88
-msgid "a_s_ipt_options"
+msgid "Options"
 msgstr "オプション"
 
 #. Out
 #: i18n/english/luasrc/i18n/admin-core.en.lua:89
-msgid "a_s_ipt_outputif"
+msgid "Out"
 msgstr "Out"
 
 #. Packets
 #: i18n/english/luasrc/i18n/admin-core.en.lua:90
-msgid "a_s_ipt_packets"
+msgid "Packets"
 msgstr "パケット"
 
 #. Pkts.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:91
-msgid "a_s_ipt_pkts"
+msgid "Pkts."
 msgstr "Pkts."
 
 #. Policy
 #: i18n/english/luasrc/i18n/admin-core.en.lua:92
-msgid "a_s_ipt_policy"
+msgid "Policy"
 msgstr "ポリシー"
 
 #. Prot.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:93
-msgid "a_s_ipt_prot"
+msgid "Prot."
 msgstr "Prot."
 
 #. References
 #: i18n/english/luasrc/i18n/admin-core.en.lua:94
-msgid "a_s_ipt_references"
+msgid "References"
 msgstr "References"
 
 #. Reset Counters
 #: i18n/english/luasrc/i18n/admin-core.en.lua:95
-msgid "a_s_ipt_reset"
+msgid "Reset Counters"
 msgstr "カウンタのリセット"
 
 #. Restart Firewall
 #: i18n/english/luasrc/i18n/admin-core.en.lua:96
-msgid "a_s_ipt_restart"
+msgid "Restart Firewall"
 msgstr "ファイアウォールの再起動"
 
 #. #
 #: i18n/english/luasrc/i18n/admin-core.en.lua:97
-msgid "a_s_ipt_rulenum"
+msgid "#"
 msgstr "#"
 
 #. Source
 #: i18n/english/luasrc/i18n/admin-core.en.lua:98
-msgid "a_s_ipt_source"
+msgid "Source"
 msgstr "ソース"
 
 #. Firewall Status
 #: i18n/english/luasrc/i18n/admin-core.en.lua:99
-msgid "a_s_ipt_status"
+msgid "Firewall Status"
 msgstr "ファイアウォール・ステータス"
 
 #. Table
 #: i18n/english/luasrc/i18n/admin-core.en.lua:100
-msgid "a_s_ipt_table"
+msgid "Table"
 msgstr "テーブル"
 
 #. Target
 #: i18n/english/luasrc/i18n/admin-core.en.lua:101
-msgid "a_s_ipt_target"
+msgid "Target"
 msgstr "ターゲット"
 
 #. Perform Actions
 #: i18n/english/luasrc/i18n/admin-core.en.lua:102
-msgid "a_s_packages_do"
+msgid "Perform Actions"
 msgstr "実行"
 
 #. Install
 #: i18n/english/luasrc/i18n/admin-core.en.lua:103
-msgid "a_s_packages_install"
+msgid "Install"
 msgstr "インストール"
 
 #. Download and install package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:104
-msgid "a_s_packages_installurl"
+msgid "Download and install package"
 msgstr "パッケージのダウンロードとインストール"
 
 #. Edit package lists and installation targets
 #: i18n/english/luasrc/i18n/admin-core.en.lua:105
-msgid "a_s_packages_ipkg"
+msgid "Edit package lists and installation targets"
 msgstr "パッケージリストとインストールターゲットの編集"
 
 #. Package name
 #: i18n/english/luasrc/i18n/admin-core.en.lua:106
-msgid "a_s_packages_name"
+msgid "Package name"
 msgstr "パッケージ名"
 
 #. Remove
 #: i18n/english/luasrc/i18n/admin-core.en.lua:107
-msgid "a_s_packages_remove"
+msgid "Remove"
 msgstr "削除"
 
 #. Find package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:108
-msgid "a_s_packages_search"
+msgid "Find package"
 msgstr "パッケージを検索"
 
 #. Package lists updated
 #: i18n/english/luasrc/i18n/admin-core.en.lua:109
-msgid "a_s_packages_update"
+msgid "Package lists updated"
 msgstr "パッケージリストを更新しました"
 
 #. Update package lists
 #: i18n/english/luasrc/i18n/admin-core.en.lua:110
-msgid "a_s_packages_updatelist"
+msgid "Update package lists"
 msgstr "パッケージリストの更新"
 
 #. Upgrade installed packages
 #: i18n/english/luasrc/i18n/admin-core.en.lua:111
-msgid "a_s_packages_upgrade"
+msgid "Upgrade installed packages"
 msgstr "インストールされているパッケージのアップグレード"
 
 #. Could not set default destination
 #: i18n/english/luasrc/i18n/admin-core.en.lua:112
 #, fuzzy
-msgid "a_s_packages_code1"
+msgid "Could not set default destination"
 msgstr "実行"
 
 #. Error parsing config file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:113
 #, fuzzy
-msgid "a_s_packages_code2"
+msgid "Error parsing config file"
 msgstr "実行"
 
 #. Could not create temporary directory (ran out of space?)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:114
 #, fuzzy
-msgid "a_s_packages_code3"
+msgid "Could not create temporary directory (ran out of space?)"
 msgstr "実行"
 
 #. Could not get adminstrative lock (ran out of space?)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:115
 #, fuzzy
-msgid "a_s_packages_code4"
+msgid "Could not get adminstrative lock (ran out of space?)"
 msgstr "実行"
 
 #. Unsatisfied Dependencies
 #: i18n/english/luasrc/i18n/admin-core.en.lua:116
 #, fuzzy
-msgid "a_s_packages_code5"
+msgid "Unsatisfied Dependencies"
 msgstr "実行"
 
 #. Refused to remove essential package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:117
 #, fuzzy
-msgid "a_s_packages_code6"
+msgid "Refused to remove essential package"
 msgstr "実行"
 
 #. Package has dependents
 #: i18n/english/luasrc/i18n/admin-core.en.lua:118
 #, fuzzy
-msgid "a_s_packages_code7"
+msgid "Package has dependents"
 msgstr "実行"
 
 #. Package has no installation candidate (wrong name?)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:119
 #, fuzzy
-msgid "a_s_packages_code8"
+msgid "Package has no installation candidate (wrong name?)"
 msgstr "実行"
 
 #. Package has no available architecture 
 #: i18n/english/luasrc/i18n/admin-core.en.lua:120
 #, fuzzy
-msgid "a_s_packages_code9"
+msgid "Package has no available architecture "
 msgstr "実行"
 
 #. Package is not trusted
 #: i18n/english/luasrc/i18n/admin-core.en.lua:121
 #, fuzzy
-msgid "a_s_packages_code10"
+msgid "Package is not trusted"
 msgstr "実行"
 
 #. Error while downloading
 #: i18n/english/luasrc/i18n/admin-core.en.lua:122
 #, fuzzy
-msgid "a_s_packages_code11"
+msgid "Error while downloading"
 msgstr "実行"
 
 #. Conflicts with other packages
 #: i18n/english/luasrc/i18n/admin-core.en.lua:123
 #, fuzzy
-msgid "a_s_packages_code12"
+msgid "Conflicts with other packages"
 msgstr "実行"
 
 #. Package is already installed
 #: i18n/english/luasrc/i18n/admin-core.en.lua:124
 #, fuzzy
-msgid "a_s_packages_code13"
+msgid "Package is already installed"
 msgstr "実行"
 
 #. Package has unresolved dependencies
 #: i18n/english/luasrc/i18n/admin-core.en.lua:125
 #, fuzzy
-msgid "a_s_packages_code14"
+msgid "Package has unresolved dependencies"
 msgstr "実行"
 
 #. Refused to downgrade package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:126
 #, fuzzy
-msgid "a_s_packages_code15"
+msgid "Refused to downgrade package"
 msgstr "実行"
 
 #. Package manager ran out of space
 #: i18n/english/luasrc/i18n/admin-core.en.lua:127
 #, fuzzy
-msgid "a_s_packages_code16"
+msgid "Package manager ran out of space"
 msgstr "実行"
 
 #. Bad signature while verifiying package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:128
 #, fuzzy
-msgid "a_s_packages_code17"
+msgid "Bad signature while verifiying package"
 msgstr "実行"
 
 #. MD5 error while verifiying package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:129
 #, fuzzy
-msgid "a_s_packages_code18"
+msgid "MD5 error while verifiying package"
 msgstr "実行"
 
 #. Internal error occured
 #: i18n/english/luasrc/i18n/admin-core.en.lua:130
 #, fuzzy
-msgid "a_s_packages_code19"
+msgid "Internal error occured"
 msgstr "実行"
 
 #. Package lists
 #: i18n/english/luasrc/i18n/admin-core.en.lua:131
-msgid "a_s_p_ipkg_pkglists"
+msgid "Package lists"
 msgstr "パッケージリスト"
 
 #. Installation targets
 #: i18n/english/luasrc/i18n/admin-core.en.lua:132
-msgid "a_s_p_ipkg_targets"
+msgid "Installation targets"
 msgstr "インストールターゲット"
 
 #. Change the password of the system administrator (User <code>root</code>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:133
-msgid "a_s_changepw1"
+msgid "Change the password of the system administrator (User <code>root</code>)"
 msgstr "システム管理者のパスワードを変更します(ユーザー <code>root</code>)"
 
 #. Password successfully changed
 #: i18n/english/luasrc/i18n/admin-core.en.lua:134
-msgid "a_s_changepw_changed"
+msgid "Password successfully changed"
 msgstr "パスワードを変更しました"
 
 #. Error: Passwords do not match
 #: i18n/english/luasrc/i18n/admin-core.en.lua:135
-msgid "a_s_changepw_nomatch"
+msgid "Error: Passwords do not match"
 msgstr "エラー: パスワードが違います"
 
 #. Here you can paste public <abbr title=\"Secure Shell\">SSH</abbr>-Keys (one per line) for <abbr title=\"Secure Shell\">SSH</abbr> public-key authentication.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:136
-msgid "a_s_sshkeys1"
+msgid "Here you can paste public <abbr title=\"Secure Shell\">SSH</abbr>-Keys (one per line) for <abbr title=\"Secure Shell\">SSH</abbr> public-key authentication."
 msgstr ""
 "ここでは、<abbr title=\"Secure Shell\">SSH</abbr>公開鍵認証で使用する <abbr title=\"Secure "
 "Shell\">SSH</abbr>公開鍵(1行づつ)を貼り付けることが出来ます。"
 
 #. Mount Points
 #: i18n/english/luasrc/i18n/admin-core.en.lua:137
-msgid "a_s_fstab_mountpoints"
+msgid "Mount Points"
 msgstr "マウントポイント"
 
 #. Mount Points define at which point a memory device will be attached to the filesystem
 #: i18n/english/luasrc/i18n/admin-core.en.lua:138
-msgid "a_s_fstab_mountpoints1"
+msgid "Mount Points define at which point a memory device will be attached to the filesystem"
 msgstr "マウントポイントは記憶デバイスがファイルシステムの何処にアタッチされているかを定義します。"
 
 #. Mounted file systems
 #: i18n/english/luasrc/i18n/admin-core.en.lua:139
-msgid "a_s_fstab_active"
+msgid "Mounted file systems"
 msgstr "マウント中のファイルシステム"
 
 #. Used
 #: i18n/english/luasrc/i18n/admin-core.en.lua:140
-msgid "a_s_fstab_used"
+msgid "Used"
 msgstr "使用"
 
 #. Available
 #: i18n/english/luasrc/i18n/admin-core.en.lua:141
-msgid "a_s_fstab_avail"
+msgid "Available"
 msgstr "使用可"
 
 #. Mount Point
 #: i18n/english/luasrc/i18n/admin-core.en.lua:142
-msgid "a_s_fstab_mountpoint"
+msgid "Mount Point"
 msgstr "マウントポイント"
 
 #. The device file of the memory or partition (<abbr title=\"for example\">e.g.</abbr> <code>/dev/sda1</code>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:143
-msgid "a_s_fstab_device1"
+msgid "The device file of the memory or partition (<abbr title=\"for example\">e.g.</abbr> <code>/dev/sda1</code>)"
 msgstr ""
 "デバイスファイルかパーティション(<abbr title=\"for example\">例</abbr> <code>/dev/sda1</code>)"
 
 #. The filesystem that was used to format the memory (<abbr title=\"for example\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></samp>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:144
-msgid "a_s_fstab_fs1"
+msgid "The filesystem that was used to format the memory (<abbr title=\"for example\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></samp>)"
 msgstr ""
 "ファイルシステムは、使用する記憶フォーマットです。(<abbr title=\"for example\">例</abbr> <samp><abbr "
 "title=\"Third Extended Filesystem\">ext3</abbr></samp>)"
 
 #. If your physical memory is insufficient unused data can be temporarily swapped to a swap-device resulting in a higher amount of usable <abbr title=\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very slow process as the swap-device cannot be accessed with the high datarates of the <abbr title=\"Random Access Memory\">RAM</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:145
-msgid "a_s_fstab_swap1"
+msgid "If your physical memory is insufficient unused data can be temporarily swapped to a swap-device resulting in a higher amount of usable <abbr title=\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very slow process as the swap-device cannot be accessed with the high datarates of the <abbr title=\"Random Access Memory\">RAM</abbr>."
 msgstr ""
 "物理メモリが不足した時に、一時的に未使用なデータをもっと大容量<abbr title=\"Random Access Memory\">RAM</abbr>"
 "によるスワップデバイスへ退避することが出来ます。データの退避は非常に遅い処理なのでスワップデバイスには高い転送レートの<abbr "
@@ -786,165 +786,165 @@ msgstr ""
 
 #. Reboots the operating system of your device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:146
-msgid "a_s_reboot1"
+msgid "Reboots the operating system of your device"
 msgstr "デバイスのオペレーティングシステムを再起動します。"
 
 #. Perform reboot
 #: i18n/english/luasrc/i18n/admin-core.en.lua:147
-msgid "a_s_reboot_do"
+msgid "Perform reboot"
 msgstr "再起動を実行"
 
 #. Please wait: Device rebooting...
 #: i18n/english/luasrc/i18n/admin-core.en.lua:148
-msgid "a_s_reboot_running"
+msgid "Please wait: Device rebooting..."
 msgstr "しばらくお待ちください: 再起動中..."
 
 #. Warning: There are unsaved changes that will be lost while rebooting!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:149
-msgid "a_s_reboot_u"
+msgid "Warning: There are unsaved changes that will be lost while rebooting!"
 msgstr "警告: これらの保存されていない変更は再起動後に失われます!"
 
 #. Changes applied.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:150
-msgid "a_s_applyreboot1"
+msgid "Changes applied."
 msgstr "変更が適用されました。"
 
 #. Backup / Restore
 #: i18n/english/luasrc/i18n/admin-core.en.lua:151
-msgid "a_s_backup"
+msgid "Backup / Restore"
 msgstr "バックアップ / 復元"
 
 #. Create backup
 #: i18n/english/luasrc/i18n/admin-core.en.lua:152
-msgid "a_s_backup_backup"
+msgid "Create backup"
 msgstr "バックアップの作成"
 
 #. Backup Archive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:153
-msgid "a_s_backup_archive"
+msgid "Backup Archive"
 msgstr "バックアップアーカイブ"
 
 #. Reset router to defaults
 #: i18n/english/luasrc/i18n/admin-core.en.lua:154
-msgid "a_s_backup_reset"
+msgid "Reset router to defaults"
 msgstr "ルーターを初期状態にリセット"
 
 #. Proceed reverting all settings and resetting to firmware defaults?
 #: i18n/english/luasrc/i18n/admin-core.en.lua:155
-msgid "a_s_backup_reset1"
+msgid "Proceed reverting all settings and resetting to firmware defaults?"
 msgstr "全ての設定を元に戻し、ファームウェアを初期状態にリセットしますか?"
 
 #. Restore backup
 #: i18n/english/luasrc/i18n/admin-core.en.lua:156
-msgid "a_s_backup_restore"
+msgid "Restore backup"
 msgstr "バックアップから復元する"
 
 #. Here you can backup and restore your router configuration and - if possible - reset the router to the default settings.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:157
-msgid "a_s_backup1"
+msgid "Here you can backup and restore your router configuration and - if possible - reset the router to the default settings."
 msgstr "ここでは、ルーターの設定のバックアップと復元と、可能であればルーターを初期状態にリセットします。"
 
 #. <abbr title=\"Hypertext Transfer Protocol\">HTTP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:158
-msgid "a_srv_http"
+msgid "<abbr title=\"Hypertext Transfer Protocol\">HTTP</abbr>-Server"
 msgstr "<abbr title=\"Hypertext Transfer Protocol\">HTTP</abbr>サーバー"
 
 #. <abbr title=\"Secure Shell\">SSH</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:159
-msgid "a_srv_ssh"
+msgid "<abbr title=\"Secure Shell\">SSH</abbr>-Server"
 msgstr "<abbr title=\"Secure Shell\">SSH</abbr>サーバー"
 
 #. Services and daemons perform certain tasks on your device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:160
-msgid "a_srv_services1"
+msgid "Services and daemons perform certain tasks on your device."
 msgstr "サービスとデーモンはデバイスで動作するある種のタスクを実行します。"
 
 #. Most of them are network servers, that offer a certain service for your device or network like shell access, serving webpages like <abbr title=\"Lua Configuration Interface\">LuCI</abbr>, doing mesh routing, sending e-mails, ...
 #: i18n/english/luasrc/i18n/admin-core.en.lua:161
-msgid "a_srv_services2"
+msgid "Most of them are network servers, that offer a certain service for your device or network like shell access, serving webpages like <abbr title=\"Lua Configuration Interface\">LuCI</abbr>, doing mesh routing, sending e-mails, ..."
 msgstr ""
 "ネットワークサーバーの多くは、デバイスへのシェルアクセスや WEPページを提供する <abbr title=\"Lua Configuration "
 "Interface\">LuCI</abbr> やメッシュルーティングやメールを送ったりなどの特定のサービスを提供します。"
 
 #. A small webserver which can be used to serve <abbr title=\"Lua Configuration Interface\">LuCI</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:162
-msgid "a_srv_http1"
+msgid "A small webserver which can be used to serve <abbr title=\"Lua Configuration Interface\">LuCI</abbr>."
 msgstr ""
 "<abbr title=\"Lua Configuration Interface\">LuCI</abbr>を動作させるのに使用することが出来る小さな "
 "WEBサーバーです。"
 
 #. Authentication Realm
 #: i18n/english/luasrc/i18n/admin-core.en.lua:163
-msgid "a_srv_http_authrealm"
+msgid "Authentication Realm"
 msgstr "認証レルム"
 
 #. The realm which will be displayed at the authentication prompt for protected pages.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:164
-msgid "a_srv_http_authrealm1"
+msgid "The realm which will be displayed at the authentication prompt for protected pages."
 msgstr "レルムは保護されたページで認証プロンプトを表示します。"
 
 #. defaults to <code>/etc/httpd.conf</code>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:165
-msgid "a_srv_http_config1"
+msgid "defaults to <code>/etc/httpd.conf</code>"
 msgstr "デフォルトは <code>/etc/httpd.conf</code>"
 
 #. Document root
 #: i18n/english/luasrc/i18n/admin-core.en.lua:166
-msgid "a_srv_http_root"
+msgid "Document root"
 msgstr "ドキュメントルート"
 
 #. Enable Keep-Alive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:167
-msgid "a_srv_http_keepalive"
+msgid "Enable Keep-Alive"
 msgstr "キープアライブを有効にする"
 
 #. Connection timeout
 #: i18n/english/luasrc/i18n/admin-core.en.lua:168
-msgid "a_srv_http_timeout"
+msgid "Connection timeout"
 msgstr "接続タイムアウト"
 
 #. Plugin path
 #: i18n/english/luasrc/i18n/admin-core.en.lua:169
-msgid "a_srv_http_path"
+msgid "Plugin path"
 msgstr "プラグインパス"
 
 #. A lightweight HTTP/1.1 webserver written in C and Lua designed to serve LuCI
 #: i18n/english/luasrc/i18n/admin-core.en.lua:170
-msgid "a_srv_lucittpd"
+msgid "A lightweight HTTP/1.1 webserver written in C and Lua designed to serve LuCI"
 msgstr "軽量な HTTP/1.1 WEBサーバーはCとLuaで書かれ LuCI に役立つ様に設計されています"
 
 #. Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:171
-msgid "a_srv_dropbear1"
+msgid "Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
 msgstr ""
 "Dropbear は <abbr title=\"Secure Shell\">SSH</abbr> ネットワークへのシェルアクセスと統合された <abbr "
 "title=\"Secure Copy\">SCP</abbr> サーバーを提供します。"
 
 #. Password authentication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:172
-msgid "a_srv_d_pwauth"
+msgid "Password authentication"
 msgstr "パスワード認証"
 
 #. Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:173
-msgid "a_srv_d_pwauth1"
+msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
 msgstr "<abbr title=\"Secure Shell\">SSH</abbr> パスワード認証を許可します"
 
 #. Channel
 #: i18n/english/luasrc/i18n/admin-core.en.lua:174
-msgid "a_w_channel"
+msgid "Channel"
 msgstr "チャンネル"
 
 #. On this pages you can find configuration options for <abbr title=\"Wireless Local Area Network\">WLAN</abbr> based wireless networks.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:175
-msgid "a_w_wifi1"
+msgid "On this pages you can find configuration options for <abbr title=\"Wireless Local Area Network\">WLAN</abbr> based wireless networks."
 msgstr ""
 "On this pages you can find configuration options for <abbr title=\"Wireless "
 "Local Area Network\">WLAN</abbr> based wireless networks."
 
 #. You can easily integrate your 802.11a/b/g/n-devices into your physical network and use the virtual adapter support to build wireless repeaters or offer several networks with one device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:176
-msgid "a_w_wifi2"
+msgid "You can easily integrate your 802.11a/b/g/n-devices into your physical network and use the virtual adapter support to build wireless repeaters or offer several networks with one device."
 msgstr ""
 "You can easily integrate your 802.11a/b/g/n-devices into your physical "
 "network and use the virtual adapter support to build wireless repeaters or "
@@ -952,7 +952,7 @@ msgstr ""
 
 #. There is support for Managed, Client, Ad-Hoc and <abbr title=\"Wireless Distribution System\">WDS</abbr> operating modes as well as <abbr title=\"Wi-Fi Protected Access\">WPA</abbr> and <abbr title=\"Wi-Fi Protected Access 2\">WPA2</abbr> encryption for secure communnication.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:177
-msgid "a_w_wifi3"
+msgid "There is support for Managed, Client, Ad-Hoc and <abbr title=\"Wireless Distribution System\">WDS</abbr> operating modes as well as <abbr title=\"Wi-Fi Protected Access\">WPA</abbr> and <abbr title=\"Wi-Fi Protected Access 2\">WPA2</abbr> encryption for secure communnication."
 msgstr ""
 "There is support for Managed, Client, Ad-Hoc and <abbr title=\"Wireless "
 "Distribution System\">WDS</abbr> operating modes as well as <abbr title=\"Wi-"
@@ -961,134 +961,134 @@ msgstr ""
 
 #. Here you can configure installed wifi devices.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:178
-msgid "a_w_devices1"
+msgid "Here you can configure installed wifi devices."
 msgstr "ここではインストールされた無線デバイスの設定を行うことが出来ます。"
 
 #. Transmit Antenna
 #: i18n/english/luasrc/i18n/admin-core.en.lua:179
-msgid "a_w_txantenna"
+msgid "Transmit Antenna"
 msgstr "送信アンテナ"
 
 #. Receive Antenna
 #: i18n/english/luasrc/i18n/admin-core.en.lua:180
-msgid "a_w_rxantenna"
+msgid "Receive Antenna"
 msgstr "受信アンテナ"
 
 #. Distance to furthest station (in meter)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:181
-msgid "a_w_distance1"
+msgid "Distance to furthest station (in meter)"
 msgstr "最も遠いメンバーとの距離(メーター)"
 
 #. Diversity
 #: i18n/english/luasrc/i18n/admin-core.en.lua:182
-msgid "a_w_diversity"
+msgid "Diversity"
 msgstr "ダイバーシティ"
 
 #. Country Code
 #: i18n/english/luasrc/i18n/admin-core.en.lua:183
-msgid "a_w_countrycode"
+msgid "Country Code"
 msgstr "国コード"
 
 #. Connection Limit
 #: i18n/english/luasrc/i18n/admin-core.en.lua:184
-msgid "a_w_connlimit"
+msgid "Connection Limit"
 msgstr "接続制限"
 
 #. You can run several wifi networks with one device. Be aware that there are certain hardware and driverspecific restrictions. Normally you can operate 1 Ad-Hoc or up to 3 Master-Mode and 1 Client-Mode network simultaneously.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:185
-msgid "a_w_networks1"
+msgid "You can run several wifi networks with one device. Be aware that there are certain hardware and driverspecific restrictions. Normally you can operate 1 Ad-Hoc or up to 3 Master-Mode and 1 Client-Mode network simultaneously."
 msgstr ""
 "1つのデバイスで複数の無線ネットワークを運用することが出来ます。特定のハードウェアとドライバの仕様の制限が在ることに注意してください。通常では1つのアド"
 "ホックモード、もしくは3つまでのマスターモードと1つのクライアントモードネットワークを同時に稼働できます。"
 
 #. Network Name (<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:186
-msgid "a_w_netid"
+msgid "Network Name (<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>)"
 msgstr "ネットワーク名(<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>)"
 
 #. Add the Wifi network to physical network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:187
-msgid "a_w_network1"
+msgid "Add the Wifi network to physical network"
 msgstr "物理ネットワークに無線ネットワークを追加します"
 
 #.  - Create new Network - 
 #: i18n/english/luasrc/i18n/admin-core.en.lua:188
-msgid "a_w_netmanual"
+msgid " - Create new Network - "
 msgstr " - 新しいネットワークを作成 - "
 
 #. Transmit Power
 #: i18n/english/luasrc/i18n/admin-core.en.lua:189
-msgid "a_w_txpwr"
+msgid "Transmit Power"
 msgstr "電波出力"
 
 #. Broadcom Frameburst
 #: i18n/english/luasrc/i18n/admin-core.en.lua:190
-msgid "a_w_brcmburst"
+msgid "Broadcom Frameburst"
 msgstr "Broadcomフレームバースト"
 
 #. Atheros Frameburst
 #: i18n/english/luasrc/i18n/admin-core.en.lua:191
-msgid "a_w_athburst"
+msgid "Atheros Frameburst"
 msgstr "Atherosフレームバースト"
 
 #. RadiusServer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:192
-msgid "a_w_radiussrv"
+msgid "RadiusServer"
 msgstr "Radiusサーバー"
 
 #. Radius-Port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:193
-msgid "a_w_radiusport"
+msgid "Radius-Port"
 msgstr "Radiusポート"
 
 #. AP-Isolation
 #: i18n/english/luasrc/i18n/admin-core.en.lua:194
-msgid "a_w_apisolation"
+msgid "AP-Isolation"
 msgstr "APの分離"
 
 #. Prevents Client to Client communication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:195
-msgid "a_w_apisolation1"
+msgid "Prevents Client to Client communication"
 msgstr "クライアント同士の通信を制限します"
 
 #. Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:196
-msgid "a_w_hideessid"
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>を隠す"
 
 #. Access Point
 #: i18n/english/luasrc/i18n/admin-core.en.lua:197
-msgid "a_w_ap"
+msgid "Access Point"
 msgstr "アクセスポイント"
 
 #. Ad-Hoc
 #: i18n/english/luasrc/i18n/admin-core.en.lua:198
-msgid "a_w_adhoc"
+msgid "Ad-Hoc"
 msgstr "アドホック"
 
 #. Pseudo Ad-Hoc (ahdemo)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:199
-msgid "a_w_ahdemo"
+msgid "Pseudo Ad-Hoc (ahdemo)"
 msgstr "擬似アドホック(ahdemo)"
 
 #. Client
 #: i18n/english/luasrc/i18n/admin-core.en.lua:200
-msgid "a_w_client"
+msgid "Client"
 msgstr "クライアント"
 
 #. WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:201
-msgid "a_w_wds"
+msgid "WDS"
 msgstr "WDS"
 
 #. Monitor
 #: i18n/english/luasrc/i18n/admin-core.en.lua:202
-msgid "a_w_monitor"
+msgid "Monitor"
 msgstr "モニター"
 
 #. Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> firewalls
 #: i18n/english/luasrc/i18n/admin-core.en.lua:203
-msgid "dhcp_dnsmasq_desc"
+msgid "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> firewalls"
 msgstr ""
 "Dnsmasq は <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>サーバーと "
 "<abbr title=\"Network Address Translation\">NAT</abbr>ファイヤーウォールの為の <abbr "
@@ -1096,240 +1096,240 @@ msgstr ""
 
 #. Domain required
 #: i18n/english/luasrc/i18n/admin-core.en.lua:204
-msgid "dhcp_dnsmasq_domainneeded"
+msgid "Domain required"
 msgstr "ドメイン必須"
 
 #. Don&#39;t forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without <abbr title=\"Domain Name System\">DNS</abbr>-Name
 #: i18n/english/luasrc/i18n/admin-core.en.lua:205
-msgid "dhcp_dnsmasq_domainneeded_desc"
+msgid "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without <abbr title=\"Domain Name System\">DNS</abbr>-Name"
 msgstr ""
 "<abbr title=\"Domain Name System\">DNS</abbr>名の無い <abbr title=\"Domain Name "
 "System\">DNS</abbr>リクエストを転送しません"
 
 #. Authoritative
 #: i18n/english/luasrc/i18n/admin-core.en.lua:206
-msgid "dhcp_dnsmasq_authoritative"
+msgid "Authoritative"
 msgstr "権威"
 
 #. This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> in the local network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:207
-msgid "dhcp_dnsmasq_authoritative_desc"
+msgid "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> in the local network"
 msgstr ""
 "これはローカルネットワーク内のみの <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr>です"
 
 #. Filter private
 #: i18n/english/luasrc/i18n/admin-core.en.lua:208
-msgid "dhcp_dnsmasq_boguspriv"
+msgid "Filter private"
 msgstr "プライベートフィルター"
 
 #. Don&#39;t forward reverse lookups for local networks
 #: i18n/english/luasrc/i18n/admin-core.en.lua:209
-msgid "dhcp_dnsmasq_boguspriv_desc"
+msgid "Don't forward reverse lookups for local networks"
 msgstr "ローカルネットワークの為の逆引きを転送しません"
 
 #. Filter useless
 #: i18n/english/luasrc/i18n/admin-core.en.lua:210
-msgid "dhcp_dnsmasq_filterwin2k"
+msgid "Filter useless"
 msgstr "無駄のフィルター"
 
 #. filter useless <abbr title=\"Domain Name System\">DNS</abbr>-queries of Windows-systems
 #: i18n/english/luasrc/i18n/admin-core.en.lua:211
-msgid "dhcp_dnsmasq_filterwin2k_desc"
+msgid "filter useless <abbr title=\"Domain Name System\">DNS</abbr>-queries of Windows-systems"
 msgstr "Windowsシステムの無駄な <abbr title=\"Domain Name System\">DNS</abbr>クエリをフィルタします"
 
 #. Localise queries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:212
-msgid "dhcp_dnsmasq_localisequeries"
+msgid "Localise queries"
 msgstr "ローカライズクエリ"
 
 #. localises the hostname depending on its subnet
 #: i18n/english/luasrc/i18n/admin-core.en.lua:213
-msgid "dhcp_dnsmasq_localisequeries_desc"
+msgid "localises the hostname depending on its subnet"
 msgstr "サブネットに依存したホスト名をローカライズします"
 
 #. Local Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:214
-msgid "dhcp_dnsmasq_local"
+msgid "Local Server"
 msgstr "ローカルサーバー"
 
 #. Local Domain
 #: i18n/english/luasrc/i18n/admin-core.en.lua:215
-msgid "dhcp_dnsmasq_domain"
+msgid "Local Domain"
 msgstr "ローカルドメイン"
 
 #. Expand Hosts
 #: i18n/english/luasrc/i18n/admin-core.en.lua:216
-msgid "dhcp_dnsmasq_expandhosts"
+msgid "Expand Hosts"
 msgstr "ホスト名展開"
 
 #. adds domain names to hostentries in the resolv file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:217
-msgid "dhcp_dnsmasq_expandhosts_desc"
+msgid "adds domain names to hostentries in the resolv file"
 msgstr "リゾルバファイルのホストエントリにドメイン名を追加します"
 
 #. don&#39;t cache unknown
 #: i18n/english/luasrc/i18n/admin-core.en.lua:218
-msgid "dhcp_dnsmasq_nonegcache"
+msgid "don't cache unknown"
 msgstr "ネガティブキャッシュを行わない"
 
 #. prevents caching of negative <abbr title=\"Domain Name System\">DNS</abbr>-replies
 #: i18n/english/luasrc/i18n/admin-core.en.lua:219
-msgid "dhcp_dnsmasq_nonegcache_desc"
+msgid "prevents caching of negative <abbr title=\"Domain Name System\">DNS</abbr>-replies"
 msgstr "ネガティブキャッシュの<abbr title=\"Domain Name System\">DNS</abbr>応答を防ぎます"
 
 #. Use <code>/etc/ethers</code>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:220
-msgid "dhcp_dnsmasq_readethers"
+msgid "Use <code>/etc/ethers</code>"
 msgstr "<code>/etc/ethers</code> を使用する"
 
 #. Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:221
-msgid "dhcp_dnsmasq_readethers_desc"
+msgid "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server"
 msgstr ""
 "<abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr>サーバーの設定の為に<code>/etc/ethers</code> を読みます"
 
 #. Leasefile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:222
-msgid "dhcp_dnsmasq_leasefile"
+msgid "Leasefile"
 msgstr "リースファイル"
 
 #. file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-leases will be stored
 #: i18n/english/luasrc/i18n/admin-core.en.lua:223
-msgid "dhcp_dnsmasq_leasefile_desc"
+msgid "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-leases will be stored"
 msgstr ""
 "<abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>リース情報が保存されるファイル"
 
 #. Resolvfile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:224
-msgid "dhcp_dnsmasq_resolvfile"
+msgid "Resolvfile"
 msgstr "リゾルバファイル"
 
 #. local <abbr title=\"Domain Name System\">DNS</abbr> file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:225
-msgid "dhcp_dnsmasq_resolvfile_desc"
+msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "ローカル <abbr title=\"Domain Name System\">DNS</abbr>ファイル"
 
 #. Ignore <code>/etc/hosts</code>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:226
-msgid "dhcp_dnsmasq_nohosts"
+msgid "Ignore <code>/etc/hosts</code>"
 msgstr "<code>/etc/hosts</code>を無視"
 
 #. Strict order
 #: i18n/english/luasrc/i18n/admin-core.en.lua:227
-msgid "dhcp_dnsmasq_strictorder"
+msgid "Strict order"
 msgstr "Strict order"
 
 #. <abbr title=\"Domain Name System\">DNS</abbr>-Server will be queried in the order of the resolvfile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:228
-msgid "dhcp_dnsmasq_strictorder_desc"
+msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Server will be queried in the order of the resolvfile"
 msgstr "<abbr title=\"Domain Name System\">DNS</abbr>サーバーはリゾルバファイルの順に問い合わせを行います。"
 
 #. Log queries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:229
-msgid "dhcp_dnsmasq_logqueries"
+msgid "Log queries"
 msgstr "Log queries"
 
 #. Ignore resolve file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:230
-msgid "dhcp_dnsmasq_noresolv"
+msgid "Ignore resolve file"
 msgstr "Ignore resolve file"
 
 #. concurrent queries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:231
-msgid "dhcp_dnsmasq_dnsforwardmax"
+msgid "concurrent queries"
 msgstr "並列問い合わせ"
 
 #. <abbr title=\"Domain Name System\">DNS</abbr>-Port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:232
-msgid "dhcp_dnsmasq_port"
+msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Port"
 msgstr "<abbr title=\"Domain Name System\">DNS</abbr>-Port"
 
 #. <abbr title=\"maximal\">max.</abbr> <abbr title=\"Extension Mechanisms for Domain Name System\">EDNS0</abbr> paket size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:233
-msgid "dhcp_dnsmasq_ednspacket_max"
+msgid "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Extension Mechanisms for Domain Name System\">EDNS0</abbr> paket size"
 msgstr ""
 "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> paket size"
 
 #. <abbr title=\"maximal\">max.</abbr> <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:234
-msgid "dhcp_dnsmasq_dhcpleasemax"
+msgid "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Leases"
 msgstr ""
 "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr>リース"
 
 #. additional hostfile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:235
-msgid "dhcp_dnsmasq_addnhosts"
+msgid "additional hostfile"
 msgstr "追加のホストファイル"
 
 #. query port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:236
-msgid "dhcp_dnsmasq_queryport"
+msgid "query port"
 msgstr "問い合わせポート"
 
 #. Enable TFTP-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:237
-msgid "dhcp_dnsmasq_enabletftp"
+msgid "Enable TFTP-Server"
 msgstr "TFTPサーバーを有効にする"
 
 #. TFTP-Server Root
 #: i18n/english/luasrc/i18n/admin-core.en.lua:238
-msgid "dhcp_dnsmasq_tftproot"
+msgid "TFTP-Server Root"
 msgstr "TFTPサーバールート"
 
 #. Network Boot Image
 #: i18n/english/luasrc/i18n/admin-core.en.lua:239
-msgid "dhcp_dnsmasq_dhcpboot"
+msgid "Network Boot Image"
 msgstr "ネットワークブートイメージ"
 
 #. Switch
 #: i18n/english/luasrc/i18n/admin-core.en.lua:240
-msgid "a_n_switch"
+msgid "Switch"
 msgstr "スイッチ"
 
 #. Active Connections
 #: i18n/english/luasrc/i18n/admin-core.en.lua:241
-msgid "a_n_conntrack"
+msgid "Active Connections"
 msgstr "アクティブコネクション"
 
 #. This page gives an overview over currently active network connections.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:242
-msgid "a_n_conntrack_desc"
+msgid "This page gives an overview over currently active network connections."
 msgstr "このページは現在アクティブなネットワークネクションの概要を表示します。"
 
 #. Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:243
-msgid "a_n_routes"
+msgid "Routes"
 msgstr "ルーティング"
 
 #. IPv4 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:244
-msgid "a_n_routes4"
+msgid "IPv4 Routes"
 msgstr "IPv4 ルーティング"
 
 #. IPv6 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:245
-msgid "a_n_routes6"
+msgid "IPv6 Routes"
 msgstr "IPv6 ルーティング"
 
 #. In this area you find all network-related settings.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:246
-msgid "a_network1"
+msgid "In this area you find all network-related settings."
 msgstr "In this area you find all network-related settings."
 
 #. On most routers the network switch can be freely configured and splitted up into several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:247
-msgid "a_network2"
+msgid "On most routers the network switch can be freely configured and splitted up into several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s."
 msgstr ""
 "On most routers the network switch can be freely configured and splitted up "
 "into several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s."
 
 #. Interfaces and <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> / <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Settings allow a custom organisation of the network and connections to other networks like the internet.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:248
-msgid "a_network3"
+msgid "Interfaces and <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> / <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Settings allow a custom organisation of the network and connections to other networks like the internet."
 msgstr ""
 "Interfaces and <abbr title=\"Point-to-Point Protocol over "
 "Ethernet\">PPPoE</abbr> / <abbr title=\"Point-to-Point Tunneling "
@@ -1338,7 +1338,7 @@ msgstr ""
 
 #. With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> devices in your local network can be automatically configured for network communication.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:249
-msgid "a_network4"
+msgid "With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> devices in your local network can be automatically configured for network communication."
 msgstr ""
 "With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> devices "
 "in your local network can be automatically configured for network "
@@ -1346,14 +1346,14 @@ msgstr ""
 
 #. Firewall and portforwarding can be used to secure your network while providing services to external networks.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:250
-msgid "a_network5"
+msgid "Firewall and portforwarding can be used to secure your network while providing services to external networks."
 msgstr ""
 "Firewall and portforwarding can be used to secure your network while "
 "providing services to external networks."
 
 #. The network ports on your router can be combined to several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s in which computers can communicate directly with each other. <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s are often used to separate different network segments. Often there is by default one Uplink port for a connection to the next greater network like the internet and other ports for a local network.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:251
-msgid "a_n_switch1"
+msgid "The network ports on your router can be combined to several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s in which computers can communicate directly with each other. <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s are often used to separate different network segments. Often there is by default one Uplink port for a connection to the next greater network like the internet and other ports for a local network."
 msgstr ""
 "ルーターのネットワークポートはコンピューターがお互いに直接通信することが出来る幾つかの <abbr title=\"Virtual Local Area "
 "Network\">VLAN</abbr>s を組み合わせることが出来ます。<abbr title=\"Virtual Local Area "
@@ -1362,7 +1362,7 @@ msgstr ""
 
 #. Ports belonging to a <abbr title=\"Virtual Local Area Network\">VLAN</abbr> are separated with spaces. The port with the highest number (usually 5) is oftern the connection to the internal network interface of the router. On devices with 5 ports often the one with the lowest number (0) is the predefined Uplink port.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:252
-msgid "network_switch_desc"
+msgid "Ports belonging to a <abbr title=\"Virtual Local Area Network\">VLAN</abbr> are separated with spaces. The port with the highest number (usually 5) is oftern the connection to the internal network interface of the router. On devices with 5 ports often the one with the lowest number (0) is the predefined Uplink port."
 msgstr ""
 "ポートは領域を区切られた <abbr title=\"Virtual Local Area Network\">VLAN</abbr> に属します。数字の最"
 "も大きいポート(通常5)はよくルーターの内部ネットワークインターフェースへの接続に使用されます。デバイス上の5つポートで数字の最も小さいポート(0)はア"
@@ -1370,7 +1370,7 @@ msgstr ""
 
 #. On this page you can configure the network interfaces. You can bridge several interfaces by ticking the &quot;bridge interfaces&quot; field and enter the names of several network interfaces separated by spaces. You can also use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation <samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: <samp>eth0.1</samp>).
 #: i18n/english/luasrc/i18n/admin-core.en.lua:253
-msgid "a_n_ifaces1"
+msgid "On this page you can configure the network interfaces. You can bridge several interfaces by ticking the \"bridge interfaces\" field and enter the names of several network interfaces separated by spaces. You can also use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation <samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: <samp>eth0.1</samp>)."
 msgstr ""
 "ここではネットワークインターフェースの設定を行うことが出来ます。&quot;ブリッジインターフェース&quot;フィールドをチェックし、複数のネットワー"
 "クインターフェース名をスペースで区切りで入力することで複数のインターフェースをブリッジすることが出来ます。また、<samp>INTERFACE.VLAN"
@@ -1380,25 +1380,25 @@ msgstr ""
 
 #. Bridge interfaces
 #: i18n/english/luasrc/i18n/admin-core.en.lua:254
-msgid "a_n_i_bridge"
+msgid "Bridge interfaces"
 msgstr "ブリッジインターフェース"
 
 #. creates a bridge over specified interface(s)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:255
-msgid "a_n_i_bridge1"
+msgid "creates a bridge over specified interface(s)"
 msgstr "指定したインターフェースでブリッジを作成します"
 
 #. Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>
-msgid "a_n_i_stp"
+msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 msgstr ""
 
 #. Enables the Spanning Tree Protocol on this bridge
-msgid "a_n_i_stp1"
+msgid "Enables the Spanning Tree Protocol on this bridge"
 msgstr ""
 
 #. With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> network members can automatically receive their network settings (<abbr title=\"Internet Protocol\">IP</abbr>-address, netmask, <abbr title=\"Domain Name System\">DNS</abbr>-server, ...).
 #: i18n/english/luasrc/i18n/admin-core.en.lua:256
-msgid "dhcp_desc"
+msgid "With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> network members can automatically receive their network settings (<abbr title=\"Internet Protocol\">IP</abbr>-address, netmask, <abbr title=\"Domain Name System\">DNS</abbr>-server, ...)."
 msgstr ""
 "<abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
 "によってネットワークメンバは自動的にネットワーク設定(<abbr title=\"Internet "
@@ -1407,79 +1407,79 @@ msgstr ""
 
 #. Leasetime
 #: i18n/english/luasrc/i18n/admin-core.en.lua:257
-msgid "dhcp_dhcp_leasetime"
+msgid "Leasetime"
 msgstr "リース時間"
 
 #. Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:258
-msgid "dhcp_dhcp_dynamicdhcp"
+msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 msgstr "ダイナミック <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 
 #. Ignore interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:259
-msgid "dhcp_dhcp_ignore"
+msgid "Ignore interface"
 msgstr "インターフェースを無視します"
 
 #. disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for this interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:260
-msgid "dhcp_dhcp_ignore_desc"
+msgid "disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for this interface"
 msgstr ""
 "このインターフェースで <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
 "を無効にします。"
 
 #. Force
 #: i18n/english/luasrc/i18n/admin-core.en.lua:261
-msgid "dhcp_dhcp_force"
+msgid "Force"
 msgstr "強制"
 
 #. first address (last octet)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:262
-msgid "dhcp_dhcp_start_desc"
+msgid "first address (last octet)"
 msgstr "先頭アドレス(最後のオクテット)"
 
 #. number of leased addresses -1
 #: i18n/english/luasrc/i18n/admin-core.en.lua:263
-msgid "dhcp_dhcp_limit_desc"
+msgid "number of leased addresses -1"
 msgstr "number of leased addresses -1"
 
 #. DHCP-Options
 #: i18n/english/luasrc/i18n/admin-core.en.lua:264
-msgid "dhcp_dhcp_dhcpoption"
+msgid "DHCP-Options"
 msgstr "DHCPオプション"
 
 #. See &quot;dnsmasq --help dhcp&quot; for a list of available options.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:265
-msgid "dhcp_dhcp_dhcpoption_desc"
+msgid "See \"dnsmasq --help dhcp\" for a list of available options."
 msgstr "有効なオプションの一覧は &quot;dnsmasq --help dhcp&quot; を参照してください。"
 
 #. Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:266
-msgid "dhcp_leases"
+msgid "Leases"
 msgstr "リース"
 
 #. Static Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:267
-msgid "luci_ethers"
+msgid "Static Leases"
 msgstr "静的リース"
 
 #. Leasetime remaining
 #: i18n/english/luasrc/i18n/admin-core.en.lua:268
-msgid "dhcp_timeremain"
+msgid "Leasetime remaining"
 msgstr "残りリース時間"
 
 #. Active Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:269
-msgid "dhcp_leases_active"
+msgid "Active Leases"
 msgstr "有効なリース"
 
 #. Point-to-Point Connections
 #: i18n/english/luasrc/i18n/admin-core.en.lua:270
-msgid "a_n_ptp"
+msgid "Point-to-Point Connections"
 msgstr "Point-to-Point接続"
 
 #. Point-to-Point connections with <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> or <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr> are often used to connect a device over <abbr title=\"Digital Subscriber Line\">DSL</abbr> or similar technologies to an internet access point.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:271
-msgid "a_n_ptp1"
+msgid "Point-to-Point connections with <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> or <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr> are often used to connect a device over <abbr title=\"Digital Subscriber Line\">DSL</abbr> or similar technologies to an internet access point."
 msgstr ""
 "Point-to-Point connections with <abbr title=\"Point-to-Point Protocol over "
 "Ethernet\">PPPoE</abbr> or <abbr title=\"Point-to-Point Tunneling "
@@ -1489,7 +1489,7 @@ msgstr ""
 
 #. You need to install &quot;comgt&quot; for UMTS/GPRS, &quot;ppp-mod-pppoe&quot; for PPPoE, &quot;ppp-mod-pppoa&quot; for PPPoA or &quot;pptp&quot; for PPtP support
 #: i18n/english/luasrc/i18n/admin-core.en.lua:272
-msgid "network_interface_prereq"
+msgid "You need to install \"comgt\" for UMTS/GPRS, \"ppp-mod-pppoe\" for PPPoE, \"ppp-mod-pppoa\" for PPPoA or \"pptp\" for PPtP support"
 msgstr ""
 "UMTS/GPRSを使用する為には &quot;comgt&quot; を、PPPoE の為に &quot;ppp-mod-pppoe&quot; "
 "を、PPPoA の為に &quot;ppp-mod-pppoa&quot; を、PPtP の為に &quot;pptp&quot; "
@@ -1497,696 +1497,696 @@ msgstr ""
 
 #. You need to install &quot;ppp-mod-pppoe&quot; for PPPoE or &quot;pptp&quot; for PPtP support
 #: i18n/english/luasrc/i18n/admin-core.en.lua:273
-msgid "network_interface_prereq_mini"
+msgid "You need to install \"ppp-mod-pppoe\" for PPPoE or \"pptp\" for PPtP support"
 msgstr ""
 "PPPoE をサポートする為には &quot;ppp-mod-pppoe&quot; を、PPtP をサポートする為に &quot;pptp&quot; "
 "をインストールする必要があります。"
 
 #. <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:274
-msgid "network_interface_server"
+msgid "<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"
 msgstr "<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>サーバー"
 
 #. Automatic Disconnect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:275
-msgid "network_interface_demand"
+msgid "Automatic Disconnect"
 msgstr "自動切断"
 
 #. Time (in seconds) after which an unused connection will be closed
 #: i18n/english/luasrc/i18n/admin-core.en.lua:276
-msgid "network_interface_demand_desc"
+msgid "Time (in seconds) after which an unused connection will be closed"
 msgstr "指定した期間(秒)コネクションが使用されない場合に接続を閉じます"
 
 #. Keep-Alive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:277
-msgid "network_interface_keepalive"
+msgid "Keep-Alive"
 msgstr "キープアライブ"
 
 #. Number of failed connection tests to initiate automatic reconnect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:278
-msgid "network_interface_keepalive_desc"
+msgid "Number of failed connection tests to initiate automatic reconnect"
 msgstr "自動再接続時に行う接続テストの失敗数"
 
 #. Modem device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:279
-msgid "network_interface_device"
+msgid "Modem device"
 msgstr "モデムデバイス"
 
 #. The device node of your modem, e.g. /dev/ttyUSB0
 #: i18n/english/luasrc/i18n/admin-core.en.lua:280
-msgid "network_interface_device_desc"
+msgid "The device node of your modem, e.g. /dev/ttyUSB0"
 msgstr "これはモデムのデバイスノードです。 例: /dev/ttyUSB0"
 
 #. Replace default route
 #: i18n/english/luasrc/i18n/admin-core.en.lua:281
-msgid "network_interface_defaultroute"
+msgid "Replace default route"
 msgstr "デフォルトルートを置き換える"
 
 #. Let pppd replace the current default route to use the PPP interface after successful connect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:282
-msgid "network_interface_defaultroute_desc"
+msgid "Let pppd replace the current default route to use the PPP interface after successful connect"
 msgstr "接続に成功した後、pppdにデフォルトルートをPPPインターフェースを使用する様に書き換えさせます"
 
 #. Use peer DNS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:283
-msgid "network_interface_peerdns"
+msgid "Use peer DNS"
 msgstr "ピアDNSを使用する"
 
 #. Configure the local DNS server to use the name servers adverticed by the PPP peer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:284
-msgid "network_interface_peerdns_desc"
+msgid "Configure the local DNS server to use the name servers adverticed by the PPP peer"
 msgstr "ローカルDNSサーバーをPPP接続先から通知されたネームサーバーを使用するように設定します"
 
 #. Enable IPv6 on PPP link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:285
-msgid "network_interface_ipv6"
+msgid "Enable IPv6 on PPP link"
 msgstr "IPv6 の PPP リンクを有効にする"
 
 #. Connect script
 #: i18n/english/luasrc/i18n/admin-core.en.lua:286
-msgid "network_interface_connect"
+msgid "Connect script"
 msgstr "接続スクリプト"
 
 #. Let pppd run this script after establishing the PPP link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:287
-msgid "network_interface_connect_desc"
+msgid "Let pppd run this script after establishing the PPP link"
 msgstr "PPPリンクを確立した後、pppd にこのスクリプトを実行させます。"
 
 #. Disconnect script
 #: i18n/english/luasrc/i18n/admin-core.en.lua:288
-msgid "network_interface_disconnect"
+msgid "Disconnect script"
 msgstr "切断スクリプト"
 
 #. Let pppd run this script before tearing down the PPP link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:289
-msgid "network_interface_disconnect_desc"
+msgid "Let pppd run this script before tearing down the PPP link"
 msgstr "PPPリンクを切断した後、pppd にこのスクリプトを実行させます。"
 
 #. Additional pppd options
 #: i18n/english/luasrc/i18n/admin-core.en.lua:290
-msgid "network_interface_pppd_options"
+msgid "Additional pppd options"
 msgstr "pppd 追加オプション"
 
 #. Specify additional command line arguments for pppd here
 #: i18n/english/luasrc/i18n/admin-core.en.lua:291
-msgid "network_interface_pppd_options_desc"
+msgid "Specify additional command line arguments for pppd here"
 msgstr "pppd の為の追加のコマンドライン引数をここに指定します。"
 
 #. Access point (APN)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:292
-msgid "network_interface_apn"
+msgid "Access point (APN)"
 msgstr "アクセスポイント(APN)"
 
 #. PIN code
 #: i18n/english/luasrc/i18n/admin-core.en.lua:293
-msgid "network_interface_pincode"
+msgid "PIN code"
 msgstr "PINコード"
 
 #. Make sure that you provide the correct pin code here or you might lock your sim card!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:294
-msgid "network_interface_pincode_desc"
+msgid "Make sure that you provide the correct pin code here or you might lock your sim card!"
 msgstr ""
 "Make sure that you provide the correct pin code here or you might lock your "
 "sim card!"
 
 #. Service type
 #: i18n/english/luasrc/i18n/admin-core.en.lua:295
-msgid "network_interface_service"
+msgid "Service type"
 msgstr "Service type"
 
 #. Setup wait time
 #: i18n/english/luasrc/i18n/admin-core.en.lua:296
-msgid "network_interface_maxwait"
+msgid "Setup wait time"
 msgstr "Setup wait time"
 
 #. Seconds to wait for the modem to become ready before attempting to connect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:297
-msgid "network_interface_maxwait_desc"
+msgid "Seconds to wait for the modem to become ready before attempting to connect"
 msgstr ""
 "Seconds to wait for the modem to become ready before attempting to connect"
 
 #. PPPoA Encapsulation
 #: i18n/english/luasrc/i18n/admin-core.en.lua:298
-msgid "network_interface_encaps"
+msgid "PPPoA Encapsulation"
 msgstr "PPPoAカプセル化"
 
 #. Routes specify over which interface and gateway a certain host or network can be reached.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:299
-msgid "a_n_r_routes1"
+msgid "Routes specify over which interface and gateway a certain host or network can be reached."
 msgstr ""
 "Routes specify over which interface and gateway a certain host or network "
 "can be reached."
 
 #. Static Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:300
-msgid "a_n_routes_static"
+msgid "Static Routes"
 msgstr "静的ルーティング"
 
 #. Static IPv4 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:301
-msgid "a_n_routes_static4"
+msgid "Static IPv4 Routes"
 msgstr "IPv4 静的ルーティング"
 
 #. Static IPv6 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:302
-msgid "a_n_routes_static6"
+msgid "Static IPv6 Routes"
 msgstr "IPv6 静的ルーティング"
 
 #. Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:303
-msgid "a_n_routes_kernel4"
+msgid "Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes"
 msgstr "アクティブ <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>ルーティング"
 
 #. Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:304
-msgid "a_n_routes_kernel6"
+msgid "Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes"
 msgstr "アクティブ <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>ルーティング"
 
 #. Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:305
-msgid "a_n_r_target1"
+msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
 msgstr "ホスト<abbr title=\"Internet Protocol Address\">IP</abbr> or ネットワーク"
 
 #. <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network (CIDR)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:306
-msgid "a_n_r_target6"
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network (CIDR)"
 msgstr ""
 "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>アドレス or ネットワーク(CIDR)"
 
 #. if target is a network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:307
-msgid "a_n_r_netmask1"
+msgid "if target is a network"
 msgstr "ターゲットがネットワークの場合"
 
 #. Internet Connection
 #: i18n/english/luasrc/i18n/admin-core.en.lua:308
-msgid "m_n_inet"
+msgid "Internet Connection"
 msgstr "インターネット接続"
 
 #. Local Network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:309
-msgid "m_n_local"
+msgid "Local Network"
 msgstr "ローカルネットワーク"
 
 #. Route
 #: i18n/english/luasrc/i18n/admin-core.en.lua:310
-msgid "m_n_route"
+msgid "Route"
 msgstr "Route"
 
 #. Bridge
 #: i18n/english/luasrc/i18n/admin-core.en.lua:311
-msgid "m_n_brdige"
+msgid "Bridge"
 msgstr "ブリッジ"
 
 #. Provide (Access Point)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:312
-msgid "m_w_ap"
+msgid "Provide (Access Point)"
 msgstr "アクセスポイント"
 
 #. Independent (Ad-Hoc)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:313
-msgid "m_w_adhoc"
+msgid "Independent (Ad-Hoc)"
 msgstr "アドホック"
 
 #. Join (Client)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:314
-msgid "m_w_client"
+msgid "Join (Client)"
 msgstr "クライアント"
 
 #. Distributed (<abbr title=\"Wireless Distribution System\">WDS</abbr>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:315
-msgid "m_w_wds"
+msgid "Distributed (<abbr title=\"Wireless Distribution System\">WDS</abbr>)"
 msgstr "分散型 (<abbr title=\"Wireless Distribution System\">WDS</abbr>)"
 
 #. Clientmode
 #: i18n/english/luasrc/i18n/admin-core.en.lua:316
-msgid "m_w_clientmode"
+msgid "Clientmode"
 msgstr "クライアントモード"
 
 #. System log buffer size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:317
-msgid "system_system_logsize"
+msgid "System log buffer size"
 msgstr "システムログのバッファサイズ"
 
 #. External system log server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:318
-msgid "system_system_logip"
+msgid "External system log server"
 msgstr "外部のシステムログサーバー"
 
 #. Log output level
 #: i18n/english/luasrc/i18n/admin-core.en.lua:319
-msgid "system_system_conloglevel"
+msgid "Log output level"
 msgstr "ログレベル"
 
 #. Level of log messages on the console
 #: i18n/english/luasrc/i18n/admin-core.en.lua:320
-msgid "system_system_conloglevel_desc"
+msgid "Level of log messages on the console"
 msgstr "コンソールメッセージのログレベル"
 
 #. Processor
 #: i18n/english/luasrc/i18n/admin-core.en.lua:321
-msgid "m_i_processor"
+msgid "Processor"
 msgstr "プロセッサ"
 
 #. Memory
 #: i18n/english/luasrc/i18n/admin-core.en.lua:322
-msgid "m_i_memory"
+msgid "Memory"
 msgstr "メモリー"
 
 #. Local Time
 #: i18n/english/luasrc/i18n/admin-core.en.lua:323
-msgid "m_i_systemtime"
+msgid "Local Time"
 msgstr "ローカルタイム"
 
 #. Uptime
 #: i18n/english/luasrc/i18n/admin-core.en.lua:324
-msgid "m_i_uptime"
+msgid "Uptime"
 msgstr "起動時間"
 
 #. First leased address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:325
-msgid "m_n_d_firstaddress"
+msgid "First leased address"
 msgstr "先頭リースアドレス"
 
 #. Number of leased addresses
 #: i18n/english/luasrc/i18n/admin-core.en.lua:326
-msgid "m_n_d_numleases"
+msgid "Number of leased addresses"
 msgstr "リースアドレス数"
 
 #. Routing table
 #: i18n/english/luasrc/i18n/admin-core.en.lua:327
-msgid "routingtable"
+msgid "Routing table"
 msgstr "ルーティングテーブル"
 
 #. Wifi scan
 #: i18n/english/luasrc/i18n/admin-core.en.lua:328
-msgid "wlanscan"
+msgid "Wifi scan"
 msgstr "Wifi scan"
 
 #. Frequency
 #: i18n/english/luasrc/i18n/admin-core.en.lua:329
-msgid "frequency"
+msgid "Frequency"
 msgstr "Frequency"
 
 #. Power
 #: i18n/english/luasrc/i18n/admin-core.en.lua:330
-msgid "power"
+msgid "Power"
 msgstr "出力"
 
 #. Noise
 #: i18n/english/luasrc/i18n/admin-core.en.lua:331
-msgid "noise"
+msgid "Noise"
 msgstr "ノイズ"
 
 #. Signal
 #: i18n/english/luasrc/i18n/admin-core.en.lua:332
-msgid "signal"
+msgid "Signal"
 msgstr "シグナル"
 
 #. Link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:333
-msgid "link"
+msgid "Link"
 msgstr "リンク"
 
 #. <abbr title=\"Fragmentation\">Frag.</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:334
-msgid "frag"
+msgid "<abbr title=\"Fragmentation\">Frag.</abbr>"
 msgstr "<abbr title=\"Fragmentation\">フラグメンテーション</abbr>"
 
 #. <abbr title=\"Request To Send\">RTS</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:335
-msgid "rts"
+msgid "<abbr title=\"Request To Send\">RTS</abbr>"
 msgstr "<abbr title=\"Request To Send\">RTS</abbr>"
 
 #. Bitrate
 #: i18n/english/luasrc/i18n/admin-core.en.lua:336
-msgid "bitrate"
+msgid "Bitrate"
 msgstr "ビットレート"
 
 #. automatically reconnect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:337
-msgid "m_n_keepalive"
+msgid "automatically reconnect"
 msgstr "自動再接続"
 
 #. disconnect when idle for
 #: i18n/english/luasrc/i18n/admin-core.en.lua:338
-msgid "m_n_dialondemand"
+msgid "disconnect when idle for"
 msgstr "disconnect when idle for"
 
 #. <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:339
-msgid "m_n_pptp_server"
+msgid "<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"
 msgstr "<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>サーバー"
 
 #. <abbr title=\"Light Emitting Diode\">LED</abbr> Configuration
 #: i18n/english/luasrc/i18n/admin-core.en.lua:340
-msgid "leds"
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr>設定"
 
 #. Customizes the behaviour of the device <abbr title=\"Light Emitting Diode\">LED</abbr>s if possible.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:341
-msgid "leds_desc"
+msgid "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode\">LED</abbr>s if possible."
 msgstr "可能であれば<abbr title=\"Light Emitting Diode\">LED</abbr>デバイスの動作をカスタマイズします。"
 
 #. <abbr title=\"Light Emitting Diode\">LED</abbr> Name
 #: i18n/english/luasrc/i18n/admin-core.en.lua:342
-msgid "system_led_name"
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr>名"
 
 #. <abbr title=\"Light Emitting Diode\">LED</abbr> Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:343
-msgid "system_led_sysfs"
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Device"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr>デバイス"
 
 #. Default state
 #: i18n/english/luasrc/i18n/admin-core.en.lua:344
-msgid "system_led_default"
+msgid "Default state"
 msgstr "初期状態"
 
 #. ticked = on
 #: i18n/english/luasrc/i18n/admin-core.en.lua:345
-msgid "system_led_default_desc"
+msgid "ticked = on"
 msgstr "点滅 = オン"
 
 #. Trigger
 #: i18n/english/luasrc/i18n/admin-core.en.lua:346
-msgid "system_led_trigger"
+msgid "Trigger"
 msgstr "トリガー"
 
 #. None
 #: i18n/english/luasrc/i18n/admin-core.en.lua:347
-msgid "system_led_trigger_none"
+msgid "None"
 msgstr "無し"
 
 #. Default On
 #: i18n/english/luasrc/i18n/admin-core.en.lua:348
-msgid "system_led_trigger_defaulton"
+msgid "Default On"
 msgstr "デフォルトでオン"
 
 #. Timer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:349
-msgid "system_led_trigger_timer"
+msgid "Timer"
 msgstr "タイマー"
 
 #. Heartbeat (Load Average)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:350
-msgid "system_led_trigger_heartbeat"
+msgid "Heartbeat (Load Average)"
 msgstr "ハートビート(Load Average)"
 
 #. Network Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:351
-msgid "system_led_trigger_netdev"
+msgid "Network Device"
 msgstr "ネットワークデバイス"
 
 #. Off-State Delay
 #: i18n/english/luasrc/i18n/admin-core.en.lua:352
-msgid "system_led_delayoff"
+msgid "Off-State Delay"
 msgstr "Off状態 時間"
 
 #. Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is off
 #: i18n/english/luasrc/i18n/admin-core.en.lua:353
-msgid "system_led_delayoff_desc"
+msgid "Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is off"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> がオフになる時間(ミリ秒)"
 
 #. On-State Delay
 #: i18n/english/luasrc/i18n/admin-core.en.lua:354
-msgid "system_led_delayon"
+msgid "On-State Delay"
 msgstr "On状態 時間"
 
 #. Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is on
 #: i18n/english/luasrc/i18n/admin-core.en.lua:355
-msgid "system_led_delayon_desc"
+msgid "Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is on"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> がオンになる時間(ミリ秒)"
 
 #. Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:356
-msgid "system_led_dev"
+msgid "Device"
 msgstr "デバイス"
 
 #. Trigger Mode
 #: i18n/english/luasrc/i18n/admin-core.en.lua:357
-msgid "system_led_mode"
+msgid "Trigger Mode"
 msgstr "トリガーモード"
 
 #. Link On
 #: i18n/english/luasrc/i18n/admin-core.en.lua:358
-msgid "system_led_mode_link"
+msgid "Link On"
 msgstr "リンクオン"
 
 #. Transmit
 #: i18n/english/luasrc/i18n/admin-core.en.lua:359
-msgid "system_led_mode_tx"
+msgid "Transmit"
 msgstr "送信"
 
 #. Receive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:360
-msgid "system_led_mode_rx"
+msgid "Receive"
 msgstr "受信"
 
 #. Active
 #: i18n/english/luasrc/i18n/admin-core.en.lua:361
-msgid "network_interface_up"
+msgid "Active"
 msgstr "アクティブ"
 
 #. <abbr title=\"Media Access Control\">MAC</abbr>-Address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:362
-msgid "network_interface_hwaddr"
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr "<abbr title=\"Media Access Control\">MAC</abbr>アドレス"
 
 #. Hardware Address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:363
-msgid "network_interface_hwaddr_desc"
+msgid "Hardware Address"
 msgstr "ハードウェアアドレス"
 
 #. Traffic
 #: i18n/english/luasrc/i18n/admin-core.en.lua:364
-msgid "network_interface_txrx"
+msgid "Traffic"
 msgstr "トラフィック"
 
 #. transmitted / received
 #: i18n/english/luasrc/i18n/admin-core.en.lua:365
-msgid "network_interface_txrx_desc"
+msgid "transmitted / received"
 msgstr "送信 / 受信"
 
 #. Errors
 #: i18n/english/luasrc/i18n/admin-core.en.lua:366
-msgid "network_interface_err"
+msgid "Errors"
 msgstr "エラー"
 
 #. TX / RX
 #: i18n/english/luasrc/i18n/admin-core.en.lua:367
-msgid "network_interface_err_desc"
+msgid "TX / RX"
 msgstr "TX / RX"
 
 #. Create / Assign firewall-zone
 #: i18n/english/luasrc/i18n/admin-core.en.lua:368
-msgid "network_interface_fwzone"
+msgid "Create / Assign firewall-zone"
 msgstr "ファイアウォールゾーンの作成 / 割り当て"
 
 #. This interface does not belong to any firewall zone yet.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:369
-msgid "network_interface_fwzone_desc"
+msgid "Choose the firewall zone you want to assign to this interface. Select <em>unspecified</em> to remove the interface from the associated zone or fill out the <em>create</em> field to define a new zone and attach the interface to it."
 msgstr "このインターフェースはまだどのファイアウォールゾーンにも属しません。"
 
 #. Processes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:370
-msgid "process_head"
+msgid "Processes"
 msgstr "プロセス"
 
 #. This list gives an overview over currently running system processes and their status.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:371
-msgid "process_descr"
+msgid "This list gives an overview over currently running system processes and their status."
 msgstr "このリストは現在システムで動作しているプロセスとそのステータスを表します。"
 
 #. PID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:372
-msgid "process_pid"
+msgid "PID"
 msgstr "PID"
 
 #. Owner
 #: i18n/english/luasrc/i18n/admin-core.en.lua:373
-msgid "process_owner"
+msgid "Owner"
 msgstr "所有者"
 
 #. Command
 #: i18n/english/luasrc/i18n/admin-core.en.lua:374
-msgid "process_command"
+msgid "Command"
 msgstr "コマンド"
 
 #. CPU usage (%)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:375
-msgid "process_cpu"
+msgid "CPU usage (%)"
 msgstr "CPU使用率 (%)"
 
 #. Memory usage (%)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:376
-msgid "process_mem"
+msgid "Memory usage (%)"
 msgstr "メモリ使用率 (%)"
 
 #. Hang Up
 #: i18n/english/luasrc/i18n/admin-core.en.lua:377
-msgid "process_hup"
+msgid "Hang Up"
 msgstr "再起動"
 
 #. Terminate
 #: i18n/english/luasrc/i18n/admin-core.en.lua:378
-msgid "process_term"
+msgid "Terminate"
 msgstr "停止"
 
 #. Kill
 #: i18n/english/luasrc/i18n/admin-core.en.lua:379
-msgid "process_kill"
+msgid "Kill"
 msgstr "強制終了"
 
 #. cached
 #: i18n/english/luasrc/i18n/admin-core.en.lua:380
-msgid "mem_cached"
+msgid "cached"
 msgstr "cached"
 
 #. buffered
 #: i18n/english/luasrc/i18n/admin-core.en.lua:381
-msgid "mem_buffered"
+msgid "buffered"
 msgstr "buffered"
 
 #. free
 #: i18n/english/luasrc/i18n/admin-core.en.lua:382
-msgid "mem_free"
+msgid "free"
 msgstr "free"
 
 #. Scheduled Tasks
 #: i18n/english/luasrc/i18n/admin-core.en.lua:383
-msgid "a_s_crontab"
+msgid "Scheduled Tasks"
 msgstr "スケジュールタスク"
 
 #. This is the system crontab in which scheduled tasks can be defined.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:384
-msgid "a_s_crontab1"
+msgid "This is the system crontab in which scheduled tasks can be defined."
 msgstr "これは、スケジュールタスクを定義することが出来る crontab システムです。"
 
 #. NAS ID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:385
-msgid "a_w_nasid"
+msgid "NAS ID"
 msgstr "NAS ID"
 
 #. Path to CA-Certificate
 #: i18n/english/luasrc/i18n/admin-core.en.lua:386
-msgid "a_w_cacert"
+msgid "Path to CA-Certificate"
 msgstr "CA証明書のパス"
 
 #. EAP-Method
 #: i18n/english/luasrc/i18n/admin-core.en.lua:387
-msgid "a_w_eaptype"
+msgid "EAP-Method"
 msgstr "EAPメソッド"
 
 #. Path to Private Key
 #: i18n/english/luasrc/i18n/admin-core.en.lua:388
-msgid "a_w_tlsprivkey"
+msgid "Path to Private Key"
 msgstr "秘密鍵のパス"
 
 #. Password of Private Key
 #: i18n/english/luasrc/i18n/admin-core.en.lua:389
-msgid "a_w_tlsprivkeypwd"
+msgid "Password of Private Key"
 msgstr "秘密鍵のパスワード"
 
 #. Authentication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:390
-msgid "a_w_peapauth"
+msgid "Authentication"
 msgstr "認証"
 
 #. Identity
 #: i18n/english/luasrc/i18n/admin-core.en.lua:391
-msgid "a_w_peapidentity"
+msgid "Identity"
 msgstr "識別子"
 
 #. Password
 #: i18n/english/luasrc/i18n/admin-core.en.lua:392
-msgid "a_w_peappassword"
+msgid "Password"
 msgstr "パスワード"
 
 #. Create Network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:393
-msgid "a_w_create"
+msgid "Create Network"
 msgstr "ネットワークの作成"
 
 #. Hostnames
 #: i18n/english/luasrc/i18n/admin-core.en.lua:394
-msgid "hostnames"
+msgid "Hostnames"
 msgstr "ホスト名"
 
 #. Host entries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:395
-msgid "hostnames_entries"
+msgid "Host entries"
 msgstr "ホストエントリー"
 
 #. Hostname
 #: i18n/english/luasrc/i18n/admin-core.en.lua:396
-msgid "hostnames_hostname"
+msgid "Hostname"
 msgstr "ホスト名"
 
 #. IP address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:397
-msgid "hostnames_address"
+msgid "IP address"
 msgstr "IPアドレス"
 
 #. Clamp Segment Size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:398
-msgid "m_n_mssfix"
+msgid "Clamp Segment Size"
 msgstr "Clamp Segment Size"
 
 #. Fixes problems with unreachable websites, submitting forms or other unexpected behaviour for some ISPs.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:399
-msgid "m_n_mssfix_desc"
+msgid "Fixes problems with unreachable websites, submitting forms or other unexpected behaviour for some ISPs."
 msgstr ""
 "Fixes problems with unreachable websites, submitting forms or other "
 "unexpected behaviour for some ISPs."
 
 #. Flash Firmware
 #: i18n/english/luasrc/i18n/admin-core.en.lua:400
-msgid "admin_upgrade"
+msgid "Flash Firmware"
 msgstr "Flash Firmware"
 
 #. The uploaded image file does not contain a supported format. Make sure that you choose the generic image format for your platform.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:401
-msgid "admin_upgrade_badimage"
+msgid "The uploaded image file does not contain a supported format. Make sure that you choose the generic image format for your platform."
 msgstr ""
 "The uploaded image file does not contain a supported format. Make sure that "
 "you choose the generic image format for your platform."
 
 #. Checksum
 #: i18n/english/luasrc/i18n/admin-core.en.lua:402
-msgid "admin_upgrade_checksum"
+msgid "Checksum"
 msgstr "Checksum"
 
 #. Upload an OpenWrt image file to reflash the device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:403
-msgid "admin_upgrade_desc"
+msgid "Upload an OpenWrt image file to reflash the device."
 msgstr "Upload an OpenWrt image file to reflash the device."
 
 #. Size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:404
-msgid "admin_upgrade_filesize"
+msgid "Size"
 msgstr "Size"
 
 #. Firmware image
 #: i18n/english/luasrc/i18n/admin-core.en.lua:405
-msgid "admin_upgrade_fwimage"
+msgid "Firmware image"
 msgstr "Firmware image"
 
 #. Keep configuration files
 #: i18n/english/luasrc/i18n/admin-core.en.lua:406
-msgid "admin_upgrade_keepcfg"
+msgid "Keep configuration files"
 msgstr "Keep configuration files"
 
 #. Sorry. OpenWrt does not support a system upgrade on this platform.<br /> You need to manually flash your device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:407
-msgid "admin_upgrade_nosupport"
+msgid "Sorry. OpenWrt does not support a system upgrade on this platform.<br /> You need to manually flash your device."
 msgstr ""
 "Sorry. OpenWrt does not support a system upgrade on this platform.<br /> You "
 "need to manually flash your device."
 
 #. The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a few minutes until you try to reconnect. It might be necessary to renew the address of your computer to reach the device again, depending on your settings.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:408
-msgid "admin_upgrade_running"
+msgid "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a few minutes until you try to reconnect. It might be necessary to renew the address of your computer to reach the device again, depending on your settings."
 msgstr ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
 "few minutes until you try to reconnect. It might be necessary to renew the "
@@ -2195,19 +2195,19 @@ msgstr ""
 
 #.  (%s available)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:409
-msgid "admin_upgrade_spaceavail"
+msgid " (%s available)"
 msgstr " (%s available)"
 
 #. It appears that you try to flash an image that does not fit into the flash memory, please verify the image file!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:410
-msgid "admin_upgrade_toolarge"
+msgid "It appears that you try to flash an image that does not fit into the flash memory, please verify the image file!"
 msgstr ""
 "It appears that you try to flash an image that does not fit into the flash "
 "memory, please verify the image file!"
 
 #. Upload image
 #: i18n/english/luasrc/i18n/admin-core.en.lua:411
-msgid "admin_upgrade_upload"
+msgid "Upload image"
 msgstr "Upload image"
 
 #. The flash image was uploaded. Below is the checksum and file size listed, compare them with the original file to ensure data integrity.<br /> Click \"Proceed\" below to start the flash procedure.
diff --git a/po/ja/asterisk.po b/po/ja/asterisk.po
index 89aa53994..32d1202a4 100644
--- a/po/ja/asterisk.po
+++ b/po/ja/asterisk.po
@@ -14,1252 +14,1252 @@ msgstr ""
 
 #. Asterisk General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:1
-msgid "asterisk_asterisk"
+msgid "Asterisk General Options"
 msgstr ""
 
 #. AGI directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:2
-msgid "asterisk_asterisk_agidir"
+msgid "AGI directory"
 msgstr ""
 
 #. Cache recorded sound files during recording
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:3
-msgid "asterisk_asterisk_cacherecordfiles"
+msgid "Cache recorded sound files during recording"
 msgstr ""
 
 #. Debug Level
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:4
-msgid "asterisk_asterisk_debug"
+msgid "Debug Level"
 msgstr ""
 
 #. Disable some warnings
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:5
-msgid "asterisk_asterisk_dontwarn"
+msgid "Disable some warnings"
 msgstr ""
 
 #. Dump core on crash
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:6
-msgid "asterisk_asterisk_dumpcore"
+msgid "Dump core on crash"
 msgstr ""
 
 #. High Priority
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:7
-msgid "asterisk_asterisk_highpriority"
+msgid "High Priority"
 msgstr ""
 
 #. Initialise Crypto
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:8
-msgid "asterisk_asterisk_initcrypto"
+msgid "Initialise Crypto"
 msgstr ""
 
 #. Use Internal Timing
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:9
-msgid "asterisk_asterisk_internaltiming"
+msgid "Use Internal Timing"
 msgstr ""
 
 #. Log directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:10
-msgid "asterisk_asterisk_logdir"
+msgid "Log directory"
 msgstr ""
 
 #. Maximum number of calls allowed
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:11
-msgid "asterisk_asterisk_maxcalls"
+msgid "Maximum number of calls allowed"
 msgstr ""
 
 #. Maximum load to stop accepting new calls
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:12
-msgid "asterisk_asterisk_maxload"
+msgid "Maximum load to stop accepting new calls"
 msgstr ""
 
 #. Disable console colors
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:13
-msgid "asterisk_asterisk_nocolor"
+msgid "Disable console colors"
 msgstr ""
 
 #. Sound files Cache directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:14
-msgid "asterisk_asterisk_recordcachedir"
+msgid "Sound files Cache directory"
 msgstr ""
 
 #. The Group to run as
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:15
-msgid "asterisk_asterisk_rungroup"
+msgid "The Group to run as"
 msgstr ""
 
 #. The User to run as
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:16
-msgid "asterisk_asterisk_runuser"
+msgid "The User to run as"
 msgstr ""
 
 #. Voicemail Spool directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:17
-msgid "asterisk_asterisk_spooldir"
+msgid "Voicemail Spool directory"
 msgstr ""
 
 #. Prefix UniquID with system name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:18
-msgid "asterisk_asterisk_systemname"
+msgid "Prefix UniquID with system name"
 msgstr ""
 
 #. Build transcode paths via SLINEAR, not directly
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:19
-msgid "asterisk_asterisk_transcodeviasln"
+msgid "Build transcode paths via SLINEAR, not directly"
 msgstr ""
 
 #. Transmit SLINEAR silence while recording a channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:20
-msgid "asterisk_asterisk_transmitsilenceduringrecord"
+msgid "Transmit SLINEAR silence while recording a channel"
 msgstr ""
 
 #. Verbose Level
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:21
-msgid "asterisk_asterisk_verbose"
+msgid "Verbose Level"
 msgstr ""
 
 #. Time Zone
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:22
-msgid "asterisk_asterisk_zone"
+msgid "Time Zone"
 msgstr ""
 
 #. Section dialplan
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:23
-msgid "asterisk_dialplan"
+msgid "Section dialplan"
 msgstr ""
 
 #. include
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:24
-msgid "asterisk_dialplan_include"
+msgid "include"
 msgstr ""
 
 #. Dialplan Extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:25
-msgid "asterisk_dialplanexten"
+msgid "Dialplan Extension"
 msgstr ""
 
 #. Dialplan General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:26
-msgid "asterisk_dialplangeneral"
+msgid "Dialplan General Options"
 msgstr ""
 
 #. Allow transfer
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:27
-msgid "asterisk_dialplangeneral_allowtransfer"
+msgid "Allow transfer"
 msgstr ""
 
 #. Reinvite/redirect media connections
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:28
-msgid "asterisk_dialplangeneral_canreinvite"
+msgid "Reinvite/redirect media connections"
 msgstr ""
 
 #. Clear global vars
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:29
-msgid "asterisk_dialplangeneral_clearglobalvars"
+msgid "Clear global vars"
 msgstr ""
 
 #. Dialplan Goto
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:30
-msgid "asterisk_dialplangoto"
+msgid "Dialplan Goto"
 msgstr ""
 
 #. Dialplan Conference
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:31
-msgid "asterisk_dialplanmeetme"
+msgid "Dialplan Conference"
 msgstr ""
 
 #. Dialplan Time
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:32
-msgid "asterisk_dialplansaytime"
+msgid "Dialplan Time"
 msgstr ""
 
 #. Dialplan Voicemail
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:33
-msgid "asterisk_dialplanvoice"
+msgid "Dialplan Voicemail"
 msgstr ""
 
 #. Dial Zones for Dialplan
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:34
-msgid "asterisk_dialzone"
+msgid "Dial Zones for Dialplan"
 msgstr ""
 
 #. Prefix to add matching dialplans
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:35
-msgid "asterisk_dialzone_addprefix"
+msgid "Prefix to add matching dialplans"
 msgstr ""
 
 #. Match International prefix
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:36
-msgid "asterisk_dialzone_international"
+msgid "Match International prefix"
 msgstr ""
 
 #. Prefix (0) to add/remove to/from international numbers
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:37
-msgid "asterisk_dialzone_localprefix"
+msgid "Prefix (0) to add/remove to/from international numbers"
 msgstr ""
 
 #. localzone
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:38
-msgid "asterisk_dialzone_localzone"
+msgid "localzone"
 msgstr ""
 
 #. Match plan
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:39
-msgid "asterisk_dialzone_match"
+msgid "Match plan"
 msgstr ""
 
 #. Connection to use
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:40
-msgid "asterisk_dialzone_uses"
+msgid "Connection to use"
 msgstr ""
 
 #. Feature Key maps
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:41
-msgid "asterisk_featuremap"
+msgid "Feature Key maps"
 msgstr ""
 
 #. Attended transfer key
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:42
-msgid "asterisk_featuremap_atxfer"
+msgid "Attended transfer key"
 msgstr ""
 
 #. Blind transfer key
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:43
-msgid "asterisk_featuremap_blindxfer"
+msgid "Blind transfer key"
 msgstr ""
 
 #. Key to Disconnect call
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:44
-msgid "asterisk_featuremap_disconnect"
+msgid "Key to Disconnect call"
 msgstr ""
 
 #. Key to Park call
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:45
-msgid "asterisk_featuremap_parkcall"
+msgid "Key to Park call"
 msgstr ""
 
 #. Parking Feature
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:46
-msgid "asterisk_featurepark"
+msgid "Parking Feature"
 msgstr ""
 
 #. ADSI Park
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:47
-msgid "asterisk_featurepark_adsipark"
+msgid "ADSI Park"
 msgstr ""
 
 #. Attended transfer timeout (sec)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:48
-msgid "asterisk_featurepark_atxfernoanswertimeout"
+msgid "Attended transfer timeout (sec)"
 msgstr ""
 
 #. One touch record key
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:49
-msgid "asterisk_featurepark_automon"
+msgid "One touch record key"
 msgstr ""
 
 #. Name of call context for parking
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:50
-msgid "asterisk_featurepark_context"
+msgid "Name of call context for parking"
 msgstr ""
 
 #. Sound file to play to parked caller
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:51
-msgid "asterisk_featurepark_courtesytone"
+msgid "Sound file to play to parked caller"
 msgstr ""
 
 #. Max time (ms) between digits for feature activation
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:52
-msgid "asterisk_featurepark_featuredigittimeout"
+msgid "Max time (ms) between digits for feature activation"
 msgstr ""
 
 #. Method to Find Parking slot
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:53
-msgid "asterisk_featurepark_findslot"
+msgid "Method to Find Parking slot"
 msgstr ""
 
 #. parkedmusicclass
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:54
-msgid "asterisk_featurepark_parkedmusicclass"
+msgid "parkedmusicclass"
 msgstr ""
 
 #. Play courtesy tone to
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:55
-msgid "asterisk_featurepark_parkedplay"
+msgid "Play courtesy tone to"
 msgstr ""
 
 #. Enable Parking
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:56
-msgid "asterisk_featurepark_parkenabled"
+msgid "Enable Parking"
 msgstr ""
 
 #. Extension to dial to park
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:57
-msgid "asterisk_featurepark_parkext"
+msgid "Extension to dial to park"
 msgstr ""
 
 #. Parking time (secs)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:58
-msgid "asterisk_featurepark_parkingtime"
+msgid "Parking time (secs)"
 msgstr ""
 
 #. Range of extensions for call parking
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:59
-msgid "asterisk_featurepark_parkpos"
+msgid "Range of extensions for call parking"
 msgstr ""
 
 #. Pickup extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:60
-msgid "asterisk_featurepark_pickupexten"
+msgid "Pickup extension"
 msgstr ""
 
 #. Seconds to wait bewteen digits when transferring
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:61
-msgid "asterisk_featurepark_transferdigittimeout"
+msgid "Seconds to wait bewteen digits when transferring"
 msgstr ""
 
 #. sound when attended transfer is complete
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:62
-msgid "asterisk_featurepark_xferfailsound"
+msgid "sound when attended transfer is complete"
 msgstr ""
 
 #. Sound when attended transfer fails
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:63
-msgid "asterisk_featurepark_xfersound"
+msgid "Sound when attended transfer fails"
 msgstr ""
 
 #. Reload Hardware Config
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:64
-msgid "asterisk_hardwarereboot"
+msgid "Reload Hardware Config"
 msgstr ""
 
 #. Reboot Method
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:65
-msgid "asterisk_hardwarereboot_method"
+msgid "Reboot Method"
 msgstr ""
 
 #. Parameter
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:66
-msgid "asterisk_hardwarereboot_param"
+msgid "Parameter"
 msgstr ""
 
 #. SIP Connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:67
-msgid "asterisk_iax"
+msgid "SIP Connection"
 msgstr ""
 
 #. Always Dial International
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:68
-msgid "asterisk_iax_alwaysinternational"
+msgid "Always Dial International"
 msgstr ""
 
 #. context
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:69
-msgid "asterisk_iax_context"
+msgid "context"
 msgstr ""
 
 #. Country Code for connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:70
-msgid "asterisk_iax_countrycode"
+msgid "Country Code for connection"
 msgstr ""
 
 #. Add as Extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:71
-msgid "asterisk_iax_extension"
+msgid "Add as Extension"
 msgstr ""
 
 #. Host name (or blank)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:72
-msgid "asterisk_iax_host"
+msgid "Host name (or blank)"
 msgstr ""
 
 #. International Dial Prefix
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:73
-msgid "asterisk_iax_internationalprefix"
+msgid "International Dial Prefix"
 msgstr ""
 
 #. Dial Prefix (for external line)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:74
-msgid "asterisk_iax_prefix"
+msgid "Dial Prefix (for external line)"
 msgstr ""
 
 #. Secret
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:75
-msgid "asterisk_iax_secret"
+msgid "Secret"
 msgstr ""
 
 #. Dial Timeout (sec)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:76
-msgid "asterisk_iax_timeout"
+msgid "Dial Timeout (sec)"
 msgstr ""
 
 #. Option type
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:77
-msgid "asterisk_iax_type"
+msgid "Option type"
 msgstr ""
 
 #. User name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:78
-msgid "asterisk_iax_username"
+msgid "User name"
 msgstr ""
 
 #. IAX General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:79
-msgid "asterisk_iaxgeneral"
+msgid "IAX General Options"
 msgstr ""
 
 #. Allow Codecs
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:80
-msgid "asterisk_iaxgeneral_allow"
+msgid "Allow Codecs"
 msgstr ""
 
 #. Reinvite/redirect media connections
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:81
-msgid "asterisk_iaxgeneral_canreinvite"
+msgid "Reinvite/redirect media connections"
 msgstr ""
 
 #. Static
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:82
-msgid "asterisk_iaxgeneral_static"
+msgid "Static"
 msgstr ""
 
 #. Write Protect
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:83
-msgid "asterisk_iaxgeneral_writeprotect"
+msgid "Write Protect"
 msgstr ""
 
 #. Meetme Conference
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:84
-msgid "asterisk_meetme"
+msgid "Meetme Conference"
 msgstr ""
 
 #. Admin PIN
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:85
-msgid "asterisk_meetme_adminpin"
+msgid "Admin PIN"
 msgstr ""
 
 #. Meeting PIN
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:86
-msgid "asterisk_meetme_pin"
+msgid "Meeting PIN"
 msgstr ""
 
 #. Meetme Conference General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:87
-msgid "asterisk_meetmegeneral"
+msgid "Meetme Conference General Options"
 msgstr ""
 
 #. Number of 20ms audio buffers to be used
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:88
-msgid "asterisk_meetmegeneral_audiobuffers"
+msgid "Number of 20ms audio buffers to be used"
 msgstr ""
 
 #. Modules
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:89
-msgid "asterisk_module"
+msgid "Modules"
 msgstr ""
 
 #. Alarm Receiver Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:90
-msgid "asterisk_module_appalarmreceiver"
+msgid "Alarm Receiver Application"
 msgstr ""
 
 #. Authentication Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:91
-msgid "asterisk_module_appauthenticate"
+msgid "Authentication Application"
 msgstr ""
 
 #. Make sure asterisk doesnt save CDR
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:92
-msgid "asterisk_module_appcdr"
+msgid "Make sure asterisk doesnt save CDR"
 msgstr ""
 
 #. Check if channel is available
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:93
-msgid "asterisk_module_appchanisavail"
+msgid "Check if channel is available"
 msgstr ""
 
 #. Listen in on any channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:94
-msgid "asterisk_module_appchanspy"
+msgid "Listen in on any channel"
 msgstr ""
 
 #. Control Playback Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:95
-msgid "asterisk_module_appcontrolplayback"
+msgid "Control Playback Application"
 msgstr ""
 
 #. Cuts up variables
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:96
-msgid "asterisk_module_appcut"
+msgid "Cuts up variables"
 msgstr ""
 
 #. Database access functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:97
-msgid "asterisk_module_appdb"
+msgid "Database access functions"
 msgstr ""
 
 #. Dialing Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:98
-msgid "asterisk_module_appdial"
+msgid "Dialing Application"
 msgstr ""
 
 #. Virtual Dictation Machine Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:99
-msgid "asterisk_module_appdictate"
+msgid "Virtual Dictation Machine Application"
 msgstr ""
 
 #. Directed Call Pickup Support
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:100
-msgid "asterisk_module_appdirectedpickup"
+msgid "Directed Call Pickup Support"
 msgstr ""
 
 #. Extension Directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:101
-msgid "asterisk_module_appdirectory"
+msgid "Extension Directory"
 msgstr ""
 
 #. DISA (Direct Inward System Access) Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:102
-msgid "asterisk_module_appdisa"
+msgid "DISA (Direct Inward System Access) Application"
 msgstr ""
 
 #. Dump channel variables Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:103
-msgid "asterisk_module_appdumpchan"
+msgid "Dump channel variables Application"
 msgstr ""
 
 #. Simple Echo Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:104
-msgid "asterisk_module_appecho"
+msgid "Simple Echo Application"
 msgstr ""
 
 #. ENUM Lookup
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:105
-msgid "asterisk_module_appenumlookup"
+msgid "ENUM Lookup"
 msgstr ""
 
 #. Reevaluates strings
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:106
-msgid "asterisk_module_appeval"
+msgid "Reevaluates strings"
 msgstr ""
 
 #. Executes applications
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:107
-msgid "asterisk_module_appexec"
+msgid "Executes applications"
 msgstr ""
 
 #. External IVR application interface
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:108
-msgid "asterisk_module_appexternalivr"
+msgid "External IVR application interface"
 msgstr ""
 
 #. Fork The CDR into 2 seperate entities
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:109
-msgid "asterisk_module_appforkcdr"
+msgid "Fork The CDR into 2 seperate entities"
 msgstr ""
 
 #. Get ADSI CPE ID
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:110
-msgid "asterisk_module_appgetcpeid"
+msgid "Get ADSI CPE ID"
 msgstr ""
 
 #. Group Management Routines
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:111
-msgid "asterisk_module_appgroupcount"
+msgid "Group Management Routines"
 msgstr ""
 
 #. Encode and Stream via icecast and ices
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:112
-msgid "asterisk_module_appices"
+msgid "Encode and Stream via icecast and ices"
 msgstr ""
 
 #. Image Transmission Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:113
-msgid "asterisk_module_appimage"
+msgid "Image Transmission Application"
 msgstr ""
 
 #. Look up Caller*ID name/number from black
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:114
-msgid "asterisk_module_applookupblacklist"
+msgid "Look up Caller*ID name/number from black"
 msgstr ""
 
 #. Look up CallerID Name from local databas
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:115
-msgid "asterisk_module_applookupcidname"
+msgid "Look up CallerID Name from local databas"
 msgstr ""
 
 #. Extension Macros
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:116
-msgid "asterisk_module_appmacro"
+msgid "Extension Macros"
 msgstr ""
 
 #. A simple math Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:117
-msgid "asterisk_module_appmath"
+msgid "A simple math Application"
 msgstr ""
 
 #. MD5 checksum Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:118
-msgid "asterisk_module_appmd5"
+msgid "MD5 checksum Application"
 msgstr ""
 
 #. Digital Milliwatt (mu-law) Test Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:119
-msgid "asterisk_module_appmilliwatt"
+msgid "Digital Milliwatt (mu-law) Test Application"
 msgstr ""
 
 #. Record a call and mix the audio during the recording
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:120
-msgid "asterisk_module_appmixmonitor"
+msgid "Record a call and mix the audio during the recording"
 msgstr ""
 
 #. Call Parking and Announce Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:121
-msgid "asterisk_module_appparkandannounce"
+msgid "Call Parking and Announce Application"
 msgstr ""
 
 #. Trivial Playback Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:122
-msgid "asterisk_module_appplayback"
+msgid "Trivial Playback Application"
 msgstr ""
 
 #. Require phone number to be entered
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:123
-msgid "asterisk_module_appprivacy"
+msgid "Require phone number to be entered"
 msgstr ""
 
 #. True Call Queueing
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:124
-msgid "asterisk_module_appqueue"
+msgid "True Call Queueing"
 msgstr ""
 
 #. Random goto
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:125
-msgid "asterisk_module_apprandom"
+msgid "Random goto"
 msgstr ""
 
 #. Read Variable Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:126
-msgid "asterisk_module_appread"
+msgid "Read Variable Application"
 msgstr ""
 
 #. Read in a file
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:127
-msgid "asterisk_module_appreadfile"
+msgid "Read in a file"
 msgstr ""
 
 #. Realtime Data Lookup/Rewrite
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:128
-msgid "asterisk_module_apprealtime"
+msgid "Realtime Data Lookup/Rewrite"
 msgstr ""
 
 #. Trivial Record Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:129
-msgid "asterisk_module_apprecord"
+msgid "Trivial Record Application"
 msgstr ""
 
 #. Say time
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:130
-msgid "asterisk_module_appsayunixtime"
+msgid "Say time"
 msgstr ""
 
 #. Send DTMF digits Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:131
-msgid "asterisk_module_appsenddtmf"
+msgid "Send DTMF digits Application"
 msgstr ""
 
 #. Send Text Applications
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:132
-msgid "asterisk_module_appsendtext"
+msgid "Send Text Applications"
 msgstr ""
 
 #. Set CallerID Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:133
-msgid "asterisk_module_appsetcallerid"
+msgid "Set CallerID Application"
 msgstr ""
 
 #. CDR user field apps
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:134
-msgid "asterisk_module_appsetcdruserfield"
+msgid "CDR user field apps"
 msgstr ""
 
 #. load =&gt; .so ; Set CallerID Name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:135
-msgid "asterisk_module_appsetcidname"
+msgid "load => .so ; Set CallerID Name"
 msgstr ""
 
 #. load =&gt; .so ; Set CallerID Number
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:136
-msgid "asterisk_module_appsetcidnum"
+msgid "load => .so ; Set CallerID Number"
 msgstr ""
 
 #. Set RDNIS Number
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:137
-msgid "asterisk_module_appsetrdnis"
+msgid "Set RDNIS Number"
 msgstr ""
 
 #. Set ISDN Transfer Capability
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:138
-msgid "asterisk_module_appsettransfercapability"
+msgid "Set ISDN Transfer Capability"
 msgstr ""
 
 #. SMS/PSTN handler
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:139
-msgid "asterisk_module_appsms"
+msgid "SMS/PSTN handler"
 msgstr ""
 
 #. Hangs up the requested channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:140
-msgid "asterisk_module_appsofthangup"
+msgid "Hangs up the requested channel"
 msgstr ""
 
 #. Stack Routines
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:141
-msgid "asterisk_module_appstack"
+msgid "Stack Routines"
 msgstr ""
 
 #. Generic System() application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:142
-msgid "asterisk_module_appsystem"
+msgid "Generic System() application"
 msgstr ""
 
 #. Playback with Talk Detection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:143
-msgid "asterisk_module_apptalkdetect"
+msgid "Playback with Talk Detection"
 msgstr ""
 
 #. Interface Test Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:144
-msgid "asterisk_module_apptest"
+msgid "Interface Test Application"
 msgstr ""
 
 #. Transfer
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:145
-msgid "asterisk_module_apptransfer"
+msgid "Transfer"
 msgstr ""
 
 #. TXTCIDName
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:146
-msgid "asterisk_module_apptxtcidname"
+msgid "TXTCIDName"
 msgstr ""
 
 #. Send URL Applications
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:147
-msgid "asterisk_module_appurl"
+msgid "Send URL Applications"
 msgstr ""
 
 #. Custom User Event Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:148
-msgid "asterisk_module_appuserevent"
+msgid "Custom User Event Application"
 msgstr ""
 
 #. Send verbose output
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:149
-msgid "asterisk_module_appverbose"
+msgid "Send verbose output"
 msgstr ""
 
 #. Voicemail
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:150
-msgid "asterisk_module_appvoicemail"
+msgid "Voicemail"
 msgstr ""
 
 #. Waits until first ring after time
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:151
-msgid "asterisk_module_appwaitforring"
+msgid "Waits until first ring after time"
 msgstr ""
 
 #. Wait For Silence Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:152
-msgid "asterisk_module_appwaitforsilence"
+msgid "Wait For Silence Application"
 msgstr ""
 
 #. While Loops and Conditional Execution
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:153
-msgid "asterisk_module_appwhile"
+msgid "While Loops and Conditional Execution"
 msgstr ""
 
 #. Comma Separated Values CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:154
-msgid "asterisk_module_cdrcsv"
+msgid "Comma Separated Values CDR Backend"
 msgstr ""
 
 #. Customizable Comma Separated Values CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:155
-msgid "asterisk_module_cdrcustom"
+msgid "Customizable Comma Separated Values CDR Backend"
 msgstr ""
 
 #. Asterisk Call Manager CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:156
-msgid "asterisk_module_cdrmanager"
+msgid "Asterisk Call Manager CDR Backend"
 msgstr ""
 
 #. MySQL CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:157
-msgid "asterisk_module_cdrmysql"
+msgid "MySQL CDR Backend"
 msgstr ""
 
 #. PostgreSQL CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:158
-msgid "asterisk_module_cdrpgsql"
+msgid "PostgreSQL CDR Backend"
 msgstr ""
 
 #. SQLite CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:159
-msgid "asterisk_module_cdrsqlite"
+msgid "SQLite CDR Backend"
 msgstr ""
 
 #. Agent Proxy Channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:160
-msgid "asterisk_module_chanagent"
+msgid "Agent Proxy Channel"
 msgstr ""
 
 #. Channel driver for GTalk
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:161
-msgid "asterisk_module_chanalsa"
+msgid "Channel driver for GTalk"
 msgstr ""
 
 #. Channel driver for GTalk
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:162
-msgid "asterisk_module_changtalk"
+msgid "Channel driver for GTalk"
 msgstr ""
 
 #. Option chan_iax2
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:163
-msgid "asterisk_module_chaniax2"
+msgid "Option chan_iax2"
 msgstr ""
 
 #. Local Proxy Channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:164
-msgid "asterisk_module_chanlocal"
+msgid "Local Proxy Channel"
 msgstr ""
 
 #. Session Initiation Protocol (SIP)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:165
-msgid "asterisk_module_chansip"
+msgid "Session Initiation Protocol (SIP)"
 msgstr ""
 
 #. Adaptive Differential PCM Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:166
-msgid "asterisk_module_codecadpcm"
+msgid "Adaptive Differential PCM Coder/Decoder"
 msgstr ""
 
 #. A-law Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:167
-msgid "asterisk_module_codecalaw"
+msgid "A-law Coder/Decoder"
 msgstr ""
 
 #. A-law and Mulaw direct Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:168
-msgid "asterisk_module_codecamu"
+msgid "A-law and Mulaw direct Coder/Decoder"
 msgstr ""
 
 #. ITU G.726-32kbps G726 Transcoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:169
-msgid "asterisk_module_codecg726"
+msgid "ITU G.726-32kbps G726 Transcoder"
 msgstr ""
 
 #. GSM/PCM16 (signed linear) Codec Translation
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:170
-msgid "asterisk_module_codecgsm"
+msgid "GSM/PCM16 (signed linear) Codec Translation"
 msgstr ""
 
 #. Speex/PCM16 (signed linear) Codec Translator
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:171
-msgid "asterisk_module_codecspeex"
+msgid "Speex/PCM16 (signed linear) Codec Translator"
 msgstr ""
 
 #. Mu-law Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:172
-msgid "asterisk_module_codeculaw"
+msgid "Mu-law Coder/Decoder"
 msgstr ""
 
 #. Sun Microsystems AU format (signed linear)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:173
-msgid "asterisk_module_formatau"
+msgid "Sun Microsystems AU format (signed linear)"
 msgstr ""
 
 #. G.723.1 Simple Timestamp File Format
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:174
-msgid "asterisk_module_formatg723"
+msgid "G.723.1 Simple Timestamp File Format"
 msgstr ""
 
 #. Raw G.726 (16/24/32/40kbps) data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:175
-msgid "asterisk_module_formatg726"
+msgid "Raw G.726 (16/24/32/40kbps) data"
 msgstr ""
 
 #. Raw G729 data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:176
-msgid "asterisk_module_formatg729"
+msgid "Raw G729 data"
 msgstr ""
 
 #. Raw GSM data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:177
-msgid "asterisk_module_formatgsm"
+msgid "Raw GSM data"
 msgstr ""
 
 #. Raw h263 data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:178
-msgid "asterisk_module_formath263"
+msgid "Raw h263 data"
 msgstr ""
 
 #. JPEG (Joint Picture Experts Group) Image
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:179
-msgid "asterisk_module_formatjpeg"
+msgid "JPEG (Joint Picture Experts Group) Image"
 msgstr ""
 
 #. Raw uLaw 8khz Audio support (PCM)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:180
-msgid "asterisk_module_formatpcm"
+msgid "Raw uLaw 8khz Audio support (PCM)"
 msgstr ""
 
 #. load =&gt; .so ; Raw aLaw 8khz PCM Audio support
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:181
-msgid "asterisk_module_formatpcmalaw"
+msgid "load => .so ; Raw aLaw 8khz PCM Audio support"
 msgstr ""
 
 #. Raw Signed Linear Audio support (SLN)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:182
-msgid "asterisk_module_formatsln"
+msgid "Raw Signed Linear Audio support (SLN)"
 msgstr ""
 
 #. Dialogic VOX (ADPCM) File Format
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:183
-msgid "asterisk_module_formatvox"
+msgid "Dialogic VOX (ADPCM) File Format"
 msgstr ""
 
 #. Microsoft WAV format (8000hz Signed Line
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:184
-msgid "asterisk_module_formatwav"
+msgid "Microsoft WAV format (8000hz Signed Line"
 msgstr ""
 
 #. Microsoft WAV format (Proprietary GSM)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:185
-msgid "asterisk_module_formatwavgsm"
+msgid "Microsoft WAV format (Proprietary GSM)"
 msgstr ""
 
 #. Caller ID related dialplan functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:186
-msgid "asterisk_module_funccallerid"
+msgid "Caller ID related dialplan functions"
 msgstr ""
 
 #. ENUM Functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:187
-msgid "asterisk_module_funcenum"
+msgid "ENUM Functions"
 msgstr ""
 
 #. URI encoding / decoding functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:188
-msgid "asterisk_module_funcuri"
+msgid "URI encoding / decoding functions"
 msgstr ""
 
 #. Asterisk Extension Language Compiler
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:189
-msgid "asterisk_module_pbxael"
+msgid "Asterisk Extension Language Compiler"
 msgstr ""
 
 #. Text Extension Configuration
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:190
-msgid "asterisk_module_pbxconfig"
+msgid "Text Extension Configuration"
 msgstr ""
 
 #. load =&gt; .so ; Builtin dialplan functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:191
-msgid "asterisk_module_pbxfunctions"
+msgid "load => .so ; Builtin dialplan functions"
 msgstr ""
 
 #. Loopback Switch
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:192
-msgid "asterisk_module_pbxloopback"
+msgid "Loopback Switch"
 msgstr ""
 
 #. Realtime Switch
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:193
-msgid "asterisk_module_pbxrealtime"
+msgid "Realtime Switch"
 msgstr ""
 
 #. Outgoing Spool Support
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:194
-msgid "asterisk_module_pbxspool"
+msgid "Outgoing Spool Support"
 msgstr ""
 
 #. Wil Cal U (Auto Dialer)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:195
-msgid "asterisk_module_pbxwilcalu"
+msgid "Wil Cal U (Auto Dialer)"
 msgstr ""
 
 #. MySQL Config Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:196
-msgid "asterisk_module_resconfigmysql"
+msgid "MySQL Config Resource"
 msgstr ""
 
 #. ODBC Config Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:197
-msgid "asterisk_module_resconfigodbc"
+msgid "ODBC Config Resource"
 msgstr ""
 
 #. PGSQL Module
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:198
-msgid "asterisk_module_resconfigpgsql"
+msgid "PGSQL Module"
 msgstr ""
 
 #. Cryptographic Digital Signatures
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:199
-msgid "asterisk_module_rescrypto"
+msgid "Cryptographic Digital Signatures"
 msgstr ""
 
 #. Call Parking Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:200
-msgid "asterisk_module_resfeatures"
+msgid "Call Parking Resource"
 msgstr ""
 
 #. Indications Configuration
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:201
-msgid "asterisk_module_resindications"
+msgid "Indications Configuration"
 msgstr ""
 
 #. Call Monitoring Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:202
-msgid "asterisk_module_resmonitor"
+msgid "Call Monitoring Resource"
 msgstr ""
 
 #. Music On Hold Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:203
-msgid "asterisk_module_resmusiconhold"
+msgid "Music On Hold Resource"
 msgstr ""
 
 #. ODBC Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:204
-msgid "asterisk_module_resodbc"
+msgid "ODBC Resource"
 msgstr ""
 
 #. SMDI Module
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:205
-msgid "asterisk_module_ressmdi"
+msgid "SMDI Module"
 msgstr ""
 
 #. SNMP Module
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:206
-msgid "asterisk_module_ressnmp"
+msgid "SNMP Module"
 msgstr ""
 
 #. Music On Hold
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:207
-msgid "asterisk_moh"
+msgid "Music On Hold"
 msgstr ""
 
 #. Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:208
-msgid "asterisk_moh_application"
+msgid "Application"
 msgstr ""
 
 #. Directory of Music
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:209
-msgid "asterisk_moh_directory"
+msgid "Directory of Music"
 msgstr ""
 
 #. Option mode
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:210
-msgid "asterisk_moh_mode"
+msgid "Option mode"
 msgstr ""
 
 #. Random Play
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:211
-msgid "asterisk_moh_random"
+msgid "Random Play"
 msgstr ""
 
 #. SIP Connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:212
-msgid "asterisk_sip"
+msgid "SIP Connection"
 msgstr ""
 
 #. Always Dial International
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:213
-msgid "asterisk_sip_alwaysinternational"
+msgid "Always Dial International"
 msgstr ""
 
 #. Reinvite/redirect media connections
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:214
-msgid "asterisk_sip_canreinvite"
+msgid "Reinvite/redirect media connections"
 msgstr ""
 
 #. context
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:215
-msgid "asterisk_sip_context"
+msgid "context"
 msgstr ""
 
 #. Country Code for connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:216
-msgid "asterisk_sip_countrycode"
+msgid "Country Code for connection"
 msgstr ""
 
 #. DTMF mode
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:217
-msgid "asterisk_sip_dtmfmode"
+msgid "DTMF mode"
 msgstr ""
 
 #. Add as Extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:218
-msgid "asterisk_sip_extension"
+msgid "Add as Extension"
 msgstr ""
 
 #. Primary domain identity for From: headers
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:219
-msgid "asterisk_sip_fromdomain"
+msgid "Primary domain identity for From: headers"
 msgstr ""
 
 #. From user (required by many SIP providers)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:220
-msgid "asterisk_sip_fromuser"
+msgid "From user (required by many SIP providers)"
 msgstr ""
 
 #. Host name (or blank)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:221
-msgid "asterisk_sip_host"
+msgid "Host name (or blank)"
 msgstr ""
 
 #. Ring on incoming dialplan contexts
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:222
-msgid "asterisk_sip_incoming"
+msgid "Ring on incoming dialplan contexts"
 msgstr ""
 
 #. Allow Insecure for
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:223
-msgid "asterisk_sip_insecure"
+msgid "Allow Insecure for"
 msgstr ""
 
 #. International Dial Prefix
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:224
-msgid "asterisk_sip_internationalprefix"
+msgid "International Dial Prefix"
 msgstr ""
 
 #. Mailbox for MWI
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:225
-msgid "asterisk_sip_mailbox"
+msgid "Mailbox for MWI"
 msgstr ""
 
 #. NAT between phone and Asterisk
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:226
-msgid "asterisk_sip_nat"
+msgid "NAT between phone and Asterisk"
 msgstr ""
 
 #. Check tags in headers
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:227
-msgid "asterisk_sip_pedantic"
+msgid "Check tags in headers"
 msgstr ""
 
 #. SIP Port
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:228
-msgid "asterisk_sip_port"
+msgid "SIP Port"
 msgstr ""
 
 #. Dial Prefix (for external line)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:229
-msgid "asterisk_sip_prefix"
+msgid "Dial Prefix (for external line)"
 msgstr ""
 
 #. Reply Timeout (ms) for down connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:230
-msgid "asterisk_sip_qualify"
+msgid "Reply Timeout (ms) for down connection"
 msgstr ""
 
 #. Register connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:231
-msgid "asterisk_sip_register"
+msgid "Register connection"
 msgstr ""
 
 #. Secret
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:232
-msgid "asterisk_sip_secret"
+msgid "Secret"
 msgstr ""
 
 #. Dial own extension for mailbox
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:233
-msgid "asterisk_sip_selfmailbox"
+msgid "Dial own extension for mailbox"
 msgstr ""
 
 #. Dial Timeout (sec)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:234
-msgid "asterisk_sip_timeout"
+msgid "Dial Timeout (sec)"
 msgstr ""
 
 #. Client Type
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:235
-msgid "asterisk_sip_type"
+msgid "Client Type"
 msgstr ""
 
 #. Username
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:236
-msgid "asterisk_sip_username"
+msgid "Username"
 msgstr ""
 
 #. Section sipgeneral
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:237
-msgid "asterisk_sipgeneral"
+msgid "Section sipgeneral"
 msgstr ""
 
 #. Allow codecs
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:238
-msgid "asterisk_sipgeneral_allow"
+msgid "Allow codecs"
 msgstr ""
 
 #. SIP Port
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:239
-msgid "asterisk_sipgeneral_port"
+msgid "SIP Port"
 msgstr ""
 
 #. SIP realm
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:240
-msgid "asterisk_sipgeneral_realm"
+msgid "SIP realm"
 msgstr ""
 
 #. Voicemail general options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:241
-msgid "asterisk_voicegeneral"
+msgid "Voicemail general options"
 msgstr ""
 
 #. From Email address of server
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:242
-msgid "asterisk_voicegeneral_serveremail"
+msgid "From Email address of server"
 msgstr ""
 
 #. Voice Mail boxes
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:243
-msgid "asterisk_voicemail"
+msgid "Voice Mail boxes"
 msgstr ""
 
 #. Email contains attachment
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:244
-msgid "asterisk_voicemail_attach"
+msgid "Email contains attachment"
 msgstr ""
 
 #. Email
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:245
-msgid "asterisk_voicemail_email"
+msgid "Email"
 msgstr ""
 
 #. Display Name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:246
-msgid "asterisk_voicemail_name"
+msgid "Display Name"
 msgstr ""
 
 #. Password
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:247
-msgid "asterisk_voicemail_password"
+msgid "Password"
 msgstr ""
 
 #. zone
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:248
-msgid "asterisk_voicemail_zone"
+msgid "zone"
 msgstr ""
 
 #. Voice Zone settings
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:249
-msgid "asterisk_voicezone"
+msgid "Voice Zone settings"
 msgstr ""
 
 #. Message Format
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:250
-msgid "asterisk_voicezone_message"
+msgid "Message Format"
 msgstr ""
 
 #. Time Zone
diff --git a/po/ja/cbi.po b/po/ja/cbi.po
index 04230ff0c..e6e3ad3e7 100644
--- a/po/ja/cbi.po
+++ b/po/ja/cbi.po
@@ -14,82 +14,82 @@ msgstr ""
 
 #. Add entry
 #: i18n/english/luasrc/i18n/cbi.en.lua:1
-msgid "cbi_add"
+msgid "Add"
 msgstr "エントリーの追加"
 
 #. Remove entry
 #: i18n/english/luasrc/i18n/cbi.en.lua:2
-msgid "cbi_del"
+msgid "Delete"
 msgstr "エントリーの削除"
 
 #. Replace entry
 #: i18n/english/luasrc/i18n/cbi.en.lua:3
-msgid "cbi_replace"
+msgid "Replace entry"
 msgstr "エントリーの置き換え"
 
 #. Invalid input value
 #: i18n/english/luasrc/i18n/cbi.en.lua:4
-msgid "cbi_invalid"
+msgid "Invalid"
 msgstr "入力値が不正です"
 
 #. <strong>Validation failed:</strong> Please check any input fields for mistakes.
 #: i18n/english/luasrc/i18n/cbi.en.lua:5
-msgid "cbi_invalid_section"
+msgid "<strong>Validation failed:</strong> Please check any input fields for mistakes."
 msgstr "<strong>検証に失敗しました:</strong> どこかの項目に間違いが無いか確認してください。"
 
 #. This field is mandatory
 #: i18n/english/luasrc/i18n/cbi.en.lua:6
-msgid "cbi_missing"
+msgid "This field is mandatory"
 msgstr "この項目は必須です"
 
 #. <strong>Validation failed:</strong> At least one mandatory field has no or an invalid value
 #: i18n/english/luasrc/i18n/cbi.en.lua:7
-msgid "cbi_deperror"
+msgid "<strong>Validation failed:</strong> At least one mandatory field has no or an invalid value"
 msgstr "<strong>検証に失敗しました:</strong> 必須の項目が無いか、不正な値です。"
 
 #. A requirement for this option was not met
 #: i18n/english/luasrc/i18n/cbi.en.lua:8
-msgid "cbi_reqerror"
+msgid "A requirement for this option was not met"
 msgstr "このオプションの為の要件を満たしていません。"
 
 #. -- Additional Field --
 #: i18n/english/luasrc/i18n/cbi.en.lua:9
-msgid "cbi_addopt"
+msgid "-- Additional Field --"
 msgstr "-- 追加項目 --"
 
 #.  (optional)
 #: i18n/english/luasrc/i18n/cbi.en.lua:10
-msgid "cbi_optional"
+msgid " (optional)"
 msgstr " (任意)"
 
 #. This section contains no values yet
 #: i18n/english/luasrc/i18n/cbi.en.lua:11
-msgid "cbi_sectempty"
+msgid "This section contains no values yet"
 msgstr "このセクションにはまだ値が含まれていません"
 
 #. -- custom --
 #: i18n/english/luasrc/i18n/cbi.en.lua:12
-msgid "cbi_manual"
+msgid "-- custom --"
 msgstr "-- カスタム --"
 
 #. -- Please choose --
 #: i18n/english/luasrc/i18n/cbi.en.lua:13
-msgid "cbi_select"
+msgid "-- Please choose --"
 msgstr "-- 選んでください --"
 
 #. Go to relevant configuration page
 #: i18n/english/luasrc/i18n/cbi.en.lua:14
-msgid "cbi_gorel"
+msgid " "
 msgstr "Go to relevant configuration page"
 
 #. Applying changes
 #: i18n/english/luasrc/i18n/cbi.en.lua:15
-msgid "cbi_applying"
+msgid "Applying changes"
 msgstr "変更を適用"
 
 #. Uploaded File
 #: i18n/english/luasrc/i18n/cbi.en.lua:16
-msgid "cbi_upload"
+msgid "Uploaded File"
 msgstr "アップロード完了"
 
 #. Search file...
diff --git a/po/ja/coovachilli.po b/po/ja/coovachilli.po
index f9e02ff30..dd6495d6f 100644
--- a/po/ja/coovachilli.po
+++ b/po/ja/coovachilli.po
@@ -14,882 +14,882 @@ msgstr ""
 
 #. CoovaChilli
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:1
-msgid "coovachilli"
+msgid "CoovaChilli"
 msgstr ""
 
 #. General configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:2
-msgid "coovachilli_general"
+msgid "General configuration"
 msgstr ""
 
 #. General CoovaChilli settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:3
-msgid "coovachilli_general_desc"
+msgid "General CoovaChilli settings"
 msgstr ""
 
 #. Command socket
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:4
-msgid "coovachilli_general_cmdsock"
+msgid "Command socket"
 msgstr ""
 
 #. UNIX socket used for communication with chilli_query
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:5
-msgid "coovachilli_general_cmdsock_desc"
+msgid "UNIX socket used for communication with chilli_query"
 msgstr ""
 
 #. Config refresh interval
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:6
-msgid "coovachilli_general_interval"
+msgid "Config refresh interval"
 msgstr ""
 
 #. Re-read configuration file and do DNS lookups every interval seconds. This has the same effect as sending the HUP signal. If interval is 0 (zero) this feature is disabled. 
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:7
-msgid "coovachilli_general_interval_desc"
+msgid "Re-read configuration file and do DNS lookups every interval seconds. This has the same effect as sending the HUP signal. If interval is 0 (zero) this feature is disabled. "
 msgstr ""
 
 #. Pid file
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:8
-msgid "coovachilli_general_pidfile"
+msgid "Pid file"
 msgstr ""
 
 #. Filename to put the process id
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:9
-msgid "coovachilli_general_pidfile_desc"
+msgid "Filename to put the process id"
 msgstr ""
 
 #. State directory
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:10
-msgid "coovachilli_general_statedir"
+msgid "State directory"
 msgstr ""
 
 #. Directory of non-volatile data
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:11
-msgid "coovachilli_general_statedir_desc"
+msgid "Directory of non-volatile data"
 msgstr ""
 
 #. TUN/TAP configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:12
-msgid "coovachilli_tun"
+msgid "TUN/TAP configuration"
 msgstr ""
 
 #. Network/Tun configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:13
-msgid "coovachilli_tun_desc"
+msgid "Network/Tun configuration"
 msgstr ""
 
 #. Network down script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:14
-msgid "coovachilli_tun_condown"
+msgid "Network down script"
 msgstr ""
 
 #. Script executed after a session has moved from authorized state to unauthorized
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:15
-msgid "coovachilli_tun_condown_desc"
+msgid "Script executed after a session has moved from authorized state to unauthorized"
 msgstr ""
 
 #. Network up script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:16
-msgid "coovachilli_tun_conup"
+msgid "Network up script"
 msgstr ""
 
 #. Script executed after the tun network interface has been brought up
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:17
-msgid "coovachilli_tun_conup_desc"
+msgid "Script executed after the tun network interface has been brought up"
 msgstr ""
 
 #. Primary DNS Server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:18
-msgid "coovachilli_tun_dns1"
+msgid "Primary DNS Server"
 msgstr ""
 
 #. Is used to inform the client about the DNS address to use for host name resolution
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:19
-msgid "coovachilli_tun_dns1_desc"
+msgid "Is used to inform the client about the DNS address to use for host name resolution"
 msgstr ""
 
 #. Secondary DNS Server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:20
-msgid "coovachilli_tun_dns2"
+msgid "Secondary DNS Server"
 msgstr ""
 
 #. Is used to inform the client about the DNS address to use for host name resolution
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:21
-msgid "coovachilli_tun_dns2_desc"
+msgid "Is used to inform the client about the DNS address to use for host name resolution"
 msgstr ""
 
 #. Domain name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:22
-msgid "coovachilli_tun_domain"
+msgid "Domain name"
 msgstr ""
 
 #. Is used to inform the client about the domain name to use for DNS lookups
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:23
-msgid "coovachilli_tun_domain_desc"
+msgid "Is used to inform the client about the domain name to use for DNS lookups"
 msgstr ""
 
 #. Dynamic IP address pool
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:24
-msgid "coovachilli_tun_dynip"
+msgid "Dynamic IP address pool"
 msgstr ""
 
 #. Specifies a pool of dynamic IP addresses
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:25
-msgid "coovachilli_tun_dynip_desc"
+msgid "Specifies a pool of dynamic IP addresses"
 msgstr ""
 
 #. IP down script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:26
-msgid "coovachilli_tun_ipdown"
+msgid "IP down script"
 msgstr ""
 
 #. Script executed after the tun network interface has been taken down
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:27
-msgid "coovachilli_tun_ipdown_desc"
+msgid "Script executed after the tun network interface has been taken down"
 msgstr ""
 
 #. IP up script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:28
-msgid "coovachilli_tun_ipup"
+msgid "IP up script"
 msgstr ""
 
 #. Script executed after the TUN/TAP network interface has been brought up
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:29
-msgid "coovachilli_tun_ipup_desc"
+msgid "Script executed after the TUN/TAP network interface has been brought up"
 msgstr ""
 
 #. Uplink subnet
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:30
-msgid "coovachilli_tun_net"
+msgid "Uplink subnet"
 msgstr ""
 
 #. Network address of the uplink interface (CIDR notation)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:31
-msgid "coovachilli_tun_net_desc"
+msgid "Network address of the uplink interface (CIDR notation)"
 msgstr ""
 
 #. Static IP address pool
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:32
-msgid "coovachilli_tun_statip"
+msgid "Static IP address pool"
 msgstr ""
 
 #. Specifies a pool of static IP addresses
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:33
-msgid "coovachilli_tun_statip_desc"
+msgid "Specifies a pool of static IP addresses"
 msgstr ""
 
 #. TUN/TAP device
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:34
-msgid "coovachilli_tun_tundev"
+msgid "TUN/TAP device"
 msgstr ""
 
 #. The specific device to use for the TUN/TAP interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:35
-msgid "coovachilli_tun_tundev_desc"
+msgid "The specific device to use for the TUN/TAP interface"
 msgstr ""
 
 #. TX queue length
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:36
-msgid "coovachilli_tun_txqlen"
+msgid "TX queue length"
 msgstr ""
 
 #. The TX queue length to set on the TUN/TAP interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:37
-msgid "coovachilli_tun_txqlen_desc"
+msgid "The TX queue length to set on the TUN/TAP interface"
 msgstr ""
 
 #. Use TAP device
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:38
-msgid "coovachilli_tun_usetap"
+msgid "Use TAP device"
 msgstr ""
 
 #. Use the TAP interface instead of TUN
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:39
-msgid "coovachilli_tun_usetap_desc"
+msgid "Use the TAP interface instead of TUN"
 msgstr ""
 
 #. DHCP configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:40
-msgid "coovachilli_dhcp"
+msgid "DHCP configuration"
 msgstr ""
 
 #. Set DHCP options for connecting clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:41
-msgid "coovachilli_dhcp_desc"
+msgid "Set DHCP options for connecting clients"
 msgstr ""
 
 #. DHCP end number
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:42
-msgid "coovachilli_dhcp_dhcpend"
+msgid "DHCP end number"
 msgstr ""
 
 #. Where to stop assigning IP addresses (default 254)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:43
-msgid "coovachilli_dhcp_dhcpend_desc"
+msgid "Where to stop assigning IP addresses (default 254)"
 msgstr ""
 
 #. DHCP interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:44
-msgid "coovachilli_dhcp_dhcpif"
+msgid "DHCP interface"
 msgstr ""
 
 #. Ethernet interface to listen to for the downlink interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:45
-msgid "coovachilli_dhcp_dhcpif_desc"
+msgid "Ethernet interface to listen to for the downlink interface"
 msgstr ""
 
 #. Listen MAC address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:46
-msgid "coovachilli_dhcp_dhcpmac"
+msgid "Listen MAC address"
 msgstr ""
 
 #. MAC address to listen to. If not specified the MAC address of the interface will be used
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:47
-msgid "coovachilli_dhcp_dhcpmac_desc"
+msgid "MAC address to listen to. If not specified the MAC address of the interface will be used"
 msgstr ""
 
 #. DHCP start number
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:48
-msgid "coovachilli_dhcp_dhcpstart"
+msgid "DHCP start number"
 msgstr ""
 
 #. Where to start assigning IP addresses (default 10)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:49
-msgid "coovachilli_dhcp_dhcpstart_desc"
+msgid "Where to start assigning IP addresses (default 10)"
 msgstr ""
 
 #. Enable IEEE 802.1x
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:50
-msgid "coovachilli_dhcp_eapolenable"
+msgid "Enable IEEE 802.1x"
 msgstr ""
 
 #. Enable IEEE 802.1x authentication and listen for EAP requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:51
-msgid "coovachilli_dhcp_eapolenable_desc"
+msgid "Enable IEEE 802.1x authentication and listen for EAP requests"
 msgstr ""
 
 #. Leasetime
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:52
-msgid "coovachilli_dhcp_lease"
+msgid "Leasetime"
 msgstr ""
 
 #. Use a DHCP lease of seconds (default 600)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:53
-msgid "coovachilli_dhcp_lease_desc"
+msgid "Use a DHCP lease of seconds (default 600)"
 msgstr ""
 
 #. RADIUS configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:54
-msgid "coovachilli_radius"
+msgid "RADIUS configuration"
 msgstr ""
 
 #. RADIUS configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:55
-msgid "coovachilli_radius_desc"
+msgid "RADIUS configuration"
 msgstr ""
 
 #. Allow session update through RADIUS
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:56
-msgid "coovachilli_radius_acctupdate"
+msgid "Allow session update through RADIUS"
 msgstr ""
 
 #. Allow updating of session parameters with RADIUS attributes sent in Accounting-Response
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:57
-msgid "coovachilli_radius_acctupdate_desc"
+msgid "Allow updating of session parameters with RADIUS attributes sent in Accounting-Response"
 msgstr ""
 
 #. Admin password
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:58
-msgid "coovachilli_radius_adminpasswd"
+msgid "Admin password"
 msgstr ""
 
 #. Password to use for Administrative-User authentication in order to pick up chilli configurations and establish a device &quot;system&quot; session
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:59
-msgid "coovachilli_radius_adminpasswd_desc"
+msgid "Password to use for Administrative-User authentication in order to pick up chilli configurations and establish a device \"system\" session"
 msgstr ""
 
 #. Admin user
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:60
-msgid "coovachilli_radius_adminuser"
+msgid "Admin user"
 msgstr ""
 
 #. User-name to use for Administrative-User authentication in order to pick up chilli configurations and establish a device &quot;system&quot; session
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:61
-msgid "coovachilli_radius_adminuser_desc"
+msgid "User-name to use for Administrative-User authentication in order to pick up chilli configurations and establish a device \"system\" session"
 msgstr ""
 
 #. Do not check disconnection requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:62
-msgid "coovachilli_radius_coanoipcheck"
+msgid "Do not check disconnection requests"
 msgstr ""
 
 #. Do not check the source IP address of radius disconnect requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:63
-msgid "coovachilli_radius_coanoipcheck_desc"
+msgid "Do not check the source IP address of radius disconnect requests"
 msgstr ""
 
 #. RADIUS disconnect port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:64
-msgid "coovachilli_radius_coaport"
+msgid "RADIUS disconnect port"
 msgstr ""
 
 #. UDP port to listen to for accepting radius disconnect requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:65
-msgid "coovachilli_radius_coaport_desc"
+msgid "UDP port to listen to for accepting radius disconnect requests"
 msgstr ""
 
 #. NAS IP
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:66
-msgid "coovachilli_radius_nasip"
+msgid "NAS IP"
 msgstr ""
 
 #. Value to use in RADIUS NAS-IP-Address attribute
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:67
-msgid "coovachilli_radius_nasip_desc"
+msgid "Value to use in RADIUS NAS-IP-Address attribute"
 msgstr ""
 
 #. NAS MAC
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:68
-msgid "coovachilli_radius_nasmac"
+msgid "NAS MAC"
 msgstr ""
 
 #. MAC address value to use in RADIUS Called-Station-ID attribute
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:69
-msgid "coovachilli_radius_nasmac_desc"
+msgid "MAC address value to use in RADIUS Called-Station-ID attribute"
 msgstr ""
 
 #. Allow OpenID authentication
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:70
-msgid "coovachilli_radius_openidauth"
+msgid "Allow OpenID authentication"
 msgstr ""
 
 #. Allows OpenID authentication by sending ChilliSpot-Config=allow-openidauth in RADIUS Access-Requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:71
-msgid "coovachilli_radius_openidauth_desc"
+msgid "Allows OpenID authentication by sending ChilliSpot-Config=allow-openidauth in RADIUS Access-Requests"
 msgstr ""
 
 #. RADIUS accounting port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:72
-msgid "coovachilli_radius_radiusacctport"
+msgid "RADIUS accounting port"
 msgstr ""
 
 #. The UDP port number to use for radius accounting requests (default 1813)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:73
-msgid "coovachilli_radius_radiusacctport_desc"
+msgid "The UDP port number to use for radius accounting requests (default 1813)"
 msgstr ""
 
 #. RADIUS authentication port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:74
-msgid "coovachilli_radius_radiusauthport"
+msgid "RADIUS authentication port"
 msgstr ""
 
 #. The UDP port number to use for radius authentication requests (default 1812)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:75
-msgid "coovachilli_radius_radiusauthport_desc"
+msgid "The UDP port number to use for radius authentication requests (default 1812)"
 msgstr ""
 
 #. Option radiuscalled
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:76
-msgid "coovachilli_radius_radiuscalled"
+msgid "Option radiuscalled"
 msgstr ""
 
 #. RADIUS listen address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:77
-msgid "coovachilli_radius_radiuslisten"
+msgid "RADIUS listen address"
 msgstr ""
 
 #. Local interface IP address to use for the radius interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:78
-msgid "coovachilli_radius_radiuslisten_desc"
+msgid "Local interface IP address to use for the radius interface"
 msgstr ""
 
 #. RADIUS location ID
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:79
-msgid "coovachilli_radius_radiuslocationid"
+msgid "RADIUS location ID"
 msgstr ""
 
 #. WISPr Location ID
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:80
-msgid "coovachilli_radius_radiuslocationid_desc"
+msgid "WISPr Location ID"
 msgstr ""
 
 #. RADIUS location name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:81
-msgid "coovachilli_radius_radiuslocationname"
+msgid "RADIUS location name"
 msgstr ""
 
 #. WISPr Location Name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:82
-msgid "coovachilli_radius_radiuslocationname_desc"
+msgid "WISPr Location Name"
 msgstr ""
 
 #. NAS ID
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:83
-msgid "coovachilli_radius_radiusnasid"
+msgid "NAS ID"
 msgstr ""
 
 #. Network access server identifier
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:84
-msgid "coovachilli_radius_radiusnasid_desc"
+msgid "Network access server identifier"
 msgstr ""
 
 #. Option radiusnasip
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:85
-msgid "coovachilli_radius_radiusnasip"
+msgid "Option radiusnasip"
 msgstr ""
 
 #. NAS port type
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:86
-msgid "coovachilli_radius_radiusnasporttype"
+msgid "NAS port type"
 msgstr ""
 
 #. Value of NAS-Port-Type attribute. Defaults to 19 (Wireless-IEEE-802.11)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:87
-msgid "coovachilli_radius_radiusnasporttype_desc"
+msgid "Value of NAS-Port-Type attribute. Defaults to 19 (Wireless-IEEE-802.11)"
 msgstr ""
 
 #. Send RADIUS VSA
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:88
-msgid "coovachilli_radius_radiusoriginalurl"
+msgid "Send RADIUS VSA"
 msgstr ""
 
 #. Send the ChilliSpot-OriginalURL RADIUS VSA in Access-Request
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:89
-msgid "coovachilli_radius_radiusoriginalurl_desc"
+msgid "Send the ChilliSpot-OriginalURL RADIUS VSA in Access-Request"
 msgstr ""
 
 #. RADIUS secret
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:90
-msgid "coovachilli_radius_radiussecret"
+msgid "RADIUS secret"
 msgstr ""
 
 #. Radius shared secret for both servers
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:91
-msgid "coovachilli_radius_radiussecret_desc"
+msgid "Radius shared secret for both servers"
 msgstr ""
 
 #. RADIUS server 1
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:92
-msgid "coovachilli_radius_radiusserver1"
+msgid "RADIUS server 1"
 msgstr ""
 
 #. The IP address of radius server 1
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:93
-msgid "coovachilli_radius_radiusserver1_desc"
+msgid "The IP address of radius server 1"
 msgstr ""
 
 #. RADIUS server 2
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:94
-msgid "coovachilli_radius_radiusserver2"
+msgid "RADIUS server 2"
 msgstr ""
 
 #. The IP address of radius server 2
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:95
-msgid "coovachilli_radius_radiusserver2_desc"
+msgid "The IP address of radius server 2"
 msgstr ""
 
 #. Swap octets
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:96
-msgid "coovachilli_radius_swapoctets"
+msgid "Swap octets"
 msgstr ""
 
 #. Swap the meaning of &quot;input octets&quot; and &quot;output octets&quot; as it related to RADIUS attribtues
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:97
-msgid "coovachilli_radius_swapoctets_desc"
+msgid "Swap the meaning of \"input octets\" and \"output octets\" as it related to RADIUS attribtues"
 msgstr ""
 
 #. Allow WPA guests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:98
-msgid "coovachilli_radius_wpaguests"
+msgid "Allow WPA guests"
 msgstr ""
 
 #. Allows WPA Guest authentication by sending ChilliSpot-Config=allow-wpa-guests in RADIUS Access-Requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:99
-msgid "coovachilli_radius_wpaguests_desc"
+msgid "Allows WPA Guest authentication by sending ChilliSpot-Config=allow-wpa-guests in RADIUS Access-Requests"
 msgstr ""
 
 #. RADIUS proxy settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:100
-msgid "coovachilli_proxy"
+msgid "RADIUS proxy settings"
 msgstr ""
 
 #. RADIUS proxy settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:101
-msgid "coovachilli_proxy_desc"
+msgid "RADIUS proxy settings"
 msgstr ""
 
 #. Proxy client
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:102
-msgid "coovachilli_proxy_proxyclient"
+msgid "Proxy client"
 msgstr ""
 
 #. IP address from which radius requests are accepted. If omitted the server will not accept radius requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:103
-msgid "coovachilli_proxy_proxyclient_desc"
+msgid "IP address from which radius requests are accepted. If omitted the server will not accept radius requests"
 msgstr ""
 
 #. Proxy listen address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:104
-msgid "coovachilli_proxy_proxylisten"
+msgid "Proxy listen address"
 msgstr ""
 
 #. Local interface IP address to use for accepting radius requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:105
-msgid "coovachilli_proxy_proxylisten_desc"
+msgid "Local interface IP address to use for accepting radius requests"
 msgstr ""
 
 #. Proxy port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:106
-msgid "coovachilli_proxy_proxyport"
+msgid "Proxy port"
 msgstr ""
 
 #. UDP Port to listen to for accepting radius requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:107
-msgid "coovachilli_proxy_proxyport_desc"
+msgid "UDP Port to listen to for accepting radius requests"
 msgstr ""
 
 #. Proxy secret
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:108
-msgid "coovachilli_proxy_proxysecret"
+msgid "Proxy secret"
 msgstr ""
 
 #. Radius shared secret for clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:109
-msgid "coovachilli_proxy_proxysecret_desc"
+msgid "Radius shared secret for clients"
 msgstr ""
 
 #. UAM configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:110
-msgid "coovachilli_uam"
+msgid "UAM configuration"
 msgstr ""
 
 #. Unified Configuration Method settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:111
-msgid "coovachilli_uam_desc"
+msgid "Unified Configuration Method settings"
 msgstr ""
 
 #. Use Chilli XML
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:112
-msgid "coovachilli_uam_chillixml"
+msgid "Use Chilli XML"
 msgstr ""
 
 #. Return the so-called Chilli XML along with WISPr XML
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:113
-msgid "coovachilli_uam_chillixml_desc"
+msgid "Return the so-called Chilli XML along with WISPr XML"
 msgstr ""
 
 #. Default idle timeout
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:114
-msgid "coovachilli_uam_defidletimeout"
+msgid "Default idle timeout"
 msgstr ""
 
 #. Default idle timeout unless otherwise set by RADIUS (defaults to 0)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:115
-msgid "coovachilli_uam_defidletimeout_desc"
+msgid "Default idle timeout unless otherwise set by RADIUS (defaults to 0)"
 msgstr ""
 
 #. Default interim interval
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:116
-msgid "coovachilli_uam_definteriminterval"
+msgid "Default interim interval"
 msgstr ""
 
 #. Default interim-interval for RADIUS accounting unless otherwise set by RADIUS (defaults to 0)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:117
-msgid "coovachilli_uam_definteriminterval_desc"
+msgid "Default interim-interval for RADIUS accounting unless otherwise set by RADIUS (defaults to 0)"
 msgstr ""
 
 #. Default session timeout
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:118
-msgid "coovachilli_uam_defsessiontimeout"
+msgid "Default session timeout"
 msgstr ""
 
 #. Default session timeout unless otherwise set by RADIUS (defaults to 0)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:119
-msgid "coovachilli_uam_defsessiontimeout_desc"
+msgid "Default session timeout unless otherwise set by RADIUS (defaults to 0)"
 msgstr ""
 
 #. Inspect DNS traffic
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:120
-msgid "coovachilli_uam_dnsparanoia"
+msgid "Inspect DNS traffic"
 msgstr ""
 
 #. Inspect DNS packets and drop responses with any non- A, CNAME, SOA, or MX records to prevent dns tunnels (experimental)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:121
-msgid "coovachilli_uam_dnsparanoia_desc"
+msgid "Inspect DNS packets and drop responses with any non- A, CNAME, SOA, or MX records to prevent dns tunnels (experimental)"
 msgstr ""
 
 #. Local users file
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:122
-msgid "coovachilli_uam_localusers"
+msgid "Local users file"
 msgstr ""
 
 #. A colon seperated file containing usernames and passwords of locally authenticated users
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:123
-msgid "coovachilli_uam_localusers_desc"
+msgid "A colon seperated file containing usernames and passwords of locally authenticated users"
 msgstr ""
 
 #. Location name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:124
-msgid "coovachilli_uam_locationname"
+msgid "Location name"
 msgstr ""
 
 #. Human readable location name used in JSON interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:125
-msgid "coovachilli_uam_locationname_desc"
+msgid "Human readable location name used in JSON interface"
 msgstr ""
 
 #. Do not redirect to UAM server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:126
-msgid "coovachilli_uam_nouamsuccess"
+msgid "Do not redirect to UAM server"
 msgstr ""
 
 #. Do not return to UAM server on login success, just redirect to original URL
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:127
-msgid "coovachilli_uam_nouamsuccess_desc"
+msgid "Do not return to UAM server on login success, just redirect to original URL"
 msgstr ""
 
 #. Do not do WISPr
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:128
-msgid "coovachilli_uam_nouamwispr"
+msgid "Do not do WISPr"
 msgstr ""
 
 #. Do not do any WISPr XML, assume the back-end is doing this instead
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:129
-msgid "coovachilli_uam_nouamwispr_desc"
+msgid "Do not do any WISPr XML, assume the back-end is doing this instead"
 msgstr ""
 
 #. Post auth proxy
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:130
-msgid "coovachilli_uam_postauthproxy"
+msgid "Post auth proxy"
 msgstr ""
 
 #. Used with postauthproxyport to define a post authentication HTTP proxy server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:131
-msgid "coovachilli_uam_postauthproxy_desc"
+msgid "Used with postauthproxyport to define a post authentication HTTP proxy server"
 msgstr ""
 
 #. Post auth proxy port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:132
-msgid "coovachilli_uam_postauthproxyport"
+msgid "Post auth proxy port"
 msgstr ""
 
 #. Used with postauthproxy to define a post authentication HTTP proxy server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:133
-msgid "coovachilli_uam_postauthproxyport_desc"
+msgid "Used with postauthproxy to define a post authentication HTTP proxy server"
 msgstr ""
 
 #. Allowed resources
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:134
-msgid "coovachilli_uam_uamallowed"
+msgid "Allowed resources"
 msgstr ""
 
 #. List of resources the client can access without first authenticating
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:135
-msgid "coovachilli_uam_uamallowed_desc"
+msgid "List of resources the client can access without first authenticating"
 msgstr ""
 
 #. Allow any DNS server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:136
-msgid "coovachilli_uam_uamanydns"
+msgid "Allow any DNS server"
 msgstr ""
 
 #. Allow any DNS server for unauthenticated clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:137
-msgid "coovachilli_uam_uamanydns_desc"
+msgid "Allow any DNS server for unauthenticated clients"
 msgstr ""
 
 #. Allow any IP address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:138
-msgid "coovachilli_uam_uamanyip"
+msgid "Allow any IP address"
 msgstr ""
 
 #. Allow clients to use any IP settings they wish by spoofing ARP (experimental)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:139
-msgid "coovachilli_uam_uamanyip_desc"
+msgid "Allow clients to use any IP settings they wish by spoofing ARP (experimental)"
 msgstr ""
 
 #. Allowed domains
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:140
-msgid "coovachilli_uam_uamdomain"
+msgid "Allowed domains"
 msgstr ""
 
 #. Defines a list of domain names to automatically add to the walled garden
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:141
-msgid "coovachilli_uam_uamdomain_desc"
+msgid "Defines a list of domain names to automatically add to the walled garden"
 msgstr ""
 
 #. UAM homepage
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:142
-msgid "coovachilli_uam_uamhomepage"
+msgid "UAM homepage"
 msgstr ""
 
 #. URL of homepage to redirect unauthenticated users to
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:143
-msgid "coovachilli_uam_uamhomepage_desc"
+msgid "URL of homepage to redirect unauthenticated users to"
 msgstr ""
 
 #. UAM static content port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:144
-msgid "coovachilli_uam_uamiport"
+msgid "UAM static content port"
 msgstr ""
 
 #. TCP port to bind to for only serving embedded content
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:145
-msgid "coovachilli_uam_uamiport_desc"
+msgid "TCP port to bind to for only serving embedded content"
 msgstr ""
 
 #. UAM listening address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:146
-msgid "coovachilli_uam_uamlisten"
+msgid "UAM listening address"
 msgstr ""
 
 #. IP address to listen to for authentication of clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:147
-msgid "coovachilli_uam_uamlisten_desc"
+msgid "IP address to listen to for authentication of clients"
 msgstr ""
 
 #. UAM logout IP
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:148
-msgid "coovachilli_uam_uamlogoutip"
+msgid "UAM logout IP"
 msgstr ""
 
 #. Use this IP address to instantly logout a client accessing it (defaults to 1.1.1.1)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:149
-msgid "coovachilli_uam_uamlogoutip_desc"
+msgid "Use this IP address to instantly logout a client accessing it (defaults to 1.1.1.1)"
 msgstr ""
 
 #. UAM listening port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:150
-msgid "coovachilli_uam_uamport"
+msgid "UAM listening port"
 msgstr ""
 
 #. TCP port to bind to for authenticating clients (default 3990)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:151
-msgid "coovachilli_uam_uamport_desc"
+msgid "TCP port to bind to for authenticating clients (default 3990)"
 msgstr ""
 
 #. UAM secret
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:152
-msgid "coovachilli_uam_uamsecret"
+msgid "UAM secret"
 msgstr ""
 
 #. Shared secret between uamserver and chilli
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:153
-msgid "coovachilli_uam_uamsecret_desc"
+msgid "Shared secret between uamserver and chilli"
 msgstr ""
 
 #. UAM server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:154
-msgid "coovachilli_uam_uamserver"
+msgid "UAM server"
 msgstr ""
 
 #. URL of web server to use for authenticating clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:155
-msgid "coovachilli_uam_uamserver_desc"
+msgid "URL of web server to use for authenticating clients"
 msgstr ""
 
 #. UAM user interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:156
-msgid "coovachilli_uam_uamui"
+msgid "UAM user interface"
 msgstr ""
 
 #. An init.d style program to handle local content on the uamuiport web server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:157
-msgid "coovachilli_uam_uamui_desc"
+msgid "An init.d style program to handle local content on the uamuiport web server"
 msgstr ""
 
 #. Use status file
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:158
-msgid "coovachilli_uam_usestatusfile"
+msgid "Use status file"
 msgstr ""
 
 #. Write the status of clients in a non-volatile state file (experimental)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:159
-msgid "coovachilli_uam_usestatusfile_desc"
+msgid "Write the status of clients in a non-volatile state file (experimental)"
 msgstr ""
 
 #. WISPr login url
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:160
-msgid "coovachilli_uam_wisprlogin"
+msgid "WISPr login url"
 msgstr ""
 
 #. Specific URL to be given in WISPr XML LoginURL
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:161
-msgid "coovachilli_uam_wisprlogin_desc"
+msgid "Specific URL to be given in WISPr XML LoginURL"
 msgstr ""
 
 #. CGI program
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:162
-msgid "coovachilli_uam_wwwbin"
+msgid "CGI program"
 msgstr ""
 
 #. Executable to run as a CGI type program (like haserl) for URLs with extention .chi
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:163
-msgid "coovachilli_uam_wwwbin_desc"
+msgid "Executable to run as a CGI type program (like haserl) for URLs with extention .chi"
 msgstr ""
 
 #. Web content directory
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:164
-msgid "coovachilli_uam_wwwdir"
+msgid "Web content directory"
 msgstr ""
 
 #. Directory where embedded local web content is placed
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:165
-msgid "coovachilli_uam_wwwdir_desc"
+msgid "Directory where embedded local web content is placed"
 msgstr ""
 
 #. MAC configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:166
-msgid "coovachilli_macauth"
+msgid "MAC configuration"
 msgstr ""
 
 #. Configure MAC authentication
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:167
-msgid "coovachilli_macauth_desc"
+msgid "Configure MAC authentication"
 msgstr ""
 
 #. Allowed MAC addresses
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:168
-msgid "coovachilli_macauth_macallowed"
+msgid "Allowed MAC addresses"
 msgstr ""
 
 #. List of MAC addresses for which MAC authentication will be performed
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:169
-msgid "coovachilli_macauth_macallowed_desc"
+msgid "List of MAC addresses for which MAC authentication will be performed"
 msgstr ""
 
 #. Authenticate locally allowed MACs
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:170
-msgid "coovachilli_macauth_macallowlocal"
+msgid "Authenticate locally allowed MACs"
 msgstr ""
 
 #. Authenticate allowed MAC addresses without the use of RADIUS
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:171
-msgid "coovachilli_macauth_macallowlocal_desc"
+msgid "Authenticate allowed MAC addresses without the use of RADIUS"
 msgstr ""
 
 #. Enable MAC authentification
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:172
-msgid "coovachilli_macauth_macauth"
+msgid "Enable MAC authentification"
 msgstr ""
 
 #. Try to authenticate all users based on their mac address alone
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:173
-msgid "coovachilli_macauth_macauth_desc"
+msgid "Try to authenticate all users based on their mac address alone"
 msgstr ""
 
 #. Password
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:174
-msgid "coovachilli_macauth_macpasswd"
+msgid "Password"
 msgstr ""
 
 #. Password used when performing MAC authentication
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:175
-msgid "coovachilli_macauth_macpasswd_desc"
+msgid "Password used when performing MAC authentication"
 msgstr ""
 
 #. Suffix
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:176
-msgid "coovachilli_macauth_macsuffix"
+msgid "Suffix"
 msgstr ""
 
 #. Suffix to add to the MAC address in order to form the User-Name, which is sent to the radius server
diff --git a/po/ja/ddns.po b/po/ja/ddns.po
index 0162fa695..e4ef3baf5 100644
--- a/po/ja/ddns.po
+++ b/po/ja/ddns.po
@@ -14,37 +14,37 @@ msgstr ""
 
 #. Dynamic DNS
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:1
-msgid "ddns"
+msgid "Dynamic DNS"
 msgstr ""
 
 #. Dynamic DNS allows that your router can be reached with a fixed hostname while having a dynamically changing IP-Address.
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:2
-msgid "ddns_desc"
+msgid "Dynamic DNS allows that your router can be reached with a fixed hostname while having a dynamically changing IP-Address."
 msgstr ""
 
 #. Source of IP-Address
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:3
-msgid "ddns_service_ipsource"
+msgid "Source of IP-Address"
 msgstr ""
 
 #. Check for changed IP every
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:4
-msgid "ddns_service_checkinterval"
+msgid "Check for changed IP every"
 msgstr ""
 
 #. Check-Time unit
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:5
-msgid "ddns_service_checkunit"
+msgid "Check-Time unit"
 msgstr ""
 
 #. Force update every
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:6
-msgid "ddns_service_forceinterval"
+msgid "Force update every"
 msgstr ""
 
 #. Force-Time unit
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:7
-msgid "ddns_service_forceunit"
+msgid "Force-Time unit"
 msgstr ""
 
 #. Custom Update-URL
diff --git a/po/ja/default.po b/po/ja/default.po
index 569f690b3..310bdedce 100644
--- a/po/ja/default.po
+++ b/po/ja/default.po
@@ -14,37 +14,37 @@ msgstr ""
 
 #. Skip to navigation
 #: i18n/english/luasrc/i18n/default.en.lua:1
-msgid "skiplink1"
+msgid "Skip to navigation"
 msgstr "Skip to navigation"
 
 #. Skip to content
 #: i18n/english/luasrc/i18n/default.en.lua:2
-msgid "skiplink2"
+msgid "Skip to content"
 msgstr "Skip to content"
 
 #. Navigation
 #: i18n/english/luasrc/i18n/default.en.lua:3
-msgid "navigation"
+msgid "Navigation"
 msgstr "ナビゲーション"
 
 #. About
 #: i18n/english/luasrc/i18n/default.en.lua:4
-msgid "about"
+msgid "About"
 msgstr "About"
 
 #. Add
 #: i18n/english/luasrc/i18n/default.en.lua:5
-msgid "add"
+msgid "Add"
 msgstr "追加"
 
 #. Addresses
 #: i18n/english/luasrc/i18n/default.en.lua:6
-msgid "addresses"
+msgid "Addresses"
 msgstr "アドレス"
 
 #. Aliases
 #: i18n/english/luasrc/i18n/default.en.lua:7
-msgid "aliases"
+msgid "Aliases"
 msgstr "エイリアス"
 
 #. all
@@ -59,98 +59,98 @@ msgstr "戻る"
 
 #. Administration
 #: i18n/english/luasrc/i18n/default.en.lua:10
-msgid "administration"
+msgid "Administration"
 msgstr "応用設定"
 
 #. Essentials
 #: i18n/english/luasrc/i18n/default.en.lua:11
-msgid "essentials"
+msgid "Essentials"
 msgstr "簡易設定"
 
 #. Apply
 #: i18n/english/luasrc/i18n/default.en.lua:12
-msgid "apply"
+msgid "Apply"
 msgstr "適用"
 
 #. Basic Settings
 #: i18n/english/luasrc/i18n/default.en.lua:13
-msgid "basicsettings"
+msgid "Basic Settings"
 msgstr "簡易設定"
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast
 #: i18n/english/luasrc/i18n/default.en.lua:14
-msgid "broadcast"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"
 msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>ブロードキャスト"
 
 #. Cancel
 #: i18n/english/luasrc/i18n/default.en.lua:15
-msgid "cancel"
+msgid "Cancel"
 msgstr "Cancel"
 
 #. Changes
 #: i18n/english/luasrc/i18n/default.en.lua:16
-msgid "changes"
+msgid "Changes"
 msgstr "変更"
 
 #. Channel
 #: i18n/english/luasrc/i18n/default.en.lua:17
-msgid "channel"
+msgid "Channel"
 msgstr "チャンネル"
 
 #. <abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/prefix
 #: i18n/english/luasrc/i18n/default.en.lua:18
-msgid "cidr6"
+msgid "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/prefix"
 msgstr ""
 "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>表記: address/prefix"
 
 #. Code
 #: i18n/english/luasrc/i18n/default.en.lua:19
-msgid "code"
+msgid "Code"
 msgstr "コード"
 
 #. Configuration
 #: i18n/english/luasrc/i18n/default.en.lua:20
-msgid "config"
+msgid "Configuration"
 msgstr "設定"
 
 #. Configuration file
 #: i18n/english/luasrc/i18n/default.en.lua:21
-msgid "configfile"
+msgid "Configuration file"
 msgstr "設定ファイル"
 
 #. Confirmation
 #: i18n/english/luasrc/i18n/default.en.lua:22
-msgid "confirmation"
+msgid "Confirmation"
 msgstr "確認"
 
 #. Delete
 #: i18n/english/luasrc/i18n/default.en.lua:23
-msgid "delete"
+msgid "Delete"
 msgstr "削除"
 
 #. Description
 #: i18n/english/luasrc/i18n/default.en.lua:24
-msgid "descr"
+msgid "Description"
 msgstr "詳細"
 
 #. Design
 #: i18n/english/luasrc/i18n/default.en.lua:25
-msgid "design"
+msgid "Design"
 msgstr "デザイン"
 
 #. Destination
 #: i18n/english/luasrc/i18n/default.en.lua:26
-msgid "destination"
+msgid "Destination"
 msgstr "宛先"
 
 #. Device
 #: i18n/english/luasrc/i18n/default.en.lua:27
-msgid "device"
+msgid "Device"
 msgstr "デバイス"
 
 #. Devices
 #: i18n/english/luasrc/i18n/default.en.lua:28
-msgid "devices"
+msgid "Devices"
 msgstr "デバイス"
 
 #. disable
@@ -160,22 +160,22 @@ msgstr "無効"
 
 #. Distance
 #: i18n/english/luasrc/i18n/default.en.lua:30
-msgid "distance"
+msgid "Distance"
 msgstr "Distance"
 
 #. Kernel Log
 #: i18n/english/luasrc/i18n/default.en.lua:31
-msgid "dmesg"
+msgid "Kernel Log"
 msgstr "カーネルログ"
 
 #. <abbr title=\"Domain Name System\">DNS</abbr>-Server
 #: i18n/english/luasrc/i18n/default.en.lua:32
-msgid "dnsserver"
+msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Server"
 msgstr "<abbr title=\"Domain Name System\">DNS</abbr>-サーバー"
 
 #. Edit
 #: i18n/english/luasrc/i18n/default.en.lua:33
-msgid "edit"
+msgid "Edit"
 msgstr "編集"
 
 #. enable
@@ -185,47 +185,47 @@ msgstr "有効"
 
 #. Encryption
 #: i18n/english/luasrc/i18n/default.en.lua:35
-msgid "encryption"
+msgid "Encryption"
 msgstr "暗号化"
 
 #. Error
 #: i18n/english/luasrc/i18n/default.en.lua:36
-msgid "error"
+msgid "Error"
 msgstr "エラー"
 
 #. Filesystem
 #: i18n/english/luasrc/i18n/default.en.lua:37
-msgid "filesystem"
+msgid "Filesystem"
 msgstr "ファイルシステム"
 
 #. Filter
 #: i18n/english/luasrc/i18n/default.en.lua:38
-msgid "filter"
+msgid "Filter"
 msgstr "フィルタ"
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway
 #: i18n/english/luasrc/i18n/default.en.lua:39
-msgid "gateway"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
 msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>ゲートウェイ"
 
 #. <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway
 #: i18n/english/luasrc/i18n/default.en.lua:40
-msgid "gateway6"
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 msgstr "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>ゲートウェイ"
 
 #. General
 #: i18n/english/luasrc/i18n/default.en.lua:41
-msgid "general"
+msgid "General"
 msgstr "一般"
 
 #. Hostname
 #: i18n/english/luasrc/i18n/default.en.lua:42
-msgid "hostname"
+msgid "Hostname"
 msgstr "ホスト名"
 
 #. Install
 #: i18n/english/luasrc/i18n/default.en.lua:43
-msgid "install"
+msgid "Install"
 msgstr "インストール"
 
 #. installed
@@ -235,102 +235,102 @@ msgstr "インストール済み"
 
 #. Interface
 #: i18n/english/luasrc/i18n/default.en.lua:45
-msgid "interface"
+msgid "Interface"
 msgstr "インターフェース"
 
 #. Interfaces
 #: i18n/english/luasrc/i18n/default.en.lua:46
-msgid "interfaces"
+msgid "Interfaces"
 msgstr "インターフェース"
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address
 #: i18n/english/luasrc/i18n/default.en.lua:47
-msgid "ipaddress"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
 msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>アドレス"
 
 #. <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address
 #: i18n/english/luasrc/i18n/default.en.lua:48
-msgid "ip6address"
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address"
 msgstr "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>アドレス"
 
 #. Legend
 #: i18n/english/luasrc/i18n/default.en.lua:49
-msgid "legend"
+msgid "Legend"
 msgstr "Legend"
 
 #. Library
 #: i18n/english/luasrc/i18n/default.en.lua:50
-msgid "library"
+msgid "Library"
 msgstr "Library"
 
 #. Logout
 #: i18n/english/luasrc/i18n/default.en.lua:51
-msgid "logout"
+msgid "Logout"
 msgstr "ログアウト"
 
 #. Key
 #: i18n/english/luasrc/i18n/default.en.lua:52
-msgid "key"
+msgid "Key"
 msgstr "Key"
 
 #. Language
 #: i18n/english/luasrc/i18n/default.en.lua:53
-msgid "language"
+msgid "Language"
 msgstr "言語"
 
 #. Limit
 #: i18n/english/luasrc/i18n/default.en.lua:54
-msgid "limit"
+msgid "Limit"
 msgstr "Limit"
 
 #. Load
 #: i18n/english/luasrc/i18n/default.en.lua:55
-msgid "load"
+msgid "Load"
 msgstr "ロードアベレージ"
 
 #. Login
 #: i18n/english/luasrc/i18n/default.en.lua:56
-msgid "login"
+msgid "Login"
 msgstr "ログイン"
 
 #. <abbr title=\"Media Access Control\">MAC</abbr>-Address
 #: i18n/english/luasrc/i18n/default.en.lua:57
-msgid "macaddress"
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr "<abbr title=\"Media Access Control\">MAC</abbr>-アドレス"
 
 #. see &#39;%s&#39; manpage
 #: i18n/english/luasrc/i18n/default.en.lua:58
-msgid "manpage"
+msgid "see '%s' manpage"
 msgstr "see &#39;%s&#39; manpage"
 
 #. Metric
 #: i18n/english/luasrc/i18n/default.en.lua:59
-msgid "metric"
+msgid "Metric"
 msgstr "メトリック"
 
 #. Mode
 #: i18n/english/luasrc/i18n/default.en.lua:60
-msgid "mode"
+msgid "Mode"
 msgstr "モード"
 
 #. Name
 #: i18n/english/luasrc/i18n/default.en.lua:61
-msgid "name"
+msgid "Name"
 msgstr "名前"
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask
 #: i18n/english/luasrc/i18n/default.en.lua:62
-msgid "netmask"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>ネットマスク"
 
 #. Network
 #: i18n/english/luasrc/i18n/default.en.lua:63
-msgid "network"
+msgid "Network"
 msgstr "ネットワーク"
 
 #. Networks
 #: i18n/english/luasrc/i18n/default.en.lua:64
-msgid "networks"
+msgid "Networks"
 msgstr "ネットワーク"
 
 #. none
@@ -340,117 +340,117 @@ msgstr "なし"
 
 #. not installed
 #: i18n/english/luasrc/i18n/default.en.lua:66
-msgid "notinstalled"
+msgid "not installed"
 msgstr "未インストール"
 
 #. OK
 #: i18n/english/luasrc/i18n/default.en.lua:67
-msgid "ok"
+msgid "OK"
 msgstr "OK"
 
 #. Options
 #: i18n/english/luasrc/i18n/default.en.lua:68
-msgid "options"
+msgid "Options"
 msgstr "オプション"
 
 #. Overview
 #: i18n/english/luasrc/i18n/default.en.lua:69
-msgid "overview"
+msgid "Overview"
 msgstr "概要"
 
 #. Package Manager
 #: i18n/english/luasrc/i18n/default.en.lua:70
-msgid "packagemanager"
+msgid "Package Manager"
 msgstr "パッケージ管理"
 
 #. Password
 #: i18n/english/luasrc/i18n/default.en.lua:71
-msgid "password"
+msgid "Password"
 msgstr "パスワード"
 
 #. Path
 #: i18n/english/luasrc/i18n/default.en.lua:72
-msgid "path"
+msgid "Path"
 msgstr "パス"
 
 #. Port
 #: i18n/english/luasrc/i18n/default.en.lua:73
-msgid "port"
+msgid "Port"
 msgstr "ポート"
 
 #. Ports
 #: i18n/english/luasrc/i18n/default.en.lua:74
-msgid "ports"
+msgid "Ports"
 msgstr "ポート"
 
 #. Proceed
 #: i18n/english/luasrc/i18n/default.en.lua:75
-msgid "proceed"
+msgid "Proceed"
 msgstr ""
 
 #. Protocol
 #: i18n/english/luasrc/i18n/default.en.lua:76
-msgid "protocol"
+msgid "Protocol"
 msgstr "プロトコル"
 
 #. Reboot
 #: i18n/english/luasrc/i18n/default.en.lua:77
-msgid "reboot"
+msgid "Reboot"
 msgstr "再起動"
 
 #. Reset
 #: i18n/english/luasrc/i18n/default.en.lua:78
-msgid "reset"
+msgid "Reset"
 msgstr "リセット"
 
 #. Revert
 #: i18n/english/luasrc/i18n/default.en.lua:79
-msgid "revert"
+msgid "Revert"
 msgstr "元に戻す"
 
 #. Save
 #: i18n/english/luasrc/i18n/default.en.lua:80
-msgid "save"
+msgid "Save"
 msgstr "保存"
 
 #. Save &amp; Apply
 #: i18n/english/luasrc/i18n/default.en.lua:81
-msgid "saveapply"
+msgid "Save & Apply"
 msgstr "保存 &amp; 適用"
 
 #. Scan
 #: i18n/english/luasrc/i18n/default.en.lua:82
-msgid "scan"
+msgid "Scan"
 msgstr "スキャン"
 
 #. Service
 #: i18n/english/luasrc/i18n/default.en.lua:83
-msgid "service"
+msgid "Service"
 msgstr "サービス"
 
 #. Services
 #: i18n/english/luasrc/i18n/default.en.lua:84
-msgid "services"
+msgid "Services"
 msgstr "サービス"
 
 #. Settings
 #: i18n/english/luasrc/i18n/default.en.lua:85
-msgid "settings"
+msgid "Settings"
 msgstr "設定"
 
 #. Size
 #: i18n/english/luasrc/i18n/default.en.lua:86
-msgid "size"
+msgid "Size"
 msgstr "サイズ"
 
 #. Source
 #: i18n/english/luasrc/i18n/default.en.lua:87
-msgid "source"
+msgid "Source"
 msgstr "送信元"
 
 #. Start
 #: i18n/english/luasrc/i18n/default.en.lua:88
-msgid "start"
+msgid "Start"
 msgstr "開始"
 
 #. static
@@ -460,72 +460,72 @@ msgstr "static"
 
 #. Status
 #: i18n/english/luasrc/i18n/default.en.lua:90
-msgid "status"
+msgid "Status"
 msgstr "ステータス"
 
 #. Statistics
 #: i18n/english/luasrc/i18n/default.en.lua:91
-msgid "statistics"
+msgid "Statistics"
 msgstr "統計"
 
 #. Submit
 #: i18n/english/luasrc/i18n/default.en.lua:92
-msgid "submit"
+msgid "Submit"
 msgstr "送信"
 
 #. System Log
 #: i18n/english/luasrc/i18n/default.en.lua:93
-msgid "syslog"
+msgid "System Log"
 msgstr "システムログ"
 
 #. System
 #: i18n/english/luasrc/i18n/default.en.lua:94
-msgid "system"
+msgid "System"
 msgstr "システム"
 
 #. Target
 #: i18n/english/luasrc/i18n/default.en.lua:95
-msgid "target"
+msgid "Target"
 msgstr "ターゲット"
 
 #. Timezone
 #: i18n/english/luasrc/i18n/default.en.lua:96
-msgid "timezone"
+msgid "Timezone"
 msgstr "タイムゾーン"
 
 #. Type
 #: i18n/english/luasrc/i18n/default.en.lua:97
-msgid "type"
+msgid "Type"
 msgstr "タイプ"
 
 #. Unknown Error
 #: i18n/english/luasrc/i18n/default.en.lua:98
-msgid "unknownerror"
+msgid "Unknown Error"
 msgstr "不明なエラー"
 
 #. Unsaved Changes
 #: i18n/english/luasrc/i18n/default.en.lua:99
-msgid "unsavedchanges"
+msgid "Unsaved Changes"
 msgstr "保存されていない変更"
 
 #. Username
 #: i18n/english/luasrc/i18n/default.en.lua:100
-msgid "username"
+msgid "Username"
 msgstr "ユーザー名"
 
 #. Version
 #: i18n/english/luasrc/i18n/default.en.lua:101
-msgid "version"
+msgid "Version"
 msgstr "バージョン"
 
 #. Web <abbr title=\"User Interface\">UI</abbr>
 #: i18n/english/luasrc/i18n/default.en.lua:102
-msgid "webui"
+msgid "Web <abbr title=\"User Interface\">UI</abbr>"
 msgstr "WEB <abbr title=\"User Interface\">UI</abbr>"
 
 #. Wifi
 #: i18n/english/luasrc/i18n/default.en.lua:103
-msgid "wifi"
+msgid "Wifi"
 msgstr "無線"
 
 #. Zone
diff --git a/po/ja/freifunk.po b/po/ja/freifunk.po
index 970eddddd..26fce2f2a 100644
--- a/po/ja/freifunk.po
+++ b/po/ja/freifunk.po
@@ -14,105 +14,105 @@ msgstr ""
 
 #. Hello and welcome in the network of
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:1
-msgid "ff_hellonet"
+msgid "Hello and welcome in the network of"
 msgstr ""
 
 #. We are an initiative to establish a free, independent and open wireless mesh network.
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:2
-msgid "ff_public1"
+msgid "We are an initiative to establish a free, independent and open wireless mesh network."
 msgstr ""
 
 #. This is the access point
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:3
-msgid "ff_public2"
+msgid "This is the access point"
 msgstr ""
 
 #. It is operated by
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:4
-msgid "ff_public3"
+msgid "It is operated by"
 msgstr ""
 
 #. You can find further information about the global Freifunk initiative at
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:5
-msgid "ff_public4"
+msgid "You can find further information about the global Freifunk initiative at"
 msgstr ""
 
 #. If you are interested in our project then contact the local community
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:6
-msgid "ff_public5"
+msgid "If you are interested in our project then contact the local community"
 msgstr ""
 
 #. Internet access depends on technical and organisational conditions and may or may not work for you.
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:7
-msgid "ff_public6"
+msgid "Internet access depends on technical and organisational conditions and may or may not work for you."
 msgstr ""
 
 #. Location
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:8
-msgid "ff_location"
+msgid "Location"
 msgstr ""
 
 #. E-Mail
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:9
-msgid "ff_mail"
+msgid "E-Mail"
 msgstr ""
 
 #. You really should provide your address here!
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:10
-msgid "ff_mail1"
+msgid "You really should provide your address here!"
 msgstr ""
 
 #. Nickname
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:11
-msgid "ff_nickname"
+msgid "Nickname"
 msgstr ""
 
 #. Realname
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:12
-msgid "ff_name"
+msgid "Realname"
 msgstr ""
 
 #. Node
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:13
-msgid "ff_node"
+msgid "Node"
 msgstr ""
 
 #. Notice
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:14
-msgid "ff_note"
+msgid "Notice"
 msgstr ""
 
 #. Phone
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:15
-msgid "ff_phone"
+msgid "Phone"
 msgstr ""
 
 #. Memory
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:16
-msgid "ff_ram"
+msgid "Memory"
 msgstr ""
 
 #. Free
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:17
-msgid "ff_free"
+msgid "Free"
 msgstr ""
 
 #. Buffers
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:18
-msgid "ff_buffers"
+msgid "Buffers"
 msgstr ""
 
 #. Cached
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:19
-msgid "ff_cached"
+msgid "Cached"
 msgstr ""
 
 #. Total
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:20
-msgid "ff_total"
+msgid "Total"
 msgstr ""
 
 #. Coordinates
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:21
-msgid "ff_geocoord"
+msgid "Coordinates"
 msgstr ""
diff --git a/po/ja/hd_idle.po b/po/ja/hd_idle.po
index a758eb35b..c298a21e0 100644
--- a/po/ja/hd_idle.po
+++ b/po/ja/hd_idle.po
@@ -14,35 +14,35 @@ msgstr ""
 
 #. Disk
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:1
-msgid "disk"
+msgid "Disk"
 msgstr ""
 
 #. Enable debug
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:2
-msgid "enable_debug"
+msgid "Enable debug"
 msgstr ""
 
 #. hd-idle
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:3
-msgid "hd_idle"
+msgid "hd-idle"
 msgstr ""
 
 #. hd-idle is a utility program for spinning-down external disks after a period of idle time.
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:4
-msgid "hd_idle_desc"
+msgid "hd-idle is a utility program for spinning-down external disks after a period of idle time."
 msgstr ""
 
 #. Idle-Time
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:5
-msgid "idle_time_interval"
+msgid "Idle-Time"
 msgstr ""
 
 #. Idle-Time unit
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:6
-msgid "idle_time_unit"
+msgid "Idle-Time unit"
 msgstr ""
 
 #. Settings
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:7
-msgid "settings"
+msgid "Settings"
 msgstr ""
diff --git a/po/ja/initmgr.po b/po/ja/initmgr.po
index d8d3711cd..547802d9f 100644
--- a/po/ja/initmgr.po
+++ b/po/ja/initmgr.po
@@ -14,22 +14,22 @@ msgstr ""
 
 #. Initscripts
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:1
-msgid "initmgr"
+msgid "Initscripts"
 msgstr ""
 
 #. You can enable or disable installed init scripts here. Changes will applied after a device reboot.<br /><strong>Warning: If you disable essential init scripts like &quot;network&quot;, your device might become inaccesable!</strong>
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:2
-msgid "initmgr_desc"
+msgid "You can enable or disable installed init scripts here. Changes will applied after a device reboot.<br /><strong>Warning: If you disable essential init scripts like \"network\", your device might become inaccesable!</strong>"
 msgstr ""
 
 #. Start priority
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:3
-msgid "initmgr_index"
+msgid "Start priority"
 msgstr ""
 
 #. Initscript
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:4
-msgid "initmgr_name"
+msgid "Initscript"
 msgstr ""
 
 #. Enable/Disable
diff --git a/po/ja/livestats.po b/po/ja/livestats.po
index d14541ae1..5a1b08d37 100644
--- a/po/ja/livestats.po
+++ b/po/ja/livestats.po
@@ -14,32 +14,32 @@ msgstr ""
 
 #. incoming
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:1
-msgid "livestats_incoming"
+msgid "incoming"
 msgstr ""
 
 #. outgoing
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:2
-msgid "livestats_outgoing"
+msgid "outgoing"
 msgstr ""
 
 #. traffic on
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:3
-msgid "livestats_traffic"
+msgid "traffic on"
 msgstr ""
 
 #. signal-to-noise ratio for
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:4
-msgid "livestats_wifi"
+msgid "signal-to-noise ratio for"
 msgstr ""
 
 #. load average
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:5
-msgid "livestats_loadavg"
+msgid "load average"
 msgstr ""
 
 #. Realtime Wireless Status
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:6
-msgid "livestats_stat_wireless"
+msgid "Realtime Wireless Status"
 msgstr ""
 
 #. Realtime Network Traffic
diff --git a/po/ja/luci-fw.po b/po/ja/luci-fw.po
index 8a98514d6..a40effdc3 100644
--- a/po/ja/luci-fw.po
+++ b/po/ja/luci-fw.po
@@ -14,277 +14,277 @@ msgstr ""
 
 #. Port forwarding
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:1
-msgid "fw_portfw"
+msgid "Port forwarding"
 msgstr ""
 
 #. Traffic Redirection
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:2
-msgid "fw_redirect"
+msgid "Traffic Redirection"
 msgstr ""
 
 #. Traffic redirection allows you to change the destination address of forwarded packets.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:3
-msgid "fw_redirect_desc"
+msgid "Traffic redirection allows you to change the destination address of forwarded packets."
 msgstr ""
 
 #. Zone-to-Zone traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:4
-msgid "fw_forwarding"
+msgid "Zone-to-Zone traffic"
 msgstr ""
 
 #. Firewall
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:5
-msgid "fw_fw"
+msgid "Firewall"
 msgstr ""
 
 #. Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:6
-msgid "fw_zone"
+msgid "Zone"
 msgstr ""
 
 #. Zones
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:7
-msgid "fw_zones"
+msgid "Zones"
 msgstr ""
 
 #. Custom forwarding
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:8
-msgid "fw_custfwd"
+msgid "Custom forwarding"
 msgstr ""
 
 #. The firewall creates zones over your network interfaces to control network traffic flow.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:9
-msgid "fw_fw1"
+msgid "The firewall creates zones over your network interfaces to control network traffic flow."
 msgstr ""
 
 #. Advanced Rules
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:10
-msgid "firewall_rule"
+msgid "Advanced Rules"
 msgstr ""
 
 #. Advanced rules let you customize the firewall to your needs. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:11
-msgid "firewall_rule_desc"
+msgid "Advanced rules let you customize the firewall to your needs. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall."
 msgstr ""
 
 #. Input Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:12
-msgid "firewall_rule_src"
+msgid "Input Zone"
 msgstr ""
 
 #. Output Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:13
-msgid "firewall_rule_dest"
+msgid "Output Zone"
 msgstr ""
 
 #. Source address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:14
-msgid "firewall_rule_srcip"
+msgid "Source address"
 msgstr ""
 
 #. Destination address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:15
-msgid "firewall_rule_destip"
+msgid "Destination address"
 msgstr ""
 
 #. Source MAC-Address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:16
-msgid "firewall_rule_srcmac"
+msgid "Source MAC-Address"
 msgstr ""
 
 #. Source port
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:17
-msgid "firewall_rule_srcport"
+msgid "Source port"
 msgstr ""
 
 #. Destination port
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:18
-msgid "firewall_rule_destport"
+msgid "Destination port"
 msgstr ""
 
 #. Action
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:19
-msgid "firewall_rule_target"
+msgid "Action"
 msgstr ""
 
 #. accept
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:20
-msgid "fw_accept"
+msgid "accept"
 msgstr ""
 
 #. reject
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:21
-msgid "fw_reject"
+msgid "reject"
 msgstr ""
 
 #. drop
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:22
-msgid "fw_drop"
+msgid "drop"
 msgstr ""
 
 #. Source
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:23
-msgid "fw_src"
+msgid "Source"
 msgstr ""
 
 #. Destination
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:24
-msgid "fw_dest"
+msgid "Destination"
 msgstr ""
 
 #. Traffic Control
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:25
-msgid "fw_traffic"
+msgid "Traffic Control"
 msgstr ""
 
 #. MSS Clamping
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:26
-msgid "fw_mtufix"
+msgid "MSS Clamping"
 msgstr ""
 
 #. Drop invalid packets
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:27
-msgid "fw_dropinvalid"
+msgid "Drop invalid packets"
 msgstr ""
 
 #. Port forwarding allows to provide network services in the internal network to an external network.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:28
-msgid "fw_portfw1"
+msgid "Port forwarding allows to provide network services in the internal network to an external network."
 msgstr ""
 
 #. External Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:29
-msgid "firewall_redirect_src_desc"
+msgid "External Zone"
 msgstr ""
 
 #. External port
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:30
-msgid "firewall_redirect_srcdport"
+msgid "External port"
 msgstr ""
 
 #. port or range as first-last
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:31
-msgid "firewall_redirect_srcdport_desc"
+msgid "port or range as first-last"
 msgstr ""
 
 #. Source address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:32
-msgid "firewall_redirect_srcip"
+msgid "Source address"
 msgstr ""
 
 #. Source MAC
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:33
-msgid "firewall_redirect_srcmac"
+msgid "Source MAC"
 msgstr ""
 
 #. Internal address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:34
-msgid "firewall_redirect_destip"
+msgid "Internal address"
 msgstr ""
 
 #. IP-Address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:35
-msgid "firewall_redirect_destip_desc"
+msgid "IP-Address"
 msgstr ""
 
 #. Internal port (optional)
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:36
-msgid "firewall_redirect_destport"
+msgid "Internal port (optional)"
 msgstr ""
 
 #. port or range as first-last
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:37
-msgid "firewall_redirect_destport_desc"
+msgid "port or range as first-last"
 msgstr ""
 
 #. Here you can specify which network traffic is allowed to flow between network zones. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall. If you experience occasional connection problems try enabling MSS Clamping otherwise disable it for performance reasons.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:38
-msgid "fw_forwarding1"
+msgid "Here you can specify which network traffic is allowed to flow between network zones. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall. If you experience occasional connection problems try enabling MSS Clamping otherwise disable it for performance reasons."
 msgstr ""
 
 #. Input
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:39
-msgid "firewall_forwarding_src"
+msgid "Input"
 msgstr ""
 
 #. Output
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:40
-msgid "firewall_forwarding_dest"
+msgid "Output"
 msgstr ""
 
 #. Defaults
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:41
-msgid "firewall_defaults"
+msgid "Defaults"
 msgstr ""
 
 #. These are the default settings that are used if no other rules match.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:42
-msgid "firewall_defaults_desc"
+msgid "These are the default settings that are used if no other rules match."
 msgstr ""
 
 #. SYN-flood protection
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:43
-msgid "firewall_defaults_synflood"
+msgid "SYN-flood protection"
 msgstr ""
 
 #. Incoming Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:44
-msgid "firewall_defaults_input"
+msgid "Incoming Traffic"
 msgstr ""
 
 #. Outgoing Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:45
-msgid "firewall_defaults_output"
+msgid "Outgoing Traffic"
 msgstr ""
 
 #. Forwarded Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:46
-msgid "firewall_defaults_forward"
+msgid "Forwarded Traffic"
 msgstr ""
 
 #. Zones part the network interfaces into certain isolated areas to separate network traffic. One or more networks can belong to a zone. The MASQ-flag enables NAT masquerading for all outgoing traffic on this zone.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:47
-msgid "firewall_zone_desc"
+msgid "Zones part the network interfaces into certain isolated areas to separate network traffic. One or more networks can belong to a zone. The MASQ-flag enables NAT masquerading for all outgoing traffic on this zone."
 msgstr ""
 
 #. Incoming Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:48
-msgid "firewall_zone_input"
+msgid "Incoming Traffic"
 msgstr ""
 
 #. Default Policy
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:49
-msgid "firewall_zone_input_desc"
+msgid "Default Policy"
 msgstr ""
 
 #. Outgoing Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:50
-msgid "firewall_zone_output"
+msgid "Outgoing Traffic"
 msgstr ""
 
 #. Default Policy
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:51
-msgid "firewall_zone_output_desc"
+msgid "Default Policy"
 msgstr ""
 
 #. Forwarded Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:52
-msgid "firewall_zone_forward"
+msgid "Forwarded Traffic"
 msgstr ""
 
 #. Default Policy
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:53
-msgid "firewall_zone_forward_desc"
+msgid "Default Policy"
 msgstr ""
 
 #. MASQ
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:54
-msgid "firewall_zone_masq"
+msgid "MASQ"
 msgstr ""
 
 #. Networks
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:55
-msgid "firewall_zone_network"
+msgid "Networks"
 msgstr ""
 
 #. contained networks
diff --git a/po/ja/mmc_over_gpio.po b/po/ja/mmc_over_gpio.po
index a3f97bdab..62b202a9e 100644
--- a/po/ja/mmc_over_gpio.po
+++ b/po/ja/mmc_over_gpio.po
@@ -14,15 +14,15 @@ msgstr ""
 
 #. MMC/SD driver configuration
 #: applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua:1
-msgid "mmc_over_gpio"
+msgid "MMC/SD driver configuration"
 msgstr ""
 
 #. MMC/SD driver configuration
 #: applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua:2
-msgid "mmc_over_gpio_desc"
+msgid "MMC/SD driver configuration"
 msgstr ""
 
 #. Settings
 #: applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua:3
-msgid "settings"
+msgid "Settings"
 msgstr ""
diff --git a/po/ja/ntpc.po b/po/ja/ntpc.po
index d349e7ebc..b1e6417dc 100644
--- a/po/ja/ntpc.po
+++ b/po/ja/ntpc.po
@@ -14,42 +14,42 @@ msgstr ""
 
 #. Time Synchronisation
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:1
-msgid "ntpc"
+msgid "Time Synchronisation"
 msgstr ""
 
 #. Synchronizes the system time
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:2
-msgid "ntpc_desc"
+msgid "Synchronizes the system time"
 msgstr ""
 
 #. Time Server
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:3
-msgid "ntpc_timeserver"
+msgid "Time Server"
 msgstr ""
 
 #. Update Interval (in s)
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:4
-msgid "ntpc_interval"
+msgid "Update Interval (in s)"
 msgstr ""
 
 #. Count of Time Measurements
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:5
-msgid "ntpc_count"
+msgid "Count of Time Measurements"
 msgstr ""
 
 #. empty = infinite
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:6
-msgid "ntpc_count_desc"
+msgid "empty = infinite"
 msgstr ""
 
 #. Clock Adjustment
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:7
-msgid "ntpc_drift"
+msgid "Clock Adjustment"
 msgstr ""
 
 #. Offset Frequency
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:8
-msgid "ntpc_drift_freq"
+msgid "Offset Frequency"
 msgstr ""
 
 #. Current system time
diff --git a/po/ja/olsr.po b/po/ja/olsr.po
index 95dfeb8dd..c1fe81b99 100644
--- a/po/ja/olsr.po
+++ b/po/ja/olsr.po
@@ -14,637 +14,637 @@ msgstr ""
 
 #. OLSR Daemon
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:1
-msgid "olsrd"
+msgid "OLSR Daemon"
 msgstr ""
 
 #. Neighbour IP
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:2
-msgid "olsrd_neighbour_ip"
+msgid "Neighbour IP"
 msgstr ""
 
 #. Local interface IP
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:3
-msgid "olsrd_local_ip"
+msgid "Local interface IP"
 msgstr ""
 
 #. Announced network
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:4
-msgid "olsrd_network"
+msgid "Announced network"
 msgstr ""
 
 #. OLSR gateway
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:5
-msgid "olsrd_gateway"
+msgid "OLSR gateway"
 msgstr ""
 
 #. OLSR node
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:6
-msgid "olsrd_node"
+msgid "OLSR node"
 msgstr ""
 
 #. Unable to connect to the OLSR daemon!
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:7
-msgid "olsrd_error"
+msgid "Unable to connect to the OLSR daemon!"
 msgstr ""
 
 #. Make sure that OLSRd is running, the &quot;txtinfo&quot; plugin is loaded, configured on port 2006 and accepts connections from &quot;127.0.0.1&quot;.
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:8
-msgid "olsrd_error_desc"
+msgid "Make sure that OLSRd is running, the \"txtinfo\" plugin is loaded, configured on port 2006 and accepts connections from \"127.0.0.1\"."
 msgstr ""
 
 #. OLSR - HNA-Announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:9
-msgid "olsrd_hna"
+msgid "OLSR - HNA-Announcements"
 msgstr ""
 
 #. OLSR - Plugins
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:10
-msgid "olsrd_plugins"
+msgid "OLSR - Plugins"
 msgstr ""
 
 #. OLSR connections
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:11
-msgid "olsrd_links"
+msgid "OLSR connections"
 msgstr ""
 
 #. Overview of currently established OLSR connections
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:12
-msgid "olsrd_links_desc"
+msgid "Overview of currently established OLSR connections"
 msgstr ""
 
 #. Expected retransmission count
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:13
-msgid "olsrd_links_etx_desc"
+msgid "Expected retransmission count"
 msgstr ""
 
 #. Success rate of sent packages
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:14
-msgid "olsrd_links_lq_desc"
+msgid "Success rate of sent packages"
 msgstr ""
 
 #. Success rate of received packages
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:15
-msgid "olsrd_links_nlq_desc"
+msgid "Success rate of received packages"
 msgstr ""
 
 #. Known OLSR routes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:16
-msgid "olsrd_routes"
+msgid "Known OLSR routes"
 msgstr ""
 
 #. Overview of currently known routes to other OLSR nodes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:17
-msgid "olsrd_routes_desc"
+msgid "Overview of currently known routes to other OLSR nodes"
 msgstr ""
 
 #. Active OLSR nodes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:18
-msgid "olsrd_topology"
+msgid "Active OLSR nodes"
 msgstr ""
 
 #. Overview of currently known OLSR nodes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:19
-msgid "olsrd_topology_desc"
+msgid "Overview of currently known OLSR nodes"
 msgstr ""
 
 #. Last hop
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:20
-msgid "olsrd_topology_lasthop"
+msgid "Last hop"
 msgstr ""
 
 #. Active host net announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:21
-msgid "olsrd_hna2"
+msgid "Active host net announcements"
 msgstr ""
 
 #. Overview of currently active OLSR host net announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:22
-msgid "olsrd_hna_desc"
+msgid "Overview of currently active OLSR host net announcements"
 msgstr ""
 
 #. Active MID announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:23
-msgid "olsrd_mid"
+msgid "Active MID announcements"
 msgstr ""
 
 #. Overview of known multiple interface announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:24
-msgid "olsrd_mid_desc"
+msgid "Overview of known multiple interface announcements"
 msgstr ""
 
 #. Secondary OLSR interfaces
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:25
-msgid "olsrd_mid_aliases"
+msgid "Secondary OLSR interfaces"
 msgstr ""
 
 #. Freifunk
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:26
-msgid "olsrd_etx_ff"
+msgid "Freifunk"
 msgstr ""
 
 #. floating point
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:27
-msgid "olsrd_etx_float"
+msgid "floating point"
 msgstr ""
 
 #. fixed point math
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:28
-msgid "olsrd_etx_fpm"
+msgid "fixed point math"
 msgstr ""
 
 #. General settings
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:29
-msgid "olsrd_olsrd"
+msgid "General settings"
 msgstr ""
 
 #. Start without network
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:30
-msgid "olsrd_olsrd_allownoint"
+msgid "Start without network"
 msgstr ""
 
 #. Clear screen
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:31
-msgid "olsrd_olsrd_clearscreen"
+msgid "Clear screen"
 msgstr ""
 
 #. Debugmode
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:32
-msgid "olsrd_olsrd_debuglevel"
+msgid "Debugmode"
 msgstr ""
 
 #. FIB metric
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:33
-msgid "olsrd_olsrd_fibmetric"
+msgid "FIB metric"
 msgstr ""
 
 #. Internet protocol
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:34
-msgid "olsrd_olsrd_ipversion"
+msgid "Internet protocol"
 msgstr ""
 
 #. LQ aging
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:35
-msgid "olsrd_olsrd_linkqualityaging"
+msgid "LQ aging"
 msgstr ""
 
 #. LQ algorithm
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:36
-msgid "olsrd_olsrd_linkqualityalgorithm"
+msgid "LQ algorithm"
 msgstr ""
 
 #. LQ Dijkstra limit
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:37
-msgid "olsrd_olsrd_linkqualitydijkstralimit"
+msgid "LQ Dijkstra limit"
 msgstr ""
 
 #. LQ fisheye
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:38
-msgid "olsrd_olsrd_linkqualityfisheye"
+msgid "LQ fisheye"
 msgstr ""
 
 #. LQ level
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:39
-msgid "olsrd_olsrd_linkqualitylevel"
+msgid "LQ level"
 msgstr ""
 
 #. MPR selection
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:40
-msgid "olsrd_olsrd_linkqualitylevel_1"
+msgid "MPR selection"
 msgstr ""
 
 #. MPR selection and routing
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:41
-msgid "olsrd_olsrd_linkqualitylevel_2"
+msgid "MPR selection and routing"
 msgstr ""
 
 #. LQ window size
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:42
-msgid "olsrd_olsrd_linkqualitywinsize"
+msgid "LQ window size"
 msgstr ""
 
 #. MPR coverage
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:43
-msgid "olsrd_olsrd_mprcoverage"
+msgid "MPR coverage"
 msgstr ""
 
 #. Pollrate
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:44
-msgid "olsrd_olsrd_pollrate"
+msgid "Pollrate"
 msgstr ""
 
 #. TC redundancy
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:45
-msgid "olsrd_olsrd_tcredundancy"
+msgid "TC redundancy"
 msgstr ""
 
 #. MPR selectors
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:46
-msgid "olsrd_olsrd_tcredundancy_0"
+msgid "MPR selectors"
 msgstr ""
 
 #. MPR selectors and MPR
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:47
-msgid "olsrd_olsrd_tcredundancy_1"
+msgid "MPR selectors and MPR"
 msgstr ""
 
 #. all neighbours
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:48
-msgid "olsrd_olsrd_tcredundancy_2"
+msgid "all neighbours"
 msgstr ""
 
 #. Use hysteresis
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:49
-msgid "olsrd_olsrd_usehysteresis"
+msgid "Use hysteresis"
 msgstr ""
 
 #. Willingness
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:50
-msgid "olsrd_olsrd_willingness"
+msgid "Willingness"
 msgstr ""
 
 #. Hello interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:51
-msgid "olsrd_interface_hellointerval"
+msgid "Hello interval"
 msgstr ""
 
 #. Hello validity time
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:52
-msgid "olsrd_interface_hellovaliditytime"
+msgid "Hello validity time"
 msgstr ""
 
 #. HNA interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:53
-msgid "olsrd_interface_hnainterval"
+msgid "HNA interval"
 msgstr ""
 
 #. HNA validity time
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:54
-msgid "olsrd_interface_hnavaliditytime"
+msgid "HNA validity time"
 msgstr ""
 
 #. IPv4 broadcast
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:55
-msgid "olsrd_interface_ip4broadcast"
+msgid "IPv4 broadcast"
 msgstr ""
 
 #. MID interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:56
-msgid "olsrd_interface_midinterval"
+msgid "MID interval"
 msgstr ""
 
 #. MID validity time
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:57
-msgid "olsrd_interface_midvaliditytime"
+msgid "MID validity time"
 msgstr ""
 
 #. TC interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:58
-msgid "olsrd_interface_tcinterval"
+msgid "TC interval"
 msgstr ""
 
 #. TC validity time
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:59
-msgid "olsrd_interface_tcvaliditytime"
+msgid "TC validity time"
 msgstr ""
 
 #. IPv6 address type
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:60
-msgid "olsrd_interface_ip6addrtype"
+msgid "IPv6 address type"
 msgstr ""
 
 #. IPC settings
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:61
-msgid "olsrd_ipcconnect"
+msgid "IPC settings"
 msgstr ""
 
 #. IPC connections enable you to remote-control the local OLSRd instance using external programs
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:62
-msgid "olsrd_ipcconnect_desc"
+msgid "IPC connections enable you to remote-control the local OLSRd instance using external programs"
 msgstr ""
 
 #. Allowed host addresses
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:63
-msgid "olsrd_ipcconnect_host"
+msgid "Allowed host addresses"
 msgstr ""
 
 #. Multiple separated by spaces
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:64
-msgid "olsrd_ipcconnect_host_desc"
+msgid "Multiple separated by spaces"
 msgstr ""
 
 #. Maxmimum connection count
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:65
-msgid "olsrd_ipcconnect_maxconnections"
+msgid "Maxmimum connection count"
 msgstr ""
 
 #. Set to 0 to disable IPC
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:66
-msgid "olsrd_ipcconnect_maxconnections_desc"
+msgid "Set to 0 to disable IPC"
 msgstr ""
 
 #. Allowed subnets
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:67
-msgid "olsrd_ipcconnect_net"
+msgid "Allowed subnets"
 msgstr ""
 
 #. Address Mask; multiple separated by space
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:68
-msgid "olsrd_ipcconnect_net_desc"
+msgid "Address Mask; multiple separated by space"
 msgstr ""
 
 #. IPv4 HNA announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:69
-msgid "olsrd_hna4"
+msgid "IPv4 HNA announcements"
 msgstr ""
 
 #. Hna4 entries allow you to propagate local IPv4 host- and network-routes into the mesh network
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:70
-msgid "olsrd_hna4_desc"
+msgid "Hna4 entries allow you to propagate local IPv4 host- and network-routes into the mesh network"
 msgstr ""
 
 #. Network address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:71
-msgid "olsrd_hna4_netaddr"
+msgid "Network address"
 msgstr ""
 
 #. IPv4 address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:72
-msgid "olsrd_hna4_netaddr_desc"
+msgid "IPv4 address"
 msgstr ""
 
 #. Netmask
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:73
-msgid "olsrd_hna4_netmask"
+msgid "Netmask"
 msgstr ""
 
 #. IPv4 address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:74
-msgid "olsrd_hna4_netmask_desc"
+msgid "IPv4 address"
 msgstr ""
 
 #. IPv6 HNA announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:75
-msgid "olsrd_hna6"
+msgid "IPv6 HNA announcements"
 msgstr ""
 
 #. Hna6 entries allow you to propagate local IPv6 host- and network-routes into the mesh network
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:76
-msgid "olsrd_hna6_desc"
+msgid "Hna6 entries allow you to propagate local IPv6 host- and network-routes into the mesh network"
 msgstr ""
 
 #. Network address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:77
-msgid "olsrd_hna6_netaddr"
+msgid "Network address"
 msgstr ""
 
 #. IPv6 address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:78
-msgid "olsrd_hna6_netaddr_desc"
+msgid "IPv6 address"
 msgstr ""
 
 #. Prefix
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:79
-msgid "olsrd_hna6_prefix"
+msgid "Prefix"
 msgstr ""
 
 #. IPv6 prefix
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:80
-msgid "olsrd_hna6_prefix_desc"
+msgid "IPv6 prefix"
 msgstr ""
 
 #. Plugin configuration
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:81
-msgid "olsrd_loadplugin"
+msgid "Plugin configuration"
 msgstr ""
 
 #. Enable plugin
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:82
-msgid "olsrd_loadplugin_ignore"
+msgid "Enable plugin"
 msgstr ""
 
 #. Library
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:83
-msgid "olsrd_loadplugin_library"
+msgid "Library"
 msgstr ""
 
 #. Allow connections from this hosts
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:84
-msgid "olsrd_loadplugin_accept"
+msgid "Allow connections from this hosts"
 msgstr ""
 
 #. Ping test addresses
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:85
-msgid "olsrd_loadplugin_ping"
+msgid "Ping test addresses"
 msgstr ""
 
 #. Interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:86
-msgid "olsrd_loadplugin_interval"
+msgid "Refresh interval in seconds"
 msgstr ""
 
 #. HNA announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:87
-msgid "olsrd_loadplugin_hna"
+msgid "HNA announcements"
 msgstr ""
 
 #. Format: IP-Address Netmask / OLSR will announce this network once it is reachable
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:88
-msgid "olsrd_loadplugin_hna_desc"
+msgid "Format: IP-Address Netmask / OLSR will announce this network once it is reachable"
 msgstr ""
 
 #. Alternative \"hosts\" file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:89
-msgid "olsrd_loadplugin_addhosts"
+msgid "Alternative \"hosts\" file"
 msgstr ""
 
 #. The contents of this file will be appended to the autogenerated \"hosts\" file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:90
-msgid "olsrd_loadplugin_addhosts_desc"
+msgid "The contents of this file will be appended to the autogenerated \"hosts\" file"
 msgstr ""
 
 #. DNS server
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:91
-msgid "olsrd_loadplugin_dnsserver"
+msgid "DNS server"
 msgstr ""
 
 #. Alternative hostnames
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:92
-msgid "olsrd_loadplugin_hosts"
+msgid "Alternative hostnames"
 msgstr ""
 
 #. Format: Interface-IP Hostname
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:93
-msgid "olsrd_loadplugin_hosts_desc"
+msgid "Format: Interface-IP Hostname"
 msgstr ""
 
 #. Path to the \"hosts\" file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:94
-msgid "olsrd_loadplugin_hostsfile"
+msgid "Path to the \"hosts\" file"
 msgstr ""
 
 #. Latitude
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:95
-msgid "olsrd_loadplugin_lat"
+msgid "Latitude"
 msgstr ""
 
 #. Output file for coordinates
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:96
-msgid "olsrd_loadplugin_latlonfile"
+msgid "Output file for coordinates"
 msgstr ""
 
 #. OLSR will write received coordinates of other nodes to this file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:97
-msgid "olsrd_loadplugin_latlonfile_desc"
+msgid "OLSR will write received coordinates of other nodes to this file"
 msgstr ""
 
 #. Input file for coordinates
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:98
-msgid "olsrd_loadplugin_latloninfile"
+msgid "Input file for coordinates"
 msgstr ""
 
 #. OLSR periodically checks this file for new coordinates and propagates them
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:99
-msgid "olsrd_loadplugin_latloninfile_desc"
+msgid "OLSR periodically checks this file for new coordinates and propagates them"
 msgstr ""
 
 #. Longitude
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:100
-msgid "olsrd_loadplugin_lon"
+msgid "Longitude"
 msgstr ""
 
 #. Hostnames
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:101
-msgid "olsrd_loadplugin_name"
+msgid "Hostnames"
 msgstr ""
 
 #. Command for name changes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:102
-msgid "olsrd_loadplugin_namechangescript"
+msgid "Command for name changes"
 msgstr ""
 
 #. OLSR executes this command once entries in the \"hosts\" are changed
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:103
-msgid "olsrd_loadplugin_namechangescript_desc"
+msgid "OLSR executes this command once entries in the \"hosts\" are changed"
 msgstr ""
 
 #. Path to the \"resolv\" file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:104
-msgid "olsrd_loadplugin_resolvfile"
+msgid "Path to the \"resolv\" file"
 msgstr ""
 
 #. Command for service changes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:105
-msgid "olsrd_loadplugin_serviceschangescript"
+msgid "Command for service changes"
 msgstr ""
 
 #. OLSR excutes this command once new service announcements are received
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:106
-msgid "olsrd_loadplugin_serviceschangescript_desc"
+msgid "OLSR excutes this command once new service announcements are received"
 msgstr ""
 
 #. PID file for SIGHUP signals
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:107
-msgid "olsrd_loadplugin_sighuppidfile"
+msgid "PID file for SIGHUP signals"
 msgstr ""
 
 #. OLSR sends a HUP signal to this PID once the \"hosts\" oder \"resolv\" file is changed
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:108
-msgid "olsrd_loadplugin_sighuppidfile_desc"
+msgid "OLSR sends a HUP signal to this PID once the \"hosts\" oder \"resolv\" file is changed"
 msgstr ""
 
 #. Domain suffix
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:109
-msgid "olsrd_loadplugin_suffix"
+msgid "Domain suffix"
 msgstr ""
 
 #. Timeout
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:110
-msgid "olsrd_loadplugin_timeout"
+msgid "Timeout"
 msgstr ""
 
 #. Name of the BMF interface
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:111
-msgid "olsrd_loadplugin_bmfinterface"
+msgid "Name of the BMF interface"
 msgstr ""
 
 #. IP address of the BMF interface
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:112
-msgid "olsrd_loadplugin_bmfinterfaceid"
+msgid "IP address of the BMF interface"
 msgstr ""
 
 #. Redirect local broadcasts
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:113
-msgid "olsrd_loadplugin_dolocalbroadcast"
+msgid "Redirect local broadcasts"
 msgstr ""
 
 #. Also redirect broadcasts from OLSR interfaces
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:114
-msgid "olsrd_loadplugin_capturepacketsonolsrinterfaces"
+msgid "Also redirect broadcasts from OLSR interfaces"
 msgstr ""
 
 #. Propagation mechanism
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:115
-msgid "olsrd_loadplugin_bmfmechanism"
+msgid "Propagation mechanism"
 msgstr ""
 
 #. Number of retransmissions per package
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:116
-msgid "olsrd_loadplugin_broadcastretransmitcount"
+msgid "Number of retransmissions per package"
 msgstr ""
 
 #. Minimum number of neighbours for broadcast redirection
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:117
-msgid "olsrd_loadplugin_fanoutlimit"
+msgid "Minimum number of neighbours for broadcast redirection"
 msgstr ""
 
 #. Non-OLSR interfaces
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:118
-msgid "olsrd_loadplugin_nonolsrif"
+msgid "Non-OLSR interfaces"
 msgstr ""
 
 #. Used port
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:119
-msgid "olsrd_loadplugin_port"
+msgid "Used port"
 msgstr ""
 
 #. Allow connections from hosts
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:120
-msgid "olsrd_loadplugin_host"
+msgid "Allow connections from hosts"
 msgstr ""
 
 #. Allow connections from subnets
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:121
-msgid "olsrd_loadplugin_net"
+msgid "Allow connections from subnets"
 msgstr ""
 
 #. Format: IP-AddresseNetmask
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:122
-msgid "olsrd_loadplugin_net_desc"
+msgid "Format: IP-AddresseNetmask"
 msgstr ""
 
 #. Used protocols
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:123
-msgid "olsrd_loadplugin_redistribute"
+msgid "Used protocols"
 msgstr ""
 
 #. Only export routes to Quagga or to kernel too
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:124
-msgid "olsrd_loadplugin_exportroutes"
+msgid "Only export routes to Quagga or to kernel too"
 msgstr ""
 
 #. Always prefer local routes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:125
-msgid "olsrd_loadplugin_localpref"
+msgid "Always prefer local routes"
 msgstr ""
 
 #. Distance of exported routes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:126
-msgid "olsrd_loadplugin_distance"
+msgid "Distance of exported routes"
 msgstr ""
 
 #. Key file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:127
-msgid "olsrd_loadplugin_keyfile"
+msgid "Key file"
 msgstr ""
 
 #. Watchdog timestamp file
diff --git a/po/ja/openvpn.po b/po/ja/openvpn.po
index 418079656..3883ec08e 100644
--- a/po/ja/openvpn.po
+++ b/po/ja/openvpn.po
@@ -14,947 +14,947 @@ msgstr ""
 
 #. OpenVPN
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:1
-msgid "openvpn"
+msgid "OpenVPN"
 msgstr ""
 
 #. Switch to basic configuration
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:3
-msgid "openvpn_switch_basic"
+msgid "« Switch to basic configuration"
 msgstr ""
 
 #. Switch to advanced configuration
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:4
-msgid "openvpn_switch_advanced"
+msgid "Switch to advanced configuration »"
 msgstr ""
 
 #. Enabled
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:6
-msgid "openvpn_enable"
+msgid "Enabled"
 msgstr ""
 
 #. Started
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:7
-msgid "openvpn_active"
+msgid "Started"
 msgstr ""
 
 #. no
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:8
-msgid "openvpn_active_no"
+msgid "no"
 msgstr ""
 
 #. yes (%i)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:9
-msgid "openvpn_active_yes"
+msgid "yes (%i)"
 msgstr ""
 
 #. Port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:10
-msgid "openvpn_port"
+msgid "Port"
 msgstr ""
 
 #. Protocol
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:11
-msgid "openvpn_proto"
+msgid "Protocol"
 msgstr ""
 
 #. Instance \"%s\"
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:13
-msgid "openvpn_instance"
+msgid "Instance \"%s\""
 msgstr ""
 
 #. OpenVPN instances
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:15
-msgid "openvpn_overview"
+msgid "OpenVPN instances"
 msgstr ""
 
 #. Below is a list of configured OpenVPN instances and their current state
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:16
-msgid "openvpn_overview_desc"
+msgid "Below is a list of configured OpenVPN instances and their current state"
 msgstr ""
 
 #. Daemon configuration
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:18
-msgid "openvpn_service"
+msgid "Daemon configuration"
 msgstr ""
 
 #. Networking options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:19
-msgid "openvpn_networking"
+msgid "Networking options"
 msgstr ""
 
 #. VPN options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:20
-msgid "openvpn_vpn"
+msgid "VPN options"
 msgstr ""
 
 #. Cryptography settings
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:21
-msgid "openvpn_cryptography"
+msgid "Cryptography settings"
 msgstr ""
 
 #. Read configuration options from file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:23
-msgid "openvpn_param_config"
+msgid "Read configuration options from file"
 msgstr ""
 
 #. Local host name or ip address
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:24
-msgid "openvpn_param_local"
+msgid "Local host name or ip address"
 msgstr ""
 
 #. Remote host name or ip address
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:25
-msgid "openvpn_param_remote"
+msgid "Remote host name or ip address"
 msgstr ""
 
 #. Randomly choose remote server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:26
-msgid "openvpn_param_remote_random"
+msgid "Randomly choose remote server"
 msgstr ""
 
 #. Major mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:27
-msgid "openvpn_param_mode"
+msgid "Major mode"
 msgstr ""
 
 #. Use protocol
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:28
-msgid "openvpn_param_proto"
+msgid "Use protocol"
 msgstr ""
 
 #. Connection retry interval
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:29
-msgid "openvpn_param_connect_retry"
+msgid "Connection retry interval"
 msgstr ""
 
 #. Connection timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:30
-msgid "openvpn_param_connect_timeout"
+msgid "Connection timeout"
 msgstr ""
 
 #. Maximum connection attempt retries
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:31
-msgid "openvpn_param_connect_retry_max"
+msgid "Maximum connection attempt retries"
 msgstr ""
 
 #. Try to sense proxy settings automatically
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:32
-msgid "openvpn_param_auto_proxy"
+msgid "Try to sense proxy settings automatically"
 msgstr ""
 
 #. Connect to remote host
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:33
-msgid "openvpn_param_http_proxy"
+msgid "Connect to remote host"
 msgstr ""
 
 #. Retry indefinitely on HTTP proxy errors
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:34
-msgid "openvpn_param_http_proxy_retry"
+msgid "Retry indefinitely on HTTP proxy errors"
 msgstr ""
 
 #. Proxy timeout in seconds
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:35
-msgid "openvpn_param_http_proxy_timeout"
+msgid "Proxy timeout in seconds"
 msgstr ""
 
 #. Set extended HTTP proxy options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:36
-msgid "openvpn_param_http_proxy_option"
+msgid "Set extended HTTP proxy options"
 msgstr ""
 
 #. Connect through Socks5 proxy
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:37
-msgid "openvpn_param_socks_proxy"
+msgid "Connect through Socks5 proxy"
 msgstr ""
 
 #. Retry indefinitely on Socks proxy errors
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:38
-msgid "openvpn_param_socks_proxy_retry"
+msgid "Retry indefinitely on Socks proxy errors"
 msgstr ""
 
 #. If hostname resolve fails, retry
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:39
-msgid "openvpn_param_resolv_retry"
+msgid "If hostname resolve fails, retry"
 msgstr ""
 
 #. Allow remote to change its IP or port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:40
-msgid "openvpn_param_float"
+msgid "Allow remote to change its IP or port"
 msgstr ""
 
 #. Execute shell command on remote ip change
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:41
-msgid "openvpn_param_ipchange"
+msgid "Execute shell command on remote ip change"
 msgstr ""
 
 #. TCP/UDP port # for both local and remote
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:42
-msgid "openvpn_param_port"
+msgid "TCP/UDP port # for both local and remote"
 msgstr ""
 
 #. TCP/UDP port # for local (default=1194)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:43
-msgid "openvpn_param_lport"
+msgid "TCP/UDP port # for local (default=1194)"
 msgstr ""
 
 #. TCP/UDP port # for remote (default=1194)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:44
-msgid "openvpn_param_rport"
+msgid "TCP/UDP port # for remote (default=1194)"
 msgstr ""
 
 #. Bind to local address and port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:45
-msgid "openvpn_param_bind"
+msgid "Bind to local address and port"
 msgstr ""
 
 #. Do not bind to local address and port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:46
-msgid "openvpn_param_nobind"
+msgid "Do not bind to local address and port"
 msgstr ""
 
 #. tun/tap device
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:47
-msgid "openvpn_param_dev"
+msgid "tun/tap device"
 msgstr ""
 
 #. Type of used device
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:48
-msgid "openvpn_param_dev_type"
+msgid "Type of used device"
 msgstr ""
 
 #. Use tun/tap device node
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:49
-msgid "openvpn_param_dev_node"
+msgid "Use tun/tap device node"
 msgstr ""
 
 #. Set the link layer address of the tap device
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:50
-msgid "openvpn_param_lladdr"
+msgid "Set the link layer address of the tap device"
 msgstr ""
 
 #. 'net30', 'p2p', or 'subnet'
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:51
-msgid "openvpn_param_topology"
+msgid "'net30', 'p2p', or 'subnet'"
 msgstr ""
 
 #. Make tun device IPv6 capable
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:52
-msgid "openvpn_param_tun_ipv6"
+msgid "Make tun device IPv6 capable"
 msgstr ""
 
 #. Configure device to use IP address
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:53
-msgid "openvpn_param_ifconfig"
+msgid "Configure device to use IP address"
 msgstr ""
 
 #. Don't actually execute ifconfig
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:54
-msgid "openvpn_param_ifconfig_noexec"
+msgid "Don't actually execute ifconfig"
 msgstr ""
 
 #. Don't warn on ifconfig inconsistencies
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:55
-msgid "openvpn_param_ifconfig_nowarn"
+msgid "Don't warn on ifconfig inconsistencies"
 msgstr ""
 
 #. Add route after establishing connection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:56
-msgid "openvpn_param_route"
+msgid "Add route after establishing connection"
 msgstr ""
 
 #. Specify a default gateway for routes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:57
-msgid "openvpn_param_route_gateway"
+msgid "Specify a default gateway for routes"
 msgstr ""
 
 #. Specify a default metric for routes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:58
-msgid "openvpn_param_route_metric"
+msgid "Specify a default metric for routes"
 msgstr ""
 
 #. Delay n seconds after connection 
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:59
-msgid "openvpn_param_route_delay"
+msgid "Delay n seconds after connection "
 msgstr ""
 
 #. Execute shell cmd after routes are added
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:60
-msgid "openvpn_param_route_up"
+msgid "Execute shell cmd after routes are added"
 msgstr ""
 
 #. Don't add routes automatically
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:61
-msgid "openvpn_param_route_noexec"
+msgid "Don't add routes automatically"
 msgstr ""
 
 #. Don't pull options from server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:62
-msgid "openvpn_param_route_nopull"
+msgid "Don't pull options from server"
 msgstr ""
 
 #. Automatically redirect default route
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:63
-msgid "openvpn_param_redirect_gateway"
+msgid "Automatically redirect default route"
 msgstr ""
 
 #. Pass environment variables to script
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:64
-msgid "openvpn_param_setenv"
+msgid "Pass environment variables to script"
 msgstr ""
 
 #. Shaping for peer bandwidth
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:65
-msgid "openvpn_param_shaper"
+msgid "Shaping for peer bandwidth"
 msgstr ""
 
 #. Set timeouts in server mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:66
-msgid "openvpn_param_keepalive"
+msgid "Set timeouts in server mode"
 msgstr ""
 
 #. tun/tap inactivity timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:67
-msgid "openvpn_param_inactive"
+msgid "tun/tap inactivity timeout"
 msgstr ""
 
 #. Remote ping timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:68
-msgid "openvpn_param_ping_exit"
+msgid "Remote ping timeout"
 msgstr ""
 
 #. Restart after remote ping timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:69
-msgid "openvpn_param_ping_restart"
+msgid "Restart after remote ping timeout"
 msgstr ""
 
 #. Only process ping timeouts if routes exist
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:70
-msgid "openvpn_param_ping_timer_rem"
+msgid "Only process ping timeouts if routes exist"
 msgstr ""
 
 #. Ping remote every n seconds over TCP/UDP port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:71
-msgid "openvpn_param_ping"
+msgid "Ping remote every n seconds over TCP/UDP port"
 msgstr ""
 
 #. Configure a multi-homed UDP server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:72
-msgid "openvpn_param_multihome"
+msgid "Configure a multi-homed UDP server"
 msgstr ""
 
 #. Optimize TUN/TAP/UDP writes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:73
-msgid "openvpn_param_fast_io"
+msgid "Optimize TUN/TAP/UDP writes"
 msgstr ""
 
 #. Remap SIGUSR1 signals
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:74
-msgid "openvpn_param_remap_usr1"
+msgid "Remap SIGUSR1 signals"
 msgstr ""
 
 #. Keep tun/tap device open on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:75
-msgid "openvpn_param_persist_tun"
+msgid "Keep tun/tap device open on restart"
 msgstr ""
 
 #. Keep remote IP address on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:76
-msgid "openvpn_param_persist_remote_ip"
+msgid "Keep remote IP address on restart"
 msgstr ""
 
 #. Keep local IP address on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:77
-msgid "openvpn_param_persist_local_ip"
+msgid "Keep local IP address on restart"
 msgstr ""
 
 #. Don't re-read key on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:78
-msgid "openvpn_param_persist_key"
+msgid "Don't re-read key on restart"
 msgstr ""
 
 #. TOS passthrough (applies to IPv4 only)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:79
-msgid "openvpn_param_passtos"
+msgid "TOS passthrough (applies to IPv4 only)"
 msgstr ""
 
 #. Set tun/tap device MTU
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:80
-msgid "openvpn_param_tun_mtu"
+msgid "Set tun/tap device MTU"
 msgstr ""
 
 #. Set tun/tap device overhead
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:81
-msgid "openvpn_param_tun_mtu_extra"
+msgid "Set tun/tap device overhead"
 msgstr ""
 
 #. Set TCP/UDP MTU
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:82
-msgid "openvpn_param_link_mtu"
+msgid "Set TCP/UDP MTU"
 msgstr ""
 
 #. Enable Path MTU discovery
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:83
-msgid "openvpn_param_mtu_disc"
+msgid "Enable Path MTU discovery"
 msgstr ""
 
 #. Empirically measure MTU
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:84
-msgid "openvpn_param_mtu_test"
+msgid "Empirically measure MTU"
 msgstr ""
 
 #. Enable internal datagram fragmentation
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:85
-msgid "openvpn_param_fragment"
+msgid "Enable internal datagram fragmentation"
 msgstr ""
 
 #. Set upper bound on TCP MSS
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:86
-msgid "openvpn_param_mssfix"
+msgid "Set upper bound on TCP MSS"
 msgstr ""
 
 #. Set the TCP/UDP send buffer size
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:87
-msgid "openvpn_param_sndbuf"
+msgid "Set the TCP/UDP send buffer size"
 msgstr ""
 
 #. Set the TCP/UDP receive buffer size
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:88
-msgid "openvpn_param_rcvbuf"
+msgid "Set the TCP/UDP receive buffer size"
 msgstr ""
 
 #. Set tun/tap TX queue length
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:89
-msgid "openvpn_param_txqueuelen"
+msgid "Set tun/tap TX queue length"
 msgstr ""
 
 #. Disable Paging
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:90
-msgid "openvpn_param_mlock"
+msgid "Disable Paging"
 msgstr ""
 
 #. Shell cmd to execute after tun device open
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:91
-msgid "openvpn_param_up"
+msgid "Shell cmd to execute after tun device open"
 msgstr ""
 
 #. Delay tun/tap open and up script execution
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:92
-msgid "openvpn_param_up_delay"
+msgid "Delay tun/tap open and up script execution"
 msgstr ""
 
 #. Shell cmd to run after tun device close
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:93
-msgid "openvpn_param_down"
+msgid "Shell cmd to run after tun device close"
 msgstr ""
 
 #. Call down cmd/script before TUN/TAP close
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:94
-msgid "openvpn_param_down_pre"
+msgid "Call down cmd/script before TUN/TAP close"
 msgstr ""
 
 #. Run up/down scripts for all restarts
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:95
-msgid "openvpn_param_up_restart"
+msgid "Run up/down scripts for all restarts"
 msgstr ""
 
 #. Set UID to user
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:96
-msgid "openvpn_param_user"
+msgid "Set UID to user"
 msgstr ""
 
 #. Set GID to group
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:97
-msgid "openvpn_param_group"
+msgid "Set GID to group"
 msgstr ""
 
 #. Chroot to directory after initialization
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:98
-msgid "openvpn_param_chroot"
+msgid "Chroot to directory after initialization"
 msgstr ""
 
 #. Change to directory before initialization
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:99
-msgid "openvpn_param_cd"
+msgid "Change to directory before initialization"
 msgstr ""
 
 #. Daemonize after initialization
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:100
-msgid "openvpn_param_daemon"
+msgid "Daemonize after initialization"
 msgstr ""
 
 #. Output to syslog and do not daemonize
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:101
-msgid "openvpn_param_syslog"
+msgid "Output to syslog and do not daemonize"
 msgstr ""
 
 #. Run as an inetd or xinetd server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:102
-msgid "openvpn_param_inetd"
+msgid "Run as an inetd or xinetd server"
 msgstr ""
 
 #. Write log to file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:103
-msgid "openvpn_param_log"
+msgid "Write log to file"
 msgstr ""
 
 #. Append log to file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:104
-msgid "openvpn_param_log_append"
+msgid "Append log to file"
 msgstr ""
 
 #. Don't log timestamps
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:105
-msgid "openvpn_param_suppress_timestamps"
+msgid "Don't log timestamps"
 msgstr ""
 
 #. Write process ID to file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:106
-msgid "openvpn_param_writepid"
+msgid "Write process ID to file"
 msgstr ""
 
 #. Change process priority
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:107
-msgid "openvpn_param_nice"
+msgid "Change process priority"
 msgstr ""
 
 #. Echo parameters to log
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:108
-msgid "openvpn_param_echo"
+msgid "Echo parameters to log"
 msgstr ""
 
 #. Set output verbosity
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:109
-msgid "openvpn_param_verb"
+msgid "Set output verbosity"
 msgstr ""
 
 #. Limit repeated log messages
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:110
-msgid "openvpn_param_mute"
+msgid "Limit repeated log messages"
 msgstr ""
 
 #. Write status to file every n seconds
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:111
-msgid "openvpn_param_status"
+msgid "Write status to file every n seconds"
 msgstr ""
 
 #. Status file format version
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:112
-msgid "openvpn_param_status_version"
+msgid "Status file format version"
 msgstr ""
 
 #. Disable options consistency check
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:113
-msgid "openvpn_param_disable_occ"
+msgid "Disable options consistency check"
 msgstr ""
 
 #. Special stress testing mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:114
-msgid "openvpn_param_gremlin"
+msgid "Special stress testing mode"
 msgstr ""
 
 #. Use fast LZO compression
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:115
-msgid "openvpn_param_comp_lzo"
+msgid "Use fast LZO compression"
 msgstr ""
 
 #. Don't use adaptive lzo compression
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:116
-msgid "openvpn_param_comp_noadapt"
+msgid "Don't use adaptive lzo compression"
 msgstr ""
 
 #. Enable management interface on <em>IP</em> <em>port</em>
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:117
-msgid "openvpn_param_management"
+msgid "Enable management interface on <em>IP</em> <em>port</em>"
 msgstr ""
 
 #. Management interface will connect as a TCP client
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:118
-msgid "openvpn_param_management_client"
+msgid "Management interface will connect as a TCP client"
 msgstr ""
 
 #. Query management channel for private key
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:119
-msgid "openvpn_param_management_query_passwords"
+msgid "Query management channel for private key"
 msgstr ""
 
 #. Start OpenVPN in a hibernating state
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:120
-msgid "openvpn_param_management_hold"
+msgid "Start OpenVPN in a hibernating state"
 msgstr ""
 
 #. Issue SIGUSR1 on management disconnect
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:121
-msgid "openvpn_param_management_signal"
+msgid "Issue SIGUSR1 on management disconnect"
 msgstr ""
 
 #. Forget passwords on management disconnect
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:122
-msgid "openvpn_param_management_forget_disconnect"
+msgid "Forget passwords on management disconnect"
 msgstr ""
 
 #. Number of lines for log file history
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:123
-msgid "openvpn_param_management_log_cache"
+msgid "Number of lines for log file history"
 msgstr ""
 
 #. Load plug-in module
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:124
-msgid "openvpn_param_plugin"
+msgid "Load plug-in module"
 msgstr ""
 
 #. Configure server mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:125
-msgid "openvpn_param_server"
+msgid "Configure server mode"
 msgstr ""
 
 #. Configure server bridge
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:126
-msgid "openvpn_param_server_bridge"
+msgid "Configure server bridge"
 msgstr ""
 
 #. Push options to peer
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:127
-msgid "openvpn_param_push"
+msgid "Push options to peer"
 msgstr ""
 
 #. Don't inherit global push options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:128
-msgid "openvpn_param_push_reset"
+msgid "Don't inherit global push options"
 msgstr ""
 
 #. Set aside a pool of subnets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:129
-msgid "openvpn_param_ifconfig_pool"
+msgid "Set aside a pool of subnets"
 msgstr ""
 
 #. Use individual addresses rather than /30 subnets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:130
-msgid "openvpn_param_ifconfig_pool_linear"
+msgid "Use individual addresses rather than /30 subnets"
 msgstr ""
 
 #. Persist/unpersist ifconfig-pool
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:131
-msgid "openvpn_param_ifconfig_pool_persist"
+msgid "Persist/unpersist ifconfig-pool"
 msgstr ""
 
 #. Push an ifconfig option to remote
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:132
-msgid "openvpn_param_ifconfig_push"
+msgid "Push an ifconfig option to remote"
 msgstr ""
 
 #. Route subnet to client
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:133
-msgid "openvpn_param_iroute"
+msgid "Route subnet to client"
 msgstr ""
 
 #. Client is disabled
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:134
-msgid "openvpn_param_disable"
+msgid "Client is disabled"
 msgstr ""
 
 #. Don't require client certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:135
-msgid "openvpn_param_client_cert_not_required"
+msgid "Don't require client certificate"
 msgstr ""
 
 #. Use username as common name
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:136
-msgid "openvpn_param_username_as_common_name"
+msgid "Use username as common name"
 msgstr ""
 
 #. Script to verify interactive authentication
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:137
-msgid "openvpn_param_auth_user_pass_verify"
+msgid "Script to verify interactive authentication"
 msgstr ""
 
 #. Allow client-to-client traffic
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:138
-msgid "openvpn_param_client_to_client"
+msgid "Allow client-to-client traffic"
 msgstr ""
 
 #. Allow multiple clients with same certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:139
-msgid "openvpn_param_duplicate_cn"
+msgid "Allow multiple clients with same certificate"
 msgstr ""
 
 #. Run script cmd on client connection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:140
-msgid "openvpn_param_client_connect"
+msgid "Run script cmd on client connection"
 msgstr ""
 
 #. Run script cmd on client disconnection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:141
-msgid "openvpn_param_client_disconnect"
+msgid "Run script cmd on client disconnection"
 msgstr ""
 
 #. Directory for custom client config files
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:142
-msgid "openvpn_param_client_config_dir"
+msgid "Directory for custom client config files"
 msgstr ""
 
 #. Refuse connection if no custom client config
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:143
-msgid "openvpn_param_ccd_exclusive"
+msgid "Refuse connection if no custom client config"
 msgstr ""
 
 #. Temporary directory for client-connect return file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:144
-msgid "openvpn_param_tmp_dir"
+msgid "Temporary directory for client-connect return file"
 msgstr ""
 
 #. Set size of real and virtual address hash tables
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:145
-msgid "openvpn_param_hash_size"
+msgid "Set size of real and virtual address hash tables"
 msgstr ""
 
 #. Number of allocated broadcast buffers
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:146
-msgid "openvpn_param_bcast_buffers"
+msgid "Number of allocated broadcast buffers"
 msgstr ""
 
 #. Maximum number of queued TCP output packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:147
-msgid "openvpn_param_tcp_queue_limit"
+msgid "Maximum number of queued TCP output packets"
 msgstr ""
 
 #. Script to validate client virtual addresses
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:148
-msgid "openvpn_param_learn_address"
+msgid "Script to validate client virtual addresses"
 msgstr ""
 
 #. Allowed maximum of new connections
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:149
-msgid "openvpn_param_connect_freq"
+msgid "Allowed maximum of new connections"
 msgstr ""
 
 #. Allowed maximum of connected clients
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:150
-msgid "openvpn_param_max_clients"
+msgid "Allowed maximum of connected clients"
 msgstr ""
 
 #. Allowed maximum of internal
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:151
-msgid "openvpn_param_max_routes_per_client"
+msgid "Allowed maximum of internal"
 msgstr ""
 
 #. Proxy incoming HTTPS sessions
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:152
-msgid "openvpn_param_port_share"
+msgid "Proxy incoming HTTPS sessions"
 msgstr ""
 
 #. Configure client mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:153
-msgid "openvpn_param_client"
+msgid "Configure client mode"
 msgstr ""
 
 #. Authenticate using username/password
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:154
-msgid "openvpn_param_auth_user_pass"
+msgid "Authenticate using username/password"
 msgstr ""
 
 #. Accept options pushed from server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:155
-msgid "openvpn_param_pull"
+msgid "Accept options pushed from server"
 msgstr ""
 
 #. Handling of authentication failures
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:156
-msgid "openvpn_param_auth_retry"
+msgid "Handling of authentication failures"
 msgstr ""
 
 #. Send notification to peer on disconnect
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:157
-msgid "openvpn_param_explicit_exit_notify"
+msgid "Send notification to peer on disconnect"
 msgstr ""
 
 #. Enable Static Key encryption mode (non-TLS)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:158
-msgid "openvpn_param_secret"
+msgid "Enable Static Key encryption mode (non-TLS)"
 msgstr ""
 
 #. HMAC authentication for packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:159
-msgid "openvpn_param_auth"
+msgid "HMAC authentication for packets"
 msgstr ""
 
 #. Encryption cipher for packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:160
-msgid "openvpn_param_cipher"
+msgid "Encryption cipher for packets"
 msgstr ""
 
 #. Size of cipher key
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:161
-msgid "openvpn_param_keysize"
+msgid "Size of cipher key"
 msgstr ""
 
 #. Enable OpenSSL hardware crypto engines
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:162
-msgid "openvpn_param_engine"
+msgid "Enable OpenSSL hardware crypto engines"
 msgstr ""
 
 #. Disable replay protection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:163
-msgid "openvpn_param_no_replay"
+msgid "Disable replay protection"
 msgstr ""
 
 #. Silence the output of replay warnings
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:164
-msgid "openvpn_param_mute_replay_warnings"
+msgid "Silence the output of replay warnings"
 msgstr ""
 
 #. Replay protection sliding window size
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:165
-msgid "openvpn_param_replay_window"
+msgid "Replay protection sliding window size"
 msgstr ""
 
 #. Disable cipher initialisation vector
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:166
-msgid "openvpn_param_no_iv"
+msgid "Disable cipher initialisation vector"
 msgstr ""
 
 #. Persist replay-protection state
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:167
-msgid "openvpn_param_replay_persist"
+msgid "Persist replay-protection state"
 msgstr ""
 
 #. Run a self-test of crypto features
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:168
-msgid "openvpn_param_test_crypto"
+msgid "Run a self-test of crypto features"
 msgstr ""
 
 #. Enable TLS and assume server role
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:169
-msgid "openvpn_param_tls_server"
+msgid "Enable TLS and assume server role"
 msgstr ""
 
 #. Enable TLS and assume client role
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:170
-msgid "openvpn_param_tls_client"
+msgid "Enable TLS and assume client role"
 msgstr ""
 
 #. Data channel key exchange method
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:171
-msgid "openvpn_param_key_method"
+msgid "Data channel key exchange method"
 msgstr ""
 
 #. Certificate authority
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:172
-msgid "openvpn_param_ca"
+msgid "Certificate authority"
 msgstr ""
 
 #. Directory of trusted certificates (CAs and CRLs)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:173
-msgid "openvpn_param_capath"
+msgid "Directory of trusted certificates (CAs and CRLs)"
 msgstr ""
 
 #. Diffie Hellman parameters
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:174
-msgid "openvpn_param_dh"
+msgid "Diffie Hellman parameters"
 msgstr ""
 
 #. Local certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:175
-msgid "openvpn_param_cert"
+msgid "Local certificate"
 msgstr ""
 
 #. Local private key
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:176
-msgid "openvpn_param_key"
+msgid "Local private key"
 msgstr ""
 
 #. PKCS#12 file containing keys
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:177
-msgid "openvpn_param_pkcs12"
+msgid "PKCS#12 file containing keys"
 msgstr ""
 
 #. TLS cipher
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:178
-msgid "openvpn_param_tls_cipher"
+msgid "TLS cipher"
 msgstr ""
 
 #. Retransmit timeout on TLS control channel
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:179
-msgid "openvpn_param_tls_timeout"
+msgid "Retransmit timeout on TLS control channel"
 msgstr ""
 
 #. Renegotiate data chan. key after bytes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:180
-msgid "openvpn_param_reneg_bytes"
+msgid "Renegotiate data chan. key after bytes"
 msgstr ""
 
 #. Renegotiate data chan. key after packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:181
-msgid "openvpn_param_reneg_pkts"
+msgid "Renegotiate data chan. key after packets"
 msgstr ""
 
 #. Renegotiate data chan. key after seconds
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:182
-msgid "openvpn_param_reneg_sec"
+msgid "Renegotiate data chan. key after seconds"
 msgstr ""
 
 #. Timeframe for key exchange
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:183
-msgid "openvpn_param_hand_window"
+msgid "Timeframe for key exchange"
 msgstr ""
 
 #. Key transition window
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:184
-msgid "openvpn_param_tran_window"
+msgid "Key transition window"
 msgstr ""
 
 #. Allow only one session
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:185
-msgid "openvpn_param_single_session"
+msgid "Allow only one session"
 msgstr ""
 
 #. Exit on TLS negotiation failure
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:186
-msgid "openvpn_param_tls_exit"
+msgid "Exit on TLS negotiation failure"
 msgstr ""
 
 #. Additional authentication over TLS
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:187
-msgid "openvpn_param_tls_auth"
+msgid "Additional authentication over TLS"
 msgstr ""
 
 #. Get PEM password from controlling tty before we daemonize
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:188
-msgid "openvpn_param_askpass"
+msgid "Get PEM password from controlling tty before we daemonize"
 msgstr ""
 
 #. Don't cache --askpass or --auth-user-pass passwords
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:189
-msgid "openvpn_param_auth_nocache"
+msgid "Don't cache --askpass or --auth-user-pass passwords"
 msgstr ""
 
 #. Check peer certificate against a CRL
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:190
-msgid "openvpn_param_crl_verify"
+msgid "Check peer certificate against a CRL"
 msgstr ""
 
 #. Shell command to verify X509 name
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:191
-msgid "openvpn_param_tls_verify"
+msgid "Shell command to verify X509 name"
 msgstr ""
 
 #. Only accept connections from given X509 name
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:192
-msgid "openvpn_param_tls_remote"
+msgid "Only accept connections from given X509 name"
 msgstr ""
 
 #. Require explicit designation on certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:193
-msgid "openvpn_param_ns_cert_type"
+msgid "Require explicit designation on certificate"
 msgstr ""
 
 #. Require explicit key usage on certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:194
-msgid "openvpn_param_remote_cert_ku"
+msgid "Require explicit key usage on certificate"
 msgstr ""
 
 #. Require extended explicit key usage on certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:195
-msgid "openvpn_param_remote_cert_eku"
+msgid "Require extended explicit key usage on certificate"
 msgstr ""
 
 #. Require normal and extended key usage on certificate
diff --git a/po/ja/p910nd.po b/po/ja/p910nd.po
index a8b125c5f..9a5e7e0c0 100644
--- a/po/ja/p910nd.po
+++ b/po/ja/p910nd.po
@@ -14,17 +14,17 @@ msgstr ""
 
 #. p910nd - Printer server
 #: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:1
-msgid "p910nd"
+msgid "p910nd - Printer server"
 msgstr ""
 
 #. First you have to install the packages to get support for USB (kmod-usb-printer) or parallel port (kmod-lp).
 #: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:2
-msgid "p910nd_desc"
+msgid "First you have to install the packages to get support for USB (kmod-usb-printer) or parallel port (kmod-lp)."
 msgstr ""
 
 #. Bidirectional mode
 #: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:3
-msgid "bidirectional"
+msgid "Bidirectional mode"
 msgstr ""
 
 #. p910nd listens on port 910+N. E.g. 9100 for the first printer.
diff --git a/po/ja/polipo.po b/po/ja/polipo.po
index 82b0d7db3..d8f454a1c 100644
--- a/po/ja/polipo.po
+++ b/po/ja/polipo.po
@@ -14,212 +14,212 @@ msgstr ""
 
 #. Polipo
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:1
-msgid "polipo"
+msgid "Polipo"
 msgstr ""
 
 #. On-Disk Cache
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:2
-msgid "polipo_cache"
+msgid "On-Disk Cache"
 msgstr ""
 
 #. Shared cache
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:3
-msgid "polipo_cache_cacheisshared"
+msgid "Shared cache"
 msgstr ""
 
 #. Enable if cache (proxy) is shared by multiple users.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:4
-msgid "polipo_cache_cacheisshared_desc"
+msgid "Enable if cache (proxy) is shared by multiple users."
 msgstr ""
 
 #. To enable polipo on-disk cache cleaning (highly recommended), you should add a cron job in Scheduled Tasks services that will execute /usr/sbin/polipo_purge script. For example to perform disk cache cleanup every day at 6:00 in the morning you should add the following line in Scheduled Tasks &quot;0 6 * * *	/usr/sbin/polipo_purge&quot; (without quotes).
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:5
-msgid "polipo_cache_desc"
+msgid "To enable polipo on-disk cache cleaning (highly recommended), you should add a cron job in Scheduled Tasks services that will execute /usr/sbin/polipo_purge script. For example to perform disk cache cleanup every day at 6:00 in the morning you should add the following line in Scheduled Tasks \"0 6 * * *\\t/usr/sbin/polipo_purge\" (without quotes)."
 msgstr ""
 
 #. Disk cache location
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:6
-msgid "polipo_cache_diskcacheroot"
+msgid "Disk cache location"
 msgstr ""
 
 #. Location where polipo will cache files permanently. Use of external storage devices is recommended, because the cache can grow considerably. Leave it empty to disable on-disk cache.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:7
-msgid "polipo_cache_diskcacheroot_desc"
+msgid "Location where polipo will cache files permanently. Use of external storage devices is recommended, because the cache can grow considerably. Leave it empty to disable on-disk cache."
 msgstr ""
 
 #. Truncate cache files size (in bytes)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:8
-msgid "polipo_cache_diskcachetruncatesize"
+msgid "Truncate cache files size (in bytes)"
 msgstr ""
 
 #. Size to which cached files should be truncated. (default value: 1048576)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:9
-msgid "polipo_cache_diskcachetruncatesize_desc"
+msgid "Size to which cached files should be truncated. (default value: 1048576)"
 msgstr ""
 
 #. Truncate cache files time
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:10
-msgid "polipo_cache_diskcachetruncatetime"
+msgid "Truncate cache files time"
 msgstr ""
 
 #. Time after which cached files will be truncated. (default value: 4d12h)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:11
-msgid "polipo_cache_diskcachetruncatetime_desc"
+msgid "Time after which cached files will be truncated. (default value: 4d12h)"
 msgstr ""
 
 #. Delete cache files time
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:12
-msgid "polipo_cache_diskcacheunlinktime"
+msgid "Delete cache files time"
 msgstr ""
 
 #. Time after which cached files will be deleted. (default value: 32d)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:13
-msgid "polipo_cache_diskcacheunlinktime_desc"
+msgid "Time after which cached files will be deleted. (default value: 32d)"
 msgstr ""
 
 #. Polipo is a small and fast caching web proxy.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:14
-msgid "polipo_desc"
+msgid "Polipo is a small and fast caching web proxy."
 msgstr ""
 
 #. General
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:15
-msgid "polipo_general"
+msgid "General"
 msgstr ""
 
 #. Allowed clients
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:16
-msgid "polipo_general_allowedclients"
+msgid "Allowed clients"
 msgstr ""
 
 #. When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients that are allowed to connect. The format is IP address or network address (192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6)).
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:17
-msgid "polipo_general_allowedclients_desc"
+msgid "When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients that are allowed to connect. The format is IP address or network address (192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))."
 msgstr ""
 
 #. In RAM cache size (in bytes)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:18
-msgid "polipo_general_chunkhighmark"
+msgid "In RAM cache size (in bytes)"
 msgstr ""
 
 #. How much RAM should Polipo use for its cache.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:19
-msgid "polipo_general_chunkhighmark_desc"
+msgid "How much RAM should Polipo use for its cache."
 msgstr ""
 
 #. DNS server address
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:20
-msgid "polipo_general_dnsnameserver"
+msgid "DNS server address"
 msgstr ""
 
 #. Set the DNS server address to use, if you want Polipo to use different DNS server than the host system.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:21
-msgid "polipo_general_dnsnameserver_desc"
+msgid "Set the DNS server address to use, if you want Polipo to use different DNS server than the host system."
 msgstr ""
 
 #. Query DNS for IPv6
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:22
-msgid "polipo_general_dnsqueryipv6"
+msgid "Query DNS for IPv6"
 msgstr ""
 
 #. false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = Query both, prefer IPv6; true = Query only IPv6
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:23
-msgid "polipo_general_dnsqueryipv6_desc"
+msgid "false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = Query both, prefer IPv6; true = Query only IPv6"
 msgstr ""
 
 #. Query DNS by hostname
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:24
-msgid "polipo_general_dnsusegethostbyname"
+msgid "Query DNS by hostname"
 msgstr ""
 
 #. false = Never use system DNS resolver; reluctantly = Query DNS directly, if DNS server is unavailable fail to system DNS resolver; happily = Query DNS directly, if host could not be found fallback to system DNS resolver; true = Always use system DNS resolver
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:25
-msgid "polipo_general_dnsusegethostbyname_desc"
+msgid "false = Never use system DNS resolver; reluctantly = Query DNS directly, if DNS server is unavailable fail to system DNS resolver; happily = Query DNS directly, if host could not be found fallback to system DNS resolver; true = Always use system DNS resolver"
 msgstr ""
 
 #. Syslog facility
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:26
-msgid "polipo_general_logfacility"
+msgid "Syslog facility"
 msgstr ""
 
 #. Log file location
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:27
-msgid "polipo_general_logfile"
+msgid "Log file location"
 msgstr ""
 
 #. Use of external storage device is recommended, because the log file is written frequently and can grow considerably.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:28
-msgid "polipo_general_logfile_desc"
+msgid "Use of external storage device is recommended, because the log file is written frequently and can grow considerably."
 msgstr ""
 
 #. Log to syslog
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:29
-msgid "polipo_general_logsyslog"
+msgid "Log to syslog"
 msgstr ""
 
 #. Parent proxy authentication
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:30
-msgid "polipo_general_parentauthcredentials"
+msgid "Parent proxy authentication"
 msgstr ""
 
 #. Basic HTTP authentication supported. Provide username and password in username:password format.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:31
-msgid "polipo_general_parentauthcredentials_desc"
+msgid "Basic HTTP authentication supported. Provide username and password in username:password format."
 msgstr ""
 
 #. Parent proxy address
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:32
-msgid "polipo_general_parentproxy"
+msgid "Parent proxy address"
 msgstr ""
 
 #. Parent proxy address (in host:port format), to which Polipo will forward the requests.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:33
-msgid "polipo_general_parentproxy_desc"
+msgid "Parent proxy address (in host:port format), to which Polipo will forward the requests."
 msgstr ""
 
 #. Listen address
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:34
-msgid "polipo_general_proxyaddress"
+msgid "Listen address"
 msgstr ""
 
 #. The interface on which Polipo will listen. To listen on all interfaces use 0.0.0.0 or :: (IPv6).
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:35
-msgid "polipo_general_proxyaddress_desc"
+msgid "The interface on which Polipo will listen. To listen on all interfaces use 0.0.0.0 or :: (IPv6)."
 msgstr ""
 
 #. Listen port
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:36
-msgid "polipo_general_proxyport"
+msgid "Listen port"
 msgstr ""
 
 #. Port on which Polipo will listen. (default value: 8123)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:37
-msgid "polipo_general_proxyport_desc"
+msgid "Port on which Polipo will listen. (default value: 8123)"
 msgstr ""
 
 #. Poor Man&#39;s Multiplexing
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:38
-msgid "polipo_pmm"
+msgid "Poor Man's Multiplexing"
 msgstr ""
 
 #. Poor Man&#39;s Multiplexing (PMM) is a technique that simulates multiplexing by requesting an instance in multiple segments. It tries to lower the latency caused by the weakness of HTTP protocol. NOTE: some sites may not work with PMM enabled.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:39
-msgid "polipo_pmm_desc"
+msgid "Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by requesting an instance in multiple segments. It tries to lower the latency caused by the weakness of HTTP protocol. NOTE: some sites may not work with PMM enabled."
 msgstr ""
 
 #. First PMM segment size (in bytes)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:40
-msgid "polipo_pmm_pmmfirstsize"
+msgid "First PMM segment size (in bytes)"
 msgstr ""
 
 #. Size of the first PMM segment. If not defined, it defaults to twice the PMM segment size.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:41
-msgid "polipo_pmm_pmmfirstsize_desc"
+msgid "Size of the first PMM segment. If not defined, it defaults to twice the PMM segment size."
 msgstr ""
 
 #. PMM segments size (in bytes)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:42
-msgid "polipo_pmm_pmmsize"
+msgid "PMM segments size (in bytes)"
 msgstr ""
 
 #. To enable PMM, PMM segment size must be set to some positive value.
diff --git a/po/ja/qos.po b/po/ja/qos.po
index ae142a01c..72480aefa 100644
--- a/po/ja/qos.po
+++ b/po/ja/qos.po
@@ -14,87 +14,87 @@ msgstr ""
 
 #. Quality of Service
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:1
-msgid "qos"
+msgid "Quality of Service"
 msgstr ""
 
 #. With QoS you can priorize network traffic selected by adresses, ports or services.
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:2
-msgid "qos_desc"
+msgid "With QoS you can priorize network traffic selected by adresses, ports or services."
 msgstr ""
 
 #. Classification
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:3
-msgid "qos_interface_classgroup"
+msgid "Classification"
 msgstr ""
 
 #. Calculate Overhead
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:4
-msgid "qos_interface_overhead"
+msgid "Calculate Overhead"
 msgstr ""
 
 #. Downlink
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:5
-msgid "qos_interface_download"
+msgid "Downlink"
 msgstr ""
 
 #. Uplink
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:6
-msgid "qos_interface_upload"
+msgid "Uplink"
 msgstr ""
 
 #. Prioritization
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:7
-msgid "qos_classify"
+msgid "Prioritization"
 msgstr ""
 
 #. Priority
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:8
-msgid "qos_classify_target"
+msgid "Priority"
 msgstr ""
 
 #. Source address
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:9
-msgid "qos_classify_srchost"
+msgid "Source address"
 msgstr ""
 
 #. source network / source host
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:10
-msgid "qos_classify_srchost_dest"
+msgid "source network / source host"
 msgstr ""
 
 #. Target address
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:11
-msgid "qos_classify_dsthost"
+msgid "Target address"
 msgstr ""
 
 #. target network / target host
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:12
-msgid "qos_classify_dsthost_dest"
+msgid "target network / target host"
 msgstr ""
 
 #. portrange
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:13
-msgid "qos_classify_portrange"
+msgid "portrange"
 msgstr ""
 
 #. low
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:14
-msgid "qos_bulk"
+msgid "low"
 msgstr ""
 
 #. normal
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:15
-msgid "qos_normal"
+msgid "normal"
 msgstr ""
 
 #. express
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:16
-msgid "qos_express"
+msgid "express"
 msgstr ""
 
 #. priority
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:17
-msgid "qos_priority"
+msgid "priority"
 msgstr ""
 
 #. Bytes sent
diff --git a/po/ja/rrdtool.po b/po/ja/rrdtool.po
index 95545db6d..135d1b3f9 100644
--- a/po/ja/rrdtool.po
+++ b/po/ja/rrdtool.po
@@ -14,342 +14,342 @@ msgstr ""
 
 #. %H: Wireless - Signal Noise Ratio
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:1
-msgid "stat_dg_title_wireless__signal_noise"
+msgid "%H: Wireless - Signal Noise Ratio"
 msgstr ""
 
 #. dBm
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:2
-msgid "stat_dg_label_wireless__signal_noise"
+msgid "dBm"
 msgstr ""
 
 #. Noise Level
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:3
-msgid "stat_ds_signal_noise"
+msgid "Noise Level"
 msgstr ""
 
 #. Signal Strength
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:4
-msgid "stat_ds_signal_power"
+msgid "Signal Strength"
 msgstr ""
 
 #. %H: Wireless - Signal Quality
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:5
-msgid "stat_dg_title_wireless__signal_quality"
+msgid "%H: Wireless - Signal Quality"
 msgstr ""
 
 #. n
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:6
-msgid "stat_dg_label_wireless__signal_quality"
+msgid "n"
 msgstr ""
 
 #. Signal Quality
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:7
-msgid "stat_ds_signal_quality"
+msgid "Signal Quality"
 msgstr ""
 
 #. %H: ICMP Roundtrip Times
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:8
-msgid "stat_dg_title_ping"
+msgid "%H: ICMP Roundtrip Times"
 msgstr ""
 
 #. ms
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:9
-msgid "stat_dg_label_ping"
+msgid "ms"
 msgstr ""
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:10
-msgid "stat_ds_ping"
+msgid "%di"
 msgstr ""
 
 #. %H: Firewall - Processed Packets
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:11
-msgid "stat_dg_title_iptables__ipt_packets"
+msgid "%H: Firewall - Processed Packets"
 msgstr ""
 
 #. Packets/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:12
-msgid "stat_dg_label_iptables__ipt_packets"
+msgid "Packets/s"
 msgstr ""
 
 #. Chain \"%di\"
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:13
-msgid "stat_ds_ipt_packets"
+msgid "Chain \"%di\""
 msgstr ""
 
 #. %H: Netlink - Transfer on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:14
-msgid "stat_dg_title_netlink__if_octets"
+msgid "%H: Netlink - Transfer on %pi"
 msgstr ""
 
 #. Bytes/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:15
-msgid "stat_dg_label_netlink__if_octets"
+msgid "Bytes/s"
 msgstr ""
 
 #. Bytes (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:16
-msgid "stat_ds_if_octets"
+msgid "Bytes (%ds)"
 msgstr ""
 
 #. %H: Netlink - Packets on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:17
-msgid "stat_dg_title_netlink__if_packets"
+msgid "%H: Netlink - Packets on %pi"
 msgstr ""
 
 #. Packets/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:18
-msgid "stat_dg_label_netlink__if_packets"
+msgid "Packets/s"
 msgstr ""
 
 #. Processed (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:19
-msgid "stat_ds_if_packets"
+msgid "Processed (%ds)"
 msgstr ""
 
 #. Dropped   (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:20
-msgid "stat_ds_if_dropped"
+msgid "Dropped (%ds)"
 msgstr ""
 
 #. Errors    (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:21
-msgid "stat_ds_if_errors"
+msgid "Errors (%ds)"
 msgstr ""
 
 #. %H: Netlink - Multicast on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:22
-msgid "stat_dg_title_netlink__if_multicast"
+msgid "%H: Netlink - Multicast on %pi"
 msgstr ""
 
 #. Packets/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:23
-msgid "stat_dg_label_netlink__if_multicast"
+msgid "Packets/s"
 msgstr ""
 
 #. Packets
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:24
-msgid "stat_ds_if_multicast"
+msgid "Packets"
 msgstr ""
 
 #. %H: Netlink - Collisions on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:25
-msgid "stat_dg_title_netlink__if_collisions"
+msgid "%H: Netlink - Collisions on %pi"
 msgstr ""
 
 #. Collisions/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:26
-msgid "stat_dg_label_netlink__if_collisions"
+msgid "Collisions/s"
 msgstr ""
 
 #. Collisions
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:27
-msgid "stat_ds_if_collisions"
+msgid "Collisions"
 msgstr ""
 
 #. %H: Netlink - Errors on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:28
-msgid "stat_dg_title_netlink__if_tx_errors"
+msgid "%H: Netlink - Errors on %pi"
 msgstr ""
 
 #. Errors/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:29
-msgid "stat_dg_label_netlink__if_tx_errors"
+msgid "Errors/s"
 msgstr ""
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:30
-msgid "stat_ds_if_tx_errors"
+msgid "%di"
 msgstr ""
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:31
-msgid "stat_ds_if_rx_errors"
+msgid "%di"
 msgstr ""
 
 #. %H: Processes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:32
-msgid "stat_dg_title_processes"
+msgid "%H: Processes"
 msgstr ""
 
 #. Processes/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:33
-msgid "stat_dg_label_processes"
+msgid "Processes/s"
 msgstr ""
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:34
-msgid "stat_ds_ps_state"
+msgid "%di"
 msgstr ""
 
 #. %H: Process %pi - used cpu time
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:35
-msgid "stat_dg_title_processes__ps_cputime"
+msgid "%H: Process %pi - used cpu time"
 msgstr ""
 
 #. Jiffies
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:36
-msgid "stat_dg_label_processes__ps_cputime"
+msgid "Jiffies"
 msgstr ""
 
 #. system
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:37
-msgid "stat_ds_ps_cputime__syst"
+msgid "System"
 msgstr ""
 
 #. user
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:38
-msgid "stat_ds_ps_cputime__user"
+msgid "user"
 msgstr ""
 
 #. %H: Process %pi - threads and processes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:39
-msgid "stat_dg_title_processes__ps_count"
+msgid "%H: Process %pi - threads and processes"
 msgstr ""
 
 #. Count
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:40
-msgid "stat_dg_label_processes__ps_count"
+msgid "Count"
 msgstr ""
 
 #. %ds
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:41
-msgid "stat_ds_ps_count"
+msgid "%ds"
 msgstr ""
 
 #. %H: Process %pi - page faults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:42
-msgid "stat_dg_title_processes__ps_pagefaults"
+msgid "%H: Process %pi - page faults"
 msgstr ""
 
 #. Pagefaults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:43
-msgid "stat_dg_label_processes__ps_pagefaults"
+msgid "Pagefaults"
 msgstr ""
 
 #. page faults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:44
-msgid "stat_ds_ps_pagefaults"
+msgid "page faults"
 msgstr ""
 
 #. %H: Process %pi - virtual memory size
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:45
-msgid "stat_dg_title_processes__ps_rss"
+msgid "%H: Process %pi - virtual memory size"
 msgstr ""
 
 #. Bytes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:46
-msgid "stat_dg_label_processes__ps_rss"
+msgid "Bytes"
 msgstr ""
 
 #. virtual memory
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:47
-msgid "stat_ds_ps_rss"
+msgid "virtual memory"
 msgstr ""
 
 #. %H: Usage on Processor #%pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:48
-msgid "stat_dg_title_cpu"
+msgid "%H: Usage on Processor #%pi"
 msgstr ""
 
 #. %
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:49
-msgid "stat_dg_label_cpu"
+msgid "%"
 msgstr ""
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:50
-msgid "stat_ds_cpu"
+msgid "%di"
 msgstr ""
 
 #. %H: Transfer on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:51
-msgid "stat_dg_title_interface__if_octets"
+msgid "%H: Transfer on %di"
 msgstr ""
 
 #. Bytes/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:52
-msgid "stat_dg_label_interface__if_octets"
+msgid "Bytes/s"
 msgstr ""
 
 #. %H: Packets on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:53
-msgid "stat_dg_title_interface__if_packets"
+msgid "%H: Packets on %di"
 msgstr ""
 
 #. Packets/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:54
-msgid "stat_dg_label_interface__if_packets"
+msgid "Packets/s"
 msgstr ""
 
 #. %H: TCP-Connections to Port %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:55
-msgid "stat_dg_title_tcpconns"
+msgid "%H: TCP-Connections to Port %pi"
 msgstr ""
 
 #. Connections/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:56
-msgid "stat_dg_label_tcpconns"
+msgid "Connections/s"
 msgstr ""
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:57
-msgid "stat_ds_tcp_connections"
+msgid "%di"
 msgstr ""
 
 #. %H: Disk Space Usage on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:58
-msgid "stat_dg_title_df"
+msgid "%H: Disk Space Usage on %di"
 msgstr ""
 
 #. Bytes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:59
-msgid "stat_dg_label_df"
+msgid "Bytes"
 msgstr ""
 
 #. %ds
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:60
-msgid "stat_ds_df__free"
+msgid "%ds"
 msgstr ""
 
 #. %ds
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:61
-msgid "stat_ds_df__used"
+msgid "%ds"
 msgstr ""
 
 #. %H: Interrupts
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:62
-msgid "stat_dg_title_irq"
+msgid "%H: Interrupts"
 msgstr ""
 
 #. Issues/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:63
-msgid "stat_dg_label_irq"
+msgid "Issues/s"
 msgstr ""
 
 #. IRQ %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:64
-msgid "stat_ds_irq"
+msgid "IRQ %di"
 msgstr ""
 
 #. %H: System Load
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:65
-msgid "stat_dg_title_load"
+msgid "%H: System Load"
 msgstr ""
 
 #. Load
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:66
-msgid "stat_dg_label_load"
+msgid "Load"
 msgstr ""
 
 #. 1 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:67
-msgid "stat_ds_load__shortterm"
+msgid "1 min"
 msgstr ""
 
 #. 5 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:68
-msgid "stat_ds_load__midterm"
+msgid "5 min"
 msgstr ""
 
 #. 15 min
diff --git a/po/ja/samba.po b/po/ja/samba.po
index c53f03d59..b9d997ea1 100644
--- a/po/ja/samba.po
+++ b/po/ja/samba.po
@@ -14,82 +14,82 @@ msgstr ""
 
 #. Network Shares
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:1
-msgid "samba"
+msgid "Network Shares"
 msgstr ""
 
 #. Hostname
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:2
-msgid "samba_samba_name"
+msgid "Hostname"
 msgstr ""
 
 #. Description
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:3
-msgid "samba_samba_description"
+msgid "Description"
 msgstr ""
 
 #. Workgroup
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:4
-msgid "samba_samba_workgroup"
+msgid "Workgroup"
 msgstr ""
 
 #. Share home-directories
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:5
-msgid "samba_samba_homes"
+msgid "Share home-directories"
 msgstr ""
 
 #. System users can reach their home directories via network shares.
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:6
-msgid "samba_samba_homes_desc"
+msgid "System users can reach their home directories via network shares."
 msgstr ""
 
 #. Shared Directories
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:7
-msgid "samba_sambashare"
+msgid "Shared Directories"
 msgstr ""
 
 #. Shared Directory
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:8
-msgid "samba_sambashare_path"
+msgid "Shared Directory"
 msgstr ""
 
 #. Physical Path
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:9
-msgid "samba_sambashare_path_desc"
+msgid "Physical Path"
 msgstr ""
 
 #. Allowed Users
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:10
-msgid "samba_sambashare_users"
+msgid "Allowed Users"
 msgstr ""
 
 #. optional
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:11
-msgid "samba_sambashare_users_desc"
+msgid "optional"
 msgstr ""
 
 #. Read Only
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:12
-msgid "samba_sambashare_readonly"
+msgid "Read Only"
 msgstr ""
 
 #. Allow Guests
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:13
-msgid "samba_sambashare_guestok"
+msgid "Allow Guests"
 msgstr ""
 
 #. Create Mask
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:14
-msgid "samba_sambashare_createmask"
+msgid "Create Mask"
 msgstr ""
 
 #. Mask for new files
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:15
-msgid "samba_sambashare_createmask_desc"
+msgid "Mask for new files"
 msgstr ""
 
 #. Directory Mask
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:16
-msgid "samba_sambashare_dirmask"
+msgid "Directory Mask"
 msgstr ""
 
 #. Mask for new directories
diff --git a/po/ja/statistics.po b/po/ja/statistics.po
index 2bf759906..2d6a6e136 100644
--- a/po/ja/statistics.po
+++ b/po/ja/statistics.po
@@ -14,1057 +14,1057 @@ msgstr ""
 
 #. Statistics
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:1
-msgid "stat_statistics"
+msgid "Statistics"
 msgstr ""
 
 #. The statistics package is based on <a href=\"http://collectd.org/index.shtml\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD Tool</a> to render diagram images from collected data.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:2
-msgid "stat_desc"
+msgid "The statistics package is based on <a href=\"http://collectd.org/index.shtml\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD Tool</a> to render diagram images from collected data."
 msgstr ""
 
 #. System plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:3
-msgid "stat_systemplugins"
+msgid "System plugins"
 msgstr ""
 
 #. Network plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:4
-msgid "stat_networkplugins"
+msgid "Network plugins"
 msgstr ""
 
 #. Output plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:5
-msgid "stat_outputplugins"
+msgid "Output plugins"
 msgstr ""
 
 #. Display timespan
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:6
-msgid "stat_showtimespan"
+msgid "Display timespan »"
 msgstr ""
 
 #. Graphs
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:7
-msgid "stat_graphs"
+msgid "Graphs"
 msgstr ""
 
 #. Collectd
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:8
-msgid "stat_collectd"
+msgid "Collectd"
 msgstr ""
 
 #. Processor
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:9
-msgid "stat_cpu"
+msgid "Processor"
 msgstr ""
 
 #. Ping
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:10
-msgid "stat_ping"
+msgid "Ping"
 msgstr ""
 
 #. Firewall
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:11
-msgid "stat_iptables"
+msgid "Firewall"
 msgstr ""
 
 #. Netlink
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:12
-msgid "stat_netlink"
+msgid "Netlink"
 msgstr ""
 
 #. Processes
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:13
-msgid "stat_processes"
+msgid "Processes"
 msgstr ""
 
 #. Wireless
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:14
-msgid "stat_wireless"
+msgid "Wireless"
 msgstr ""
 
 #. TCP Connections
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:15
-msgid "stat_tcpconns"
+msgid "TCP Connections"
 msgstr ""
 
 #. Interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:16
-msgid "stat_interface"
+msgid "Interfaces"
 msgstr ""
 
 #. Disk Space Usage
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:17
-msgid "stat_df"
+msgid "Disk Space Usage"
 msgstr ""
 
 #. Interrupts
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:18
-msgid "stat_irq"
+msgid "Interrupts"
 msgstr ""
 
 #. Disk Usage
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:19
-msgid "stat_disk"
+msgid "Disk Usage"
 msgstr ""
 
 #. Exec
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:20
-msgid "stat_exec"
+msgid "Exec"
 msgstr ""
 
 #. RRDTool
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:21
-msgid "stat_rrdtool"
+msgid "RRDTool"
 msgstr ""
 
 #. Network
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:22
-msgid "stat_network"
+msgid "Network"
 msgstr ""
 
 #. CSV Output
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:23
-msgid "stat_csv"
+msgid "CSV Output"
 msgstr ""
 
 #. System Load
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:24
-msgid "stat_load"
+msgid "System Load"
 msgstr ""
 
 #. DNS
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:25
-msgid "stat_dns"
+msgid "DNS"
 msgstr ""
 
 #. Email
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:26
-msgid "stat_email"
+msgid "Email"
 msgstr ""
 
 #. UnixSock
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:27
-msgid "stat_unixsock"
+msgid "UnixSock"
 msgstr ""
 
 #. Statistics
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:28
-msgid "lucistatistics"
+msgid "Statistics"
 msgstr ""
 
 #. Collectd Settings
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:29
-msgid "lucistatistics_collectd"
+msgid "Collectd Settings"
 msgstr ""
 
 #. Collectd is a small daeomon for collecting data from various sources through different plugins. On this page you can change general settings for the collectd daemon.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:30
-msgid "lucistatistics_collectd_desc"
+msgid "Collectd is a small daeomon for collecting data from various sources through different plugins. On this page you can change general settings for the collectd daemon."
 msgstr ""
 
 #. Hostname
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:31
-msgid "lucistatistics_collectd_hostname"
+msgid "Hostname"
 msgstr ""
 
 #. Base Directory
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:32
-msgid "lucistatistics_collectd_basedir"
+msgid "Base Directory"
 msgstr ""
 
 #. Directory for sub-configurations
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:33
-msgid "lucistatistics_collectd_include"
+msgid "Directory for sub-configurations"
 msgstr ""
 
 #. Directory for collectd plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:34
-msgid "lucistatistics_collectd_plugindir"
+msgid "Directory for collectd plugins"
 msgstr ""
 
 #. Used PID file
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:35
-msgid "lucistatistics_collectd_pidfile"
+msgid "Used PID file"
 msgstr ""
 
 #. Datasets definition file
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:36
-msgid "lucistatistics_collectd_typesdb"
+msgid "Datasets definition file"
 msgstr ""
 
 #. Data collection interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:37
-msgid "lucistatistics_collectd_interval"
+msgid "Data collection interval"
 msgstr ""
 
 #. Seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:38
-msgid "lucistatistics_collectd_interval_desc"
+msgid "Seconds"
 msgstr ""
 
 #. Number of threads for data collection
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:39
-msgid "lucistatistics_collectd_readthreads"
+msgid "Number of threads for data collection"
 msgstr ""
 
 #. Try to lookup fully qualified hostname
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:40
-msgid "lucistatistics_collectd_fqdnlookup"
+msgid "Try to lookup fully qualified hostname"
 msgstr ""
 
 #. CPU Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:41
-msgid "lucistatistics_collectdcpu"
+msgid "CPU Plugin Configuration"
 msgstr ""
 
 #. The cpu plugin collects basic statistics about the processor usage.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:42
-msgid "lucistatistics_collectdcpu_desc"
+msgid "The cpu plugin collects basic statistics about the processor usage."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:43
-msgid "lucistatistics_collectdcpu_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. CSV Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:44
-msgid "lucistatistics_collectdcsv"
+msgid "CSV Plugin Configuration"
 msgstr ""
 
 #. The csv plugin stores collected data in csv file format for further processing by external programs.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:45
-msgid "lucistatistics_collectdcsv_desc"
+msgid "The csv plugin stores collected data in csv file format for further processing by external programs."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:46
-msgid "lucistatistics_collectdcsv_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Storage directory for the csv files
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:47
-msgid "lucistatistics_collectdcsv_datadir"
+msgid "Storage directory for the csv files"
 msgstr ""
 
 #. Store data values as rates instead of absolute values
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:48
-msgid "lucistatistics_collectdcsv_storerates"
+msgid "Store data values as rates instead of absolute values"
 msgstr ""
 
 #. DF Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:49
-msgid "lucistatistics_collectddf"
+msgid "DF Plugin Configuration"
 msgstr ""
 
 #. The df plugin collects statistics about the disk space usage on different devices, mount points or filesystem types.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:50
-msgid "lucistatistics_collectddf_desc"
+msgid "The df plugin collects statistics about the disk space usage on different devices, mount points or filesystem types."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:51
-msgid "lucistatistics_collectddf_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Monitor devices
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:52
-msgid "lucistatistics_collectddf_devices"
+msgid "Monitor devices"
 msgstr ""
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:53
-msgid "lucistatistics_collectddf_devices_desc"
+msgid "multiple separated by space"
 msgstr ""
 
 #. Monitor mount points
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:54
-msgid "lucistatistics_collectddf_mountpoints"
+msgid "Monitor mount points"
 msgstr ""
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:55
-msgid "lucistatistics_collectddf_mountpoints_desc"
+msgid "multiple separated by space"
 msgstr ""
 
 #. Monitor filesystem types
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:56
-msgid "lucistatistics_collectddf_fstypes"
+msgid "Monitor filesystem types"
 msgstr ""
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:57
-msgid "lucistatistics_collectddf_fstypes_desc"
+msgid "multiple separated by space"
 msgstr ""
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:58
-msgid "lucistatistics_collectddf_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr ""
 
 #. Disk Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:59
-msgid "lucistatistics_collectddisk"
+msgid "Disk Plugin Configuration"
 msgstr ""
 
 #. The disk plugin collects detailled usage statistics for selected partitions or whole disks.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:60
-msgid "lucistatistics_collectddisk_desc"
+msgid "The disk plugin collects detailled usage statistics for selected partitions or whole disks."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:61
-msgid "lucistatistics_collectddisk_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Monitor disks and partitions
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:62
-msgid "lucistatistics_collectddisk_disks"
+msgid "Monitor disks and partitions"
 msgstr ""
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:63
-msgid "lucistatistics_collectddisk_disks_desc"
+msgid "multiple separated by space"
 msgstr ""
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:64
-msgid "lucistatistics_collectddisk_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr ""
 
 #. DNS Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:65
-msgid "lucistatistics_collectddns"
+msgid "DNS Plugin Configuration"
 msgstr ""
 
 #. The dns plugin collects detailled statistics about dns related traffic on selected interfaces.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:66
-msgid "lucistatistics_collectddns_desc"
+msgid "The dns plugin collects detailled statistics about dns related traffic on selected interfaces."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:67
-msgid "lucistatistics_collectddns_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Monitor interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:68
-msgid "lucistatistics_collectddns_interfaces"
+msgid "Monitor interfaces"
 msgstr ""
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:69
-msgid "lucistatistics_collectddns_interfaces_desc"
+msgid "multiple separated by space"
 msgstr ""
 
 #. Ignore source addresses
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:70
-msgid "lucistatistics_collectddns_ignoresources"
+msgid "Ignore source addresses"
 msgstr ""
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:71
-msgid "lucistatistics_collectddns_ignoresources_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr ""
 
 #. E-Mail Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:72
-msgid "lucistatistics_collectdemail"
+msgid "E-Mail Plugin Configuration"
 msgstr ""
 
 #. The email plugin creates a unix socket which can be used to transmit email-statistics to a running collectd daemon. This plugin is primarily intended to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can be used in other ways as well.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:73
-msgid "lucistatistics_collectdemail_desc"
+msgid "The email plugin creates a unix socket which can be used to transmit email-statistics to a running collectd daemon. This plugin is primarily intended to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can be used in other ways as well."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:74
-msgid "lucistatistics_collectdemail_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Filepath of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:75
-msgid "lucistatistics_collectdemail_socketfile"
+msgid "Filepath of the unix socket"
 msgstr ""
 
 #. Group ownership of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:76
-msgid "lucistatistics_collectdemail_socketgroup"
+msgid "Group ownership of the unix socket"
 msgstr ""
 
 #. group name
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:77
-msgid "lucistatistics_collectdemail_socketgroup_desc"
+msgid "group name"
 msgstr ""
 
 #. File permissions of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:78
-msgid "lucistatistics_collectdemail_socketperms"
+msgid "File permissions of the unix socket"
 msgstr ""
 
 #. octal
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:79
-msgid "lucistatistics_collectdemail_socketperms_desc"
+msgid "octal"
 msgstr ""
 
 #. Maximum allowed connections
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:80
-msgid "lucistatistics_collectdemail_maxconns"
+msgid "Maximum allowed connections"
 msgstr ""
 
 #. Exec Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:81
-msgid "lucistatistics_collectdexec"
+msgid "Exec Plugin Configuration"
 msgstr ""
 
 #. The exec plugin starts external commands to read values from or to notify external processes when certain threshold values have been reached.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:82
-msgid "lucistatistics_collectdexec_desc"
+msgid "The exec plugin starts external commands to read values from or to notify external processes when certain threshold values have been reached."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:83
-msgid "lucistatistics_collectdexec_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Add command for reading values
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:84
-msgid "lucistatistics_collectdexecinput"
+msgid "Add command for reading values"
 msgstr ""
 
 #. Here you can define external commands which will be started by collectd in order to read certain values. The values will be read from stdout.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:85
-msgid "lucistatistics_collectdexecinput_desc"
+msgid "Here you can define external commands which will be started by collectd in order to read certain values. The values will be read from stdout."
 msgstr ""
 
 #. Commandline
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:86
-msgid "lucistatistics_collectdexecinput_cmdline"
+msgid "Commandline"
 msgstr ""
 
 #. Run as user
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:87
-msgid "lucistatistics_collectdexecinput_cmduser"
+msgid "Run as user"
 msgstr ""
 
 #. Run as group
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:88
-msgid "lucistatistics_collectdexecinput_cmdgroup"
+msgid "Run as group"
 msgstr ""
 
 #. Add notification command
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:89
-msgid "lucistatistics_collectdexecnotify"
+msgid "Add notification command"
 msgstr ""
 
 #. Here you can define external commands which will be started by collectd when certain threshold values have been reached. The values leading to invokation will be feeded to the the called programs stdin.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:90
-msgid "lucistatistics_collectdexecnotify_desc"
+msgid "Here you can define external commands which will be started by collectd when certain threshold values have been reached. The values leading to invokation will be feeded to the the called programs stdin."
 msgstr ""
 
 #. Commandline
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:91
-msgid "lucistatistics_collectdexecnotify_cmdline"
+msgid "Commandline"
 msgstr ""
 
 #. Run as user
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:92
-msgid "lucistatistics_collectdexecnotify_cmduser"
+msgid "Run as user"
 msgstr ""
 
 #. Run as group
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:93
-msgid "lucistatistics_collectdexecnotify_cmdgroup"
+msgid "Run as group"
 msgstr ""
 
 #. Interface Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:94
-msgid "lucistatistics_collectdinterface"
+msgid "Interface Plugin Configuration"
 msgstr ""
 
 #. The interface plugin collects traffic statistics on selected interfaces.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:95
-msgid "lucistatistics_collectdinterface_desc"
+msgid "The interface plugin collects traffic statistics on selected interfaces."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:96
-msgid "lucistatistics_collectdinterface_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Monitor interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:97
-msgid "lucistatistics_collectdinterface_interfaces"
+msgid "Monitor interfaces"
 msgstr ""
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:98
-msgid "lucistatistics_collectdinterface_interfaces_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr ""
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:99
-msgid "lucistatistics_collectdinterface_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr ""
 
 #. Iptables Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:100
-msgid "lucistatistics_collectdiptables"
+msgid "Iptables Plugin Configuration"
 msgstr ""
 
 #. The iptables plugin will monitor selected firewall rules and collect informations about processed bytes and packets per rule.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:101
-msgid "lucistatistics_collectdiptables_desc"
+msgid "The iptables plugin will monitor selected firewall rules and collect informations about processed bytes and packets per rule."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:102
-msgid "lucistatistics_collectdiptables_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Add matching rule
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:103
-msgid "lucistatistics_collectdiptablesmatch"
+msgid "Add matching rule"
 msgstr ""
 
 #. Here you can define various criteria by which the monitored iptables rules are selected.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:104
-msgid "lucistatistics_collectdiptablesmatch_desc"
+msgid "Here you can define various criteria by which the monitored iptables rules are selected."
 msgstr ""
 
 #. Name of the rule
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:105
-msgid "lucistatistics_collectdiptablesmatch_name"
+msgid "Name of the rule"
 msgstr ""
 
 #. max. 16 chars
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:106
-msgid "lucistatistics_collectdiptablesmatch_name_desc"
+msgid "max. 16 chars"
 msgstr ""
 
 #. Table
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:107
-msgid "lucistatistics_collectdiptablesmatch_table"
+msgid "Table"
 msgstr ""
 
 #. Chain
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:108
-msgid "lucistatistics_collectdiptablesmatch_chain"
+msgid "Chain"
 msgstr ""
 
 #. Action (target)
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:109
-msgid "lucistatistics_collectdiptablesmatch_target"
+msgid "Action (target)"
 msgstr ""
 
 #. Network protocol
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:110
-msgid "lucistatistics_collectdiptablesmatch_protocol"
+msgid "Network protocol"
 msgstr ""
 
 #. Source ip range
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:111
-msgid "lucistatistics_collectdiptablesmatch_source"
+msgid "Source ip range"
 msgstr ""
 
 #. CIDR notation
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:112
-msgid "lucistatistics_collectdiptablesmatch_source_desc"
+msgid "CIDR notation"
 msgstr ""
 
 #. Destination ip range
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:113
-msgid "lucistatistics_collectdiptablesmatch_destination"
+msgid "Destination ip range"
 msgstr ""
 
 #. CIDR notation
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:114
-msgid "lucistatistics_collectdiptablesmatch_destination_desc"
+msgid "CIDR notation"
 msgstr ""
 
 #. Incoming interface
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:115
-msgid "lucistatistics_collectdiptablesmatch_inputif"
+msgid "Incoming interface"
 msgstr ""
 
 #. e.g. br-lan
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:116
-msgid "lucistatistics_collectdiptablesmatch_inputif_desc"
+msgid "e.g. br-lan"
 msgstr ""
 
 #. Outgoing interface
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:117
-msgid "lucistatistics_collectdiptablesmatch_outputif"
+msgid "Outgoing interface"
 msgstr ""
 
 #. e.g. br-ff
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:118
-msgid "lucistatistics_collectdiptablesmatch_outputif_desc"
+msgid "e.g. br-ff"
 msgstr ""
 
 #. Options
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:119
-msgid "lucistatistics_collectdiptablesmatch_options"
+msgid "Options"
 msgstr ""
 
 #. e.g. reject-with tcp-reset
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:120
-msgid "lucistatistics_collectdiptablesmatch_options_desc"
+msgid "e.g. reject-with tcp-reset"
 msgstr ""
 
 #. IRQ Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:121
-msgid "lucistatistics_collectdirq"
+msgid "IRQ Plugin Configuration"
 msgstr ""
 
 #. The irq plugin will monitor the rate of issues per second for each selected interrupt. If no interrupt is selected then all interrupts are monitored.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:122
-msgid "lucistatistics_collectdirq_desc"
+msgid "The irq plugin will monitor the rate of issues per second for each selected interrupt. If no interrupt is selected then all interrupts are monitored."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:123
-msgid "lucistatistics_collectdirq_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Monitor interrupts
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:124
-msgid "lucistatistics_collectdirq_irqs"
+msgid "Monitor interrupts"
 msgstr ""
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:125
-msgid "lucistatistics_collectdirq_irqs_desc"
+msgid "multiple separated by space"
 msgstr ""
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:126
-msgid "lucistatistics_collectdirq_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr ""
 
 #. Load Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:127
-msgid "lucistatistics_collectdload"
+msgid "Load Plugin Configuration"
 msgstr ""
 
 #. The load plugin collects statistics about the general system load.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:128
-msgid "lucistatistics_collectdload_desc"
+msgid "The load plugin collects statistics about the general system load."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:129
-msgid "lucistatistics_collectdload_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Netlink Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:130
-msgid "lucistatistics_collectdnetlink"
+msgid "Netlink Plugin Configuration"
 msgstr ""
 
 #. The netlink plugin collects extended informations like qdisc-, class- and filter-statistics for selected interfaces.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:131
-msgid "lucistatistics_collectdnetlink_desc"
+msgid "The netlink plugin collects extended informations like qdisc-, class- and filter-statistics for selected interfaces."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:132
-msgid "lucistatistics_collectdnetlink_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Basic monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:133
-msgid "lucistatistics_collectdnetlink_interfaces"
+msgid "Basic monitoring"
 msgstr ""
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:134
-msgid "lucistatistics_collectdnetlink_interfaces_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr ""
 
 #. Verbose monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:135
-msgid "lucistatistics_collectdnetlink_verboseinterfaces"
+msgid "Verbose monitoring"
 msgstr ""
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:136
-msgid "lucistatistics_collectdnetlink_verboseinterfaces_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr ""
 
 #. Qdisc monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:137
-msgid "lucistatistics_collectdnetlink_qdiscs"
+msgid "Qdisc monitoring"
 msgstr ""
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:138
-msgid "lucistatistics_collectdnetlink_qdiscs_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr ""
 
 #. Shaping class monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:139
-msgid "lucistatistics_collectdnetlink_classes"
+msgid "Shaping class monitoring"
 msgstr ""
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:140
-msgid "lucistatistics_collectdnetlink_classes_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr ""
 
 #. Filter class monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:141
-msgid "lucistatistics_collectdnetlink_filters"
+msgid "Filter class monitoring"
 msgstr ""
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:142
-msgid "lucistatistics_collectdnetlink_filters_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr ""
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:143
-msgid "lucistatistics_collectdnetlink_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr ""
 
 #. Network Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:144
-msgid "lucistatistics_collectdnetwork"
+msgid "Network Plugin Configuration"
 msgstr ""
 
 #. The network plugin provides network based communication between different collectd instances. Collectd can operate both in client and server mode. In client mode locally collected date is transferred to a collectd server instance, in server mode the local instance receives data from other hosts.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:145
-msgid "lucistatistics_collectdnetwork_desc"
+msgid "The network plugin provides network based communication between different collectd instances. Collectd can operate both in client and server mode. In client mode locally collected date is transferred to a collectd server instance, in server mode the local instance receives data from other hosts."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:146
-msgid "lucistatistics_collectdnetwork_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Listener interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:147
-msgid "lucistatistics_collectdnetworklisten"
+msgid "Listener interfaces"
 msgstr ""
 
 #. This section defines on which interfaces collectd will wait for incoming connections.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:148
-msgid "lucistatistics_collectdnetworklisten_desc"
+msgid "This section defines on which interfaces collectd will wait for incoming connections."
 msgstr ""
 
 #. Listen host
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:149
-msgid "lucistatistics_collectdnetworklisten_host"
+msgid "Listen host"
 msgstr ""
 
 #. host-, ip- or ip6 address
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:150
-msgid "lucistatistics_collectdnetworklisten_host_desc"
+msgid "host-, ip- or ip6 address"
 msgstr ""
 
 #. Listen port
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:151
-msgid "lucistatistics_collectdnetworklisten_port"
+msgid "Listen port"
 msgstr ""
 
 #. 0 - 65535
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:152
-msgid "lucistatistics_collectdnetworklisten_port_desc"
+msgid "0 - 65535"
 msgstr ""
 
 #. server interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:153
-msgid "lucistatistics_collectdnetworkserver"
+msgid "server interfaces"
 msgstr ""
 
 #. This section defines to which servers the locally collected data is sent to.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:154
-msgid "lucistatistics_collectdnetworkserver_desc"
+msgid "This section defines to which servers the locally collected data is sent to."
 msgstr ""
 
 #. Server host
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:155
-msgid "lucistatistics_collectdnetworkserver_host"
+msgid "Server host"
 msgstr ""
 
 #. host-, ip- or ip6 address
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:156
-msgid "lucistatistics_collectdnetworkserver_host_desc"
+msgid "host-, ip- or ip6 address"
 msgstr ""
 
 #. Server port
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:157
-msgid "lucistatistics_collectdnetworkserver_port"
+msgid "Server port"
 msgstr ""
 
 #. 0 - 65535
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:158
-msgid "lucistatistics_collectdnetworkserver_port_desc"
+msgid "0 - 65535"
 msgstr ""
 
 #. TTL for network packets
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:159
-msgid "lucistatistics_collectdnetwork_timetolive"
+msgid "TTL for network packets"
 msgstr ""
 
 #. 0 - 255
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:160
-msgid "lucistatistics_collectdnetwork_timetolive_desc"
+msgid "0 - 255"
 msgstr ""
 
 #. Forwarding between listen and server addresses
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:161
-msgid "lucistatistics_collectdnetwork_forward"
+msgid "Forwarding between listen and server addresses"
 msgstr ""
 
 #. Cache flush interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:162
-msgid "lucistatistics_collectdnetwork_cacheflush"
+msgid "Cache flush interval"
 msgstr ""
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:163
-msgid "lucistatistics_collectdnetwork_cacheflush_desc"
+msgid "seconds"
 msgstr ""
 
 #. Ping Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:164
-msgid "lucistatistics_collectdping"
+msgid "Ping Plugin Configuration"
 msgstr ""
 
 #. The ping plugin will send icmp echo replies to selected hosts and measure the roundtrip time for each host.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:165
-msgid "lucistatistics_collectdping_desc"
+msgid "The ping plugin will send icmp echo replies to selected hosts and measure the roundtrip time for each host."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:166
-msgid "lucistatistics_collectdping_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Monitor hosts
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:167
-msgid "lucistatistics_collectdping_hosts"
+msgid "Monitor hosts"
 msgstr ""
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:168
-msgid "lucistatistics_collectdping_hosts_desc"
+msgid "multiple separated by space"
 msgstr ""
 
 #. TTL for ping packets
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:169
-msgid "lucistatistics_collectdping_ttl"
+msgid "TTL for ping packets"
 msgstr ""
 
 #. 0 - 255
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:170
-msgid "lucistatistics_collectdping_ttl_desc"
+msgid "0 - 255"
 msgstr ""
 
 #. Processes Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:171
-msgid "lucistatistics_collectdprocesses"
+msgid "Processes Plugin Configuration"
 msgstr ""
 
 #. The processes plugin collects informations like cpu time, page faults and memory usage of selected processes.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:172
-msgid "lucistatistics_collectdprocesses_desc"
+msgid "The processes plugin collects informations like cpu time, page faults and memory usage of selected processes."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:173
-msgid "lucistatistics_collectdprocesses_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Monitor processes
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:174
-msgid "lucistatistics_collectdprocesses_processes"
+msgid "Monitor processes"
 msgstr ""
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:175
-msgid "lucistatistics_collectdprocesses_processes_desc"
+msgid "multiple separated by space"
 msgstr ""
 
 #. RRDTool Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:176
-msgid "lucistatistics_collectdrrdtool"
+msgid "RRDTool Plugin Configuration"
 msgstr ""
 
 #. The rrdtool plugin stores the collected data in rrd database files, the foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong values will result in a very high memory consumption in the temporary directory. This can render the device unusable!</strong>
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:177
-msgid "lucistatistics_collectdrrdtool_desc"
+msgid "The rrdtool plugin stores the collected data in rrd database files, the foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong values will result in a very high memory consumption in the temporary directory. This can render the device unusable!</strong>"
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:178
-msgid "lucistatistics_collectdrrdtool_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Storage directory
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:179
-msgid "lucistatistics_collectdrrdtool_datadir"
+msgid "Storage directory"
 msgstr ""
 
 #. RRD step interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:180
-msgid "lucistatistics_collectdrrdtool_stepsize"
+msgid "RRD step interval"
 msgstr ""
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:181
-msgid "lucistatistics_collectdrrdtool_stepsize_desc"
+msgid "seconds"
 msgstr ""
 
 #. RRD heart beat interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:182
-msgid "lucistatistics_collectdrrdtool_heartbeat"
+msgid "RRD heart beat interval"
 msgstr ""
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:183
-msgid "lucistatistics_collectdrrdtool_heartbeat_desc"
+msgid "seconds"
 msgstr ""
 
 #. Only create average RRAs
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:184
-msgid "lucistatistics_collectdrrdtool_rrasingle"
+msgid "Only create average RRAs"
 msgstr ""
 
 #. reduces rrd size
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:185
-msgid "lucistatistics_collectdrrdtool_rrasingle_desc"
+msgid "reduces rrd size"
 msgstr ""
 
 #. Stored timespans
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:186
-msgid "lucistatistics_collectdrrdtool_rratimespans"
+msgid "Stored timespans"
 msgstr ""
 
 #. seconds; multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:187
-msgid "lucistatistics_collectdrrdtool_rratimespans_desc"
+msgid "seconds; multiple separated by space"
 msgstr ""
 
 #. Rows per RRA
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:188
-msgid "lucistatistics_collectdrrdtool_rrarows"
+msgid "Rows per RRA"
 msgstr ""
 
 #. RRD XFiles Factor
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:189
-msgid "lucistatistics_collectdrrdtool_xff"
+msgid "RRD XFiles Factor"
 msgstr ""
 
 #. Cache collected data for
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:190
-msgid "lucistatistics_collectdrrdtool_cachetimeout"
+msgid "Cache collected data for"
 msgstr ""
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:191
-msgid "lucistatistics_collectdrrdtool_cachetimeout_desc"
+msgid "seconds"
 msgstr ""
 
 #. Flush cache after
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:192
-msgid "lucistatistics_collectdrrdtool_cacheflush"
+msgid "Flush cache after"
 msgstr ""
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:193
-msgid "lucistatistics_collectdrrdtool_cacheflush_desc"
+msgid "seconds"
 msgstr ""
 
 #. TCPConns Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:194
-msgid "lucistatistics_collectdtcpconns"
+msgid "TCPConns Plugin Configuration"
 msgstr ""
 
 #. The tcpconns plugin collects informations about open tcp connections on selected ports.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:195
-msgid "lucistatistics_collectdtcpconns_desc"
+msgid "The tcpconns plugin collects informations about open tcp connections on selected ports."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:196
-msgid "lucistatistics_collectdtcpconns_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Monitor all local listen ports
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:197
-msgid "lucistatistics_collectdtcpconns_listeningports"
+msgid "Monitor all local listen ports"
 msgstr ""
 
 #. Monitor local ports
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:198
-msgid "lucistatistics_collectdtcpconns_localports"
+msgid "Monitor local ports"
 msgstr ""
 
 #. 0 - 65535; multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:199
-msgid "lucistatistics_collectdtcpconns_localports_desc"
+msgid "0 - 65535; multiple separated by space"
 msgstr ""
 
 #. Monitor remote ports
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:200
-msgid "lucistatistics_collectdtcpconns_remoteports"
+msgid "Monitor remote ports"
 msgstr ""
 
 #. 0 - 65535; multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:201
-msgid "lucistatistics_collectdtcpconns_remoteports_desc"
+msgid "0 - 65535; multiple separated by space"
 msgstr ""
 
 #. Unixsock Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:202
-msgid "lucistatistics_collectdunixsock"
+msgid "Unixsock Plugin Configuration"
 msgstr ""
 
 #. The unixsock plugin creates a unix socket which can be used to read collected data from a running collectd instance.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:203
-msgid "lucistatistics_collectdunixsock_desc"
+msgid "The unixsock plugin creates a unix socket which can be used to read collected data from a running collectd instance."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:204
-msgid "lucistatistics_collectdunixsock_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Filepath of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:205
-msgid "lucistatistics_collectdunixsock_socketfile"
+msgid "Filepath of the unix socket"
 msgstr ""
 
 #. Group ownership of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:206
-msgid "lucistatistics_collectdunixsock_socketgroup"
+msgid "Group ownership of the unix socket"
 msgstr ""
 
 #. group name
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:207
-msgid "lucistatistics_collectdunixsock_socketgroup_desc"
+msgid "group name"
 msgstr ""
 
 #. File permissions of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:208
-msgid "lucistatistics_collectdunixsock_socketperms"
+msgid "File permissions of the unix socket"
 msgstr ""
 
 #. octal
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:209
-msgid "lucistatistics_collectdunixsock_socketperms_desc"
+msgid "octal"
 msgstr ""
 
 #. Wireless Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:210
-msgid "lucistatistics_collectdwireless"
+msgid "Wireless Plugin Configuration"
 msgstr ""
 
 #. The wireless plugin collects statistics about wireless signal strength, noise and quality.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:211
-msgid "lucistatistics_collectdwireless_desc"
+msgid "The wireless plugin collects statistics about wireless signal strength, noise and quality."
 msgstr ""
 
 #. Enable this plugin
diff --git a/po/ja/sysauth.po b/po/ja/sysauth.po
index 4d280f2f1..657d53246 100644
--- a/po/ja/sysauth.po
+++ b/po/ja/sysauth.po
@@ -14,12 +14,12 @@ msgstr ""
 
 #. Authorization Required
 #: i18n/english/luasrc/i18n/sysauth.en.lua:1
-msgid "sysauth_head"
+msgid "Authorization Required"
 msgstr "認証が必要です"
 
 #. Please enter your username and password.
 #: i18n/english/luasrc/i18n/sysauth.en.lua:2
-msgid "sysauth_prompt"
+msgid "Please enter your username and password."
 msgstr "あなたのユーザー名とパスワードを入力してください。"
 
 #. Invalid username and/or password! Please try again.
diff --git a/po/ja/tinyproxy.po b/po/ja/tinyproxy.po
index 527e4ffba..df4b3498e 100644
--- a/po/ja/tinyproxy.po
+++ b/po/ja/tinyproxy.po
@@ -14,157 +14,157 @@ msgstr ""
 
 #. Tinyproxy
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:1
-msgid "tinyproxy"
+msgid "Tinyproxy"
 msgstr ""
 
 #. Tinyproxy is a small and fast non-caching HTTP(S)-Proxy
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:2
-msgid "tinyproxy_desc"
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
 msgstr ""
 
 #. Allow access from
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:3
-msgid "tinyproxy_tinyproxy_allow"
+msgid "Allow access from"
 msgstr ""
 
 #. Allowed headers for anonymous proxy
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:4
-msgid "tinyproxy_tinyproxy_anonymous"
+msgid "Allowed headers for anonymous proxy"
 msgstr ""
 
 #. Bind outgoing traffic to address
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:5
-msgid "tinyproxy_tinyproxy_bind"
+msgid "Bind outgoing traffic to address"
 msgstr ""
 
 #. Ports allowed for CONNECT method
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:6
-msgid "tinyproxy_tinyproxy_connectport"
+msgid "Ports allowed for CONNECT method"
 msgstr ""
 
 #. 0 = disabled, empty = all
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:7
-msgid "tinyproxy_tinyproxy_connectport_desc"
+msgid "0 = disabled, empty = all"
 msgstr ""
 
 #. Error document
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:8
-msgid "tinyproxy_tinyproxy_defaulterrorfile"
+msgid "Error document"
 msgstr ""
 
 #. Filter list
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:9
-msgid "tinyproxy_tinyproxy_filter"
+msgid "Filter list"
 msgstr ""
 
 #. Case sensitive filters
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:10
-msgid "tinyproxy_tinyproxy_filtercasesensitive"
+msgid "Case sensitive filters"
 msgstr ""
 
 #. Filter list is a whitelist
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:11
-msgid "tinyproxy_tinyproxy_filterdefaultdeny"
+msgid "Filter list is a whitelist"
 msgstr ""
 
 #. Extended regular expression filters
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:12
-msgid "tinyproxy_tinyproxy_filterextended"
+msgid "Extended regular expression filters"
 msgstr ""
 
 #. Filter URLs instead of domains
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:13
-msgid "tinyproxy_tinyproxy_filterurls"
+msgid "Filter URLs instead of domains"
 msgstr ""
 
 #. Listen on address
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:14
-msgid "tinyproxy_tinyproxy_listen"
+msgid "Listen on address"
 msgstr ""
 
 #. Logfile
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:15
-msgid "tinyproxy_tinyproxy_logfile"
+msgid "Logfile"
 msgstr ""
 
 #. Log level
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:16
-msgid "tinyproxy_tinyproxy_loglevel"
+msgid "Log level"
 msgstr ""
 
 #. Maximum number of clients
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:17
-msgid "tinyproxy_tinyproxy_maxclients"
+msgid "Maximum number of clients"
 msgstr ""
 
 #. Maximum requests per thread
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:18
-msgid "tinyproxy_tinyproxy_maxrequestsperchild"
+msgid "Maximum requests per thread"
 msgstr ""
 
 #. Max. spare servers
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:19
-msgid "tinyproxy_tinyproxy_maxspareservers"
+msgid "Max. spare servers"
 msgstr ""
 
 #. Min. spare servers
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:20
-msgid "tinyproxy_tinyproxy_minspareservers"
+msgid "Min. spare servers"
 msgstr ""
 
 #. Spare servers to start with
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:21
-msgid "tinyproxy_tinyproxy_startservers"
+msgid "Spare servers to start with"
 msgstr ""
 
 #. Statistic document
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:22
-msgid "tinyproxy_tinyproxy_statfile"
+msgid "Statistic document"
 msgstr ""
 
 #. Write to syslog
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:23
-msgid "tinyproxy_tinyproxy_syslog"
+msgid "Write to syslog"
 msgstr ""
 
 #. Connection Timeout
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:24
-msgid "tinyproxy_tinyproxy_timeout"
+msgid "Connection Timeout"
 msgstr ""
 
 #. Value of Via-Header
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:25
-msgid "tinyproxy_tinyproxy_viaproxyname"
+msgid "Value of Via-Header"
 msgstr ""
 
 #. Include client IP
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:26
-msgid "tinyproxy_tinyproxy_xtinyproxy"
+msgid "Include client IP"
 msgstr ""
 
 #. Via proxy
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:27
-msgid "tinyproxy_type_proxy"
+msgid "Via proxy"
 msgstr ""
 
 #. Reject access
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:28
-msgid "tinyproxy_type_reject"
+msgid "Reject access"
 msgstr ""
 
 #. Upstream Control
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:29
-msgid "tinyproxy_upstream"
+msgid "Upstream Control"
 msgstr ""
 
 #. Target host
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:30
-msgid "tinyproxy_upstream_target"
+msgid "Target host"
 msgstr ""
 
 #. Type
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:31
-msgid "tinyproxy_upstream_type"
+msgid "Type"
 msgstr ""
 
 #. Upstream Proxy
diff --git a/po/ja/upnp.po b/po/ja/upnp.po
index e4a9d22eb..e70302883 100644
--- a/po/ja/upnp.po
+++ b/po/ja/upnp.po
@@ -14,32 +14,32 @@ msgstr ""
 
 #. Universal Plug &amp; Play
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:1
-msgid "upnpd"
+msgid "Universal Plug & Play"
 msgstr ""
 
 #. UPNP allows clients in the local network to automatically configure the router.
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:2
-msgid "upnpd_desc"
+msgid "UPNP allows clients in the local network to automatically configure the router."
 msgstr ""
 
 #. UPNP should only be enabled if absolutely necessary as it can result in high security risks for your network.
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:3
-msgid "upnpd_config_desc"
+msgid "UPNP should only be enabled if absolutely necessary as it can result in high security risks for your network."
 msgstr ""
 
 #. Enable secure mode
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:4
-msgid "upnpd_config_securemode"
+msgid "Enable secure mode"
 msgstr ""
 
 #. Log output
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:5
-msgid "upnpd_config_logoutput"
+msgid "Log output"
 msgstr ""
 
 #. Downlink
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:6
-msgid "upnpd_config_download"
+msgid "Downlink"
 msgstr ""
 
 #. Uplink
diff --git a/po/ja/ushare.po b/po/ja/ushare.po
index f3acd43e5..c0ff09ca1 100644
--- a/po/ja/ushare.po
+++ b/po/ja/ushare.po
@@ -14,37 +14,37 @@ msgstr ""
 
 #. Content directories
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:1
-msgid "content_directories"
+msgid "Content directories"
 msgstr ""
 
 #. Disable telnet console
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:2
-msgid "disable_telnet"
+msgid "Disable telnet console"
 msgstr ""
 
 #. Disable webinterface
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:3
-msgid "disable_webif"
+msgid "Disable webinterface"
 msgstr ""
 
 #. Options
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:4
-msgid "options"
+msgid "Options"
 msgstr ""
 
 #. Servername
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:5
-msgid "servername"
+msgid "Servername"
 msgstr ""
 
 #. Settings
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:6
-msgid "settings"
+msgid "Settings"
 msgstr ""
 
 #. uShare
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:7
-msgid "ushare"
+msgid "uShare"
 msgstr ""
 
 #. uShare
diff --git a/po/ja/uvc_streamer.po b/po/ja/uvc_streamer.po
index db79cd8a8..0431eb192 100644
--- a/po/ja/uvc_streamer.po
+++ b/po/ja/uvc_streamer.po
@@ -14,22 +14,22 @@ msgstr ""
 
 #. Frames per second
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
-msgid "framespersecond"
+msgid "Frames per second"
 msgstr ""
 
 #. Resolution
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
-msgid "resolution"
+msgid "Resolution"
 msgstr ""
 
 #. Settings
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
-msgid "settings"
+msgid "Settings"
 msgstr ""
 
 #. Webcam streaming
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
-msgid "uvc_streamer"
+msgid "Webcam streaming"
 msgstr ""
 
 #. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
diff --git a/po/ja/uvl.po b/po/ja/uvl.po
index fac3aa150..e8fadab38 100644
--- a/po/ja/uvl.po
+++ b/po/ja/uvl.po
@@ -14,192 +14,192 @@ msgstr ""
 
 #. Unable to load config \"%p\": %1
 #: libs/uvl/luasrc/i18n/uvl.en.lua:1
-msgid "uvl_err_uciload"
+msgid "Unable to load config \"%p\": %1"
 msgstr ""
 
 #. Error in scheme \"%p\":\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:2
-msgid "uvl_err_scheme"
+msgid "Error in scheme \"%p\":\\n%c"
 msgstr ""
 
 #. Error in config \"%p\":\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:3
-msgid "uvl_err_config"
+msgid "Error in config \"%p\":\\n%c"
 msgstr ""
 
 #. Error in section \"%i\" (%I):\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:4
-msgid "uvl_err_section"
+msgid "Error in section \"%i\" (%I):\\n%c"
 msgstr ""
 
 #. Error in option \"%i\" (%I):\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:5
-msgid "uvl_err_option"
+msgid "Error in option \"%i\" (%I):\\n%c"
 msgstr ""
 
 #. Option \"%i\" has invalid reference specification %1:\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:6
-msgid "uvl_err_reference"
+msgid "Option \"%i\" has invalid reference specification %1:\\n%c"
 msgstr ""
 
 #. In dependency check for %t \"%i\":\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:7
-msgid "uvl_err_dependency"
+msgid "In dependency check for %t \"%i\":\\n%c"
 msgstr ""
 
 #. Can not find scheme \"%p\" in \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:8
-msgid "uvl_err_sme_find"
+msgid "Can not find scheme \"%p\" in \"%1\""
 msgstr ""
 
 #. Can not access file \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:9
-msgid "uvl_err_sme_read"
+msgid "Can not access file \"%1\""
 msgstr ""
 
 #. Missing required scheme field \"%1\" in \"%i\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:10
-msgid "uvl_err_sme_reqfld"
+msgid "Missing required scheme field \"%1\" in \"%i\""
 msgstr ""
 
 #. Illegal reference \"%1\" to an anonymous section
 #: libs/uvl/luasrc/i18n/uvl.en.lua:11
-msgid "uvl_err_sme_invref"
+msgid "Illegal reference \"%1\" to an anonymous section"
 msgstr ""
 
 #. Malformed reference in \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:12
-msgid "uvl_err_sme_badref"
+msgid "Malformed reference in \"%1\""
 msgstr ""
 
 #. Malformed dependency specification \"%1\" in \"%i\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:13
-msgid "uvl_err_sme_baddep"
+msgid "Malformed dependency specification \"%1\" in \"%i\""
 msgstr ""
 
 #. Malformed validator specification \"%1\" in \"%i\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:14
-msgid "uvl_err_sme_badval"
+msgid "Malformed validator specification \"%1\" in \"%i\""
 msgstr ""
 
 #. External validator \"%1\" failed: %2
 #: libs/uvl/luasrc/i18n/uvl.en.lua:15
-msgid "uvl_err_sme_errval"
+msgid "External validator \"%1\" failed: %2"
 msgstr ""
 
 #. Variable \"%o\" in scheme \"%p\" references unknown package \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:16
-msgid "uvl_err_sme_vbadpack"
+msgid "Variable \"%o\" in scheme \"%p\" references unknown package \"%1\""
 msgstr ""
 
 #. Variable \"%o\" in scheme \"%p\" references unknown section \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:17
-msgid "uvl_err_sme_vbadsect"
+msgid "Variable \"%o\" in scheme \"%p\" references unknown section \"%1\""
 msgstr ""
 
 #. Enum \"%v\" in scheme \"%p\" references unknown package \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:18
-msgid "uvl_err_sme_ebadpack"
+msgid "Enum \"%v\" in scheme \"%p\" references unknown package \"%1\""
 msgstr ""
 
 #. Enum \"%v\" in scheme \"%p\" references unknown section \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:19
-msgid "uvl_err_sme_ebadsect"
+msgid "Enum \"%v\" in scheme \"%p\" references unknown section \"%1\""
 msgstr ""
 
 #. Enum \"%v\" in scheme \"%p\" references unknown option \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:20
-msgid "uvl_err_sme_ebadopt"
+msgid "Enum \"%v\" in scheme \"%p\" references unknown option \"%1\""
 msgstr ""
 
 #. Enum \"%v\" in scheme \"%p\" references non-enum option \"%p.%s.%o\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:21
-msgid "uvl_err_sme_ebadtype"
+msgid "Enum \"%v\" in scheme \"%p\" references non-enum option \"%p.%s.%o\""
 msgstr ""
 
 #. Enum \"%v\" in scheme \"%p\" redeclares the default value of \"%p.%s.%o\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:22
-msgid "uvl_err_sme_ebaddef"
+msgid "Enum \"%v\" in scheme \"%p\" redeclares the default value of \"%p.%s.%o\""
 msgstr ""
 
 #. Section \"%i\" (%I) not found in scheme
 #: libs/uvl/luasrc/i18n/uvl.en.lua:23
-msgid "uvl_err_sect_unknown"
+msgid "Section \"%i\" (%I) not found in scheme"
 msgstr ""
 
 #. Required section \"%p.%s\" not found in config
 #: libs/uvl/luasrc/i18n/uvl.en.lua:24
-msgid "uvl_err_sect_required"
+msgid "Required section \"%p.%s\" not found in config"
 msgstr ""
 
 #. Unique section \"%p.%s\" occurs multiple times in config
 #: libs/uvl/luasrc/i18n/uvl.en.lua:25
-msgid "uvl_err_sect_unique"
+msgid "Unique section \"%p.%s\" occurs multiple times in config"
 msgstr ""
 
 #. The section of type \"%p.%s\" is stored anonymously in config but must be named
 #: libs/uvl/luasrc/i18n/uvl.en.lua:26
-msgid "uvl_err_sect_named"
+msgid "The section of type \"%p.%s\" is stored anonymously in config but must be named"
 msgstr ""
 
 #. Section \"%p.%s\" not found in config
 #: libs/uvl/luasrc/i18n/uvl.en.lua:27
-msgid "uvl_err_sect_notfound"
+msgid "Section \"%p.%s\" not found in config"
 msgstr ""
 
 #. Option \"%i\" (%I) not found in scheme
 #: libs/uvl/luasrc/i18n/uvl.en.lua:28
-msgid "uvl_err_opt_unknown"
+msgid "Option \"%i\" (%I) not found in scheme"
 msgstr ""
 
 #. Required option \"%i\" has no value
 #: libs/uvl/luasrc/i18n/uvl.en.lua:29
-msgid "uvl_err_opt_required"
+msgid "Required option \"%i\" has no value"
 msgstr ""
 
 #. Value \"%1\" of option \"%i\" is not defined in enum %2
 #: libs/uvl/luasrc/i18n/uvl.en.lua:30
-msgid "uvl_err_opt_badvalue"
+msgid "Value \"%1\" of option \"%i\" is not defined in enum %2"
 msgstr ""
 
 #. Value \"%1\" of option \"%i\" does not validate as datatype \"%2\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:31
-msgid "uvl_err_opt_invvalue"
+msgid "Value \"%1\" of option \"%i\" does not validate as datatype \"%2\""
 msgstr ""
 
 #. Option \"%i\" is defined as list but stored as plain value
 #: libs/uvl/luasrc/i18n/uvl.en.lua:32
-msgid "uvl_err_opt_notlist"
+msgid "Option \"%i\" is defined as list but stored as plain value"
 msgstr ""
 
 #. Option \"%i\" has unknown datatype \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:33
-msgid "uvl_err_opt_datatype"
+msgid "Option \"%i\" has unknown datatype \"%1\""
 msgstr ""
 
 #. Option \"%p.%s.%o\" not found in config
 #: libs/uvl/luasrc/i18n/uvl.en.lua:34
-msgid "uvl_err_opt_notfound"
+msgid "Option \"%p.%s.%o\" not found in config"
 msgstr ""
 
 #. Dependency (%1) failed:\noption \"%i\" is not eqal \"%2\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:35
-msgid "uvl_err_dep_notequal"
+msgid "Dependency (%1) failed:\\noption \"%i\" is not eqal \"%2\""
 msgstr ""
 
 #. Dependency (%1) failed:\noption \"%i\" has no value
 #: libs/uvl/luasrc/i18n/uvl.en.lua:36
-msgid "uvl_err_dep_novalue"
+msgid "Dependency (%1) failed:\\noption \"%i\" has no value"
 msgstr ""
 
 #. Dependency (%1) failed:\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:37
-msgid "uvl_err_dep_notvalid"
+msgid "Dependency (%1) failed:\\n%c"
 msgstr ""
 
 #. Recursive dependency for option \"%i\" detected
 #: libs/uvl/luasrc/i18n/uvl.en.lua:38
-msgid "uvl_err_dep_recursive"
+msgid "Recursive dependency for option \"%i\" detected"
 msgstr ""
 
 #. In dependency check for enum value \"%i\":\n%c
diff --git a/po/ja/wifi.po b/po/ja/wifi.po
index 42c79e04f..6f3fccece 100644
--- a/po/ja/wifi.po
+++ b/po/ja/wifi.po
@@ -14,192 +14,192 @@ msgstr ""
 
 #. auto
 #: i18n/english/luasrc/i18n/wifi.en.lua:1
-msgid "wifi_auto"
+msgid "auto"
 msgstr "自動"
 
 #. Frequency Hopping
 #: i18n/english/luasrc/i18n/wifi.en.lua:2
-msgid "wifi_fh"
+msgid "Frequency Hopping"
 msgstr "周波数ホッピング"
 
 #. Diversity
 #: i18n/english/luasrc/i18n/wifi.en.lua:3
-msgid "wifi_diversity"
+msgid "Diversity"
 msgstr "ダイバーシティ"
 
 #. Transmitter Antenna
 #: i18n/english/luasrc/i18n/wifi.en.lua:4
-msgid "wifi_txantenna"
+msgid "Transmitter Antenna"
 msgstr "送信アンテナ"
 
 #. Receiver Antenna
 #: i18n/english/luasrc/i18n/wifi.en.lua:5
-msgid "wifi_rxantenna"
+msgid "Receiver Antenna"
 msgstr "受信アンテナ"
 
 #. Distance Optimization
 #: i18n/english/luasrc/i18n/wifi.en.lua:6
-msgid "wifi_distance"
+msgid "Distance Optimization"
 msgstr "距離の最適化"
 
 #. Distance to farthest network member in meters.
 #: i18n/english/luasrc/i18n/wifi.en.lua:7
-msgid "wifi_distance_desc"
+msgid "Distance to farthest network member in meters."
 msgstr "最も遠いメンバーとの距離(メーター)。"
 
 #. MAC-Address Filter
 #: i18n/english/luasrc/i18n/wifi.en.lua:8
-msgid "wifi_macpolicy"
+msgid "MAC-Address Filter"
 msgstr "MACアドレスフィルタ"
 
 #. Allow listed only
 #: i18n/english/luasrc/i18n/wifi.en.lua:9
-msgid "wifi_whitelist"
+msgid "Allow listed only"
 msgstr "リストを許可する"
 
 #. Allow all except listed
 #: i18n/english/luasrc/i18n/wifi.en.lua:10
-msgid "wifi_blacklist"
+msgid "Allow all except listed"
 msgstr "リストを禁止する"
 
 #. MAC-List
 #: i18n/english/luasrc/i18n/wifi.en.lua:11
-msgid "wifi_maclist"
+msgid "MAC-List"
 msgstr "MACリスト"
 
 #. Frame Bursting
 #: i18n/english/luasrc/i18n/wifi.en.lua:12
-msgid "wifi_bursting"
+msgid "Frame Bursting"
 msgstr "フレームバースト"
 
 #. Regulatory Domain
 #: i18n/english/luasrc/i18n/wifi.en.lua:13
-msgid "wifi_regdomain"
+msgid "Regulatory Domain"
 msgstr ""
 
 #. Country Code
 #: i18n/english/luasrc/i18n/wifi.en.lua:14
-msgid "wifi_country"
+msgid "Country Code"
 msgstr "国コード"
 
 #. Outdoor Channels
 #: i18n/english/luasrc/i18n/wifi.en.lua:15
-msgid "wifi_outdoor"
+msgid "Outdoor Channels"
 msgstr ""
 
 #. Connection Limit
 #: i18n/english/luasrc/i18n/wifi.en.lua:16
-msgid "wifi_maxassoc"
+msgid "Connection Limit"
 msgstr "接続制限"
 
 #. <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:17
-msgid "wifi_essid"
+msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
 #. <abbr title=\"Basic Service Set Identifier\">BSSID</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:18
-msgid "wifi_bssid"
+msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 
 #. Fragmentation Threshold
 #: i18n/english/luasrc/i18n/wifi.en.lua:19
-msgid "wifi_frag"
+msgid "Fragmentation Threshold"
 msgstr "フラグメンテーション閾値"
 
 #. RTS/CTS Threshold
 #: i18n/english/luasrc/i18n/wifi.en.lua:20
-msgid "wifi_rts"
+msgid "RTS/CTS Threshold"
 msgstr "RTS/CTS閾値"
 
 #. <abbr title=\"Wireless Distribution System\">WDS</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:21
-msgid "wifi_wds"
+msgid "<abbr title=\"Wireless Distribution System\">WDS</abbr>"
 msgstr "<abbr title=\"Wireless Distribution System\">WDS</abbr>"
 
 #. Separate WDS
 #: i18n/english/luasrc/i18n/wifi.en.lua:22
-msgid "wifi_wdssep"
+msgid "Separate WDS"
 msgstr "WDSを分離する"
 
 #. Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:23
-msgid "wifi_hidden"
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>を隠す"
 
 #. Isolate Clients
 #: i18n/english/luasrc/i18n/wifi.en.lua:24
-msgid "wifi_isloate"
+msgid "Isolate Clients"
 msgstr "クライアントの分離"
 
 #. Prevent Client to Client Communication
 #: i18n/english/luasrc/i18n/wifi.en.lua:25
-msgid "wifi_isloate_desc"
+msgid "Prevent Client to Client Communication"
 msgstr "クライアント同士の通信を制限します"
 
 #. Background Scan
 #: i18n/english/luasrc/i18n/wifi.en.lua:26
-msgid "wifi_bgscan"
+msgid "Background Scan"
 msgstr "バックグラウンドスキャン"
 
 #. Transmission Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:27
-msgid "wifi_rate"
+msgid "Transmission Rate"
 msgstr "転送レート"
 
 #. Multicast Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:28
-msgid "wifi_mcast_rate"
+msgid "Multicast Rate"
 msgstr "マルチキャストレート"
 
 #. Minimum Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:29
-msgid "wifi_minrate"
+msgid "Minimum Rate"
 msgstr "最小レート"
 
 #. Maximum Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:30
-msgid "wifi_maxrate"
+msgid "Maximum Rate"
 msgstr "最大レート"
 
 #. Compression
 #: i18n/english/luasrc/i18n/wifi.en.lua:31
-msgid "wifi_compression"
+msgid "Compression"
 msgstr "圧縮"
 
 #. Turbo Mode
 #: i18n/english/luasrc/i18n/wifi.en.lua:32
-msgid "wifi_turbo"
+msgid "Turbo Mode"
 msgstr "ターボモード"
 
 #. Fast Frames
 #: i18n/english/luasrc/i18n/wifi.en.lua:33
-msgid "wifi_ff"
+msgid "Fast Frames"
 msgstr "Fast Frames"
 
 #. WMM Mode
 #: i18n/english/luasrc/i18n/wifi.en.lua:34
-msgid "wifi_wmm"
+msgid "WMM Mode"
 msgstr "WMMモード"
 
 #. XR Support
 #: i18n/english/luasrc/i18n/wifi.en.lua:35
-msgid "wifi_xr"
+msgid "XR Support"
 msgstr "XRサポート"
 
 #. AR Support
 #: i18n/english/luasrc/i18n/wifi.en.lua:36
-msgid "wifi_ar"
+msgid "AR Support"
 msgstr "ARサポート"
 
 #. Disable HW-Beacon timer
 #: i18n/english/luasrc/i18n/wifi.en.lua:37
-msgid "wifi_nosbeacon"
+msgid "Disable HW-Beacon timer"
 msgstr "HWビーコンタイマーを無効にする"
 
 #. Do not send probe responses
 #: i18n/english/luasrc/i18n/wifi.en.lua:38
-msgid "wifi_noprobereq"
+msgid "Do not send probe responses"
 msgstr "プローブレスポンスを送信しない"
 
 #. WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP and ad-hoc mode) to be installed.
diff --git a/po/pt/admin-core.po b/po/pt/admin-core.po
index b473d7c30..efc583dd8 100644
--- a/po/pt/admin-core.po
+++ b/po/pt/admin-core.po
@@ -13,22 +13,22 @@ msgstr ""
 
 #. The following changes have been applied
 #: i18n/english/luasrc/i18n/admin-core.en.lua:1
-msgid "uci_applied"
+msgid "The following changes have been applied"
 msgstr "Foram aplicadas as seguintes alterações "
 
 #. The following changes have been reverted
 #: i18n/english/luasrc/i18n/admin-core.en.lua:2
-msgid "uci_reverted"
+msgid "The following changes have been reverted"
 msgstr "Foram recuperadas as seguintes alterações "
 
 #. User Interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:3
-msgid "a_i_ui"
+msgid "User Interface"
 msgstr "Interface do Utilizador"
 
 #. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a collection of free Lua software including an <abbr title=\"Model-View-Controller\">MVC</abbr>-Webframework and webinterface for embedded devices. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is licensed under the Apache-License.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:4
-msgid "c_lucidesc"
+msgid "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a collection of free Lua software including an <abbr title=\"Model-View-Controller\">MVC</abbr>-Webframework and webinterface for embedded devices. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is licensed under the Apache-License."
 msgstr ""
 "<abbr title=\"Interface de configuração Lua\">LuCI</abbr> é uma colecção "
 "gratuita de programas Lua incluindo um Framework Web <abbr title=\"Modelo-"
@@ -38,32 +38,32 @@ msgstr ""
 
 #. Project Homepage
 #: i18n/english/luasrc/i18n/admin-core.en.lua:5
-msgid "c_projecthome"
+msgid "Project Homepage"
 msgstr "Página do Projecto"
 
 #. Lead Development
 #: i18n/english/luasrc/i18n/admin-core.en.lua:6
-msgid "c_leaddev"
+msgid "Lead Development"
 msgstr "Equipa de Desenvolvimento"
 
 #. Contributing Developers
 #: i18n/english/luasrc/i18n/admin-core.en.lua:7
-msgid "c_contributors"
+msgid "Contributing Developers"
 msgstr "Programadores Contribuintes"
 
 #. Thanks To
 #: i18n/english/luasrc/i18n/admin-core.en.lua:8
-msgid "c_thanksto"
+msgid "Thanks To"
 msgstr "Obrigado a"
 
 #. Hello!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:9
-msgid "a_i_i_hello"
+msgid "Hello!"
 msgstr "Olá!"
 
 #. This is the administration area of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:10
-msgid "a_i_i_admin1"
+msgid "This is the administration area of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>."
 msgstr ""
 "Esta é a área de administração do <abbr title=\"Interface de configuração "
 "Lua\">LuCI</abbr>."
@@ -71,7 +71,7 @@ msgstr ""
 # "free as in freedom" equivale a "livre de liberdade" não de "grátis"
 #. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a free, flexible, and user friendly graphical interface for configuring OpenWrt Kamikaze.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:11
-msgid "a_i_i_admin2"
+msgid "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a free, flexible, and user friendly graphical interface for configuring OpenWrt Kamikaze."
 msgstr ""
 "O <abbr title=\"Interface de configuração Lua\">LuCI</abbr> é um interface "
 "gráfico livre, flexível e fácil de utilizar para configurar o OpenWrt "
@@ -79,14 +79,14 @@ msgstr ""
 
 #. On the following pages you can adjust all important settings of your router.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:12
-msgid "a_i_i_admin3"
+msgid "On the following pages you can adjust all important settings of your router."
 msgstr ""
 "Nas próximas páginas, pode ajustar todas as definições importantes do seu "
 "router."
 
 #. Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> changes have to be confirmed by clicking Changes - Save &amp; Apply before being applied.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:13
-msgid "a_i_i_admin4"
+msgid "Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> changes have to be confirmed by clicking Changes - Save & Apply before being applied."
 msgstr ""
 "Aviso: No <abbr title=\"Interface de configuração Lua\">LuCI</abbr> as "
 "alterações devem ser confirmadas clicando em Alterações - Salvar &amp; "
@@ -94,36 +94,36 @@ msgstr ""
 
 #. As we always want to improve this interface we are looking forward to your feedback and suggestions.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:14
-msgid "a_i_i_admin5"
+msgid "As we always want to improve this interface we are looking forward to your feedback and suggestions."
 msgstr ""
 "Agradecemos os seus comentários e sugestões por forma a podermos continuar a "
 "melhorar este interface."
 
 #. And now have fun with your router!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:15
-msgid "a_i_i_admin6"
+msgid "And now have fun with your router!"
 msgstr "E agora divirta-se com o seu router!"
 
 #. The <abbr title=\"Lua Configuration Interface\">LuCI</abbr> Team
 #: i18n/english/luasrc/i18n/admin-core.en.lua:16
-msgid "a_i_i_team"
+msgid "The <abbr title=\"Lua Configuration Interface\">LuCI</abbr> Team"
 msgstr "A equipa do <abbr title=\"Interface de configuração Lua\">LuCI</abbr>"
 
 #. Here you can customize the settings and the functionality of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:17
-msgid "a_i_luci1"
+msgid "Here you can customize the settings and the functionality of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>."
 msgstr ""
 "Aqui pode personalizar as configurações e funcionalidades do <abbr "
 "title=\"Interface de configuração Lua\">LuCI</abbr>."
 
 #. Post-commit actions
 #: i18n/english/luasrc/i18n/admin-core.en.lua:18
-msgid "a_i_ucicommit"
+msgid "Post-commit actions"
 msgstr "Acções pós-gravação"
 
 #. These commands will be executed automatically when a given <abbr title=\"Unified Configuration Interface\">UCI</abbr> configuration is committed allowing changes to be applied instantly.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:19
-msgid "a_i_ucicommit1"
+msgid "These commands will be executed automatically when a given <abbr title=\"Unified Configuration Interface\">UCI</abbr> configuration is committed allowing changes to be applied instantly."
 msgstr ""
 "Estes comandos são executados automaticamente quando uma determinada "
 "configuração da <abbr title=\"Interface de configuração unificada\">UCI</abbr> "
@@ -131,12 +131,12 @@ msgstr ""
 
 #. Files to be kept when flashing a new firmware
 #: i18n/english/luasrc/i18n/admin-core.en.lua:20
-msgid "a_i_keepflash"
+msgid "Files to be kept when flashing a new firmware"
 msgstr "Ficheiros que devem ser mantidos quando gravar um novo firmware."
 
 #. When flashing a new firmware with <abbr title=\"Lua Configuration Interface\">LuCI</abbr> these files will be added to the new firmware installation.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:21
-msgid "a_i_keepflash1"
+msgid "When flashing a new firmware with <abbr title=\"Lua Configuration Interface\">LuCI</abbr> these files will be added to the new firmware installation."
 msgstr ""
 "Quando gravar um novo firmware com o <abbr title=\"Interface de configuração "
 "Lua\">LuCI</abbr> estes arquivos serão adicionados ao novo firmware "
@@ -144,7 +144,7 @@ msgstr ""
 
 #. Here you can find information about the current system status like <abbr title=\"Central Processing Unit\">CPU</abbr> clock frequency, memory usage or network interface data.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:22
-msgid "a_st_i_status1"
+msgid "Here you can find information about the current system status like <abbr title=\"Central Processing Unit\">CPU</abbr> clock frequency, memory usage or network interface data."
 msgstr ""
 "Aqui você pode encontrar informações sobre o estado actual do sistema, tais "
 "como <abbr title=\"Central Processing Unit\">CPU</abbr>, frequência do "
@@ -152,255 +152,255 @@ msgstr ""
 
 #. Also kernel or service logfiles can be viewed here to get an overview over their current state.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:23
-msgid "a_st_i_status2"
+msgid "Also kernel or service logfiles can be viewed here to get an overview over their current state."
 msgstr ""
 "Também os arquivos de logs do kernel ou dos serviços podem ser consultados "
 "aqui para obter uma visão geral sobre o seu estado actual."
 
 #. <abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan
 #: i18n/english/luasrc/i18n/admin-core.en.lua:24
-msgid "iwscan"
+msgid "<abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan"
 msgstr "<abbr title=\"Rede Local Wireless\">WLAN</abbr>-Pesquisa"
 
 #. Wifi networks in your local environment
 #: i18n/english/luasrc/i18n/admin-core.en.lua:25
-msgid "iwscan1"
+msgid "Wifi networks in your local environment"
 msgstr "Redes Wifi no seu ambiente local"
 
 #. <abbr title=\"Encrypted\">Encr.</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:26
-msgid "iwscan_encr"
+msgid "<abbr title=\"Encrypted\">Encr.</abbr>"
 msgstr "<abbr title=\"Encriptado\">Encr.</abbr>"
 
 #. Link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:27
-msgid "iwscan_link"
+msgid "Link"
 msgstr "Link"
 
 #. Signal
 #: i18n/english/luasrc/i18n/admin-core.en.lua:28
-msgid "iwscan_signal"
+msgid "Signal"
 msgstr "Sinal"
 
 #. Noise
 #: i18n/english/luasrc/i18n/admin-core.en.lua:29
-msgid "iwscan_noise"
+msgid "Noise"
 msgstr "Ruído"
 
 #. Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:30
-msgid "routes"
+msgid "Routes"
 msgstr "Rotas"
 
 #. Netmask
 #: i18n/english/luasrc/i18n/admin-core.en.lua:31
-msgid "routes_netmask"
+msgid "Netmask"
 msgstr "Máscara de sub-rede"
 
 #. Gateway
 #: i18n/english/luasrc/i18n/admin-core.en.lua:32
-msgid "routes_gateway"
+msgid "Gateway"
 msgstr "Gateway"
 
 #. Metric
 #: i18n/english/luasrc/i18n/admin-core.en.lua:33
-msgid "routes_metric"
+msgid "Metric"
 msgstr "Métrica"
 
 #. Here you can configure the basic aspects of your device like its hostname or the timezone.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:34
-msgid "a_s_desc"
+msgid "Here you can configure the basic aspects of your device like its hostname or the timezone."
 msgstr ""
 "Aqui pode configurar os aspectos básicos do seu equipamento,  como o nome do "
 "host ou o fuso horário."
 
 #. Software
 #: i18n/english/luasrc/i18n/admin-core.en.lua:35
-msgid "a_s_packages"
+msgid "Software"
 msgstr "Software"
 
 #. Admin Password
 #: i18n/english/luasrc/i18n/admin-core.en.lua:36
-msgid "a_s_changepw"
+msgid "Admin Password"
 msgstr "Password do Administrador"
 
 #. OPKG-Configuration
 #: i18n/english/luasrc/i18n/admin-core.en.lua:37
-msgid "a_s_p_ipkg"
+msgid "OPKG-Configuration"
 msgstr "Configuração-OPKG"
 
 #. <abbr title=\"Secure Shell\">SSH</abbr>-Keys
 #: i18n/english/luasrc/i18n/admin-core.en.lua:38
-msgid "a_s_sshkeys"
+msgid "<abbr title=\"Secure Shell\">SSH</abbr>-Keys"
 msgstr "Chaves-<abbr title=\"Shell Seguro\">SSH</abbr>"
 
 #. Mount Points
 #: i18n/english/luasrc/i18n/admin-core.en.lua:39
-msgid "a_s_fstab"
+msgid "Mount Points"
 msgstr "Pontos de Montagem"
 
 #. Change settings related to the system itself, its identification, installed hard- and software, authentication or mount points.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:40
-msgid "a_s_i_system1"
+msgid "Change settings related to the system itself, its identification, installed hard- and software, authentication or mount points."
 msgstr ""
 "Altera as configurações relacionadas com o sistema em si, sua identificação, "
 "hardware e software instalados, autenticação ou pontos de montagem."
 
 #. These settings define the base of your system.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:41
-msgid "a_s_i_system2"
+msgid "These settings define the base of your system."
 msgstr "Estas configurações definem a base do seu sistema."
 
 #. Pay attention as any misconfiguration here may prevent your device from booting or may lock yourself out of it.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:42
-msgid "a_s_i_system3"
+msgid "Pay attention as any misconfiguration here may prevent your device from booting or may lock yourself out of it."
 msgstr ""
 "Tenha em mente de que qualquer configuração errada aqui pode impedir o seu "
 "equipamento de arrancar, ou bloquear seu acesso de fora a ele."
 
 #. Interfaces
 #: i18n/english/luasrc/i18n/admin-core.en.lua:43
-msgid "a_s_if"
+msgid "Interfaces"
 msgstr "Interfaces"
 
 #. Bridge
 #: i18n/english/luasrc/i18n/admin-core.en.lua:44
-msgid "a_s_if_bridge"
+msgid "Bridge"
 msgstr "Interface em Ponte"
 
 #. ID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:45
-msgid "a_s_if_bridge_id"
+msgid "ID"
 msgstr "Identificação de interface em ponte"
 
 #. Bridge Port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:46
-msgid "a_s_if_bridge_port"
+msgid "Bridge Port"
 msgstr "Porta do interface em ponte"
 
 #. STP
 #: i18n/english/luasrc/i18n/admin-core.en.lua:47
-msgid "a_s_if_bridge_stp"
+msgid "STP"
 msgstr "STP"
 
 #. Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:48
-msgid "a_s_if_device"
+msgid "Device"
 msgstr "Dispositivo"
 
 #. Ethernet Bridge
 #: i18n/english/luasrc/i18n/admin-core.en.lua:49
-msgid "a_s_if_ethbridge"
+msgid "Ethernet Bridge"
 msgstr "Ponte Ethernet"
 
 #. Ethernet Adapter
 #: i18n/english/luasrc/i18n/admin-core.en.lua:50
-msgid "a_s_if_ethdev"
+msgid "Ethernet Adapter"
 msgstr "Adaptador Ethernet"
 
 #. Ethernet Switch
 #: i18n/english/luasrc/i18n/admin-core.en.lua:51
-msgid "a_s_if_ethswitch"
+msgid "Ethernet Switch"
 msgstr "Switch Ethernet"
 
 #. Interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:52
-msgid "a_s_if_interface"
+msgid "Interface"
 msgstr "Interface"
 
 #. IP Configuration
 #: i18n/english/luasrc/i18n/admin-core.en.lua:53
-msgid "a_s_if_ipconfig"
+msgid "IP Configuration"
 msgstr "Configuração IP"
 
 #. Alias
 #: i18n/english/luasrc/i18n/admin-core.en.lua:54
-msgid "a_s_if_ipconfig_alias"
+msgid "Alias"
 msgstr "Configuração IP alternativa"
 
 #. DHCP assigned
 #: i18n/english/luasrc/i18n/admin-core.en.lua:55
-msgid "a_s_if_ipconfig_dhcp"
+msgid "DHCP assigned"
 msgstr "DHCP atribuido"
 
 #. IPv6
 #: i18n/english/luasrc/i18n/admin-core.en.lua:56
-msgid "a_s_if_ipconfig_ipv6"
+msgid "IPv6"
 msgstr "Configuração IPv6"
 
 #. Not configured
 #: i18n/english/luasrc/i18n/admin-core.en.lua:57
-msgid "a_s_if_ipconfig_none"
+msgid "Not configured"
 msgstr "Não configurado"
 
 #. Primary
 #: i18n/english/luasrc/i18n/admin-core.en.lua:58
-msgid "a_s_if_ipconfig_primary"
+msgid "Primary"
 msgstr "Primário"
 
 #. Channel
 #: i18n/english/luasrc/i18n/admin-core.en.lua:59
-msgid "a_s_if_iwchannel"
+msgid "Channel"
 msgstr "Canal"
 
 #. Mode
 #: i18n/english/luasrc/i18n/admin-core.en.lua:60
-msgid "a_s_if_iwmode"
+msgid "Mode"
 msgstr "Modo"
 
 #. Ad-Hoc
 #: i18n/english/luasrc/i18n/admin-core.en.lua:61
-msgid "a_s_if_iwmode_adhoc"
+msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
 #. Pseudo Ad-Hoc
 #: i18n/english/luasrc/i18n/admin-core.en.lua:62
-msgid "a_s_if_iwmode_ahdemo"
+msgid "Pseudo Ad-Hoc"
 msgstr "Ahdemo"
 
 #. Master
 #: i18n/english/luasrc/i18n/admin-core.en.lua:63
-msgid "a_s_if_iwmode_ap"
+msgid "Master"
 msgstr "AP"
 
 #. Master + WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:64
-msgid "a_s_if_iwmode_apwds"
+msgid "Master + WDS"
 msgstr "AP+WDS"
 
 #. Client
 #: i18n/english/luasrc/i18n/admin-core.en.lua:65
-msgid "a_s_if_iwmode_sta"
+msgid "Client"
 msgstr "Cliente (STA)"
 
 #. Client + WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:66
-msgid "a_s_if_iwmode_stawds"
+msgid "Client + WDS"
 msgstr "Cliente (WDS)"
 
 #. WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:67
-msgid "a_s_if_iwmode_wds"
+msgid "WDS"
 msgstr "WDS"
 
 #. SSID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:68
-msgid "a_s_if_iwssid"
+msgid "SSID"
 msgstr "SSID"
 
 #. MAC
 #: i18n/english/luasrc/i18n/admin-core.en.lua:69
-msgid "a_s_if_mac"
+msgid "MAC"
 msgstr "MAC"
 
 #. Pkts.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:70
-msgid "a_s_if_pkts"
+msgid "Pkts."
 msgstr "Pacotes"
 
 #. Interface Status
 #: i18n/english/luasrc/i18n/admin-core.en.lua:71
-msgid "a_s_if_status"
+msgid "Interface Status"
 msgstr ""
 "Aqui encontra informações sobre o estado actual do sistema, como <abbr "
 "title=\"Central Processing Unit\">CPU</abbr>, frequência do relógio, uso de "
@@ -408,327 +408,327 @@ msgstr ""
 
 #. Transfer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:72
-msgid "a_s_if_transfer"
+msgid "Transfer"
 msgstr "Transferências"
 
 #. RX
 #: i18n/english/luasrc/i18n/admin-core.en.lua:73
-msgid "a_s_if_transfer_rx"
+msgid "RX"
 msgstr "RX"
 
 #. TX
 #: i18n/english/luasrc/i18n/admin-core.en.lua:74
-msgid "a_s_if_transfer_tx"
+msgid "TX"
 msgstr "TX"
 
 #. Type
 #: i18n/english/luasrc/i18n/admin-core.en.lua:75
-msgid "a_s_if_type"
+msgid "Type"
 msgstr "Tipo"
 
 #. VLAN
 #: i18n/english/luasrc/i18n/admin-core.en.lua:76
-msgid "a_s_if_vlan"
+msgid "VLAN"
 msgstr "VLAN"
 
 #. Ports
 #: i18n/english/luasrc/i18n/admin-core.en.lua:77
-msgid "a_s_if_vlanports"
+msgid "Ports"
 msgstr "Portas VLAN"
 
 #. Wireless Adapter
 #: i18n/english/luasrc/i18n/admin-core.en.lua:78
-msgid "a_s_if_wifidev"
+msgid "Wireless Adapter"
 msgstr "Dispositivo WiFi"
 
 #. Firewall
 #: i18n/english/luasrc/i18n/admin-core.en.lua:79
-msgid "a_s_ipt"
+msgid "Firewall"
 msgstr "Firewall"
 
 #. Actions
 #: i18n/english/luasrc/i18n/admin-core.en.lua:80
-msgid "a_s_ipt_actions"
+msgid "Actions"
 msgstr "Acções"
 
 #. Traffic
 #: i18n/english/luasrc/i18n/admin-core.en.lua:81
-msgid "a_s_ipt_bytes"
+msgid "Traffic"
 msgstr "Tráfego"
 
 #. Chain
 #: i18n/english/luasrc/i18n/admin-core.en.lua:82
-msgid "a_s_ipt_chain"
+msgid "Chain"
 msgstr "Chain"
 
 #. Destination
 #: i18n/english/luasrc/i18n/admin-core.en.lua:83
-msgid "a_s_ipt_destination"
+msgid "Destination"
 msgstr "Destino"
 
 #. Flags
 #: i18n/english/luasrc/i18n/admin-core.en.lua:84
-msgid "a_s_ipt_flags"
+msgid "Flags"
 msgstr "Flags"
 
 #. In
 #: i18n/english/luasrc/i18n/admin-core.en.lua:85
-msgid "a_s_ipt_inputif"
+msgid "In"
 msgstr "Entrada"
 
 #. No chains in this table
 #: i18n/english/luasrc/i18n/admin-core.en.lua:86
-msgid "a_s_ipt_nochains"
+msgid "No chains in this table"
 msgstr "Tabela sem chains"
 
 #. No Rules in this chain
 #: i18n/english/luasrc/i18n/admin-core.en.lua:87
-msgid "a_s_ipt_norules"
+msgid "No Rules in this chain"
 msgstr "Sem regras nesta chain"
 
 #. Options
 #: i18n/english/luasrc/i18n/admin-core.en.lua:88
-msgid "a_s_ipt_options"
+msgid "Options"
 msgstr "Opções"
 
 #. Out
 #: i18n/english/luasrc/i18n/admin-core.en.lua:89
-msgid "a_s_ipt_outputif"
+msgid "Out"
 msgstr "Saída"
 
 #. Packets
 #: i18n/english/luasrc/i18n/admin-core.en.lua:90
-msgid "a_s_ipt_packets"
+msgid "Packets"
 msgstr "Pacotes"
 
 #. Pkts.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:91
-msgid "a_s_ipt_pkts"
+msgid "Pkts."
 msgstr "Pacotes"
 
 #. Policy
 #: i18n/english/luasrc/i18n/admin-core.en.lua:92
-msgid "a_s_ipt_policy"
+msgid "Policy"
 msgstr "Política"
 
 #. Prot.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:93
-msgid "a_s_ipt_prot"
+msgid "Prot."
 msgstr "Protocolo"
 
 #. References
 #: i18n/english/luasrc/i18n/admin-core.en.lua:94
-msgid "a_s_ipt_references"
+msgid "References"
 msgstr "Referências"
 
 #. Reset Counters
 #: i18n/english/luasrc/i18n/admin-core.en.lua:95
-msgid "a_s_ipt_reset"
+msgid "Reset Counters"
 msgstr "Reiniciar contadores"
 
 #. Restart Firewall
 #: i18n/english/luasrc/i18n/admin-core.en.lua:96
-msgid "a_s_ipt_restart"
+msgid "Restart Firewall"
 msgstr "Reiniciar Firewall"
 
 #. #
 #: i18n/english/luasrc/i18n/admin-core.en.lua:97
-msgid "a_s_ipt_rulenum"
+msgid "#"
 msgstr "#"
 
 #. Source
 #: i18n/english/luasrc/i18n/admin-core.en.lua:98
-msgid "a_s_ipt_source"
+msgid "Source"
 msgstr "Origem"
 
 #. Firewall Status
 #: i18n/english/luasrc/i18n/admin-core.en.lua:99
-msgid "a_s_ipt_status"
+msgid "Firewall Status"
 msgstr "Estado da Firewall"
 
 #. Table
 #: i18n/english/luasrc/i18n/admin-core.en.lua:100
-msgid "a_s_ipt_table"
+msgid "Table"
 msgstr "Tabela"
 
 #. Target
 #: i18n/english/luasrc/i18n/admin-core.en.lua:101
-msgid "a_s_ipt_target"
+msgid "Target"
 msgstr "Alvo"
 
 #. Perform Actions
 #: i18n/english/luasrc/i18n/admin-core.en.lua:102
-msgid "a_s_packages_do"
+msgid "Perform Actions"
 msgstr "Executar Acções"
 
 #. Install
 #: i18n/english/luasrc/i18n/admin-core.en.lua:103
-msgid "a_s_packages_install"
+msgid "Install"
 msgstr "Instalar pacotes"
 
 #. Download and install package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:104
-msgid "a_s_packages_installurl"
+msgid "Download and install package"
 msgstr "Descarga e instalação de pacote"
 
 #. Edit package lists and installation targets
 #: i18n/english/luasrc/i18n/admin-core.en.lua:105
-msgid "a_s_packages_ipkg"
+msgid "Edit package lists and installation targets"
 msgstr "Editar listas de pacotes e destinos de instalação"
 
 #. Package name
 #: i18n/english/luasrc/i18n/admin-core.en.lua:106
-msgid "a_s_packages_name"
+msgid "Package name"
 msgstr "Nome do Pacote"
 
 #. Remove
 #: i18n/english/luasrc/i18n/admin-core.en.lua:107
-msgid "a_s_packages_remove"
+msgid "Remove"
 msgstr "Remover"
 
 #. Find package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:108
-msgid "a_s_packages_search"
+msgid "Find package"
 msgstr "Procurar pacote"
 
 #. Package lists updated
 #: i18n/english/luasrc/i18n/admin-core.en.lua:109
-msgid "a_s_packages_update"
+msgid "Package lists updated"
 msgstr "As listas de pacotes foram actualizadas"
 
 #. Update package lists
 #: i18n/english/luasrc/i18n/admin-core.en.lua:110
-msgid "a_s_packages_updatelist"
+msgid "Update package lists"
 msgstr "Actualizar listas de pacotes"
 
 #. Upgrade installed packages
 #: i18n/english/luasrc/i18n/admin-core.en.lua:111
-msgid "a_s_packages_upgrade"
+msgid "Upgrade installed packages"
 msgstr "Actualizar os pacotes instalados"
 
 #. Could not set default destination
 #: i18n/english/luasrc/i18n/admin-core.en.lua:112
-msgid "a_s_packages_code1"
+msgid "Could not set default destination"
 msgstr "Nao foi possível definir destino da instalação"
 
 #. Error parsing config file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:113
-msgid "a_s_packages_code2"
+msgid "Error parsing config file"
 msgstr "Erro a interpretar o ficheiro de configuração"
 
 #. Could not create temporary directory (ran out of space?)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:114
-msgid "a_s_packages_code3"
+msgid "Could not create temporary directory (ran out of space?)"
 msgstr "Não foi possível criar a directoria temporária (disco cheio?)"
 
 #. Could not get adminstrative lock (ran out of space?)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:115
-msgid "a_s_packages_code4"
+msgid "Could not get adminstrative lock (ran out of space?)"
 msgstr "Não foi possível obter acesso exclusivo (disco cheio?)"
 
 #. Unsatisfied Dependencies
 #: i18n/english/luasrc/i18n/admin-core.en.lua:116
-msgid "a_s_packages_code5"
+msgid "Unsatisfied Dependencies"
 msgstr "Dependências por satisfazer"
 
 #. Refused to remove essential package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:117
-msgid "a_s_packages_code6"
+msgid "Refused to remove essential package"
 msgstr "Recusa na remoção de um pacote essencial"
 
 #. Package has dependents
 #: i18n/english/luasrc/i18n/admin-core.en.lua:118
-msgid "a_s_packages_code7"
+msgid "Package has dependents"
 msgstr "Pacote tem dependências"
 
 #. Package has no installation candidate (wrong name?)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:119
-msgid "a_s_packages_code8"
+msgid "Package has no installation candidate (wrong name?)"
 msgstr "Pacote não tem candidato para instalação (nome errado?)"
 
 #. Package has no available architecture 
 #: i18n/english/luasrc/i18n/admin-core.en.lua:120
-msgid "a_s_packages_code9"
+msgid "Package has no available architecture "
 msgstr "Pacote não disponível nesta arquitectura"
 
 #. Package is not trusted
 #: i18n/english/luasrc/i18n/admin-core.en.lua:121
-msgid "a_s_packages_code10"
+msgid "Package is not trusted"
 msgstr "Pacote de origem desconhecida"
 
 #. Error while downloading
 #: i18n/english/luasrc/i18n/admin-core.en.lua:122
-msgid "a_s_packages_code11"
+msgid "Error while downloading"
 msgstr "Erro durante o download"
 
 #. Conflicts with other packages
 #: i18n/english/luasrc/i18n/admin-core.en.lua:123
-msgid "a_s_packages_code12"
+msgid "Conflicts with other packages"
 msgstr "Conflito com outros pacotes"
 
 #. Package is already installed
 #: i18n/english/luasrc/i18n/admin-core.en.lua:124
-msgid "a_s_packages_code13"
+msgid "Package is already installed"
 msgstr "Pacote já instalado"
 
 #. Package has unresolved dependencies
 #: i18n/english/luasrc/i18n/admin-core.en.lua:125
-msgid "a_s_packages_code14"
+msgid "Package has unresolved dependencies"
 msgstr "Dependências por resolver no pacote"
 
 #. Refused to downgrade package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:126
-msgid "a_s_packages_code15"
+msgid "Refused to downgrade package"
 msgstr "Recusa no downgrade do pacote"
 
 #. Package manager ran out of space
 #: i18n/english/luasrc/i18n/admin-core.en.lua:127
-msgid "a_s_packages_code16"
+msgid "Package manager ran out of space"
 msgstr "O gestor de pacotes não tem espaço disponível"
 
 #. Bad signature while verifiying package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:128
-msgid "a_s_packages_code17"
+msgid "Bad signature while verifiying package"
 msgstr "Assinatura incorrecta na verificação do pacote"
 
 #. MD5 error while verifiying package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:129
-msgid "a_s_packages_code18"
+msgid "MD5 error while verifiying package"
 msgstr "Erro MD5 na verificação do pacote"
 
 #. Internal error occured
 #: i18n/english/luasrc/i18n/admin-core.en.lua:130
-msgid "a_s_packages_code19"
+msgid "Internal error occured"
 msgstr "Erro interno"
 
 #. Package lists
 #: i18n/english/luasrc/i18n/admin-core.en.lua:131
-msgid "a_s_p_ipkg_pkglists"
+msgid "Package lists"
 msgstr "Listas de pacotes"
 
 #. Installation targets
 #: i18n/english/luasrc/i18n/admin-core.en.lua:132
-msgid "a_s_p_ipkg_targets"
+msgid "Installation targets"
 msgstr "Destino de Instalação"
 
 #. Change the password of the system administrator (User <code>root</code>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:133
-msgid "a_s_changepw1"
+msgid "Change the password of the system administrator (User <code>root</code>)"
 msgstr "Altera a senha do administrador do sistema (Login <code>root</code>)"
 
 #. Password successfully changed
 #: i18n/english/luasrc/i18n/admin-core.en.lua:134
-msgid "a_s_changepw_changed"
+msgid "Password successfully changed"
 msgstr "Senha alterada com sucesso"
 
 #. Error: Passwords do not match
 #: i18n/english/luasrc/i18n/admin-core.en.lua:135
-msgid "a_s_changepw_nomatch"
+msgid "Error: Passwords do not match"
 msgstr "Erro: As senhas estão diferentes"
 
 #. Here you can paste public <abbr title=\"Secure Shell\">SSH</abbr>-Keys (one per line) for <abbr title=\"Secure Shell\">SSH</abbr> public-key authentication.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:136
-msgid "a_s_sshkeys1"
+msgid "Here you can paste public <abbr title=\"Secure Shell\">SSH</abbr>-Keys (one per line) for <abbr title=\"Secure Shell\">SSH</abbr> public-key authentication."
 msgstr ""
 "Aqui pode colar suas Chaves-<abbr title=\"Shell Seguro\">SSH</abbr> públicas "
 "(uma por linha) para a autenticação <abbr title=\"Shell Seguro\">SSH</abbr> "
@@ -736,46 +736,46 @@ msgstr ""
 
 #. Mount Points
 #: i18n/english/luasrc/i18n/admin-core.en.lua:137
-msgid "a_s_fstab_mountpoints"
+msgid "Mount Points"
 msgstr "Pontos de Montagem"
 
 #. Mount Points define at which point a memory device will be attached to the filesystem
 #: i18n/english/luasrc/i18n/admin-core.en.lua:138
-msgid "a_s_fstab_mountpoints1"
+msgid "Mount Points define at which point a memory device will be attached to the filesystem"
 msgstr ""
 "Pontos de montagem definem em que ponto um dispositivo de memória será "
 "anexado ao sistema de arquivos"
 
 #. Mounted file systems
 #: i18n/english/luasrc/i18n/admin-core.en.lua:139
-msgid "a_s_fstab_active"
+msgid "Mounted file systems"
 msgstr "Sistemas de arquivos montados"
 
 #. Used
 #: i18n/english/luasrc/i18n/admin-core.en.lua:140
-msgid "a_s_fstab_used"
+msgid "Used"
 msgstr "Usado"
 
 #. Available
 #: i18n/english/luasrc/i18n/admin-core.en.lua:141
-msgid "a_s_fstab_avail"
+msgid "Available"
 msgstr "Disponível"
 
 #. Mount Point
 #: i18n/english/luasrc/i18n/admin-core.en.lua:142
-msgid "a_s_fstab_mountpoint"
+msgid "Mount Point"
 msgstr "Ponto de Montagem"
 
 #. The device file of the memory or partition (<abbr title=\"for example\">e.g.</abbr> <code>/dev/sda1</code>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:143
-msgid "a_s_fstab_device1"
+msgid "The device file of the memory or partition (<abbr title=\"for example\">e.g.</abbr> <code>/dev/sda1</code>)"
 msgstr ""
 "O arquivo do dispositivo de memória ou da partição (<abbr title=\"por "
 "exemplo\">ex.</abbr> <code>/dev/sda1</code>)"
 
 #. The filesystem that was used to format the memory (<abbr title=\"for example\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></samp>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:144
-msgid "a_s_fstab_fs1"
+msgid "The filesystem that was used to format the memory (<abbr title=\"for example\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></samp>)"
 msgstr ""
 "O sistema que foi usado para formatar a memória (<abbr title=\"por "
 "exemplo\">ex.</abbr> <samp><abbr title=\"Sistema de Arquivos "
@@ -783,7 +783,7 @@ msgstr ""
 
 #. If your physical memory is insufficient unused data can be temporarily swapped to a swap-device resulting in a higher amount of usable <abbr title=\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very slow process as the swap-device cannot be accessed with the high datarates of the <abbr title=\"Random Access Memory\">RAM</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:145
-msgid "a_s_fstab_swap1"
+msgid "If your physical memory is insufficient unused data can be temporarily swapped to a swap-device resulting in a higher amount of usable <abbr title=\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very slow process as the swap-device cannot be accessed with the high datarates of the <abbr title=\"Random Access Memory\">RAM</abbr>."
 msgstr ""
 "Se a sua memória física for insuficiente, os dados poderão ser trocados "
 "temporariamente para um dispositivo swap, resultando em uma maior quantidade "
@@ -794,88 +794,88 @@ msgstr ""
 
 #. Reboots the operating system of your device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:146
-msgid "a_s_reboot1"
+msgid "Reboots the operating system of your device"
 msgstr "Reinicia o seu equipamento"
 
 #. Perform reboot
 #: i18n/english/luasrc/i18n/admin-core.en.lua:147
-msgid "a_s_reboot_do"
+msgid "Perform reboot"
 msgstr "Executar reinicialização"
 
 #. Please wait: Device rebooting...
 #: i18n/english/luasrc/i18n/admin-core.en.lua:148
-msgid "a_s_reboot_running"
+msgid "Please wait: Device rebooting..."
 msgstr "Por favor aguarde: Equipamento a reiniciar..."
 
 #. Warning: There are unsaved changes that will be lost while rebooting!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:149
-msgid "a_s_reboot_u"
+msgid "Warning: There are unsaved changes that will be lost while rebooting!"
 msgstr ""
 "Aviso: Existem alterações não salvas que serão perdidas durante a "
 "reinicialização!"
 
 #. Changes applied.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:150
-msgid "a_s_applyreboot1"
+msgid "Changes applied."
 msgstr "Alterações aplicadas."
 
 #. Backup / Restore
 #: i18n/english/luasrc/i18n/admin-core.en.lua:151
-msgid "a_s_backup"
+msgid "Backup / Restore"
 msgstr "Backup / Restauração"
 
 #. Create backup
 #: i18n/english/luasrc/i18n/admin-core.en.lua:152
-msgid "a_s_backup_backup"
+msgid "Create backup"
 msgstr "Criar backup"
 
 #. Backup Archive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:153
-msgid "a_s_backup_archive"
+msgid "Backup Archive"
 msgstr "Arquivo de backup"
 
 #. Reset router to defaults
 #: i18n/english/luasrc/i18n/admin-core.en.lua:154
-msgid "a_s_backup_reset"
+msgid "Reset router to defaults"
 msgstr "Restaurar as configurações pré-definidas do router"
 
 #. Proceed reverting all settings and resetting to firmware defaults?
 #: i18n/english/luasrc/i18n/admin-core.en.lua:155
-msgid "a_s_backup_reset1"
+msgid "Proceed reverting all settings and resetting to firmware defaults?"
 msgstr "Proceder com a restauração das configurações pré-definidas?"
 
 #. Restore backup
 #: i18n/english/luasrc/i18n/admin-core.en.lua:156
-msgid "a_s_backup_restore"
+msgid "Restore backup"
 msgstr "Restaurar backup"
 
 #. Here you can backup and restore your router configuration and - if possible - reset the router to the default settings.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:157
-msgid "a_s_backup1"
+msgid "Here you can backup and restore your router configuration and - if possible - reset the router to the default settings."
 msgstr ""
 "Aqui pode fazer o backup e restaurar as configurações do seu router. Também "
 "pode restaurar seu router para as configurações pré-definidas."
 
 #. <abbr title=\"Hypertext Transfer Protocol\">HTTP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:158
-msgid "a_srv_http"
+msgid "<abbr title=\"Hypertext Transfer Protocol\">HTTP</abbr>-Server"
 msgstr ""
 "Servidor-<abbr title=\"Protocolo de Transferência de Hipertexto\">HTTP</abbr>"
 
 #. <abbr title=\"Secure Shell\">SSH</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:159
-msgid "a_srv_ssh"
+msgid "<abbr title=\"Secure Shell\">SSH</abbr>-Server"
 msgstr "Servidor-<abbr title=\"Shell Seguro\">SSH</abbr>"
 
 #. Services and daemons perform certain tasks on your device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:160
-msgid "a_srv_services1"
+msgid "Services and daemons perform certain tasks on your device."
 msgstr ""
 "Serviços e daemons que estão a executar diversas tarefas no seu equipamento."
 
 #. Most of them are network servers, that offer a certain service for your device or network like shell access, serving webpages like <abbr title=\"Lua Configuration Interface\">LuCI</abbr>, doing mesh routing, sending e-mails, ...
 #: i18n/english/luasrc/i18n/admin-core.en.lua:161
-msgid "a_srv_services2"
+msgid "Most of them are network servers, that offer a certain service for your device or network like shell access, serving webpages like <abbr title=\"Lua Configuration Interface\">LuCI</abbr>, doing mesh routing, sending e-mails, ..."
 msgstr ""
 "A maioria deles são servidores de rede, que oferecem um determinado serviço "
 "para seu equipamento ou rede como acesso shell, servindo páginas web como o "
@@ -884,58 +884,58 @@ msgstr ""
 
 #. A small webserver which can be used to serve <abbr title=\"Lua Configuration Interface\">LuCI</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:162
-msgid "a_srv_http1"
+msgid "A small webserver which can be used to serve <abbr title=\"Lua Configuration Interface\">LuCI</abbr>."
 msgstr ""
 "Um pequeno servidor web que pode ser utilizado para servir a interface <abbr "
 "title=\"Interface de configuração Lua\">LuCI</abbr>."
 
 #. Authentication Realm
 #: i18n/english/luasrc/i18n/admin-core.en.lua:163
-msgid "a_srv_http_authrealm"
+msgid "Authentication Realm"
 msgstr "Área de autenticação"
 
 #. The realm which will be displayed at the authentication prompt for protected pages.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:164
-msgid "a_srv_http_authrealm1"
+msgid "The realm which will be displayed at the authentication prompt for protected pages."
 msgstr ""
 "A área de autenticação (realm) que será mostrada na prompt de autenticação "
 "das páginas protegidas."
 
 #. defaults to <code>/etc/httpd.conf</code>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:165
-msgid "a_srv_http_config1"
+msgid "defaults to <code>/etc/httpd.conf</code>"
 msgstr "padrão é <code>/etc/httpd.conf</code>"
 
 #. Document root
 #: i18n/english/luasrc/i18n/admin-core.en.lua:166
-msgid "a_srv_http_root"
+msgid "Document root"
 msgstr "Diretório raiz"
 
 #. Enable Keep-Alive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:167
-msgid "a_srv_http_keepalive"
+msgid "Enable Keep-Alive"
 msgstr "Activar keep-alive"
 
 #. Connection timeout
 #: i18n/english/luasrc/i18n/admin-core.en.lua:168
-msgid "a_srv_http_timeout"
+msgid "Connection timeout"
 msgstr "Esgotado o tempo de ligação"
 
 #. Plugin path
 #: i18n/english/luasrc/i18n/admin-core.en.lua:169
-msgid "a_srv_http_path"
+msgid "Plugin path"
 msgstr "Directorio de plugins"
 
 #. A lightweight HTTP/1.1 webserver written in C and Lua designed to serve LuCI
 #: i18n/english/luasrc/i18n/admin-core.en.lua:170
-msgid "a_srv_lucittpd"
+msgid "A lightweight HTTP/1.1 webserver written in C and Lua designed to serve LuCI"
 msgstr ""
 "Um servidor web HTTP/1.1 ligeiro escrito em C e desenvolvido em Lua para "
 "servir LuCI"
 
 #. Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:171
-msgid "a_srv_dropbear1"
+msgid "Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
 msgstr ""
 "Dropbear oferece um acesso shell seguro à rede <abbr title=\"Shell "
 "Seguro\">(SSH)</abbr> e um servidor <abbr title=\"Cópia Segura\">SCP</abbr> "
@@ -943,29 +943,29 @@ msgstr ""
 
 #. Password authentication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:172
-msgid "a_srv_d_pwauth"
+msgid "Password authentication"
 msgstr "Autenticação por senha"
 
 #. Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:173
-msgid "a_srv_d_pwauth1"
+msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
 msgstr "Permitir autenticação <abbr title=\"Shell Seguro\">SSH</abbr> por senha"
 
 #. Channel
 #: i18n/english/luasrc/i18n/admin-core.en.lua:174
-msgid "a_w_channel"
+msgid "Channel"
 msgstr "Canal"
 
 #. On this pages you can find configuration options for <abbr title=\"Wireless Local Area Network\">WLAN</abbr> based wireless networks.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:175
-msgid "a_w_wifi1"
+msgid "On this pages you can find configuration options for <abbr title=\"Wireless Local Area Network\">WLAN</abbr> based wireless networks."
 msgstr ""
 "Nestas páginas encontra opções de configuração <abbr "
 "title=\"Wireless\">WLAN</abbr> para redes sem fio."
 
 #. You can easily integrate your 802.11a/b/g/n-devices into your physical network and use the virtual adapter support to build wireless repeaters or offer several networks with one device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:176
-msgid "a_w_wifi2"
+msgid "You can easily integrate your 802.11a/b/g/n-devices into your physical network and use the virtual adapter support to build wireless repeaters or offer several networks with one device."
 msgstr ""
 "Pode facilmente integrar seus equipamentos 802.11a/b/g/n com sua rede física "
 "e usar o adaptador virtual para construir repetidores wireless ou oferecer "
@@ -973,7 +973,7 @@ msgstr ""
 
 #. There is support for Managed, Client, Ad-Hoc and <abbr title=\"Wireless Distribution System\">WDS</abbr> operating modes as well as <abbr title=\"Wi-Fi Protected Access\">WPA</abbr> and <abbr title=\"Wi-Fi Protected Access 2\">WPA2</abbr> encryption for secure communnication.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:177
-msgid "a_w_wifi3"
+msgid "There is support for Managed, Client, Ad-Hoc and <abbr title=\"Wireless Distribution System\">WDS</abbr> operating modes as well as <abbr title=\"Wi-Fi Protected Access\">WPA</abbr> and <abbr title=\"Wi-Fi Protected Access 2\">WPA2</abbr> encryption for secure communnication."
 msgstr ""
 "Existe suporte para os modos AP, Cliente, Ad-Hoc e <abbr title=\"Sistema de "
 "Distribuição Wireless\">WDS</abbr> bem como encriptação <abbr title=\"Acesso "
@@ -982,42 +982,42 @@ msgstr ""
 
 #. Here you can configure installed wifi devices.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:178
-msgid "a_w_devices1"
+msgid "Here you can configure installed wifi devices."
 msgstr "Aqui pode configurar os dispositivos wifi instalados. "
 
 #. Transmit Antenna
 #: i18n/english/luasrc/i18n/admin-core.en.lua:179
-msgid "a_w_txantenna"
+msgid "Transmit Antenna"
 msgstr "Antena de Transmissão"
 
 #. Receive Antenna
 #: i18n/english/luasrc/i18n/admin-core.en.lua:180
-msgid "a_w_rxantenna"
+msgid "Receive Antenna"
 msgstr "Antena de Recepção"
 
 #. Distance to furthest station (in meter)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:181
-msgid "a_w_distance1"
+msgid "Distance to furthest station (in meter)"
 msgstr "Distancia para a estação mais longinqua (em metros)"
 
 #. Diversity
 #: i18n/english/luasrc/i18n/admin-core.en.lua:182
-msgid "a_w_diversity"
+msgid "Diversity"
 msgstr "Diversidade"
 
 #. Country Code
 #: i18n/english/luasrc/i18n/admin-core.en.lua:183
-msgid "a_w_countrycode"
+msgid "Country Code"
 msgstr "Código do País"
 
 #. Connection Limit
 #: i18n/english/luasrc/i18n/admin-core.en.lua:184
-msgid "a_w_connlimit"
+msgid "Connection Limit"
 msgstr "Limite de Ligações"
 
 #. You can run several wifi networks with one device. Be aware that there are certain hardware and driverspecific restrictions. Normally you can operate 1 Ad-Hoc or up to 3 Master-Mode and 1 Client-Mode network simultaneously.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:185
-msgid "a_w_networks1"
+msgid "You can run several wifi networks with one device. Be aware that there are certain hardware and driverspecific restrictions. Normally you can operate 1 Ad-Hoc or up to 3 Master-Mode and 1 Client-Mode network simultaneously."
 msgstr ""
 "Pode servir várias redes wifi com o mesmo dispositivo. Esteja ciente de que "
 "existem certas restrições específicas do hardware e do controlador. Pode "
@@ -1026,96 +1026,96 @@ msgstr ""
 
 #. Network Name (<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:186
-msgid "a_w_netid"
+msgid "Network Name (<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>)"
 msgstr ""
 "Nome da Rede (<abbr title=\"Identificador de Conjunto de Serviços "
 "Estendidos\">ESSID</abbr>)"
 
 #. Add the Wifi network to physical network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:187
-msgid "a_w_network1"
+msgid "Add the Wifi network to physical network"
 msgstr "Adicione a rede Wifi à rede física"
 
 #.  - Create new Network - 
 #: i18n/english/luasrc/i18n/admin-core.en.lua:188
-msgid "a_w_netmanual"
+msgid " - Create new Network - "
 msgstr " - Criar nova Rede - "
 
 #. Transmit Power
 #: i18n/english/luasrc/i18n/admin-core.en.lua:189
-msgid "a_w_txpwr"
+msgid "Transmit Power"
 msgstr "Potência de Transmissão"
 
 #. Broadcom Frameburst
 #: i18n/english/luasrc/i18n/admin-core.en.lua:190
-msgid "a_w_brcmburst"
+msgid "Broadcom Frameburst"
 msgstr "Broadcom Frame Burst"
 
 #. Atheros Frameburst
 #: i18n/english/luasrc/i18n/admin-core.en.lua:191
-msgid "a_w_athburst"
+msgid "Atheros Frameburst"
 msgstr "Atheros Frame Burst"
 
 #. RadiusServer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:192
-msgid "a_w_radiussrv"
+msgid "RadiusServer"
 msgstr "Servidor RADIUS"
 
 #. Radius-Port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:193
-msgid "a_w_radiusport"
+msgid "Radius-Port"
 msgstr "Porta RADIUS"
 
 #. AP-Isolation
 #: i18n/english/luasrc/i18n/admin-core.en.lua:194
-msgid "a_w_apisolation"
+msgid "AP-Isolation"
 msgstr "Isolamento do AP"
 
 #. Prevents Client to Client communication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:195
-msgid "a_w_apisolation1"
+msgid "Prevents Client to Client communication"
 msgstr "Impede a comunicação de Cliente para Cliente"
 
 #. Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:196
-msgid "a_w_hideessid"
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 "Ocultar <abbr title=\"Identificador de Conjunto de Serviços "
 "Estendidos\">ESSID</abbr>"
 
 #. Access Point
 #: i18n/english/luasrc/i18n/admin-core.en.lua:197
-msgid "a_w_ap"
+msgid "Access Point"
 msgstr "Access Point (AP)"
 
 #. Ad-Hoc
 #: i18n/english/luasrc/i18n/admin-core.en.lua:198
-msgid "a_w_adhoc"
+msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
 #. Pseudo Ad-Hoc (ahdemo)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:199
-msgid "a_w_ahdemo"
+msgid "Pseudo Ad-Hoc (ahdemo)"
 msgstr "Pseudo Ad-Hoc (ahdemo)"
 
 #. Client
 #: i18n/english/luasrc/i18n/admin-core.en.lua:200
-msgid "a_w_client"
+msgid "Client"
 msgstr "Cliente"
 
 #. WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:201
-msgid "a_w_wds"
+msgid "WDS"
 msgstr "WDS"
 
 #. Monitor
 #: i18n/english/luasrc/i18n/admin-core.en.lua:202
-msgid "a_w_monitor"
+msgid "Monitor"
 msgstr "Monitor"
 
 #. Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> firewalls
 #: i18n/english/luasrc/i18n/admin-core.en.lua:203
-msgid "dhcp_dnsmasq_desc"
+msgid "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> firewalls"
 msgstr ""
 "Dnsmasq é um servidor combinado de <abbr title=\"Protocolo de Configuração "
 "Dinâmica de Hosts\">DHCP</abbr> e <abbr title=\"Sistema de Nomes de "
@@ -1124,12 +1124,12 @@ msgstr ""
 
 #. Domain required
 #: i18n/english/luasrc/i18n/admin-core.en.lua:204
-msgid "dhcp_dnsmasq_domainneeded"
+msgid "Domain required"
 msgstr "Requerer domínio"
 
 #. Don&#39;t forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without <abbr title=\"Domain Name System\">DNS</abbr>-Name
 #: i18n/english/luasrc/i18n/admin-core.en.lua:205
-msgid "dhcp_dnsmasq_domainneeded_desc"
+msgid "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without <abbr title=\"Domain Name System\">DNS</abbr>-Name"
 msgstr ""
 "Não encaminhar consultas <abbr title=\"Sistema de Nomes de "
 "Domínios\">DNS</abbr> sem o nome do <abbr title=\"Sistema de Nomes de "
@@ -1137,236 +1137,236 @@ msgstr ""
 
 #. Authoritative
 #: i18n/english/luasrc/i18n/admin-core.en.lua:206
-msgid "dhcp_dnsmasq_authoritative"
+msgid "Authoritative"
 msgstr "Autoritário"
 
 #. This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> in the local network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:207
-msgid "dhcp_dnsmasq_authoritative_desc"
+msgid "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> in the local network"
 msgstr ""
 "Este é o único <abbr title=\"Protocolo de Configuração Dinâmica de "
 "Hosts\">DHCP</abbr> na rede local"
 
 #. Filter private
 #: i18n/english/luasrc/i18n/admin-core.en.lua:208
-msgid "dhcp_dnsmasq_boguspriv"
+msgid "Filter private"
 msgstr "Filtrar endereços privados"
 
 #. Don&#39;t forward reverse lookups for local networks
 #: i18n/english/luasrc/i18n/admin-core.en.lua:209
-msgid "dhcp_dnsmasq_boguspriv_desc"
+msgid "Don't forward reverse lookups for local networks"
 msgstr "Não encaminhar as pesquisas reversas para redes locais"
 
 #. Filter useless
 #: i18n/english/luasrc/i18n/admin-core.en.lua:210
-msgid "dhcp_dnsmasq_filterwin2k"
+msgid "Filter useless"
 msgstr "Filtro de consultas inuteis de Windows"
 
 #. filter useless <abbr title=\"Domain Name System\">DNS</abbr>-queries of Windows-systems
 #: i18n/english/luasrc/i18n/admin-core.en.lua:211
-msgid "dhcp_dnsmasq_filterwin2k_desc"
+msgid "filter useless <abbr title=\"Domain Name System\">DNS</abbr>-queries of Windows-systems"
 msgstr ""
 "Filtro de consultas inuteis-<abbr title=\"Sistema de Nomes de "
 "Domínios\">DNS</abbr> de sistemas windows"
 
 #. Localise queries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:212
-msgid "dhcp_dnsmasq_localisequeries"
+msgid "Localise queries"
 msgstr "Localizar consultas"
 
 #. localises the hostname depending on its subnet
 #: i18n/english/luasrc/i18n/admin-core.en.lua:213
-msgid "dhcp_dnsmasq_localisequeries_desc"
+msgid "localises the hostname depending on its subnet"
 msgstr "Localizar o hostname dependendo de sua sub-rede"
 
 #. Local Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:214
-msgid "dhcp_dnsmasq_local"
+msgid "Local Server"
 msgstr "Servidor Local"
 
 #. Local Domain
 #: i18n/english/luasrc/i18n/admin-core.en.lua:215
-msgid "dhcp_dnsmasq_domain"
+msgid "Local Domain"
 msgstr "Domínio Local"
 
 #. Expand Hosts
 #: i18n/english/luasrc/i18n/admin-core.en.lua:216
-msgid "dhcp_dnsmasq_expandhosts"
+msgid "Expand Hosts"
 msgstr "Expandir Hosts"
 
 #. adds domain names to hostentries in the resolv file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:217
-msgid "dhcp_dnsmasq_expandhosts_desc"
+msgid "adds domain names to hostentries in the resolv file"
 msgstr ""
 "Adiciona os nomes dos domínios às entradas de hosts no arquivo resolv.conf"
 
 #. don&#39;t cache unknown
 #: i18n/english/luasrc/i18n/admin-core.en.lua:218
-msgid "dhcp_dnsmasq_nonegcache"
+msgid "don't cache unknown"
 msgstr "Não fazer cache de desconhecidos"
 
 #. prevents caching of negative <abbr title=\"Domain Name System\">DNS</abbr>-replies
 #: i18n/english/luasrc/i18n/admin-core.en.lua:219
-msgid "dhcp_dnsmasq_nonegcache_desc"
+msgid "prevents caching of negative <abbr title=\"Domain Name System\">DNS</abbr>-replies"
 msgstr ""
 "Impede o cache de respostas-<abbr title=\"Sistema de Nomes de "
 "Domínios\">DNS</abbr> negativas"
 
 #. Use <code>/etc/ethers</code>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:220
-msgid "dhcp_dnsmasq_readethers"
+msgid "Use <code>/etc/ethers</code>"
 msgstr "Usar <code>/etc/ethers</code>"
 
 #. Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:221
-msgid "dhcp_dnsmasq_readethers_desc"
+msgid "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server"
 msgstr ""
 "Ler <code>/etc/ethers</code> para configurar o Servidor-<abbr "
 "title=\"Protocolo de Configuração Dinâmica de Hosts\">DHCP</abbr>"
 
 #. Leasefile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:222
-msgid "dhcp_dnsmasq_leasefile"
+msgid "Leasefile"
 msgstr "Ficheiro de Atribuições"
 
 #. file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-leases will be stored
 #: i18n/english/luasrc/i18n/admin-core.en.lua:223
-msgid "dhcp_dnsmasq_leasefile_desc"
+msgid "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-leases will be stored"
 msgstr ""
 "Ficheiro onde as atribuições <abbr title=\"Protocolo de Configuração Dinâmica "
 "de Hosts\">DHCP</abbr> são armazenadas"
 
 #. Resolvfile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:224
-msgid "dhcp_dnsmasq_resolvfile"
+msgid "Resolvfile"
 msgstr "Ficheiro resolv.conf"
 
 #. local <abbr title=\"Domain Name System\">DNS</abbr> file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:225
-msgid "dhcp_dnsmasq_resolvfile_desc"
+msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "Ficheiro local de <abbr title=\"Sistema de Nomes de Domínios\">DNS</abbr>"
 
 #. Ignore <code>/etc/hosts</code>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:226
-msgid "dhcp_dnsmasq_nohosts"
+msgid "Ignore <code>/etc/hosts</code>"
 msgstr "Ignorar <code>/etc/hosts</code>"
 
 #. Strict order
 #: i18n/english/luasrc/i18n/admin-core.en.lua:227
-msgid "dhcp_dnsmasq_strictorder"
+msgid "Strict order"
 msgstr "Ordem Exacta"
 
 #. <abbr title=\"Domain Name System\">DNS</abbr>-Server will be queried in the order of the resolvfile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:228
-msgid "dhcp_dnsmasq_strictorder_desc"
+msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Server will be queried in the order of the resolvfile"
 msgstr ""
 "Servidor <abbr title=\"Sistema de Nomes de Domínios\">DNS</abbr> será "
 "consultado na ordem do arquivo resolv.conf"
 
 #. Log queries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:229
-msgid "dhcp_dnsmasq_logqueries"
+msgid "Log queries"
 msgstr "Registo das consultas"
 
 #. Ignore resolve file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:230
-msgid "dhcp_dnsmasq_noresolv"
+msgid "Ignore resolve file"
 msgstr "Ignorar ficheiro resolv.conf"
 
 #. concurrent queries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:231
-msgid "dhcp_dnsmasq_dnsforwardmax"
+msgid "concurrent queries"
 msgstr "Consultas simultâneas"
 
 #. <abbr title=\"Domain Name System\">DNS</abbr>-Port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:232
-msgid "dhcp_dnsmasq_port"
+msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Port"
 msgstr "Porta do <abbr title=\"Sistema de Nomes de Domínios\">DNS</abbr>"
 
 #. <abbr title=\"maximal\">max.</abbr> <abbr title=\"Extension Mechanisms for Domain Name System\">EDNS0</abbr> paket size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:233
-msgid "dhcp_dnsmasq_ednspacket_max"
+msgid "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Extension Mechanisms for Domain Name System\">EDNS0</abbr> paket size"
 msgstr ""
 "tamanho <abbr title=\"máximo\">max.</abbr> do pacote <abbr title=\"Mecanismos "
 "de Extensão do Sistema de Nomes de Domínios\">EDNS0</abbr>"
 
 #. <abbr title=\"maximal\">max.</abbr> <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:234
-msgid "dhcp_dnsmasq_dhcpleasemax"
+msgid "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Leases"
 msgstr ""
 "<abbr title=\"máximo\">max.</abbr> de <abbr title=\"Protocolo de Configuração "
 "Dinâmica de Hosts\">DHCP</abbr>-Leases"
 
 #. additional hostfile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:235
-msgid "dhcp_dnsmasq_addnhosts"
+msgid "additional hostfile"
 msgstr "ficheiro de hosts adicional"
 
 #. query port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:236
-msgid "dhcp_dnsmasq_queryport"
+msgid "query port"
 msgstr "porta para consultas"
 
 #. Enable TFTP-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:237
-msgid "dhcp_dnsmasq_enabletftp"
+msgid "Enable TFTP-Server"
 msgstr "Activar servidor TFTP"
 
 #. TFTP-Server Root
 #: i18n/english/luasrc/i18n/admin-core.en.lua:238
-msgid "dhcp_dnsmasq_tftproot"
+msgid "TFTP-Server Root"
 msgstr "Directório raiz do servidor TFTP"
 
 #. Network Boot Image
 #: i18n/english/luasrc/i18n/admin-core.en.lua:239
-msgid "dhcp_dnsmasq_dhcpboot"
+msgid "Network Boot Image"
 msgstr "Imagem para o boot remoto (PXE)"
 
 #. Switch
 #: i18n/english/luasrc/i18n/admin-core.en.lua:240
-msgid "a_n_switch"
+msgid "Switch"
 msgstr "Switch"
 
 #. Active Connections
 #: i18n/english/luasrc/i18n/admin-core.en.lua:241
-msgid "a_n_conntrack"
+msgid "Active Connections"
 msgstr "Ligações Activas"
 
 #. This page gives an overview over currently active network connections.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:242
-msgid "a_n_conntrack_desc"
+msgid "This page gives an overview over currently active network connections."
 msgstr "Esta página fornece informações sobre as ligações de rede activas."
 
 #. Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:243
-msgid "a_n_routes"
+msgid "Routes"
 msgstr "Rotas"
 
 #. IPv4 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:244
-msgid "a_n_routes4"
+msgid "IPv4 Routes"
 msgstr "Rotas IPv4"
 
 #. IPv6 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:245
-msgid "a_n_routes6"
+msgid "IPv6 Routes"
 msgstr "Rotas IPv6"
 
 #. In this area you find all network-related settings.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:246
-msgid "a_network1"
+msgid "In this area you find all network-related settings."
 msgstr "Neste espaço encontrará todas as configurações relacionadas com a rede."
 
 #. On most routers the network switch can be freely configured and splitted up into several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:247
-msgid "a_network2"
+msgid "On most routers the network switch can be freely configured and splitted up into several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s."
 msgstr ""
 "Na maioria dos routers o switch de rede pode ser configurado livremente e "
 "dividos em diversas <abbr title=\"Rede Local Virtual\">VLAN</abbr>s."
 
 #. Interfaces and <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> / <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Settings allow a custom organisation of the network and connections to other networks like the internet.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:248
-msgid "a_network3"
+msgid "Interfaces and <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> / <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Settings allow a custom organisation of the network and connections to other networks like the internet."
 msgstr ""
 "Interfaces e Configurações-<abbr title=\"Protocolo Ponto-a-Ponto sobre "
 "Ethernet\">PPPoE</abbr> / <abbr title=\"Protocolo de Tunelamento "
@@ -1375,7 +1375,7 @@ msgstr ""
 
 #. With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> devices in your local network can be automatically configured for network communication.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:249
-msgid "a_network4"
+msgid "With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> devices in your local network can be automatically configured for network communication."
 msgstr ""
 "Com o <abbr title=\"Protocolo de Configuração Dinâmica de Hosts\">DHCP</abbr> "
 "os dispositivos na sua rede local podem ser automaticamente configurados "
@@ -1383,14 +1383,14 @@ msgstr ""
 
 #. Firewall and portforwarding can be used to secure your network while providing services to external networks.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:250
-msgid "a_network5"
+msgid "Firewall and portforwarding can be used to secure your network while providing services to external networks."
 msgstr ""
 "A firewall e o redireccionamento de portas podem ser usados para proteger "
 "sua rede ao mesmo tempo que prestam serviços às redes externas."
 
 #. The network ports on your router can be combined to several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s in which computers can communicate directly with each other. <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s are often used to separate different network segments. Often there is by default one Uplink port for a connection to the next greater network like the internet and other ports for a local network.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:251
-msgid "a_n_switch1"
+msgid "The network ports on your router can be combined to several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s in which computers can communicate directly with each other. <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s are often used to separate different network segments. Often there is by default one Uplink port for a connection to the next greater network like the internet and other ports for a local network."
 msgstr ""
 "As portas de rede do seu router podem ser combinadas com diversas <abbr "
 "title=\"Rede Local Virtual\">VLAN</abbr>s em que os computadores podem "
@@ -1401,7 +1401,7 @@ msgstr ""
 
 #. Ports belonging to a <abbr title=\"Virtual Local Area Network\">VLAN</abbr> are separated with spaces. The port with the highest number (usually 5) is oftern the connection to the internal network interface of the router. On devices with 5 ports often the one with the lowest number (0) is the predefined Uplink port.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:252
-msgid "network_switch_desc"
+msgid "Ports belonging to a <abbr title=\"Virtual Local Area Network\">VLAN</abbr> are separated with spaces. The port with the highest number (usually 5) is oftern the connection to the internal network interface of the router. On devices with 5 ports often the one with the lowest number (0) is the predefined Uplink port."
 msgstr ""
 "Portas que pertencem a uma <abbr title=\"Rede Local Virtual\">VLAN</abbr> são "
 "separadas com espaços. A porta com o maior número (geralmente 5) é muitas "
@@ -1411,7 +1411,7 @@ msgstr ""
 
 #. On this page you can configure the network interfaces. You can bridge several interfaces by ticking the &quot;bridge interfaces&quot; field and enter the names of several network interfaces separated by spaces. You can also use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation <samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: <samp>eth0.1</samp>).
 #: i18n/english/luasrc/i18n/admin-core.en.lua:253
-msgid "a_n_ifaces1"
+msgid "On this page you can configure the network interfaces. You can bridge several interfaces by ticking the \"bridge interfaces\" field and enter the names of several network interfaces separated by spaces. You can also use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation <samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: <samp>eth0.1</samp>)."
 msgstr ""
 "Nesta página pode configurar as interfaces de rede. Pode ter várias "
 "interfaces do tipo bridge, assinalando o campo &quot;interfaces bridge&quot; "
@@ -1422,17 +1422,17 @@ msgstr ""
 
 #. Bridge interfaces
 #: i18n/english/luasrc/i18n/admin-core.en.lua:254
-msgid "a_n_i_bridge"
+msgid "Bridge interfaces"
 msgstr "Activar ponte no interface"
 
 #. creates a bridge over specified interface(s)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:255
-msgid "a_n_i_bridge1"
+msgid "creates a bridge over specified interface(s)"
 msgstr "cria uma ponte sobre determinada(s) interface(s)"
 
 #. With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> network members can automatically receive their network settings (<abbr title=\"Internet Protocol\">IP</abbr>-address, netmask, <abbr title=\"Domain Name System\">DNS</abbr>-server, ...).
 #: i18n/english/luasrc/i18n/admin-core.en.lua:256
-msgid "dhcp_desc"
+msgid "With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> network members can automatically receive their network settings (<abbr title=\"Internet Protocol\">IP</abbr>-address, netmask, <abbr title=\"Domain Name System\">DNS</abbr>-server, ...)."
 msgstr ""
 "Com o <abbr title=\"Protocolo de Configuração Dinâmica de Hosts\">DHCP</abbr> "
 "os membros da rede podem automaticamente receber as suas configurações de "
@@ -1441,81 +1441,81 @@ msgstr ""
 
 #. Leasetime
 #: i18n/english/luasrc/i18n/admin-core.en.lua:257
-msgid "dhcp_dhcp_leasetime"
+msgid "Leasetime"
 msgstr "Tempo de atribuição DHCP"
 
 #. Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:258
-msgid "dhcp_dhcp_dynamicdhcp"
+msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 msgstr ""
 "<abbr title=\"Protocolo de Configuração Dinâmica de Hosts\">DHCP</abbr> "
 "Dinâmico"
 
 #. Ignore interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:259
-msgid "dhcp_dhcp_ignore"
+msgid "Ignore interface"
 msgstr "Ignorar Interface"
 
 #. disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for this interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:260
-msgid "dhcp_dhcp_ignore_desc"
+msgid "disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for this interface"
 msgstr ""
 "desabilitar <abbr title=\"Protocolo de Configuração Dinâmica de "
 "Hosts\">DHCP</abbr> para esta interface"
 
 #. Force
 #: i18n/english/luasrc/i18n/admin-core.en.lua:261
-msgid "dhcp_dhcp_force"
+msgid "Force"
 msgstr "Forçar"
 
 #. first address (last octet)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:262
-msgid "dhcp_dhcp_start_desc"
+msgid "first address (last octet)"
 msgstr "primeiro endereço (último octeto)"
 
 #. number of leased addresses -1
 #: i18n/english/luasrc/i18n/admin-core.en.lua:263
-msgid "dhcp_dhcp_limit_desc"
+msgid "number of leased addresses -1"
 msgstr "número de endereços para atribuição -1"
 
 #. DHCP-Options
 #: i18n/english/luasrc/i18n/admin-core.en.lua:264
-msgid "dhcp_dhcp_dhcpoption"
+msgid "DHCP-Options"
 msgstr "Opções DHCP"
 
 #. See &quot;dnsmasq --help dhcp&quot; for a list of available options.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:265
-msgid "dhcp_dhcp_dhcpoption_desc"
+msgid "See \"dnsmasq --help dhcp\" for a list of available options."
 msgstr "Veja &quot;dnsmasq --help dhcp&quot; para a lista disponível de opções."
 
 #. Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:266
-msgid "dhcp_leases"
+msgid "Leases"
 msgstr "Atribuições"
 
 #. Static Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:267
-msgid "luci_ethers"
+msgid "Static Leases"
 msgstr "Atribuições Estáticas"
 
 #. Leasetime remaining
 #: i18n/english/luasrc/i18n/admin-core.en.lua:268
-msgid "dhcp_timeremain"
+msgid "Leasetime remaining"
 msgstr "Tempo de atribuição restante"
 
 #. Active Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:269
-msgid "dhcp_leases_active"
+msgid "Active Leases"
 msgstr "Atribuições Activas"
 
 #. Point-to-Point Connections
 #: i18n/english/luasrc/i18n/admin-core.en.lua:270
-msgid "a_n_ptp"
+msgid "Point-to-Point Connections"
 msgstr "Ligações Ponto-a-Ponto"
 
 #. Point-to-Point connections with <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> or <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr> are often used to connect a device over <abbr title=\"Digital Subscriber Line\">DSL</abbr> or similar technologies to an internet access point.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:271
-msgid "a_n_ptp1"
+msgid "Point-to-Point connections with <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> or <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr> are often used to connect a device over <abbr title=\"Digital Subscriber Line\">DSL</abbr> or similar technologies to an internet access point."
 msgstr ""
 "Ligações Ponto-a-Ponto com <abbr title=\"Protocolo Ponto-a-Ponto sobre "
 "Ethernet\">PPPoE</abbr> ou <abbr title=\"Protocolo de Tunelamento "
@@ -1525,7 +1525,7 @@ msgstr ""
 
 #. You need to install &quot;comgt&quot; for UMTS/GPRS, &quot;ppp-mod-pppoe&quot; for PPPoE, &quot;ppp-mod-pppoa&quot; for PPPoA or &quot;pptp&quot; for PPtP support
 #: i18n/english/luasrc/i18n/admin-core.en.lua:272
-msgid "network_interface_prereq"
+msgid "You need to install \"comgt\" for UMTS/GPRS, \"ppp-mod-pppoe\" for PPPoE, \"ppp-mod-pppoa\" for PPPoA or \"pptp\" for PPtP support"
 msgstr ""
 "Precisa de instalar os pacotes &quot;comgt&quot; para UMTS/GPRS, &quot;ppp-"
 "mod-pppoe&quot; para PPPoE, &quot;ppp-mod-pppoa&quot; para PPPoA ou "
@@ -1533,706 +1533,706 @@ msgstr ""
 
 #. You need to install &quot;ppp-mod-pppoe&quot; for PPPoE or &quot;pptp&quot; for PPtP support
 #: i18n/english/luasrc/i18n/admin-core.en.lua:273
-msgid "network_interface_prereq_mini"
+msgid "You need to install \"ppp-mod-pppoe\" for PPPoE or \"pptp\" for PPtP support"
 msgstr ""
 "Precisa de instalar os pacotes &quot;ppp-mod-pppoe&quot; para PPPoE ou "
 "&quot;pptp&quot; para o suporte PPtP"
 
 #. <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:274
-msgid "network_interface_server"
+msgid "<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"
 msgstr ""
 "Servidor <abbr title=\"Protocolo de Tunelamento Ponto-a-Ponto\">PPTP</abbr>"
 
 #. Automatic Disconnect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:275
-msgid "network_interface_demand"
+msgid "Automatic Disconnect"
 msgstr "Fim automático de ligação"
 
 #. Time (in seconds) after which an unused connection will be closed
 #: i18n/english/luasrc/i18n/admin-core.en.lua:276
-msgid "network_interface_demand_desc"
+msgid "Time (in seconds) after which an unused connection will be closed"
 msgstr "Tempo (em segundos) para fim de uma ligação já não utilizada"
 
 #. Keep-Alive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:277
-msgid "network_interface_keepalive"
+msgid "Keep-Alive"
 msgstr "Manter em Actividade"
 
 #. Number of failed connection tests to initiate automatic reconnect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:278
-msgid "network_interface_keepalive_desc"
+msgid "Number of failed connection tests to initiate automatic reconnect"
 msgstr ""
 "Número de falhas do teste de ligação para reiniciar uma ligação automática"
 
 #. Modem device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:279
-msgid "network_interface_device"
+msgid "Modem device"
 msgstr "Dispositivo do Modem"
 
 #. The device node of your modem, e.g. /dev/ttyUSB0
 #: i18n/english/luasrc/i18n/admin-core.en.lua:280
-msgid "network_interface_device_desc"
+msgid "The device node of your modem, e.g. /dev/ttyUSB0"
 msgstr "O caminho do dispositivo do seu modem, ex. /dev/ttyUSB0"
 
 #. Replace default route
 #: i18n/english/luasrc/i18n/admin-core.en.lua:281
-msgid "network_interface_defaultroute"
+msgid "Replace default route"
 msgstr "Substituir a rota padrão"
 
 #. Let pppd replace the current default route to use the PPP interface after successful connect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:282
-msgid "network_interface_defaultroute_desc"
+msgid "Let pppd replace the current default route to use the PPP interface after successful connect"
 msgstr ""
 "Permitir o pppd substituir a rota padrão actual e usar a interface PPP como "
 "padrão após a ligação ser efectuada com sucesso"
 
 #. Use peer DNS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:283
-msgid "network_interface_peerdns"
+msgid "Use peer DNS"
 msgstr "Utilizar DNS do peer"
 
 #. Configure the local DNS server to use the name servers adverticed by the PPP peer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:284
-msgid "network_interface_peerdns_desc"
+msgid "Configure the local DNS server to use the name servers adverticed by the PPP peer"
 msgstr ""
 "Configurar o servidor DNS local para usar o servidores de nomes fornecidos "
 "pelo PPP"
 
 #. Enable IPv6 on PPP link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:285
-msgid "network_interface_ipv6"
+msgid "Enable IPv6 on PPP link"
 msgstr "Activar IPv6 no link PPP"
 
 #. Connect script
 #: i18n/english/luasrc/i18n/admin-core.en.lua:286
-msgid "network_interface_connect"
+msgid "Connect script"
 msgstr "Script de ligação"
 
 #. Let pppd run this script after establishing the PPP link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:287
-msgid "network_interface_connect_desc"
+msgid "Let pppd run this script after establishing the PPP link"
 msgstr "Deixar o pppd executar este script após o estabelecimento do link PPP"
 
 #. Disconnect script
 #: i18n/english/luasrc/i18n/admin-core.en.lua:288
-msgid "network_interface_disconnect"
+msgid "Disconnect script"
 msgstr "Script de fim de ligação"
 
 #. Let pppd run this script before tearing down the PPP link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:289
-msgid "network_interface_disconnect_desc"
+msgid "Let pppd run this script before tearing down the PPP link"
 msgstr "Deixar o pppd executar este script antes de terminar o link PPP"
 
 #. Additional pppd options
 #: i18n/english/luasrc/i18n/admin-core.en.lua:290
-msgid "network_interface_pppd_options"
+msgid "Additional pppd options"
 msgstr "Opções adicionais do pppd"
 
 #. Specify additional command line arguments for pppd here
 #: i18n/english/luasrc/i18n/admin-core.en.lua:291
-msgid "network_interface_pppd_options_desc"
+msgid "Specify additional command line arguments for pppd here"
 msgstr "Especificar argumentos adicionais por linha de comando para o pppd aqui"
 
 #. Access point (APN)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:292
-msgid "network_interface_apn"
+msgid "Access point (APN)"
 msgstr "Ponto de acesso (APN)"
 
 #. PIN code
 #: i18n/english/luasrc/i18n/admin-core.en.lua:293
-msgid "network_interface_pincode"
+msgid "PIN code"
 msgstr "Código PIN"
 
 #. Make sure that you provide the correct pin code here or you might lock your sim card!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:294
-msgid "network_interface_pincode_desc"
+msgid "Make sure that you provide the correct pin code here or you might lock your sim card!"
 msgstr ""
 "Certifique-se que forneceu o código PIN correcto aqui, ou pode bloquear o "
 "seu cartão SIM"
 
 #. Service type
 #: i18n/english/luasrc/i18n/admin-core.en.lua:295
-msgid "network_interface_service"
+msgid "Service type"
 msgstr "Tipo do serviço"
 
 #. Setup wait time
 #: i18n/english/luasrc/i18n/admin-core.en.lua:296
-msgid "network_interface_maxwait"
+msgid "Setup wait time"
 msgstr "Configurar tempo de espera"
 
 #. Seconds to wait for the modem to become ready before attempting to connect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:297
-msgid "network_interface_maxwait_desc"
+msgid "Seconds to wait for the modem to become ready before attempting to connect"
 msgstr ""
 "Segundos de espera para o modem ficar pronto antes de tentar uma ligação"
 
 #. PPPoA Encapsulation
 #: i18n/english/luasrc/i18n/admin-core.en.lua:298
-msgid "network_interface_encaps"
+msgid "PPPoA Encapsulation"
 msgstr "Encapsulamento PPPoA "
 
 #. Routes specify over which interface and gateway a certain host or network can be reached.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:299
-msgid "a_n_r_routes1"
+msgid "Routes specify over which interface and gateway a certain host or network can be reached."
 msgstr ""
 "As rotas especificam através de que interfaces ou gateways podem ser "
 "alcançados determinadas redes ou hosts."
 
 #. Static Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:300
-msgid "a_n_routes_static"
+msgid "Static Routes"
 msgstr "Rotas Estáticas"
 
 #. Static IPv4 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:301
-msgid "a_n_routes_static4"
+msgid "Static IPv4 Routes"
 msgstr "Rotas Estáticas IPv4"
 
 #. Static IPv6 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:302
-msgid "a_n_routes_static6"
+msgid "Static IPv6 Routes"
 msgstr "Rotas Estáticas IPv6"
 
 #. Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:303
-msgid "a_n_routes_kernel4"
+msgid "Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes"
 msgstr "Rotas-<abbr title=\"Protocolo de Internet Versão 4\">IPv4</abbr> activas"
 
 #. Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:304
-msgid "a_n_routes_kernel6"
+msgid "Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes"
 msgstr "Rotas-<abbr title=\"Protocolo de Internet Versão 6\">IPv6</abbr> activas"
 
 #. Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:305
-msgid "a_n_r_target1"
+msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
 msgstr ""
 "<abbr title=\"Endereço do Protocolo de Internet\">IP</abbr> do host ou rede"
 
 #. <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network (CIDR)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:306
-msgid "a_n_r_target6"
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network (CIDR)"
 msgstr ""
 "<abbr title=\"Endereço do Protocolo de Internet Versão 6\">IPv6</abbr> do host "
 "ou rede"
 
 #. if target is a network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:307
-msgid "a_n_r_netmask1"
+msgid "if target is a network"
 msgstr "se o destino for uma rede"
 
 #. Internet Connection
 #: i18n/english/luasrc/i18n/admin-core.en.lua:308
-msgid "m_n_inet"
+msgid "Internet Connection"
 msgstr "Ligação Internet"
 
 #. Local Network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:309
-msgid "m_n_local"
+msgid "Local Network"
 msgstr "Rede Local"
 
 #. Route
 #: i18n/english/luasrc/i18n/admin-core.en.lua:310
-msgid "m_n_route"
+msgid "Route"
 msgstr "Rota"
 
 #. Bridge
 #: i18n/english/luasrc/i18n/admin-core.en.lua:311
-msgid "m_n_brdige"
+msgid "Bridge"
 msgstr "Ponte"
 
 #. Provide (Access Point)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:312
-msgid "m_w_ap"
+msgid "Provide (Access Point)"
 msgstr "Ponto de Acesso (Access Point)"
 
 #. Independent (Ad-Hoc)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:313
-msgid "m_w_adhoc"
+msgid "Independent (Ad-Hoc)"
 msgstr "Independente (Ad-Hoc)"
 
 #. Join (Client)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:314
-msgid "m_w_client"
+msgid "Join (Client)"
 msgstr "Cliente (Client)"
 
 #. Distributed (<abbr title=\"Wireless Distribution System\">WDS</abbr>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:315
-msgid "m_w_wds"
+msgid "Distributed (<abbr title=\"Wireless Distribution System\">WDS</abbr>)"
 msgstr "Distribuído (<abbr title=\"Sistema de Distribuição Wireless\">WDS</abbr>)"
 
 #. Clientmode
 #: i18n/english/luasrc/i18n/admin-core.en.lua:316
-msgid "m_w_clientmode"
+msgid "Clientmode"
 msgstr "Modo Cliente"
 
 #. System log buffer size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:317
-msgid "system_system_logsize"
+msgid "System log buffer size"
 msgstr "Tamanho do buffer do registo do sistema"
 
 #. External system log server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:318
-msgid "system_system_logip"
+msgid "External system log server"
 msgstr "Servidor externo do registo do sistema"
 
 #. Log output level
 #: i18n/english/luasrc/i18n/admin-core.en.lua:319
-msgid "system_system_conloglevel"
+msgid "Log output level"
 msgstr "Nível de detalhe do registo do sistema"
 
 #. Level of log messages on the console
 #: i18n/english/luasrc/i18n/admin-core.en.lua:320
-msgid "system_system_conloglevel_desc"
+msgid "Level of log messages on the console"
 msgstr "Categoria das mensagens de registo de sistema na consola"
 
 #. Processor
 #: i18n/english/luasrc/i18n/admin-core.en.lua:321
-msgid "m_i_processor"
+msgid "Processor"
 msgstr "Processador"
 
 #. Memory
 #: i18n/english/luasrc/i18n/admin-core.en.lua:322
-msgid "m_i_memory"
+msgid "Memory"
 msgstr "Memória"
 
 #. Local Time
 #: i18n/english/luasrc/i18n/admin-core.en.lua:323
-msgid "m_i_systemtime"
+msgid "Local Time"
 msgstr "Hora Local"
 
 #. Uptime
 #: i18n/english/luasrc/i18n/admin-core.en.lua:324
-msgid "m_i_uptime"
+msgid "Uptime"
 msgstr "Uptime"
 
 #. First leased address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:325
-msgid "m_n_d_firstaddress"
+msgid "First leased address"
 msgstr "Primeiro endereço de atribuição"
 
 #. Number of leased addresses
 #: i18n/english/luasrc/i18n/admin-core.en.lua:326
-msgid "m_n_d_numleases"
+msgid "Number of leased addresses"
 msgstr "Número de endereços atribuidos"
 
 #. Routing table
 #: i18n/english/luasrc/i18n/admin-core.en.lua:327
-msgid "routingtable"
+msgid "Routing table"
 msgstr "Tabela de roteamento"
 
 #. Wifi scan
 #: i18n/english/luasrc/i18n/admin-core.en.lua:328
-msgid "wlanscan"
+msgid "Wifi scan"
 msgstr "Procurar redes Wifi"
 
 #. Frequency
 #: i18n/english/luasrc/i18n/admin-core.en.lua:329
-msgid "frequency"
+msgid "Frequency"
 msgstr "Frequência"
 
 #. Power
 #: i18n/english/luasrc/i18n/admin-core.en.lua:330
-msgid "power"
+msgid "Power"
 msgstr "Potência"
 
 #. Noise
 #: i18n/english/luasrc/i18n/admin-core.en.lua:331
-msgid "noise"
+msgid "Noise"
 msgstr "Ruído"
 
 #. Signal
 #: i18n/english/luasrc/i18n/admin-core.en.lua:332
-msgid "signal"
+msgid "Signal"
 msgstr "Sinal"
 
 #. Link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:333
-msgid "link"
+msgid "Link"
 msgstr "Link"
 
 #. <abbr title=\"Fragmentation\">Frag.</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:334
-msgid "frag"
+msgid "<abbr title=\"Fragmentation\">Frag.</abbr>"
 msgstr "<abbr title=\"Fragmentation\">Frag.</abbr>"
 
 #. <abbr title=\"Request To Send\">RTS</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:335
-msgid "rts"
+msgid "<abbr title=\"Request To Send\">RTS</abbr>"
 msgstr "<abbr title=\"Request To Send\">RTS</abbr>"
 
 #. Bitrate
 #: i18n/english/luasrc/i18n/admin-core.en.lua:336
-msgid "bitrate"
+msgid "Bitrate"
 msgstr "Bitrate"
 
 #. automatically reconnect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:337
-msgid "m_n_keepalive"
+msgid "automatically reconnect"
 msgstr "ligação automática"
 
 #. disconnect when idle for
 #: i18n/english/luasrc/i18n/admin-core.en.lua:338
-msgid "m_n_dialondemand"
+msgid "disconnect when idle for"
 msgstr "desligar quando ocioso por"
 
 #. <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:339
-msgid "m_n_pptp_server"
+msgid "<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"
 msgstr ""
 "Servidor-<abbr title=\"Protocolo de Tunelamento Ponto-a-Ponto\">PPTP</abbr>"
 
 #. <abbr title=\"Light Emitting Diode\">LED</abbr> Configuration
 #: i18n/english/luasrc/i18n/admin-core.en.lua:340
-msgid "leds"
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "Configuração do <abbr title=\"Diodo Emissor de Luz\">LED</abbr>"
 
 #. Customizes the behaviour of the device <abbr title=\"Light Emitting Diode\">LED</abbr>s if possible.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:341
-msgid "leds_desc"
+msgid "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode\">LED</abbr>s if possible."
 msgstr ""
 "Customiza o comportamento dos <abbr title=\"Diodo Emissor de Luz\">LED</abbr>s "
 "se possível."
 
 #. <abbr title=\"Light Emitting Diode\">LED</abbr> Name
 #: i18n/english/luasrc/i18n/admin-core.en.lua:342
-msgid "system_led_name"
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr "Nome do <abbr title=\"Diodo Emissor de Luz\">LED</abbr>"
 
 #. <abbr title=\"Light Emitting Diode\">LED</abbr> Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:343
-msgid "system_led_sysfs"
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Device"
 msgstr "Dispositivo do <abbr title=\"Diodo Emissor de Luz\">LED</abbr>"
 
 #. Default state
 #: i18n/english/luasrc/i18n/admin-core.en.lua:344
-msgid "system_led_default"
+msgid "Default state"
 msgstr "Estado padrão"
 
 #. ticked = on
 #: i18n/english/luasrc/i18n/admin-core.en.lua:345
-msgid "system_led_default_desc"
+msgid "ticked = on"
 msgstr "selecionado = ligado"
 
 #. Trigger
 #: i18n/english/luasrc/i18n/admin-core.en.lua:346
-msgid "system_led_trigger"
+msgid "Trigger"
 msgstr "Evento"
 
 #. None
 #: i18n/english/luasrc/i18n/admin-core.en.lua:347
-msgid "system_led_trigger_none"
+msgid "None"
 msgstr "Nenhum"
 
 #. Default On
 #: i18n/english/luasrc/i18n/admin-core.en.lua:348
-msgid "system_led_trigger_defaulton"
+msgid "Default On"
 msgstr "Padrão Ligado"
 
 #. Timer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:349
-msgid "system_led_trigger_timer"
+msgid "Timer"
 msgstr "Temporizador"
 
 #. Heartbeat (Load Average)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:350
-msgid "system_led_trigger_heartbeat"
+msgid "Heartbeat (Load Average)"
 msgstr "Carga Média"
 
 #. Network Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:351
-msgid "system_led_trigger_netdev"
+msgid "Network Device"
 msgstr "Dispositivo de Rede"
 
 #. Off-State Delay
 #: i18n/english/luasrc/i18n/admin-core.en.lua:352
-msgid "system_led_delayoff"
+msgid "Off-State Delay"
 msgstr "Tempo no Estado Desligado"
 
 #. Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is off
 #: i18n/english/luasrc/i18n/admin-core.en.lua:353
-msgid "system_led_delayoff_desc"
+msgid "Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is off"
 msgstr ""
 "Tempo (em ms) durante o qual o <abbr title=\"Diodo Emissor de Luz\">LED</abbr> "
 "fica desligado"
 
 #. On-State Delay
 #: i18n/english/luasrc/i18n/admin-core.en.lua:354
-msgid "system_led_delayon"
+msgid "On-State Delay"
 msgstr "Tempo no Estado Ligado"
 
 #. Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is on
 #: i18n/english/luasrc/i18n/admin-core.en.lua:355
-msgid "system_led_delayon_desc"
+msgid "Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is on"
 msgstr ""
 "Tempo (em ms) durante o qual o <abbr title=\"Diodo Emissor de Luz\">LED</abbr> "
 "permanece ligado"
 
 #. Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:356
-msgid "system_led_dev"
+msgid "Device"
 msgstr "Dispositivo"
 
 #. Trigger Mode
 #: i18n/english/luasrc/i18n/admin-core.en.lua:357
-msgid "system_led_mode"
+msgid "Trigger Mode"
 msgstr "Modo do gatilho"
 
 #. Link On
 #: i18n/english/luasrc/i18n/admin-core.en.lua:358
-msgid "system_led_mode_link"
+msgid "Link On"
 msgstr "Link Activo"
 
 #. Transmit
 #: i18n/english/luasrc/i18n/admin-core.en.lua:359
-msgid "system_led_mode_tx"
+msgid "Transmit"
 msgstr "Transmitir"
 
 #. Receive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:360
-msgid "system_led_mode_rx"
+msgid "Receive"
 msgstr "Receber"
 
 #. Active
 #: i18n/english/luasrc/i18n/admin-core.en.lua:361
-msgid "network_interface_up"
+msgid "Active"
 msgstr "Activo"
 
 #. <abbr title=\"Media Access Control\">MAC</abbr>-Address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:362
-msgid "network_interface_hwaddr"
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr "Endereço <abbr title=\"Controle de Acesso ao Meio\">MAC</abbr>"
 
 #. Hardware Address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:363
-msgid "network_interface_hwaddr_desc"
+msgid "Hardware Address"
 msgstr "Endereço do Hardware"
 
 #. Traffic
 #: i18n/english/luasrc/i18n/admin-core.en.lua:364
-msgid "network_interface_txrx"
+msgid "Traffic"
 msgstr "Tráfego"
 
 #. transmitted / received
 #: i18n/english/luasrc/i18n/admin-core.en.lua:365
-msgid "network_interface_txrx_desc"
+msgid "transmitted / received"
 msgstr "transmitido / recebido"
 
 #. Errors
 #: i18n/english/luasrc/i18n/admin-core.en.lua:366
-msgid "network_interface_err"
+msgid "Errors"
 msgstr "Erros"
 
 #. TX / RX
 #: i18n/english/luasrc/i18n/admin-core.en.lua:367
-msgid "network_interface_err_desc"
+msgid "TX / RX"
 msgstr "TX / RX"
 
 #. Create / Assign firewall-zone
 #: i18n/english/luasrc/i18n/admin-core.en.lua:368
-msgid "network_interface_fwzone"
+msgid "Create / Assign firewall-zone"
 msgstr "Criar / Atribuir a uma zona de firewall"
 
 #. This interface does not belong to any firewall zone yet.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:369
-msgid "network_interface_fwzone_desc"
+msgid "Choose the firewall zone you want to assign to this interface. Select <em>unspecified</em> to remove the interface from the associated zone or fill out the <em>create</em> field to define a new zone and attach the interface to it."
 msgstr "Esta interface ainda não pertence a nenhuma zona de firewall."
 
 #. Processes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:370
-msgid "process_head"
+msgid "Processes"
 msgstr "Processos"
 
 #. This list gives an overview over currently running system processes and their status.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:371
-msgid "process_descr"
+msgid "This list gives an overview over currently running system processes and their status."
 msgstr ""
 "Esta lista fornece uma visão geral sobre os processos em execução no "
 "sistema."
 
 #. PID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:372
-msgid "process_pid"
+msgid "PID"
 msgstr "PID"
 
 #. Owner
 #: i18n/english/luasrc/i18n/admin-core.en.lua:373
-msgid "process_owner"
+msgid "Owner"
 msgstr "Dono"
 
 #. Command
 #: i18n/english/luasrc/i18n/admin-core.en.lua:374
-msgid "process_command"
+msgid "Command"
 msgstr "Comando"
 
 #. CPU usage (%)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:375
-msgid "process_cpu"
+msgid "CPU usage (%)"
 msgstr "Uso da CPU (%)"
 
 #. Memory usage (%)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:376
-msgid "process_mem"
+msgid "Memory usage (%)"
 msgstr "Uso de memória (%)"
 
 #. Hang Up
 #: i18n/english/luasrc/i18n/admin-core.en.lua:377
-msgid "process_hup"
+msgid "Hang Up"
 msgstr "Suspender"
 
 #. Terminate
 #: i18n/english/luasrc/i18n/admin-core.en.lua:378
-msgid "process_term"
+msgid "Terminate"
 msgstr "Terminar"
 
 #. Kill
 #: i18n/english/luasrc/i18n/admin-core.en.lua:379
-msgid "process_kill"
+msgid "Kill"
 msgstr "Matar"
 
 #. cached
 #: i18n/english/luasrc/i18n/admin-core.en.lua:380
-msgid "mem_cached"
+msgid "cached"
 msgstr "em cache"
 
 #. buffered
 #: i18n/english/luasrc/i18n/admin-core.en.lua:381
-msgid "mem_buffered"
+msgid "buffered"
 msgstr "em buffer"
 
 #. free
 #: i18n/english/luasrc/i18n/admin-core.en.lua:382
-msgid "mem_free"
+msgid "free"
 msgstr "livre"
 
 #. Scheduled Tasks
 #: i18n/english/luasrc/i18n/admin-core.en.lua:383
-msgid "a_s_crontab"
+msgid "Scheduled Tasks"
 msgstr "Tarefas Agendadas"
 
 #. This is the system crontab in which scheduled tasks can be defined.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:384
-msgid "a_s_crontab1"
+msgid "This is the system crontab in which scheduled tasks can be defined."
 msgstr "Este é o sistema de agendamento de tarefas."
 
 #. NAS ID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:385
-msgid "a_w_nasid"
+msgid "NAS ID"
 msgstr "NAS ID"
 
 #. Path to CA-Certificate
 #: i18n/english/luasrc/i18n/admin-core.en.lua:386
-msgid "a_w_cacert"
+msgid "Path to CA-Certificate"
 msgstr "Directorio do Certificado CA"
 
 #. EAP-Method
 #: i18n/english/luasrc/i18n/admin-core.en.lua:387
-msgid "a_w_eaptype"
+msgid "EAP-Method"
 msgstr "Tipo de EAP"
 
 #. Path to Private Key
 #: i18n/english/luasrc/i18n/admin-core.en.lua:388
-msgid "a_w_tlsprivkey"
+msgid "Path to Private Key"
 msgstr "Directorio da Chave Privada"
 
 #. Password of Private Key
 #: i18n/english/luasrc/i18n/admin-core.en.lua:389
-msgid "a_w_tlsprivkeypwd"
+msgid "Password of Private Key"
 msgstr "Senha da Chave Privada"
 
 #. Authentication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:390
-msgid "a_w_peapauth"
+msgid "Authentication"
 msgstr "Autenticação PEAP"
 
 #. Identity
 #: i18n/english/luasrc/i18n/admin-core.en.lua:391
-msgid "a_w_peapidentity"
+msgid "Identity"
 msgstr "Identidade PEAP"
 
 #. Password
 #: i18n/english/luasrc/i18n/admin-core.en.lua:392
-msgid "a_w_peappassword"
+msgid "Password"
 msgstr "Senha PEAP"
 
 #. Create Network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:393
-msgid "a_w_create"
+msgid "Create Network"
 msgstr "Criar Rede"
 
 #. Hostnames
 #: i18n/english/luasrc/i18n/admin-core.en.lua:394
-msgid "hostnames"
+msgid "Hostnames"
 msgstr "Hostnames"
 
 #. Host entries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:395
-msgid "hostnames_entries"
+msgid "Host entries"
 msgstr "Entradas de Hosts"
 
 #. Hostname
 #: i18n/english/luasrc/i18n/admin-core.en.lua:396
-msgid "hostnames_hostname"
+msgid "Hostname"
 msgstr "Nome do host"
 
 #. IP address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:397
-msgid "hostnames_address"
+msgid "IP address"
 msgstr "Endereço IP"
 
 #. Clamp Segment Size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:398
-msgid "m_n_mssfix"
+msgid "Clamp Segment Size"
 msgstr "Clamp Segment Size"
 
 #. Fixes problems with unreachable websites, submitting forms or other unexpected behaviour for some ISPs.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:399
-msgid "m_n_mssfix_desc"
+msgid "Fixes problems with unreachable websites, submitting forms or other unexpected behaviour for some ISPs."
 msgstr ""
 "Resolve problemas com websites indisponíveis, submissão de formulários ou "
 "comportamentos inesperados de alguns ISP's."
 
 #. Flash Firmware
 #: i18n/english/luasrc/i18n/admin-core.en.lua:400
-msgid "admin_upgrade"
+msgid "Flash Firmware"
 msgstr "Gravar Firmware"
 
 #. The uploaded image file does not contain a supported format. Make sure that you choose the generic image format for your platform.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:401
-msgid "admin_upgrade_badimage"
+msgid "The uploaded image file does not contain a supported format. Make sure that you choose the generic image format for your platform."
 msgstr ""
 "A imagem carregada não contém um formato suportado. Confirme que escolhe uma "
 "imagem genérica para a sua plataforma."
 
 #. Checksum
 #: i18n/english/luasrc/i18n/admin-core.en.lua:402
-msgid "admin_upgrade_checksum"
+msgid "Checksum"
 msgstr "Checksum"
 
 #. Upload an OpenWrt image file to reflash the device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:403
-msgid "admin_upgrade_desc"
+msgid "Upload an OpenWrt image file to reflash the device."
 msgstr "Carregar uma imagem OpenWrt para a flash do router."
 
 #. Size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:404
-msgid "admin_upgrade_filesize"
+msgid "Size"
 msgstr "Tamanho"
 
 #. Firmware image
 #: i18n/english/luasrc/i18n/admin-core.en.lua:405
-msgid "admin_upgrade_fwimage"
+msgid "Firmware image"
 msgstr "Imagem de Firmware"
 
 #. Keep configuration files
 #: i18n/english/luasrc/i18n/admin-core.en.lua:406
-msgid "admin_upgrade_keepcfg"
+msgid "Keep configuration files"
 msgstr "Manter ficheiros de configuração"
 
 #. Sorry. OpenWrt does not support a system upgrade on this platform.<br /> You need to manually flash your device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:407
-msgid "admin_upgrade_nosupport"
+msgid "Sorry. OpenWrt does not support a system upgrade on this platform.<br /> You need to manually flash your device."
 msgstr ""
 "Lamentamos, mas o OpenWrt não suporta uma actualização do sistema para esta "
 "plataforma.<br /> É necessário carregar manualmente uma imagem para a flash "
@@ -2240,7 +2240,7 @@ msgstr ""
 
 #. The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a few minutes until you try to reconnect. It might be necessary to renew the address of your computer to reach the device again, depending on your settings.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:408
-msgid "admin_upgrade_running"
+msgid "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a few minutes until you try to reconnect. It might be necessary to renew the address of your computer to reach the device again, depending on your settings."
 msgstr ""
 "O sistema está a carregar o firmware para a flash.<br /> NÃO DESLIGUE O "
 "EQUIPAMENTO!<br /> Espere alguns minutos até tentar uma ligação. Dependendo "
@@ -2249,19 +2249,19 @@ msgstr ""
 
 #.  (%s available)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:409
-msgid "admin_upgrade_spaceavail"
+msgid " (%s available)"
 msgstr " (%s disponível)"
 
 #. It appears that you try to flash an image that does not fit into the flash memory, please verify the image file!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:410
-msgid "admin_upgrade_toolarge"
+msgid "It appears that you try to flash an image that does not fit into the flash memory, please verify the image file!"
 msgstr ""
 "A imagem que está a tentar carregar aparenta nao caber na flash do "
 "equipamento. Por favor verifique o ficheiro de imagem."
 
 #. Upload image
 #: i18n/english/luasrc/i18n/admin-core.en.lua:411
-msgid "admin_upgrade_upload"
+msgid "Upload image"
 msgstr "Carregar imagem"
 
 #. The flash image was uploaded. Below is the checksum and file size listed, compare them with the original file to ensure data integrity.<br /> Click \"Proceed\" below to start the flash procedure.
diff --git a/po/pt/asterisk.po b/po/pt/asterisk.po
index 701f14f25..f983fd3f4 100644
--- a/po/pt/asterisk.po
+++ b/po/pt/asterisk.po
@@ -13,1266 +13,1266 @@ msgstr ""
 
 #. Asterisk General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:1
-msgid "asterisk_asterisk"
+msgid "Asterisk General Options"
 msgstr "Opções Gerais do Asterisk"
 
 #. AGI directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:2
-msgid "asterisk_asterisk_agidir"
+msgid "AGI directory"
 msgstr "Directorio AGI"
 
 #. Cache recorded sound files during recording
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:3
-msgid "asterisk_asterisk_cacherecordfiles"
+msgid "Cache recorded sound files during recording"
 msgstr "Guardar em cache os ficheiros de som durante a gravação"
 
 #. Debug Level
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:4
-msgid "asterisk_asterisk_debug"
+msgid "Debug Level"
 msgstr "Nível de debug"
 
 #. Disable some warnings
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:5
-msgid "asterisk_asterisk_dontwarn"
+msgid "Disable some warnings"
 msgstr "Desactivar alguns avisos"
 
 #. Dump core on crash
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:6
-msgid "asterisk_asterisk_dumpcore"
+msgid "Dump core on crash"
 msgstr "Guardar o core quando houver crash"
 
 #. High Priority
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:7
-msgid "asterisk_asterisk_highpriority"
+msgid "High Priority"
 msgstr "Alta Prioridade"
 
 #. Initialise Crypto
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:8
-msgid "asterisk_asterisk_initcrypto"
+msgid "Initialise Crypto"
 msgstr "Inicializar Crypto"
 
 #. Use Internal Timing
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:9
-msgid "asterisk_asterisk_internaltiming"
+msgid "Use Internal Timing"
 msgstr "Usar temporizações internas"
 
 #. Log directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:10
-msgid "asterisk_asterisk_logdir"
+msgid "Log directory"
 msgstr "Directorio de registos"
 
 #. Maximum number of calls allowed
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:11
-msgid "asterisk_asterisk_maxcalls"
+msgid "Maximum number of calls allowed"
 msgstr "Maximo de chamadas permitidas"
 
 #. Maximum load to stop accepting new calls
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:12
-msgid "asterisk_asterisk_maxload"
+msgid "Maximum load to stop accepting new calls"
 msgstr "Maximo de carga para deixar de aceitar novas chamadas"
 
 #. Disable console colors
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:13
-msgid "asterisk_asterisk_nocolor"
+msgid "Disable console colors"
 msgstr "Desactivar cores na consola"
 
 #. Sound files Cache directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:14
-msgid "asterisk_asterisk_recordcachedir"
+msgid "Sound files Cache directory"
 msgstr "Directorio de cache para ficheiros de som"
 
 #. The Group to run as
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:15
-msgid "asterisk_asterisk_rungroup"
+msgid "The Group to run as"
 msgstr "O grupo sob o qual o asterisk será executado"
 
 #. The User to run as
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:16
-msgid "asterisk_asterisk_runuser"
+msgid "The User to run as"
 msgstr "O utilizador sob o qual o asterisk será executado"
 
 #. Voicemail Spool directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:17
-msgid "asterisk_asterisk_spooldir"
+msgid "Voicemail Spool directory"
 msgstr "Directorio da spool de voicemail"
 
 #. Prefix UniquID with system name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:18
-msgid "asterisk_asterisk_systemname"
+msgid "Prefix UniquID with system name"
 msgstr "Prefixar o nome de sistema à UniquID"
 
 #. Build transcode paths via SLINEAR, not directly
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:19
-msgid "asterisk_asterisk_transcodeviasln"
+msgid "Build transcode paths via SLINEAR, not directly"
 msgstr ""
 "Construir os caminhos de transcode atraves de SLINEAR e não directamente"
 
 #. Transmit SLINEAR silence while recording a channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:20
-msgid "asterisk_asterisk_transmitsilenceduringrecord"
+msgid "Transmit SLINEAR silence while recording a channel"
 msgstr "Transmitir silencio SLINEAR durante a gravação de um canal"
 
 #. Verbose Level
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:21
-msgid "asterisk_asterisk_verbose"
+msgid "Verbose Level"
 msgstr "Nivel de verbosidade"
 
 #. Time Zone
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:22
-msgid "asterisk_asterisk_zone"
+msgid "Time Zone"
 msgstr "Fuso Horário"
 
 #. Section dialplan
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:23
-msgid "asterisk_dialplan"
+msgid "Section dialplan"
 msgstr "Secção do Plano de Marcação"
 
 #. include
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:24
-msgid "asterisk_dialplan_include"
+msgid "include"
 msgstr "incluir"
 
 #. Dialplan Extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:25
-msgid "asterisk_dialplanexten"
+msgid "Dialplan Extension"
 msgstr "Extensão do Plano de Marcação"
 
 #. Dialplan General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:26
-msgid "asterisk_dialplangeneral"
+msgid "Dialplan General Options"
 msgstr "Opções Gerais do Plano de Marcação"
 
 #. Allow transfer
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:27
-msgid "asterisk_dialplangeneral_allowtransfer"
+msgid "Allow transfer"
 msgstr "Permitir transferência"
 
 #. Reinvite/redirect media connections
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:28
-msgid "asterisk_dialplangeneral_canreinvite"
+msgid "Reinvite/redirect media connections"
 msgstr "Redirigir/Repetir ligações multimedia"
 
 #. Clear global vars
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:29
-msgid "asterisk_dialplangeneral_clearglobalvars"
+msgid "Clear global vars"
 msgstr "Limpar variaveis globais"
 
 #. Dialplan Goto
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:30
-msgid "asterisk_dialplangoto"
+msgid "Dialplan Goto"
 msgstr "Encaminhamento do Plano de Marcação"
 
 #. Dialplan Conference
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:31
-msgid "asterisk_dialplanmeetme"
+msgid "Dialplan Conference"
 msgstr "Conferencia do Plano de Marcação"
 
 #. Dialplan Time
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:32
 #, fuzzy
-msgid "asterisk_dialplansaytime"
+msgid "Dialplan Time"
 msgstr "Conferencia do Plano de Marcação"
 
 #. Dialplan Voicemail
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:33
 #, fuzzy
-msgid "asterisk_dialplanvoice"
+msgid "Dialplan Voicemail"
 msgstr "Encaminhamento do Plano de Marcação"
 
 #. Dial Zones for Dialplan
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:34
 #, fuzzy
-msgid "asterisk_dialzone"
+msgid "Dial Zones for Dialplan"
 msgstr "Secção do Plano de Marcação"
 
 #. Prefix to add matching dialplans
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:35
-msgid "asterisk_dialzone_addprefix"
+msgid "Prefix to add matching dialplans"
 msgstr ""
 
 #. Match International prefix
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:36
-msgid "asterisk_dialzone_international"
+msgid "Match International prefix"
 msgstr ""
 
 #. Prefix (0) to add/remove to/from international numbers
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:37
-msgid "asterisk_dialzone_localprefix"
+msgid "Prefix (0) to add/remove to/from international numbers"
 msgstr ""
 
 #. localzone
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:38
-msgid "asterisk_dialzone_localzone"
+msgid "localzone"
 msgstr ""
 
 #. Match plan
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:39
-msgid "asterisk_dialzone_match"
+msgid "Match plan"
 msgstr ""
 
 #. Connection to use
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:40
 #, fuzzy
-msgid "asterisk_dialzone_uses"
+msgid "Connection to use"
 msgstr "Secção do Plano de Marcação"
 
 #. Feature Key maps
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:41
-msgid "asterisk_featuremap"
+msgid "Feature Key maps"
 msgstr ""
 
 #. Attended transfer key
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:42
-msgid "asterisk_featuremap_atxfer"
+msgid "Attended transfer key"
 msgstr ""
 
 #. Blind transfer key
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:43
-msgid "asterisk_featuremap_blindxfer"
+msgid "Blind transfer key"
 msgstr ""
 
 #. Key to Disconnect call
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:44
-msgid "asterisk_featuremap_disconnect"
+msgid "Key to Disconnect call"
 msgstr ""
 
 #. Key to Park call
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:45
-msgid "asterisk_featuremap_parkcall"
+msgid "Key to Park call"
 msgstr ""
 
 #. Parking Feature
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:46
-msgid "asterisk_featurepark"
+msgid "Parking Feature"
 msgstr ""
 
 #. ADSI Park
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:47
-msgid "asterisk_featurepark_adsipark"
+msgid "ADSI Park"
 msgstr ""
 
 #. Attended transfer timeout (sec)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:48
-msgid "asterisk_featurepark_atxfernoanswertimeout"
+msgid "Attended transfer timeout (sec)"
 msgstr ""
 
 #. One touch record key
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:49
-msgid "asterisk_featurepark_automon"
+msgid "One touch record key"
 msgstr ""
 
 #. Name of call context for parking
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:50
-msgid "asterisk_featurepark_context"
+msgid "Name of call context for parking"
 msgstr ""
 
 #. Sound file to play to parked caller
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:51
-msgid "asterisk_featurepark_courtesytone"
+msgid "Sound file to play to parked caller"
 msgstr ""
 
 #. Max time (ms) between digits for feature activation
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:52
-msgid "asterisk_featurepark_featuredigittimeout"
+msgid "Max time (ms) between digits for feature activation"
 msgstr ""
 
 #. Method to Find Parking slot
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:53
-msgid "asterisk_featurepark_findslot"
+msgid "Method to Find Parking slot"
 msgstr ""
 
 #. parkedmusicclass
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:54
-msgid "asterisk_featurepark_parkedmusicclass"
+msgid "parkedmusicclass"
 msgstr ""
 
 #. Play courtesy tone to
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:55
-msgid "asterisk_featurepark_parkedplay"
+msgid "Play courtesy tone to"
 msgstr ""
 
 #. Enable Parking
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:56
-msgid "asterisk_featurepark_parkenabled"
+msgid "Enable Parking"
 msgstr ""
 
 #. Extension to dial to park
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:57
-msgid "asterisk_featurepark_parkext"
+msgid "Extension to dial to park"
 msgstr ""
 
 #. Parking time (secs)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:58
-msgid "asterisk_featurepark_parkingtime"
+msgid "Parking time (secs)"
 msgstr ""
 
 #. Range of extensions for call parking
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:59
-msgid "asterisk_featurepark_parkpos"
+msgid "Range of extensions for call parking"
 msgstr ""
 
 #. Pickup extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:60
-msgid "asterisk_featurepark_pickupexten"
+msgid "Pickup extension"
 msgstr ""
 
 #. Seconds to wait bewteen digits when transferring
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:61
-msgid "asterisk_featurepark_transferdigittimeout"
+msgid "Seconds to wait bewteen digits when transferring"
 msgstr ""
 
 #. sound when attended transfer is complete
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:62
-msgid "asterisk_featurepark_xferfailsound"
+msgid "sound when attended transfer is complete"
 msgstr ""
 
 #. Sound when attended transfer fails
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:63
-msgid "asterisk_featurepark_xfersound"
+msgid "Sound when attended transfer fails"
 msgstr ""
 
 #. Reload Hardware Config
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:64
-msgid "asterisk_hardwarereboot"
+msgid "Reload Hardware Config"
 msgstr ""
 
 #. Reboot Method
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:65
-msgid "asterisk_hardwarereboot_method"
+msgid "Reboot Method"
 msgstr ""
 
 #. Parameter
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:66
-msgid "asterisk_hardwarereboot_param"
+msgid "Parameter"
 msgstr ""
 
 #. SIP Connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:67
-msgid "asterisk_iax"
+msgid "SIP Connection"
 msgstr ""
 
 #. Always Dial International
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:68
-msgid "asterisk_iax_alwaysinternational"
+msgid "Always Dial International"
 msgstr ""
 
 #. context
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:69
-msgid "asterisk_iax_context"
+msgid "context"
 msgstr ""
 
 #. Country Code for connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:70
-msgid "asterisk_iax_countrycode"
+msgid "Country Code for connection"
 msgstr ""
 
 #. Add as Extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:71
-msgid "asterisk_iax_extension"
+msgid "Add as Extension"
 msgstr ""
 
 #. Host name (or blank)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:72
-msgid "asterisk_iax_host"
+msgid "Host name (or blank)"
 msgstr ""
 
 #. International Dial Prefix
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:73
-msgid "asterisk_iax_internationalprefix"
+msgid "International Dial Prefix"
 msgstr ""
 
 #. Dial Prefix (for external line)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:74
-msgid "asterisk_iax_prefix"
+msgid "Dial Prefix (for external line)"
 msgstr ""
 
 #. Secret
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:75
-msgid "asterisk_iax_secret"
+msgid "Secret"
 msgstr ""
 
 #. Dial Timeout (sec)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:76
-msgid "asterisk_iax_timeout"
+msgid "Dial Timeout (sec)"
 msgstr ""
 
 #. Option type
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:77
-msgid "asterisk_iax_type"
+msgid "Option type"
 msgstr ""
 
 #. User name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:78
-msgid "asterisk_iax_username"
+msgid "User name"
 msgstr ""
 
 #. IAX General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:79
 #, fuzzy
-msgid "asterisk_iaxgeneral"
+msgid "IAX General Options"
 msgstr "Opções Gerais do Plano de Marcação"
 
 #. Allow Codecs
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:80
 #, fuzzy
-msgid "asterisk_iaxgeneral_allow"
+msgid "Allow Codecs"
 msgstr "Opções Gerais do Plano de Marcação"
 
 #. Reinvite/redirect media connections
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:81
 #, fuzzy
-msgid "asterisk_iaxgeneral_canreinvite"
+msgid "Reinvite/redirect media connections"
 msgstr "Redirigir/Repetir ligações multimedia"
 
 #. Static
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:82
-msgid "asterisk_iaxgeneral_static"
+msgid "Static"
 msgstr ""
 
 #. Write Protect
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:83
-msgid "asterisk_iaxgeneral_writeprotect"
+msgid "Write Protect"
 msgstr ""
 
 #. Meetme Conference
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:84
-msgid "asterisk_meetme"
+msgid "Meetme Conference"
 msgstr ""
 
 #. Admin PIN
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:85
-msgid "asterisk_meetme_adminpin"
+msgid "Admin PIN"
 msgstr ""
 
 #. Meeting PIN
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:86
-msgid "asterisk_meetme_pin"
+msgid "Meeting PIN"
 msgstr ""
 
 #. Meetme Conference General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:87
-msgid "asterisk_meetmegeneral"
+msgid "Meetme Conference General Options"
 msgstr ""
 
 #. Number of 20ms audio buffers to be used
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:88
-msgid "asterisk_meetmegeneral_audiobuffers"
+msgid "Number of 20ms audio buffers to be used"
 msgstr ""
 
 #. Modules
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:89
-msgid "asterisk_module"
+msgid "Modules"
 msgstr ""
 
 #. Alarm Receiver Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:90
-msgid "asterisk_module_appalarmreceiver"
+msgid "Alarm Receiver Application"
 msgstr ""
 
 #. Authentication Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:91
-msgid "asterisk_module_appauthenticate"
+msgid "Authentication Application"
 msgstr ""
 
 #. Make sure asterisk doesnt save CDR
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:92
-msgid "asterisk_module_appcdr"
+msgid "Make sure asterisk doesnt save CDR"
 msgstr ""
 
 #. Check if channel is available
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:93
-msgid "asterisk_module_appchanisavail"
+msgid "Check if channel is available"
 msgstr ""
 
 #. Listen in on any channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:94
-msgid "asterisk_module_appchanspy"
+msgid "Listen in on any channel"
 msgstr ""
 
 #. Control Playback Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:95
-msgid "asterisk_module_appcontrolplayback"
+msgid "Control Playback Application"
 msgstr ""
 
 #. Cuts up variables
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:96
-msgid "asterisk_module_appcut"
+msgid "Cuts up variables"
 msgstr ""
 
 #. Database access functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:97
-msgid "asterisk_module_appdb"
+msgid "Database access functions"
 msgstr ""
 
 #. Dialing Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:98
-msgid "asterisk_module_appdial"
+msgid "Dialing Application"
 msgstr ""
 
 #. Virtual Dictation Machine Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:99
-msgid "asterisk_module_appdictate"
+msgid "Virtual Dictation Machine Application"
 msgstr ""
 
 #. Directed Call Pickup Support
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:100
-msgid "asterisk_module_appdirectedpickup"
+msgid "Directed Call Pickup Support"
 msgstr ""
 
 #. Extension Directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:101
-msgid "asterisk_module_appdirectory"
+msgid "Extension Directory"
 msgstr ""
 
 #. DISA (Direct Inward System Access) Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:102
-msgid "asterisk_module_appdisa"
+msgid "DISA (Direct Inward System Access) Application"
 msgstr ""
 
 #. Dump channel variables Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:103
-msgid "asterisk_module_appdumpchan"
+msgid "Dump channel variables Application"
 msgstr ""
 
 #. Simple Echo Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:104
-msgid "asterisk_module_appecho"
+msgid "Simple Echo Application"
 msgstr ""
 
 #. ENUM Lookup
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:105
-msgid "asterisk_module_appenumlookup"
+msgid "ENUM Lookup"
 msgstr ""
 
 #. Reevaluates strings
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:106
-msgid "asterisk_module_appeval"
+msgid "Reevaluates strings"
 msgstr ""
 
 #. Executes applications
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:107
-msgid "asterisk_module_appexec"
+msgid "Executes applications"
 msgstr ""
 
 #. External IVR application interface
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:108
-msgid "asterisk_module_appexternalivr"
+msgid "External IVR application interface"
 msgstr ""
 
 #. Fork The CDR into 2 seperate entities
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:109
-msgid "asterisk_module_appforkcdr"
+msgid "Fork The CDR into 2 seperate entities"
 msgstr ""
 
 #. Get ADSI CPE ID
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:110
-msgid "asterisk_module_appgetcpeid"
+msgid "Get ADSI CPE ID"
 msgstr ""
 
 #. Group Management Routines
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:111
-msgid "asterisk_module_appgroupcount"
+msgid "Group Management Routines"
 msgstr ""
 
 #. Encode and Stream via icecast and ices
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:112
-msgid "asterisk_module_appices"
+msgid "Encode and Stream via icecast and ices"
 msgstr ""
 
 #. Image Transmission Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:113
-msgid "asterisk_module_appimage"
+msgid "Image Transmission Application"
 msgstr ""
 
 #. Look up Caller*ID name/number from black
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:114
-msgid "asterisk_module_applookupblacklist"
+msgid "Look up Caller*ID name/number from black"
 msgstr ""
 
 #. Look up CallerID Name from local databas
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:115
-msgid "asterisk_module_applookupcidname"
+msgid "Look up CallerID Name from local databas"
 msgstr ""
 
 #. Extension Macros
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:116
-msgid "asterisk_module_appmacro"
+msgid "Extension Macros"
 msgstr ""
 
 #. A simple math Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:117
-msgid "asterisk_module_appmath"
+msgid "A simple math Application"
 msgstr ""
 
 #. MD5 checksum Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:118
-msgid "asterisk_module_appmd5"
+msgid "MD5 checksum Application"
 msgstr ""
 
 #. Digital Milliwatt (mu-law) Test Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:119
-msgid "asterisk_module_appmilliwatt"
+msgid "Digital Milliwatt (mu-law) Test Application"
 msgstr ""
 
 #. Record a call and mix the audio during the recording
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:120
-msgid "asterisk_module_appmixmonitor"
+msgid "Record a call and mix the audio during the recording"
 msgstr ""
 
 #. Call Parking and Announce Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:121
-msgid "asterisk_module_appparkandannounce"
+msgid "Call Parking and Announce Application"
 msgstr ""
 
 #. Trivial Playback Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:122
-msgid "asterisk_module_appplayback"
+msgid "Trivial Playback Application"
 msgstr ""
 
 #. Require phone number to be entered
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:123
-msgid "asterisk_module_appprivacy"
+msgid "Require phone number to be entered"
 msgstr ""
 
 #. True Call Queueing
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:124
-msgid "asterisk_module_appqueue"
+msgid "True Call Queueing"
 msgstr ""
 
 #. Random goto
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:125
-msgid "asterisk_module_apprandom"
+msgid "Random goto"
 msgstr ""
 
 #. Read Variable Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:126
-msgid "asterisk_module_appread"
+msgid "Read Variable Application"
 msgstr ""
 
 #. Read in a file
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:127
-msgid "asterisk_module_appreadfile"
+msgid "Read in a file"
 msgstr ""
 
 #. Realtime Data Lookup/Rewrite
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:128
-msgid "asterisk_module_apprealtime"
+msgid "Realtime Data Lookup/Rewrite"
 msgstr ""
 
 #. Trivial Record Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:129
-msgid "asterisk_module_apprecord"
+msgid "Trivial Record Application"
 msgstr ""
 
 #. Say time
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:130
-msgid "asterisk_module_appsayunixtime"
+msgid "Say time"
 msgstr ""
 
 #. Send DTMF digits Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:131
-msgid "asterisk_module_appsenddtmf"
+msgid "Send DTMF digits Application"
 msgstr ""
 
 #. Send Text Applications
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:132
-msgid "asterisk_module_appsendtext"
+msgid "Send Text Applications"
 msgstr ""
 
 #. Set CallerID Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:133
-msgid "asterisk_module_appsetcallerid"
+msgid "Set CallerID Application"
 msgstr ""
 
 #. CDR user field apps
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:134
-msgid "asterisk_module_appsetcdruserfield"
+msgid "CDR user field apps"
 msgstr ""
 
 #. load =&gt; .so ; Set CallerID Name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:135
-msgid "asterisk_module_appsetcidname"
+msgid "load => .so ; Set CallerID Name"
 msgstr ""
 
 #. load =&gt; .so ; Set CallerID Number
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:136
-msgid "asterisk_module_appsetcidnum"
+msgid "load => .so ; Set CallerID Number"
 msgstr ""
 
 #. Set RDNIS Number
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:137
-msgid "asterisk_module_appsetrdnis"
+msgid "Set RDNIS Number"
 msgstr ""
 
 #. Set ISDN Transfer Capability
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:138
-msgid "asterisk_module_appsettransfercapability"
+msgid "Set ISDN Transfer Capability"
 msgstr ""
 
 #. SMS/PSTN handler
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:139
-msgid "asterisk_module_appsms"
+msgid "SMS/PSTN handler"
 msgstr ""
 
 #. Hangs up the requested channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:140
-msgid "asterisk_module_appsofthangup"
+msgid "Hangs up the requested channel"
 msgstr ""
 
 #. Stack Routines
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:141
-msgid "asterisk_module_appstack"
+msgid "Stack Routines"
 msgstr ""
 
 #. Generic System() application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:142
-msgid "asterisk_module_appsystem"
+msgid "Generic System() application"
 msgstr ""
 
 #. Playback with Talk Detection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:143
-msgid "asterisk_module_apptalkdetect"
+msgid "Playback with Talk Detection"
 msgstr ""
 
 #. Interface Test Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:144
-msgid "asterisk_module_apptest"
+msgid "Interface Test Application"
 msgstr ""
 
 #. Transfer
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:145
-msgid "asterisk_module_apptransfer"
+msgid "Transfer"
 msgstr ""
 
 #. TXTCIDName
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:146
-msgid "asterisk_module_apptxtcidname"
+msgid "TXTCIDName"
 msgstr ""
 
 #. Send URL Applications
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:147
-msgid "asterisk_module_appurl"
+msgid "Send URL Applications"
 msgstr ""
 
 #. Custom User Event Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:148
-msgid "asterisk_module_appuserevent"
+msgid "Custom User Event Application"
 msgstr ""
 
 #. Send verbose output
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:149
-msgid "asterisk_module_appverbose"
+msgid "Send verbose output"
 msgstr ""
 
 #. Voicemail
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:150
-msgid "asterisk_module_appvoicemail"
+msgid "Voicemail"
 msgstr ""
 
 #. Waits until first ring after time
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:151
-msgid "asterisk_module_appwaitforring"
+msgid "Waits until first ring after time"
 msgstr ""
 
 #. Wait For Silence Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:152
-msgid "asterisk_module_appwaitforsilence"
+msgid "Wait For Silence Application"
 msgstr ""
 
 #. While Loops and Conditional Execution
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:153
-msgid "asterisk_module_appwhile"
+msgid "While Loops and Conditional Execution"
 msgstr ""
 
 #. Comma Separated Values CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:154
-msgid "asterisk_module_cdrcsv"
+msgid "Comma Separated Values CDR Backend"
 msgstr ""
 
 #. Customizable Comma Separated Values CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:155
-msgid "asterisk_module_cdrcustom"
+msgid "Customizable Comma Separated Values CDR Backend"
 msgstr ""
 
 #. Asterisk Call Manager CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:156
-msgid "asterisk_module_cdrmanager"
+msgid "Asterisk Call Manager CDR Backend"
 msgstr ""
 
 #. MySQL CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:157
-msgid "asterisk_module_cdrmysql"
+msgid "MySQL CDR Backend"
 msgstr ""
 
 #. PostgreSQL CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:158
-msgid "asterisk_module_cdrpgsql"
+msgid "PostgreSQL CDR Backend"
 msgstr ""
 
 #. SQLite CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:159
-msgid "asterisk_module_cdrsqlite"
+msgid "SQLite CDR Backend"
 msgstr ""
 
 #. Agent Proxy Channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:160
-msgid "asterisk_module_chanagent"
+msgid "Agent Proxy Channel"
 msgstr ""
 
 #. Channel driver for GTalk
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:161
-msgid "asterisk_module_chanalsa"
+msgid "Channel driver for GTalk"
 msgstr ""
 
 #. Channel driver for GTalk
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:162
-msgid "asterisk_module_changtalk"
+msgid "Channel driver for GTalk"
 msgstr ""
 
 #. Option chan_iax2
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:163
-msgid "asterisk_module_chaniax2"
+msgid "Option chan_iax2"
 msgstr ""
 
 #. Local Proxy Channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:164
-msgid "asterisk_module_chanlocal"
+msgid "Local Proxy Channel"
 msgstr ""
 
 #. Session Initiation Protocol (SIP)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:165
-msgid "asterisk_module_chansip"
+msgid "Session Initiation Protocol (SIP)"
 msgstr ""
 
 #. Adaptive Differential PCM Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:166
-msgid "asterisk_module_codecadpcm"
+msgid "Adaptive Differential PCM Coder/Decoder"
 msgstr ""
 
 #. A-law Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:167
-msgid "asterisk_module_codecalaw"
+msgid "A-law Coder/Decoder"
 msgstr ""
 
 #. A-law and Mulaw direct Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:168
-msgid "asterisk_module_codecamu"
+msgid "A-law and Mulaw direct Coder/Decoder"
 msgstr ""
 
 #. ITU G.726-32kbps G726 Transcoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:169
-msgid "asterisk_module_codecg726"
+msgid "ITU G.726-32kbps G726 Transcoder"
 msgstr ""
 
 #. GSM/PCM16 (signed linear) Codec Translation
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:170
-msgid "asterisk_module_codecgsm"
+msgid "GSM/PCM16 (signed linear) Codec Translation"
 msgstr ""
 
 #. Speex/PCM16 (signed linear) Codec Translator
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:171
-msgid "asterisk_module_codecspeex"
+msgid "Speex/PCM16 (signed linear) Codec Translator"
 msgstr ""
 
 #. Mu-law Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:172
-msgid "asterisk_module_codeculaw"
+msgid "Mu-law Coder/Decoder"
 msgstr ""
 
 #. Sun Microsystems AU format (signed linear)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:173
-msgid "asterisk_module_formatau"
+msgid "Sun Microsystems AU format (signed linear)"
 msgstr ""
 
 #. G.723.1 Simple Timestamp File Format
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:174
-msgid "asterisk_module_formatg723"
+msgid "G.723.1 Simple Timestamp File Format"
 msgstr ""
 
 #. Raw G.726 (16/24/32/40kbps) data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:175
-msgid "asterisk_module_formatg726"
+msgid "Raw G.726 (16/24/32/40kbps) data"
 msgstr ""
 
 #. Raw G729 data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:176
-msgid "asterisk_module_formatg729"
+msgid "Raw G729 data"
 msgstr ""
 
 #. Raw GSM data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:177
-msgid "asterisk_module_formatgsm"
+msgid "Raw GSM data"
 msgstr ""
 
 #. Raw h263 data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:178
-msgid "asterisk_module_formath263"
+msgid "Raw h263 data"
 msgstr ""
 
 #. JPEG (Joint Picture Experts Group) Image
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:179
-msgid "asterisk_module_formatjpeg"
+msgid "JPEG (Joint Picture Experts Group) Image"
 msgstr ""
 
 #. Raw uLaw 8khz Audio support (PCM)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:180
-msgid "asterisk_module_formatpcm"
+msgid "Raw uLaw 8khz Audio support (PCM)"
 msgstr ""
 
 #. load =&gt; .so ; Raw aLaw 8khz PCM Audio support
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:181
-msgid "asterisk_module_formatpcmalaw"
+msgid "load => .so ; Raw aLaw 8khz PCM Audio support"
 msgstr ""
 
 #. Raw Signed Linear Audio support (SLN)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:182
-msgid "asterisk_module_formatsln"
+msgid "Raw Signed Linear Audio support (SLN)"
 msgstr ""
 
 #. Dialogic VOX (ADPCM) File Format
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:183
-msgid "asterisk_module_formatvox"
+msgid "Dialogic VOX (ADPCM) File Format"
 msgstr ""
 
 #. Microsoft WAV format (8000hz Signed Line
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:184
-msgid "asterisk_module_formatwav"
+msgid "Microsoft WAV format (8000hz Signed Line"
 msgstr ""
 
 #. Microsoft WAV format (Proprietary GSM)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:185
-msgid "asterisk_module_formatwavgsm"
+msgid "Microsoft WAV format (Proprietary GSM)"
 msgstr ""
 
 #. Caller ID related dialplan functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:186
-msgid "asterisk_module_funccallerid"
+msgid "Caller ID related dialplan functions"
 msgstr ""
 
 #. ENUM Functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:187
-msgid "asterisk_module_funcenum"
+msgid "ENUM Functions"
 msgstr ""
 
 #. URI encoding / decoding functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:188
-msgid "asterisk_module_funcuri"
+msgid "URI encoding / decoding functions"
 msgstr ""
 
 #. Asterisk Extension Language Compiler
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:189
-msgid "asterisk_module_pbxael"
+msgid "Asterisk Extension Language Compiler"
 msgstr ""
 
 #. Text Extension Configuration
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:190
-msgid "asterisk_module_pbxconfig"
+msgid "Text Extension Configuration"
 msgstr ""
 
 #. load =&gt; .so ; Builtin dialplan functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:191
-msgid "asterisk_module_pbxfunctions"
+msgid "load => .so ; Builtin dialplan functions"
 msgstr ""
 
 #. Loopback Switch
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:192
-msgid "asterisk_module_pbxloopback"
+msgid "Loopback Switch"
 msgstr ""
 
 #. Realtime Switch
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:193
-msgid "asterisk_module_pbxrealtime"
+msgid "Realtime Switch"
 msgstr ""
 
 #. Outgoing Spool Support
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:194
-msgid "asterisk_module_pbxspool"
+msgid "Outgoing Spool Support"
 msgstr ""
 
 #. Wil Cal U (Auto Dialer)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:195
-msgid "asterisk_module_pbxwilcalu"
+msgid "Wil Cal U (Auto Dialer)"
 msgstr ""
 
 #. MySQL Config Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:196
-msgid "asterisk_module_resconfigmysql"
+msgid "MySQL Config Resource"
 msgstr ""
 
 #. ODBC Config Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:197
-msgid "asterisk_module_resconfigodbc"
+msgid "ODBC Config Resource"
 msgstr ""
 
 #. PGSQL Module
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:198
-msgid "asterisk_module_resconfigpgsql"
+msgid "PGSQL Module"
 msgstr ""
 
 #. Cryptographic Digital Signatures
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:199
-msgid "asterisk_module_rescrypto"
+msgid "Cryptographic Digital Signatures"
 msgstr ""
 
 #. Call Parking Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:200
-msgid "asterisk_module_resfeatures"
+msgid "Call Parking Resource"
 msgstr ""
 
 #. Indications Configuration
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:201
-msgid "asterisk_module_resindications"
+msgid "Indications Configuration"
 msgstr ""
 
 #. Call Monitoring Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:202
-msgid "asterisk_module_resmonitor"
+msgid "Call Monitoring Resource"
 msgstr ""
 
 #. Music On Hold Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:203
-msgid "asterisk_module_resmusiconhold"
+msgid "Music On Hold Resource"
 msgstr ""
 
 #. ODBC Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:204
-msgid "asterisk_module_resodbc"
+msgid "ODBC Resource"
 msgstr ""
 
 #. SMDI Module
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:205
-msgid "asterisk_module_ressmdi"
+msgid "SMDI Module"
 msgstr ""
 
 #. SNMP Module
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:206
-msgid "asterisk_module_ressnmp"
+msgid "SNMP Module"
 msgstr ""
 
 #. Music On Hold
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:207
-msgid "asterisk_moh"
+msgid "Music On Hold"
 msgstr ""
 
 #. Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:208
-msgid "asterisk_moh_application"
+msgid "Application"
 msgstr ""
 
 #. Directory of Music
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:209
-msgid "asterisk_moh_directory"
+msgid "Directory of Music"
 msgstr ""
 
 #. Option mode
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:210
-msgid "asterisk_moh_mode"
+msgid "Option mode"
 msgstr ""
 
 #. Random Play
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:211
-msgid "asterisk_moh_random"
+msgid "Random Play"
 msgstr ""
 
 #. SIP Connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:212
-msgid "asterisk_sip"
+msgid "SIP Connection"
 msgstr ""
 
 #. Always Dial International
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:213
-msgid "asterisk_sip_alwaysinternational"
+msgid "Always Dial International"
 msgstr ""
 
 #. Reinvite/redirect media connections
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:214
-msgid "asterisk_sip_canreinvite"
+msgid "Reinvite/redirect media connections"
 msgstr ""
 
 #. context
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:215
-msgid "asterisk_sip_context"
+msgid "context"
 msgstr ""
 
 #. Country Code for connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:216
-msgid "asterisk_sip_countrycode"
+msgid "Country Code for connection"
 msgstr ""
 
 #. DTMF mode
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:217
-msgid "asterisk_sip_dtmfmode"
+msgid "DTMF mode"
 msgstr ""
 
 #. Add as Extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:218
-msgid "asterisk_sip_extension"
+msgid "Add as Extension"
 msgstr ""
 
 #. Primary domain identity for From: headers
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:219
-msgid "asterisk_sip_fromdomain"
+msgid "Primary domain identity for From: headers"
 msgstr ""
 
 #. From user (required by many SIP providers)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:220
-msgid "asterisk_sip_fromuser"
+msgid "From user (required by many SIP providers)"
 msgstr ""
 
 #. Host name (or blank)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:221
-msgid "asterisk_sip_host"
+msgid "Host name (or blank)"
 msgstr ""
 
 #. Ring on incoming dialplan contexts
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:222
-msgid "asterisk_sip_incoming"
+msgid "Ring on incoming dialplan contexts"
 msgstr ""
 
 #. Allow Insecure for
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:223
-msgid "asterisk_sip_insecure"
+msgid "Allow Insecure for"
 msgstr ""
 
 #. International Dial Prefix
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:224
-msgid "asterisk_sip_internationalprefix"
+msgid "International Dial Prefix"
 msgstr ""
 
 #. Mailbox for MWI
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:225
-msgid "asterisk_sip_mailbox"
+msgid "Mailbox for MWI"
 msgstr ""
 
 #. NAT between phone and Asterisk
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:226
-msgid "asterisk_sip_nat"
+msgid "NAT between phone and Asterisk"
 msgstr ""
 
 #. Check tags in headers
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:227
-msgid "asterisk_sip_pedantic"
+msgid "Check tags in headers"
 msgstr ""
 
 #. SIP Port
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:228
-msgid "asterisk_sip_port"
+msgid "SIP Port"
 msgstr ""
 
 #. Dial Prefix (for external line)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:229
-msgid "asterisk_sip_prefix"
+msgid "Dial Prefix (for external line)"
 msgstr ""
 
 #. Reply Timeout (ms) for down connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:230
-msgid "asterisk_sip_qualify"
+msgid "Reply Timeout (ms) for down connection"
 msgstr ""
 
 #. Register connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:231
-msgid "asterisk_sip_register"
+msgid "Register connection"
 msgstr ""
 
 #. Secret
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:232
-msgid "asterisk_sip_secret"
+msgid "Secret"
 msgstr ""
 
 #. Dial own extension for mailbox
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:233
-msgid "asterisk_sip_selfmailbox"
+msgid "Dial own extension for mailbox"
 msgstr ""
 
 #. Dial Timeout (sec)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:234
-msgid "asterisk_sip_timeout"
+msgid "Dial Timeout (sec)"
 msgstr ""
 
 #. Client Type
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:235
-msgid "asterisk_sip_type"
+msgid "Client Type"
 msgstr ""
 
 #. Username
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:236
-msgid "asterisk_sip_username"
+msgid "Username"
 msgstr ""
 
 #. Section sipgeneral
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:237
 #, fuzzy
-msgid "asterisk_sipgeneral"
+msgid "Section sipgeneral"
 msgstr "Opções Gerais do Plano de Marcação"
 
 #. Allow codecs
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:238
 #, fuzzy
-msgid "asterisk_sipgeneral_allow"
+msgid "Allow codecs"
 msgstr "Opções Gerais do Plano de Marcação"
 
 #. SIP Port
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:239
 #, fuzzy
-msgid "asterisk_sipgeneral_port"
+msgid "SIP Port"
 msgstr "Opções Gerais do Plano de Marcação"
 
 #. SIP realm
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:240
 #, fuzzy
-msgid "asterisk_sipgeneral_realm"
+msgid "SIP realm"
 msgstr "Opções Gerais do Plano de Marcação"
 
 #. Voicemail general options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:241
 #, fuzzy
-msgid "asterisk_voicegeneral"
+msgid "Voicemail general options"
 msgstr "Opções Gerais do Plano de Marcação"
 
 #. From Email address of server
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:242
-msgid "asterisk_voicegeneral_serveremail"
+msgid "From Email address of server"
 msgstr ""
 
 #. Voice Mail boxes
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:243
-msgid "asterisk_voicemail"
+msgid "Voice Mail boxes"
 msgstr ""
 
 #. Email contains attachment
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:244
-msgid "asterisk_voicemail_attach"
+msgid "Email contains attachment"
 msgstr ""
 
 #. Email
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:245
-msgid "asterisk_voicemail_email"
+msgid "Email"
 msgstr ""
 
 #. Display Name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:246
-msgid "asterisk_voicemail_name"
+msgid "Display Name"
 msgstr ""
 
 #. Password
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:247
-msgid "asterisk_voicemail_password"
+msgid "Password"
 msgstr ""
 
 #. zone
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:248
-msgid "asterisk_voicemail_zone"
+msgid "zone"
 msgstr ""
 
 #. Voice Zone settings
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:249
 #, fuzzy
-msgid "asterisk_voicezone"
+msgid "Voice Zone settings"
 msgstr "Secção do Plano de Marcação"
 
 #. Message Format
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:250
-msgid "asterisk_voicezone_message"
+msgid "Message Format"
 msgstr ""
 
 #. Time Zone
diff --git a/po/pt/cbi.po b/po/pt/cbi.po
index 42ecfd1e5..482fdc551 100644
--- a/po/pt/cbi.po
+++ b/po/pt/cbi.po
@@ -13,86 +13,86 @@ msgstr ""
 
 #. Add entry
 #: i18n/english/luasrc/i18n/cbi.en.lua:1
-msgid "cbi_add"
+msgid "Add"
 msgstr "Adicionar entrada"
 
 #. Remove entry
 #: i18n/english/luasrc/i18n/cbi.en.lua:2
-msgid "cbi_del"
+msgid "Delete"
 msgstr "Remover entrada"
 
 #. Replace entry
 #: i18n/english/luasrc/i18n/cbi.en.lua:3
-msgid "cbi_replace"
+msgid "Replace entry"
 msgstr "Substituir entrada"
 
 #. Invalid input value
 #: i18n/english/luasrc/i18n/cbi.en.lua:4
-msgid "cbi_invalid"
+msgid "Invalid"
 msgstr "Valor inválido"
 
 #. <strong>Validation failed:</strong> Please check any input fields for mistakes.
 #: i18n/english/luasrc/i18n/cbi.en.lua:5
-msgid "cbi_invalid_section"
+msgid "<strong>Validation failed:</strong> Please check any input fields for mistakes."
 msgstr ""
 "<strong>A validação falhou:</strong> Por favor, verifique por erros em algum "
 "dos campos de entrada."
 
 #. This field is mandatory
 #: i18n/english/luasrc/i18n/cbi.en.lua:6
-msgid "cbi_missing"
+msgid "This field is mandatory"
 msgstr "Este campo é obrigatório"
 
 #. <strong>Validation failed:</strong> At least one mandatory field has no or an invalid value
 #: i18n/english/luasrc/i18n/cbi.en.lua:7
-msgid "cbi_deperror"
+msgid "<strong>Validation failed:</strong> At least one mandatory field has no or an invalid value"
 msgstr ""
 "<strong>A validação falhou:</strong> É obrigatório pelo menos um campo com o "
 "valor correcto."
 
 #. A requirement for this option was not met
 #: i18n/english/luasrc/i18n/cbi.en.lua:8
-msgid "cbi_reqerror"
+msgid "A requirement for this option was not met"
 msgstr "Um requisito para esta opção não foi cumprido"
 
 #. -- Additional Field --
 #: i18n/english/luasrc/i18n/cbi.en.lua:9
-msgid "cbi_addopt"
+msgid "-- Additional Field --"
 msgstr "-- Campo Adicional --"
 
 #.  (optional)
 #: i18n/english/luasrc/i18n/cbi.en.lua:10
-msgid "cbi_optional"
+msgid " (optional)"
 msgstr " (opcional)"
 
 #. This section contains no values yet
 #: i18n/english/luasrc/i18n/cbi.en.lua:11
-msgid "cbi_sectempty"
+msgid "This section contains no values yet"
 msgstr "Esta secção ainda não contêm valores"
 
 #. -- custom --
 #: i18n/english/luasrc/i18n/cbi.en.lua:12
-msgid "cbi_manual"
+msgid "-- custom --"
 msgstr "-- personalizado --"
 
 #. -- Please choose --
 #: i18n/english/luasrc/i18n/cbi.en.lua:13
-msgid "cbi_select"
+msgid "-- Please choose --"
 msgstr "-- Por favor escolha --"
 
 #. Go to relevant configuration page
 #: i18n/english/luasrc/i18n/cbi.en.lua:14
-msgid "cbi_gorel"
+msgid " "
 msgstr "Ir para a página respectiva de configuração"
 
 #. Applying changes
 #: i18n/english/luasrc/i18n/cbi.en.lua:15
-msgid "cbi_applying"
+msgid "Applying changes"
 msgstr "A aplicar as alterações"
 
 #. Uploaded File
 #: i18n/english/luasrc/i18n/cbi.en.lua:16
-msgid "cbi_upload"
+msgid "Uploaded File"
 msgstr "Ficheiro carregado"
 
 #. Search file...
diff --git a/po/pt/coovachilli.po b/po/pt/coovachilli.po
index e6b582072..4b651e57d 100644
--- a/po/pt/coovachilli.po
+++ b/po/pt/coovachilli.po
@@ -13,37 +13,37 @@ msgstr ""
 
 #. CoovaChilli
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:1
-msgid "coovachilli"
+msgid "CoovaChilli"
 msgstr "CoovaChilli"
 
 #. General configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:2
-msgid "coovachilli_general"
+msgid "General configuration"
 msgstr "Configuração Geral"
 
 #. General CoovaChilli settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:3
-msgid "coovachilli_general_desc"
+msgid "General CoovaChilli settings"
 msgstr "Definições gerais do CoovaChilli"
 
 #. Command socket
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:4
-msgid "coovachilli_general_cmdsock"
+msgid "Command socket"
 msgstr "Socket de comando"
 
 #. UNIX socket used for communication with chilli_query
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:5
-msgid "coovachilli_general_cmdsock_desc"
+msgid "UNIX socket used for communication with chilli_query"
 msgstr "Socket UNIX para comunicação com  chilli_query"
 
 #. Config refresh interval
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:6
-msgid "coovachilli_general_interval"
+msgid "Config refresh interval"
 msgstr "Intervalo de refrescamento da configuração"
 
 #. Re-read configuration file and do DNS lookups every interval seconds. This has the same effect as sending the HUP signal. If interval is 0 (zero) this feature is disabled. 
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:7
-msgid "coovachilli_general_interval_desc"
+msgid "Re-read configuration file and do DNS lookups every interval seconds. This has the same effect as sending the HUP signal. If interval is 0 (zero) this feature is disabled. "
 msgstr ""
 "Reler o ficheiro de configuração e executar verificações DNS n segundos de "
 "intervalo. Tem o mesmo efeito que o envio do sinal HUP. Se o intervalo for 0 "
@@ -51,101 +51,101 @@ msgstr ""
 
 #. Pid file
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:8
-msgid "coovachilli_general_pidfile"
+msgid "Pid file"
 msgstr "Ficheiro PID"
 
 #. Filename to put the process id
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:9
-msgid "coovachilli_general_pidfile_desc"
+msgid "Filename to put the process id"
 msgstr "Nome do ficheiro onde será guardado o PID"
 
 #. State directory
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:10
-msgid "coovachilli_general_statedir"
+msgid "State directory"
 msgstr "Directorio de estado"
 
 #. Directory of non-volatile data
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:11
-msgid "coovachilli_general_statedir_desc"
+msgid "Directory of non-volatile data"
 msgstr "Directorio para dados não-volateis"
 
 #. TUN/TAP configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:12
-msgid "coovachilli_tun"
+msgid "TUN/TAP configuration"
 msgstr "Configuração tun/tap"
 
 #. Network/Tun configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:13
-msgid "coovachilli_tun_desc"
+msgid "Network/Tun configuration"
 msgstr "Configuração de rede/tun"
 
 #. Network down script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:14
-msgid "coovachilli_tun_condown"
+msgid "Network down script"
 msgstr "Script de rede/tun em baixo"
 
 #. Script executed after a session has moved from authorized state to unauthorized
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:15
-msgid "coovachilli_tun_condown_desc"
+msgid "Script executed after a session has moved from authorized state to unauthorized"
 msgstr ""
 "Script executado após o estado de uma sessão ser alterado de autorizado para "
 "não-autorizado "
 
 #. Network up script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:16
-msgid "coovachilli_tun_conup"
+msgid "Network up script"
 msgstr "Script de rede/tun em cima"
 
 #. Script executed after the tun network interface has been brought up
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:17
-msgid "coovachilli_tun_conup_desc"
+msgid "Script executed after the tun network interface has been brought up"
 msgstr "Script executado apos o interface tun de rede ter sido levantado"
 
 #. Primary DNS Server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:18
-msgid "coovachilli_tun_dns1"
+msgid "Primary DNS Server"
 msgstr "Servidor primário de DNS"
 
 #. Is used to inform the client about the DNS address to use for host name resolution
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:19
-msgid "coovachilli_tun_dns1_desc"
+msgid "Is used to inform the client about the DNS address to use for host name resolution"
 msgstr ""
 "Usado para informar o cliente sobre o endereço de servidor DNS a usar para a "
 "resolução de nomes"
 
 #. Secondary DNS Server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:20
-msgid "coovachilli_tun_dns2"
+msgid "Secondary DNS Server"
 msgstr "Servidor secundário de DNS"
 
 #. Is used to inform the client about the DNS address to use for host name resolution
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:21
-msgid "coovachilli_tun_dns2_desc"
+msgid "Is used to inform the client about the DNS address to use for host name resolution"
 msgstr ""
 "Usado para informar o cliente sobre o endereço de servidor secundário de DNS "
 "a usar para a resolução de nomes"
 
 #. Domain name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:22
-msgid "coovachilli_tun_domain"
+msgid "Domain name"
 msgstr "Domínio"
 
 #. Is used to inform the client about the domain name to use for DNS lookups
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:23
-msgid "coovachilli_tun_domain_desc"
+msgid "Is used to inform the client about the domain name to use for DNS lookups"
 msgstr ""
 "Usado para informar o cliente sobre o dominio a utilizar para pedidos DNS"
 
 #. Dynamic IP address pool
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:24
 #, fuzzy
-msgid "coovachilli_tun_dynip"
+msgid "Dynamic IP address pool"
 msgstr "Servidor primário de DNS"
 
 #. Specifies a pool of dynamic IP addresses
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:25
 #, fuzzy
-msgid "coovachilli_tun_dynip_desc"
+msgid "Specifies a pool of dynamic IP addresses"
 msgstr ""
 "Usado para informar o cliente sobre o endereço de servidor DNS a usar para a "
 "resolução de nomes"
@@ -153,13 +153,13 @@ msgstr ""
 #. IP down script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:26
 #, fuzzy
-msgid "coovachilli_tun_ipdown"
+msgid "IP down script"
 msgstr "Script de rede/tun em baixo"
 
 #. Script executed after the tun network interface has been taken down
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:27
 #, fuzzy
-msgid "coovachilli_tun_ipdown_desc"
+msgid "Script executed after the tun network interface has been taken down"
 msgstr ""
 "Script executado após o estado de uma sessão ser alterado de autorizado para "
 "não-autorizado "
@@ -167,25 +167,25 @@ msgstr ""
 #. IP up script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:28
 #, fuzzy
-msgid "coovachilli_tun_ipup"
+msgid "IP up script"
 msgstr "Script de rede/tun em cima"
 
 #. Script executed after the TUN/TAP network interface has been brought up
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:29
 #, fuzzy
-msgid "coovachilli_tun_ipup_desc"
+msgid "Script executed after the TUN/TAP network interface has been brought up"
 msgstr "Script executado apos o interface tun de rede ter sido levantado"
 
 #. Uplink subnet
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:30
 #, fuzzy
-msgid "coovachilli_tun_net"
+msgid "Uplink subnet"
 msgstr "Configuração de rede/tun"
 
 #. Network address of the uplink interface (CIDR notation)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:31
 #, fuzzy
-msgid "coovachilli_tun_net_desc"
+msgid "Network address of the uplink interface (CIDR notation)"
 msgstr ""
 "Usado para informar o cliente sobre o endereço de servidor DNS a usar para a "
 "resolução de nomes"
@@ -193,25 +193,25 @@ msgstr ""
 #. Static IP address pool
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:32
 #, fuzzy
-msgid "coovachilli_tun_statip"
+msgid "Static IP address pool"
 msgstr "Script de rede/tun em cima"
 
 #. Specifies a pool of static IP addresses
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:33
 #, fuzzy
-msgid "coovachilli_tun_statip_desc"
+msgid "Specifies a pool of static IP addresses"
 msgstr "Script executado apos o interface tun de rede ter sido levantado"
 
 #. TUN/TAP device
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:34
 #, fuzzy
-msgid "coovachilli_tun_tundev"
+msgid "TUN/TAP device"
 msgstr "Script de rede/tun em baixo"
 
 #. The specific device to use for the TUN/TAP interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:35
 #, fuzzy
-msgid "coovachilli_tun_tundev_desc"
+msgid "The specific device to use for the TUN/TAP interface"
 msgstr ""
 "Script executado após o estado de uma sessão ser alterado de autorizado para "
 "não-autorizado "
@@ -219,774 +219,774 @@ msgstr ""
 #. TX queue length
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:36
 #, fuzzy
-msgid "coovachilli_tun_txqlen"
+msgid "TX queue length"
 msgstr "Domínio"
 
 #. The TX queue length to set on the TUN/TAP interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:37
 #, fuzzy
-msgid "coovachilli_tun_txqlen_desc"
+msgid "The TX queue length to set on the TUN/TAP interface"
 msgstr ""
 "Usado para informar o cliente sobre o dominio a utilizar para pedidos DNS"
 
 #. Use TAP device
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:38
 #, fuzzy
-msgid "coovachilli_tun_usetap"
+msgid "Use TAP device"
 msgstr "Configuração de rede/tun"
 
 #. Use the TAP interface instead of TUN
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:39
 #, fuzzy
-msgid "coovachilli_tun_usetap_desc"
+msgid "Use the TAP interface instead of TUN"
 msgstr "Script executado apos o interface tun de rede ter sido levantado"
 
 #. DHCP configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:40
 #, fuzzy
-msgid "coovachilli_dhcp"
+msgid "DHCP configuration"
 msgstr "Configuração tun/tap"
 
 #. Set DHCP options for connecting clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:41
 #, fuzzy
-msgid "coovachilli_dhcp_desc"
+msgid "Set DHCP options for connecting clients"
 msgstr "Configuração de rede/tun"
 
 #. DHCP end number
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:42
 #, fuzzy
-msgid "coovachilli_dhcp_dhcpend"
+msgid "DHCP end number"
 msgstr "Configuração de rede/tun"
 
 #. Where to stop assigning IP addresses (default 254)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:43
-msgid "coovachilli_dhcp_dhcpend_desc"
+msgid "Where to stop assigning IP addresses (default 254)"
 msgstr ""
 
 #. DHCP interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:44
 #, fuzzy
-msgid "coovachilli_dhcp_dhcpif"
+msgid "DHCP interface"
 msgstr "Configuração de rede/tun"
 
 #. Ethernet interface to listen to for the downlink interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:45
 #, fuzzy
-msgid "coovachilli_dhcp_dhcpif_desc"
+msgid "Ethernet interface to listen to for the downlink interface"
 msgstr "Configuração de rede/tun"
 
 #. Listen MAC address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:46
 #, fuzzy
-msgid "coovachilli_dhcp_dhcpmac"
+msgid "Listen MAC address"
 msgstr "Configuração de rede/tun"
 
 #. MAC address to listen to. If not specified the MAC address of the interface will be used
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:47
-msgid "coovachilli_dhcp_dhcpmac_desc"
+msgid "MAC address to listen to. If not specified the MAC address of the interface will be used"
 msgstr ""
 
 #. DHCP start number
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:48
-msgid "coovachilli_dhcp_dhcpstart"
+msgid "DHCP start number"
 msgstr ""
 
 #. Where to start assigning IP addresses (default 10)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:49
-msgid "coovachilli_dhcp_dhcpstart_desc"
+msgid "Where to start assigning IP addresses (default 10)"
 msgstr ""
 
 #. Enable IEEE 802.1x
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:50
-msgid "coovachilli_dhcp_eapolenable"
+msgid "Enable IEEE 802.1x"
 msgstr ""
 
 #. Enable IEEE 802.1x authentication and listen for EAP requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:51
-msgid "coovachilli_dhcp_eapolenable_desc"
+msgid "Enable IEEE 802.1x authentication and listen for EAP requests"
 msgstr ""
 
 #. Leasetime
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:52
 #, fuzzy
-msgid "coovachilli_dhcp_lease"
+msgid "Leasetime"
 msgstr "Configuração de rede/tun"
 
 #. Use a DHCP lease of seconds (default 600)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:53
 #, fuzzy
-msgid "coovachilli_dhcp_lease_desc"
+msgid "Use a DHCP lease of seconds (default 600)"
 msgstr "Configuração de rede/tun"
 
 #. RADIUS configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:54
 #, fuzzy
-msgid "coovachilli_radius"
+msgid "RADIUS configuration"
 msgstr "Configuração de rede/tun"
 
 #. RADIUS configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:55
 #, fuzzy
-msgid "coovachilli_radius_desc"
+msgid "RADIUS configuration"
 msgstr "Configuração de rede/tun"
 
 #. Allow session update through RADIUS
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:56
-msgid "coovachilli_radius_acctupdate"
+msgid "Allow session update through RADIUS"
 msgstr ""
 
 #. Allow updating of session parameters with RADIUS attributes sent in Accounting-Response
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:57
-msgid "coovachilli_radius_acctupdate_desc"
+msgid "Allow updating of session parameters with RADIUS attributes sent in Accounting-Response"
 msgstr ""
 
 #. Admin password
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:58
-msgid "coovachilli_radius_adminpasswd"
+msgid "Admin password"
 msgstr ""
 
 #. Password to use for Administrative-User authentication in order to pick up chilli configurations and establish a device &quot;system&quot; session
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:59
-msgid "coovachilli_radius_adminpasswd_desc"
+msgid "Password to use for Administrative-User authentication in order to pick up chilli configurations and establish a device \"system\" session"
 msgstr ""
 
 #. Admin user
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:60
 #, fuzzy
-msgid "coovachilli_radius_adminuser"
+msgid "Admin user"
 msgstr "Configuração de rede/tun"
 
 #. User-name to use for Administrative-User authentication in order to pick up chilli configurations and establish a device &quot;system&quot; session
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:61
-msgid "coovachilli_radius_adminuser_desc"
+msgid "User-name to use for Administrative-User authentication in order to pick up chilli configurations and establish a device \"system\" session"
 msgstr ""
 
 #. Do not check disconnection requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:62
-msgid "coovachilli_radius_coanoipcheck"
+msgid "Do not check disconnection requests"
 msgstr ""
 
 #. Do not check the source IP address of radius disconnect requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:63
-msgid "coovachilli_radius_coanoipcheck_desc"
+msgid "Do not check the source IP address of radius disconnect requests"
 msgstr ""
 
 #. RADIUS disconnect port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:64
-msgid "coovachilli_radius_coaport"
+msgid "RADIUS disconnect port"
 msgstr ""
 
 #. UDP port to listen to for accepting radius disconnect requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:65
-msgid "coovachilli_radius_coaport_desc"
+msgid "UDP port to listen to for accepting radius disconnect requests"
 msgstr ""
 
 #. NAS IP
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:66
 #, fuzzy
-msgid "coovachilli_radius_nasip"
+msgid "NAS IP"
 msgstr "Configuração de rede/tun"
 
 #. Value to use in RADIUS NAS-IP-Address attribute
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:67
 #, fuzzy
-msgid "coovachilli_radius_nasip_desc"
+msgid "Value to use in RADIUS NAS-IP-Address attribute"
 msgstr "Configuração de rede/tun"
 
 #. NAS MAC
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:68
 #, fuzzy
-msgid "coovachilli_radius_nasmac"
+msgid "NAS MAC"
 msgstr "Configuração de rede/tun"
 
 #. MAC address value to use in RADIUS Called-Station-ID attribute
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:69
 #, fuzzy
-msgid "coovachilli_radius_nasmac_desc"
+msgid "MAC address value to use in RADIUS Called-Station-ID attribute"
 msgstr "Configuração de rede/tun"
 
 #. Allow OpenID authentication
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:70
-msgid "coovachilli_radius_openidauth"
+msgid "Allow OpenID authentication"
 msgstr ""
 
 #. Allows OpenID authentication by sending ChilliSpot-Config=allow-openidauth in RADIUS Access-Requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:71
-msgid "coovachilli_radius_openidauth_desc"
+msgid "Allows OpenID authentication by sending ChilliSpot-Config=allow-openidauth in RADIUS Access-Requests"
 msgstr ""
 
 #. RADIUS accounting port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:72
-msgid "coovachilli_radius_radiusacctport"
+msgid "RADIUS accounting port"
 msgstr ""
 
 #. The UDP port number to use for radius accounting requests (default 1813)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:73
-msgid "coovachilli_radius_radiusacctport_desc"
+msgid "The UDP port number to use for radius accounting requests (default 1813)"
 msgstr ""
 
 #. RADIUS authentication port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:74
-msgid "coovachilli_radius_radiusauthport"
+msgid "RADIUS authentication port"
 msgstr ""
 
 #. The UDP port number to use for radius authentication requests (default 1812)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:75
-msgid "coovachilli_radius_radiusauthport_desc"
+msgid "The UDP port number to use for radius authentication requests (default 1812)"
 msgstr ""
 
 #. Option radiuscalled
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:76
-msgid "coovachilli_radius_radiuscalled"
+msgid "Option radiuscalled"
 msgstr ""
 
 #. RADIUS listen address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:77
-msgid "coovachilli_radius_radiuslisten"
+msgid "RADIUS listen address"
 msgstr ""
 
 #. Local interface IP address to use for the radius interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:78
-msgid "coovachilli_radius_radiuslisten_desc"
+msgid "Local interface IP address to use for the radius interface"
 msgstr ""
 
 #. RADIUS location ID
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:79
-msgid "coovachilli_radius_radiuslocationid"
+msgid "RADIUS location ID"
 msgstr ""
 
 #. WISPr Location ID
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:80
-msgid "coovachilli_radius_radiuslocationid_desc"
+msgid "WISPr Location ID"
 msgstr ""
 
 #. RADIUS location name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:81
-msgid "coovachilli_radius_radiuslocationname"
+msgid "RADIUS location name"
 msgstr ""
 
 #. WISPr Location Name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:82
-msgid "coovachilli_radius_radiuslocationname_desc"
+msgid "WISPr Location Name"
 msgstr ""
 
 #. NAS ID
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:83
-msgid "coovachilli_radius_radiusnasid"
+msgid "NAS ID"
 msgstr ""
 
 #. Network access server identifier
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:84
-msgid "coovachilli_radius_radiusnasid_desc"
+msgid "Network access server identifier"
 msgstr ""
 
 #. Option radiusnasip
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:85
-msgid "coovachilli_radius_radiusnasip"
+msgid "Option radiusnasip"
 msgstr ""
 
 #. NAS port type
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:86
-msgid "coovachilli_radius_radiusnasporttype"
+msgid "NAS port type"
 msgstr ""
 
 #. Value of NAS-Port-Type attribute. Defaults to 19 (Wireless-IEEE-802.11)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:87
-msgid "coovachilli_radius_radiusnasporttype_desc"
+msgid "Value of NAS-Port-Type attribute. Defaults to 19 (Wireless-IEEE-802.11)"
 msgstr ""
 
 #. Send RADIUS VSA
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:88
-msgid "coovachilli_radius_radiusoriginalurl"
+msgid "Send RADIUS VSA"
 msgstr ""
 
 #. Send the ChilliSpot-OriginalURL RADIUS VSA in Access-Request
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:89
-msgid "coovachilli_radius_radiusoriginalurl_desc"
+msgid "Send the ChilliSpot-OriginalURL RADIUS VSA in Access-Request"
 msgstr ""
 
 #. RADIUS secret
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:90
-msgid "coovachilli_radius_radiussecret"
+msgid "RADIUS secret"
 msgstr ""
 
 #. Radius shared secret for both servers
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:91
-msgid "coovachilli_radius_radiussecret_desc"
+msgid "Radius shared secret for both servers"
 msgstr ""
 
 #. RADIUS server 1
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:92
-msgid "coovachilli_radius_radiusserver1"
+msgid "RADIUS server 1"
 msgstr ""
 
 #. The IP address of radius server 1
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:93
-msgid "coovachilli_radius_radiusserver1_desc"
+msgid "The IP address of radius server 1"
 msgstr ""
 
 #. RADIUS server 2
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:94
-msgid "coovachilli_radius_radiusserver2"
+msgid "RADIUS server 2"
 msgstr ""
 
 #. The IP address of radius server 2
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:95
-msgid "coovachilli_radius_radiusserver2_desc"
+msgid "The IP address of radius server 2"
 msgstr ""
 
 #. Swap octets
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:96
-msgid "coovachilli_radius_swapoctets"
+msgid "Swap octets"
 msgstr ""
 
 #. Swap the meaning of &quot;input octets&quot; and &quot;output octets&quot; as it related to RADIUS attribtues
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:97
-msgid "coovachilli_radius_swapoctets_desc"
+msgid "Swap the meaning of \"input octets\" and \"output octets\" as it related to RADIUS attribtues"
 msgstr ""
 
 #. Allow WPA guests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:98
 #, fuzzy
-msgid "coovachilli_radius_wpaguests"
+msgid "Allow WPA guests"
 msgstr "Configuração de rede/tun"
 
 #. Allows WPA Guest authentication by sending ChilliSpot-Config=allow-wpa-guests in RADIUS Access-Requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:99
-msgid "coovachilli_radius_wpaguests_desc"
+msgid "Allows WPA Guest authentication by sending ChilliSpot-Config=allow-wpa-guests in RADIUS Access-Requests"
 msgstr ""
 
 #. RADIUS proxy settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:100
 #, fuzzy
-msgid "coovachilli_proxy"
+msgid "RADIUS proxy settings"
 msgstr "Configuração de rede/tun"
 
 #. RADIUS proxy settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:101
 #, fuzzy
-msgid "coovachilli_proxy_desc"
+msgid "RADIUS proxy settings"
 msgstr "Configuração de rede/tun"
 
 #. Proxy client
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:102
-msgid "coovachilli_proxy_proxyclient"
+msgid "Proxy client"
 msgstr ""
 
 #. IP address from which radius requests are accepted. If omitted the server will not accept radius requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:103
-msgid "coovachilli_proxy_proxyclient_desc"
+msgid "IP address from which radius requests are accepted. If omitted the server will not accept radius requests"
 msgstr ""
 
 #. Proxy listen address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:104
-msgid "coovachilli_proxy_proxylisten"
+msgid "Proxy listen address"
 msgstr ""
 
 #. Local interface IP address to use for accepting radius requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:105
-msgid "coovachilli_proxy_proxylisten_desc"
+msgid "Local interface IP address to use for accepting radius requests"
 msgstr ""
 
 #. Proxy port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:106
-msgid "coovachilli_proxy_proxyport"
+msgid "Proxy port"
 msgstr ""
 
 #. UDP Port to listen to for accepting radius requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:107
-msgid "coovachilli_proxy_proxyport_desc"
+msgid "UDP Port to listen to for accepting radius requests"
 msgstr ""
 
 #. Proxy secret
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:108
-msgid "coovachilli_proxy_proxysecret"
+msgid "Proxy secret"
 msgstr ""
 
 #. Radius shared secret for clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:109
-msgid "coovachilli_proxy_proxysecret_desc"
+msgid "Radius shared secret for clients"
 msgstr ""
 
 #. UAM configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:110
 #, fuzzy
-msgid "coovachilli_uam"
+msgid "UAM configuration"
 msgstr "Configuração tun/tap"
 
 #. Unified Configuration Method settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:111
 #, fuzzy
-msgid "coovachilli_uam_desc"
+msgid "Unified Configuration Method settings"
 msgstr "Configuração de rede/tun"
 
 #. Use Chilli XML
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:112
-msgid "coovachilli_uam_chillixml"
+msgid "Use Chilli XML"
 msgstr ""
 
 #. Return the so-called Chilli XML along with WISPr XML
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:113
-msgid "coovachilli_uam_chillixml_desc"
+msgid "Return the so-called Chilli XML along with WISPr XML"
 msgstr ""
 
 #. Default idle timeout
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:114
-msgid "coovachilli_uam_defidletimeout"
+msgid "Default idle timeout"
 msgstr ""
 
 #. Default idle timeout unless otherwise set by RADIUS (defaults to 0)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:115
-msgid "coovachilli_uam_defidletimeout_desc"
+msgid "Default idle timeout unless otherwise set by RADIUS (defaults to 0)"
 msgstr ""
 
 #. Default interim interval
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:116
-msgid "coovachilli_uam_definteriminterval"
+msgid "Default interim interval"
 msgstr ""
 
 #. Default interim-interval for RADIUS accounting unless otherwise set by RADIUS (defaults to 0)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:117
-msgid "coovachilli_uam_definteriminterval_desc"
+msgid "Default interim-interval for RADIUS accounting unless otherwise set by RADIUS (defaults to 0)"
 msgstr ""
 
 #. Default session timeout
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:118
-msgid "coovachilli_uam_defsessiontimeout"
+msgid "Default session timeout"
 msgstr ""
 
 #. Default session timeout unless otherwise set by RADIUS (defaults to 0)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:119
-msgid "coovachilli_uam_defsessiontimeout_desc"
+msgid "Default session timeout unless otherwise set by RADIUS (defaults to 0)"
 msgstr ""
 
 #. Inspect DNS traffic
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:120
-msgid "coovachilli_uam_dnsparanoia"
+msgid "Inspect DNS traffic"
 msgstr ""
 
 #. Inspect DNS packets and drop responses with any non- A, CNAME, SOA, or MX records to prevent dns tunnels (experimental)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:121
-msgid "coovachilli_uam_dnsparanoia_desc"
+msgid "Inspect DNS packets and drop responses with any non- A, CNAME, SOA, or MX records to prevent dns tunnels (experimental)"
 msgstr ""
 
 #. Local users file
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:122
-msgid "coovachilli_uam_localusers"
+msgid "Local users file"
 msgstr ""
 
 #. A colon seperated file containing usernames and passwords of locally authenticated users
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:123
-msgid "coovachilli_uam_localusers_desc"
+msgid "A colon seperated file containing usernames and passwords of locally authenticated users"
 msgstr ""
 
 #. Location name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:124
-msgid "coovachilli_uam_locationname"
+msgid "Location name"
 msgstr ""
 
 #. Human readable location name used in JSON interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:125
-msgid "coovachilli_uam_locationname_desc"
+msgid "Human readable location name used in JSON interface"
 msgstr ""
 
 #. Do not redirect to UAM server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:126
-msgid "coovachilli_uam_nouamsuccess"
+msgid "Do not redirect to UAM server"
 msgstr ""
 
 #. Do not return to UAM server on login success, just redirect to original URL
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:127
-msgid "coovachilli_uam_nouamsuccess_desc"
+msgid "Do not return to UAM server on login success, just redirect to original URL"
 msgstr ""
 
 #. Do not do WISPr
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:128
-msgid "coovachilli_uam_nouamwispr"
+msgid "Do not do WISPr"
 msgstr ""
 
 #. Do not do any WISPr XML, assume the back-end is doing this instead
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:129
-msgid "coovachilli_uam_nouamwispr_desc"
+msgid "Do not do any WISPr XML, assume the back-end is doing this instead"
 msgstr ""
 
 #. Post auth proxy
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:130
-msgid "coovachilli_uam_postauthproxy"
+msgid "Post auth proxy"
 msgstr ""
 
 #. Used with postauthproxyport to define a post authentication HTTP proxy server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:131
-msgid "coovachilli_uam_postauthproxy_desc"
+msgid "Used with postauthproxyport to define a post authentication HTTP proxy server"
 msgstr ""
 
 #. Post auth proxy port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:132
-msgid "coovachilli_uam_postauthproxyport"
+msgid "Post auth proxy port"
 msgstr ""
 
 #. Used with postauthproxy to define a post authentication HTTP proxy server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:133
-msgid "coovachilli_uam_postauthproxyport_desc"
+msgid "Used with postauthproxy to define a post authentication HTTP proxy server"
 msgstr ""
 
 #. Allowed resources
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:134
-msgid "coovachilli_uam_uamallowed"
+msgid "Allowed resources"
 msgstr ""
 
 #. List of resources the client can access without first authenticating
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:135
 #, fuzzy
-msgid "coovachilli_uam_uamallowed_desc"
+msgid "List of resources the client can access without first authenticating"
 msgstr ""
 "Usado para informar o cliente sobre o dominio a utilizar para pedidos DNS"
 
 #. Allow any DNS server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:136
 #, fuzzy
-msgid "coovachilli_uam_uamanydns"
+msgid "Allow any DNS server"
 msgstr ""
 "Usado para informar o cliente sobre o dominio a utilizar para pedidos DNS"
 
 #. Allow any DNS server for unauthenticated clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:137
 #, fuzzy
-msgid "coovachilli_uam_uamanydns_desc"
+msgid "Allow any DNS server for unauthenticated clients"
 msgstr ""
 "Usado para informar o cliente sobre o dominio a utilizar para pedidos DNS"
 
 #. Allow any IP address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:138
 #, fuzzy
-msgid "coovachilli_uam_uamanyip"
+msgid "Allow any IP address"
 msgstr "Domínio"
 
 #. Allow clients to use any IP settings they wish by spoofing ARP (experimental)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:139
 #, fuzzy
-msgid "coovachilli_uam_uamanyip_desc"
+msgid "Allow clients to use any IP settings they wish by spoofing ARP (experimental)"
 msgstr ""
 "Usado para informar o cliente sobre o dominio a utilizar para pedidos DNS"
 
 #. Allowed domains
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:140
 #, fuzzy
-msgid "coovachilli_uam_uamdomain"
+msgid "Allowed domains"
 msgstr "Domínio"
 
 #. Defines a list of domain names to automatically add to the walled garden
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:141
 #, fuzzy
-msgid "coovachilli_uam_uamdomain_desc"
+msgid "Defines a list of domain names to automatically add to the walled garden"
 msgstr ""
 "Usado para informar o cliente sobre o dominio a utilizar para pedidos DNS"
 
 #. UAM homepage
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:142
 #, fuzzy
-msgid "coovachilli_uam_uamhomepage"
+msgid "UAM homepage"
 msgstr "Domínio"
 
 #. URL of homepage to redirect unauthenticated users to
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:143
 #, fuzzy
-msgid "coovachilli_uam_uamhomepage_desc"
+msgid "URL of homepage to redirect unauthenticated users to"
 msgstr ""
 "Usado para informar o cliente sobre o dominio a utilizar para pedidos DNS"
 
 #. UAM static content port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:144
 #, fuzzy
-msgid "coovachilli_uam_uamiport"
+msgid "UAM static content port"
 msgstr "Domínio"
 
 #. TCP port to bind to for only serving embedded content
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:145
 #, fuzzy
-msgid "coovachilli_uam_uamiport_desc"
+msgid "TCP port to bind to for only serving embedded content"
 msgstr ""
 "Usado para informar o cliente sobre o dominio a utilizar para pedidos DNS"
 
 #. UAM listening address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:146
 #, fuzzy
-msgid "coovachilli_uam_uamlisten"
+msgid "UAM listening address"
 msgstr "Domínio"
 
 #. IP address to listen to for authentication of clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:147
 #, fuzzy
-msgid "coovachilli_uam_uamlisten_desc"
+msgid "IP address to listen to for authentication of clients"
 msgstr ""
 "Usado para informar o cliente sobre o dominio a utilizar para pedidos DNS"
 
 #. UAM logout IP
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:148
 #, fuzzy
-msgid "coovachilli_uam_uamlogoutip"
+msgid "UAM logout IP"
 msgstr "Domínio"
 
 #. Use this IP address to instantly logout a client accessing it (defaults to 1.1.1.1)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:149
 #, fuzzy
-msgid "coovachilli_uam_uamlogoutip_desc"
+msgid "Use this IP address to instantly logout a client accessing it (defaults to 1.1.1.1)"
 msgstr ""
 "Usado para informar o cliente sobre o dominio a utilizar para pedidos DNS"
 
 #. UAM listening port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:150
 #, fuzzy
-msgid "coovachilli_uam_uamport"
+msgid "UAM listening port"
 msgstr "Domínio"
 
 #. TCP port to bind to for authenticating clients (default 3990)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:151
 #, fuzzy
-msgid "coovachilli_uam_uamport_desc"
+msgid "TCP port to bind to for authenticating clients (default 3990)"
 msgstr ""
 "Usado para informar o cliente sobre o dominio a utilizar para pedidos DNS"
 
 #. UAM secret
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:152
 #, fuzzy
-msgid "coovachilli_uam_uamsecret"
+msgid "UAM secret"
 msgstr "Domínio"
 
 #. Shared secret between uamserver and chilli
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:153
 #, fuzzy
-msgid "coovachilli_uam_uamsecret_desc"
+msgid "Shared secret between uamserver and chilli"
 msgstr ""
 "Usado para informar o cliente sobre o dominio a utilizar para pedidos DNS"
 
 #. UAM server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:154
 #, fuzzy
-msgid "coovachilli_uam_uamserver"
+msgid "UAM server"
 msgstr "Domínio"
 
 #. URL of web server to use for authenticating clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:155
 #, fuzzy
-msgid "coovachilli_uam_uamserver_desc"
+msgid "URL of web server to use for authenticating clients"
 msgstr ""
 "Usado para informar o cliente sobre o dominio a utilizar para pedidos DNS"
 
 #. UAM user interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:156
 #, fuzzy
-msgid "coovachilli_uam_uamui"
+msgid "UAM user interface"
 msgstr "Domínio"
 
 #. An init.d style program to handle local content on the uamuiport web server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:157
 #, fuzzy
-msgid "coovachilli_uam_uamui_desc"
+msgid "An init.d style program to handle local content on the uamuiport web server"
 msgstr ""
 "Usado para informar o cliente sobre o dominio a utilizar para pedidos DNS"
 
 #. Use status file
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:158
-msgid "coovachilli_uam_usestatusfile"
+msgid "Use status file"
 msgstr ""
 
 #. Write the status of clients in a non-volatile state file (experimental)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:159
-msgid "coovachilli_uam_usestatusfile_desc"
+msgid "Write the status of clients in a non-volatile state file (experimental)"
 msgstr ""
 
 #. WISPr login url
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:160
-msgid "coovachilli_uam_wisprlogin"
+msgid "WISPr login url"
 msgstr ""
 
 #. Specific URL to be given in WISPr XML LoginURL
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:161
-msgid "coovachilli_uam_wisprlogin_desc"
+msgid "Specific URL to be given in WISPr XML LoginURL"
 msgstr ""
 
 #. CGI program
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:162
-msgid "coovachilli_uam_wwwbin"
+msgid "CGI program"
 msgstr ""
 
 #. Executable to run as a CGI type program (like haserl) for URLs with extention .chi
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:163
 #, fuzzy
-msgid "coovachilli_uam_wwwbin_desc"
+msgid "Executable to run as a CGI type program (like haserl) for URLs with extention .chi"
 msgstr ""
 "Usado para informar o cliente sobre o dominio a utilizar para pedidos DNS"
 
 #. Web content directory
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:164
-msgid "coovachilli_uam_wwwdir"
+msgid "Web content directory"
 msgstr ""
 
 #. Directory where embedded local web content is placed
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:165
 #, fuzzy
-msgid "coovachilli_uam_wwwdir_desc"
+msgid "Directory where embedded local web content is placed"
 msgstr ""
 "Usado para informar o cliente sobre o dominio a utilizar para pedidos DNS"
 
 #. MAC configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:166
 #, fuzzy
-msgid "coovachilli_macauth"
+msgid "MAC configuration"
 msgstr "Configuração de rede/tun"
 
 #. Configure MAC authentication
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:167
 #, fuzzy
-msgid "coovachilli_macauth_desc"
+msgid "Configure MAC authentication"
 msgstr "Configuração de rede/tun"
 
 #. Allowed MAC addresses
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:168
-msgid "coovachilli_macauth_macallowed"
+msgid "Allowed MAC addresses"
 msgstr ""
 
 #. List of MAC addresses for which MAC authentication will be performed
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:169
-msgid "coovachilli_macauth_macallowed_desc"
+msgid "List of MAC addresses for which MAC authentication will be performed"
 msgstr ""
 
 #. Authenticate locally allowed MACs
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:170
-msgid "coovachilli_macauth_macallowlocal"
+msgid "Authenticate locally allowed MACs"
 msgstr ""
 
 #. Authenticate allowed MAC addresses without the use of RADIUS
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:171
-msgid "coovachilli_macauth_macallowlocal_desc"
+msgid "Authenticate allowed MAC addresses without the use of RADIUS"
 msgstr ""
 
 #. Enable MAC authentification
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:172
-msgid "coovachilli_macauth_macauth"
+msgid "Enable MAC authentification"
 msgstr ""
 
 #. Try to authenticate all users based on their mac address alone
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:173
 #, fuzzy
-msgid "coovachilli_macauth_macauth_desc"
+msgid "Try to authenticate all users based on their mac address alone"
 msgstr "Configuração de rede/tun"
 
 #. Password
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:174
-msgid "coovachilli_macauth_macpasswd"
+msgid "Password"
 msgstr ""
 
 #. Password used when performing MAC authentication
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:175
-msgid "coovachilli_macauth_macpasswd_desc"
+msgid "Password used when performing MAC authentication"
 msgstr ""
 
 #. Suffix
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:176
-msgid "coovachilli_macauth_macsuffix"
+msgid "Suffix"
 msgstr ""
 
 #. Suffix to add to the MAC address in order to form the User-Name, which is sent to the radius server
diff --git a/po/pt/ddns.po b/po/pt/ddns.po
index 07da63c53..c43b6cb25 100644
--- a/po/pt/ddns.po
+++ b/po/pt/ddns.po
@@ -13,39 +13,39 @@ msgstr ""
 
 #. Dynamic DNS
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:1
-msgid "ddns"
+msgid "Dynamic DNS"
 msgstr "DNS Dinâmico"
 
 #. Dynamic DNS allows that your router can be reached with a fixed hostname while having a dynamically changing IP-Address.
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:2
-msgid "ddns_desc"
+msgid "Dynamic DNS allows that your router can be reached with a fixed hostname while having a dynamically changing IP-Address."
 msgstr ""
 "O DNS dinâmico permite que o seu router possa ser encontrado a partir de um "
 "hostname fixo, mesmo usando um Endereço IP dinâmico."
 
 #. Source of IP-Address
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:3
-msgid "ddns_service_ipsource"
+msgid "Source of IP-Address"
 msgstr "Origem do Endereço IP"
 
 #. Check for changed IP every
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:4
-msgid "ddns_service_checkinterval"
+msgid "Check for changed IP every"
 msgstr "Intervalo para verificação de alteração do endereço IP"
 
 #. Check-Time unit
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:5
-msgid "ddns_service_checkunit"
+msgid "Check-Time unit"
 msgstr "Unidade de tempo para verificação"
 
 #. Force update every
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:6
-msgid "ddns_service_forceinterval"
+msgid "Force update every"
 msgstr "Forçar actualização a cada"
 
 #. Force-Time unit
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:7
-msgid "ddns_service_forceunit"
+msgid "Force-Time unit"
 msgstr "Unidade de tempo para actualização forçada"
 
 #. Custom Update-URL
diff --git a/po/pt/default.po b/po/pt/default.po
index c2fa109b0..36fcd4f77 100644
--- a/po/pt/default.po
+++ b/po/pt/default.po
@@ -13,37 +13,37 @@ msgstr ""
 
 #. Skip to navigation
 #: i18n/english/luasrc/i18n/default.en.lua:1
-msgid "skiplink1"
+msgid "Skip to navigation"
 msgstr "Ir para a navegação"
 
 #. Skip to content
 #: i18n/english/luasrc/i18n/default.en.lua:2
-msgid "skiplink2"
+msgid "Skip to content"
 msgstr "Ir para o conteúdo"
 
 #. Navigation
 #: i18n/english/luasrc/i18n/default.en.lua:3
-msgid "navigation"
+msgid "Navigation"
 msgstr "Navegação"
 
 #. About
 #: i18n/english/luasrc/i18n/default.en.lua:4
-msgid "about"
+msgid "About"
 msgstr "Sobre"
 
 #. Add
 #: i18n/english/luasrc/i18n/default.en.lua:5
-msgid "add"
+msgid "Add"
 msgstr "Adicionar"
 
 #. Addresses
 #: i18n/english/luasrc/i18n/default.en.lua:6
-msgid "addresses"
+msgid "Addresses"
 msgstr "Endereços"
 
 #. Aliases
 #: i18n/english/luasrc/i18n/default.en.lua:7
-msgid "aliases"
+msgid "Aliases"
 msgstr "Aliases"
 
 #. all
@@ -58,99 +58,99 @@ msgstr "voltar"
 
 #. Administration
 #: i18n/english/luasrc/i18n/default.en.lua:10
-msgid "administration"
+msgid "Administration"
 msgstr "Administração"
 
 #. Essentials
 #: i18n/english/luasrc/i18n/default.en.lua:11
-msgid "essentials"
+msgid "Essentials"
 msgstr "Básico"
 
 #. Apply
 #: i18n/english/luasrc/i18n/default.en.lua:12
-msgid "apply"
+msgid "Apply"
 msgstr "Aplicar"
 
 #. Basic Settings
 #: i18n/english/luasrc/i18n/default.en.lua:13
-msgid "basicsettings"
+msgid "Basic Settings"
 msgstr "Configurações Básicas"
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast
 #: i18n/english/luasrc/i18n/default.en.lua:14
-msgid "broadcast"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"
 msgstr "Broadcast <abbr title=\"Protocolo de Internet Versão 4\">IPv4</abbr>"
 
 #. Cancel
 #: i18n/english/luasrc/i18n/default.en.lua:15
-msgid "cancel"
+msgid "Cancel"
 msgstr "Cancelar"
 
 #. Changes
 #: i18n/english/luasrc/i18n/default.en.lua:16
-msgid "changes"
+msgid "Changes"
 msgstr "Alterações"
 
 #. Channel
 #: i18n/english/luasrc/i18n/default.en.lua:17
-msgid "channel"
+msgid "Channel"
 msgstr "Canal"
 
 #. <abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/prefix
 #: i18n/english/luasrc/i18n/default.en.lua:18
-msgid "cidr6"
+msgid "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/prefix"
 msgstr ""
 "Notação <abbr title=\"Roteamento entre Domínios sem Classe\">CIDR</abbr>: "
 "endereço/prefixo"
 
 #. Code
 #: i18n/english/luasrc/i18n/default.en.lua:19
-msgid "code"
+msgid "Code"
 msgstr "Código"
 
 #. Configuration
 #: i18n/english/luasrc/i18n/default.en.lua:20
-msgid "config"
+msgid "Configuration"
 msgstr "Configuração"
 
 #. Configuration file
 #: i18n/english/luasrc/i18n/default.en.lua:21
-msgid "configfile"
+msgid "Configuration file"
 msgstr "Ficheiro de configuração"
 
 #. Confirmation
 #: i18n/english/luasrc/i18n/default.en.lua:22
-msgid "confirmation"
+msgid "Confirmation"
 msgstr "Confirmação"
 
 #. Delete
 #: i18n/english/luasrc/i18n/default.en.lua:23
-msgid "delete"
+msgid "Delete"
 msgstr "Apagar"
 
 #. Description
 #: i18n/english/luasrc/i18n/default.en.lua:24
-msgid "descr"
+msgid "Description"
 msgstr "Descrição"
 
 #. Design
 #: i18n/english/luasrc/i18n/default.en.lua:25
-msgid "design"
+msgid "Design"
 msgstr "Tema"
 
 #. Destination
 #: i18n/english/luasrc/i18n/default.en.lua:26
-msgid "destination"
+msgid "Destination"
 msgstr "Destino"
 
 #. Device
 #: i18n/english/luasrc/i18n/default.en.lua:27
-msgid "device"
+msgid "Device"
 msgstr "Dispositivo"
 
 #. Devices
 #: i18n/english/luasrc/i18n/default.en.lua:28
-msgid "devices"
+msgid "Devices"
 msgstr "Dispositivos"
 
 #. disable
@@ -160,22 +160,22 @@ msgstr "desactivar"
 
 #. Distance
 #: i18n/english/luasrc/i18n/default.en.lua:30
-msgid "distance"
+msgid "Distance"
 msgstr "Distância"
 
 #. Kernel Log
 #: i18n/english/luasrc/i18n/default.en.lua:31
-msgid "dmesg"
+msgid "Kernel Log"
 msgstr "Registo do Kernel"
 
 #. <abbr title=\"Domain Name System\">DNS</abbr>-Server
 #: i18n/english/luasrc/i18n/default.en.lua:32
-msgid "dnsserver"
+msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Server"
 msgstr "Servidor <abbr title=\"Sistema de Nomes de Domínios\">DNS</abbr>"
 
 #. Edit
 #: i18n/english/luasrc/i18n/default.en.lua:33
-msgid "edit"
+msgid "Edit"
 msgstr "Editar"
 
 #. enable
@@ -185,47 +185,47 @@ msgstr "activar"
 
 #. Encryption
 #: i18n/english/luasrc/i18n/default.en.lua:35
-msgid "encryption"
+msgid "Encryption"
 msgstr "Encriptação"
 
 #. Error
 #: i18n/english/luasrc/i18n/default.en.lua:36
-msgid "error"
+msgid "Error"
 msgstr "Erro"
 
 #. Filesystem
 #: i18n/english/luasrc/i18n/default.en.lua:37
-msgid "filesystem"
+msgid "Filesystem"
 msgstr "Sistema de Ficheiros"
 
 #. Filter
 #: i18n/english/luasrc/i18n/default.en.lua:38
-msgid "filter"
+msgid "Filter"
 msgstr "Filtro"
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway
 #: i18n/english/luasrc/i18n/default.en.lua:39
-msgid "gateway"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
 msgstr "Gateway <abbr title=\"Protocolo de Internet Versão 4\">IPv4</abbr>"
 
 #. <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway
 #: i18n/english/luasrc/i18n/default.en.lua:40
-msgid "gateway6"
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 msgstr "Gateway <abbr title=\"Protocolo de Internet Versão 6\">IPv6</abbr>"
 
 #. General
 #: i18n/english/luasrc/i18n/default.en.lua:41
-msgid "general"
+msgid "General"
 msgstr "Geral"
 
 #. Hostname
 #: i18n/english/luasrc/i18n/default.en.lua:42
-msgid "hostname"
+msgid "Hostname"
 msgstr "Hostname"
 
 #. Install
 #: i18n/english/luasrc/i18n/default.en.lua:43
-msgid "install"
+msgid "Install"
 msgstr "Instalar"
 
 #. installed
@@ -235,103 +235,103 @@ msgstr "instalado"
 
 #. Interface
 #: i18n/english/luasrc/i18n/default.en.lua:45
-msgid "interface"
+msgid "Interface"
 msgstr "Interface"
 
 #. Interfaces
 #: i18n/english/luasrc/i18n/default.en.lua:46
-msgid "interfaces"
+msgid "Interfaces"
 msgstr "Interfaces"
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address
 #: i18n/english/luasrc/i18n/default.en.lua:47
-msgid "ipaddress"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
 msgstr "Endereço <abbr title=\"Protocolo de Internet Versão 4\">IPv4</abbr>"
 
 #. <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address
 #: i18n/english/luasrc/i18n/default.en.lua:48
-msgid "ip6address"
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address"
 msgstr "Endereço <abbr title=\"Protocolo de Internet Versão 6\">IPv6</abbr>"
 
 #. Legend
 #: i18n/english/luasrc/i18n/default.en.lua:49
-msgid "legend"
+msgid "Legend"
 msgstr "Legenda"
 
 #. Library
 #: i18n/english/luasrc/i18n/default.en.lua:50
-msgid "library"
+msgid "Library"
 msgstr "Biblioteca"
 
 #. Logout
 #: i18n/english/luasrc/i18n/default.en.lua:51
-msgid "logout"
+msgid "Logout"
 msgstr "Logout"
 
 #. Key
 #: i18n/english/luasrc/i18n/default.en.lua:52
-msgid "key"
+msgid "Key"
 msgstr "Chave"
 
 #. Language
 #: i18n/english/luasrc/i18n/default.en.lua:53
-msgid "language"
+msgid "Language"
 msgstr "Idioma"
 
 #. Limit
 #: i18n/english/luasrc/i18n/default.en.lua:54
-msgid "limit"
+msgid "Limit"
 msgstr "Limite"
 
 #. Load
 #: i18n/english/luasrc/i18n/default.en.lua:55
-msgid "load"
+msgid "Load"
 msgstr "Carga"
 
 #. Login
 #: i18n/english/luasrc/i18n/default.en.lua:56
-msgid "login"
+msgid "Login"
 msgstr "Login"
 
 #. <abbr title=\"Media Access Control\">MAC</abbr>-Address
 #: i18n/english/luasrc/i18n/default.en.lua:57
-msgid "macaddress"
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr "Endereço <abbr title=\"Controle de Acesso ao Meio\">MAC</abbr>"
 
 #. see &#39;%s&#39; manpage
 #: i18n/english/luasrc/i18n/default.en.lua:58
-msgid "manpage"
+msgid "see '%s' manpage"
 msgstr "veja sobre &#39;%s&#39; na página de manual (man)"
 
 #. Metric
 #: i18n/english/luasrc/i18n/default.en.lua:59
-msgid "metric"
+msgid "Metric"
 msgstr "Métrica"
 
 #. Mode
 #: i18n/english/luasrc/i18n/default.en.lua:60
-msgid "mode"
+msgid "Mode"
 msgstr "Modo"
 
 #. Name
 #: i18n/english/luasrc/i18n/default.en.lua:61
-msgid "name"
+msgid "Name"
 msgstr "Nome"
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask
 #: i18n/english/luasrc/i18n/default.en.lua:62
-msgid "netmask"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr ""
 "Máscara de rede <abbr title=\"Protocolo de Internet Versão 4\">IPv4</abbr>"
 
 #. Network
 #: i18n/english/luasrc/i18n/default.en.lua:63
-msgid "network"
+msgid "Network"
 msgstr "Rede"
 
 #. Networks
 #: i18n/english/luasrc/i18n/default.en.lua:64
-msgid "networks"
+msgid "Networks"
 msgstr "Redes"
 
 #. none
@@ -341,117 +341,117 @@ msgstr "nenhum"
 
 #. not installed
 #: i18n/english/luasrc/i18n/default.en.lua:66
-msgid "notinstalled"
+msgid "not installed"
 msgstr "não instalado"
 
 #. OK
 #: i18n/english/luasrc/i18n/default.en.lua:67
-msgid "ok"
+msgid "OK"
 msgstr "OK"
 
 #. Options
 #: i18n/english/luasrc/i18n/default.en.lua:68
-msgid "options"
+msgid "Options"
 msgstr "Opções"
 
 #. Overview
 #: i18n/english/luasrc/i18n/default.en.lua:69
-msgid "overview"
+msgid "Overview"
 msgstr "Visão geral"
 
 #. Package Manager
 #: i18n/english/luasrc/i18n/default.en.lua:70
-msgid "packagemanager"
+msgid "Package Manager"
 msgstr "Gestor de Pacotes"
 
 #. Password
 #: i18n/english/luasrc/i18n/default.en.lua:71
-msgid "password"
+msgid "Password"
 msgstr "Senha"
 
 #. Path
 #: i18n/english/luasrc/i18n/default.en.lua:72
-msgid "path"
+msgid "Path"
 msgstr "Directório"
 
 #. Port
 #: i18n/english/luasrc/i18n/default.en.lua:73
-msgid "port"
+msgid "Port"
 msgstr "Porta"
 
 #. Ports
 #: i18n/english/luasrc/i18n/default.en.lua:74
-msgid "ports"
+msgid "Ports"
 msgstr "Portas"
 
 #. Proceed
 #: i18n/english/luasrc/i18n/default.en.lua:75
-msgid "proceed"
+msgid "Proceed"
 msgstr "Proceder"
 
 #. Protocol
 #: i18n/english/luasrc/i18n/default.en.lua:76
-msgid "protocol"
+msgid "Protocol"
 msgstr "Protocolo"
 
 #. Reboot
 #: i18n/english/luasrc/i18n/default.en.lua:77
-msgid "reboot"
+msgid "Reboot"
 msgstr "Reboot"
 
 #. Reset
 #: i18n/english/luasrc/i18n/default.en.lua:78
-msgid "reset"
+msgid "Reset"
 msgstr "Reset"
 
 #. Revert
 #: i18n/english/luasrc/i18n/default.en.lua:79
-msgid "revert"
+msgid "Revert"
 msgstr "Reverter"
 
 #. Save
 #: i18n/english/luasrc/i18n/default.en.lua:80
-msgid "save"
+msgid "Save"
 msgstr "Salvar"
 
 #. Save &amp; Apply
 #: i18n/english/luasrc/i18n/default.en.lua:81
-msgid "saveapply"
+msgid "Save & Apply"
 msgstr "Salvar &amp; Aplicar"
 
 #. Scan
 #: i18n/english/luasrc/i18n/default.en.lua:82
-msgid "scan"
+msgid "Scan"
 msgstr "Procurar"
 
 #. Service
 #: i18n/english/luasrc/i18n/default.en.lua:83
-msgid "service"
+msgid "Service"
 msgstr "Serviço"
 
 #. Services
 #: i18n/english/luasrc/i18n/default.en.lua:84
-msgid "services"
+msgid "Services"
 msgstr "Serviços"
 
 #. Settings
 #: i18n/english/luasrc/i18n/default.en.lua:85
-msgid "settings"
+msgid "Settings"
 msgstr "Definições"
 
 #. Size
 #: i18n/english/luasrc/i18n/default.en.lua:86
-msgid "size"
+msgid "Size"
 msgstr "Tamanho"
 
 #. Source
 #: i18n/english/luasrc/i18n/default.en.lua:87
-msgid "source"
+msgid "Source"
 msgstr "Origem"
 
 #. Start
 #: i18n/english/luasrc/i18n/default.en.lua:88
-msgid "start"
+msgid "Start"
 msgstr "Início"
 
 #. static
@@ -461,72 +461,72 @@ msgstr "estático"
 
 #. Status
 #: i18n/english/luasrc/i18n/default.en.lua:90
-msgid "status"
+msgid "Status"
 msgstr "Status"
 
 #. Statistics
 #: i18n/english/luasrc/i18n/default.en.lua:91
-msgid "statistics"
+msgid "Statistics"
 msgstr "Estatísticas"
 
 #. Submit
 #: i18n/english/luasrc/i18n/default.en.lua:92
-msgid "submit"
+msgid "Submit"
 msgstr "Enviar"
 
 #. System Log
 #: i18n/english/luasrc/i18n/default.en.lua:93
-msgid "syslog"
+msgid "System Log"
 msgstr "Registo do Sistema"
 
 #. System
 #: i18n/english/luasrc/i18n/default.en.lua:94
-msgid "system"
+msgid "System"
 msgstr "Sistema"
 
 #. Target
 #: i18n/english/luasrc/i18n/default.en.lua:95
-msgid "target"
+msgid "Target"
 msgstr "Destino"
 
 #. Timezone
 #: i18n/english/luasrc/i18n/default.en.lua:96
-msgid "timezone"
+msgid "Timezone"
 msgstr "Fuso Horário"
 
 #. Type
 #: i18n/english/luasrc/i18n/default.en.lua:97
-msgid "type"
+msgid "Type"
 msgstr "Tipo"
 
 #. Unknown Error
 #: i18n/english/luasrc/i18n/default.en.lua:98
-msgid "unknownerror"
+msgid "Unknown Error"
 msgstr "Erro Desconhecido"
 
 #. Unsaved Changes
 #: i18n/english/luasrc/i18n/default.en.lua:99
-msgid "unsavedchanges"
+msgid "Unsaved Changes"
 msgstr "Alterações não Salvas"
 
 #. Username
 #: i18n/english/luasrc/i18n/default.en.lua:100
-msgid "username"
+msgid "Username"
 msgstr "Utilizador"
 
 #. Version
 #: i18n/english/luasrc/i18n/default.en.lua:101
-msgid "version"
+msgid "Version"
 msgstr "Versão"
 
 #. Web <abbr title=\"User Interface\">UI</abbr>
 #: i18n/english/luasrc/i18n/default.en.lua:102
-msgid "webui"
+msgid "Web <abbr title=\"User Interface\">UI</abbr>"
 msgstr "Web <abbr title=\"Interface do Utilizador\">UI</abbr>"
 
 #. Wifi
 #: i18n/english/luasrc/i18n/default.en.lua:103
-msgid "wifi"
+msgid "Wifi"
 msgstr "Wifi"
 
 #. Zone
diff --git a/po/pt/freifunk.po b/po/pt/freifunk.po
index 3dea0096c..24e928732 100644
--- a/po/pt/freifunk.po
+++ b/po/pt/freifunk.po
@@ -13,111 +13,111 @@ msgstr ""
 
 #. Hello and welcome in the network of
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:1
-msgid "ff_hellonet"
+msgid "Hello and welcome in the network of"
 msgstr "Olá e benvindo à rede "
 
 #. We are an initiative to establish a free, independent and open wireless mesh network.
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:2
-msgid "ff_public1"
+msgid "We are an initiative to establish a free, independent and open wireless mesh network."
 msgstr ""
 "Somos uma iniciativa para implementação de uma rede livre, independente e "
 "não-comercial."
 
 #. This is the access point
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:3
-msgid "ff_public2"
+msgid "This is the access point"
 msgstr "Este é o ponto de acesso "
 
 #. It is operated by
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:4
-msgid "ff_public3"
+msgid "It is operated by"
 msgstr "É operado por "
 
 #. You can find further information about the global Freifunk initiative at
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:5
-msgid "ff_public4"
+msgid "You can find further information about the global Freifunk initiative at"
 msgstr "Pode encontrar mais informações sobre a iniciativa global Freifunk em "
 
 #. If you are interested in our project then contact the local community
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:6
-msgid "ff_public5"
+msgid "If you are interested in our project then contact the local community"
 msgstr ""
 "Se estiver interessado no nosso projecto, entre em contacto com a sua "
 "comunidade local"
 
 #. Internet access depends on technical and organisational conditions and may or may not work for you.
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:7
-msgid "ff_public6"
+msgid "Internet access depends on technical and organisational conditions and may or may not work for you."
 msgstr ""
 "O acesso à Internet depende de factores técnicos e organizacionais, e pode "
 "funcionar ou não no seu caso."
 
 #. Location
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:8
-msgid "ff_location"
+msgid "Location"
 msgstr "Localização"
 
 #. E-Mail
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:9
-msgid "ff_mail"
+msgid "E-Mail"
 msgstr "email"
 
 #. You really should provide your address here!
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:10
-msgid "ff_mail1"
+msgid "You really should provide your address here!"
 msgstr "É realmente importante que indique o seu endereço email!"
 
 #. Nickname
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:11
-msgid "ff_nickname"
+msgid "Nickname"
 msgstr "Nome curto (nick)"
 
 #. Realname
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:12
-msgid "ff_name"
+msgid "Realname"
 msgstr "Nome"
 
 #. Node
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:13
-msgid "ff_node"
+msgid "Node"
 msgstr "Nó"
 
 #. Notice
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:14
-msgid "ff_note"
+msgid "Notice"
 msgstr "Notas"
 
 #. Phone
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:15
-msgid "ff_phone"
+msgid "Phone"
 msgstr "Telefone"
 
 #. Memory
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:16
-msgid "ff_ram"
+msgid "Memory"
 msgstr "Memória"
 
 #. Free
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:17
-msgid "ff_free"
+msgid "Free"
 msgstr "Livre"
 
 #. Buffers
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:18
-msgid "ff_buffers"
+msgid "Buffers"
 msgstr "Buffers"
 
 #. Cached
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:19
-msgid "ff_cached"
+msgid "Cached"
 msgstr "Em cache"
 
 #. Total
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:20
-msgid "ff_total"
+msgid "Total"
 msgstr "Total"
 
 #. Coordinates
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:21
-msgid "ff_geocoord"
+msgid "Coordinates"
 msgstr "Coordenadas"
diff --git a/po/pt/hd_idle.po b/po/pt/hd_idle.po
index 04af29784..af876bf64 100644
--- a/po/pt/hd_idle.po
+++ b/po/pt/hd_idle.po
@@ -13,22 +13,22 @@ msgstr ""
 
 #. Disk
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:1
-msgid "disk"
+msgid "Disk"
 msgstr "Disco"
 
 #. Enable debug
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:2
-msgid "enable_debug"
+msgid "Enable debug"
 msgstr "Activar debug"
 
 #. hd-idle
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:3
-msgid "hd_idle"
+msgid "hd-idle"
 msgstr "Hd-idle"
 
 #. hd-idle is a utility program for spinning-down external disks after a period of idle time.
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:4
-msgid "hd_idle_desc"
+msgid "hd-idle is a utility program for spinning-down external disks after a period of idle time."
 msgstr ""
 "Hd-idle é um programa utilitário para activar o modo &quot;economia de "
 "energia&quot; (spinning-down) de discos externos após um período de "
@@ -36,15 +36,15 @@ msgstr ""
 
 #. Idle-Time
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:5
-msgid "idle_time_interval"
+msgid "Idle-Time"
 msgstr "Tempo de ociosidade"
 
 #. Idle-Time unit
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:6
-msgid "idle_time_unit"
+msgid "Idle-Time unit"
 msgstr "Unidade do tempo de ociosidade"
 
 #. Settings
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:7
-msgid "settings"
+msgid "Settings"
 msgstr "Configurações"
diff --git a/po/pt/initmgr.po b/po/pt/initmgr.po
index 56fc6b9de..20277511b 100644
--- a/po/pt/initmgr.po
+++ b/po/pt/initmgr.po
@@ -14,12 +14,12 @@ msgstr ""
 
 #. Initscripts
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:1
-msgid "initmgr"
+msgid "Initscripts"
 msgstr "Scripts de Inicialização"
 
 #. You can enable or disable installed init scripts here. Changes will applied after a device reboot.<br /><strong>Warning: If you disable essential init scripts like &quot;network&quot;, your device might become inaccesable!</strong>
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:2
-msgid "initmgr_desc"
+msgid "You can enable or disable installed init scripts here. Changes will applied after a device reboot.<br /><strong>Warning: If you disable essential init scripts like \"network\", your device might become inaccesable!</strong>"
 msgstr ""
 "Você pode ativar ou desativar os scripts de inicialização instalados aqui. "
 "As mudanças serão aplicadas após a reinicialização do equipamento.<br "
@@ -29,12 +29,12 @@ msgstr ""
 
 #. Start priority
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:3
-msgid "initmgr_index"
+msgid "Start priority"
 msgstr "Prioridade de inicialização"
 
 #. Initscript
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:4
-msgid "initmgr_name"
+msgid "Initscript"
 msgstr "Script de inicialização"
 
 #. Enable/Disable
diff --git a/po/pt/livestats.po b/po/pt/livestats.po
index 1cb83bb10..9fd7d83a8 100644
--- a/po/pt/livestats.po
+++ b/po/pt/livestats.po
@@ -13,32 +13,32 @@ msgstr ""
 
 #. incoming
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:1
-msgid "livestats_incoming"
+msgid "incoming"
 msgstr "entrada"
 
 #. outgoing
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:2
-msgid "livestats_outgoing"
+msgid "outgoing"
 msgstr "saída"
 
 #. traffic on
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:3
-msgid "livestats_traffic"
+msgid "traffic on"
 msgstr "tráfego"
 
 #. signal-to-noise ratio for
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:4
-msgid "livestats_wifi"
+msgid "signal-to-noise ratio for"
 msgstr "SNR para"
 
 #. load average
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:5
-msgid "livestats_loadavg"
+msgid "load average"
 msgstr "carga média"
 
 #. Realtime Wireless Status
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:6
-msgid "livestats_stat_wireless"
+msgid "Realtime Wireless Status"
 msgstr "Estado wireless em tempo-real"
 
 #. Realtime Network Traffic
diff --git a/po/pt/luci-fw.po b/po/pt/luci-fw.po
index 471ac4230..e9b32942d 100644
--- a/po/pt/luci-fw.po
+++ b/po/pt/luci-fw.po
@@ -13,61 +13,61 @@ msgstr ""
 
 #. Port forwarding
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:1
-msgid "fw_portfw"
+msgid "Port forwarding"
 msgstr "Redirecionamento de portas"
 
 #. Traffic Redirection
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:2
-msgid "fw_redirect"
+msgid "Traffic Redirection"
 msgstr "Redirecionamento de Tráfego"
 
 #. Traffic redirection allows you to change the destination address of forwarded packets.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:3
-msgid "fw_redirect_desc"
+msgid "Traffic redirection allows you to change the destination address of forwarded packets."
 msgstr ""
 "Redirecionamento do tráfego permite a alteração do endereço de destino dos "
 "pacotes enviados."
 
 #. Zone-to-Zone traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:4
-msgid "fw_forwarding"
+msgid "Zone-to-Zone traffic"
 msgstr "Tráfego de Zona-para-Zona"
 
 #. Firewall
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:5
-msgid "fw_fw"
+msgid "Firewall"
 msgstr "Firewall"
 
 #. Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:6
-msgid "fw_zone"
+msgid "Zone"
 msgstr "Zona"
 
 #. Zones
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:7
-msgid "fw_zones"
+msgid "Zones"
 msgstr "Zonas"
 
 #. Custom forwarding
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:8
-msgid "fw_custfwd"
+msgid "Custom forwarding"
 msgstr "Redirecionamento personalizado"
 
 #. The firewall creates zones over your network interfaces to control network traffic flow.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:9
-msgid "fw_fw1"
+msgid "The firewall creates zones over your network interfaces to control network traffic flow."
 msgstr ""
 "O firewall cria zonas sobre as interfaces de rede para controlar o fluxo do "
 "tráfego."
 
 #. Advanced Rules
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:10
-msgid "firewall_rule"
+msgid "Advanced Rules"
 msgstr "Regras Avançadas"
 
 #. Advanced rules let you customize the firewall to your needs. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:11
-msgid "firewall_rule_desc"
+msgid "Advanced rules let you customize the firewall to your needs. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall."
 msgstr ""
 "As regras avançadas permitem a personalização da firewall de acordo com as "
 "necessidades. Apenas as novas ligações serão processadas. Pacotes que "
@@ -76,139 +76,139 @@ msgstr ""
 
 #. Input Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:12
-msgid "firewall_rule_src"
+msgid "Input Zone"
 msgstr "Zona de Entrada"
 
 #. Output Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:13
-msgid "firewall_rule_dest"
+msgid "Output Zone"
 msgstr "Zona de Saída"
 
 #. Source address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:14
-msgid "firewall_rule_srcip"
+msgid "Source address"
 msgstr "Endereço de origem"
 
 #. Destination address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:15
-msgid "firewall_rule_destip"
+msgid "Destination address"
 msgstr "Endereço de destino"
 
 #. Source MAC-Address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:16
-msgid "firewall_rule_srcmac"
+msgid "Source MAC-Address"
 msgstr "Endereço MAC de origem"
 
 #. Source port
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:17
-msgid "firewall_rule_srcport"
+msgid "Source port"
 msgstr "Porta de origem"
 
 #. Destination port
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:18
-msgid "firewall_rule_destport"
+msgid "Destination port"
 msgstr "Porta de destino"
 
 #. Action
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:19
-msgid "firewall_rule_target"
+msgid "Action"
 msgstr "Acção"
 
 #. accept
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:20
-msgid "fw_accept"
+msgid "accept"
 msgstr "aceitar"
 
 #. reject
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:21
-msgid "fw_reject"
+msgid "reject"
 msgstr "rejeitar"
 
 #. drop
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:22
-msgid "fw_drop"
+msgid "drop"
 msgstr "dropar"
 
 #. Source
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:23
-msgid "fw_src"
+msgid "Source"
 msgstr "Origem"
 
 #. Destination
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:24
-msgid "fw_dest"
+msgid "Destination"
 msgstr "Destino"
 
 #. Traffic Control
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:25
-msgid "fw_traffic"
+msgid "Traffic Control"
 msgstr "Controle de Tráfego"
 
 #. MSS Clamping
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:26
-msgid "fw_mtufix"
+msgid "MSS Clamping"
 msgstr "MSS-Correction"
 
 #. Drop invalid packets
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:27
-msgid "fw_dropinvalid"
+msgid "Drop invalid packets"
 msgstr "Dropar pacotes inválidos"
 
 #. Port forwarding allows to provide network services in the internal network to an external network.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:28
-msgid "fw_portfw1"
+msgid "Port forwarding allows to provide network services in the internal network to an external network."
 msgstr ""
 "O redirecionamento de portas permite disponibilizar serviços na rede interna "
 "para uma rede externa."
 
 #. External Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:29
-msgid "firewall_redirect_src_desc"
+msgid "External Zone"
 msgstr "Zona Externa"
 
 #. External port
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:30
-msgid "firewall_redirect_srcdport"
+msgid "External port"
 msgstr "Porta Externa"
 
 #. port or range as first-last
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:31
-msgid "firewall_redirect_srcdport_desc"
+msgid "port or range as first-last"
 msgstr "porta ou gama no formato \"primeira-última\""
 
 #. Source address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:32
-msgid "firewall_redirect_srcip"
+msgid "Source address"
 msgstr "Endereço de origem"
 
 #. Source MAC
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:33
-msgid "firewall_redirect_srcmac"
+msgid "Source MAC"
 msgstr "MAC de origem"
 
 #. Internal address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:34
-msgid "firewall_redirect_destip"
+msgid "Internal address"
 msgstr "Endereço interno"
 
 #. IP-Address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:35
-msgid "firewall_redirect_destip_desc"
+msgid "IP-Address"
 msgstr "Endereço IP"
 
 #. Internal port (optional)
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:36
-msgid "firewall_redirect_destport"
+msgid "Internal port (optional)"
 msgstr "Porta interna (opcional)"
 
 #. port or range as first-last
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:37
-msgid "firewall_redirect_destport_desc"
+msgid "port or range as first-last"
 msgstr "porta ou gama no formato \"primeira-última\""
 
 #. Here you can specify which network traffic is allowed to flow between network zones. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall. If you experience occasional connection problems try enabling MSS Clamping otherwise disable it for performance reasons.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:38
-msgid "fw_forwarding1"
+msgid "Here you can specify which network traffic is allowed to flow between network zones. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall. If you experience occasional connection problems try enabling MSS Clamping otherwise disable it for performance reasons."
 msgstr ""
 "Aqui você pode especificar qual tráfego de rede será permitido para o fluxo "
 "entre zonas das redes. Somente novas conexões serão processadas. Pacotes "
@@ -217,49 +217,49 @@ msgstr ""
 
 #. Input
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:39
-msgid "firewall_forwarding_src"
+msgid "Input"
 msgstr "Entrada"
 
 #. Output
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:40
-msgid "firewall_forwarding_dest"
+msgid "Output"
 msgstr "Saída"
 
 #. Defaults
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:41
-msgid "firewall_defaults"
+msgid "Defaults"
 msgstr "Padrões"
 
 #. These are the default settings that are used if no other rules match.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:42
-msgid "firewall_defaults_desc"
+msgid "These are the default settings that are used if no other rules match."
 msgstr ""
 "Estas são as configurações padrões, que serão usadas se não houver outras "
 "regras."
 
 #. SYN-flood protection
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:43
-msgid "firewall_defaults_synflood"
+msgid "SYN-flood protection"
 msgstr "Proteção SYN-flood"
 
 #. Incoming Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:44
-msgid "firewall_defaults_input"
+msgid "Incoming Traffic"
 msgstr "Tráfego de Entrada"
 
 #. Outgoing Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:45
-msgid "firewall_defaults_output"
+msgid "Outgoing Traffic"
 msgstr "Tráfego de Saída"
 
 #. Forwarded Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:46
-msgid "firewall_defaults_forward"
+msgid "Forwarded Traffic"
 msgstr "Tráfego Redirecionado"
 
 #. Zones part the network interfaces into certain isolated areas to separate network traffic. One or more networks can belong to a zone. The MASQ-flag enables NAT masquerading for all outgoing traffic on this zone.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:47
-msgid "firewall_zone_desc"
+msgid "Zones part the network interfaces into certain isolated areas to separate network traffic. One or more networks can belong to a zone. The MASQ-flag enables NAT masquerading for all outgoing traffic on this zone."
 msgstr ""
 "Zonas são interfaces de redes usadas para separar o tráfego da rede. Uma ou "
 "mais redes podem pertencer a uma zona. A flag-MASQ ativa o mascaramento NAT "
@@ -267,42 +267,42 @@ msgstr ""
 
 #. Incoming Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:48
-msgid "firewall_zone_input"
+msgid "Incoming Traffic"
 msgstr "Tráfego de Entrada"
 
 #. Default Policy
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:49
-msgid "firewall_zone_input_desc"
+msgid "Default Policy"
 msgstr "Política Padrão"
 
 #. Outgoing Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:50
-msgid "firewall_zone_output"
+msgid "Outgoing Traffic"
 msgstr "Tráfego de Saída"
 
 #. Default Policy
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:51
-msgid "firewall_zone_output_desc"
+msgid "Default Policy"
 msgstr "Política Padrão"
 
 #. Forwarded Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:52
-msgid "firewall_zone_forward"
+msgid "Forwarded Traffic"
 msgstr "Tráfego Redirecionado"
 
 #. Default Policy
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:53
-msgid "firewall_zone_forward_desc"
+msgid "Default Policy"
 msgstr "Política Padrão"
 
 #. MASQ
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:54
-msgid "firewall_zone_masq"
+msgid "MASQ"
 msgstr "MASQ"
 
 #. Networks
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:55
-msgid "firewall_zone_network"
+msgid "Networks"
 msgstr "Redes"
 
 #. contained networks
diff --git a/po/pt/mmc_over_gpio.po b/po/pt/mmc_over_gpio.po
index ed9adc705..c7fe8ee87 100644
--- a/po/pt/mmc_over_gpio.po
+++ b/po/pt/mmc_over_gpio.po
@@ -14,15 +14,15 @@ msgstr ""
 
 #. MMC/SD driver configuration
 #: applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua:1
-msgid "mmc_over_gpio"
+msgid "MMC/SD driver configuration"
 msgstr "Configuração do driver MMC/SD"
 
 #. MMC/SD driver configuration
 #: applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua:2
-msgid "mmc_over_gpio_desc"
+msgid "MMC/SD driver configuration"
 msgstr "Configuração do driver MMC/SD"
 
 #. Settings
 #: applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua:3
-msgid "settings"
+msgid "Settings"
 msgstr "Configurações"
diff --git a/po/pt/ntpc.po b/po/pt/ntpc.po
index ab709d9a0..7b6be5f39 100644
--- a/po/pt/ntpc.po
+++ b/po/pt/ntpc.po
@@ -13,42 +13,42 @@ msgstr ""
 
 #. Time Synchronisation
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:1
-msgid "ntpc"
+msgid "Time Synchronisation"
 msgstr "Sincronização de Horário"
 
 #. Synchronizes the system time
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:2
-msgid "ntpc_desc"
+msgid "Synchronizes the system time"
 msgstr "Sincroniza a hora do sistema"
 
 #. Time Server
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:3
-msgid "ntpc_timeserver"
+msgid "Time Server"
 msgstr "Servidor de Hora"
 
 #. Update Interval (in s)
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:4
-msgid "ntpc_interval"
+msgid "Update Interval (in s)"
 msgstr "Intervalo de Actualização (em s)"
 
 #. Count of Time Measurements
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:5
-msgid "ntpc_count"
+msgid "Count of Time Measurements"
 msgstr "Quantas vezes irá atualizar"
 
 #. empty = infinite
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:6
-msgid "ntpc_count_desc"
+msgid "empty = infinite"
 msgstr "vazio = infinito"
 
 #. Clock Adjustment
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:7
-msgid "ntpc_drift"
+msgid "Clock Adjustment"
 msgstr "Ajuste do Relógio"
 
 #. Offset Frequency
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:8
-msgid "ntpc_drift_freq"
+msgid "Offset Frequency"
 msgstr "Frequência do Offset"
 
 #. Current system time
diff --git a/po/pt/olsr.po b/po/pt/olsr.po
index e23cc63e3..97fea9b18 100644
--- a/po/pt/olsr.po
+++ b/po/pt/olsr.po
@@ -14,42 +14,42 @@ msgstr ""
 
 #. OLSR Daemon
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:1
-msgid "olsrd"
+msgid "OLSR Daemon"
 msgstr "Servidor OLSR"
 
 #. Neighbour IP
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:2
-msgid "olsrd_neighbour_ip"
+msgid "Neighbour IP"
 msgstr "Endereço IP do Vizinho"
 
 #. Local interface IP
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:3
-msgid "olsrd_local_ip"
+msgid "Local interface IP"
 msgstr "Endereço IP do interface local"
 
 #. Announced network
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:4
-msgid "olsrd_network"
+msgid "Announced network"
 msgstr "Rede anunciada"
 
 #. OLSR gateway
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:5
-msgid "olsrd_gateway"
+msgid "OLSR gateway"
 msgstr "gateway OLSR"
 
 #. OLSR node
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:6
-msgid "olsrd_node"
+msgid "OLSR node"
 msgstr "Nó OLSR"
 
 #. Unable to connect to the OLSR daemon!
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:7
-msgid "olsrd_error"
+msgid "Unable to connect to the OLSR daemon!"
 msgstr "Não foi possivel ligar ao servidor OLSR!"
 
 #. Make sure that OLSRd is running, the &quot;txtinfo&quot; plugin is loaded, configured on port 2006 and accepts connections from &quot;127.0.0.1&quot;.
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:8
-msgid "olsrd_error_desc"
+msgid "Make sure that OLSRd is running, the \"txtinfo\" plugin is loaded, configured on port 2006 and accepts connections from \"127.0.0.1\"."
 msgstr ""
 "Certifique-se que o processo olsrd está em execução, que o plugin "
 "&quot;txtinfo&quot; está carregado e configurado para a porta 2006 e que "
@@ -57,621 +57,621 @@ msgstr ""
 
 #. OLSR - HNA-Announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:9
-msgid "olsrd_hna"
+msgid "OLSR - HNA-Announcements"
 msgstr "OLSR - Anuncios HNA4"
 
 #. OLSR - Plugins
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:10
-msgid "olsrd_plugins"
+msgid "OLSR - Plugins"
 msgstr "OLSR - Plugins"
 
 #. OLSR connections
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:11
-msgid "olsrd_links"
+msgid "OLSR connections"
 msgstr "OLSR - Ligações"
 
 #. Overview of currently established OLSR connections
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:12
-msgid "olsrd_links_desc"
+msgid "Overview of currently established OLSR connections"
 msgstr "Resumo das ligações OLSR actualmente estabelecidas"
 
 #. Expected retransmission count
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:13
-msgid "olsrd_links_etx_desc"
+msgid "Expected retransmission count"
 msgstr "Contagem esperada de retransmissões"
 
 #. Success rate of sent packages
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:14
-msgid "olsrd_links_lq_desc"
+msgid "Success rate of sent packages"
 msgstr "Racio de sucesso de pacotes enviados"
 
 #. Success rate of received packages
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:15
-msgid "olsrd_links_nlq_desc"
+msgid "Success rate of received packages"
 msgstr "Racio de sucesso de pacotes recebidos"
 
 #. Known OLSR routes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:16
-msgid "olsrd_routes"
+msgid "Known OLSR routes"
 msgstr "Rotas OLSR conhecidas"
 
 #. Overview of currently known routes to other OLSR nodes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:17
-msgid "olsrd_routes_desc"
+msgid "Overview of currently known routes to other OLSR nodes"
 msgstr "Resumo das rotas conhecidas para outros nós OLSR"
 
 #. Active OLSR nodes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:18
-msgid "olsrd_topology"
+msgid "Active OLSR nodes"
 msgstr "Nós OLSR activos"
 
 #. Overview of currently known OLSR nodes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:19
-msgid "olsrd_topology_desc"
+msgid "Overview of currently known OLSR nodes"
 msgstr "Resumo dos nós OLSR conhecidos"
 
 #. Last hop
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:20
-msgid "olsrd_topology_lasthop"
+msgid "Last hop"
 msgstr "Ultimo salto"
 
 #. Active host net announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:21
 #, fuzzy
-msgid "olsrd_hna2"
+msgid "Active host net announcements"
 msgstr "Anuncios activos de hosts"
 
 #. Overview of currently active OLSR host net announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:22
 #, fuzzy
-msgid "olsrd_hna_desc"
+msgid "Overview of currently active OLSR host net announcements"
 msgstr "Resumo de anuncios activos de hosts"
 
 #. Active MID announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:23
-msgid "olsrd_mid"
+msgid "Active MID announcements"
 msgstr "Anuncios MID activos"
 
 #. Overview of known multiple interface announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:24
-msgid "olsrd_mid_desc"
+msgid "Overview of known multiple interface announcements"
 msgstr "Resumo de anuncios de nós com multiplos interfaces activos"
 
 #. Secondary OLSR interfaces
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:25
-msgid "olsrd_mid_aliases"
+msgid "Secondary OLSR interfaces"
 msgstr "Interfaces OLSR secundários"
 
 #. Freifunk
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:26
-msgid "olsrd_etx_ff"
+msgid "Freifunk"
 msgstr "Freifunk"
 
 #. floating point
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:27
-msgid "olsrd_etx_float"
+msgid "floating point"
 msgstr "Virgula flutuante"
 
 #. fixed point math
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:28
-msgid "olsrd_etx_fpm"
+msgid "fixed point math"
 msgstr "Matemática de virgula fixa"
 
 #. General settings
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:29
-msgid "olsrd_olsrd"
+msgid "General settings"
 msgstr "Definições gerais"
 
 #. Start without network
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:30
-msgid "olsrd_olsrd_allownoint"
+msgid "Start without network"
 msgstr "Iniciar sem rede"
 
 #. Clear screen
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:31
-msgid "olsrd_olsrd_clearscreen"
+msgid "Clear screen"
 msgstr "Limpar ecran"
 
 #. Debugmode
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:32
-msgid "olsrd_olsrd_debuglevel"
+msgid "Debugmode"
 msgstr "Nível de mensagens de diagnóstico"
 
 #. FIB metric
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:33
-msgid "olsrd_olsrd_fibmetric"
+msgid "FIB metric"
 msgstr "métrica FIB"
 
 #. Internet protocol
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:34
-msgid "olsrd_olsrd_ipversion"
+msgid "Internet protocol"
 msgstr "Versão IP"
 
 #. LQ aging
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:35
-msgid "olsrd_olsrd_linkqualityaging"
+msgid "LQ aging"
 msgstr "Envelhecimento LQ"
 
 #. LQ algorithm
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:36
-msgid "olsrd_olsrd_linkqualityalgorithm"
+msgid "LQ algorithm"
 msgstr "Algoritmo LQ"
 
 #. LQ Dijkstra limit
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:37
-msgid "olsrd_olsrd_linkqualitydijkstralimit"
+msgid "LQ Dijkstra limit"
 msgstr "Limite Dijkstra LQ"
 
 #. LQ fisheye
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:38
 #, fuzzy
-msgid "olsrd_olsrd_linkqualityfisheye"
+msgid "LQ fisheye"
 msgstr "LQ Fisheye"
 
 #. LQ level
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:39
-msgid "olsrd_olsrd_linkqualitylevel"
+msgid "LQ level"
 msgstr "Nível LQ"
 
 #. MPR selection
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:40
 #, fuzzy
-msgid "olsrd_olsrd_linkqualitylevel_1"
+msgid "MPR selection"
 msgstr "Selecção MPR"
 
 #. MPR selection and routing
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:41
 #, fuzzy
-msgid "olsrd_olsrd_linkqualitylevel_2"
+msgid "MPR selection and routing"
 msgstr "Selecção e Routing MPR"
 
 #. LQ window size
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:42
 #, fuzzy
-msgid "olsrd_olsrd_linkqualitywinsize"
+msgid "LQ window size"
 msgstr "Janela de Amostragem LQ"
 
 #. MPR coverage
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:43
-msgid "olsrd_olsrd_mprcoverage"
+msgid "MPR coverage"
 msgstr "Cobertura MPR"
 
 #. Pollrate
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:44
-msgid "olsrd_olsrd_pollrate"
+msgid "Pollrate"
 msgstr "Pollrate"
 
 #. TC redundancy
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:45
-msgid "olsrd_olsrd_tcredundancy"
+msgid "TC redundancy"
 msgstr "Redundância TC"
 
 #. MPR selectors
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:46
-msgid "olsrd_olsrd_tcredundancy_0"
+msgid "MPR selectors"
 msgstr "Selectores MPR"
 
 #. MPR selectors and MPR
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:47
-msgid "olsrd_olsrd_tcredundancy_1"
+msgid "MPR selectors and MPR"
 msgstr "MPR e selectores MPR"
 
 #. all neighbours
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:48
-msgid "olsrd_olsrd_tcredundancy_2"
+msgid "all neighbours"
 msgstr "Todos os vizinhos"
 
 #. Use hysteresis
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:49
-msgid "olsrd_olsrd_usehysteresis"
+msgid "Use hysteresis"
 msgstr "Usar histerese"
 
 #. Willingness
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:50
-msgid "olsrd_olsrd_willingness"
+msgid "Willingness"
 msgstr "Disponibilidade"
 
 #. Hello interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:51
-msgid "olsrd_interface_hellointerval"
+msgid "Hello interval"
 msgstr "Intervalo entre Hello"
 
 #. Hello validity time
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:52
-msgid "olsrd_interface_hellovaliditytime"
+msgid "Hello validity time"
 msgstr "Validade de Hello"
 
 #. HNA interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:53
-msgid "olsrd_interface_hnainterval"
+msgid "HNA interval"
 msgstr "Intervalo entre HNA"
 
 #. HNA validity time
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:54
-msgid "olsrd_interface_hnavaliditytime"
+msgid "HNA validity time"
 msgstr "Validade de HNA"
 
 #. IPv4 broadcast
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:55
-msgid "olsrd_interface_ip4broadcast"
+msgid "IPv4 broadcast"
 msgstr "Endereço IPv4 de Broadcast"
 
 #. MID interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:56
-msgid "olsrd_interface_midinterval"
+msgid "MID interval"
 msgstr "Intervalo de MID"
 
 #. MID validity time
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:57
-msgid "olsrd_interface_midvaliditytime"
+msgid "MID validity time"
 msgstr "Validade de MID"
 
 #. TC interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:58
-msgid "olsrd_interface_tcinterval"
+msgid "TC interval"
 msgstr "Intervalo de TC"
 
 #. TC validity time
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:59
-msgid "olsrd_interface_tcvaliditytime"
+msgid "TC validity time"
 msgstr "Validade de TC"
 
 #. IPv6 address type
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:60
-msgid "olsrd_interface_ip6addrtype"
+msgid "IPv6 address type"
 msgstr "Tipo de Endereço IPv6"
 
 #. IPC settings
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:61
-msgid "olsrd_ipcconnect"
+msgid "IPC settings"
 msgstr "Definições IPC"
 
 #. IPC connections enable you to remote-control the local OLSRd instance using external programs
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:62
-msgid "olsrd_ipcconnect_desc"
+msgid "IPC connections enable you to remote-control the local OLSRd instance using external programs"
 msgstr ""
 "As ligações IPC permitem-lhe controlar a instancia local de OLSRd com "
 "aplicações externas"
 
 #. Allowed host addresses
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:63
-msgid "olsrd_ipcconnect_host"
+msgid "Allowed host addresses"
 msgstr "Endereços de hosts permitidos"
 
 #. Multiple separated by spaces
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:64
-msgid "olsrd_ipcconnect_host_desc"
+msgid "Multiple separated by spaces"
 msgstr "Multiplas entradas, separadas por espaços"
 
 #. Maxmimum connection count
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:65
-msgid "olsrd_ipcconnect_maxconnections"
+msgid "Maxmimum connection count"
 msgstr "Máximo de ligações permitidas"
 
 #. Set to 0 to disable IPC
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:66
-msgid "olsrd_ipcconnect_maxconnections_desc"
+msgid "Set to 0 to disable IPC"
 msgstr "Defina 0 para desactivar IPC"
 
 #. Allowed subnets
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:67
-msgid "olsrd_ipcconnect_net"
+msgid "Allowed subnets"
 msgstr "Subredes permitidas"
 
 #. Address Mask; multiple separated by space
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:68
-msgid "olsrd_ipcconnect_net_desc"
+msgid "Address Mask; multiple separated by space"
 msgstr "Máscara de subrede; multiplas entradas, separadas por espaços"
 
 #. IPv4 HNA announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:69
 #, fuzzy
-msgid "olsrd_hna4"
+msgid "IPv4 HNA announcements"
 msgstr "OLSR - Anuncios HNA4"
 
 #. Hna4 entries allow you to propagate local IPv4 host- and network-routes into the mesh network
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:70
 #, fuzzy
-msgid "olsrd_hna4_desc"
+msgid "Hna4 entries allow you to propagate local IPv4 host- and network-routes into the mesh network"
 msgstr "Resumo de anuncios activos de hosts"
 
 #. Network address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:71
-msgid "olsrd_hna4_netaddr"
+msgid "Network address"
 msgstr "Endereço de Rede"
 
 #. IPv4 address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:72
-msgid "olsrd_hna4_netaddr_desc"
+msgid "IPv4 address"
 msgstr "Endereço IPv4"
 
 #. Netmask
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:73
-msgid "olsrd_hna4_netmask"
+msgid "Netmask"
 msgstr "Máscara de subrede"
 
 #. IPv4 address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:74
-msgid "olsrd_hna4_netmask_desc"
+msgid "IPv4 address"
 msgstr "Endereço IPv4"
 
 #. IPv6 HNA announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:75
 #, fuzzy
-msgid "olsrd_hna6"
+msgid "IPv6 HNA announcements"
 msgstr "OLSR - Anuncios HNA4"
 
 #. Hna6 entries allow you to propagate local IPv6 host- and network-routes into the mesh network
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:76
 #, fuzzy
-msgid "olsrd_hna6_desc"
+msgid "Hna6 entries allow you to propagate local IPv6 host- and network-routes into the mesh network"
 msgstr "Resumo de anuncios activos de hosts"
 
 #. Network address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:77
-msgid "olsrd_hna6_netaddr"
+msgid "Network address"
 msgstr "Endereço de Rede"
 
 #. IPv6 address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:78
-msgid "olsrd_hna6_netaddr_desc"
+msgid "IPv6 address"
 msgstr "Endereço IPv6"
 
 #. Prefix
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:79
-msgid "olsrd_hna6_prefix"
+msgid "Prefix"
 msgstr "Prefixo"
 
 #. IPv6 prefix
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:80
-msgid "olsrd_hna6_prefix_desc"
+msgid "IPv6 prefix"
 msgstr "Prefixo IPv6"
 
 #. Plugin configuration
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:81
-msgid "olsrd_loadplugin"
+msgid "Plugin configuration"
 msgstr "Configuração de Plugin"
 
 #. Enable plugin
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:82
-msgid "olsrd_loadplugin_ignore"
+msgid "Enable plugin"
 msgstr "Activar Plugin"
 
 #. Library
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:83
-msgid "olsrd_loadplugin_library"
+msgid "Library"
 msgstr "Biblioteca"
 
 #. Allow connections from this hosts
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:84
-msgid "olsrd_loadplugin_accept"
+msgid "Allow connections from this hosts"
 msgstr "Aceitar ligações a partir destes hosts"
 
 #. Ping test addresses
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:85
-msgid "olsrd_loadplugin_ping"
+msgid "Ping test addresses"
 msgstr "Endereços a testar por ping"
 
 #. Interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:86
-msgid "olsrd_loadplugin_interval"
+msgid "Refresh interval in seconds"
 msgstr "Intervalo"
 
 #. HNA announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:87
-msgid "olsrd_loadplugin_hna"
+msgid "HNA announcements"
 msgstr "Anúncios HNA"
 
 #. Format: IP-Address Netmask / OLSR will announce this network once it is reachable
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:88
-msgid "olsrd_loadplugin_hna_desc"
+msgid "Format: IP-Address Netmask / OLSR will announce this network once it is reachable"
 msgstr ""
 "Formato: \"Endereço IP\" \"máscara de subrede\" / o OLSR anunciará esta rede "
 "logo que esta seja acessível "
 
 #. Alternative \"hosts\" file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:89
-msgid "olsrd_loadplugin_addhosts"
+msgid "Alternative \"hosts\" file"
 msgstr "Ficheiro de \"hosts\" alternativo"
 
 #. The contents of this file will be appended to the autogenerated \"hosts\" file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:90
-msgid "olsrd_loadplugin_addhosts_desc"
+msgid "The contents of this file will be appended to the autogenerated \"hosts\" file"
 msgstr ""
 "Os conteúdos deste ficheiro serão acrescentados ao ficheiro automaticamente "
 "gerado de \"hosts\""
 
 #. DNS server
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:91
-msgid "olsrd_loadplugin_dnsserver"
+msgid "DNS server"
 msgstr "Servidor de DNS"
 
 #. Alternative hostnames
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:92
-msgid "olsrd_loadplugin_hosts"
+msgid "Alternative hostnames"
 msgstr "Hostnames alternativos"
 
 #. Format: Interface-IP Hostname
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:93
-msgid "olsrd_loadplugin_hosts_desc"
+msgid "Format: Interface-IP Hostname"
 msgstr "Formato: \"Endereço IP do interface\" \"hostname\""
 
 #. Path to the \"hosts\" file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:94
-msgid "olsrd_loadplugin_hostsfile"
+msgid "Path to the \"hosts\" file"
 msgstr "Caminho completo do ficheiro de \"hosts\""
 
 #. Latitude
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:95
-msgid "olsrd_loadplugin_lat"
+msgid "Latitude"
 msgstr "Latitude"
 
 #. Output file for coordinates
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:96
-msgid "olsrd_loadplugin_latlonfile"
+msgid "Output file for coordinates"
 msgstr "Ficheiro para output das coordenadas"
 
 #. OLSR will write received coordinates of other nodes to this file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:97
-msgid "olsrd_loadplugin_latlonfile_desc"
+msgid "OLSR will write received coordinates of other nodes to this file"
 msgstr ""
 "O OLSR irá escrever as coordenadas que receba de outros hosts neste ficheiro"
 
 #. Input file for coordinates
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:98
-msgid "olsrd_loadplugin_latloninfile"
+msgid "Input file for coordinates"
 msgstr "Ficheiro de entrada para coordenadas"
 
 #. OLSR periodically checks this file for new coordinates and propagates them
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:99
-msgid "olsrd_loadplugin_latloninfile_desc"
+msgid "OLSR periodically checks this file for new coordinates and propagates them"
 msgstr ""
 "O OLSR verifica periodicamente este ficheiro por novas coordenadas e "
 "propaga-as"
 
 #. Longitude
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:100
-msgid "olsrd_loadplugin_lon"
+msgid "Longitude"
 msgstr "Longitude"
 
 #. Hostnames
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:101
-msgid "olsrd_loadplugin_name"
+msgid "Hostnames"
 msgstr "Hostnames"
 
 #. Command for name changes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:102
-msgid "olsrd_loadplugin_namechangescript"
+msgid "Command for name changes"
 msgstr "Comando para alterações de nome"
 
 #. OLSR executes this command once entries in the \"hosts\" are changed
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:103
-msgid "olsrd_loadplugin_namechangescript_desc"
+msgid "OLSR executes this command once entries in the \"hosts\" are changed"
 msgstr ""
 "O OLSR executa este comando logo que existam alterações no ficheiro de hosts"
 
 #. Path to the \"resolv\" file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:104
-msgid "olsrd_loadplugin_resolvfile"
+msgid "Path to the \"resolv\" file"
 msgstr "Caminho para o ficheiro \"resolv.conf\""
 
 #. Command for service changes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:105
-msgid "olsrd_loadplugin_serviceschangescript"
+msgid "Command for service changes"
 msgstr "Comando para alterações ao serviço"
 
 #. OLSR excutes this command once new service announcements are received
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:106
-msgid "olsrd_loadplugin_serviceschangescript_desc"
+msgid "OLSR excutes this command once new service announcements are received"
 msgstr ""
 "O OLSR executa este comando sempre que sejam recebidos novos anuncios de "
 "serviços"
 
 #. PID file for SIGHUP signals
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:107
-msgid "olsrd_loadplugin_sighuppidfile"
+msgid "PID file for SIGHUP signals"
 msgstr "Ficheiro PID para sinais SIGHUP"
 
 #. OLSR sends a HUP signal to this PID once the \"hosts\" oder \"resolv\" file is changed
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:108
-msgid "olsrd_loadplugin_sighuppidfile_desc"
+msgid "OLSR sends a HUP signal to this PID once the \"hosts\" oder \"resolv\" file is changed"
 msgstr ""
 "O OLSR envia um sinal HUP a este PID sempre que o ficheiro \\\"hosts\\\" ou "
 "\\\"resolv.conf\\\" seja alterado"
 
 #. Domain suffix
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:109
-msgid "olsrd_loadplugin_suffix"
+msgid "Domain suffix"
 msgstr "Sufixo de domínio"
 
 #. Timeout
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:110
-msgid "olsrd_loadplugin_timeout"
+msgid "Timeout"
 msgstr "Timeout"
 
 #. Name of the BMF interface
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:111
-msgid "olsrd_loadplugin_bmfinterface"
+msgid "Name of the BMF interface"
 msgstr "Nome do interface BMF"
 
 #. IP address of the BMF interface
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:112
-msgid "olsrd_loadplugin_bmfinterfaceid"
+msgid "IP address of the BMF interface"
 msgstr "Endereço IP do interface BMF"
 
 #. Redirect local broadcasts
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:113
-msgid "olsrd_loadplugin_dolocalbroadcast"
+msgid "Redirect local broadcasts"
 msgstr "Redireccionar broadcasts locais"
 
 #. Also redirect broadcasts from OLSR interfaces
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:114
-msgid "olsrd_loadplugin_capturepacketsonolsrinterfaces"
+msgid "Also redirect broadcasts from OLSR interfaces"
 msgstr "Também redireccionar broadcasts de interfaces OLSR"
 
 #. Propagation mechanism
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:115
-msgid "olsrd_loadplugin_bmfmechanism"
+msgid "Propagation mechanism"
 msgstr "Mecanismo de propagação"
 
 #. Number of retransmissions per package
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:116
-msgid "olsrd_loadplugin_broadcastretransmitcount"
+msgid "Number of retransmissions per package"
 msgstr "Número de retransmissões por pacote"
 
 #. Minimum number of neighbours for broadcast redirection
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:117
-msgid "olsrd_loadplugin_fanoutlimit"
+msgid "Minimum number of neighbours for broadcast redirection"
 msgstr "Número mínimo de vizinhos para redireccionamento de broadcasts"
 
 #. Non-OLSR interfaces
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:118
-msgid "olsrd_loadplugin_nonolsrif"
+msgid "Non-OLSR interfaces"
 msgstr "Interfaces não-OLSR"
 
 #. Used port
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:119
-msgid "olsrd_loadplugin_port"
+msgid "Used port"
 msgstr "Porta utilizada"
 
 #. Allow connections from hosts
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:120
-msgid "olsrd_loadplugin_host"
+msgid "Allow connections from hosts"
 msgstr "Permitir ligações de hosts"
 
 #. Allow connections from subnets
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:121
-msgid "olsrd_loadplugin_net"
+msgid "Allow connections from subnets"
 msgstr "permitir ligações de subredes"
 
 #. Format: IP-AddresseNetmask
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:122
-msgid "olsrd_loadplugin_net_desc"
+msgid "Format: IP-AddresseNetmask"
 msgstr "Formato: \\\"Endereço IP\\\" \\\"Máscara de subrede\\\""
 
 #. Used protocols
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:123
-msgid "olsrd_loadplugin_redistribute"
+msgid "Used protocols"
 msgstr "Protocolos utilizados"
 
 #. Only export routes to Quagga or to kernel too
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:124
-msgid "olsrd_loadplugin_exportroutes"
+msgid "Only export routes to Quagga or to kernel too"
 msgstr "Exportar rotas apenas para quagga ou kernel"
 
 #. Always prefer local routes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:125
-msgid "olsrd_loadplugin_localpref"
+msgid "Always prefer local routes"
 msgstr "Preferir sempre as rotas locais"
 
 #. Distance of exported routes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:126
-msgid "olsrd_loadplugin_distance"
+msgid "Distance of exported routes"
 msgstr "Distância das rotas exportadas"
 
 #. Key file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:127
-msgid "olsrd_loadplugin_keyfile"
+msgid "Key file"
 msgstr "Ficheiro de chave"
 
 #. Watchdog timestamp file
diff --git a/po/pt/openvpn.po b/po/pt/openvpn.po
index f74446311..d17089093 100644
--- a/po/pt/openvpn.po
+++ b/po/pt/openvpn.po
@@ -13,949 +13,949 @@ msgstr ""
 
 #. OpenVPN
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:1
-msgid "openvpn"
+msgid "OpenVPN"
 msgstr "OpenVPN"
 
 #. Switch to basic configuration
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:3
-msgid "openvpn_switch_basic"
+msgid "« Switch to basic configuration"
 msgstr "Mudar para configuração básica"
 
 #. Switch to advanced configuration
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:4
-msgid "openvpn_switch_advanced"
+msgid "Switch to advanced configuration »"
 msgstr "Mudar para configuração avançada"
 
 #. Enabled
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:6
-msgid "openvpn_enable"
+msgid "Enabled"
 msgstr "Activado"
 
 #. Started
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:7
-msgid "openvpn_active"
+msgid "Started"
 msgstr "Iniciado"
 
 #. no
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:8
-msgid "openvpn_active_no"
+msgid "no"
 msgstr "não"
 
 #. yes (%i)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:9
-msgid "openvpn_active_yes"
+msgid "yes (%i)"
 msgstr "sim (%i)"
 
 #. Port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:10
-msgid "openvpn_port"
+msgid "Port"
 msgstr "Porta"
 
 #. Protocol
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:11
-msgid "openvpn_proto"
+msgid "Protocol"
 msgstr "Protocolo"
 
 #. Instance \"%s\"
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:13
-msgid "openvpn_instance"
+msgid "Instance \"%s\""
 msgstr "Instância \\\"%s\\\""
 
 #. OpenVPN instances
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:15
-msgid "openvpn_overview"
+msgid "OpenVPN instances"
 msgstr "Instâncias OpenVPN"
 
 #. Below is a list of configured OpenVPN instances and their current state
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:16
-msgid "openvpn_overview_desc"
+msgid "Below is a list of configured OpenVPN instances and their current state"
 msgstr ""
 "Abaixo está uma lista de todas as instâncias OpenVPN configuradas e o seu "
 "estado actual"
 
 #. Daemon configuration
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:18
-msgid "openvpn_service"
+msgid "Daemon configuration"
 msgstr "Configuração do processo"
 
 #. Networking options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:19
-msgid "openvpn_networking"
+msgid "Networking options"
 msgstr "Opções de rede"
 
 #. VPN options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:20
-msgid "openvpn_vpn"
+msgid "VPN options"
 msgstr "Opções de VPN"
 
 #. Cryptography settings
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:21
-msgid "openvpn_cryptography"
+msgid "Cryptography settings"
 msgstr "Definições criptográficas"
 
 #. Read configuration options from file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:23
-msgid "openvpn_param_config"
+msgid "Read configuration options from file"
 msgstr "Obter definições a partir de ficheiro"
 
 #. Local host name or ip address
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:24
-msgid "openvpn_param_local"
+msgid "Local host name or ip address"
 msgstr "Hostname ou endereço IP local"
 
 #. Remote host name or ip address
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:25
-msgid "openvpn_param_remote"
+msgid "Remote host name or ip address"
 msgstr "Hostname endereço IP remoto"
 
 #. Randomly choose remote server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:26
-msgid "openvpn_param_remote_random"
+msgid "Randomly choose remote server"
 msgstr "Escolher o server remoto aleatoriamente"
 
 #. Major mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:27
-msgid "openvpn_param_mode"
+msgid "Major mode"
 msgstr "Modo principal"
 
 #. Use protocol
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:28
-msgid "openvpn_param_proto"
+msgid "Use protocol"
 msgstr "Usar protocolo"
 
 #. Connection retry interval
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:29
-msgid "openvpn_param_connect_retry"
+msgid "Connection retry interval"
 msgstr "Intervalo de reestabelecimento de ligação"
 
 #. Connection timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:30
-msgid "openvpn_param_connect_timeout"
+msgid "Connection timeout"
 msgstr "Timeout da ligação"
 
 #. Maximum connection attempt retries
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:31
-msgid "openvpn_param_connect_retry_max"
+msgid "Maximum connection attempt retries"
 msgstr "Máximo de tentativas de estabelecimento de ligação"
 
 #. Try to sense proxy settings automatically
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:32
-msgid "openvpn_param_auto_proxy"
+msgid "Try to sense proxy settings automatically"
 msgstr "Descobrir proxy automaticamente"
 
 #. Connect to remote host
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:33
-msgid "openvpn_param_http_proxy"
+msgid "Connect to remote host"
 msgstr "Ligar a host remoto"
 
 #. Retry indefinitely on HTTP proxy errors
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:34
-msgid "openvpn_param_http_proxy_retry"
+msgid "Retry indefinitely on HTTP proxy errors"
 msgstr "Tentar infinitamente sempre que existam erros de proxy HTTP"
 
 #. Proxy timeout in seconds
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:35
-msgid "openvpn_param_http_proxy_timeout"
+msgid "Proxy timeout in seconds"
 msgstr "Timeout do proxy em segundos"
 
 #. Set extended HTTP proxy options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:36
-msgid "openvpn_param_http_proxy_option"
+msgid "Set extended HTTP proxy options"
 msgstr "Definir opções extra para o proxy HTTP"
 
 #. Connect through Socks5 proxy
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:37
-msgid "openvpn_param_socks_proxy"
+msgid "Connect through Socks5 proxy"
 msgstr "Ligar através de um proxy Socks5"
 
 #. Retry indefinitely on Socks proxy errors
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:38
-msgid "openvpn_param_socks_proxy_retry"
+msgid "Retry indefinitely on Socks proxy errors"
 msgstr "Tentar continuamente a ligação quando existirem erros de proxy Socks"
 
 #. If hostname resolve fails, retry
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:39
-msgid "openvpn_param_resolv_retry"
+msgid "If hostname resolve fails, retry"
 msgstr "Se a resolução de nomes falhar, tentar novamente"
 
 #. Allow remote to change its IP or port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:40
-msgid "openvpn_param_float"
+msgid "Allow remote to change its IP or port"
 msgstr "Permitir a um host remoto que altere o seu IP ou porta"
 
 #. Execute shell command on remote ip change
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:41
-msgid "openvpn_param_ipchange"
+msgid "Execute shell command on remote ip change"
 msgstr "Executar o comando shell quando existir alteração do IP remoto"
 
 #. TCP/UDP port # for both local and remote
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:42
-msgid "openvpn_param_port"
+msgid "TCP/UDP port # for both local and remote"
 msgstr "Porta TCP/UDP para local e remoto"
 
 #. TCP/UDP port # for local (default=1194)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:43
-msgid "openvpn_param_lport"
+msgid "TCP/UDP port # for local (default=1194)"
 msgstr "Porta TCP/UDP para local (predefinição=1194)"
 
 #. TCP/UDP port # for remote (default=1194)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:44
-msgid "openvpn_param_rport"
+msgid "TCP/UDP port # for remote (default=1194)"
 msgstr "Porta TCP/UDP para remoto (predefinição=1194)"
 
 #. Bind to local address and port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:45
-msgid "openvpn_param_bind"
+msgid "Bind to local address and port"
 msgstr "Activar no endereço e porta locais"
 
 #. Do not bind to local address and port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:46
-msgid "openvpn_param_nobind"
+msgid "Do not bind to local address and port"
 msgstr "Não activar no endereço e porta locais"
 
 #. tun/tap device
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:47
-msgid "openvpn_param_dev"
+msgid "tun/tap device"
 msgstr "Dispositivo tun/tap"
 
 #. Type of used device
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:48
-msgid "openvpn_param_dev_type"
+msgid "Type of used device"
 msgstr "Tipo de dispositivo utilizado"
 
 #. Use tun/tap device node
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:49
-msgid "openvpn_param_dev_node"
+msgid "Use tun/tap device node"
 msgstr "Utilizar dispositivo tun/tap"
 
 #. Set the link layer address of the tap device
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:50
-msgid "openvpn_param_lladdr"
+msgid "Set the link layer address of the tap device"
 msgstr "Definir o endereço de link do dispositivo tap"
 
 #. 'net30', 'p2p', or 'subnet'
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:51
-msgid "openvpn_param_topology"
+msgid "'net30', 'p2p', or 'subnet'"
 msgstr "'net30', 'p2p', ou 'subnet'"
 
 #. Make tun device IPv6 capable
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:52
-msgid "openvpn_param_tun_ipv6"
+msgid "Make tun device IPv6 capable"
 msgstr "Tornar o dispositivo tun capaz de IPv6"
 
 #. Configure device to use IP address
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:53
-msgid "openvpn_param_ifconfig"
+msgid "Configure device to use IP address"
 msgstr "Configurar o dispositivo para usar endereço IP"
 
 #. Don't actually execute ifconfig
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:54
-msgid "openvpn_param_ifconfig_noexec"
+msgid "Don't actually execute ifconfig"
 msgstr "Não executar ifconfig"
 
 #. Don't warn on ifconfig inconsistencies
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:55
-msgid "openvpn_param_ifconfig_nowarn"
+msgid "Don't warn on ifconfig inconsistencies"
 msgstr "Não avisar quando existirem inconsistencias no ifconfig"
 
 #. Add route after establishing connection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:56
-msgid "openvpn_param_route"
+msgid "Add route after establishing connection"
 msgstr "Adicionar rota após estabelecimento da ligação"
 
 #. Specify a default gateway for routes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:57
-msgid "openvpn_param_route_gateway"
+msgid "Specify a default gateway for routes"
 msgstr "Especificar uma gateway para as rotas"
 
 #. Specify a default metric for routes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:58
-msgid "openvpn_param_route_metric"
+msgid "Specify a default metric for routes"
 msgstr "Especificar uma métrica para as rotas"
 
 #. Delay n seconds after connection 
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:59
-msgid "openvpn_param_route_delay"
+msgid "Delay n seconds after connection "
 msgstr "Aguardar n segundos após a ligação"
 
 #. Execute shell cmd after routes are added
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:60
-msgid "openvpn_param_route_up"
+msgid "Execute shell cmd after routes are added"
 msgstr "Executar o comando shell após as rotas serem adicionadas"
 
 #. Don't add routes automatically
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:61
-msgid "openvpn_param_route_noexec"
+msgid "Don't add routes automatically"
 msgstr "Não adicionar rotas automaticamente"
 
 #. Don't pull options from server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:62
-msgid "openvpn_param_route_nopull"
+msgid "Don't pull options from server"
 msgstr "Não obter opções do servidor"
 
 #. Automatically redirect default route
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:63
-msgid "openvpn_param_redirect_gateway"
+msgid "Automatically redirect default route"
 msgstr "Redireccionar automaticamente a rota pre-definida"
 
 #. Pass environment variables to script
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:64
-msgid "openvpn_param_setenv"
+msgid "Pass environment variables to script"
 msgstr "Passar variaveis de ambiente ao script"
 
 #. Shaping for peer bandwidth
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:65
-msgid "openvpn_param_shaper"
+msgid "Shaping for peer bandwidth"
 msgstr "Restringir a largura de banda ao remoto"
 
 #. Set timeouts in server mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:66
-msgid "openvpn_param_keepalive"
+msgid "Set timeouts in server mode"
 msgstr "Definir timeouts em modo de servidor"
 
 #. tun/tap inactivity timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:67
-msgid "openvpn_param_inactive"
+msgid "tun/tap inactivity timeout"
 msgstr "Timeout de inactividade tun/tap"
 
 #. Remote ping timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:68
-msgid "openvpn_param_ping_exit"
+msgid "Remote ping timeout"
 msgstr "Timeout do ping remoto"
 
 #. Restart after remote ping timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:69
-msgid "openvpn_param_ping_restart"
+msgid "Restart after remote ping timeout"
 msgstr "Reiniciar após timeout do ping remoto"
 
 #. Only process ping timeouts if routes exist
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:70
-msgid "openvpn_param_ping_timer_rem"
+msgid "Only process ping timeouts if routes exist"
 msgstr "Só processar timeouts de pings se existirem rotas"
 
 #. Ping remote every n seconds over TCP/UDP port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:71
-msgid "openvpn_param_ping"
+msgid "Ping remote every n seconds over TCP/UDP port"
 msgstr "Pingar o remoto a cada n segundos sobre a porta TCP/UDP"
 
 #. Configure a multi-homed UDP server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:72
-msgid "openvpn_param_multihome"
+msgid "Configure a multi-homed UDP server"
 msgstr "Configurar um servidor UDP com vários endereços no interface"
 
 #. Optimize TUN/TAP/UDP writes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:73
-msgid "openvpn_param_fast_io"
+msgid "Optimize TUN/TAP/UDP writes"
 msgstr "Optimizar as escritas TUN/TAP/UDP"
 
 #. Remap SIGUSR1 signals
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:74
-msgid "openvpn_param_remap_usr1"
+msgid "Remap SIGUSR1 signals"
 msgstr "Mapear os sinais SIGUSR1"
 
 #. Keep tun/tap device open on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:75
-msgid "openvpn_param_persist_tun"
+msgid "Keep tun/tap device open on restart"
 msgstr "Manter o dispositivo tun/tap aberto entre reinicios"
 
 #. Keep remote IP address on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:76
-msgid "openvpn_param_persist_remote_ip"
+msgid "Keep remote IP address on restart"
 msgstr "Manter o endereço IP remoto entre reinicios"
 
 #. Keep local IP address on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:77
-msgid "openvpn_param_persist_local_ip"
+msgid "Keep local IP address on restart"
 msgstr "Manter o endereço IP local entre reinicios"
 
 #. Don't re-read key on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:78
-msgid "openvpn_param_persist_key"
+msgid "Don't re-read key on restart"
 msgstr "Não reler a chave entre reinicios"
 
 #. TOS passthrough (applies to IPv4 only)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:79
-msgid "openvpn_param_passtos"
+msgid "TOS passthrough (applies to IPv4 only)"
 msgstr "Passthrough TOS (aplicavel apenas a IPv4)"
 
 #. Set tun/tap device MTU
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:80
-msgid "openvpn_param_tun_mtu"
+msgid "Set tun/tap device MTU"
 msgstr "Definir o MTU do dispositivo tun/tap"
 
 #. Set tun/tap device overhead
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:81
-msgid "openvpn_param_tun_mtu_extra"
+msgid "Set tun/tap device overhead"
 msgstr "Definir o overhead do dispositivo tun/tap"
 
 #. Set TCP/UDP MTU
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:82
-msgid "openvpn_param_link_mtu"
+msgid "Set TCP/UDP MTU"
 msgstr "Definir o MTU TCP/UDP"
 
 #. Enable Path MTU discovery
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:83
-msgid "openvpn_param_mtu_disc"
+msgid "Enable Path MTU discovery"
 msgstr "Activar a descoberta do MTU do caminho"
 
 #. Empirically measure MTU
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:84
-msgid "openvpn_param_mtu_test"
+msgid "Empirically measure MTU"
 msgstr "Medição empírica de MTU"
 
 #. Enable internal datagram fragmentation
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:85
-msgid "openvpn_param_fragment"
+msgid "Enable internal datagram fragmentation"
 msgstr "Activar a fragmentação interna de datagramas"
 
 #. Set upper bound on TCP MSS
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:86
-msgid "openvpn_param_mssfix"
+msgid "Set upper bound on TCP MSS"
 msgstr "Definir tecto do MSS TCP"
 
 #. Set the TCP/UDP send buffer size
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:87
-msgid "openvpn_param_sndbuf"
+msgid "Set the TCP/UDP send buffer size"
 msgstr "Definir o buffer de envio TCP/UDP"
 
 #. Set the TCP/UDP receive buffer size
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:88
-msgid "openvpn_param_rcvbuf"
+msgid "Set the TCP/UDP receive buffer size"
 msgstr "Definir o buffer de recepção TCP/UDP"
 
 #. Set tun/tap TX queue length
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:89
-msgid "openvpn_param_txqueuelen"
+msgid "Set tun/tap TX queue length"
 msgstr "Definir o tamanho da queue de transmissão tun/tap"
 
 #. Disable Paging
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:90
-msgid "openvpn_param_mlock"
+msgid "Disable Paging"
 msgstr "Desactivar Paging"
 
 #. Shell cmd to execute after tun device open
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:91
-msgid "openvpn_param_up"
+msgid "Shell cmd to execute after tun device open"
 msgstr "Comando shell a executar após abertura do dispositivo tun"
 
 #. Delay tun/tap open and up script execution
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:92
-msgid "openvpn_param_up_delay"
+msgid "Delay tun/tap open and up script execution"
 msgstr "Retardar o script de abertura/activação tun/tap"
 
 #. Shell cmd to run after tun device close
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:93
-msgid "openvpn_param_down"
+msgid "Shell cmd to run after tun device close"
 msgstr "Comando shell a executar após fecho do dispositivo tun"
 
 #. Call down cmd/script before TUN/TAP close
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:94
-msgid "openvpn_param_down_pre"
+msgid "Call down cmd/script before TUN/TAP close"
 msgstr "Executar o comando/script antes do fecho tun/tap"
 
 #. Run up/down scripts for all restarts
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:95
-msgid "openvpn_param_up_restart"
+msgid "Run up/down scripts for all restarts"
 msgstr "Executar scripts de abertura/activação para todos os reinicios"
 
 #. Set UID to user
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:96
-msgid "openvpn_param_user"
+msgid "Set UID to user"
 msgstr "Assumir UID para o utilizador"
 
 #. Set GID to group
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:97
-msgid "openvpn_param_group"
+msgid "Set GID to group"
 msgstr "Assumir GID para o grupo"
 
 #. Chroot to directory after initialization
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:98
-msgid "openvpn_param_chroot"
+msgid "Chroot to directory after initialization"
 msgstr "Chroot para o directorio apos a inicialização"
 
 #. Change to directory before initialization
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:99
-msgid "openvpn_param_cd"
+msgid "Change to directory before initialization"
 msgstr "Mudar para o directório antes da inicialização"
 
 #. Daemonize after initialization
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:100
-msgid "openvpn_param_daemon"
+msgid "Daemonize after initialization"
 msgstr "Passar a daemon após a inicialização"
 
 #. Output to syslog and do not daemonize
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:101
-msgid "openvpn_param_syslog"
+msgid "Output to syslog and do not daemonize"
 msgstr "Registos para o syslog e não passar a daemon"
 
 #. Run as an inetd or xinetd server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:102
-msgid "openvpn_param_inetd"
+msgid "Run as an inetd or xinetd server"
 msgstr "Executar via inetd ou xinetd"
 
 #. Write log to file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:103
-msgid "openvpn_param_log"
+msgid "Write log to file"
 msgstr "Escrever registo para o ficheiro"
 
 #. Append log to file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:104
-msgid "openvpn_param_log_append"
+msgid "Append log to file"
 msgstr "Acrescentar registos ao ficheiro"
 
 #. Don't log timestamps
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:105
-msgid "openvpn_param_suppress_timestamps"
+msgid "Don't log timestamps"
 msgstr "Não registar timestamps"
 
 #. Write process ID to file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:106
-msgid "openvpn_param_writepid"
+msgid "Write process ID to file"
 msgstr "Escrever PID no ficheiro"
 
 #. Change process priority
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:107
-msgid "openvpn_param_nice"
+msgid "Change process priority"
 msgstr "Alterar prioridade do processo"
 
 #. Echo parameters to log
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:108
-msgid "openvpn_param_echo"
+msgid "Echo parameters to log"
 msgstr "Escrever parametros no registo"
 
 #. Set output verbosity
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:109
-msgid "openvpn_param_verb"
+msgid "Set output verbosity"
 msgstr "Definir verbosidade do registo"
 
 #. Limit repeated log messages
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:110
-msgid "openvpn_param_mute"
+msgid "Limit repeated log messages"
 msgstr "Limitar repetição de entradas no registo"
 
 #. Write status to file every n seconds
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:111
-msgid "openvpn_param_status"
+msgid "Write status to file every n seconds"
 msgstr "Escrever estado para ficheiro a cada n segundos"
 
 #. Status file format version
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:112
-msgid "openvpn_param_status_version"
+msgid "Status file format version"
 msgstr "Versão de formato do ficheiro de estado"
 
 #. Disable options consistency check
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:113
-msgid "openvpn_param_disable_occ"
+msgid "Disable options consistency check"
 msgstr "Desactivar opções de verificação de consistência"
 
 #. Special stress testing mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:114
-msgid "openvpn_param_gremlin"
+msgid "Special stress testing mode"
 msgstr "Modo especial de teste de stress"
 
 #. Use fast LZO compression
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:115
-msgid "openvpn_param_comp_lzo"
+msgid "Use fast LZO compression"
 msgstr "Usar compressão LZO rápida"
 
 #. Don't use adaptive lzo compression
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:116
-msgid "openvpn_param_comp_noadapt"
+msgid "Don't use adaptive lzo compression"
 msgstr "Não usar compressão LZO adaptiva"
 
 #. Enable management interface on <em>IP</em> <em>port</em>
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:117
-msgid "openvpn_param_management"
+msgid "Enable management interface on <em>IP</em> <em>port</em>"
 msgstr "Activar o interface de gestão em <em>IP</em> <em>porta</em>"
 
 #. Management interface will connect as a TCP client
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:118
-msgid "openvpn_param_management_client"
+msgid "Management interface will connect as a TCP client"
 msgstr "O interface de gestão ligará como um cliente TCP"
 
 #. Query management channel for private key
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:119
-msgid "openvpn_param_management_query_passwords"
+msgid "Query management channel for private key"
 msgstr "Solicitar chave privada ao canal de gestão"
 
 #. Start OpenVPN in a hibernating state
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:120
-msgid "openvpn_param_management_hold"
+msgid "Start OpenVPN in a hibernating state"
 msgstr "Iniciar o OpenVPN em estado de hibernação"
 
 #. Issue SIGUSR1 on management disconnect
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:121
-msgid "openvpn_param_management_signal"
+msgid "Issue SIGUSR1 on management disconnect"
 msgstr "Enviar um SIGUSR1 no fim de uma ligação de gestão"
 
 #. Forget passwords on management disconnect
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:122
-msgid "openvpn_param_management_forget_disconnect"
+msgid "Forget passwords on management disconnect"
 msgstr "Esquecer passwords no fim de uma ligação de gestão"
 
 #. Number of lines for log file history
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:123
-msgid "openvpn_param_management_log_cache"
+msgid "Number of lines for log file history"
 msgstr "Numero de linhas para o historico do registo"
 
 #. Load plug-in module
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:124
-msgid "openvpn_param_plugin"
+msgid "Load plug-in module"
 msgstr "Carregar plugin"
 
 #. Configure server mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:125
-msgid "openvpn_param_server"
+msgid "Configure server mode"
 msgstr "Configurar modo de servidor"
 
 #. Configure server bridge
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:126
-msgid "openvpn_param_server_bridge"
+msgid "Configure server bridge"
 msgstr "Configurar ponte de servidor"
 
 #. Push options to peer
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:127
-msgid "openvpn_param_push"
+msgid "Push options to peer"
 msgstr "Enviar opções ao remoto"
 
 #. Don't inherit global push options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:128
-msgid "openvpn_param_push_reset"
+msgid "Don't inherit global push options"
 msgstr "Não herdar as opções globais de envio (push)"
 
 #. Set aside a pool of subnets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:129
-msgid "openvpn_param_ifconfig_pool"
+msgid "Set aside a pool of subnets"
 msgstr "Reservar um conjunto de subredes"
 
 #. Use individual addresses rather than /30 subnets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:130
-msgid "openvpn_param_ifconfig_pool_linear"
+msgid "Use individual addresses rather than /30 subnets"
 msgstr "Usar endereços individuais em vez de subredes /30"
 
 #. Persist/unpersist ifconfig-pool
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:131
-msgid "openvpn_param_ifconfig_pool_persist"
+msgid "Persist/unpersist ifconfig-pool"
 msgstr "Manter ou não o conjunto de subredes"
 
 #. Push an ifconfig option to remote
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:132
-msgid "openvpn_param_ifconfig_push"
+msgid "Push an ifconfig option to remote"
 msgstr "Enviar uma opção ifconfig ao remoto"
 
 #. Route subnet to client
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:133
-msgid "openvpn_param_iroute"
+msgid "Route subnet to client"
 msgstr "Encaminhar rota da subrede para o cliente"
 
 #. Client is disabled
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:134
-msgid "openvpn_param_disable"
+msgid "Client is disabled"
 msgstr "Cliente desactivado"
 
 #. Don't require client certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:135
-msgid "openvpn_param_client_cert_not_required"
+msgid "Don't require client certificate"
 msgstr "Não solicitar certificado ao cliente"
 
 #. Use username as common name
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:136
-msgid "openvpn_param_username_as_common_name"
+msgid "Use username as common name"
 msgstr "Usar o username como nome comum"
 
 #. Script to verify interactive authentication
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:137
-msgid "openvpn_param_auth_user_pass_verify"
+msgid "Script to verify interactive authentication"
 msgstr "Script para verificar a autenticação interactiva"
 
 #. Allow client-to-client traffic
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:138
-msgid "openvpn_param_client_to_client"
+msgid "Allow client-to-client traffic"
 msgstr "Permitir tráfego cliente-a-cliente"
 
 #. Allow multiple clients with same certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:139
-msgid "openvpn_param_duplicate_cn"
+msgid "Allow multiple clients with same certificate"
 msgstr "Permitir multiplos clientes com o mesmo certificado"
 
 #. Run script cmd on client connection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:140
-msgid "openvpn_param_client_connect"
+msgid "Run script cmd on client connection"
 msgstr "Executar script quando o cliente ligar"
 
 #. Run script cmd on client disconnection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:141
-msgid "openvpn_param_client_disconnect"
+msgid "Run script cmd on client disconnection"
 msgstr "Executar script quando o cliente desligar"
 
 #. Directory for custom client config files
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:142
-msgid "openvpn_param_client_config_dir"
+msgid "Directory for custom client config files"
 msgstr "Directório para configurações personalizadas dos clientes"
 
 #. Refuse connection if no custom client config
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:143
-msgid "openvpn_param_ccd_exclusive"
+msgid "Refuse connection if no custom client config"
 msgstr "Recusar ligações de clientes que não tenham configurações "
 
 #. Temporary directory for client-connect return file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:144
-msgid "openvpn_param_tmp_dir"
+msgid "Temporary directory for client-connect return file"
 msgstr "Directório temporário para ficheiro de retorno de ligação-cliente"
 
 #. Set size of real and virtual address hash tables
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:145
-msgid "openvpn_param_hash_size"
+msgid "Set size of real and virtual address hash tables"
 msgstr "Definir tamanho das tabelas hash de endereços reais e virtuais"
 
 #. Number of allocated broadcast buffers
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:146
-msgid "openvpn_param_bcast_buffers"
+msgid "Number of allocated broadcast buffers"
 msgstr "Numero de buffers de broadcast alocados"
 
 #. Maximum number of queued TCP output packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:147
-msgid "openvpn_param_tcp_queue_limit"
+msgid "Maximum number of queued TCP output packets"
 msgstr "Maximo de pacotes TCP na queue de output"
 
 #. Script to validate client virtual addresses
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:148
-msgid "openvpn_param_learn_address"
+msgid "Script to validate client virtual addresses"
 msgstr "Script de validação de endereços virtuais de clientes"
 
 #. Allowed maximum of new connections
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:149
-msgid "openvpn_param_connect_freq"
+msgid "Allowed maximum of new connections"
 msgstr "Maximo permitido de novas ligações"
 
 #. Allowed maximum of connected clients
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:150
-msgid "openvpn_param_max_clients"
+msgid "Allowed maximum of connected clients"
 msgstr "Máximo permitido de clientes ligados"
 
 #. Allowed maximum of internal
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:151
-msgid "openvpn_param_max_routes_per_client"
+msgid "Allowed maximum of internal"
 msgstr "Máximo permitido internamente para rotas de clientes"
 
 #. Proxy incoming HTTPS sessions
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:152
-msgid "openvpn_param_port_share"
+msgid "Proxy incoming HTTPS sessions"
 msgstr "Sessões recebidas HTTPS por proxy "
 
 #. Configure client mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:153
-msgid "openvpn_param_client"
+msgid "Configure client mode"
 msgstr "Configurar modo cliente"
 
 #. Authenticate using username/password
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:154
-msgid "openvpn_param_auth_user_pass"
+msgid "Authenticate using username/password"
 msgstr "Autenticar com username/password"
 
 #. Accept options pushed from server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:155
-msgid "openvpn_param_pull"
+msgid "Accept options pushed from server"
 msgstr "Aceitar opções enviadas pelo servidor"
 
 #. Handling of authentication failures
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:156
-msgid "openvpn_param_auth_retry"
+msgid "Handling of authentication failures"
 msgstr "Gestão de falhas de autenticação"
 
 #. Send notification to peer on disconnect
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:157
-msgid "openvpn_param_explicit_exit_notify"
+msgid "Send notification to peer on disconnect"
 msgstr "Notificar remoto ao desligar"
 
 #. Enable Static Key encryption mode (non-TLS)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:158
-msgid "openvpn_param_secret"
+msgid "Enable Static Key encryption mode (non-TLS)"
 msgstr "Activar modo de encriptação por chave estática (não-TLS)"
 
 #. HMAC authentication for packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:159
-msgid "openvpn_param_auth"
+msgid "HMAC authentication for packets"
 msgstr "Autenticação HMAC para pacotes"
 
 #. Encryption cipher for packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:160
-msgid "openvpn_param_cipher"
+msgid "Encryption cipher for packets"
 msgstr "Cifra de encriptação para pacotes"
 
 #. Size of cipher key
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:161
-msgid "openvpn_param_keysize"
+msgid "Size of cipher key"
 msgstr "Tamanho da chave de cifra"
 
 #. Enable OpenSSL hardware crypto engines
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:162
-msgid "openvpn_param_engine"
+msgid "Enable OpenSSL hardware crypto engines"
 msgstr "Activar motor OpenSSL por hardware"
 
 #. Disable replay protection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:163
-msgid "openvpn_param_no_replay"
+msgid "Disable replay protection"
 msgstr "Desactivar protecção contra replay"
 
 #. Silence the output of replay warnings
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:164
-msgid "openvpn_param_mute_replay_warnings"
+msgid "Silence the output of replay warnings"
 msgstr "Silenciar o output dos avisos de replay"
 
 #. Replay protection sliding window size
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:165
-msgid "openvpn_param_replay_window"
+msgid "Replay protection sliding window size"
 msgstr "Tamanho da janela de protecção conta replay"
 
 #. Disable cipher initialisation vector
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:166
-msgid "openvpn_param_no_iv"
+msgid "Disable cipher initialisation vector"
 msgstr "Desactivar o vector de inicialização da cifra"
 
 #. Persist replay-protection state
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:167
-msgid "openvpn_param_replay_persist"
+msgid "Persist replay-protection state"
 msgstr "Manter persistência da protecção replay"
 
 #. Run a self-test of crypto features
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:168
-msgid "openvpn_param_test_crypto"
+msgid "Run a self-test of crypto features"
 msgstr "Executar um auto-teste das funcionalidades criptograficas"
 
 #. Enable TLS and assume server role
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:169
-msgid "openvpn_param_tls_server"
+msgid "Enable TLS and assume server role"
 msgstr "Activar TLS e assumir papel de servidor"
 
 #. Enable TLS and assume client role
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:170
-msgid "openvpn_param_tls_client"
+msgid "Enable TLS and assume client role"
 msgstr "Activar TLS e assumir papel de cliente"
 
 #. Data channel key exchange method
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:171
-msgid "openvpn_param_key_method"
+msgid "Data channel key exchange method"
 msgstr "Método de troca de chave do canal"
 
 #. Certificate authority
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:172
-msgid "openvpn_param_ca"
+msgid "Certificate authority"
 msgstr "Autoridade certificadora"
 
 #. Directory of trusted certificates (CAs and CRLs)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:173
-msgid "openvpn_param_capath"
+msgid "Directory of trusted certificates (CAs and CRLs)"
 msgstr "Directorio de certificados fidedignos (CAs e CRLs)"
 
 #. Diffie Hellman parameters
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:174
-msgid "openvpn_param_dh"
+msgid "Diffie Hellman parameters"
 msgstr "Parametros Diffie-Hellman"
 
 #. Local certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:175
-msgid "openvpn_param_cert"
+msgid "Local certificate"
 msgstr "Certificado local"
 
 #. Local private key
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:176
-msgid "openvpn_param_key"
+msgid "Local private key"
 msgstr "Chave privada local"
 
 #. PKCS#12 file containing keys
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:177
-msgid "openvpn_param_pkcs12"
+msgid "PKCS#12 file containing keys"
 msgstr "Ficheiro PKCS#12 com chaves"
 
 #. TLS cipher
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:178
-msgid "openvpn_param_tls_cipher"
+msgid "TLS cipher"
 msgstr "Cifra TLS"
 
 #. Retransmit timeout on TLS control channel
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:179
-msgid "openvpn_param_tls_timeout"
+msgid "Retransmit timeout on TLS control channel"
 msgstr "Timeout de retransmissão no canal de controlo TLS"
 
 #. Renegotiate data chan. key after bytes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:180
-msgid "openvpn_param_reneg_bytes"
+msgid "Renegotiate data chan. key after bytes"
 msgstr "Renegociar chave do canal de dados após n bytes "
 
 #. Renegotiate data chan. key after packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:181
-msgid "openvpn_param_reneg_pkts"
+msgid "Renegotiate data chan. key after packets"
 msgstr "Renegociar chave do canal de dados após n pacotes"
 
 #. Renegotiate data chan. key after seconds
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:182
-msgid "openvpn_param_reneg_sec"
+msgid "Renegotiate data chan. key after seconds"
 msgstr "Renegociar chave do canal de dados após n segundos"
 
 #. Timeframe for key exchange
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:183
-msgid "openvpn_param_hand_window"
+msgid "Timeframe for key exchange"
 msgstr "Janela temporal para troca de chaves"
 
 #. Key transition window
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:184
-msgid "openvpn_param_tran_window"
+msgid "Key transition window"
 msgstr "Janela para transição de chaves"
 
 #. Allow only one session
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:185
-msgid "openvpn_param_single_session"
+msgid "Allow only one session"
 msgstr "Permitir apenas uma sessão"
 
 #. Exit on TLS negotiation failure
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:186
-msgid "openvpn_param_tls_exit"
+msgid "Exit on TLS negotiation failure"
 msgstr "Fechar quando existir falha na negociacao TLS"
 
 #. Additional authentication over TLS
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:187
-msgid "openvpn_param_tls_auth"
+msgid "Additional authentication over TLS"
 msgstr "Autenticação adicional por TLS"
 
 #. Get PEM password from controlling tty before we daemonize
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:188
-msgid "openvpn_param_askpass"
+msgid "Get PEM password from controlling tty before we daemonize"
 msgstr "Obter password PEM do terminal de controlo antes de passar a daemon"
 
 #. Don't cache --askpass or --auth-user-pass passwords
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:189
-msgid "openvpn_param_auth_nocache"
+msgid "Don't cache --askpass or --auth-user-pass passwords"
 msgstr "Não colocar em cache as passwords --askpass ou --auth-user-pass "
 
 #. Check peer certificate against a CRL
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:190
-msgid "openvpn_param_crl_verify"
+msgid "Check peer certificate against a CRL"
 msgstr "Verificar certificado do remoto conta uma CRL"
 
 #. Shell command to verify X509 name
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:191
-msgid "openvpn_param_tls_verify"
+msgid "Shell command to verify X509 name"
 msgstr "Comando shell para verificar o nome X509"
 
 #. Only accept connections from given X509 name
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:192
-msgid "openvpn_param_tls_remote"
+msgid "Only accept connections from given X509 name"
 msgstr "Aceitar ligações apenas de um dado nome X509"
 
 #. Require explicit designation on certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:193
-msgid "openvpn_param_ns_cert_type"
+msgid "Require explicit designation on certificate"
 msgstr "Requerer designação específica no certificado"
 
 #. Require explicit key usage on certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:194
-msgid "openvpn_param_remote_cert_ku"
+msgid "Require explicit key usage on certificate"
 msgstr "Requerer utilização explicita de utilização de chave no certificado"
 
 #. Require extended explicit key usage on certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:195
-msgid "openvpn_param_remote_cert_eku"
+msgid "Require extended explicit key usage on certificate"
 msgstr ""
 "Requerer utilização explicita extendida de utilização de chave no "
 "certificado"
diff --git a/po/pt/p910nd.po b/po/pt/p910nd.po
index 958888329..f37775e8e 100644
--- a/po/pt/p910nd.po
+++ b/po/pt/p910nd.po
@@ -14,19 +14,19 @@ msgstr ""
 
 #. p910nd - Printer server
 #: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:1
-msgid "p910nd"
+msgid "p910nd - Printer server"
 msgstr "P910nd - Servidor de impressão"
 
 #. First you have to install the packages to get support for USB (kmod-usb-printer) or parallel port (kmod-lp).
 #: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:2
-msgid "p910nd_desc"
+msgid "First you have to install the packages to get support for USB (kmod-usb-printer) or parallel port (kmod-lp)."
 msgstr ""
 "Primeiro você deve instalar os pacotes para obter suporte USB (kmod-usb-"
 "printer) ou porta paralela (kmod-lp)."
 
 #. Bidirectional mode
 #: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:3
-msgid "bidirectional"
+msgid "Bidirectional mode"
 msgstr "Modo bidirecional"
 
 #. p910nd listens on port 910+N. E.g. 9100 for the first printer.
diff --git a/po/pt/polipo.po b/po/pt/polipo.po
index 4a04065c9..08f520e34 100644
--- a/po/pt/polipo.po
+++ b/po/pt/polipo.po
@@ -13,27 +13,27 @@ msgstr ""
 
 #. Polipo
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:1
-msgid "polipo"
+msgid "Polipo"
 msgstr "Polipo"
 
 #. On-Disk Cache
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:2
-msgid "polipo_cache"
+msgid "On-Disk Cache"
 msgstr "Cache em disco"
 
 #. Shared cache
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:3
-msgid "polipo_cache_cacheisshared"
+msgid "Shared cache"
 msgstr "Cache partilhada"
 
 #. Enable if cache (proxy) is shared by multiple users.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:4
-msgid "polipo_cache_cacheisshared_desc"
+msgid "Enable if cache (proxy) is shared by multiple users."
 msgstr "Activar se a cache (proxy) for partilhada por multiplos utilizadores."
 
 #. To enable polipo on-disk cache cleaning (highly recommended), you should add a cron job in Scheduled Tasks services that will execute /usr/sbin/polipo_purge script. For example to perform disk cache cleanup every day at 6:00 in the morning you should add the following line in Scheduled Tasks &quot;0 6 * * *	/usr/sbin/polipo_purge&quot; (without quotes).
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:5
-msgid "polipo_cache_desc"
+msgid "To enable polipo on-disk cache cleaning (highly recommended), you should add a cron job in Scheduled Tasks services that will execute /usr/sbin/polipo_purge script. For example to perform disk cache cleanup every day at 6:00 in the morning you should add the following line in Scheduled Tasks \"0 6 * * *\\t/usr/sbin/polipo_purge\" (without quotes)."
 msgstr ""
 "Para activar a limpeza de cache em disco (altamente recomendado), deve "
 "acrescentar uma tarefa cron (\"Serviços\") que execute o script "
@@ -43,12 +43,12 @@ msgstr ""
 
 #. Disk cache location
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:6
-msgid "polipo_cache_diskcacheroot"
+msgid "Disk cache location"
 msgstr "Localização da cache em disco"
 
 #. Location where polipo will cache files permanently. Use of external storage devices is recommended, because the cache can grow considerably. Leave it empty to disable on-disk cache.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:7
-msgid "polipo_cache_diskcacheroot_desc"
+msgid "Location where polipo will cache files permanently. Use of external storage devices is recommended, because the cache can grow considerably. Leave it empty to disable on-disk cache."
 msgstr ""
 "Local onde o polipo guardará permanentemente os ficheiros de cache. É "
 "recomendada a utilização de dispositivos de armazenamento remoto devido ao "
@@ -57,58 +57,58 @@ msgstr ""
 
 #. Truncate cache files size (in bytes)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:8
-msgid "polipo_cache_diskcachetruncatesize"
+msgid "Truncate cache files size (in bytes)"
 msgstr "Tamanho de trancagem dos ficheiros de cache (bytes)"
 
 #. Size to which cached files should be truncated. (default value: 1048576)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:9
-msgid "polipo_cache_diskcachetruncatesize_desc"
+msgid "Size to which cached files should be truncated. (default value: 1048576)"
 msgstr ""
 "Tamanho com o qual devem ser trancados os ficheiros da cache. (valor pre-"
 "definido: 1048576)"
 
 #. Truncate cache files time
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:10
-msgid "polipo_cache_diskcachetruncatetime"
+msgid "Truncate cache files time"
 msgstr "Tempo de trancagem dos ficheiros de cache"
 
 #. Time after which cached files will be truncated. (default value: 4d12h)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:11
-msgid "polipo_cache_diskcachetruncatetime_desc"
+msgid "Time after which cached files will be truncated. (default value: 4d12h)"
 msgstr ""
 "Tempo após o qual os ficheiros de cache serão trancados. (valor pre-"
 "definido: 4d12h)"
 
 #. Delete cache files time
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:12
-msgid "polipo_cache_diskcacheunlinktime"
+msgid "Delete cache files time"
 msgstr "Tempo para remoção dos ficheiros de cache"
 
 #. Time after which cached files will be deleted. (default value: 32d)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:13
-msgid "polipo_cache_diskcacheunlinktime_desc"
+msgid "Time after which cached files will be deleted. (default value: 32d)"
 msgstr ""
 "Tempo apos o qual os ficheiros de cache serão removidos. (valor "
 "pré-definido: 32d)"
 
 #. Polipo is a small and fast caching web proxy.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:14
-msgid "polipo_desc"
+msgid "Polipo is a small and fast caching web proxy."
 msgstr "O polipo é um proxy web ligeiro e rápido."
 
 #. General
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:15
-msgid "polipo_general"
+msgid "General"
 msgstr "Geral"
 
 #. Allowed clients
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:16
-msgid "polipo_general_allowedclients"
+msgid "Allowed clients"
 msgstr "Clientes permitidos"
 
 #. When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients that are allowed to connect. The format is IP address or network address (192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6)).
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:17
-msgid "polipo_general_allowedclients_desc"
+msgid "When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients that are allowed to connect. The format is IP address or network address (192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))."
 msgstr ""
 "Quando o endereço de listen fôr 0.0.0.0 (IPv4) ou :: (IPv6), deve listar os "
 "clientes que tiverem permissão para ligação. O formato é endereço de host ou "
@@ -116,46 +116,46 @@ msgstr ""
 
 #. In RAM cache size (in bytes)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:18
-msgid "polipo_general_chunkhighmark"
+msgid "In RAM cache size (in bytes)"
 msgstr "Tamanho da cache em RAM (bytes)"
 
 #. How much RAM should Polipo use for its cache.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:19
-msgid "polipo_general_chunkhighmark_desc"
+msgid "How much RAM should Polipo use for its cache."
 msgstr "Quanta memória RAM deverá ser usada pelo polipo para a sua cache."
 
 #. DNS server address
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:20
-msgid "polipo_general_dnsnameserver"
+msgid "DNS server address"
 msgstr "Endereço do servidor DNS"
 
 #. Set the DNS server address to use, if you want Polipo to use different DNS server than the host system.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:21
-msgid "polipo_general_dnsnameserver_desc"
+msgid "Set the DNS server address to use, if you want Polipo to use different DNS server than the host system."
 msgstr ""
 "Define o endereço do servidor de DNS a usar, caso pretenda que o polipo "
 "utilize um servidor alternativo ao do sistema."
 
 #. Query DNS for IPv6
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:22
-msgid "polipo_general_dnsqueryipv6"
+msgid "Query DNS for IPv6"
 msgstr "Pedidos IPv6 ao DNS"
 
 #. false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = Query both, prefer IPv6; true = Query only IPv6
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:23
-msgid "polipo_general_dnsqueryipv6_desc"
+msgid "false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = Query both, prefer IPv6; true = Query only IPv6"
 msgstr ""
 "false = Não pedir IPv6; reluctantly=Pedir ambos e preferir IPv4; "
 "happily=Pedir ambos, preferir IPv6; true=Pedir apenas IPv6"
 
 #. Query DNS by hostname
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:24
-msgid "polipo_general_dnsusegethostbyname"
+msgid "Query DNS by hostname"
 msgstr "Pedidos ao DNS através de hostname"
 
 #. false = Never use system DNS resolver; reluctantly = Query DNS directly, if DNS server is unavailable fail to system DNS resolver; happily = Query DNS directly, if host could not be found fallback to system DNS resolver; true = Always use system DNS resolver
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:25
-msgid "polipo_general_dnsusegethostbyname_desc"
+msgid "false = Never use system DNS resolver; reluctantly = Query DNS directly, if DNS server is unavailable fail to system DNS resolver; happily = Query DNS directly, if host could not be found fallback to system DNS resolver; true = Always use system DNS resolver"
 msgstr ""
 "false=nunca usar o resolver do sistema; reluctantly=pedir DNS directamente, "
 "se o servidor DNS estiver indisponivel recorrer do resolver DNS do sistema; "
@@ -164,80 +164,80 @@ msgstr ""
 
 #. Syslog facility
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:26
-msgid "polipo_general_logfacility"
+msgid "Syslog facility"
 msgstr "Categoria dos eventos polipo no registo do sistema"
 
 #. Log file location
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:27
-msgid "polipo_general_logfile"
+msgid "Log file location"
 msgstr "Localização do ficheiro de registo"
 
 #. Use of external storage device is recommended, because the log file is written frequently and can grow considerably.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:28
-msgid "polipo_general_logfile_desc"
+msgid "Use of external storage device is recommended, because the log file is written frequently and can grow considerably."
 msgstr ""
 "É recomendado o recurso a sistemas de armazenamento de ficheiros externos, "
 "devido ao rápido crescimento do ficheiro de registo."
 
 #. Log to syslog
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:29
-msgid "polipo_general_logsyslog"
+msgid "Log to syslog"
 msgstr "Registar para o syslog"
 
 #. Parent proxy authentication
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:30
-msgid "polipo_general_parentauthcredentials"
+msgid "Parent proxy authentication"
 msgstr "Autenticação em cache de hierarquia superior"
 
 #. Basic HTTP authentication supported. Provide username and password in username:password format.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:31
-msgid "polipo_general_parentauthcredentials_desc"
+msgid "Basic HTTP authentication supported. Provide username and password in username:password format."
 msgstr ""
 "É suportada a autenticação basica HTTP. Indique username e password no "
 "formato username:password."
 
 #. Parent proxy address
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:32
-msgid "polipo_general_parentproxy"
+msgid "Parent proxy address"
 msgstr "Endereço do proxy de hierarquia superior."
 
 #. Parent proxy address (in host:port format), to which Polipo will forward the requests.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:33
-msgid "polipo_general_parentproxy_desc"
+msgid "Parent proxy address (in host:port format), to which Polipo will forward the requests."
 msgstr ""
 "Endereço do proxy de hierarquia superior (no formato host:porta), ao qual o "
 "polipo irá encaminhar os seus pedidos."
 
 #. Listen address
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:34
-msgid "polipo_general_proxyaddress"
+msgid "Listen address"
 msgstr "Endereço local"
 
 #. The interface on which Polipo will listen. To listen on all interfaces use 0.0.0.0 or :: (IPv6).
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:35
-msgid "polipo_general_proxyaddress_desc"
+msgid "The interface on which Polipo will listen. To listen on all interfaces use 0.0.0.0 or :: (IPv6)."
 msgstr ""
 "O interface no qual o polipo será activado. Para activar em todos os "
 "endereços, use 0.0.0.0 ou :: (IPv6)."
 
 #. Listen port
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:36
-msgid "polipo_general_proxyport"
+msgid "Listen port"
 msgstr "Porta local"
 
 #. Port on which Polipo will listen. (default value: 8123)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:37
-msgid "polipo_general_proxyport_desc"
+msgid "Port on which Polipo will listen. (default value: 8123)"
 msgstr "Porta local na qual o polipo será activado. (pre-definido: 8123)"
 
 #. Poor Man&#39;s Multiplexing
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:38
-msgid "polipo_pmm"
+msgid "Poor Man's Multiplexing"
 msgstr "Multiplexagem simples"
 
 #. Poor Man&#39;s Multiplexing (PMM) is a technique that simulates multiplexing by requesting an instance in multiple segments. It tries to lower the latency caused by the weakness of HTTP protocol. NOTE: some sites may not work with PMM enabled.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:39
-msgid "polipo_pmm_desc"
+msgid "Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by requesting an instance in multiple segments. It tries to lower the latency caused by the weakness of HTTP protocol. NOTE: some sites may not work with PMM enabled."
 msgstr ""
 "A multiplexagem simples (PMM) consiste na simulação de multiplexagem através "
 "da requesição de um pedido em multiplos segmentos. O método tenta baixar a "
@@ -246,19 +246,19 @@ msgstr ""
 
 #. First PMM segment size (in bytes)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:40
-msgid "polipo_pmm_pmmfirstsize"
+msgid "First PMM segment size (in bytes)"
 msgstr "Tamanho do primeiro segmento PMM (em bytes)"
 
 #. Size of the first PMM segment. If not defined, it defaults to twice the PMM segment size.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:41
-msgid "polipo_pmm_pmmfirstsize_desc"
+msgid "Size of the first PMM segment. If not defined, it defaults to twice the PMM segment size."
 msgstr ""
 "Tamanho do primeiro segmento PMM. Se não estiver definido, reverte para o "
 "dobro do tamanho do segmento PMM."
 
 #. PMM segments size (in bytes)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:42
-msgid "polipo_pmm_pmmsize"
+msgid "PMM segments size (in bytes)"
 msgstr "Tamanho do segmento PMM (em bytes)"
 
 #. To enable PMM, PMM segment size must be set to some positive value.
diff --git a/po/pt/qos.po b/po/pt/qos.po
index c83c08806..ca1f4138a 100644
--- a/po/pt/qos.po
+++ b/po/pt/qos.po
@@ -15,94 +15,94 @@ msgstr ""
 
 #. Quality of Service
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:1
-msgid "qos"
+msgid "Quality of Service"
 msgstr "Qualidade de Serviço"
 
 #. With QoS you can priorize network traffic selected by adresses, ports or services.
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:2
-msgid "qos_desc"
+msgid "With QoS you can priorize network traffic selected by adresses, ports or services."
 msgstr ""
 "Com QoS você pode priozirar o tráfego da rede selecionada por endereços, "
 "portas ou serviços."
 
 #. Classification
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:3
-msgid "qos_interface_classgroup"
+msgid "Classification"
 msgstr "Classificação"
 
 #. Calculate Overhead
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:4
-msgid "qos_interface_overhead"
+msgid "Calculate Overhead"
 msgstr "Calcular Overhead"
 
 #. Half-Duplex
 #, fuzzy
-msgid "qos_interface_halfduplex"
+msgid "Half-Duplex"
 msgstr "Link para upload"
 
 #. Downlink
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:5
-msgid "qos_interface_download"
+msgid "Downlink"
 msgstr "Link para download"
 
 #. Uplink
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:6
-msgid "qos_interface_upload"
+msgid "Uplink"
 msgstr "Link para upload"
 
 #. Prioritization
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:7
-msgid "qos_classify"
+msgid "Prioritization"
 msgstr "Priorização"
 
 #. Priority
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:8
-msgid "qos_classify_target"
+msgid "Priority"
 msgstr "Prioridade"
 
 #. Source address
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:9
-msgid "qos_classify_srchost"
+msgid "Source address"
 msgstr "Endereço de origem"
 
 #. source network / source host
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:10
-msgid "qos_classify_srchost_dest"
+msgid "source network / source host"
 msgstr "rede de origem / host de origem"
 
 #. Target address
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:11
-msgid "qos_classify_dsthost"
+msgid "Target address"
 msgstr "Endereço de destino"
 
 #. target network / target host
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:12
-msgid "qos_classify_dsthost_dest"
+msgid "target network / target host"
 msgstr "rede de destino / host de destino"
 
 #. portrange
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:13
-msgid "qos_classify_portrange"
+msgid "portrange"
 msgstr "faixa de portas"
 
 #. low
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:14
-msgid "qos_bulk"
+msgid "low"
 msgstr "baixa"
 
 #. normal
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:15
-msgid "qos_normal"
+msgid "normal"
 msgstr "normal"
 
 #. express
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:16
-msgid "qos_express"
+msgid "express"
 msgstr "expressa"
 
 #. priority
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:17
-msgid "qos_priority"
+msgid "priority"
 msgstr "alta"
 
 #. Bytes sent
diff --git a/po/pt/rrdtool.po b/po/pt/rrdtool.po
index 420676788..9d7234389 100644
--- a/po/pt/rrdtool.po
+++ b/po/pt/rrdtool.po
@@ -13,342 +13,342 @@ msgstr ""
 
 #. %H: Wireless - Signal Noise Ratio
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:1
-msgid "stat_dg_title_wireless__signal_noise"
+msgid "%H: Wireless - Signal Noise Ratio"
 msgstr "%H: Wireless - Relação Sinal/Ruido"
 
 #. dBm
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:2
-msgid "stat_dg_label_wireless__signal_noise"
+msgid "dBm"
 msgstr "dBm"
 
 #. Noise Level
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:3
-msgid "stat_ds_signal_noise"
+msgid "Noise Level"
 msgstr "Nivel de Ruido"
 
 #. Signal Strength
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:4
-msgid "stat_ds_signal_power"
+msgid "Signal Strength"
 msgstr "Forca do Sinal"
 
 #. %H: Wireless - Signal Quality
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:5
-msgid "stat_dg_title_wireless__signal_quality"
+msgid "%H: Wireless - Signal Quality"
 msgstr "%H: Wireless - Qualidade do Sinal"
 
 #. n
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:6
-msgid "stat_dg_label_wireless__signal_quality"
+msgid "n"
 msgstr "n"
 
 #. Signal Quality
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:7
-msgid "stat_ds_signal_quality"
+msgid "Signal Quality"
 msgstr "Qualidade do Sinal"
 
 #. %H: ICMP Roundtrip Times
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:8
-msgid "stat_dg_title_ping"
+msgid "%H: ICMP Roundtrip Times"
 msgstr "%H: Tempo de resposta ICMP"
 
 #. ms
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:9
-msgid "stat_dg_label_ping"
+msgid "ms"
 msgstr "ms"
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:10
-msgid "stat_ds_ping"
+msgid "%di"
 msgstr "%di"
 
 #. %H: Firewall - Processed Packets
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:11
-msgid "stat_dg_title_iptables__ipt_packets"
+msgid "%H: Firewall - Processed Packets"
 msgstr "%H: Firewall - Pacotes Processados"
 
 #. Packets/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:12
-msgid "stat_dg_label_iptables__ipt_packets"
+msgid "Packets/s"
 msgstr "Pacote/s"
 
 #. Chain \"%di\"
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:13
-msgid "stat_ds_ipt_packets"
+msgid "Chain \"%di\""
 msgstr "Cadeia &quot;%di&quot;"
 
 #. %H: Netlink - Transfer on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:14
-msgid "stat_dg_title_netlink__if_octets"
+msgid "%H: Netlink - Transfer on %pi"
 msgstr "%H: Netlink - Transferencia na %pi"
 
 #. Bytes/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:15
-msgid "stat_dg_label_netlink__if_octets"
+msgid "Bytes/s"
 msgstr "Bytes/s"
 
 #. Bytes (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:16
-msgid "stat_ds_if_octets"
+msgid "Bytes (%ds)"
 msgstr "Bytes (%ds)"
 
 #. %H: Netlink - Packets on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:17
-msgid "stat_dg_title_netlink__if_packets"
+msgid "%H: Netlink - Packets on %pi"
 msgstr "%H: Netlink - Pacotes na %pi"
 
 #. Packets/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:18
-msgid "stat_dg_label_netlink__if_packets"
+msgid "Packets/s"
 msgstr "Packets/s"
 
 #. Processed (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:19
-msgid "stat_ds_if_packets"
+msgid "Processed (%ds)"
 msgstr "Processado (%ds)"
 
 #. Dropped   (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:20
-msgid "stat_ds_if_dropped"
+msgid "Dropped (%ds)"
 msgstr "Dropado    (%ds)"
 
 #. Errors    (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:21
-msgid "stat_ds_if_errors"
+msgid "Errors (%ds)"
 msgstr "Erros      (%ds)"
 
 #. %H: Netlink - Multicast on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:22
-msgid "stat_dg_title_netlink__if_multicast"
+msgid "%H: Netlink - Multicast on %pi"
 msgstr "%H: Netlink - Multicast na %pi"
 
 #. Packets/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:23
-msgid "stat_dg_label_netlink__if_multicast"
+msgid "Packets/s"
 msgstr "Pacote/s"
 
 #. Packets
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:24
-msgid "stat_ds_if_multicast"
+msgid "Packets"
 msgstr "Pacotes"
 
 #. %H: Netlink - Collisions on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:25
-msgid "stat_dg_title_netlink__if_collisions"
+msgid "%H: Netlink - Collisions on %pi"
 msgstr "%H: Netlink - Colisoes na %pi"
 
 #. Collisions/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:26
-msgid "stat_dg_label_netlink__if_collisions"
+msgid "Collisions/s"
 msgstr "Colisao(es)"
 
 #. Collisions
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:27
-msgid "stat_ds_if_collisions"
+msgid "Collisions"
 msgstr "Colisoes"
 
 #. %H: Netlink - Errors on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:28
-msgid "stat_dg_title_netlink__if_tx_errors"
+msgid "%H: Netlink - Errors on %pi"
 msgstr "%H: Netlink - Erros na %pi"
 
 #. Errors/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:29
-msgid "stat_dg_label_netlink__if_tx_errors"
+msgid "Errors/s"
 msgstr "Erro/s"
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:30
-msgid "stat_ds_if_tx_errors"
+msgid "%di"
 msgstr "%di"
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:31
-msgid "stat_ds_if_rx_errors"
+msgid "%di"
 msgstr "%di"
 
 #. %H: Processes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:32
-msgid "stat_dg_title_processes"
+msgid "%H: Processes"
 msgstr "%H: Processos"
 
 #. Processes/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:33
-msgid "stat_dg_label_processes"
+msgid "Processes/s"
 msgstr "Processo/s"
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:34
-msgid "stat_ds_ps_state"
+msgid "%di"
 msgstr "%di"
 
 #. %H: Process %pi - used cpu time
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:35
-msgid "stat_dg_title_processes__ps_cputime"
+msgid "%H: Process %pi - used cpu time"
 msgstr "%H: Processo %pi - tempo usado da cpu"
 
 #. Jiffies
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:36
-msgid "stat_dg_label_processes__ps_cputime"
+msgid "Jiffies"
 msgstr "Jiffies"
 
 #. system
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:37
-msgid "stat_ds_ps_cputime__syst"
+msgid "System"
 msgstr "sistema"
 
 #. user
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:38
-msgid "stat_ds_ps_cputime__user"
+msgid "user"
 msgstr "utilizador"
 
 #. %H: Process %pi - threads and processes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:39
-msgid "stat_dg_title_processes__ps_count"
+msgid "%H: Process %pi - threads and processes"
 msgstr "%H: Processo %pi - threads e processos"
 
 #. Count
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:40
-msgid "stat_dg_label_processes__ps_count"
+msgid "Count"
 msgstr "Contagem"
 
 #. %ds
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:41
-msgid "stat_ds_ps_count"
+msgid "%ds"
 msgstr "%ds"
 
 #. %H: Process %pi - page faults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:42
-msgid "stat_dg_title_processes__ps_pagefaults"
+msgid "%H: Process %pi - page faults"
 msgstr "%H: Prcesso %pi - pagina de erros"
 
 #. Pagefaults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:43
-msgid "stat_dg_label_processes__ps_pagefaults"
+msgid "Pagefaults"
 msgstr "Pagina de erros"
 
 #. page faults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:44
-msgid "stat_ds_ps_pagefaults"
+msgid "page faults"
 msgstr "pagina de erros"
 
 #. %H: Process %pi - virtual memory size
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:45
-msgid "stat_dg_title_processes__ps_rss"
+msgid "%H: Process %pi - virtual memory size"
 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"
+msgid "Bytes"
 msgstr "Bytes"
 
 #. virtual memory
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:47
-msgid "stat_ds_ps_rss"
+msgid "virtual memory"
 msgstr "memoria virtual"
 
 #. %H: Usage on Processor #%pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:48
-msgid "stat_dg_title_cpu"
+msgid "%H: Usage on Processor #%pi"
 msgstr "%H: Usado no Processado #%pi"
 
 #. %
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:49
-msgid "stat_dg_label_cpu"
+msgid "%"
 msgstr "%"
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:50
-msgid "stat_ds_cpu"
+msgid "%di"
 msgstr "%di"
 
 #. %H: Transfer on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:51
-msgid "stat_dg_title_interface__if_octets"
+msgid "%H: Transfer on %di"
 msgstr "%H: Transferencia na %di"
 
 #. Bytes/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:52
-msgid "stat_dg_label_interface__if_octets"
+msgid "Bytes/s"
 msgstr "Bytes/s"
 
 #. %H: Packets on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:53
-msgid "stat_dg_title_interface__if_packets"
+msgid "%H: Packets on %di"
 msgstr "%H: Pacotes na %di"
 
 #. Packets/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:54
-msgid "stat_dg_label_interface__if_packets"
+msgid "Packets/s"
 msgstr "Pacote/s"
 
 #. %H: TCP-Connections to Port %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:55
-msgid "stat_dg_title_tcpconns"
+msgid "%H: TCP-Connections to Port %pi"
 msgstr "%H: Ligações TCP na Porta %pi"
 
 #. Connections/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:56
-msgid "stat_dg_label_tcpconns"
+msgid "Connections/s"
 msgstr "Ligação(ões)"
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:57
-msgid "stat_ds_tcp_connections"
+msgid "%di"
 msgstr "%di"
 
 #. %H: Disk Space Usage on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:58
-msgid "stat_dg_title_df"
+msgid "%H: Disk Space Usage on %di"
 msgstr "%H: Utilizacao de Espaco em Disco em %di"
 
 #. Bytes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:59
-msgid "stat_dg_label_df"
+msgid "Bytes"
 msgstr "Bytes"
 
 #. %ds
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:60
-msgid "stat_ds_df__free"
+msgid "%ds"
 msgstr "%ds"
 
 #. %ds
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:61
-msgid "stat_ds_df__used"
+msgid "%ds"
 msgstr "%ds"
 
 #. %H: Interrupts
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:62
-msgid "stat_dg_title_irq"
+msgid "%H: Interrupts"
 msgstr "%H: Interrupcoes"
 
 #. Issues/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:63
-msgid "stat_dg_label_irq"
+msgid "Issues/s"
 msgstr "Erro/s"
 
 #. IRQ %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:64
-msgid "stat_ds_irq"
+msgid "IRQ %di"
 msgstr "IRQ %di"
 
 #. %H: System Load
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:65
-msgid "stat_dg_title_load"
+msgid "%H: System Load"
 msgstr "%H: Carga do Sistema"
 
 #. Load
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:66
-msgid "stat_dg_label_load"
+msgid "Load"
 msgstr "Carga"
 
 #. 1 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:67
-msgid "stat_ds_load__shortterm"
+msgid "1 min"
 msgstr "1 min"
 
 #. 5 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:68
-msgid "stat_ds_load__midterm"
+msgid "5 min"
 msgstr "5 min"
 
 #. 15 min
diff --git a/po/pt/samba.po b/po/pt/samba.po
index 7ed605e3a..05a7efd22 100644
--- a/po/pt/samba.po
+++ b/po/pt/samba.po
@@ -14,84 +14,84 @@ msgstr ""
 
 #. Network Shares
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:1
-msgid "samba"
+msgid "Network Shares"
 msgstr "Compartilhamentos de Rede"
 
 #. Hostname
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:2
-msgid "samba_samba_name"
+msgid "Hostname"
 msgstr "Hostname"
 
 #. Description
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:3
-msgid "samba_samba_description"
+msgid "Description"
 msgstr "Descrição"
 
 #. Workgroup
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:4
-msgid "samba_samba_workgroup"
+msgid "Workgroup"
 msgstr "Grupo de Trabalho"
 
 #. Share home-directories
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:5
-msgid "samba_samba_homes"
+msgid "Share home-directories"
 msgstr "Compartilhar diretórios home"
 
 #. System users can reach their home directories via network shares.
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:6
-msgid "samba_samba_homes_desc"
+msgid "System users can reach their home directories via network shares."
 msgstr ""
 "Usuários do sistema poderão acessar seu diretório home através dos "
 "compartilhamentos de rede."
 
 #. Shared Directories
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:7
-msgid "samba_sambashare"
+msgid "Shared Directories"
 msgstr "Diretórios Compartilhados"
 
 #. Shared Directory
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:8
-msgid "samba_sambashare_path"
+msgid "Shared Directory"
 msgstr "Diretório Compartilhado"
 
 #. Physical Path
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:9
-msgid "samba_sambashare_path_desc"
+msgid "Physical Path"
 msgstr "Caminho Físico"
 
 #. Allowed Users
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:10
-msgid "samba_sambashare_users"
+msgid "Allowed Users"
 msgstr "Usuários Permitidos"
 
 #. optional
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:11
-msgid "samba_sambashare_users_desc"
+msgid "optional"
 msgstr "opcional"
 
 #. Read Only
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:12
-msgid "samba_sambashare_readonly"
+msgid "Read Only"
 msgstr "Somente Leitura"
 
 #. Allow Guests
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:13
-msgid "samba_sambashare_guestok"
+msgid "Allow Guests"
 msgstr "Permitir Convidados"
 
 #. Create Mask
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:14
-msgid "samba_sambashare_createmask"
+msgid "Create Mask"
 msgstr "Criar Máscara"
 
 #. Mask for new files
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:15
-msgid "samba_sambashare_createmask_desc"
+msgid "Mask for new files"
 msgstr "Máscara para novos arquivos"
 
 #. Directory Mask
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:16
-msgid "samba_sambashare_dirmask"
+msgid "Directory Mask"
 msgstr "Máscara do Diretório"
 
 #. Mask for new directories
diff --git a/po/pt/statistics.po b/po/pt/statistics.po
index 197bba38a..313423eda 100644
--- a/po/pt/statistics.po
+++ b/po/pt/statistics.po
@@ -14,12 +14,12 @@ msgstr ""
 
 #. Statistics
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:1
-msgid "stat_statistics"
+msgid "Statistics"
 msgstr "Estatísticas"
 
 #. The statistics package is based on <a href=\"http://collectd.org/index.shtml\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD Tool</a> to render diagram images from collected data.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:2
-msgid "stat_desc"
+msgid "The statistics package is based on <a href=\"http://collectd.org/index.shtml\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD Tool</a> to render diagram images from collected data."
 msgstr ""
 "As estatísticas são baseadas no <a "
 "href=\"http://collectd.org/index.shtml\">Collectd</a> e é utilizado o <a "
@@ -28,142 +28,142 @@ msgstr ""
 
 #. System plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:3
-msgid "stat_systemplugins"
+msgid "System plugins"
 msgstr "Plugis de Sistema"
 
 #. Network plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:4
-msgid "stat_networkplugins"
+msgid "Network plugins"
 msgstr "Plugins de rede"
 
 #. Output plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:5
-msgid "stat_outputplugins"
+msgid "Output plugins"
 msgstr "Plugins de saída"
 
 #. Display timespan
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:6
-msgid "stat_showtimespan"
+msgid "Display timespan »"
 msgstr "Mostrar intervalo »"
 
 #. Graphs
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:7
-msgid "stat_graphs"
+msgid "Graphs"
 msgstr "Gráficos"
 
 #. Collectd
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:8
-msgid "stat_collectd"
+msgid "Collectd"
 msgstr "Collectd"
 
 #. Processor
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:9
-msgid "stat_cpu"
+msgid "Processor"
 msgstr "Processador"
 
 #. Ping
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:10
-msgid "stat_ping"
+msgid "Ping"
 msgstr "Ping"
 
 #. Firewall
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:11
-msgid "stat_iptables"
+msgid "Firewall"
 msgstr "Firewall"
 
 #. Netlink
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:12
-msgid "stat_netlink"
+msgid "Netlink"
 msgstr "Netlink"
 
 #. Processes
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:13
-msgid "stat_processes"
+msgid "Processes"
 msgstr "Processos"
 
 #. Wireless
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:14
-msgid "stat_wireless"
+msgid "Wireless"
 msgstr "Wireless"
 
 #. TCP Connections
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:15
-msgid "stat_tcpconns"
+msgid "TCP Connections"
 msgstr "Conexões TCP"
 
 #. Interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:16
-msgid "stat_interface"
+msgid "Interfaces"
 msgstr "Interfaces"
 
 #. Disk Space Usage
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:17
-msgid "stat_df"
+msgid "Disk Space Usage"
 msgstr "Utilização de espaço em disco"
 
 #. Interrupts
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:18
-msgid "stat_irq"
+msgid "Interrupts"
 msgstr "Interrupções"
 
 #. Disk Usage
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:19
-msgid "stat_disk"
+msgid "Disk Usage"
 msgstr "Utilização do Disco"
 
 #. Exec
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:20
-msgid "stat_exec"
+msgid "Exec"
 msgstr "Exec"
 
 #. RRDTool
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:21
-msgid "stat_rrdtool"
+msgid "RRDTool"
 msgstr "RRDTool"
 
 #. Network
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:22
-msgid "stat_network"
+msgid "Network"
 msgstr "Rede"
 
 #. CSV Output
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:23
-msgid "stat_csv"
+msgid "CSV Output"
 msgstr "Formato CSV"
 
 #. System Load
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:24
-msgid "stat_load"
+msgid "System Load"
 msgstr "Carga do Sistema"
 
 #. DNS
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:25
-msgid "stat_dns"
+msgid "DNS"
 msgstr "DNS"
 
 #. Email
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:26
-msgid "stat_email"
+msgid "Email"
 msgstr "Email"
 
 #. UnixSock
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:27
-msgid "stat_unixsock"
+msgid "UnixSock"
 msgstr "UnixSock"
 
 #. Statistics
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:28
-msgid "lucistatistics"
+msgid "Statistics"
 msgstr "Estatísticas"
 
 #. Collectd Settings
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:29
-msgid "lucistatistics_collectd"
+msgid "Collectd Settings"
 msgstr "Configurações do Collectd"
 
 #. Collectd is a small daeomon for collecting data from various sources through different plugins. On this page you can change general settings for the collectd daemon.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:30
-msgid "lucistatistics_collectd_desc"
+msgid "Collectd is a small daeomon for collecting data from various sources through different plugins. On this page you can change general settings for the collectd daemon."
 msgstr ""
 "Collectd é um pequeno daemon que coleta dados de várias fontes através de "
 "diferentes plugins. Nesta página você pode alterar as configurações gerais "
@@ -171,104 +171,104 @@ msgstr ""
 
 #. Hostname
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:31
-msgid "lucistatistics_collectd_hostname"
+msgid "Hostname"
 msgstr "Hostname"
 
 #. Base Directory
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:32
-msgid "lucistatistics_collectd_basedir"
+msgid "Base Directory"
 msgstr "Diretório Base"
 
 #. Directory for sub-configurations
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:33
-msgid "lucistatistics_collectd_include"
+msgid "Directory for sub-configurations"
 msgstr "Diretório para sub-configurações"
 
 #. Directory for collectd plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:34
-msgid "lucistatistics_collectd_plugindir"
+msgid "Directory for collectd plugins"
 msgstr "Diretório para os plugins do collectd"
 
 #. Used PID file
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:35
-msgid "lucistatistics_collectd_pidfile"
+msgid "Used PID file"
 msgstr "Arquivo PID usado"
 
 #. Datasets definition file
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:36
-msgid "lucistatistics_collectd_typesdb"
+msgid "Datasets definition file"
 msgstr "Arquivo com a definição de dados"
 
 #. Data collection interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:37
-msgid "lucistatistics_collectd_interval"
+msgid "Data collection interval"
 msgstr "Intervalo da coleta de dados"
 
 #. Seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:38
-msgid "lucistatistics_collectd_interval_desc"
+msgid "Seconds"
 msgstr "Segundos"
 
 #. Number of threads for data collection
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:39
-msgid "lucistatistics_collectd_readthreads"
+msgid "Number of threads for data collection"
 msgstr "Número de threads para o coletor de dados"
 
 #. Try to lookup fully qualified hostname
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:40
-msgid "lucistatistics_collectd_fqdnlookup"
+msgid "Try to lookup fully qualified hostname"
 msgstr "Tentar encontrar o nome do host completo (FQDN)"
 
 #. CPU Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:41
-msgid "lucistatistics_collectdcpu"
+msgid "CPU Plugin Configuration"
 msgstr "Configuração do plugin CPU"
 
 #. The cpu plugin collects basic statistics about the processor usage.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:42
-msgid "lucistatistics_collectdcpu_desc"
+msgid "The cpu plugin collects basic statistics about the processor usage."
 msgstr "O plugin cpu coleta as estatísticas básicas sobre o uso do processador."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:43
-msgid "lucistatistics_collectdcpu_enable"
+msgid "Enable this plugin"
 msgstr "Habilitar este plugin"
 
 #. CSV Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:44
-msgid "lucistatistics_collectdcsv"
+msgid "CSV Plugin Configuration"
 msgstr "Configuração do plugin CSV"
 
 #. The csv plugin stores collected data in csv file format for further processing by external programs.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:45
-msgid "lucistatistics_collectdcsv_desc"
+msgid "The csv plugin stores collected data in csv file format for further processing by external programs."
 msgstr ""
 "O plugin csv armazena os dados coletados em um arquivo no formato csv para "
 "um futuro processamento por outros programas."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:46
-msgid "lucistatistics_collectdcsv_enable"
+msgid "Enable this plugin"
 msgstr "Habilitar este plugin"
 
 #. Storage directory for the csv files
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:47
-msgid "lucistatistics_collectdcsv_datadir"
+msgid "Storage directory for the csv files"
 msgstr "Diretório para armazenamento dos arquivos csv"
 
 #. Store data values as rates instead of absolute values
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:48
-msgid "lucistatistics_collectdcsv_storerates"
+msgid "Store data values as rates instead of absolute values"
 msgstr "Armazenar os valores dos dados como taxas em vez de valores absolutos"
 
 #. DF Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:49
-msgid "lucistatistics_collectddf"
+msgid "DF Plugin Configuration"
 msgstr "Configuração do plugin DF"
 
 #. The df plugin collects statistics about the disk space usage on different devices, mount points or filesystem types.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:50
-msgid "lucistatistics_collectddf_desc"
+msgid "The df plugin collects statistics about the disk space usage on different devices, mount points or filesystem types."
 msgstr ""
 "O plugin df coleta estatísticas sobre a utilização de espaço em disco em "
 "diferentes dispositivos, pontos de montagem ou tipos de sistemas de "
@@ -276,121 +276,121 @@ msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:51
-msgid "lucistatistics_collectddf_enable"
+msgid "Enable this plugin"
 msgstr "Habilitar este plugin"
 
 #. Monitor devices
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:52
-msgid "lucistatistics_collectddf_devices"
+msgid "Monitor devices"
 msgstr "Monitorar dispositivos"
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:53
-msgid "lucistatistics_collectddf_devices_desc"
+msgid "multiple separated by space"
 msgstr "múltiplos valores, separados por espaço"
 
 #. Monitor mount points
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:54
-msgid "lucistatistics_collectddf_mountpoints"
+msgid "Monitor mount points"
 msgstr "Monitorar pontos de montagem"
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:55
-msgid "lucistatistics_collectddf_mountpoints_desc"
+msgid "multiple separated by space"
 msgstr "múltiplos valores, separados por espaço"
 
 #. Monitor filesystem types
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:56
-msgid "lucistatistics_collectddf_fstypes"
+msgid "Monitor filesystem types"
 msgstr "Monitorar tipos de sistemas de arquivos"
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:57
-msgid "lucistatistics_collectddf_fstypes_desc"
+msgid "multiple separated by space"
 msgstr "múltiplos valores, separados por espaço"
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:58
-msgid "lucistatistics_collectddf_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr "Monitorar tudo exceto os selecionados"
 
 #. Disk Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:59
-msgid "lucistatistics_collectddisk"
+msgid "Disk Plugin Configuration"
 msgstr "Configuração do plugin Disco"
 
 #. The disk plugin collects detailled usage statistics for selected partitions or whole disks.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:60
-msgid "lucistatistics_collectddisk_desc"
+msgid "The disk plugin collects detailled usage statistics for selected partitions or whole disks."
 msgstr ""
 "O plugin disco coleta estatísticas de uso detalhadas das partições "
 "selecionadas ou discos inteiros."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:61
-msgid "lucistatistics_collectddisk_enable"
+msgid "Enable this plugin"
 msgstr "Habilitar este plugin"
 
 #. Monitor disks and partitions
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:62
-msgid "lucistatistics_collectddisk_disks"
+msgid "Monitor disks and partitions"
 msgstr "Monitoras discos e partições"
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:63
-msgid "lucistatistics_collectddisk_disks_desc"
+msgid "multiple separated by space"
 msgstr "múltiplos valores, separados por espaço"
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:64
-msgid "lucistatistics_collectddisk_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr "Monitorar tudo exceto os selecionados"
 
 #. DNS Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:65
-msgid "lucistatistics_collectddns"
+msgid "DNS Plugin Configuration"
 msgstr "Configuração do plugin DNS"
 
 #. The dns plugin collects detailled statistics about dns related traffic on selected interfaces.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:66
-msgid "lucistatistics_collectddns_desc"
+msgid "The dns plugin collects detailled statistics about dns related traffic on selected interfaces."
 msgstr ""
 "O plugin dns coleta estatísticas detalhadas sobre o tráfego do dns nas "
 "interfaces selecionadas."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:67
-msgid "lucistatistics_collectddns_enable"
+msgid "Enable this plugin"
 msgstr "Habilitar este plugin"
 
 #. Monitor interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:68
-msgid "lucistatistics_collectddns_interfaces"
+msgid "Monitor interfaces"
 msgstr "Monitorar interfaces"
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:69
-msgid "lucistatistics_collectddns_interfaces_desc"
+msgid "multiple separated by space"
 msgstr "múltiplos valores, separados por espaço"
 
 #. Ignore source addresses
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:70
-msgid "lucistatistics_collectddns_ignoresources"
+msgid "Ignore source addresses"
 msgstr "Ignorar endereços de origem"
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:71
-msgid "lucistatistics_collectddns_ignoresources_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr "pressione Ctrl enquanto clica para selecionar várias interfaces"
 
 #. E-Mail Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:72
-msgid "lucistatistics_collectdemail"
+msgid "E-Mail Plugin Configuration"
 msgstr "Configuração do plugin E-Mail"
 
 #. The email plugin creates a unix socket which can be used to transmit email-statistics to a running collectd daemon. This plugin is primarily intended to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can be used in other ways as well.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:73
-msgid "lucistatistics_collectdemail_desc"
+msgid "The email plugin creates a unix socket which can be used to transmit email-statistics to a running collectd daemon. This plugin is primarily intended to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can be used in other ways as well."
 msgstr ""
 "O plugin de email cria um socket unix que pode ser usado para transmitir "
 "estatísticas de email o daemon collectd. Este plugin é essencialmente "
@@ -400,91 +400,91 @@ msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:74
-msgid "lucistatistics_collectdemail_enable"
+msgid "Enable this plugin"
 msgstr "Habilitar este plugin"
 
 #. Filepath of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:75
-msgid "lucistatistics_collectdemail_socketfile"
+msgid "Filepath of the unix socket"
 msgstr "Caminho do arquivo do socket unix"
 
 #. Group ownership of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:76
-msgid "lucistatistics_collectdemail_socketgroup"
+msgid "Group ownership of the unix socket"
 msgstr "Grupo dono do socket unix"
 
 #. group name
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:77
-msgid "lucistatistics_collectdemail_socketgroup_desc"
+msgid "group name"
 msgstr "nome do grupo"
 
 #. File permissions of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:78
-msgid "lucistatistics_collectdemail_socketperms"
+msgid "File permissions of the unix socket"
 msgstr "Permissões de arquivo do socket unix"
 
 #. octal
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:79
-msgid "lucistatistics_collectdemail_socketperms_desc"
+msgid "octal"
 msgstr "octal"
 
 #. Maximum allowed connections
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:80
-msgid "lucistatistics_collectdemail_maxconns"
+msgid "Maximum allowed connections"
 msgstr "Máximo de conexões permitidas"
 
 #. Exec Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:81
-msgid "lucistatistics_collectdexec"
+msgid "Exec Plugin Configuration"
 msgstr "Configuração do plugin Exec"
 
 #. The exec plugin starts external commands to read values from or to notify external processes when certain threshold values have been reached.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:82
-msgid "lucistatistics_collectdexec_desc"
+msgid "The exec plugin starts external commands to read values from or to notify external processes when certain threshold values have been reached."
 msgstr ""
 "O plugin exec inicia comandos externos para leitura de valores ou notificar "
 "processos externos quando um determinado valor limite for atingido."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:83
-msgid "lucistatistics_collectdexec_enable"
+msgid "Enable this plugin"
 msgstr "Habilitar este plugin"
 
 #. Add command for reading values
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:84
-msgid "lucistatistics_collectdexecinput"
+msgid "Add command for reading values"
 msgstr "Adicionar comando para leitura de valores"
 
 #. Here you can define external commands which will be started by collectd in order to read certain values. The values will be read from stdout.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:85
-msgid "lucistatistics_collectdexecinput_desc"
+msgid "Here you can define external commands which will be started by collectd in order to read certain values. The values will be read from stdout."
 msgstr ""
 "Aqui você pode definir comandos externos que serão iniciados pelo collectd a "
 "fim de ler determinados valores. Os valores serão lidos a partir do stdout."
 
 #. Commandline
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:86
-msgid "lucistatistics_collectdexecinput_cmdline"
+msgid "Commandline"
 msgstr "Linha de comando"
 
 #. Run as user
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:87
-msgid "lucistatistics_collectdexecinput_cmduser"
+msgid "Run as user"
 msgstr "Executar como usuário"
 
 #. Run as group
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:88
-msgid "lucistatistics_collectdexecinput_cmdgroup"
+msgid "Run as group"
 msgstr "Executar como grupo"
 
 #. Add notification command
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:89
-msgid "lucistatistics_collectdexecnotify"
+msgid "Add notification command"
 msgstr "Adicionar o comando de notificação"
 
 #. Here you can define external commands which will be started by collectd when certain threshold values have been reached. The values leading to invokation will be feeded to the the called programs stdin.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:90
-msgid "lucistatistics_collectdexecnotify_desc"
+msgid "Here you can define external commands which will be started by collectd when certain threshold values have been reached. The values leading to invokation will be feeded to the the called programs stdin."
 msgstr ""
 "Aqui você pode definir os comandos externos que serão iniciados pelo "
 "collectd quando determinados valores limite forem  atingidos. Os valores "
@@ -492,168 +492,168 @@ msgstr ""
 
 #. Commandline
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:91
-msgid "lucistatistics_collectdexecnotify_cmdline"
+msgid "Commandline"
 msgstr "Linha de comando"
 
 #. Run as user
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:92
-msgid "lucistatistics_collectdexecnotify_cmduser"
+msgid "Run as user"
 msgstr "Executar como usuário"
 
 #. Run as group
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:93
-msgid "lucistatistics_collectdexecnotify_cmdgroup"
+msgid "Run as group"
 msgstr "Executar como grupo"
 
 #. Interface Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:94
-msgid "lucistatistics_collectdinterface"
+msgid "Interface Plugin Configuration"
 msgstr "Configuração do plugin Interface"
 
 #. The interface plugin collects traffic statistics on selected interfaces.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:95
-msgid "lucistatistics_collectdinterface_desc"
+msgid "The interface plugin collects traffic statistics on selected interfaces."
 msgstr ""
 "O plugin interface plugin coleta estatísticas sobre o tráfego das interfaces "
 "selecionadas."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:96
-msgid "lucistatistics_collectdinterface_enable"
+msgid "Enable this plugin"
 msgstr "Habilitar este plugin"
 
 #. Monitor interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:97
-msgid "lucistatistics_collectdinterface_interfaces"
+msgid "Monitor interfaces"
 msgstr "Monitorar interfaces"
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:98
-msgid "lucistatistics_collectdinterface_interfaces_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr "pressione Ctrl enquanto clica para selecionar várias interfaces"
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:99
-msgid "lucistatistics_collectdinterface_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr "Monitorar todas exceto as selecionadas"
 
 #. Iptables Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:100
-msgid "lucistatistics_collectdiptables"
+msgid "Iptables Plugin Configuration"
 msgstr "Configuração do plugin Iptables"
 
 #. The iptables plugin will monitor selected firewall rules and collect informations about processed bytes and packets per rule.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:101
-msgid "lucistatistics_collectdiptables_desc"
+msgid "The iptables plugin will monitor selected firewall rules and collect informations about processed bytes and packets per rule."
 msgstr ""
 "O plugin iptables irá monitorar as regras de firewall selecionadas e coletar "
 "informações sobre pacotes e bytes processados pela regra."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:102
-msgid "lucistatistics_collectdiptables_enable"
+msgid "Enable this plugin"
 msgstr "Habilitar este plugin"
 
 #. Add matching rule
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:103
-msgid "lucistatistics_collectdiptablesmatch"
+msgid "Add matching rule"
 msgstr "Adicionar regra"
 
 #. Here you can define various criteria by which the monitored iptables rules are selected.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:104
-msgid "lucistatistics_collectdiptablesmatch_desc"
+msgid "Here you can define various criteria by which the monitored iptables rules are selected."
 msgstr ""
 "Aqui você pode definir diversos critérios para as regras iptables "
 "selecionadas serem monitoradas."
 
 #. Name of the rule
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:105
-msgid "lucistatistics_collectdiptablesmatch_name"
+msgid "Name of the rule"
 msgstr "Nome da regra"
 
 #. max. 16 chars
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:106
-msgid "lucistatistics_collectdiptablesmatch_name_desc"
+msgid "max. 16 chars"
 msgstr "max. 16 caract."
 
 #. Table
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:107
-msgid "lucistatistics_collectdiptablesmatch_table"
+msgid "Table"
 msgstr "Tabela"
 
 #. Chain
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:108
-msgid "lucistatistics_collectdiptablesmatch_chain"
+msgid "Chain"
 msgstr "Cadeia"
 
 #. Action (target)
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:109
-msgid "lucistatistics_collectdiptablesmatch_target"
+msgid "Action (target)"
 msgstr "Ação (destino)"
 
 #. Network protocol
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:110
-msgid "lucistatistics_collectdiptablesmatch_protocol"
+msgid "Network protocol"
 msgstr "Protocolo de rede"
 
 #. Source ip range
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:111
-msgid "lucistatistics_collectdiptablesmatch_source"
+msgid "Source ip range"
 msgstr "IP de origem"
 
 #. CIDR notation
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:112
-msgid "lucistatistics_collectdiptablesmatch_source_desc"
+msgid "CIDR notation"
 msgstr "Notação CIDR"
 
 #. Destination ip range
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:113
-msgid "lucistatistics_collectdiptablesmatch_destination"
+msgid "Destination ip range"
 msgstr "IP de destino"
 
 #. CIDR notation
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:114
-msgid "lucistatistics_collectdiptablesmatch_destination_desc"
+msgid "CIDR notation"
 msgstr "Notação CIDR"
 
 #. Incoming interface
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:115
-msgid "lucistatistics_collectdiptablesmatch_inputif"
+msgid "Incoming interface"
 msgstr "Interface de entrada"
 
 #. e.g. br-lan
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:116
-msgid "lucistatistics_collectdiptablesmatch_inputif_desc"
+msgid "e.g. br-lan"
 msgstr "ex. br-lan"
 
 #. Outgoing interface
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:117
-msgid "lucistatistics_collectdiptablesmatch_outputif"
+msgid "Outgoing interface"
 msgstr "Interface de saída"
 
 #. e.g. br-ff
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:118
-msgid "lucistatistics_collectdiptablesmatch_outputif_desc"
+msgid "e.g. br-ff"
 msgstr "ex. br-ff"
 
 #. Options
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:119
-msgid "lucistatistics_collectdiptablesmatch_options"
+msgid "Options"
 msgstr "Opções"
 
 #. e.g. reject-with tcp-reset
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:120
-msgid "lucistatistics_collectdiptablesmatch_options_desc"
+msgid "e.g. reject-with tcp-reset"
 msgstr "ex. rejeitar-com tcp-reset"
 
 #. IRQ Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:121
-msgid "lucistatistics_collectdirq"
+msgid "IRQ Plugin Configuration"
 msgstr "Configuração do plugin IRQ"
 
 #. The irq plugin will monitor the rate of issues per second for each selected interrupt. If no interrupt is selected then all interrupts are monitored.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:122
-msgid "lucistatistics_collectdirq_desc"
+msgid "The irq plugin will monitor the rate of issues per second for each selected interrupt. If no interrupt is selected then all interrupts are monitored."
 msgstr ""
 "O plugin irq irá monitorar a taxa de erros por segundo de cada interrupção "
 "selecionada. Se nenhuma interrupção for selecionada então todas as "
@@ -661,119 +661,119 @@ msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:123
-msgid "lucistatistics_collectdirq_enable"
+msgid "Enable this plugin"
 msgstr "Habilitar este plugin"
 
 #. Monitor interrupts
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:124
-msgid "lucistatistics_collectdirq_irqs"
+msgid "Monitor interrupts"
 msgstr "Monitorar interrupções"
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:125
-msgid "lucistatistics_collectdirq_irqs_desc"
+msgid "multiple separated by space"
 msgstr "múltiplos valores, separados por espaço"
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:126
-msgid "lucistatistics_collectdirq_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr "Monitorar todas exceto as selecionadas"
 
 #. Load Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:127
-msgid "lucistatistics_collectdload"
+msgid "Load Plugin Configuration"
 msgstr "Configuração do plugin carga"
 
 #. The load plugin collects statistics about the general system load.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:128
-msgid "lucistatistics_collectdload_desc"
+msgid "The load plugin collects statistics about the general system load."
 msgstr "O plugin carga coleta estatísticas gerais sobre a carga do sistema."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:129
-msgid "lucistatistics_collectdload_enable"
+msgid "Enable this plugin"
 msgstr "Habilitar este plugin"
 
 #. Netlink Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:130
-msgid "lucistatistics_collectdnetlink"
+msgid "Netlink Plugin Configuration"
 msgstr "Configuração do plugin Netlink"
 
 #. The netlink plugin collects extended informations like qdisc-, class- and filter-statistics for selected interfaces.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:131
-msgid "lucistatistics_collectdnetlink_desc"
+msgid "The netlink plugin collects extended informations like qdisc-, class- and filter-statistics for selected interfaces."
 msgstr ""
 "O plugin Netlink coleta informações detalhadas como qdisc-, classe- e filtro "
 "de estatísticas das interfaces selecionadas."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:132
-msgid "lucistatistics_collectdnetlink_enable"
+msgid "Enable this plugin"
 msgstr "Habilitar este plugin"
 
 #. Basic monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:133
-msgid "lucistatistics_collectdnetlink_interfaces"
+msgid "Basic monitoring"
 msgstr "Monitoramento básico"
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:134
-msgid "lucistatistics_collectdnetlink_interfaces_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr "pressione Ctrl enquanto clica para selecionar várias interfaces"
 
 #. Verbose monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:135
-msgid "lucistatistics_collectdnetlink_verboseinterfaces"
+msgid "Verbose monitoring"
 msgstr "Monitoramento no modo verbose"
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:136
-msgid "lucistatistics_collectdnetlink_verboseinterfaces_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr "pressione Ctrl enquanto clica para selecionar várias interfaces"
 
 #. Qdisc monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:137
-msgid "lucistatistics_collectdnetlink_qdiscs"
+msgid "Qdisc monitoring"
 msgstr "Monitoramento do Qdisc"
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:138
-msgid "lucistatistics_collectdnetlink_qdiscs_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr "pressione Ctrl enquanto clica para selecionar várias interfaces"
 
 #. Shaping class monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:139
-msgid "lucistatistics_collectdnetlink_classes"
+msgid "Shaping class monitoring"
 msgstr "Monitoramento das Classes de Shaping"
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:140
-msgid "lucistatistics_collectdnetlink_classes_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr "pressione Ctrl enquanto clica para selecionar várias interfaces"
 
 #. Filter class monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:141
-msgid "lucistatistics_collectdnetlink_filters"
+msgid "Filter class monitoring"
 msgstr "Monitoramento das Classes de Filtros"
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:142
-msgid "lucistatistics_collectdnetlink_filters_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr "pressione Ctrl enquanto clica para selecionar várias interfaces"
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:143
-msgid "lucistatistics_collectdnetlink_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr "Monitorar todas exceto as selecionadas"
 
 #. Network Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:144
-msgid "lucistatistics_collectdnetwork"
+msgid "Network Plugin Configuration"
 msgstr "Configuração do plugin Rede"
 
 #. The network plugin provides network based communication between different collectd instances. Collectd can operate both in client and server mode. In client mode locally collected date is transferred to a collectd server instance, in server mode the local instance receives data from other hosts.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:145
-msgid "lucistatistics_collectdnetwork_desc"
+msgid "The network plugin provides network based communication between different collectd instances. Collectd can operate both in client and server mode. In client mode locally collected date is transferred to a collectd server instance, in server mode the local instance receives data from other hosts."
 msgstr ""
 "O plugin rede fornece informações de rede baseadas na comunicação entre as "
 "diferentes instâncias do collectd. O Collectd pode operar tanto no modo "
@@ -783,170 +783,170 @@ msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:146
-msgid "lucistatistics_collectdnetwork_enable"
+msgid "Enable this plugin"
 msgstr "Habilitar este plugin"
 
 #. Listener interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:147
-msgid "lucistatistics_collectdnetworklisten"
+msgid "Listener interfaces"
 msgstr "Escutar na(s) interface(s)"
 
 #. This section defines on which interfaces collectd will wait for incoming connections.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:148
-msgid "lucistatistics_collectdnetworklisten_desc"
+msgid "This section defines on which interfaces collectd will wait for incoming connections."
 msgstr ""
 "Esta seção define em quais interfaces o collectd irá aguardar para receber "
 "conexões."
 
 #. Listen host
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:149
-msgid "lucistatistics_collectdnetworklisten_host"
+msgid "Listen host"
 msgstr "Endereço de escuta do Host"
 
 #. host-, ip- or ip6 address
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:150
-msgid "lucistatistics_collectdnetworklisten_host_desc"
+msgid "host-, ip- or ip6 address"
 msgstr "hostname, ip ou ip6"
 
 #. Listen port
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:151
-msgid "lucistatistics_collectdnetworklisten_port"
+msgid "Listen port"
 msgstr "Porta de escuta"
 
 #. 0 - 65535
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:152
-msgid "lucistatistics_collectdnetworklisten_port_desc"
+msgid "0 - 65535"
 msgstr "0 - 65535"
 
 #. server interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:153
-msgid "lucistatistics_collectdnetworkserver"
+msgid "server interfaces"
 msgstr "Interfaces do servidor"
 
 #. This section defines to which servers the locally collected data is sent to.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:154
-msgid "lucistatistics_collectdnetworkserver_desc"
+msgid "This section defines to which servers the locally collected data is sent to."
 msgstr ""
 "Esta seção define para qual servidor os dados coletados localmente serão "
 "enviados."
 
 #. Server host
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:155
-msgid "lucistatistics_collectdnetworkserver_host"
+msgid "Server host"
 msgstr "IP/Hostname do servidor"
 
 #. host-, ip- or ip6 address
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:156
-msgid "lucistatistics_collectdnetworkserver_host_desc"
+msgid "host-, ip- or ip6 address"
 msgstr "hostname, ip ou ip6"
 
 #. Server port
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:157
-msgid "lucistatistics_collectdnetworkserver_port"
+msgid "Server port"
 msgstr "Porta do servidor"
 
 #. 0 - 65535
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:158
-msgid "lucistatistics_collectdnetworkserver_port_desc"
+msgid "0 - 65535"
 msgstr "0 - 65535"
 
 #. TTL for network packets
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:159
-msgid "lucistatistics_collectdnetwork_timetolive"
+msgid "TTL for network packets"
 msgstr "TTL para os pacotes de rede"
 
 #. 0 - 255
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:160
-msgid "lucistatistics_collectdnetwork_timetolive_desc"
+msgid "0 - 255"
 msgstr "0 - 255"
 
 #. Forwarding between listen and server addresses
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:161
-msgid "lucistatistics_collectdnetwork_forward"
+msgid "Forwarding between listen and server addresses"
 msgstr "Transmissão entre o endereço de escuta e dos servidores"
 
 #. Cache flush interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:162
-msgid "lucistatistics_collectdnetwork_cacheflush"
+msgid "Cache flush interval"
 msgstr "Intervalo de limpeza do cache"
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:163
-msgid "lucistatistics_collectdnetwork_cacheflush_desc"
+msgid "seconds"
 msgstr "segundos"
 
 #. Ping Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:164
-msgid "lucistatistics_collectdping"
+msgid "Ping Plugin Configuration"
 msgstr "Configuração do plugin Ping"
 
 #. The ping plugin will send icmp echo replies to selected hosts and measure the roundtrip time for each host.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:165
-msgid "lucistatistics_collectdping_desc"
+msgid "The ping plugin will send icmp echo replies to selected hosts and measure the roundtrip time for each host."
 msgstr ""
 "O plugin ping irá enviar pacotes ICMP to tipo echo aos hosts selecionados e "
 "medir o tempo de resposta para cada host."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:166
-msgid "lucistatistics_collectdping_enable"
+msgid "Enable this plugin"
 msgstr "Habilitar este plugin"
 
 #. Monitor hosts
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:167
-msgid "lucistatistics_collectdping_hosts"
+msgid "Monitor hosts"
 msgstr "Monitorar os hosts"
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:168
-msgid "lucistatistics_collectdping_hosts_desc"
+msgid "multiple separated by space"
 msgstr "múltiplos valores, separados por espaço"
 
 #. TTL for ping packets
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:169
-msgid "lucistatistics_collectdping_ttl"
+msgid "TTL for ping packets"
 msgstr "TTL para os pacotes do ping"
 
 #. 0 - 255
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:170
-msgid "lucistatistics_collectdping_ttl_desc"
+msgid "0 - 255"
 msgstr "0 - 255"
 
 #. Processes Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:171
-msgid "lucistatistics_collectdprocesses"
+msgid "Processes Plugin Configuration"
 msgstr "Configuração do plugin Processos"
 
 #. The processes plugin collects informations like cpu time, page faults and memory usage of selected processes.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:172
-msgid "lucistatistics_collectdprocesses_desc"
+msgid "The processes plugin collects informations like cpu time, page faults and memory usage of selected processes."
 msgstr ""
 "O plugin processo coleta informações como o tempo da cpu, página falhas e "
 "uso de memória dos processos selecionados."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:173
-msgid "lucistatistics_collectdprocesses_enable"
+msgid "Enable this plugin"
 msgstr "Habilitar este plugin"
 
 #. Monitor processes
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:174
-msgid "lucistatistics_collectdprocesses_processes"
+msgid "Monitor processes"
 msgstr "Monitorar processos"
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:175
-msgid "lucistatistics_collectdprocesses_processes_desc"
+msgid "multiple separated by space"
 msgstr "múltiplos valores, separados por espaço"
 
 #. RRDTool Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:176
-msgid "lucistatistics_collectdrrdtool"
+msgid "RRDTool Plugin Configuration"
 msgstr "Configuração do plugin RRDTool"
 
 #. The rrdtool plugin stores the collected data in rrd database files, the foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong values will result in a very high memory consumption in the temporary directory. This can render the device unusable!</strong>
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:177
-msgid "lucistatistics_collectdrrdtool_desc"
+msgid "The rrdtool plugin stores the collected data in rrd database files, the foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong values will result in a very high memory consumption in the temporary directory. This can render the device unusable!</strong>"
 msgstr ""
 "O plugin rrdtool armazena os dados coletados no arquivo de banco de dados "
 "rrd.<br /><br /><strong>Aviso: A má configuração desses valores, resultará "
@@ -955,176 +955,176 @@ msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:178
-msgid "lucistatistics_collectdrrdtool_enable"
+msgid "Enable this plugin"
 msgstr "Habilitar este plugin"
 
 #. Storage directory
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:179
-msgid "lucistatistics_collectdrrdtool_datadir"
+msgid "Storage directory"
 msgstr "Diretório de armazenamento"
 
 #. RRD step interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:180
-msgid "lucistatistics_collectdrrdtool_stepsize"
+msgid "RRD step interval"
 msgstr "Intervalo de atualização"
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:181
-msgid "lucistatistics_collectdrrdtool_stepsize_desc"
+msgid "seconds"
 msgstr "segundos"
 
 #. RRD heart beat interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:182
-msgid "lucistatistics_collectdrrdtool_heartbeat"
+msgid "RRD heart beat interval"
 msgstr "Intervalo entre duas atualizações"
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:183
-msgid "lucistatistics_collectdrrdtool_heartbeat_desc"
+msgid "seconds"
 msgstr "segundos"
 
 #. Only create average RRAs
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:184
-msgid "lucistatistics_collectdrrdtool_rrasingle"
+msgid "Only create average RRAs"
 msgstr "Somente criar RRAs de média"
 
 #. reduces rrd size
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:185
-msgid "lucistatistics_collectdrrdtool_rrasingle_desc"
+msgid "reduces rrd size"
 msgstr "reduzir o tamanho do rrd"
 
 #. Stored timespans
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:186
-msgid "lucistatistics_collectdrrdtool_rratimespans"
+msgid "Stored timespans"
 msgstr "Intervalos armazenados"
 
 #. seconds; multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:187
-msgid "lucistatistics_collectdrrdtool_rratimespans_desc"
+msgid "seconds; multiple separated by space"
 msgstr "segundos; vários valores, separar com espaço"
 
 #. Rows per RRA
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:188
-msgid "lucistatistics_collectdrrdtool_rrarows"
+msgid "Rows per RRA"
 msgstr "Linhas por RRA"
 
 #. RRD XFiles Factor
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:189
-msgid "lucistatistics_collectdrrdtool_xff"
+msgid "RRD XFiles Factor"
 msgstr "Arquivos RRD XFiles Factor"
 
 #. Cache collected data for
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:190
-msgid "lucistatistics_collectdrrdtool_cachetimeout"
+msgid "Cache collected data for"
 msgstr "Cache dos dados coletados"
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:191
-msgid "lucistatistics_collectdrrdtool_cachetimeout_desc"
+msgid "seconds"
 msgstr "segundos"
 
 #. Flush cache after
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:192
-msgid "lucistatistics_collectdrrdtool_cacheflush"
+msgid "Flush cache after"
 msgstr "Limpar cache após"
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:193
-msgid "lucistatistics_collectdrrdtool_cacheflush_desc"
+msgid "seconds"
 msgstr "segundos"
 
 #. TCPConns Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:194
-msgid "lucistatistics_collectdtcpconns"
+msgid "TCPConns Plugin Configuration"
 msgstr "Configuração do plugin TCPConns"
 
 #. The tcpconns plugin collects informations about open tcp connections on selected ports.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:195
-msgid "lucistatistics_collectdtcpconns_desc"
+msgid "The tcpconns plugin collects informations about open tcp connections on selected ports."
 msgstr ""
 "O plugin tcpconns coleta informações sobre as conexões TCP abertas das "
 "portas selecionadas."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:196
-msgid "lucistatistics_collectdtcpconns_enable"
+msgid "Enable this plugin"
 msgstr "Habilitar este plugin"
 
 #. Monitor all local listen ports
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:197
-msgid "lucistatistics_collectdtcpconns_listeningports"
+msgid "Monitor all local listen ports"
 msgstr "Monitorar todas as portas locais"
 
 #. Monitor local ports
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:198
-msgid "lucistatistics_collectdtcpconns_localports"
+msgid "Monitor local ports"
 msgstr "Monitorar as portas locais"
 
 #. 0 - 65535; multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:199
-msgid "lucistatistics_collectdtcpconns_localports_desc"
+msgid "0 - 65535; multiple separated by space"
 msgstr "0 - 65535; vários valores, separar com espaço"
 
 #. Monitor remote ports
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:200
-msgid "lucistatistics_collectdtcpconns_remoteports"
+msgid "Monitor remote ports"
 msgstr "Monitorar portas remotas"
 
 #. 0 - 65535; multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:201
-msgid "lucistatistics_collectdtcpconns_remoteports_desc"
+msgid "0 - 65535; multiple separated by space"
 msgstr "0 - 65535; vários valores, separar com espaço"
 
 #. Unixsock Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:202
-msgid "lucistatistics_collectdunixsock"
+msgid "Unixsock Plugin Configuration"
 msgstr "Configuração do plugin Unixsock"
 
 #. The unixsock plugin creates a unix socket which can be used to read collected data from a running collectd instance.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:203
-msgid "lucistatistics_collectdunixsock_desc"
+msgid "The unixsock plugin creates a unix socket which can be used to read collected data from a running collectd instance."
 msgstr ""
 "O plugin unixsock cria um socket unix, que pode ser usado para ler os dados "
 "coletados a partir de uma instância do collectd."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:204
-msgid "lucistatistics_collectdunixsock_enable"
+msgid "Enable this plugin"
 msgstr "Habilitar este plugin"
 
 #. Filepath of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:205
-msgid "lucistatistics_collectdunixsock_socketfile"
+msgid "Filepath of the unix socket"
 msgstr "Caminho do arquivo socket unix"
 
 #. Group ownership of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:206
-msgid "lucistatistics_collectdunixsock_socketgroup"
+msgid "Group ownership of the unix socket"
 msgstr "Grupo dono do socket unix"
 
 #. group name
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:207
-msgid "lucistatistics_collectdunixsock_socketgroup_desc"
+msgid "group name"
 msgstr "nome do grupo"
 
 #. File permissions of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:208
-msgid "lucistatistics_collectdunixsock_socketperms"
+msgid "File permissions of the unix socket"
 msgstr "Permissões de arquivo do socket unix"
 
 #. octal
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:209
-msgid "lucistatistics_collectdunixsock_socketperms_desc"
+msgid "octal"
 msgstr "octal"
 
 #. Wireless Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:210
-msgid "lucistatistics_collectdwireless"
+msgid "Wireless Plugin Configuration"
 msgstr "Configuração do plugin Wireless"
 
 #. The wireless plugin collects statistics about wireless signal strength, noise and quality.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:211
-msgid "lucistatistics_collectdwireless_desc"
+msgid "The wireless plugin collects statistics about wireless signal strength, noise and quality."
 msgstr ""
 "O plugin wireless coleta estatísticas sobre o nível de sinal wireless, o "
 "ruído e qualidade."
diff --git a/po/pt/sysauth.po b/po/pt/sysauth.po
index 5b6306cc0..f6cf5e5c0 100644
--- a/po/pt/sysauth.po
+++ b/po/pt/sysauth.po
@@ -13,12 +13,12 @@ msgstr ""
 
 #. Authorization Required
 #: i18n/english/luasrc/i18n/sysauth.en.lua:1
-msgid "sysauth_head"
+msgid "Authorization Required"
 msgstr "Autorização Requerida"
 
 #. Please enter your username and password.
 #: i18n/english/luasrc/i18n/sysauth.en.lua:2
-msgid "sysauth_prompt"
+msgid "Please enter your username and password."
 msgstr "Insira o seu username e password."
 
 #. Invalid username and/or password! Please try again.
diff --git a/po/pt/tinyproxy.po b/po/pt/tinyproxy.po
index 0db689739..a6256c33b 100644
--- a/po/pt/tinyproxy.po
+++ b/po/pt/tinyproxy.po
@@ -14,157 +14,157 @@ msgstr ""
 
 #. Tinyproxy
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:1
-msgid "tinyproxy"
+msgid "Tinyproxy"
 msgstr "Tinyproxy"
 
 #. Tinyproxy is a small and fast non-caching HTTP(S)-Proxy
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:2
-msgid "tinyproxy_desc"
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
 msgstr "Tinyproxy é um pequeno e rápido Proxy-HTTP(S) sem suporte à cache"
 
 #. Allow access from
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:3
-msgid "tinyproxy_tinyproxy_allow"
+msgid "Allow access from"
 msgstr "Permitir acesso de"
 
 #. Allowed headers for anonymous proxy
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:4
-msgid "tinyproxy_tinyproxy_anonymous"
+msgid "Allowed headers for anonymous proxy"
 msgstr "Cabeçalhos permitidos para proxy anônimo"
 
 #. Bind outgoing traffic to address
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:5
-msgid "tinyproxy_tinyproxy_bind"
+msgid "Bind outgoing traffic to address"
 msgstr "Associar o tráfego de saída ao endereço"
 
 #. Ports allowed for CONNECT method
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:6
-msgid "tinyproxy_tinyproxy_connectport"
+msgid "Ports allowed for CONNECT method"
 msgstr "Portas permitidas para o método CONNECT "
 
 #. 0 = disabled, empty = all
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:7
-msgid "tinyproxy_tinyproxy_connectport_desc"
+msgid "0 = disabled, empty = all"
 msgstr "0 = desativado, vazio = todas"
 
 #. Error document
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:8
-msgid "tinyproxy_tinyproxy_defaulterrorfile"
+msgid "Error document"
 msgstr "Documento de erro"
 
 #. Filter list
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:9
-msgid "tinyproxy_tinyproxy_filter"
+msgid "Filter list"
 msgstr "Lista de filtros"
 
 #. Case sensitive filters
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:10
-msgid "tinyproxy_tinyproxy_filtercasesensitive"
+msgid "Case sensitive filters"
 msgstr "Filtros &quot;case sensitive&quot;"
 
 #. Filter list is a whitelist
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:11
-msgid "tinyproxy_tinyproxy_filterdefaultdeny"
+msgid "Filter list is a whitelist"
 msgstr "A lista de filtros é uma lista branca"
 
 #. Extended regular expression filters
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:12
-msgid "tinyproxy_tinyproxy_filterextended"
+msgid "Extended regular expression filters"
 msgstr "Filtros com suporte à expressões regulares"
 
 #. Filter URLs instead of domains
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:13
-msgid "tinyproxy_tinyproxy_filterurls"
+msgid "Filter URLs instead of domains"
 msgstr "Filtrar URLs em vez de domínios"
 
 #. Listen on address
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:14
-msgid "tinyproxy_tinyproxy_listen"
+msgid "Listen on address"
 msgstr "Escutar no endereço"
 
 #. Logfile
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:15
-msgid "tinyproxy_tinyproxy_logfile"
+msgid "Logfile"
 msgstr "Arquivo de log"
 
 #. Log level
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:16
-msgid "tinyproxy_tinyproxy_loglevel"
+msgid "Log level"
 msgstr "Nível do log"
 
 #. Maximum number of clients
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:17
-msgid "tinyproxy_tinyproxy_maxclients"
+msgid "Maximum number of clients"
 msgstr "Número máximo de clientes"
 
 #. Maximum requests per thread
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:18
-msgid "tinyproxy_tinyproxy_maxrequestsperchild"
+msgid "Maximum requests per thread"
 msgstr "Máximo de solicitações por thread"
 
 #. Max. spare servers
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:19
-msgid "tinyproxy_tinyproxy_maxspareservers"
+msgid "Max. spare servers"
 msgstr "Max. servidores sobressalentes"
 
 #. Min. spare servers
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:20
-msgid "tinyproxy_tinyproxy_minspareservers"
+msgid "Min. spare servers"
 msgstr "Min. servidores sobressalentes"
 
 #. Spare servers to start with
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:21
-msgid "tinyproxy_tinyproxy_startservers"
+msgid "Spare servers to start with"
 msgstr "Servidores sobressalentes iniciar com"
 
 #. Statistic document
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:22
-msgid "tinyproxy_tinyproxy_statfile"
+msgid "Statistic document"
 msgstr "Documento de estatísticas"
 
 #. Write to syslog
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:23
-msgid "tinyproxy_tinyproxy_syslog"
+msgid "Write to syslog"
 msgstr "Escrever para syslog"
 
 #. Connection Timeout
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:24
-msgid "tinyproxy_tinyproxy_timeout"
+msgid "Connection Timeout"
 msgstr "Timeout de conexão"
 
 #. Value of Via-Header
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:25
-msgid "tinyproxy_tinyproxy_viaproxyname"
+msgid "Value of Via-Header"
 msgstr "Valor do cabeçalho &quot;Via-Header&quot;"
 
 #. Include client IP
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:26
-msgid "tinyproxy_tinyproxy_xtinyproxy"
+msgid "Include client IP"
 msgstr "Incluir o IP do cliente"
 
 #. Via proxy
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:27
-msgid "tinyproxy_type_proxy"
+msgid "Via proxy"
 msgstr "Via proxy"
 
 #. Reject access
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:28
-msgid "tinyproxy_type_reject"
+msgid "Reject access"
 msgstr "Rejeitar o acesso"
 
 #. Upstream Control
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:29
-msgid "tinyproxy_upstream"
+msgid "Upstream Control"
 msgstr "Controle de Upstream"
 
 #. Target host
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:30
-msgid "tinyproxy_upstream_target"
+msgid "Target host"
 msgstr "Host de destino"
 
 #. Type
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:31
-msgid "tinyproxy_upstream_type"
+msgid "Type"
 msgstr "Tipo"
 
 #. Upstream Proxy
diff --git a/po/pt/upnp.po b/po/pt/upnp.po
index e8a5fe633..aab24a750 100644
--- a/po/pt/upnp.po
+++ b/po/pt/upnp.po
@@ -14,36 +14,36 @@ msgstr ""
 
 #. Universal Plug &amp; Play
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:1
-msgid "upnpd"
+msgid "Universal Plug & Play"
 msgstr "Plug &amp; Play Universal"
 
 #. UPNP allows clients in the local network to automatically configure the router.
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:2
-msgid "upnpd_desc"
+msgid "UPNP allows clients in the local network to automatically configure the router."
 msgstr ""
 "UPNP permite os clientes da rede local automaticamente configurar o "
 "roteador."
 
 #. UPNP should only be enabled if absolutely necessary as it can result in high security risks for your network.
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:3
-msgid "upnpd_config_desc"
+msgid "UPNP should only be enabled if absolutely necessary as it can result in high security risks for your network."
 msgstr ""
 "O UPNP deve ser ativado apenas se for absolutamente necessário, pois ele "
 "pode resultar em elevados riscos de segurança para sua rede."
 
 #. Enable secure mode
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:4
-msgid "upnpd_config_securemode"
+msgid "Enable secure mode"
 msgstr "Enable secure mode"
 
 #. Log output
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:5
-msgid "upnpd_config_logoutput"
+msgid "Log output"
 msgstr "Log de saída"
 
 #. Downlink
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:6
-msgid "upnpd_config_download"
+msgid "Downlink"
 msgstr "Link para download"
 
 #. Uplink
diff --git a/po/pt/ushare.po b/po/pt/ushare.po
index 3466d1570..19f974fca 100644
--- a/po/pt/ushare.po
+++ b/po/pt/ushare.po
@@ -14,37 +14,37 @@ msgstr ""
 
 #. Content directories
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:1
-msgid "content_directories"
+msgid "Content directories"
 msgstr "Diretórios de conteúdo"
 
 #. Disable telnet console
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:2
-msgid "disable_telnet"
+msgid "Disable telnet console"
 msgstr "Desativar console telnet"
 
 #. Disable webinterface
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:3
-msgid "disable_webif"
+msgid "Disable webinterface"
 msgstr "Desativar interface web"
 
 #. Options
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:4
-msgid "options"
+msgid "Options"
 msgstr "Opções"
 
 #. Servername
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:5
-msgid "servername"
+msgid "Servername"
 msgstr "Nome do servidor"
 
 #. Settings
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:6
-msgid "settings"
+msgid "Settings"
 msgstr "Configurações"
 
 #. uShare
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:7
-msgid "ushare"
+msgid "uShare"
 msgstr "uShare"
 
 #. uShare
diff --git a/po/pt/uvc_streamer.po b/po/pt/uvc_streamer.po
index 41b5a75a3..a91beb17d 100644
--- a/po/pt/uvc_streamer.po
+++ b/po/pt/uvc_streamer.po
@@ -14,22 +14,22 @@ msgstr ""
 
 #. Frames per second
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
-msgid "framespersecond"
+msgid "Frames per second"
 msgstr "Frames por segundo"
 
 #. Resolution
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
-msgid "resolution"
+msgid "Resolution"
 msgstr "Resolução"
 
 #. Settings
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
-msgid "settings"
+msgid "Settings"
 msgstr "Configurações"
 
 #. Webcam streaming
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
-msgid "uvc_streamer"
+msgid "Webcam streaming"
 msgstr "Webcam streaming"
 
 #. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
diff --git a/po/pt/uvl.po b/po/pt/uvl.po
index d3de25c34..d37c29b70 100644
--- a/po/pt/uvl.po
+++ b/po/pt/uvl.po
@@ -14,219 +14,219 @@ msgstr ""
 
 #. Unable to load config \"%p\": %1
 #: libs/uvl/luasrc/i18n/uvl.en.lua:1
-msgid "uvl_err_uciload"
+msgid "Unable to load config \"%p\": %1"
 msgstr "Não foi possível carregar a configuração \"%p\": %1"
 
 #. Error in scheme \"%p\":\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:2
-msgid "uvl_err_scheme"
+msgid "Error in scheme \"%p\":\\n%c"
 msgstr ""
 "Erro no esquema \"%p\":\n"
 "%c"
 
 #. Error in config \"%p\":\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:3
-msgid "uvl_err_config"
+msgid "Error in config \"%p\":\\n%c"
 msgstr ""
 "Erro na configuração \"%p\":\n"
 "%c"
 
 #. Error in section \"%i\" (%I):\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:4
-msgid "uvl_err_section"
+msgid "Error in section \"%i\" (%I):\\n%c"
 msgstr ""
 "Erro na seção \"%i\" (%I):\n"
 "%c"
 
 #. Error in option \"%i\" (%I):\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:5
-msgid "uvl_err_option"
+msgid "Error in option \"%i\" (%I):\\n%c"
 msgstr ""
 "Erro na opção \"%i\" (%I):\n"
 "%c"
 
 #. Option \"%i\" has invalid reference specification %1:\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:6
-msgid "uvl_err_reference"
+msgid "Option \"%i\" has invalid reference specification %1:\\n%c"
 msgstr ""
 "Opção \"%i\" tem especificação de referência inválida %1:\n"
 "%c"
 
 #. In dependency check for %t \"%i\":\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:7
-msgid "uvl_err_dependency"
+msgid "In dependency check for %t \"%i\":\\n%c"
 msgstr ""
 "Na dependência de verificação %t \"%i\":\n"
 "%c"
 
 #. Can not find scheme \"%p\" in \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:8
-msgid "uvl_err_sme_find"
+msgid "Can not find scheme \"%p\" in \"%1\""
 msgstr "Não é possível encontrar o esquema \"%p\" in \"%1\""
 
 #. Can not access file \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:9
-msgid "uvl_err_sme_read"
+msgid "Can not access file \"%1\""
 msgstr "Não é possível acessar o arquivo \"%1\""
 
 #. Missing required scheme field \"%1\" in \"%i\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:10
-msgid "uvl_err_sme_reqfld"
+msgid "Missing required scheme field \"%1\" in \"%i\""
 msgstr "Faltando campo requerido no esquema: \"%1\" em \"%i\""
 
 #. Illegal reference \"%1\" to an anonymous section
 #: libs/uvl/luasrc/i18n/uvl.en.lua:11
-msgid "uvl_err_sme_invref"
+msgid "Illegal reference \"%1\" to an anonymous section"
 msgstr "Referência \"1%\" ilegal para uma seção anônima"
 
 #. Malformed reference in \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:12
-msgid "uvl_err_sme_badref"
+msgid "Malformed reference in \"%1\""
 msgstr "Referência mal elaborada em \"%1\""
 
 #. Malformed dependency specification \"%1\" in \"%i\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:13
-msgid "uvl_err_sme_baddep"
+msgid "Malformed dependency specification \"%1\" in \"%i\""
 msgstr "Especificação de dependência mal elaborada: \"%1\" em \"%i\""
 
 #. Malformed validator specification \"%1\" in \"%i\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:14
-msgid "uvl_err_sme_badval"
+msgid "Malformed validator specification \"%1\" in \"%i\""
 msgstr "Especificação de validador mal elaborada: \"%1\" em \"%i\""
 
 #. External validator \"%1\" failed: %2
 #: libs/uvl/luasrc/i18n/uvl.en.lua:15
-msgid "uvl_err_sme_errval"
+msgid "External validator \"%1\" failed: %2"
 msgstr "Validador externo \"%1\" falhou: %2"
 
 #. Variable \"%o\" in scheme \"%p\" references unknown package \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:16
-msgid "uvl_err_sme_vbadpack"
+msgid "Variable \"%o\" in scheme \"%p\" references unknown package \"%1\""
 msgstr ""
 "Variável \"%o\" no esquema \"%p\" faz referência para um pacote desconecido \"%1\""
 
 #. Variable \"%o\" in scheme \"%p\" references unknown section \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:17
-msgid "uvl_err_sme_vbadsect"
+msgid "Variable \"%o\" in scheme \"%p\" references unknown section \"%1\""
 msgstr ""
 "Variável \"%o\" no esquema \"%p\" faz referência para uma seção desconecida \"%1\""
 
 #. Enum \"%v\" in scheme \"%p\" references unknown package \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:18
-msgid "uvl_err_sme_ebadpack"
+msgid "Enum \"%v\" in scheme \"%p\" references unknown package \"%1\""
 msgstr ""
 "Enum \"%v\" no esquema \"%p\" faz referência para um pacote desconecido \"%1\""
 
 #. Enum \"%v\" in scheme \"%p\" references unknown section \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:19
-msgid "uvl_err_sme_ebadsect"
+msgid "Enum \"%v\" in scheme \"%p\" references unknown section \"%1\""
 msgstr ""
 "Enum \"%v\" no esquema \"%p\" faz referência para uma seção desconecida \"%1\""
 
 #. Enum \"%v\" in scheme \"%p\" references unknown option \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:20
-msgid "uvl_err_sme_ebadopt"
+msgid "Enum \"%v\" in scheme \"%p\" references unknown option \"%1\""
 msgstr ""
 "Enum \"%v\" no esquema \"%p\" faz referência para uma opção desconecida \"%1\""
 
 #. Enum \"%v\" in scheme \"%p\" references non-enum option \"%p.%s.%o\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:21
-msgid "uvl_err_sme_ebadtype"
+msgid "Enum \"%v\" in scheme \"%p\" references non-enum option \"%p.%s.%o\""
 msgstr ""
 "Enum \"%v\" no esquema \"%p\" faz referência para uma opção não-enum \"%p.%s.%o\""
 
 #. Enum \"%v\" in scheme \"%p\" redeclares the default value of \"%p.%s.%o\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:22
-msgid "uvl_err_sme_ebaddef"
+msgid "Enum \"%v\" in scheme \"%p\" redeclares the default value of \"%p.%s.%o\""
 msgstr "Enum \"%v\" no esquema \"%p\" redeclara o valor padrão de \"%p.%s.%o\""
 
 #. Section \"%i\" (%I) not found in scheme
 #: libs/uvl/luasrc/i18n/uvl.en.lua:23
-msgid "uvl_err_sect_unknown"
+msgid "Section \"%i\" (%I) not found in scheme"
 msgstr "Seção \"%i\" (%I) não encontrada no esquema"
 
 #. Required section \"%p.%s\" not found in config
 #: libs/uvl/luasrc/i18n/uvl.en.lua:24
-msgid "uvl_err_sect_required"
+msgid "Required section \"%p.%s\" not found in config"
 msgstr "Seção requerida \"%p.%s\" não encontrada na configuração"
 
 #. Unique section \"%p.%s\" occurs multiple times in config
 #: libs/uvl/luasrc/i18n/uvl.en.lua:25
-msgid "uvl_err_sect_unique"
+msgid "Unique section \"%p.%s\" occurs multiple times in config"
 msgstr "Seção única \"%p.%s\" ocorre várias vezes na configuração"
 
 #. The section of type \"%p.%s\" is stored anonymously in config but must be named
 #: libs/uvl/luasrc/i18n/uvl.en.lua:26
-msgid "uvl_err_sect_named"
+msgid "The section of type \"%p.%s\" is stored anonymously in config but must be named"
 msgstr ""
 "A seção do tipo \"%p.%s\" está armazenada na configuração como anônima, mas "
 "deve ser nomeada"
 
 #. Section \"%p.%s\" not found in config
 #: libs/uvl/luasrc/i18n/uvl.en.lua:27
-msgid "uvl_err_sect_notfound"
+msgid "Section \"%p.%s\" not found in config"
 msgstr "Seção \"%p.%s\" não encontrada na configuração"
 
 #. Option \"%i\" (%I) not found in scheme
 #: libs/uvl/luasrc/i18n/uvl.en.lua:28
-msgid "uvl_err_opt_unknown"
+msgid "Option \"%i\" (%I) not found in scheme"
 msgstr "Opção \"%i\" (%I) não encontrada no esquema"
 
 #. Required option \"%i\" has no value
 #: libs/uvl/luasrc/i18n/uvl.en.lua:29
-msgid "uvl_err_opt_required"
+msgid "Required option \"%i\" has no value"
 msgstr "Opção requerida \"%i\" não tem nenhum valor"
 
 #. Value \"%1\" of option \"%i\" is not defined in enum %2
 #: libs/uvl/luasrc/i18n/uvl.en.lua:30
-msgid "uvl_err_opt_badvalue"
+msgid "Value \"%1\" of option \"%i\" is not defined in enum %2"
 msgstr "Valor \"%1\" da opção \"%i\" não está definido no enum %2"
 
 #. Value \"%1\" of option \"%i\" does not validate as datatype \"%2\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:31
-msgid "uvl_err_opt_invvalue"
+msgid "Value \"%1\" of option \"%i\" does not validate as datatype \"%2\""
 msgstr "Valor \"%1\" da opção \"%i\" não foi validado como tipo de dados \"%2\""
 
 #. Option \"%i\" is defined as list but stored as plain value
 #: libs/uvl/luasrc/i18n/uvl.en.lua:32
-msgid "uvl_err_opt_notlist"
+msgid "Option \"%i\" is defined as list but stored as plain value"
 msgstr ""
 "Opção \"%i\" está definida como lista, mas armazenada como um valor simples"
 
 #. Option \"%i\" has unknown datatype \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:33
-msgid "uvl_err_opt_datatype"
+msgid "Option \"%i\" has unknown datatype \"%1\""
 msgstr "Opção \"%i\" tem o tipo de dados desconhecido \"%1\""
 
 #. Option \"%p.%s.%o\" not found in config
 #: libs/uvl/luasrc/i18n/uvl.en.lua:34
-msgid "uvl_err_opt_notfound"
+msgid "Option \"%p.%s.%o\" not found in config"
 msgstr "Opção \"%p.%s.%o\" não encontrada na configuração"
 
 #. Dependency (%1) failed:\noption \"%i\" is not eqal \"%2\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:35
-msgid "uvl_err_dep_notequal"
+msgid "Dependency (%1) failed:\\noption \"%i\" is not eqal \"%2\""
 msgstr ""
 "Dependência (%1) falhou:\n"
 "opção \"%i\" is not eqal à \"%2\""
 
 #. Dependency (%1) failed:\noption \"%i\" has no value
 #: libs/uvl/luasrc/i18n/uvl.en.lua:36
-msgid "uvl_err_dep_novalue"
+msgid "Dependency (%1) failed:\\noption \"%i\" has no value"
 msgstr ""
 "Dependência (%1) falhou:\n"
 "opção \"%i\" não tem nenhum valor"
 
 #. Dependency (%1) failed:\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:37
-msgid "uvl_err_dep_notvalid"
+msgid "Dependency (%1) failed:\\n%c"
 msgstr ""
 "Dependência (%1) falhou:\n"
 "%c"
 
 #. Recursive dependency for option \"%i\" detected
 #: libs/uvl/luasrc/i18n/uvl.en.lua:38
-msgid "uvl_err_dep_recursive"
+msgid "Recursive dependency for option \"%i\" detected"
 msgstr "Dependência recursiva para a opção \"%i\" detectada"
 
 #. In dependency check for enum value \"%i\":\n%c
diff --git a/po/pt/wifi.po b/po/pt/wifi.po
index c6b74d09a..b6d72a2a1 100644
--- a/po/pt/wifi.po
+++ b/po/pt/wifi.po
@@ -13,195 +13,195 @@ msgstr ""
 
 #. auto
 #: i18n/english/luasrc/i18n/wifi.en.lua:1
-msgid "wifi_auto"
+msgid "auto"
 msgstr "automático"
 
 #. Frequency Hopping
 #: i18n/english/luasrc/i18n/wifi.en.lua:2
-msgid "wifi_fh"
+msgid "Frequency Hopping"
 msgstr "Salto de Frequência"
 
 #. Diversity
 #: i18n/english/luasrc/i18n/wifi.en.lua:3
-msgid "wifi_diversity"
+msgid "Diversity"
 msgstr "Diversidade"
 
 #. Transmitter Antenna
 #: i18n/english/luasrc/i18n/wifi.en.lua:4
-msgid "wifi_txantenna"
+msgid "Transmitter Antenna"
 msgstr "Antena de Transmissão"
 
 #. Receiver Antenna
 #: i18n/english/luasrc/i18n/wifi.en.lua:5
-msgid "wifi_rxantenna"
+msgid "Receiver Antenna"
 msgstr "Antena de Recepção"
 
 #. Distance Optimization
 #: i18n/english/luasrc/i18n/wifi.en.lua:6
-msgid "wifi_distance"
+msgid "Distance Optimization"
 msgstr "Optimização de Distância"
 
 #. Distance to farthest network member in meters.
 #: i18n/english/luasrc/i18n/wifi.en.lua:7
-msgid "wifi_distance_desc"
+msgid "Distance to farthest network member in meters."
 msgstr "Distância para o último host da rede (em metros)."
 
 #. MAC-Address Filter
 #: i18n/english/luasrc/i18n/wifi.en.lua:8
-msgid "wifi_macpolicy"
+msgid "MAC-Address Filter"
 msgstr "Filtro de Endereço-MAC"
 
 #. Allow listed only
 #: i18n/english/luasrc/i18n/wifi.en.lua:9
-msgid "wifi_whitelist"
+msgid "Allow listed only"
 msgstr "Permitir somente os listados"
 
 #. Allow all except listed
 #: i18n/english/luasrc/i18n/wifi.en.lua:10
-msgid "wifi_blacklist"
+msgid "Allow all except listed"
 msgstr "Permitir todos, excepto os listados"
 
 #. MAC-List
 #: i18n/english/luasrc/i18n/wifi.en.lua:11
-msgid "wifi_maclist"
+msgid "MAC-List"
 msgstr "Lista de MAC"
 
 #. Frame Bursting
 #: i18n/english/luasrc/i18n/wifi.en.lua:12
-msgid "wifi_bursting"
+msgid "Frame Bursting"
 msgstr "Frame Bursting"
 
 #. Regulatory Domain
 #: i18n/english/luasrc/i18n/wifi.en.lua:13
-msgid "wifi_regdomain"
+msgid "Regulatory Domain"
 msgstr "Domínio Regulatório"
 
 #. Country Code
 #: i18n/english/luasrc/i18n/wifi.en.lua:14
-msgid "wifi_country"
+msgid "Country Code"
 msgstr "Código do País"
 
 #. Outdoor Channels
 #: i18n/english/luasrc/i18n/wifi.en.lua:15
-msgid "wifi_outdoor"
+msgid "Outdoor Channels"
 msgstr "Canais de Outdoor"
 
 #. Connection Limit
 #: i18n/english/luasrc/i18n/wifi.en.lua:16
-msgid "wifi_maxassoc"
+msgid "Connection Limit"
 msgstr "Máximo de Associações"
 
 #. <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:17
-msgid "wifi_essid"
+msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 "<abbr title=\"Identificador de Conjunto de Serviços Estendidos\">ESSID</abbr>"
 
 #. <abbr title=\"Basic Service Set Identifier\">BSSID</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:18
-msgid "wifi_bssid"
+msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr "<abbr title=\"Identificador de Conjunto Básico de Serviços\">BSSID</abbr>"
 
 #. Fragmentation Threshold
 #: i18n/english/luasrc/i18n/wifi.en.lua:19
-msgid "wifi_frag"
+msgid "Fragmentation Threshold"
 msgstr "Fragmentation Threshold"
 
 #. RTS/CTS Threshold
 #: i18n/english/luasrc/i18n/wifi.en.lua:20
-msgid "wifi_rts"
+msgid "RTS/CTS Threshold"
 msgstr "RTS/CTS Threshold"
 
 #. <abbr title=\"Wireless Distribution System\">WDS</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:21
-msgid "wifi_wds"
+msgid "<abbr title=\"Wireless Distribution System\">WDS</abbr>"
 msgstr "<abbr title=\"Sistema de Distribuição Wireless\">WDS</abbr>"
 
 #. Separate WDS
 #: i18n/english/luasrc/i18n/wifi.en.lua:22
-msgid "wifi_wdssep"
+msgid "Separate WDS"
 msgstr "Separar WDS"
 
 #. Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:23
-msgid "wifi_hidden"
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 "Ocultar <abbr title=\"Identificador de Conjunto de Serviços "
 "Estendidos\">ESSID</abbr>"
 
 #. Isolate Clients
 #: i18n/english/luasrc/i18n/wifi.en.lua:24
-msgid "wifi_isloate"
+msgid "Isolate Clients"
 msgstr "Isolar Clientes"
 
 #. Prevent Client to Client Communication
 #: i18n/english/luasrc/i18n/wifi.en.lua:25
-msgid "wifi_isloate_desc"
+msgid "Prevent Client to Client Communication"
 msgstr "Previnir Comunicação de Cliente para Cliente"
 
 #. Background Scan
 #: i18n/english/luasrc/i18n/wifi.en.lua:26
-msgid "wifi_bgscan"
+msgid "Background Scan"
 msgstr "Procurar em Segundo Plano"
 
 #. Transmission Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:27
-msgid "wifi_rate"
+msgid "Transmission Rate"
 msgstr "Taxa de Transmissão"
 
 #. Multicast Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:28
-msgid "wifi_mcast_rate"
+msgid "Multicast Rate"
 msgstr "Taxa de Multicast"
 
 #. Minimum Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:29
-msgid "wifi_minrate"
+msgid "Minimum Rate"
 msgstr "Taxa Mínima"
 
 #. Maximum Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:30
-msgid "wifi_maxrate"
+msgid "Maximum Rate"
 msgstr "Taxa Máxima"
 
 #. Compression
 #: i18n/english/luasrc/i18n/wifi.en.lua:31
-msgid "wifi_compression"
+msgid "Compression"
 msgstr "Compressão"
 
 #. Turbo Mode
 #: i18n/english/luasrc/i18n/wifi.en.lua:32
-msgid "wifi_turbo"
+msgid "Turbo Mode"
 msgstr "Modo Turbo"
 
 #. Fast Frames
 #: i18n/english/luasrc/i18n/wifi.en.lua:33
-msgid "wifi_ff"
+msgid "Fast Frames"
 msgstr "Frames Rápidas"
 
 #. WMM Mode
 #: i18n/english/luasrc/i18n/wifi.en.lua:34
-msgid "wifi_wmm"
+msgid "WMM Mode"
 msgstr "Modo WMM"
 
 #. XR Support
 #: i18n/english/luasrc/i18n/wifi.en.lua:35
-msgid "wifi_xr"
+msgid "XR Support"
 msgstr "Suporte XR"
 
 #. AR Support
 #: i18n/english/luasrc/i18n/wifi.en.lua:36
-msgid "wifi_ar"
+msgid "AR Support"
 msgstr "Suporte AR"
 
 #. Disable HW-Beacon timer
 #: i18n/english/luasrc/i18n/wifi.en.lua:37
-msgid "wifi_nosbeacon"
+msgid "Disable HW-Beacon timer"
 msgstr "Desactivar temporizador de HW-Beacon"
 
 #. Do not send probe responses
 #: i18n/english/luasrc/i18n/wifi.en.lua:38
-msgid "wifi_noprobereq"
+msgid "Do not send probe responses"
 msgstr "Não enviar respostas a sondas"
 
 #. WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP and ad-hoc mode) to be installed.
diff --git a/po/pt_BR/admin-core.po b/po/pt_BR/admin-core.po
index 150307281..b5694d8ad 100644
--- a/po/pt_BR/admin-core.po
+++ b/po/pt_BR/admin-core.po
@@ -13,22 +13,22 @@ msgstr ""
 
 #. The following changes have been applied
 #: i18n/english/luasrc/i18n/admin-core.en.lua:1
-msgid "uci_applied"
+msgid "The following changes have been applied"
 msgstr "Foram aplicadas as seguintes alterações "
 
 #. The following changes have been reverted
 #: i18n/english/luasrc/i18n/admin-core.en.lua:2
-msgid "uci_reverted"
+msgid "The following changes have been reverted"
 msgstr "Foram recuperadas as seguintes alterações "
 
 #. User Interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:3
-msgid "a_i_ui"
+msgid "User Interface"
 msgstr "Interface do Utilizador"
 
 #. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a collection of free Lua software including an <abbr title=\"Model-View-Controller\">MVC</abbr>-Webframework and webinterface for embedded devices. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is licensed under the Apache-License.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:4
-msgid "c_lucidesc"
+msgid "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a collection of free Lua software including an <abbr title=\"Model-View-Controller\">MVC</abbr>-Webframework and webinterface for embedded devices. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is licensed under the Apache-License."
 msgstr ""
 "<abbr title=\"Interface de configuração Lua\">LuCI</abbr> é uma colecção "
 "gratuita de programas Lua incluindo um Framework Web <abbr title=\"Modelo-"
@@ -38,32 +38,32 @@ msgstr ""
 
 #. Project Homepage
 #: i18n/english/luasrc/i18n/admin-core.en.lua:5
-msgid "c_projecthome"
+msgid "Project Homepage"
 msgstr "Página do Projecto"
 
 #. Lead Development
 #: i18n/english/luasrc/i18n/admin-core.en.lua:6
-msgid "c_leaddev"
+msgid "Lead Development"
 msgstr "Equipa de Desenvolvimento"
 
 #. Contributing Developers
 #: i18n/english/luasrc/i18n/admin-core.en.lua:7
-msgid "c_contributors"
+msgid "Contributing Developers"
 msgstr "Programadores Contribuintes"
 
 #. Thanks To
 #: i18n/english/luasrc/i18n/admin-core.en.lua:8
-msgid "c_thanksto"
+msgid "Thanks To"
 msgstr "Obrigado a"
 
 #. Hello!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:9
-msgid "a_i_i_hello"
+msgid "Hello!"
 msgstr "Olá!"
 
 #. This is the administration area of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:10
-msgid "a_i_i_admin1"
+msgid "This is the administration area of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>."
 msgstr ""
 "Esta é a área de administração do <abbr title=\"Interface de configuração "
 "Lua\">LuCI</abbr>."
@@ -71,7 +71,7 @@ msgstr ""
 # "free as in freedom" equivale a "livre de liberdade" não de "grátis"
 #. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a free, flexible, and user friendly graphical interface for configuring OpenWrt Kamikaze.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:11
-msgid "a_i_i_admin2"
+msgid "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a free, flexible, and user friendly graphical interface for configuring OpenWrt Kamikaze."
 msgstr ""
 "O <abbr title=\"Interface de configuração Lua\">LuCI</abbr> é um interface "
 "gráfico livre, flexível e fácil de utilizar para configurar o OpenWrt "
@@ -79,14 +79,14 @@ msgstr ""
 
 #. On the following pages you can adjust all important settings of your router.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:12
-msgid "a_i_i_admin3"
+msgid "On the following pages you can adjust all important settings of your router."
 msgstr ""
 "Nas próximas páginas, pode ajustar todas as definições importantes do seu "
 "router."
 
 #. Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> changes have to be confirmed by clicking Changes - Save &amp; Apply before being applied.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:13
-msgid "a_i_i_admin4"
+msgid "Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> changes have to be confirmed by clicking Changes - Save & Apply before being applied."
 msgstr ""
 "Aviso: No <abbr title=\"Interface de configuração Lua\">LuCI</abbr> as "
 "alterações devem ser confirmadas clicando em Alterações - Salvar &amp; "
@@ -94,36 +94,36 @@ msgstr ""
 
 #. As we always want to improve this interface we are looking forward to your feedback and suggestions.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:14
-msgid "a_i_i_admin5"
+msgid "As we always want to improve this interface we are looking forward to your feedback and suggestions."
 msgstr ""
 "Agradecemos os seus comentários e sugestões por forma a podermos continuar a "
 "melhorar este interface."
 
 #. And now have fun with your router!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:15
-msgid "a_i_i_admin6"
+msgid "And now have fun with your router!"
 msgstr "E agora divirta-se com o seu router!"
 
 #. The <abbr title=\"Lua Configuration Interface\">LuCI</abbr> Team
 #: i18n/english/luasrc/i18n/admin-core.en.lua:16
-msgid "a_i_i_team"
+msgid "The <abbr title=\"Lua Configuration Interface\">LuCI</abbr> Team"
 msgstr "A equipa do <abbr title=\"Interface de configuração Lua\">LuCI</abbr>"
 
 #. Here you can customize the settings and the functionality of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:17
-msgid "a_i_luci1"
+msgid "Here you can customize the settings and the functionality of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>."
 msgstr ""
 "Aqui pode personalizar as configurações e funcionalidades do <abbr "
 "title=\"Interface de configuração Lua\">LuCI</abbr>."
 
 #. Post-commit actions
 #: i18n/english/luasrc/i18n/admin-core.en.lua:18
-msgid "a_i_ucicommit"
+msgid "Post-commit actions"
 msgstr "Acções pós-gravação"
 
 #. These commands will be executed automatically when a given <abbr title=\"Unified Configuration Interface\">UCI</abbr> configuration is committed allowing changes to be applied instantly.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:19
-msgid "a_i_ucicommit1"
+msgid "These commands will be executed automatically when a given <abbr title=\"Unified Configuration Interface\">UCI</abbr> configuration is committed allowing changes to be applied instantly."
 msgstr ""
 "Estes comandos são executados automaticamente quando uma determinada "
 "configuração da <abbr title=\"Interface de configuração unificada\">UCI</abbr> "
@@ -131,12 +131,12 @@ msgstr ""
 
 #. Files to be kept when flashing a new firmware
 #: i18n/english/luasrc/i18n/admin-core.en.lua:20
-msgid "a_i_keepflash"
+msgid "Files to be kept when flashing a new firmware"
 msgstr "Ficheiros que devem ser mantidos quando gravar um novo firmware."
 
 #. When flashing a new firmware with <abbr title=\"Lua Configuration Interface\">LuCI</abbr> these files will be added to the new firmware installation.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:21
-msgid "a_i_keepflash1"
+msgid "When flashing a new firmware with <abbr title=\"Lua Configuration Interface\">LuCI</abbr> these files will be added to the new firmware installation."
 msgstr ""
 "Quando gravar um novo firmware com o <abbr title=\"Interface de configuração "
 "Lua\">LuCI</abbr> estes arquivos serão adicionados ao novo firmware "
@@ -144,7 +144,7 @@ msgstr ""
 
 #. Here you can find information about the current system status like <abbr title=\"Central Processing Unit\">CPU</abbr> clock frequency, memory usage or network interface data.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:22
-msgid "a_st_i_status1"
+msgid "Here you can find information about the current system status like <abbr title=\"Central Processing Unit\">CPU</abbr> clock frequency, memory usage or network interface data."
 msgstr ""
 "Aqui você pode encontrar informações sobre o estado actual do sistema, tais "
 "como <abbr title=\"Central Processing Unit\">CPU</abbr>, frequência do "
@@ -152,255 +152,255 @@ msgstr ""
 
 #. Also kernel or service logfiles can be viewed here to get an overview over their current state.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:23
-msgid "a_st_i_status2"
+msgid "Also kernel or service logfiles can be viewed here to get an overview over their current state."
 msgstr ""
 "Também os arquivos de logs do kernel ou dos serviços podem ser consultados "
 "aqui para obter uma visão geral sobre o seu estado actual."
 
 #. <abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan
 #: i18n/english/luasrc/i18n/admin-core.en.lua:24
-msgid "iwscan"
+msgid "<abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan"
 msgstr "<abbr title=\"Rede Local Wireless\">WLAN</abbr>-Pesquisa"
 
 #. Wifi networks in your local environment
 #: i18n/english/luasrc/i18n/admin-core.en.lua:25
-msgid "iwscan1"
+msgid "Wifi networks in your local environment"
 msgstr "Redes Wifi no seu ambiente local"
 
 #. <abbr title=\"Encrypted\">Encr.</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:26
-msgid "iwscan_encr"
+msgid "<abbr title=\"Encrypted\">Encr.</abbr>"
 msgstr "<abbr title=\"Encriptado\">Encr.</abbr>"
 
 #. Link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:27
-msgid "iwscan_link"
+msgid "Link"
 msgstr "Link"
 
 #. Signal
 #: i18n/english/luasrc/i18n/admin-core.en.lua:28
-msgid "iwscan_signal"
+msgid "Signal"
 msgstr "Sinal"
 
 #. Noise
 #: i18n/english/luasrc/i18n/admin-core.en.lua:29
-msgid "iwscan_noise"
+msgid "Noise"
 msgstr "Ruído"
 
 #. Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:30
-msgid "routes"
+msgid "Routes"
 msgstr "Rotas"
 
 #. Netmask
 #: i18n/english/luasrc/i18n/admin-core.en.lua:31
-msgid "routes_netmask"
+msgid "Netmask"
 msgstr "Máscara de sub-rede"
 
 #. Gateway
 #: i18n/english/luasrc/i18n/admin-core.en.lua:32
-msgid "routes_gateway"
+msgid "Gateway"
 msgstr "Gateway"
 
 #. Metric
 #: i18n/english/luasrc/i18n/admin-core.en.lua:33
-msgid "routes_metric"
+msgid "Metric"
 msgstr "Métrica"
 
 #. Here you can configure the basic aspects of your device like its hostname or the timezone.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:34
-msgid "a_s_desc"
+msgid "Here you can configure the basic aspects of your device like its hostname or the timezone."
 msgstr ""
 "Aqui pode configurar os aspectos básicos do seu equipamento,  como o nome do "
 "host ou o fuso horário."
 
 #. Software
 #: i18n/english/luasrc/i18n/admin-core.en.lua:35
-msgid "a_s_packages"
+msgid "Software"
 msgstr "Software"
 
 #. Admin Password
 #: i18n/english/luasrc/i18n/admin-core.en.lua:36
-msgid "a_s_changepw"
+msgid "Admin Password"
 msgstr "Password do Administrador"
 
 #. OPKG-Configuration
 #: i18n/english/luasrc/i18n/admin-core.en.lua:37
-msgid "a_s_p_ipkg"
+msgid "OPKG-Configuration"
 msgstr "Configuração-OPKG"
 
 #. <abbr title=\"Secure Shell\">SSH</abbr>-Keys
 #: i18n/english/luasrc/i18n/admin-core.en.lua:38
-msgid "a_s_sshkeys"
+msgid "<abbr title=\"Secure Shell\">SSH</abbr>-Keys"
 msgstr "Chaves-<abbr title=\"Shell Seguro\">SSH</abbr>"
 
 #. Mount Points
 #: i18n/english/luasrc/i18n/admin-core.en.lua:39
-msgid "a_s_fstab"
+msgid "Mount Points"
 msgstr "Pontos de Montagem"
 
 #. Change settings related to the system itself, its identification, installed hard- and software, authentication or mount points.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:40
-msgid "a_s_i_system1"
+msgid "Change settings related to the system itself, its identification, installed hard- and software, authentication or mount points."
 msgstr ""
 "Altera as configurações relacionadas com o sistema em si, sua identificação, "
 "hardware e software instalados, autenticação ou pontos de montagem."
 
 #. These settings define the base of your system.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:41
-msgid "a_s_i_system2"
+msgid "These settings define the base of your system."
 msgstr "Estas configurações definem a base do seu sistema."
 
 #. Pay attention as any misconfiguration here may prevent your device from booting or may lock yourself out of it.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:42
-msgid "a_s_i_system3"
+msgid "Pay attention as any misconfiguration here may prevent your device from booting or may lock yourself out of it."
 msgstr ""
 "Tenha em mente de que qualquer configuração errada aqui pode impedir o seu "
 "equipamento de arrancar, ou bloquear seu acesso de fora a ele."
 
 #. Interfaces
 #: i18n/english/luasrc/i18n/admin-core.en.lua:43
-msgid "a_s_if"
+msgid "Interfaces"
 msgstr "Interfaces"
 
 #. Bridge
 #: i18n/english/luasrc/i18n/admin-core.en.lua:44
-msgid "a_s_if_bridge"
+msgid "Bridge"
 msgstr "Interface em Ponte"
 
 #. ID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:45
-msgid "a_s_if_bridge_id"
+msgid "ID"
 msgstr "Identificação de interface em ponte"
 
 #. Bridge Port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:46
-msgid "a_s_if_bridge_port"
+msgid "Bridge Port"
 msgstr "Porta do interface em ponte"
 
 #. STP
 #: i18n/english/luasrc/i18n/admin-core.en.lua:47
-msgid "a_s_if_bridge_stp"
+msgid "STP"
 msgstr "STP"
 
 #. Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:48
-msgid "a_s_if_device"
+msgid "Device"
 msgstr "Dispositivo"
 
 #. Ethernet Bridge
 #: i18n/english/luasrc/i18n/admin-core.en.lua:49
-msgid "a_s_if_ethbridge"
+msgid "Ethernet Bridge"
 msgstr "Ponte Ethernet"
 
 #. Ethernet Adapter
 #: i18n/english/luasrc/i18n/admin-core.en.lua:50
-msgid "a_s_if_ethdev"
+msgid "Ethernet Adapter"
 msgstr "Adaptador Ethernet"
 
 #. Ethernet Switch
 #: i18n/english/luasrc/i18n/admin-core.en.lua:51
-msgid "a_s_if_ethswitch"
+msgid "Ethernet Switch"
 msgstr "Switch Ethernet"
 
 #. Interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:52
-msgid "a_s_if_interface"
+msgid "Interface"
 msgstr "Interface"
 
 #. IP Configuration
 #: i18n/english/luasrc/i18n/admin-core.en.lua:53
-msgid "a_s_if_ipconfig"
+msgid "IP Configuration"
 msgstr "Configuração IP"
 
 #. Alias
 #: i18n/english/luasrc/i18n/admin-core.en.lua:54
-msgid "a_s_if_ipconfig_alias"
+msgid "Alias"
 msgstr "Configuração IP alternativa"
 
 #. DHCP assigned
 #: i18n/english/luasrc/i18n/admin-core.en.lua:55
-msgid "a_s_if_ipconfig_dhcp"
+msgid "DHCP assigned"
 msgstr "DHCP atribuido"
 
 #. IPv6
 #: i18n/english/luasrc/i18n/admin-core.en.lua:56
-msgid "a_s_if_ipconfig_ipv6"
+msgid "IPv6"
 msgstr "Configuração IPv6"
 
 #. Not configured
 #: i18n/english/luasrc/i18n/admin-core.en.lua:57
-msgid "a_s_if_ipconfig_none"
+msgid "Not configured"
 msgstr "Não configurado"
 
 #. Primary
 #: i18n/english/luasrc/i18n/admin-core.en.lua:58
-msgid "a_s_if_ipconfig_primary"
+msgid "Primary"
 msgstr "Primário"
 
 #. Channel
 #: i18n/english/luasrc/i18n/admin-core.en.lua:59
-msgid "a_s_if_iwchannel"
+msgid "Channel"
 msgstr "Canal"
 
 #. Mode
 #: i18n/english/luasrc/i18n/admin-core.en.lua:60
-msgid "a_s_if_iwmode"
+msgid "Mode"
 msgstr "Modo"
 
 #. Ad-Hoc
 #: i18n/english/luasrc/i18n/admin-core.en.lua:61
-msgid "a_s_if_iwmode_adhoc"
+msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
 #. Pseudo Ad-Hoc
 #: i18n/english/luasrc/i18n/admin-core.en.lua:62
-msgid "a_s_if_iwmode_ahdemo"
+msgid "Pseudo Ad-Hoc"
 msgstr "Ahdemo"
 
 #. Master
 #: i18n/english/luasrc/i18n/admin-core.en.lua:63
-msgid "a_s_if_iwmode_ap"
+msgid "Master"
 msgstr "AP"
 
 #. Master + WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:64
-msgid "a_s_if_iwmode_apwds"
+msgid "Master + WDS"
 msgstr "AP+WDS"
 
 #. Client
 #: i18n/english/luasrc/i18n/admin-core.en.lua:65
-msgid "a_s_if_iwmode_sta"
+msgid "Client"
 msgstr "Cliente (STA)"
 
 #. Client + WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:66
-msgid "a_s_if_iwmode_stawds"
+msgid "Client + WDS"
 msgstr "Cliente (WDS)"
 
 #. WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:67
-msgid "a_s_if_iwmode_wds"
+msgid "WDS"
 msgstr "WDS"
 
 #. SSID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:68
-msgid "a_s_if_iwssid"
+msgid "SSID"
 msgstr "SSID"
 
 #. MAC
 #: i18n/english/luasrc/i18n/admin-core.en.lua:69
-msgid "a_s_if_mac"
+msgid "MAC"
 msgstr "MAC"
 
 #. Pkts.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:70
-msgid "a_s_if_pkts"
+msgid "Pkts."
 msgstr "Pacotes"
 
 #. Interface Status
 #: i18n/english/luasrc/i18n/admin-core.en.lua:71
-msgid "a_s_if_status"
+msgid "Interface Status"
 msgstr ""
 "Aqui encontra informações sobre o estado actual do sistema, como <abbr "
 "title=\"Central Processing Unit\">CPU</abbr>, frequência do relógio, uso de "
@@ -408,327 +408,327 @@ msgstr ""
 
 #. Transfer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:72
-msgid "a_s_if_transfer"
+msgid "Transfer"
 msgstr "Transferências"
 
 #. RX
 #: i18n/english/luasrc/i18n/admin-core.en.lua:73
-msgid "a_s_if_transfer_rx"
+msgid "RX"
 msgstr "RX"
 
 #. TX
 #: i18n/english/luasrc/i18n/admin-core.en.lua:74
-msgid "a_s_if_transfer_tx"
+msgid "TX"
 msgstr "TX"
 
 #. Type
 #: i18n/english/luasrc/i18n/admin-core.en.lua:75
-msgid "a_s_if_type"
+msgid "Type"
 msgstr "Tipo"
 
 #. VLAN
 #: i18n/english/luasrc/i18n/admin-core.en.lua:76
-msgid "a_s_if_vlan"
+msgid "VLAN"
 msgstr "VLAN"
 
 #. Ports
 #: i18n/english/luasrc/i18n/admin-core.en.lua:77
-msgid "a_s_if_vlanports"
+msgid "Ports"
 msgstr "Portas VLAN"
 
 #. Wireless Adapter
 #: i18n/english/luasrc/i18n/admin-core.en.lua:78
-msgid "a_s_if_wifidev"
+msgid "Wireless Adapter"
 msgstr "Dispositivo WiFi"
 
 #. Firewall
 #: i18n/english/luasrc/i18n/admin-core.en.lua:79
-msgid "a_s_ipt"
+msgid "Firewall"
 msgstr "Firewall"
 
 #. Actions
 #: i18n/english/luasrc/i18n/admin-core.en.lua:80
-msgid "a_s_ipt_actions"
+msgid "Actions"
 msgstr "Acções"
 
 #. Traffic
 #: i18n/english/luasrc/i18n/admin-core.en.lua:81
-msgid "a_s_ipt_bytes"
+msgid "Traffic"
 msgstr "Tráfego"
 
 #. Chain
 #: i18n/english/luasrc/i18n/admin-core.en.lua:82
-msgid "a_s_ipt_chain"
+msgid "Chain"
 msgstr "Chain"
 
 #. Destination
 #: i18n/english/luasrc/i18n/admin-core.en.lua:83
-msgid "a_s_ipt_destination"
+msgid "Destination"
 msgstr "Destino"
 
 #. Flags
 #: i18n/english/luasrc/i18n/admin-core.en.lua:84
-msgid "a_s_ipt_flags"
+msgid "Flags"
 msgstr "Flags"
 
 #. In
 #: i18n/english/luasrc/i18n/admin-core.en.lua:85
-msgid "a_s_ipt_inputif"
+msgid "In"
 msgstr "Entrada"
 
 #. No chains in this table
 #: i18n/english/luasrc/i18n/admin-core.en.lua:86
-msgid "a_s_ipt_nochains"
+msgid "No chains in this table"
 msgstr "Tabela sem chains"
 
 #. No Rules in this chain
 #: i18n/english/luasrc/i18n/admin-core.en.lua:87
-msgid "a_s_ipt_norules"
+msgid "No Rules in this chain"
 msgstr "Sem regras nesta chain"
 
 #. Options
 #: i18n/english/luasrc/i18n/admin-core.en.lua:88
-msgid "a_s_ipt_options"
+msgid "Options"
 msgstr "Opções"
 
 #. Out
 #: i18n/english/luasrc/i18n/admin-core.en.lua:89
-msgid "a_s_ipt_outputif"
+msgid "Out"
 msgstr "Saída"
 
 #. Packets
 #: i18n/english/luasrc/i18n/admin-core.en.lua:90
-msgid "a_s_ipt_packets"
+msgid "Packets"
 msgstr "Pacotes"
 
 #. Pkts.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:91
-msgid "a_s_ipt_pkts"
+msgid "Pkts."
 msgstr "Pacotes"
 
 #. Policy
 #: i18n/english/luasrc/i18n/admin-core.en.lua:92
-msgid "a_s_ipt_policy"
+msgid "Policy"
 msgstr "Política"
 
 #. Prot.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:93
-msgid "a_s_ipt_prot"
+msgid "Prot."
 msgstr "Protocolo"
 
 #. References
 #: i18n/english/luasrc/i18n/admin-core.en.lua:94
-msgid "a_s_ipt_references"
+msgid "References"
 msgstr "Referências"
 
 #. Reset Counters
 #: i18n/english/luasrc/i18n/admin-core.en.lua:95
-msgid "a_s_ipt_reset"
+msgid "Reset Counters"
 msgstr "Reiniciar contadores"
 
 #. Restart Firewall
 #: i18n/english/luasrc/i18n/admin-core.en.lua:96
-msgid "a_s_ipt_restart"
+msgid "Restart Firewall"
 msgstr "Reiniciar Firewall"
 
 #. #
 #: i18n/english/luasrc/i18n/admin-core.en.lua:97
-msgid "a_s_ipt_rulenum"
+msgid "#"
 msgstr "#"
 
 #. Source
 #: i18n/english/luasrc/i18n/admin-core.en.lua:98
-msgid "a_s_ipt_source"
+msgid "Source"
 msgstr "Origem"
 
 #. Firewall Status
 #: i18n/english/luasrc/i18n/admin-core.en.lua:99
-msgid "a_s_ipt_status"
+msgid "Firewall Status"
 msgstr "Estado da Firewall"
 
 #. Table
 #: i18n/english/luasrc/i18n/admin-core.en.lua:100
-msgid "a_s_ipt_table"
+msgid "Table"
 msgstr "Tabela"
 
 #. Target
 #: i18n/english/luasrc/i18n/admin-core.en.lua:101
-msgid "a_s_ipt_target"
+msgid "Target"
 msgstr "Alvo"
 
 #. Perform Actions
 #: i18n/english/luasrc/i18n/admin-core.en.lua:102
-msgid "a_s_packages_do"
+msgid "Perform Actions"
 msgstr "Executar Acções"
 
 #. Install
 #: i18n/english/luasrc/i18n/admin-core.en.lua:103
-msgid "a_s_packages_install"
+msgid "Install"
 msgstr "Instalar pacotes"
 
 #. Download and install package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:104
-msgid "a_s_packages_installurl"
+msgid "Download and install package"
 msgstr "Descarga e instalação de pacote"
 
 #. Edit package lists and installation targets
 #: i18n/english/luasrc/i18n/admin-core.en.lua:105
-msgid "a_s_packages_ipkg"
+msgid "Edit package lists and installation targets"
 msgstr "Editar listas de pacotes e destinos de instalação"
 
 #. Package name
 #: i18n/english/luasrc/i18n/admin-core.en.lua:106
-msgid "a_s_packages_name"
+msgid "Package name"
 msgstr "Nome do Pacote"
 
 #. Remove
 #: i18n/english/luasrc/i18n/admin-core.en.lua:107
-msgid "a_s_packages_remove"
+msgid "Remove"
 msgstr "Remover"
 
 #. Find package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:108
-msgid "a_s_packages_search"
+msgid "Find package"
 msgstr "Procurar pacote"
 
 #. Package lists updated
 #: i18n/english/luasrc/i18n/admin-core.en.lua:109
-msgid "a_s_packages_update"
+msgid "Package lists updated"
 msgstr "As listas de pacotes foram actualizadas"
 
 #. Update package lists
 #: i18n/english/luasrc/i18n/admin-core.en.lua:110
-msgid "a_s_packages_updatelist"
+msgid "Update package lists"
 msgstr "Actualizar listas de pacotes"
 
 #. Upgrade installed packages
 #: i18n/english/luasrc/i18n/admin-core.en.lua:111
-msgid "a_s_packages_upgrade"
+msgid "Upgrade installed packages"
 msgstr "Actualizar os pacotes instalados"
 
 #. Could not set default destination
 #: i18n/english/luasrc/i18n/admin-core.en.lua:112
-msgid "a_s_packages_code1"
+msgid "Could not set default destination"
 msgstr "Nao foi possível definir destino da instalação"
 
 #. Error parsing config file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:113
-msgid "a_s_packages_code2"
+msgid "Error parsing config file"
 msgstr "Erro a interpretar o ficheiro de configuração"
 
 #. Could not create temporary directory (ran out of space?)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:114
-msgid "a_s_packages_code3"
+msgid "Could not create temporary directory (ran out of space?)"
 msgstr "Não foi possível criar a directoria temporária (disco cheio?)"
 
 #. Could not get adminstrative lock (ran out of space?)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:115
-msgid "a_s_packages_code4"
+msgid "Could not get adminstrative lock (ran out of space?)"
 msgstr "Não foi possível obter acesso exclusivo (disco cheio?)"
 
 #. Unsatisfied Dependencies
 #: i18n/english/luasrc/i18n/admin-core.en.lua:116
-msgid "a_s_packages_code5"
+msgid "Unsatisfied Dependencies"
 msgstr "Dependências por satisfazer"
 
 #. Refused to remove essential package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:117
-msgid "a_s_packages_code6"
+msgid "Refused to remove essential package"
 msgstr "Recusa na remoção de um pacote essencial"
 
 #. Package has dependents
 #: i18n/english/luasrc/i18n/admin-core.en.lua:118
-msgid "a_s_packages_code7"
+msgid "Package has dependents"
 msgstr "Pacote tem dependências"
 
 #. Package has no installation candidate (wrong name?)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:119
-msgid "a_s_packages_code8"
+msgid "Package has no installation candidate (wrong name?)"
 msgstr "Pacote não tem candidato para instalação (nome errado?)"
 
 #. Package has no available architecture 
 #: i18n/english/luasrc/i18n/admin-core.en.lua:120
-msgid "a_s_packages_code9"
+msgid "Package has no available architecture "
 msgstr "Pacote não disponível nesta arquitectura"
 
 #. Package is not trusted
 #: i18n/english/luasrc/i18n/admin-core.en.lua:121
-msgid "a_s_packages_code10"
+msgid "Package is not trusted"
 msgstr "Pacote de origem desconhecida"
 
 #. Error while downloading
 #: i18n/english/luasrc/i18n/admin-core.en.lua:122
-msgid "a_s_packages_code11"
+msgid "Error while downloading"
 msgstr "Erro durante o download"
 
 #. Conflicts with other packages
 #: i18n/english/luasrc/i18n/admin-core.en.lua:123
-msgid "a_s_packages_code12"
+msgid "Conflicts with other packages"
 msgstr "Conflito com outros pacotes"
 
 #. Package is already installed
 #: i18n/english/luasrc/i18n/admin-core.en.lua:124
-msgid "a_s_packages_code13"
+msgid "Package is already installed"
 msgstr "Pacote já instalado"
 
 #. Package has unresolved dependencies
 #: i18n/english/luasrc/i18n/admin-core.en.lua:125
-msgid "a_s_packages_code14"
+msgid "Package has unresolved dependencies"
 msgstr "Dependências por resolver no pacote"
 
 #. Refused to downgrade package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:126
-msgid "a_s_packages_code15"
+msgid "Refused to downgrade package"
 msgstr "Recusa no downgrade do pacote"
 
 #. Package manager ran out of space
 #: i18n/english/luasrc/i18n/admin-core.en.lua:127
-msgid "a_s_packages_code16"
+msgid "Package manager ran out of space"
 msgstr "O gestor de pacotes não tem espaço disponível"
 
 #. Bad signature while verifiying package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:128
-msgid "a_s_packages_code17"
+msgid "Bad signature while verifiying package"
 msgstr "Assinatura incorrecta na verificação do pacote"
 
 #. MD5 error while verifiying package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:129
-msgid "a_s_packages_code18"
+msgid "MD5 error while verifiying package"
 msgstr "Erro MD5 na verificação do pacote"
 
 #. Internal error occured
 #: i18n/english/luasrc/i18n/admin-core.en.lua:130
-msgid "a_s_packages_code19"
+msgid "Internal error occured"
 msgstr "Erro interno"
 
 #. Package lists
 #: i18n/english/luasrc/i18n/admin-core.en.lua:131
-msgid "a_s_p_ipkg_pkglists"
+msgid "Package lists"
 msgstr "Listas de pacotes"
 
 #. Installation targets
 #: i18n/english/luasrc/i18n/admin-core.en.lua:132
-msgid "a_s_p_ipkg_targets"
+msgid "Installation targets"
 msgstr "Destino de Instalação"
 
 #. Change the password of the system administrator (User <code>root</code>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:133
-msgid "a_s_changepw1"
+msgid "Change the password of the system administrator (User <code>root</code>)"
 msgstr "Altera a senha do administrador do sistema (Login <code>root</code>)"
 
 #. Password successfully changed
 #: i18n/english/luasrc/i18n/admin-core.en.lua:134
-msgid "a_s_changepw_changed"
+msgid "Password successfully changed"
 msgstr "Senha alterada com sucesso"
 
 #. Error: Passwords do not match
 #: i18n/english/luasrc/i18n/admin-core.en.lua:135
-msgid "a_s_changepw_nomatch"
+msgid "Error: Passwords do not match"
 msgstr "Erro: As senhas estão diferentes"
 
 #. Here you can paste public <abbr title=\"Secure Shell\">SSH</abbr>-Keys (one per line) for <abbr title=\"Secure Shell\">SSH</abbr> public-key authentication.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:136
-msgid "a_s_sshkeys1"
+msgid "Here you can paste public <abbr title=\"Secure Shell\">SSH</abbr>-Keys (one per line) for <abbr title=\"Secure Shell\">SSH</abbr> public-key authentication."
 msgstr ""
 "Aqui pode colar suas Chaves-<abbr title=\"Shell Seguro\">SSH</abbr> públicas "
 "(uma por linha) para a autenticação <abbr title=\"Shell Seguro\">SSH</abbr> "
@@ -736,46 +736,46 @@ msgstr ""
 
 #. Mount Points
 #: i18n/english/luasrc/i18n/admin-core.en.lua:137
-msgid "a_s_fstab_mountpoints"
+msgid "Mount Points"
 msgstr "Pontos de Montagem"
 
 #. Mount Points define at which point a memory device will be attached to the filesystem
 #: i18n/english/luasrc/i18n/admin-core.en.lua:138
-msgid "a_s_fstab_mountpoints1"
+msgid "Mount Points define at which point a memory device will be attached to the filesystem"
 msgstr ""
 "Pontos de montagem definem em que ponto um dispositivo de memória será "
 "anexado ao sistema de arquivos"
 
 #. Mounted file systems
 #: i18n/english/luasrc/i18n/admin-core.en.lua:139
-msgid "a_s_fstab_active"
+msgid "Mounted file systems"
 msgstr "Sistemas de arquivos montados"
 
 #. Used
 #: i18n/english/luasrc/i18n/admin-core.en.lua:140
-msgid "a_s_fstab_used"
+msgid "Used"
 msgstr "Usado"
 
 #. Available
 #: i18n/english/luasrc/i18n/admin-core.en.lua:141
-msgid "a_s_fstab_avail"
+msgid "Available"
 msgstr "Disponível"
 
 #. Mount Point
 #: i18n/english/luasrc/i18n/admin-core.en.lua:142
-msgid "a_s_fstab_mountpoint"
+msgid "Mount Point"
 msgstr "Ponto de Montagem"
 
 #. The device file of the memory or partition (<abbr title=\"for example\">e.g.</abbr> <code>/dev/sda1</code>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:143
-msgid "a_s_fstab_device1"
+msgid "The device file of the memory or partition (<abbr title=\"for example\">e.g.</abbr> <code>/dev/sda1</code>)"
 msgstr ""
 "O arquivo do dispositivo de memória ou da partição (<abbr title=\"por "
 "exemplo\">ex.</abbr> <code>/dev/sda1</code>)"
 
 #. The filesystem that was used to format the memory (<abbr title=\"for example\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></samp>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:144
-msgid "a_s_fstab_fs1"
+msgid "The filesystem that was used to format the memory (<abbr title=\"for example\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></samp>)"
 msgstr ""
 "O sistema que foi usado para formatar a memória (<abbr title=\"por "
 "exemplo\">ex.</abbr> <samp><abbr title=\"Sistema de Arquivos "
@@ -783,7 +783,7 @@ msgstr ""
 
 #. If your physical memory is insufficient unused data can be temporarily swapped to a swap-device resulting in a higher amount of usable <abbr title=\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very slow process as the swap-device cannot be accessed with the high datarates of the <abbr title=\"Random Access Memory\">RAM</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:145
-msgid "a_s_fstab_swap1"
+msgid "If your physical memory is insufficient unused data can be temporarily swapped to a swap-device resulting in a higher amount of usable <abbr title=\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very slow process as the swap-device cannot be accessed with the high datarates of the <abbr title=\"Random Access Memory\">RAM</abbr>."
 msgstr ""
 "Se a sua memória física for insuficiente, os dados poderão ser trocados "
 "temporariamente para um dispositivo swap, resultando em uma maior quantidade "
@@ -794,88 +794,88 @@ msgstr ""
 
 #. Reboots the operating system of your device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:146
-msgid "a_s_reboot1"
+msgid "Reboots the operating system of your device"
 msgstr "Reinicia o seu equipamento"
 
 #. Perform reboot
 #: i18n/english/luasrc/i18n/admin-core.en.lua:147
-msgid "a_s_reboot_do"
+msgid "Perform reboot"
 msgstr "Executar reinicialização"
 
 #. Please wait: Device rebooting...
 #: i18n/english/luasrc/i18n/admin-core.en.lua:148
-msgid "a_s_reboot_running"
+msgid "Please wait: Device rebooting..."
 msgstr "Por favor aguarde: Equipamento a reiniciar..."
 
 #. Warning: There are unsaved changes that will be lost while rebooting!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:149
-msgid "a_s_reboot_u"
+msgid "Warning: There are unsaved changes that will be lost while rebooting!"
 msgstr ""
 "Aviso: Existem alterações não salvas que serão perdidas durante a "
 "reinicialização!"
 
 #. Changes applied.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:150
-msgid "a_s_applyreboot1"
+msgid "Changes applied."
 msgstr "Alterações aplicadas."
 
 #. Backup / Restore
 #: i18n/english/luasrc/i18n/admin-core.en.lua:151
-msgid "a_s_backup"
+msgid "Backup / Restore"
 msgstr "Backup / Restauração"
 
 #. Create backup
 #: i18n/english/luasrc/i18n/admin-core.en.lua:152
-msgid "a_s_backup_backup"
+msgid "Create backup"
 msgstr "Criar backup"
 
 #. Backup Archive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:153
-msgid "a_s_backup_archive"
+msgid "Backup Archive"
 msgstr "Arquivo de backup"
 
 #. Reset router to defaults
 #: i18n/english/luasrc/i18n/admin-core.en.lua:154
-msgid "a_s_backup_reset"
+msgid "Reset router to defaults"
 msgstr "Restaurar as configurações pré-definidas do router"
 
 #. Proceed reverting all settings and resetting to firmware defaults?
 #: i18n/english/luasrc/i18n/admin-core.en.lua:155
-msgid "a_s_backup_reset1"
+msgid "Proceed reverting all settings and resetting to firmware defaults?"
 msgstr "Proceder com a restauração das configurações pré-definidas?"
 
 #. Restore backup
 #: i18n/english/luasrc/i18n/admin-core.en.lua:156
-msgid "a_s_backup_restore"
+msgid "Restore backup"
 msgstr "Restaurar backup"
 
 #. Here you can backup and restore your router configuration and - if possible - reset the router to the default settings.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:157
-msgid "a_s_backup1"
+msgid "Here you can backup and restore your router configuration and - if possible - reset the router to the default settings."
 msgstr ""
 "Aqui pode fazer o backup e restaurar as configurações do seu router. Também "
 "pode restaurar seu router para as configurações pré-definidas."
 
 #. <abbr title=\"Hypertext Transfer Protocol\">HTTP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:158
-msgid "a_srv_http"
+msgid "<abbr title=\"Hypertext Transfer Protocol\">HTTP</abbr>-Server"
 msgstr ""
 "Servidor-<abbr title=\"Protocolo de Transferência de Hipertexto\">HTTP</abbr>"
 
 #. <abbr title=\"Secure Shell\">SSH</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:159
-msgid "a_srv_ssh"
+msgid "<abbr title=\"Secure Shell\">SSH</abbr>-Server"
 msgstr "Servidor-<abbr title=\"Shell Seguro\">SSH</abbr>"
 
 #. Services and daemons perform certain tasks on your device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:160
-msgid "a_srv_services1"
+msgid "Services and daemons perform certain tasks on your device."
 msgstr ""
 "Serviços e daemons que estão a executar diversas tarefas no seu equipamento."
 
 #. Most of them are network servers, that offer a certain service for your device or network like shell access, serving webpages like <abbr title=\"Lua Configuration Interface\">LuCI</abbr>, doing mesh routing, sending e-mails, ...
 #: i18n/english/luasrc/i18n/admin-core.en.lua:161
-msgid "a_srv_services2"
+msgid "Most of them are network servers, that offer a certain service for your device or network like shell access, serving webpages like <abbr title=\"Lua Configuration Interface\">LuCI</abbr>, doing mesh routing, sending e-mails, ..."
 msgstr ""
 "A maioria deles são servidores de rede, que oferecem um determinado serviço "
 "para seu equipamento ou rede como acesso shell, servindo páginas web como o "
@@ -884,58 +884,58 @@ msgstr ""
 
 #. A small webserver which can be used to serve <abbr title=\"Lua Configuration Interface\">LuCI</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:162
-msgid "a_srv_http1"
+msgid "A small webserver which can be used to serve <abbr title=\"Lua Configuration Interface\">LuCI</abbr>."
 msgstr ""
 "Um pequeno servidor web que pode ser utilizado para servir a interface <abbr "
 "title=\"Interface de configuração Lua\">LuCI</abbr>."
 
 #. Authentication Realm
 #: i18n/english/luasrc/i18n/admin-core.en.lua:163
-msgid "a_srv_http_authrealm"
+msgid "Authentication Realm"
 msgstr "Área de autenticação"
 
 #. The realm which will be displayed at the authentication prompt for protected pages.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:164
-msgid "a_srv_http_authrealm1"
+msgid "The realm which will be displayed at the authentication prompt for protected pages."
 msgstr ""
 "A área de autenticação (realm) que será mostrada na prompt de autenticação "
 "das páginas protegidas."
 
 #. defaults to <code>/etc/httpd.conf</code>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:165
-msgid "a_srv_http_config1"
+msgid "defaults to <code>/etc/httpd.conf</code>"
 msgstr "padrão é <code>/etc/httpd.conf</code>"
 
 #. Document root
 #: i18n/english/luasrc/i18n/admin-core.en.lua:166
-msgid "a_srv_http_root"
+msgid "Document root"
 msgstr "Diretório raiz"
 
 #. Enable Keep-Alive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:167
-msgid "a_srv_http_keepalive"
+msgid "Enable Keep-Alive"
 msgstr "Activar keep-alive"
 
 #. Connection timeout
 #: i18n/english/luasrc/i18n/admin-core.en.lua:168
-msgid "a_srv_http_timeout"
+msgid "Connection timeout"
 msgstr "Esgotado o tempo de ligação"
 
 #. Plugin path
 #: i18n/english/luasrc/i18n/admin-core.en.lua:169
-msgid "a_srv_http_path"
+msgid "Plugin path"
 msgstr "Directorio de plugins"
 
 #. A lightweight HTTP/1.1 webserver written in C and Lua designed to serve LuCI
 #: i18n/english/luasrc/i18n/admin-core.en.lua:170
-msgid "a_srv_lucittpd"
+msgid "A lightweight HTTP/1.1 webserver written in C and Lua designed to serve LuCI"
 msgstr ""
 "Um servidor web HTTP/1.1 ligeiro escrito em C e desenvolvido em Lua para "
 "servir LuCI"
 
 #. Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:171
-msgid "a_srv_dropbear1"
+msgid "Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
 msgstr ""
 "Dropbear oferece um acesso shell seguro à rede <abbr title=\"Shell "
 "Seguro\">(SSH)</abbr> e um servidor <abbr title=\"Cópia Segura\">SCP</abbr> "
@@ -943,29 +943,29 @@ msgstr ""
 
 #. Password authentication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:172
-msgid "a_srv_d_pwauth"
+msgid "Password authentication"
 msgstr "Autenticação por senha"
 
 #. Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:173
-msgid "a_srv_d_pwauth1"
+msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
 msgstr "Permitir autenticação <abbr title=\"Shell Seguro\">SSH</abbr> por senha"
 
 #. Channel
 #: i18n/english/luasrc/i18n/admin-core.en.lua:174
-msgid "a_w_channel"
+msgid "Channel"
 msgstr "Canal"
 
 #. On this pages you can find configuration options for <abbr title=\"Wireless Local Area Network\">WLAN</abbr> based wireless networks.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:175
-msgid "a_w_wifi1"
+msgid "On this pages you can find configuration options for <abbr title=\"Wireless Local Area Network\">WLAN</abbr> based wireless networks."
 msgstr ""
 "Nestas páginas encontra opções de configuração <abbr "
 "title=\"Wireless\">WLAN</abbr> para redes sem fio."
 
 #. You can easily integrate your 802.11a/b/g/n-devices into your physical network and use the virtual adapter support to build wireless repeaters or offer several networks with one device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:176
-msgid "a_w_wifi2"
+msgid "You can easily integrate your 802.11a/b/g/n-devices into your physical network and use the virtual adapter support to build wireless repeaters or offer several networks with one device."
 msgstr ""
 "Pode facilmente integrar seus equipamentos 802.11a/b/g/n com sua rede física "
 "e usar o adaptador virtual para construir repetidores wireless ou oferecer "
@@ -973,7 +973,7 @@ msgstr ""
 
 #. There is support for Managed, Client, Ad-Hoc and <abbr title=\"Wireless Distribution System\">WDS</abbr> operating modes as well as <abbr title=\"Wi-Fi Protected Access\">WPA</abbr> and <abbr title=\"Wi-Fi Protected Access 2\">WPA2</abbr> encryption for secure communnication.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:177
-msgid "a_w_wifi3"
+msgid "There is support for Managed, Client, Ad-Hoc and <abbr title=\"Wireless Distribution System\">WDS</abbr> operating modes as well as <abbr title=\"Wi-Fi Protected Access\">WPA</abbr> and <abbr title=\"Wi-Fi Protected Access 2\">WPA2</abbr> encryption for secure communnication."
 msgstr ""
 "Existe suporte para os modos AP, Cliente, Ad-Hoc e <abbr title=\"Sistema de "
 "Distribuição Wireless\">WDS</abbr> bem como encriptação <abbr title=\"Acesso "
@@ -982,42 +982,42 @@ msgstr ""
 
 #. Here you can configure installed wifi devices.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:178
-msgid "a_w_devices1"
+msgid "Here you can configure installed wifi devices."
 msgstr "Aqui pode configurar os dispositivos wifi instalados. "
 
 #. Transmit Antenna
 #: i18n/english/luasrc/i18n/admin-core.en.lua:179
-msgid "a_w_txantenna"
+msgid "Transmit Antenna"
 msgstr "Antena de Transmissão"
 
 #. Receive Antenna
 #: i18n/english/luasrc/i18n/admin-core.en.lua:180
-msgid "a_w_rxantenna"
+msgid "Receive Antenna"
 msgstr "Antena de Recepção"
 
 #. Distance to furthest station (in meter)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:181
-msgid "a_w_distance1"
+msgid "Distance to furthest station (in meter)"
 msgstr "Distancia para a estação mais longinqua (em metros)"
 
 #. Diversity
 #: i18n/english/luasrc/i18n/admin-core.en.lua:182
-msgid "a_w_diversity"
+msgid "Diversity"
 msgstr "Diversidade"
 
 #. Country Code
 #: i18n/english/luasrc/i18n/admin-core.en.lua:183
-msgid "a_w_countrycode"
+msgid "Country Code"
 msgstr "Código do País"
 
 #. Connection Limit
 #: i18n/english/luasrc/i18n/admin-core.en.lua:184
-msgid "a_w_connlimit"
+msgid "Connection Limit"
 msgstr "Limite de Ligações"
 
 #. You can run several wifi networks with one device. Be aware that there are certain hardware and driverspecific restrictions. Normally you can operate 1 Ad-Hoc or up to 3 Master-Mode and 1 Client-Mode network simultaneously.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:185
-msgid "a_w_networks1"
+msgid "You can run several wifi networks with one device. Be aware that there are certain hardware and driverspecific restrictions. Normally you can operate 1 Ad-Hoc or up to 3 Master-Mode and 1 Client-Mode network simultaneously."
 msgstr ""
 "Pode servir várias redes wifi com o mesmo dispositivo. Esteja ciente de que "
 "existem certas restrições específicas do hardware e do controlador. Pode "
@@ -1026,96 +1026,96 @@ msgstr ""
 
 #. Network Name (<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:186
-msgid "a_w_netid"
+msgid "Network Name (<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>)"
 msgstr ""
 "Nome da Rede (<abbr title=\"Identificador de Conjunto de Serviços "
 "Estendidos\">ESSID</abbr>)"
 
 #. Add the Wifi network to physical network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:187
-msgid "a_w_network1"
+msgid "Add the Wifi network to physical network"
 msgstr "Adicione a rede Wifi à rede física"
 
 #.  - Create new Network - 
 #: i18n/english/luasrc/i18n/admin-core.en.lua:188
-msgid "a_w_netmanual"
+msgid " - Create new Network - "
 msgstr " - Criar nova Rede - "
 
 #. Transmit Power
 #: i18n/english/luasrc/i18n/admin-core.en.lua:189
-msgid "a_w_txpwr"
+msgid "Transmit Power"
 msgstr "Potência de Transmissão"
 
 #. Broadcom Frameburst
 #: i18n/english/luasrc/i18n/admin-core.en.lua:190
-msgid "a_w_brcmburst"
+msgid "Broadcom Frameburst"
 msgstr "Broadcom Frame Burst"
 
 #. Atheros Frameburst
 #: i18n/english/luasrc/i18n/admin-core.en.lua:191
-msgid "a_w_athburst"
+msgid "Atheros Frameburst"
 msgstr "Atheros Frame Burst"
 
 #. RadiusServer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:192
-msgid "a_w_radiussrv"
+msgid "RadiusServer"
 msgstr "Servidor RADIUS"
 
 #. Radius-Port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:193
-msgid "a_w_radiusport"
+msgid "Radius-Port"
 msgstr "Porta RADIUS"
 
 #. AP-Isolation
 #: i18n/english/luasrc/i18n/admin-core.en.lua:194
-msgid "a_w_apisolation"
+msgid "AP-Isolation"
 msgstr "Isolamento do AP"
 
 #. Prevents Client to Client communication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:195
-msgid "a_w_apisolation1"
+msgid "Prevents Client to Client communication"
 msgstr "Impede a comunicação de Cliente para Cliente"
 
 #. Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:196
-msgid "a_w_hideessid"
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 "Ocultar <abbr title=\"Identificador de Conjunto de Serviços "
 "Estendidos\">ESSID</abbr>"
 
 #. Access Point
 #: i18n/english/luasrc/i18n/admin-core.en.lua:197
-msgid "a_w_ap"
+msgid "Access Point"
 msgstr "Access Point (AP)"
 
 #. Ad-Hoc
 #: i18n/english/luasrc/i18n/admin-core.en.lua:198
-msgid "a_w_adhoc"
+msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
 #. Pseudo Ad-Hoc (ahdemo)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:199
-msgid "a_w_ahdemo"
+msgid "Pseudo Ad-Hoc (ahdemo)"
 msgstr "Pseudo Ad-Hoc (ahdemo)"
 
 #. Client
 #: i18n/english/luasrc/i18n/admin-core.en.lua:200
-msgid "a_w_client"
+msgid "Client"
 msgstr "Cliente"
 
 #. WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:201
-msgid "a_w_wds"
+msgid "WDS"
 msgstr "WDS"
 
 #. Monitor
 #: i18n/english/luasrc/i18n/admin-core.en.lua:202
-msgid "a_w_monitor"
+msgid "Monitor"
 msgstr "Monitor"
 
 #. Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> firewalls
 #: i18n/english/luasrc/i18n/admin-core.en.lua:203
-msgid "dhcp_dnsmasq_desc"
+msgid "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> firewalls"
 msgstr ""
 "Dnsmasq é um servidor combinado de <abbr title=\"Protocolo de Configuração "
 "Dinâmica de Hosts\">DHCP</abbr> e <abbr title=\"Sistema de Nomes de "
@@ -1124,12 +1124,12 @@ msgstr ""
 
 #. Domain required
 #: i18n/english/luasrc/i18n/admin-core.en.lua:204
-msgid "dhcp_dnsmasq_domainneeded"
+msgid "Domain required"
 msgstr "Requerer domínio"
 
 #. Don&#39;t forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without <abbr title=\"Domain Name System\">DNS</abbr>-Name
 #: i18n/english/luasrc/i18n/admin-core.en.lua:205
-msgid "dhcp_dnsmasq_domainneeded_desc"
+msgid "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without <abbr title=\"Domain Name System\">DNS</abbr>-Name"
 msgstr ""
 "Não encaminhar consultas <abbr title=\"Sistema de Nomes de "
 "Domínios\">DNS</abbr> sem o nome do <abbr title=\"Sistema de Nomes de "
@@ -1137,236 +1137,236 @@ msgstr ""
 
 #. Authoritative
 #: i18n/english/luasrc/i18n/admin-core.en.lua:206
-msgid "dhcp_dnsmasq_authoritative"
+msgid "Authoritative"
 msgstr "Autoritário"
 
 #. This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> in the local network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:207
-msgid "dhcp_dnsmasq_authoritative_desc"
+msgid "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> in the local network"
 msgstr ""
 "Este é o único <abbr title=\"Protocolo de Configuração Dinâmica de "
 "Hosts\">DHCP</abbr> na rede local"
 
 #. Filter private
 #: i18n/english/luasrc/i18n/admin-core.en.lua:208
-msgid "dhcp_dnsmasq_boguspriv"
+msgid "Filter private"
 msgstr "Filtrar endereços privados"
 
 #. Don&#39;t forward reverse lookups for local networks
 #: i18n/english/luasrc/i18n/admin-core.en.lua:209
-msgid "dhcp_dnsmasq_boguspriv_desc"
+msgid "Don't forward reverse lookups for local networks"
 msgstr "Não encaminhar as pesquisas reversas para redes locais"
 
 #. Filter useless
 #: i18n/english/luasrc/i18n/admin-core.en.lua:210
-msgid "dhcp_dnsmasq_filterwin2k"
+msgid "Filter useless"
 msgstr "Filtro de consultas inuteis de Windows"
 
 #. filter useless <abbr title=\"Domain Name System\">DNS</abbr>-queries of Windows-systems
 #: i18n/english/luasrc/i18n/admin-core.en.lua:211
-msgid "dhcp_dnsmasq_filterwin2k_desc"
+msgid "filter useless <abbr title=\"Domain Name System\">DNS</abbr>-queries of Windows-systems"
 msgstr ""
 "Filtro de consultas inuteis-<abbr title=\"Sistema de Nomes de "
 "Domínios\">DNS</abbr> de sistemas windows"
 
 #. Localise queries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:212
-msgid "dhcp_dnsmasq_localisequeries"
+msgid "Localise queries"
 msgstr "Localizar consultas"
 
 #. localises the hostname depending on its subnet
 #: i18n/english/luasrc/i18n/admin-core.en.lua:213
-msgid "dhcp_dnsmasq_localisequeries_desc"
+msgid "localises the hostname depending on its subnet"
 msgstr "Localizar o hostname dependendo de sua sub-rede"
 
 #. Local Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:214
-msgid "dhcp_dnsmasq_local"
+msgid "Local Server"
 msgstr "Servidor Local"
 
 #. Local Domain
 #: i18n/english/luasrc/i18n/admin-core.en.lua:215
-msgid "dhcp_dnsmasq_domain"
+msgid "Local Domain"
 msgstr "Domínio Local"
 
 #. Expand Hosts
 #: i18n/english/luasrc/i18n/admin-core.en.lua:216
-msgid "dhcp_dnsmasq_expandhosts"
+msgid "Expand Hosts"
 msgstr "Expandir Hosts"
 
 #. adds domain names to hostentries in the resolv file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:217
-msgid "dhcp_dnsmasq_expandhosts_desc"
+msgid "adds domain names to hostentries in the resolv file"
 msgstr ""
 "Adiciona os nomes dos domínios às entradas de hosts no arquivo resolv.conf"
 
 #. don&#39;t cache unknown
 #: i18n/english/luasrc/i18n/admin-core.en.lua:218
-msgid "dhcp_dnsmasq_nonegcache"
+msgid "don't cache unknown"
 msgstr "Não fazer cache de desconhecidos"
 
 #. prevents caching of negative <abbr title=\"Domain Name System\">DNS</abbr>-replies
 #: i18n/english/luasrc/i18n/admin-core.en.lua:219
-msgid "dhcp_dnsmasq_nonegcache_desc"
+msgid "prevents caching of negative <abbr title=\"Domain Name System\">DNS</abbr>-replies"
 msgstr ""
 "Impede o cache de respostas-<abbr title=\"Sistema de Nomes de "
 "Domínios\">DNS</abbr> negativas"
 
 #. Use <code>/etc/ethers</code>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:220
-msgid "dhcp_dnsmasq_readethers"
+msgid "Use <code>/etc/ethers</code>"
 msgstr "Usar <code>/etc/ethers</code>"
 
 #. Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:221
-msgid "dhcp_dnsmasq_readethers_desc"
+msgid "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server"
 msgstr ""
 "Ler <code>/etc/ethers</code> para configurar o Servidor-<abbr "
 "title=\"Protocolo de Configuração Dinâmica de Hosts\">DHCP</abbr>"
 
 #. Leasefile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:222
-msgid "dhcp_dnsmasq_leasefile"
+msgid "Leasefile"
 msgstr "Ficheiro de Atribuições"
 
 #. file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-leases will be stored
 #: i18n/english/luasrc/i18n/admin-core.en.lua:223
-msgid "dhcp_dnsmasq_leasefile_desc"
+msgid "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-leases will be stored"
 msgstr ""
 "Ficheiro onde as atribuições <abbr title=\"Protocolo de Configuração Dinâmica "
 "de Hosts\">DHCP</abbr> são armazenadas"
 
 #. Resolvfile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:224
-msgid "dhcp_dnsmasq_resolvfile"
+msgid "Resolvfile"
 msgstr "Ficheiro resolv.conf"
 
 #. local <abbr title=\"Domain Name System\">DNS</abbr> file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:225
-msgid "dhcp_dnsmasq_resolvfile_desc"
+msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "Ficheiro local de <abbr title=\"Sistema de Nomes de Domínios\">DNS</abbr>"
 
 #. Ignore <code>/etc/hosts</code>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:226
-msgid "dhcp_dnsmasq_nohosts"
+msgid "Ignore <code>/etc/hosts</code>"
 msgstr "Ignorar <code>/etc/hosts</code>"
 
 #. Strict order
 #: i18n/english/luasrc/i18n/admin-core.en.lua:227
-msgid "dhcp_dnsmasq_strictorder"
+msgid "Strict order"
 msgstr "Ordem Exacta"
 
 #. <abbr title=\"Domain Name System\">DNS</abbr>-Server will be queried in the order of the resolvfile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:228
-msgid "dhcp_dnsmasq_strictorder_desc"
+msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Server will be queried in the order of the resolvfile"
 msgstr ""
 "Servidor <abbr title=\"Sistema de Nomes de Domínios\">DNS</abbr> será "
 "consultado na ordem do arquivo resolv.conf"
 
 #. Log queries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:229
-msgid "dhcp_dnsmasq_logqueries"
+msgid "Log queries"
 msgstr "Registo das consultas"
 
 #. Ignore resolve file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:230
-msgid "dhcp_dnsmasq_noresolv"
+msgid "Ignore resolve file"
 msgstr "Ignorar ficheiro resolv.conf"
 
 #. concurrent queries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:231
-msgid "dhcp_dnsmasq_dnsforwardmax"
+msgid "concurrent queries"
 msgstr "Consultas simultâneas"
 
 #. <abbr title=\"Domain Name System\">DNS</abbr>-Port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:232
-msgid "dhcp_dnsmasq_port"
+msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Port"
 msgstr "Porta do <abbr title=\"Sistema de Nomes de Domínios\">DNS</abbr>"
 
 #. <abbr title=\"maximal\">max.</abbr> <abbr title=\"Extension Mechanisms for Domain Name System\">EDNS0</abbr> paket size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:233
-msgid "dhcp_dnsmasq_ednspacket_max"
+msgid "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Extension Mechanisms for Domain Name System\">EDNS0</abbr> paket size"
 msgstr ""
 "tamanho <abbr title=\"máximo\">max.</abbr> do pacote <abbr title=\"Mecanismos "
 "de Extensão do Sistema de Nomes de Domínios\">EDNS0</abbr>"
 
 #. <abbr title=\"maximal\">max.</abbr> <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:234
-msgid "dhcp_dnsmasq_dhcpleasemax"
+msgid "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Leases"
 msgstr ""
 "<abbr title=\"máximo\">max.</abbr> de <abbr title=\"Protocolo de Configuração "
 "Dinâmica de Hosts\">DHCP</abbr>-Leases"
 
 #. additional hostfile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:235
-msgid "dhcp_dnsmasq_addnhosts"
+msgid "additional hostfile"
 msgstr "ficheiro de hosts adicional"
 
 #. query port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:236
-msgid "dhcp_dnsmasq_queryport"
+msgid "query port"
 msgstr "porta para consultas"
 
 #. Enable TFTP-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:237
-msgid "dhcp_dnsmasq_enabletftp"
+msgid "Enable TFTP-Server"
 msgstr "Activar servidor TFTP"
 
 #. TFTP-Server Root
 #: i18n/english/luasrc/i18n/admin-core.en.lua:238
-msgid "dhcp_dnsmasq_tftproot"
+msgid "TFTP-Server Root"
 msgstr "Directório raiz do servidor TFTP"
 
 #. Network Boot Image
 #: i18n/english/luasrc/i18n/admin-core.en.lua:239
-msgid "dhcp_dnsmasq_dhcpboot"
+msgid "Network Boot Image"
 msgstr "Imagem para o boot remoto (PXE)"
 
 #. Switch
 #: i18n/english/luasrc/i18n/admin-core.en.lua:240
-msgid "a_n_switch"
+msgid "Switch"
 msgstr "Switch"
 
 #. Active Connections
 #: i18n/english/luasrc/i18n/admin-core.en.lua:241
-msgid "a_n_conntrack"
+msgid "Active Connections"
 msgstr "Ligações Activas"
 
 #. This page gives an overview over currently active network connections.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:242
-msgid "a_n_conntrack_desc"
+msgid "This page gives an overview over currently active network connections."
 msgstr "Esta página fornece informações sobre as ligações de rede activas."
 
 #. Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:243
-msgid "a_n_routes"
+msgid "Routes"
 msgstr "Rotas"
 
 #. IPv4 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:244
-msgid "a_n_routes4"
+msgid "IPv4 Routes"
 msgstr "Rotas IPv4"
 
 #. IPv6 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:245
-msgid "a_n_routes6"
+msgid "IPv6 Routes"
 msgstr "Rotas IPv6"
 
 #. In this area you find all network-related settings.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:246
-msgid "a_network1"
+msgid "In this area you find all network-related settings."
 msgstr "Neste espaço encontrará todas as configurações relacionadas com a rede."
 
 #. On most routers the network switch can be freely configured and splitted up into several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:247
-msgid "a_network2"
+msgid "On most routers the network switch can be freely configured and splitted up into several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s."
 msgstr ""
 "Na maioria dos routers o switch de rede pode ser configurado livremente e "
 "dividos em diversas <abbr title=\"Rede Local Virtual\">VLAN</abbr>s."
 
 #. Interfaces and <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> / <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Settings allow a custom organisation of the network and connections to other networks like the internet.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:248
-msgid "a_network3"
+msgid "Interfaces and <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> / <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Settings allow a custom organisation of the network and connections to other networks like the internet."
 msgstr ""
 "Interfaces e Configurações-<abbr title=\"Protocolo Ponto-a-Ponto sobre "
 "Ethernet\">PPPoE</abbr> / <abbr title=\"Protocolo de Tunelamento "
@@ -1375,7 +1375,7 @@ msgstr ""
 
 #. With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> devices in your local network can be automatically configured for network communication.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:249
-msgid "a_network4"
+msgid "With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> devices in your local network can be automatically configured for network communication."
 msgstr ""
 "Com o <abbr title=\"Protocolo de Configuração Dinâmica de Hosts\">DHCP</abbr> "
 "os dispositivos na sua rede local podem ser automaticamente configurados "
@@ -1383,14 +1383,14 @@ msgstr ""
 
 #. Firewall and portforwarding can be used to secure your network while providing services to external networks.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:250
-msgid "a_network5"
+msgid "Firewall and portforwarding can be used to secure your network while providing services to external networks."
 msgstr ""
 "A firewall e o redireccionamento de portas podem ser usados para proteger "
 "sua rede ao mesmo tempo que prestam serviços às redes externas."
 
 #. The network ports on your router can be combined to several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s in which computers can communicate directly with each other. <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s are often used to separate different network segments. Often there is by default one Uplink port for a connection to the next greater network like the internet and other ports for a local network.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:251
-msgid "a_n_switch1"
+msgid "The network ports on your router can be combined to several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s in which computers can communicate directly with each other. <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s are often used to separate different network segments. Often there is by default one Uplink port for a connection to the next greater network like the internet and other ports for a local network."
 msgstr ""
 "As portas de rede do seu router podem ser combinadas com diversas <abbr "
 "title=\"Rede Local Virtual\">VLAN</abbr>s em que os computadores podem "
@@ -1401,7 +1401,7 @@ msgstr ""
 
 #. Ports belonging to a <abbr title=\"Virtual Local Area Network\">VLAN</abbr> are separated with spaces. The port with the highest number (usually 5) is oftern the connection to the internal network interface of the router. On devices with 5 ports often the one with the lowest number (0) is the predefined Uplink port.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:252
-msgid "network_switch_desc"
+msgid "Ports belonging to a <abbr title=\"Virtual Local Area Network\">VLAN</abbr> are separated with spaces. The port with the highest number (usually 5) is oftern the connection to the internal network interface of the router. On devices with 5 ports often the one with the lowest number (0) is the predefined Uplink port."
 msgstr ""
 "Portas que pertencem a uma <abbr title=\"Rede Local Virtual\">VLAN</abbr> são "
 "separadas com espaços. A porta com o maior número (geralmente 5) é muitas "
@@ -1411,7 +1411,7 @@ msgstr ""
 
 #. On this page you can configure the network interfaces. You can bridge several interfaces by ticking the &quot;bridge interfaces&quot; field and enter the names of several network interfaces separated by spaces. You can also use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation <samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: <samp>eth0.1</samp>).
 #: i18n/english/luasrc/i18n/admin-core.en.lua:253
-msgid "a_n_ifaces1"
+msgid "On this page you can configure the network interfaces. You can bridge several interfaces by ticking the \"bridge interfaces\" field and enter the names of several network interfaces separated by spaces. You can also use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation <samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: <samp>eth0.1</samp>)."
 msgstr ""
 "Nesta página pode configurar as interfaces de rede. Pode ter várias "
 "interfaces do tipo bridge, assinalando o campo &quot;interfaces bridge&quot; "
@@ -1422,25 +1422,25 @@ msgstr ""
 
 #. Bridge interfaces
 #: i18n/english/luasrc/i18n/admin-core.en.lua:254
-msgid "a_n_i_bridge"
+msgid "Bridge interfaces"
 msgstr "Activar ponte no interface"
 
 #. creates a bridge over specified interface(s)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:255
-msgid "a_n_i_bridge1"
+msgid "creates a bridge over specified interface(s)"
 msgstr "cria uma ponte sobre determinada(s) interface(s)"
 
 #. Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>
-msgid "a_n_i_stp"
+msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 msgstr ""
 
 #. Enables the Spanning Tree Protocol on this bridge
-msgid "a_n_i_stp1"
+msgid "Enables the Spanning Tree Protocol on this bridge"
 msgstr ""
 
 #. With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> network members can automatically receive their network settings (<abbr title=\"Internet Protocol\">IP</abbr>-address, netmask, <abbr title=\"Domain Name System\">DNS</abbr>-server, ...).
 #: i18n/english/luasrc/i18n/admin-core.en.lua:256
-msgid "dhcp_desc"
+msgid "With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> network members can automatically receive their network settings (<abbr title=\"Internet Protocol\">IP</abbr>-address, netmask, <abbr title=\"Domain Name System\">DNS</abbr>-server, ...)."
 msgstr ""
 "Com o <abbr title=\"Protocolo de Configuração Dinâmica de Hosts\">DHCP</abbr> "
 "os membros da rede podem automaticamente receber as suas configurações de "
@@ -1449,81 +1449,81 @@ msgstr ""
 
 #. Leasetime
 #: i18n/english/luasrc/i18n/admin-core.en.lua:257
-msgid "dhcp_dhcp_leasetime"
+msgid "Leasetime"
 msgstr "Tempo de atribuição DHCP"
 
 #. Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:258
-msgid "dhcp_dhcp_dynamicdhcp"
+msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 msgstr ""
 "<abbr title=\"Protocolo de Configuração Dinâmica de Hosts\">DHCP</abbr> "
 "Dinâmico"
 
 #. Ignore interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:259
-msgid "dhcp_dhcp_ignore"
+msgid "Ignore interface"
 msgstr "Ignorar Interface"
 
 #. disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for this interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:260
-msgid "dhcp_dhcp_ignore_desc"
+msgid "disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for this interface"
 msgstr ""
 "desabilitar <abbr title=\"Protocolo de Configuração Dinâmica de "
 "Hosts\">DHCP</abbr> para esta interface"
 
 #. Force
 #: i18n/english/luasrc/i18n/admin-core.en.lua:261
-msgid "dhcp_dhcp_force"
+msgid "Force"
 msgstr "Forçar"
 
 #. first address (last octet)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:262
-msgid "dhcp_dhcp_start_desc"
+msgid "first address (last octet)"
 msgstr "primeiro endereço (último octeto)"
 
 #. number of leased addresses -1
 #: i18n/english/luasrc/i18n/admin-core.en.lua:263
-msgid "dhcp_dhcp_limit_desc"
+msgid "number of leased addresses -1"
 msgstr "número de endereços para atribuição -1"
 
 #. DHCP-Options
 #: i18n/english/luasrc/i18n/admin-core.en.lua:264
-msgid "dhcp_dhcp_dhcpoption"
+msgid "DHCP-Options"
 msgstr "Opções DHCP"
 
 #. See &quot;dnsmasq --help dhcp&quot; for a list of available options.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:265
-msgid "dhcp_dhcp_dhcpoption_desc"
+msgid "See \"dnsmasq --help dhcp\" for a list of available options."
 msgstr "Veja &quot;dnsmasq --help dhcp&quot; para a lista disponível de opções."
 
 #. Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:266
-msgid "dhcp_leases"
+msgid "Leases"
 msgstr "Atribuições"
 
 #. Static Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:267
-msgid "luci_ethers"
+msgid "Static Leases"
 msgstr "Atribuições Estáticas"
 
 #. Leasetime remaining
 #: i18n/english/luasrc/i18n/admin-core.en.lua:268
-msgid "dhcp_timeremain"
+msgid "Leasetime remaining"
 msgstr "Tempo de atribuição restante"
 
 #. Active Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:269
-msgid "dhcp_leases_active"
+msgid "Active Leases"
 msgstr "Atribuições Activas"
 
 #. Point-to-Point Connections
 #: i18n/english/luasrc/i18n/admin-core.en.lua:270
-msgid "a_n_ptp"
+msgid "Point-to-Point Connections"
 msgstr "Ligações Ponto-a-Ponto"
 
 #. Point-to-Point connections with <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> or <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr> are often used to connect a device over <abbr title=\"Digital Subscriber Line\">DSL</abbr> or similar technologies to an internet access point.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:271
-msgid "a_n_ptp1"
+msgid "Point-to-Point connections with <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> or <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr> are often used to connect a device over <abbr title=\"Digital Subscriber Line\">DSL</abbr> or similar technologies to an internet access point."
 msgstr ""
 "Ligações Ponto-a-Ponto com <abbr title=\"Protocolo Ponto-a-Ponto sobre "
 "Ethernet\">PPPoE</abbr> ou <abbr title=\"Protocolo de Tunelamento "
@@ -1533,7 +1533,7 @@ msgstr ""
 
 #. You need to install &quot;comgt&quot; for UMTS/GPRS, &quot;ppp-mod-pppoe&quot; for PPPoE, &quot;ppp-mod-pppoa&quot; for PPPoA or &quot;pptp&quot; for PPtP support
 #: i18n/english/luasrc/i18n/admin-core.en.lua:272
-msgid "network_interface_prereq"
+msgid "You need to install \"comgt\" for UMTS/GPRS, \"ppp-mod-pppoe\" for PPPoE, \"ppp-mod-pppoa\" for PPPoA or \"pptp\" for PPtP support"
 msgstr ""
 "Precisa de instalar os pacotes &quot;comgt&quot; para UMTS/GPRS, &quot;ppp-"
 "mod-pppoe&quot; para PPPoE, &quot;ppp-mod-pppoa&quot; para PPPoA ou "
@@ -1541,706 +1541,706 @@ msgstr ""
 
 #. You need to install &quot;ppp-mod-pppoe&quot; for PPPoE or &quot;pptp&quot; for PPtP support
 #: i18n/english/luasrc/i18n/admin-core.en.lua:273
-msgid "network_interface_prereq_mini"
+msgid "You need to install \"ppp-mod-pppoe\" for PPPoE or \"pptp\" for PPtP support"
 msgstr ""
 "Precisa de instalar os pacotes &quot;ppp-mod-pppoe&quot; para PPPoE ou "
 "&quot;pptp&quot; para o suporte PPtP"
 
 #. <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:274
-msgid "network_interface_server"
+msgid "<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"
 msgstr ""
 "Servidor <abbr title=\"Protocolo de Tunelamento Ponto-a-Ponto\">PPTP</abbr>"
 
 #. Automatic Disconnect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:275
-msgid "network_interface_demand"
+msgid "Automatic Disconnect"
 msgstr "Fim automático de ligação"
 
 #. Time (in seconds) after which an unused connection will be closed
 #: i18n/english/luasrc/i18n/admin-core.en.lua:276
-msgid "network_interface_demand_desc"
+msgid "Time (in seconds) after which an unused connection will be closed"
 msgstr "Tempo (em segundos) para fim de uma ligação já não utilizada"
 
 #. Keep-Alive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:277
-msgid "network_interface_keepalive"
+msgid "Keep-Alive"
 msgstr "Manter em Actividade"
 
 #. Number of failed connection tests to initiate automatic reconnect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:278
-msgid "network_interface_keepalive_desc"
+msgid "Number of failed connection tests to initiate automatic reconnect"
 msgstr ""
 "Número de falhas do teste de ligação para reiniciar uma ligação automática"
 
 #. Modem device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:279
-msgid "network_interface_device"
+msgid "Modem device"
 msgstr "Dispositivo do Modem"
 
 #. The device node of your modem, e.g. /dev/ttyUSB0
 #: i18n/english/luasrc/i18n/admin-core.en.lua:280
-msgid "network_interface_device_desc"
+msgid "The device node of your modem, e.g. /dev/ttyUSB0"
 msgstr "O caminho do dispositivo do seu modem, ex. /dev/ttyUSB0"
 
 #. Replace default route
 #: i18n/english/luasrc/i18n/admin-core.en.lua:281
-msgid "network_interface_defaultroute"
+msgid "Replace default route"
 msgstr "Substituir a rota padrão"
 
 #. Let pppd replace the current default route to use the PPP interface after successful connect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:282
-msgid "network_interface_defaultroute_desc"
+msgid "Let pppd replace the current default route to use the PPP interface after successful connect"
 msgstr ""
 "Permitir o pppd substituir a rota padrão actual e usar a interface PPP como "
 "padrão após a ligação ser efectuada com sucesso"
 
 #. Use peer DNS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:283
-msgid "network_interface_peerdns"
+msgid "Use peer DNS"
 msgstr "Utilizar DNS do peer"
 
 #. Configure the local DNS server to use the name servers adverticed by the PPP peer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:284
-msgid "network_interface_peerdns_desc"
+msgid "Configure the local DNS server to use the name servers adverticed by the PPP peer"
 msgstr ""
 "Configurar o servidor DNS local para usar o servidores de nomes fornecidos "
 "pelo PPP"
 
 #. Enable IPv6 on PPP link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:285
-msgid "network_interface_ipv6"
+msgid "Enable IPv6 on PPP link"
 msgstr "Activar IPv6 no link PPP"
 
 #. Connect script
 #: i18n/english/luasrc/i18n/admin-core.en.lua:286
-msgid "network_interface_connect"
+msgid "Connect script"
 msgstr "Script de ligação"
 
 #. Let pppd run this script after establishing the PPP link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:287
-msgid "network_interface_connect_desc"
+msgid "Let pppd run this script after establishing the PPP link"
 msgstr "Deixar o pppd executar este script após o estabelecimento do link PPP"
 
 #. Disconnect script
 #: i18n/english/luasrc/i18n/admin-core.en.lua:288
-msgid "network_interface_disconnect"
+msgid "Disconnect script"
 msgstr "Script de fim de ligação"
 
 #. Let pppd run this script before tearing down the PPP link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:289
-msgid "network_interface_disconnect_desc"
+msgid "Let pppd run this script before tearing down the PPP link"
 msgstr "Deixar o pppd executar este script antes de terminar o link PPP"
 
 #. Additional pppd options
 #: i18n/english/luasrc/i18n/admin-core.en.lua:290
-msgid "network_interface_pppd_options"
+msgid "Additional pppd options"
 msgstr "Opções adicionais do pppd"
 
 #. Specify additional command line arguments for pppd here
 #: i18n/english/luasrc/i18n/admin-core.en.lua:291
-msgid "network_interface_pppd_options_desc"
+msgid "Specify additional command line arguments for pppd here"
 msgstr "Especificar argumentos adicionais por linha de comando para o pppd aqui"
 
 #. Access point (APN)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:292
-msgid "network_interface_apn"
+msgid "Access point (APN)"
 msgstr "Ponto de acesso (APN)"
 
 #. PIN code
 #: i18n/english/luasrc/i18n/admin-core.en.lua:293
-msgid "network_interface_pincode"
+msgid "PIN code"
 msgstr "Código PIN"
 
 #. Make sure that you provide the correct pin code here or you might lock your sim card!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:294
-msgid "network_interface_pincode_desc"
+msgid "Make sure that you provide the correct pin code here or you might lock your sim card!"
 msgstr ""
 "Certifique-se que forneceu o código PIN correcto aqui, ou pode bloquear o "
 "seu cartão SIM"
 
 #. Service type
 #: i18n/english/luasrc/i18n/admin-core.en.lua:295
-msgid "network_interface_service"
+msgid "Service type"
 msgstr "Tipo do serviço"
 
 #. Setup wait time
 #: i18n/english/luasrc/i18n/admin-core.en.lua:296
-msgid "network_interface_maxwait"
+msgid "Setup wait time"
 msgstr "Configurar tempo de espera"
 
 #. Seconds to wait for the modem to become ready before attempting to connect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:297
-msgid "network_interface_maxwait_desc"
+msgid "Seconds to wait for the modem to become ready before attempting to connect"
 msgstr ""
 "Segundos de espera para o modem ficar pronto antes de tentar uma ligação"
 
 #. PPPoA Encapsulation
 #: i18n/english/luasrc/i18n/admin-core.en.lua:298
-msgid "network_interface_encaps"
+msgid "PPPoA Encapsulation"
 msgstr "Encapsulamento PPPoA "
 
 #. Routes specify over which interface and gateway a certain host or network can be reached.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:299
-msgid "a_n_r_routes1"
+msgid "Routes specify over which interface and gateway a certain host or network can be reached."
 msgstr ""
 "As rotas especificam através de que interfaces ou gateways podem ser "
 "alcançados determinadas redes ou hosts."
 
 #. Static Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:300
-msgid "a_n_routes_static"
+msgid "Static Routes"
 msgstr "Rotas Estáticas"
 
 #. Static IPv4 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:301
-msgid "a_n_routes_static4"
+msgid "Static IPv4 Routes"
 msgstr "Rotas Estáticas IPv4"
 
 #. Static IPv6 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:302
-msgid "a_n_routes_static6"
+msgid "Static IPv6 Routes"
 msgstr "Rotas Estáticas IPv6"
 
 #. Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:303
-msgid "a_n_routes_kernel4"
+msgid "Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes"
 msgstr "Rotas-<abbr title=\"Protocolo de Internet Versão 4\">IPv4</abbr> activas"
 
 #. Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:304
-msgid "a_n_routes_kernel6"
+msgid "Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes"
 msgstr "Rotas-<abbr title=\"Protocolo de Internet Versão 6\">IPv6</abbr> activas"
 
 #. Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:305
-msgid "a_n_r_target1"
+msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
 msgstr ""
 "<abbr title=\"Endereço do Protocolo de Internet\">IP</abbr> do host ou rede"
 
 #. <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network (CIDR)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:306
-msgid "a_n_r_target6"
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network (CIDR)"
 msgstr ""
 "<abbr title=\"Endereço do Protocolo de Internet Versão 6\">IPv6</abbr> do host "
 "ou rede"
 
 #. if target is a network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:307
-msgid "a_n_r_netmask1"
+msgid "if target is a network"
 msgstr "se o destino for uma rede"
 
 #. Internet Connection
 #: i18n/english/luasrc/i18n/admin-core.en.lua:308
-msgid "m_n_inet"
+msgid "Internet Connection"
 msgstr "Ligação Internet"
 
 #. Local Network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:309
-msgid "m_n_local"
+msgid "Local Network"
 msgstr "Rede Local"
 
 #. Route
 #: i18n/english/luasrc/i18n/admin-core.en.lua:310
-msgid "m_n_route"
+msgid "Route"
 msgstr "Rota"
 
 #. Bridge
 #: i18n/english/luasrc/i18n/admin-core.en.lua:311
-msgid "m_n_brdige"
+msgid "Bridge"
 msgstr "Ponte"
 
 #. Provide (Access Point)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:312
-msgid "m_w_ap"
+msgid "Provide (Access Point)"
 msgstr "Ponto de Acesso (Access Point)"
 
 #. Independent (Ad-Hoc)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:313
-msgid "m_w_adhoc"
+msgid "Independent (Ad-Hoc)"
 msgstr "Independente (Ad-Hoc)"
 
 #. Join (Client)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:314
-msgid "m_w_client"
+msgid "Join (Client)"
 msgstr "Cliente (Client)"
 
 #. Distributed (<abbr title=\"Wireless Distribution System\">WDS</abbr>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:315
-msgid "m_w_wds"
+msgid "Distributed (<abbr title=\"Wireless Distribution System\">WDS</abbr>)"
 msgstr "Distribuído (<abbr title=\"Sistema de Distribuição Wireless\">WDS</abbr>)"
 
 #. Clientmode
 #: i18n/english/luasrc/i18n/admin-core.en.lua:316
-msgid "m_w_clientmode"
+msgid "Clientmode"
 msgstr "Modo Cliente"
 
 #. System log buffer size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:317
-msgid "system_system_logsize"
+msgid "System log buffer size"
 msgstr "Tamanho do buffer do registo do sistema"
 
 #. External system log server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:318
-msgid "system_system_logip"
+msgid "External system log server"
 msgstr "Servidor externo do registo do sistema"
 
 #. Log output level
 #: i18n/english/luasrc/i18n/admin-core.en.lua:319
-msgid "system_system_conloglevel"
+msgid "Log output level"
 msgstr "Nível de detalhe do registo do sistema"
 
 #. Level of log messages on the console
 #: i18n/english/luasrc/i18n/admin-core.en.lua:320
-msgid "system_system_conloglevel_desc"
+msgid "Level of log messages on the console"
 msgstr "Categoria das mensagens de registo de sistema na consola"
 
 #. Processor
 #: i18n/english/luasrc/i18n/admin-core.en.lua:321
-msgid "m_i_processor"
+msgid "Processor"
 msgstr "Processador"
 
 #. Memory
 #: i18n/english/luasrc/i18n/admin-core.en.lua:322
-msgid "m_i_memory"
+msgid "Memory"
 msgstr "Memória"
 
 #. Local Time
 #: i18n/english/luasrc/i18n/admin-core.en.lua:323
-msgid "m_i_systemtime"
+msgid "Local Time"
 msgstr "Hora Local"
 
 #. Uptime
 #: i18n/english/luasrc/i18n/admin-core.en.lua:324
-msgid "m_i_uptime"
+msgid "Uptime"
 msgstr "Uptime"
 
 #. First leased address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:325
-msgid "m_n_d_firstaddress"
+msgid "First leased address"
 msgstr "Primeiro endereço de atribuição"
 
 #. Number of leased addresses
 #: i18n/english/luasrc/i18n/admin-core.en.lua:326
-msgid "m_n_d_numleases"
+msgid "Number of leased addresses"
 msgstr "Número de endereços atribuidos"
 
 #. Routing table
 #: i18n/english/luasrc/i18n/admin-core.en.lua:327
-msgid "routingtable"
+msgid "Routing table"
 msgstr "Tabela de roteamento"
 
 #. Wifi scan
 #: i18n/english/luasrc/i18n/admin-core.en.lua:328
-msgid "wlanscan"
+msgid "Wifi scan"
 msgstr "Procurar redes Wifi"
 
 #. Frequency
 #: i18n/english/luasrc/i18n/admin-core.en.lua:329
-msgid "frequency"
+msgid "Frequency"
 msgstr "Frequência"
 
 #. Power
 #: i18n/english/luasrc/i18n/admin-core.en.lua:330
-msgid "power"
+msgid "Power"
 msgstr "Potência"
 
 #. Noise
 #: i18n/english/luasrc/i18n/admin-core.en.lua:331
-msgid "noise"
+msgid "Noise"
 msgstr "Ruído"
 
 #. Signal
 #: i18n/english/luasrc/i18n/admin-core.en.lua:332
-msgid "signal"
+msgid "Signal"
 msgstr "Sinal"
 
 #. Link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:333
-msgid "link"
+msgid "Link"
 msgstr "Link"
 
 #. <abbr title=\"Fragmentation\">Frag.</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:334
-msgid "frag"
+msgid "<abbr title=\"Fragmentation\">Frag.</abbr>"
 msgstr "<abbr title=\"Fragmentation\">Frag.</abbr>"
 
 #. <abbr title=\"Request To Send\">RTS</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:335
-msgid "rts"
+msgid "<abbr title=\"Request To Send\">RTS</abbr>"
 msgstr "<abbr title=\"Request To Send\">RTS</abbr>"
 
 #. Bitrate
 #: i18n/english/luasrc/i18n/admin-core.en.lua:336
-msgid "bitrate"
+msgid "Bitrate"
 msgstr "Bitrate"
 
 #. automatically reconnect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:337
-msgid "m_n_keepalive"
+msgid "automatically reconnect"
 msgstr "ligação automática"
 
 #. disconnect when idle for
 #: i18n/english/luasrc/i18n/admin-core.en.lua:338
-msgid "m_n_dialondemand"
+msgid "disconnect when idle for"
 msgstr "desligar quando ocioso por"
 
 #. <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:339
-msgid "m_n_pptp_server"
+msgid "<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"
 msgstr ""
 "Servidor-<abbr title=\"Protocolo de Tunelamento Ponto-a-Ponto\">PPTP</abbr>"
 
 #. <abbr title=\"Light Emitting Diode\">LED</abbr> Configuration
 #: i18n/english/luasrc/i18n/admin-core.en.lua:340
-msgid "leds"
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "Configuração do <abbr title=\"Diodo Emissor de Luz\">LED</abbr>"
 
 #. Customizes the behaviour of the device <abbr title=\"Light Emitting Diode\">LED</abbr>s if possible.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:341
-msgid "leds_desc"
+msgid "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode\">LED</abbr>s if possible."
 msgstr ""
 "Customiza o comportamento dos <abbr title=\"Diodo Emissor de Luz\">LED</abbr>s "
 "se possível."
 
 #. <abbr title=\"Light Emitting Diode\">LED</abbr> Name
 #: i18n/english/luasrc/i18n/admin-core.en.lua:342
-msgid "system_led_name"
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr "Nome do <abbr title=\"Diodo Emissor de Luz\">LED</abbr>"
 
 #. <abbr title=\"Light Emitting Diode\">LED</abbr> Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:343
-msgid "system_led_sysfs"
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Device"
 msgstr "Dispositivo do <abbr title=\"Diodo Emissor de Luz\">LED</abbr>"
 
 #. Default state
 #: i18n/english/luasrc/i18n/admin-core.en.lua:344
-msgid "system_led_default"
+msgid "Default state"
 msgstr "Estado padrão"
 
 #. ticked = on
 #: i18n/english/luasrc/i18n/admin-core.en.lua:345
-msgid "system_led_default_desc"
+msgid "ticked = on"
 msgstr "selecionado = ligado"
 
 #. Trigger
 #: i18n/english/luasrc/i18n/admin-core.en.lua:346
-msgid "system_led_trigger"
+msgid "Trigger"
 msgstr "Evento"
 
 #. None
 #: i18n/english/luasrc/i18n/admin-core.en.lua:347
-msgid "system_led_trigger_none"
+msgid "None"
 msgstr "Nenhum"
 
 #. Default On
 #: i18n/english/luasrc/i18n/admin-core.en.lua:348
-msgid "system_led_trigger_defaulton"
+msgid "Default On"
 msgstr "Padrão Ligado"
 
 #. Timer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:349
-msgid "system_led_trigger_timer"
+msgid "Timer"
 msgstr "Temporizador"
 
 #. Heartbeat (Load Average)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:350
-msgid "system_led_trigger_heartbeat"
+msgid "Heartbeat (Load Average)"
 msgstr "Carga Média"
 
 #. Network Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:351
-msgid "system_led_trigger_netdev"
+msgid "Network Device"
 msgstr "Dispositivo de Rede"
 
 #. Off-State Delay
 #: i18n/english/luasrc/i18n/admin-core.en.lua:352
-msgid "system_led_delayoff"
+msgid "Off-State Delay"
 msgstr "Tempo no Estado Desligado"
 
 #. Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is off
 #: i18n/english/luasrc/i18n/admin-core.en.lua:353
-msgid "system_led_delayoff_desc"
+msgid "Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is off"
 msgstr ""
 "Tempo (em ms) durante o qual o <abbr title=\"Diodo Emissor de Luz\">LED</abbr> "
 "fica desligado"
 
 #. On-State Delay
 #: i18n/english/luasrc/i18n/admin-core.en.lua:354
-msgid "system_led_delayon"
+msgid "On-State Delay"
 msgstr "Tempo no Estado Ligado"
 
 #. Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is on
 #: i18n/english/luasrc/i18n/admin-core.en.lua:355
-msgid "system_led_delayon_desc"
+msgid "Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is on"
 msgstr ""
 "Tempo (em ms) durante o qual o <abbr title=\"Diodo Emissor de Luz\">LED</abbr> "
 "permanece ligado"
 
 #. Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:356
-msgid "system_led_dev"
+msgid "Device"
 msgstr "Dispositivo"
 
 #. Trigger Mode
 #: i18n/english/luasrc/i18n/admin-core.en.lua:357
-msgid "system_led_mode"
+msgid "Trigger Mode"
 msgstr "Modo do gatilho"
 
 #. Link On
 #: i18n/english/luasrc/i18n/admin-core.en.lua:358
-msgid "system_led_mode_link"
+msgid "Link On"
 msgstr "Link Activo"
 
 #. Transmit
 #: i18n/english/luasrc/i18n/admin-core.en.lua:359
-msgid "system_led_mode_tx"
+msgid "Transmit"
 msgstr "Transmitir"
 
 #. Receive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:360
-msgid "system_led_mode_rx"
+msgid "Receive"
 msgstr "Receber"
 
 #. Active
 #: i18n/english/luasrc/i18n/admin-core.en.lua:361
-msgid "network_interface_up"
+msgid "Active"
 msgstr "Activo"
 
 #. <abbr title=\"Media Access Control\">MAC</abbr>-Address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:362
-msgid "network_interface_hwaddr"
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr "Endereço <abbr title=\"Controle de Acesso ao Meio\">MAC</abbr>"
 
 #. Hardware Address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:363
-msgid "network_interface_hwaddr_desc"
+msgid "Hardware Address"
 msgstr "Endereço do Hardware"
 
 #. Traffic
 #: i18n/english/luasrc/i18n/admin-core.en.lua:364
-msgid "network_interface_txrx"
+msgid "Traffic"
 msgstr "Tráfego"
 
 #. transmitted / received
 #: i18n/english/luasrc/i18n/admin-core.en.lua:365
-msgid "network_interface_txrx_desc"
+msgid "transmitted / received"
 msgstr "transmitido / recebido"
 
 #. Errors
 #: i18n/english/luasrc/i18n/admin-core.en.lua:366
-msgid "network_interface_err"
+msgid "Errors"
 msgstr "Erros"
 
 #. TX / RX
 #: i18n/english/luasrc/i18n/admin-core.en.lua:367
-msgid "network_interface_err_desc"
+msgid "TX / RX"
 msgstr "TX / RX"
 
 #. Create / Assign firewall-zone
 #: i18n/english/luasrc/i18n/admin-core.en.lua:368
-msgid "network_interface_fwzone"
+msgid "Create / Assign firewall-zone"
 msgstr "Criar / Atribuir a uma zona de firewall"
 
 #. This interface does not belong to any firewall zone yet.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:369
-msgid "network_interface_fwzone_desc"
+msgid "Choose the firewall zone you want to assign to this interface. Select <em>unspecified</em> to remove the interface from the associated zone or fill out the <em>create</em> field to define a new zone and attach the interface to it."
 msgstr "Esta interface ainda não pertence a nenhuma zona de firewall."
 
 #. Processes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:370
-msgid "process_head"
+msgid "Processes"
 msgstr "Processos"
 
 #. This list gives an overview over currently running system processes and their status.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:371
-msgid "process_descr"
+msgid "This list gives an overview over currently running system processes and their status."
 msgstr ""
 "Esta lista fornece uma visão geral sobre os processos em execução no "
 "sistema."
 
 #. PID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:372
-msgid "process_pid"
+msgid "PID"
 msgstr "PID"
 
 #. Owner
 #: i18n/english/luasrc/i18n/admin-core.en.lua:373
-msgid "process_owner"
+msgid "Owner"
 msgstr "Dono"
 
 #. Command
 #: i18n/english/luasrc/i18n/admin-core.en.lua:374
-msgid "process_command"
+msgid "Command"
 msgstr "Comando"
 
 #. CPU usage (%)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:375
-msgid "process_cpu"
+msgid "CPU usage (%)"
 msgstr "Uso da CPU (%)"
 
 #. Memory usage (%)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:376
-msgid "process_mem"
+msgid "Memory usage (%)"
 msgstr "Uso de memória (%)"
 
 #. Hang Up
 #: i18n/english/luasrc/i18n/admin-core.en.lua:377
-msgid "process_hup"
+msgid "Hang Up"
 msgstr "Suspender"
 
 #. Terminate
 #: i18n/english/luasrc/i18n/admin-core.en.lua:378
-msgid "process_term"
+msgid "Terminate"
 msgstr "Terminar"
 
 #. Kill
 #: i18n/english/luasrc/i18n/admin-core.en.lua:379
-msgid "process_kill"
+msgid "Kill"
 msgstr "Matar"
 
 #. cached
 #: i18n/english/luasrc/i18n/admin-core.en.lua:380
-msgid "mem_cached"
+msgid "cached"
 msgstr "em cache"
 
 #. buffered
 #: i18n/english/luasrc/i18n/admin-core.en.lua:381
-msgid "mem_buffered"
+msgid "buffered"
 msgstr "em buffer"
 
 #. free
 #: i18n/english/luasrc/i18n/admin-core.en.lua:382
-msgid "mem_free"
+msgid "free"
 msgstr "livre"
 
 #. Scheduled Tasks
 #: i18n/english/luasrc/i18n/admin-core.en.lua:383
-msgid "a_s_crontab"
+msgid "Scheduled Tasks"
 msgstr "Tarefas Agendadas"
 
 #. This is the system crontab in which scheduled tasks can be defined.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:384
-msgid "a_s_crontab1"
+msgid "This is the system crontab in which scheduled tasks can be defined."
 msgstr "Este é o sistema de agendamento de tarefas."
 
 #. NAS ID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:385
-msgid "a_w_nasid"
+msgid "NAS ID"
 msgstr "NAS ID"
 
 #. Path to CA-Certificate
 #: i18n/english/luasrc/i18n/admin-core.en.lua:386
-msgid "a_w_cacert"
+msgid "Path to CA-Certificate"
 msgstr "Directorio do Certificado CA"
 
 #. EAP-Method
 #: i18n/english/luasrc/i18n/admin-core.en.lua:387
-msgid "a_w_eaptype"
+msgid "EAP-Method"
 msgstr "Tipo de EAP"
 
 #. Path to Private Key
 #: i18n/english/luasrc/i18n/admin-core.en.lua:388
-msgid "a_w_tlsprivkey"
+msgid "Path to Private Key"
 msgstr "Directorio da Chave Privada"
 
 #. Password of Private Key
 #: i18n/english/luasrc/i18n/admin-core.en.lua:389
-msgid "a_w_tlsprivkeypwd"
+msgid "Password of Private Key"
 msgstr "Senha da Chave Privada"
 
 #. Authentication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:390
-msgid "a_w_peapauth"
+msgid "Authentication"
 msgstr "Autenticação PEAP"
 
 #. Identity
 #: i18n/english/luasrc/i18n/admin-core.en.lua:391
-msgid "a_w_peapidentity"
+msgid "Identity"
 msgstr "Identidade PEAP"
 
 #. Password
 #: i18n/english/luasrc/i18n/admin-core.en.lua:392
-msgid "a_w_peappassword"
+msgid "Password"
 msgstr "Senha PEAP"
 
 #. Create Network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:393
-msgid "a_w_create"
+msgid "Create Network"
 msgstr "Criar Rede"
 
 #. Hostnames
 #: i18n/english/luasrc/i18n/admin-core.en.lua:394
-msgid "hostnames"
+msgid "Hostnames"
 msgstr "Hostnames"
 
 #. Host entries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:395
-msgid "hostnames_entries"
+msgid "Host entries"
 msgstr "Entradas de Hosts"
 
 #. Hostname
 #: i18n/english/luasrc/i18n/admin-core.en.lua:396
-msgid "hostnames_hostname"
+msgid "Hostname"
 msgstr "Nome do host"
 
 #. IP address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:397
-msgid "hostnames_address"
+msgid "IP address"
 msgstr "Endereço IP"
 
 #. Clamp Segment Size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:398
-msgid "m_n_mssfix"
+msgid "Clamp Segment Size"
 msgstr "Clamp Segment Size"
 
 #. Fixes problems with unreachable websites, submitting forms or other unexpected behaviour for some ISPs.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:399
-msgid "m_n_mssfix_desc"
+msgid "Fixes problems with unreachable websites, submitting forms or other unexpected behaviour for some ISPs."
 msgstr ""
 "Resolve problemas com websites indisponíveis, submissão de formulários ou "
 "comportamentos inesperados de alguns ISP's."
 
 #. Flash Firmware
 #: i18n/english/luasrc/i18n/admin-core.en.lua:400
-msgid "admin_upgrade"
+msgid "Flash Firmware"
 msgstr "Gravar Firmware"
 
 #. The uploaded image file does not contain a supported format. Make sure that you choose the generic image format for your platform.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:401
-msgid "admin_upgrade_badimage"
+msgid "The uploaded image file does not contain a supported format. Make sure that you choose the generic image format for your platform."
 msgstr ""
 "A imagem carregada não contém um formato suportado. Confirme que escolhe uma "
 "imagem genérica para a sua plataforma."
 
 #. Checksum
 #: i18n/english/luasrc/i18n/admin-core.en.lua:402
-msgid "admin_upgrade_checksum"
+msgid "Checksum"
 msgstr "Checksum"
 
 #. Upload an OpenWrt image file to reflash the device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:403
-msgid "admin_upgrade_desc"
+msgid "Upload an OpenWrt image file to reflash the device."
 msgstr "Carregar uma imagem OpenWrt para a flash do router."
 
 #. Size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:404
-msgid "admin_upgrade_filesize"
+msgid "Size"
 msgstr "Tamanho"
 
 #. Firmware image
 #: i18n/english/luasrc/i18n/admin-core.en.lua:405
-msgid "admin_upgrade_fwimage"
+msgid "Firmware image"
 msgstr "Imagem de Firmware"
 
 #. Keep configuration files
 #: i18n/english/luasrc/i18n/admin-core.en.lua:406
-msgid "admin_upgrade_keepcfg"
+msgid "Keep configuration files"
 msgstr "Manter ficheiros de configuração"
 
 #. Sorry. OpenWrt does not support a system upgrade on this platform.<br /> You need to manually flash your device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:407
-msgid "admin_upgrade_nosupport"
+msgid "Sorry. OpenWrt does not support a system upgrade on this platform.<br /> You need to manually flash your device."
 msgstr ""
 "Lamentamos, mas o OpenWrt não suporta uma actualização do sistema para esta "
 "plataforma.<br /> É necessário carregar manualmente uma imagem para a flash "
@@ -2248,7 +2248,7 @@ msgstr ""
 
 #. The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a few minutes until you try to reconnect. It might be necessary to renew the address of your computer to reach the device again, depending on your settings.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:408
-msgid "admin_upgrade_running"
+msgid "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a few minutes until you try to reconnect. It might be necessary to renew the address of your computer to reach the device again, depending on your settings."
 msgstr ""
 "O sistema está a carregar o firmware para a flash.<br /> NÃO DESLIGUE O "
 "EQUIPAMENTO!<br /> Espere alguns minutos até tentar uma ligação. Dependendo "
@@ -2257,19 +2257,19 @@ msgstr ""
 
 #.  (%s available)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:409
-msgid "admin_upgrade_spaceavail"
+msgid " (%s available)"
 msgstr " (%s disponível)"
 
 #. It appears that you try to flash an image that does not fit into the flash memory, please verify the image file!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:410
-msgid "admin_upgrade_toolarge"
+msgid "It appears that you try to flash an image that does not fit into the flash memory, please verify the image file!"
 msgstr ""
 "A imagem que está a tentar carregar aparenta nao caber na flash do "
 "equipamento. Por favor verifique o ficheiro de imagem."
 
 #. Upload image
 #: i18n/english/luasrc/i18n/admin-core.en.lua:411
-msgid "admin_upgrade_upload"
+msgid "Upload image"
 msgstr "Carregar imagem"
 
 #. The flash image was uploaded. Below is the checksum and file size listed, compare them with the original file to ensure data integrity.<br /> Click \"Proceed\" below to start the flash procedure.
diff --git a/po/pt_BR/asterisk.po b/po/pt_BR/asterisk.po
index 425abcb57..45011f101 100644
--- a/po/pt_BR/asterisk.po
+++ b/po/pt_BR/asterisk.po
@@ -13,1259 +13,1259 @@ msgstr ""
 
 #. Asterisk General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:1
-msgid "asterisk_asterisk"
+msgid "Asterisk General Options"
 msgstr "Opções Gerais do Asterisk"
 
 #. AGI directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:2
-msgid "asterisk_asterisk_agidir"
+msgid "AGI directory"
 msgstr "Directorio AGI"
 
 #. Cache recorded sound files during recording
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:3
-msgid "asterisk_asterisk_cacherecordfiles"
+msgid "Cache recorded sound files during recording"
 msgstr "Guardar em cache os ficheiros de som durante a gravação"
 
 #. Debug Level
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:4
-msgid "asterisk_asterisk_debug"
+msgid "Debug Level"
 msgstr "Nível de debug"
 
 #. Disable some warnings
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:5
-msgid "asterisk_asterisk_dontwarn"
+msgid "Disable some warnings"
 msgstr "Desactivar alguns avisos"
 
 #. Dump core on crash
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:6
-msgid "asterisk_asterisk_dumpcore"
+msgid "Dump core on crash"
 msgstr "Guardar o core quando houver crash"
 
 #. High Priority
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:7
-msgid "asterisk_asterisk_highpriority"
+msgid "High Priority"
 msgstr "Alta Prioridade"
 
 #. Initialise Crypto
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:8
-msgid "asterisk_asterisk_initcrypto"
+msgid "Initialise Crypto"
 msgstr "Inicializar Crypto"
 
 #. Use Internal Timing
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:9
-msgid "asterisk_asterisk_internaltiming"
+msgid "Use Internal Timing"
 msgstr "Usar temporizações internas"
 
 #. Log directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:10
-msgid "asterisk_asterisk_logdir"
+msgid "Log directory"
 msgstr "Directorio de registos"
 
 #. Maximum number of calls allowed
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:11
-msgid "asterisk_asterisk_maxcalls"
+msgid "Maximum number of calls allowed"
 msgstr "Maximo de chamadas permitidas"
 
 #. Maximum load to stop accepting new calls
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:12
-msgid "asterisk_asterisk_maxload"
+msgid "Maximum load to stop accepting new calls"
 msgstr "Maximo de carga para deixar de aceitar novas chamadas"
 
 #. Disable console colors
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:13
-msgid "asterisk_asterisk_nocolor"
+msgid "Disable console colors"
 msgstr "Desactivar cores na consola"
 
 #. Sound files Cache directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:14
-msgid "asterisk_asterisk_recordcachedir"
+msgid "Sound files Cache directory"
 msgstr "Directorio de cache para ficheiros de som"
 
 #. The Group to run as
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:15
-msgid "asterisk_asterisk_rungroup"
+msgid "The Group to run as"
 msgstr "O grupo sob o qual o asterisk será executado"
 
 #. The User to run as
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:16
-msgid "asterisk_asterisk_runuser"
+msgid "The User to run as"
 msgstr "O utilizador sob o qual o asterisk será executado"
 
 #. Voicemail Spool directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:17
-msgid "asterisk_asterisk_spooldir"
+msgid "Voicemail Spool directory"
 msgstr "Directorio da spool de voicemail"
 
 #. Prefix UniquID with system name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:18
-msgid "asterisk_asterisk_systemname"
+msgid "Prefix UniquID with system name"
 msgstr "Prefixar o nome de sistema à UniquID"
 
 #. Build transcode paths via SLINEAR, not directly
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:19
-msgid "asterisk_asterisk_transcodeviasln"
+msgid "Build transcode paths via SLINEAR, not directly"
 msgstr ""
 "Construir os caminhos de transcode atraves de SLINEAR e não directamente"
 
 #. Transmit SLINEAR silence while recording a channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:20
-msgid "asterisk_asterisk_transmitsilenceduringrecord"
+msgid "Transmit SLINEAR silence while recording a channel"
 msgstr "Transmitir silencio SLINEAR durante a gravação de um canal"
 
 #. Verbose Level
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:21
-msgid "asterisk_asterisk_verbose"
+msgid "Verbose Level"
 msgstr "Nivel de verbosidade"
 
 #. Time Zone
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:22
-msgid "asterisk_asterisk_zone"
+msgid "Time Zone"
 msgstr "Fuso Horário"
 
 #. Section dialplan
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:23
-msgid "asterisk_dialplan"
+msgid "Section dialplan"
 msgstr "Secção do Plano de Marcação"
 
 #. include
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:24
-msgid "asterisk_dialplan_include"
+msgid "include"
 msgstr "incluir"
 
 #. Dialplan Extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:25
-msgid "asterisk_dialplanexten"
+msgid "Dialplan Extension"
 msgstr "Extensão do Plano de Marcação"
 
 #. Dialplan General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:26
-msgid "asterisk_dialplangeneral"
+msgid "Dialplan General Options"
 msgstr "Opções Gerais do Plano de Marcação"
 
 #. Allow transfer
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:27
-msgid "asterisk_dialplangeneral_allowtransfer"
+msgid "Allow transfer"
 msgstr "Permitir transferência"
 
 #. Reinvite/redirect media connections
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:28
-msgid "asterisk_dialplangeneral_canreinvite"
+msgid "Reinvite/redirect media connections"
 msgstr "Redirigir/Repetir ligações multimedia"
 
 #. Clear global vars
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:29
-msgid "asterisk_dialplangeneral_clearglobalvars"
+msgid "Clear global vars"
 msgstr "Limpar variaveis globais"
 
 #. Dialplan Goto
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:30
-msgid "asterisk_dialplangoto"
+msgid "Dialplan Goto"
 msgstr "Encaminhamento do Plano de Marcação"
 
 #. Dialplan Conference
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:31
-msgid "asterisk_dialplanmeetme"
+msgid "Dialplan Conference"
 msgstr "Conferencia do Plano de Marcação"
 
 #. Dialplan Time
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:32
 #, fuzzy
-msgid "asterisk_dialplansaytime"
+msgid "Dialplan Time"
 msgstr "Conferencia do Plano de Marcação"
 
 #. Dialplan Voicemail
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:33
 #, fuzzy
-msgid "asterisk_dialplanvoice"
+msgid "Dialplan Voicemail"
 msgstr "Encaminhamento do Plano de Marcação"
 
 #. Dial Zones for Dialplan
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:34
 #, fuzzy
-msgid "asterisk_dialzone"
+msgid "Dial Zones for Dialplan"
 msgstr "Secção do Plano de Marcação"
 
 #. Prefix to add matching dialplans
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:35
-msgid "asterisk_dialzone_addprefix"
+msgid "Prefix to add matching dialplans"
 msgstr ""
 
 #. Match International prefix
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:36
-msgid "asterisk_dialzone_international"
+msgid "Match International prefix"
 msgstr ""
 
 #. Prefix (0) to add/remove to/from international numbers
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:37
-msgid "asterisk_dialzone_localprefix"
+msgid "Prefix (0) to add/remove to/from international numbers"
 msgstr ""
 
 #. localzone
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:38
-msgid "asterisk_dialzone_localzone"
+msgid "localzone"
 msgstr ""
 
 #. Match plan
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:39
-msgid "asterisk_dialzone_match"
+msgid "Match plan"
 msgstr ""
 
 #. Connection to use
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:40
-msgid "asterisk_dialzone_uses"
+msgid "Connection to use"
 msgstr ""
 
 #. Feature Key maps
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:41
-msgid "asterisk_featuremap"
+msgid "Feature Key maps"
 msgstr ""
 
 #. Attended transfer key
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:42
-msgid "asterisk_featuremap_atxfer"
+msgid "Attended transfer key"
 msgstr ""
 
 #. Blind transfer key
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:43
-msgid "asterisk_featuremap_blindxfer"
+msgid "Blind transfer key"
 msgstr ""
 
 #. Key to Disconnect call
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:44
-msgid "asterisk_featuremap_disconnect"
+msgid "Key to Disconnect call"
 msgstr ""
 
 #. Key to Park call
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:45
-msgid "asterisk_featuremap_parkcall"
+msgid "Key to Park call"
 msgstr ""
 
 #. Parking Feature
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:46
-msgid "asterisk_featurepark"
+msgid "Parking Feature"
 msgstr ""
 
 #. ADSI Park
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:47
-msgid "asterisk_featurepark_adsipark"
+msgid "ADSI Park"
 msgstr ""
 
 #. Attended transfer timeout (sec)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:48
-msgid "asterisk_featurepark_atxfernoanswertimeout"
+msgid "Attended transfer timeout (sec)"
 msgstr ""
 
 #. One touch record key
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:49
-msgid "asterisk_featurepark_automon"
+msgid "One touch record key"
 msgstr ""
 
 #. Name of call context for parking
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:50
-msgid "asterisk_featurepark_context"
+msgid "Name of call context for parking"
 msgstr ""
 
 #. Sound file to play to parked caller
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:51
-msgid "asterisk_featurepark_courtesytone"
+msgid "Sound file to play to parked caller"
 msgstr ""
 
 #. Max time (ms) between digits for feature activation
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:52
-msgid "asterisk_featurepark_featuredigittimeout"
+msgid "Max time (ms) between digits for feature activation"
 msgstr ""
 
 #. Method to Find Parking slot
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:53
-msgid "asterisk_featurepark_findslot"
+msgid "Method to Find Parking slot"
 msgstr ""
 
 #. parkedmusicclass
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:54
-msgid "asterisk_featurepark_parkedmusicclass"
+msgid "parkedmusicclass"
 msgstr ""
 
 #. Play courtesy tone to
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:55
-msgid "asterisk_featurepark_parkedplay"
+msgid "Play courtesy tone to"
 msgstr ""
 
 #. Enable Parking
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:56
-msgid "asterisk_featurepark_parkenabled"
+msgid "Enable Parking"
 msgstr ""
 
 #. Extension to dial to park
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:57
-msgid "asterisk_featurepark_parkext"
+msgid "Extension to dial to park"
 msgstr ""
 
 #. Parking time (secs)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:58
-msgid "asterisk_featurepark_parkingtime"
+msgid "Parking time (secs)"
 msgstr ""
 
 #. Range of extensions for call parking
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:59
-msgid "asterisk_featurepark_parkpos"
+msgid "Range of extensions for call parking"
 msgstr ""
 
 #. Pickup extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:60
-msgid "asterisk_featurepark_pickupexten"
+msgid "Pickup extension"
 msgstr ""
 
 #. Seconds to wait bewteen digits when transferring
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:61
-msgid "asterisk_featurepark_transferdigittimeout"
+msgid "Seconds to wait bewteen digits when transferring"
 msgstr ""
 
 #. sound when attended transfer is complete
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:62
-msgid "asterisk_featurepark_xferfailsound"
+msgid "sound when attended transfer is complete"
 msgstr ""
 
 #. Sound when attended transfer fails
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:63
-msgid "asterisk_featurepark_xfersound"
+msgid "Sound when attended transfer fails"
 msgstr ""
 
 #. Reload Hardware Config
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:64
-msgid "asterisk_hardwarereboot"
+msgid "Reload Hardware Config"
 msgstr ""
 
 #. Reboot Method
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:65
-msgid "asterisk_hardwarereboot_method"
+msgid "Reboot Method"
 msgstr ""
 
 #. Parameter
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:66
-msgid "asterisk_hardwarereboot_param"
+msgid "Parameter"
 msgstr ""
 
 #. SIP Connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:67
-msgid "asterisk_iax"
+msgid "SIP Connection"
 msgstr ""
 
 #. Always Dial International
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:68
-msgid "asterisk_iax_alwaysinternational"
+msgid "Always Dial International"
 msgstr ""
 
 #. context
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:69
-msgid "asterisk_iax_context"
+msgid "context"
 msgstr ""
 
 #. Country Code for connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:70
-msgid "asterisk_iax_countrycode"
+msgid "Country Code for connection"
 msgstr ""
 
 #. Add as Extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:71
-msgid "asterisk_iax_extension"
+msgid "Add as Extension"
 msgstr ""
 
 #. Host name (or blank)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:72
-msgid "asterisk_iax_host"
+msgid "Host name (or blank)"
 msgstr ""
 
 #. International Dial Prefix
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:73
-msgid "asterisk_iax_internationalprefix"
+msgid "International Dial Prefix"
 msgstr ""
 
 #. Dial Prefix (for external line)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:74
-msgid "asterisk_iax_prefix"
+msgid "Dial Prefix (for external line)"
 msgstr ""
 
 #. Secret
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:75
-msgid "asterisk_iax_secret"
+msgid "Secret"
 msgstr ""
 
 #. Dial Timeout (sec)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:76
-msgid "asterisk_iax_timeout"
+msgid "Dial Timeout (sec)"
 msgstr ""
 
 #. Option type
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:77
-msgid "asterisk_iax_type"
+msgid "Option type"
 msgstr ""
 
 #. User name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:78
-msgid "asterisk_iax_username"
+msgid "User name"
 msgstr ""
 
 #. IAX General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:79
 #, fuzzy
-msgid "asterisk_iaxgeneral"
+msgid "IAX General Options"
 msgstr "Opções Gerais do Plano de Marcação"
 
 #. Allow Codecs
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:80
-msgid "asterisk_iaxgeneral_allow"
+msgid "Allow Codecs"
 msgstr ""
 
 #. Reinvite/redirect media connections
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:81
 #, fuzzy
-msgid "asterisk_iaxgeneral_canreinvite"
+msgid "Reinvite/redirect media connections"
 msgstr "Redirigir/Repetir ligações multimedia"
 
 #. Static
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:82
-msgid "asterisk_iaxgeneral_static"
+msgid "Static"
 msgstr ""
 
 #. Write Protect
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:83
-msgid "asterisk_iaxgeneral_writeprotect"
+msgid "Write Protect"
 msgstr ""
 
 #. Meetme Conference
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:84
-msgid "asterisk_meetme"
+msgid "Meetme Conference"
 msgstr ""
 
 #. Admin PIN
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:85
-msgid "asterisk_meetme_adminpin"
+msgid "Admin PIN"
 msgstr ""
 
 #. Meeting PIN
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:86
-msgid "asterisk_meetme_pin"
+msgid "Meeting PIN"
 msgstr ""
 
 #. Meetme Conference General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:87
-msgid "asterisk_meetmegeneral"
+msgid "Meetme Conference General Options"
 msgstr ""
 
 #. Number of 20ms audio buffers to be used
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:88
-msgid "asterisk_meetmegeneral_audiobuffers"
+msgid "Number of 20ms audio buffers to be used"
 msgstr ""
 
 #. Modules
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:89
-msgid "asterisk_module"
+msgid "Modules"
 msgstr ""
 
 #. Alarm Receiver Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:90
-msgid "asterisk_module_appalarmreceiver"
+msgid "Alarm Receiver Application"
 msgstr ""
 
 #. Authentication Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:91
-msgid "asterisk_module_appauthenticate"
+msgid "Authentication Application"
 msgstr ""
 
 #. Make sure asterisk doesnt save CDR
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:92
-msgid "asterisk_module_appcdr"
+msgid "Make sure asterisk doesnt save CDR"
 msgstr ""
 
 #. Check if channel is available
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:93
-msgid "asterisk_module_appchanisavail"
+msgid "Check if channel is available"
 msgstr ""
 
 #. Listen in on any channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:94
-msgid "asterisk_module_appchanspy"
+msgid "Listen in on any channel"
 msgstr ""
 
 #. Control Playback Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:95
-msgid "asterisk_module_appcontrolplayback"
+msgid "Control Playback Application"
 msgstr ""
 
 #. Cuts up variables
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:96
-msgid "asterisk_module_appcut"
+msgid "Cuts up variables"
 msgstr ""
 
 #. Database access functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:97
-msgid "asterisk_module_appdb"
+msgid "Database access functions"
 msgstr ""
 
 #. Dialing Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:98
-msgid "asterisk_module_appdial"
+msgid "Dialing Application"
 msgstr ""
 
 #. Virtual Dictation Machine Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:99
-msgid "asterisk_module_appdictate"
+msgid "Virtual Dictation Machine Application"
 msgstr ""
 
 #. Directed Call Pickup Support
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:100
-msgid "asterisk_module_appdirectedpickup"
+msgid "Directed Call Pickup Support"
 msgstr ""
 
 #. Extension Directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:101
-msgid "asterisk_module_appdirectory"
+msgid "Extension Directory"
 msgstr ""
 
 #. DISA (Direct Inward System Access) Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:102
-msgid "asterisk_module_appdisa"
+msgid "DISA (Direct Inward System Access) Application"
 msgstr ""
 
 #. Dump channel variables Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:103
-msgid "asterisk_module_appdumpchan"
+msgid "Dump channel variables Application"
 msgstr ""
 
 #. Simple Echo Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:104
-msgid "asterisk_module_appecho"
+msgid "Simple Echo Application"
 msgstr ""
 
 #. ENUM Lookup
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:105
-msgid "asterisk_module_appenumlookup"
+msgid "ENUM Lookup"
 msgstr ""
 
 #. Reevaluates strings
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:106
-msgid "asterisk_module_appeval"
+msgid "Reevaluates strings"
 msgstr ""
 
 #. Executes applications
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:107
-msgid "asterisk_module_appexec"
+msgid "Executes applications"
 msgstr ""
 
 #. External IVR application interface
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:108
-msgid "asterisk_module_appexternalivr"
+msgid "External IVR application interface"
 msgstr ""
 
 #. Fork The CDR into 2 seperate entities
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:109
-msgid "asterisk_module_appforkcdr"
+msgid "Fork The CDR into 2 seperate entities"
 msgstr ""
 
 #. Get ADSI CPE ID
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:110
-msgid "asterisk_module_appgetcpeid"
+msgid "Get ADSI CPE ID"
 msgstr ""
 
 #. Group Management Routines
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:111
-msgid "asterisk_module_appgroupcount"
+msgid "Group Management Routines"
 msgstr ""
 
 #. Encode and Stream via icecast and ices
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:112
-msgid "asterisk_module_appices"
+msgid "Encode and Stream via icecast and ices"
 msgstr ""
 
 #. Image Transmission Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:113
-msgid "asterisk_module_appimage"
+msgid "Image Transmission Application"
 msgstr ""
 
 #. Look up Caller*ID name/number from black
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:114
-msgid "asterisk_module_applookupblacklist"
+msgid "Look up Caller*ID name/number from black"
 msgstr ""
 
 #. Look up CallerID Name from local databas
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:115
-msgid "asterisk_module_applookupcidname"
+msgid "Look up CallerID Name from local databas"
 msgstr ""
 
 #. Extension Macros
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:116
-msgid "asterisk_module_appmacro"
+msgid "Extension Macros"
 msgstr ""
 
 #. A simple math Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:117
-msgid "asterisk_module_appmath"
+msgid "A simple math Application"
 msgstr ""
 
 #. MD5 checksum Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:118
-msgid "asterisk_module_appmd5"
+msgid "MD5 checksum Application"
 msgstr ""
 
 #. Digital Milliwatt (mu-law) Test Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:119
-msgid "asterisk_module_appmilliwatt"
+msgid "Digital Milliwatt (mu-law) Test Application"
 msgstr ""
 
 #. Record a call and mix the audio during the recording
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:120
-msgid "asterisk_module_appmixmonitor"
+msgid "Record a call and mix the audio during the recording"
 msgstr ""
 
 #. Call Parking and Announce Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:121
-msgid "asterisk_module_appparkandannounce"
+msgid "Call Parking and Announce Application"
 msgstr ""
 
 #. Trivial Playback Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:122
-msgid "asterisk_module_appplayback"
+msgid "Trivial Playback Application"
 msgstr ""
 
 #. Require phone number to be entered
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:123
-msgid "asterisk_module_appprivacy"
+msgid "Require phone number to be entered"
 msgstr ""
 
 #. True Call Queueing
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:124
-msgid "asterisk_module_appqueue"
+msgid "True Call Queueing"
 msgstr ""
 
 #. Random goto
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:125
-msgid "asterisk_module_apprandom"
+msgid "Random goto"
 msgstr ""
 
 #. Read Variable Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:126
-msgid "asterisk_module_appread"
+msgid "Read Variable Application"
 msgstr ""
 
 #. Read in a file
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:127
-msgid "asterisk_module_appreadfile"
+msgid "Read in a file"
 msgstr ""
 
 #. Realtime Data Lookup/Rewrite
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:128
-msgid "asterisk_module_apprealtime"
+msgid "Realtime Data Lookup/Rewrite"
 msgstr ""
 
 #. Trivial Record Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:129
-msgid "asterisk_module_apprecord"
+msgid "Trivial Record Application"
 msgstr ""
 
 #. Say time
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:130
-msgid "asterisk_module_appsayunixtime"
+msgid "Say time"
 msgstr ""
 
 #. Send DTMF digits Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:131
-msgid "asterisk_module_appsenddtmf"
+msgid "Send DTMF digits Application"
 msgstr ""
 
 #. Send Text Applications
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:132
-msgid "asterisk_module_appsendtext"
+msgid "Send Text Applications"
 msgstr ""
 
 #. Set CallerID Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:133
-msgid "asterisk_module_appsetcallerid"
+msgid "Set CallerID Application"
 msgstr ""
 
 #. CDR user field apps
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:134
-msgid "asterisk_module_appsetcdruserfield"
+msgid "CDR user field apps"
 msgstr ""
 
 #. load =&gt; .so ; Set CallerID Name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:135
-msgid "asterisk_module_appsetcidname"
+msgid "load => .so ; Set CallerID Name"
 msgstr ""
 
 #. load =&gt; .so ; Set CallerID Number
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:136
-msgid "asterisk_module_appsetcidnum"
+msgid "load => .so ; Set CallerID Number"
 msgstr ""
 
 #. Set RDNIS Number
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:137
-msgid "asterisk_module_appsetrdnis"
+msgid "Set RDNIS Number"
 msgstr ""
 
 #. Set ISDN Transfer Capability
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:138
-msgid "asterisk_module_appsettransfercapability"
+msgid "Set ISDN Transfer Capability"
 msgstr ""
 
 #. SMS/PSTN handler
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:139
-msgid "asterisk_module_appsms"
+msgid "SMS/PSTN handler"
 msgstr ""
 
 #. Hangs up the requested channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:140
-msgid "asterisk_module_appsofthangup"
+msgid "Hangs up the requested channel"
 msgstr ""
 
 #. Stack Routines
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:141
-msgid "asterisk_module_appstack"
+msgid "Stack Routines"
 msgstr ""
 
 #. Generic System() application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:142
-msgid "asterisk_module_appsystem"
+msgid "Generic System() application"
 msgstr ""
 
 #. Playback with Talk Detection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:143
-msgid "asterisk_module_apptalkdetect"
+msgid "Playback with Talk Detection"
 msgstr ""
 
 #. Interface Test Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:144
-msgid "asterisk_module_apptest"
+msgid "Interface Test Application"
 msgstr ""
 
 #. Transfer
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:145
-msgid "asterisk_module_apptransfer"
+msgid "Transfer"
 msgstr ""
 
 #. TXTCIDName
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:146
-msgid "asterisk_module_apptxtcidname"
+msgid "TXTCIDName"
 msgstr ""
 
 #. Send URL Applications
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:147
-msgid "asterisk_module_appurl"
+msgid "Send URL Applications"
 msgstr ""
 
 #. Custom User Event Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:148
-msgid "asterisk_module_appuserevent"
+msgid "Custom User Event Application"
 msgstr ""
 
 #. Send verbose output
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:149
-msgid "asterisk_module_appverbose"
+msgid "Send verbose output"
 msgstr ""
 
 #. Voicemail
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:150
-msgid "asterisk_module_appvoicemail"
+msgid "Voicemail"
 msgstr ""
 
 #. Waits until first ring after time
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:151
-msgid "asterisk_module_appwaitforring"
+msgid "Waits until first ring after time"
 msgstr ""
 
 #. Wait For Silence Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:152
-msgid "asterisk_module_appwaitforsilence"
+msgid "Wait For Silence Application"
 msgstr ""
 
 #. While Loops and Conditional Execution
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:153
-msgid "asterisk_module_appwhile"
+msgid "While Loops and Conditional Execution"
 msgstr ""
 
 #. Comma Separated Values CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:154
-msgid "asterisk_module_cdrcsv"
+msgid "Comma Separated Values CDR Backend"
 msgstr ""
 
 #. Customizable Comma Separated Values CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:155
-msgid "asterisk_module_cdrcustom"
+msgid "Customizable Comma Separated Values CDR Backend"
 msgstr ""
 
 #. Asterisk Call Manager CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:156
-msgid "asterisk_module_cdrmanager"
+msgid "Asterisk Call Manager CDR Backend"
 msgstr ""
 
 #. MySQL CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:157
-msgid "asterisk_module_cdrmysql"
+msgid "MySQL CDR Backend"
 msgstr ""
 
 #. PostgreSQL CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:158
-msgid "asterisk_module_cdrpgsql"
+msgid "PostgreSQL CDR Backend"
 msgstr ""
 
 #. SQLite CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:159
-msgid "asterisk_module_cdrsqlite"
+msgid "SQLite CDR Backend"
 msgstr ""
 
 #. Agent Proxy Channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:160
-msgid "asterisk_module_chanagent"
+msgid "Agent Proxy Channel"
 msgstr ""
 
 #. Channel driver for GTalk
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:161
-msgid "asterisk_module_chanalsa"
+msgid "Channel driver for GTalk"
 msgstr ""
 
 #. Channel driver for GTalk
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:162
-msgid "asterisk_module_changtalk"
+msgid "Channel driver for GTalk"
 msgstr ""
 
 #. Option chan_iax2
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:163
-msgid "asterisk_module_chaniax2"
+msgid "Option chan_iax2"
 msgstr ""
 
 #. Local Proxy Channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:164
-msgid "asterisk_module_chanlocal"
+msgid "Local Proxy Channel"
 msgstr ""
 
 #. Session Initiation Protocol (SIP)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:165
-msgid "asterisk_module_chansip"
+msgid "Session Initiation Protocol (SIP)"
 msgstr ""
 
 #. Adaptive Differential PCM Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:166
-msgid "asterisk_module_codecadpcm"
+msgid "Adaptive Differential PCM Coder/Decoder"
 msgstr ""
 
 #. A-law Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:167
-msgid "asterisk_module_codecalaw"
+msgid "A-law Coder/Decoder"
 msgstr ""
 
 #. A-law and Mulaw direct Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:168
-msgid "asterisk_module_codecamu"
+msgid "A-law and Mulaw direct Coder/Decoder"
 msgstr ""
 
 #. ITU G.726-32kbps G726 Transcoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:169
-msgid "asterisk_module_codecg726"
+msgid "ITU G.726-32kbps G726 Transcoder"
 msgstr ""
 
 #. GSM/PCM16 (signed linear) Codec Translation
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:170
-msgid "asterisk_module_codecgsm"
+msgid "GSM/PCM16 (signed linear) Codec Translation"
 msgstr ""
 
 #. Speex/PCM16 (signed linear) Codec Translator
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:171
-msgid "asterisk_module_codecspeex"
+msgid "Speex/PCM16 (signed linear) Codec Translator"
 msgstr ""
 
 #. Mu-law Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:172
-msgid "asterisk_module_codeculaw"
+msgid "Mu-law Coder/Decoder"
 msgstr ""
 
 #. Sun Microsystems AU format (signed linear)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:173
-msgid "asterisk_module_formatau"
+msgid "Sun Microsystems AU format (signed linear)"
 msgstr ""
 
 #. G.723.1 Simple Timestamp File Format
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:174
-msgid "asterisk_module_formatg723"
+msgid "G.723.1 Simple Timestamp File Format"
 msgstr ""
 
 #. Raw G.726 (16/24/32/40kbps) data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:175
-msgid "asterisk_module_formatg726"
+msgid "Raw G.726 (16/24/32/40kbps) data"
 msgstr ""
 
 #. Raw G729 data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:176
-msgid "asterisk_module_formatg729"
+msgid "Raw G729 data"
 msgstr ""
 
 #. Raw GSM data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:177
-msgid "asterisk_module_formatgsm"
+msgid "Raw GSM data"
 msgstr ""
 
 #. Raw h263 data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:178
-msgid "asterisk_module_formath263"
+msgid "Raw h263 data"
 msgstr ""
 
 #. JPEG (Joint Picture Experts Group) Image
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:179
-msgid "asterisk_module_formatjpeg"
+msgid "JPEG (Joint Picture Experts Group) Image"
 msgstr ""
 
 #. Raw uLaw 8khz Audio support (PCM)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:180
-msgid "asterisk_module_formatpcm"
+msgid "Raw uLaw 8khz Audio support (PCM)"
 msgstr ""
 
 #. load =&gt; .so ; Raw aLaw 8khz PCM Audio support
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:181
-msgid "asterisk_module_formatpcmalaw"
+msgid "load => .so ; Raw aLaw 8khz PCM Audio support"
 msgstr ""
 
 #. Raw Signed Linear Audio support (SLN)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:182
-msgid "asterisk_module_formatsln"
+msgid "Raw Signed Linear Audio support (SLN)"
 msgstr ""
 
 #. Dialogic VOX (ADPCM) File Format
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:183
-msgid "asterisk_module_formatvox"
+msgid "Dialogic VOX (ADPCM) File Format"
 msgstr ""
 
 #. Microsoft WAV format (8000hz Signed Line
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:184
-msgid "asterisk_module_formatwav"
+msgid "Microsoft WAV format (8000hz Signed Line"
 msgstr ""
 
 #. Microsoft WAV format (Proprietary GSM)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:185
-msgid "asterisk_module_formatwavgsm"
+msgid "Microsoft WAV format (Proprietary GSM)"
 msgstr ""
 
 #. Caller ID related dialplan functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:186
-msgid "asterisk_module_funccallerid"
+msgid "Caller ID related dialplan functions"
 msgstr ""
 
 #. ENUM Functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:187
-msgid "asterisk_module_funcenum"
+msgid "ENUM Functions"
 msgstr ""
 
 #. URI encoding / decoding functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:188
-msgid "asterisk_module_funcuri"
+msgid "URI encoding / decoding functions"
 msgstr ""
 
 #. Asterisk Extension Language Compiler
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:189
-msgid "asterisk_module_pbxael"
+msgid "Asterisk Extension Language Compiler"
 msgstr ""
 
 #. Text Extension Configuration
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:190
-msgid "asterisk_module_pbxconfig"
+msgid "Text Extension Configuration"
 msgstr ""
 
 #. load =&gt; .so ; Builtin dialplan functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:191
-msgid "asterisk_module_pbxfunctions"
+msgid "load => .so ; Builtin dialplan functions"
 msgstr ""
 
 #. Loopback Switch
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:192
-msgid "asterisk_module_pbxloopback"
+msgid "Loopback Switch"
 msgstr ""
 
 #. Realtime Switch
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:193
-msgid "asterisk_module_pbxrealtime"
+msgid "Realtime Switch"
 msgstr ""
 
 #. Outgoing Spool Support
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:194
-msgid "asterisk_module_pbxspool"
+msgid "Outgoing Spool Support"
 msgstr ""
 
 #. Wil Cal U (Auto Dialer)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:195
-msgid "asterisk_module_pbxwilcalu"
+msgid "Wil Cal U (Auto Dialer)"
 msgstr ""
 
 #. MySQL Config Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:196
-msgid "asterisk_module_resconfigmysql"
+msgid "MySQL Config Resource"
 msgstr ""
 
 #. ODBC Config Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:197
-msgid "asterisk_module_resconfigodbc"
+msgid "ODBC Config Resource"
 msgstr ""
 
 #. PGSQL Module
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:198
-msgid "asterisk_module_resconfigpgsql"
+msgid "PGSQL Module"
 msgstr ""
 
 #. Cryptographic Digital Signatures
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:199
-msgid "asterisk_module_rescrypto"
+msgid "Cryptographic Digital Signatures"
 msgstr ""
 
 #. Call Parking Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:200
-msgid "asterisk_module_resfeatures"
+msgid "Call Parking Resource"
 msgstr ""
 
 #. Indications Configuration
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:201
-msgid "asterisk_module_resindications"
+msgid "Indications Configuration"
 msgstr ""
 
 #. Call Monitoring Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:202
-msgid "asterisk_module_resmonitor"
+msgid "Call Monitoring Resource"
 msgstr ""
 
 #. Music On Hold Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:203
-msgid "asterisk_module_resmusiconhold"
+msgid "Music On Hold Resource"
 msgstr ""
 
 #. ODBC Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:204
-msgid "asterisk_module_resodbc"
+msgid "ODBC Resource"
 msgstr ""
 
 #. SMDI Module
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:205
-msgid "asterisk_module_ressmdi"
+msgid "SMDI Module"
 msgstr ""
 
 #. SNMP Module
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:206
-msgid "asterisk_module_ressnmp"
+msgid "SNMP Module"
 msgstr ""
 
 #. Music On Hold
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:207
-msgid "asterisk_moh"
+msgid "Music On Hold"
 msgstr ""
 
 #. Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:208
-msgid "asterisk_moh_application"
+msgid "Application"
 msgstr ""
 
 #. Directory of Music
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:209
-msgid "asterisk_moh_directory"
+msgid "Directory of Music"
 msgstr ""
 
 #. Option mode
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:210
-msgid "asterisk_moh_mode"
+msgid "Option mode"
 msgstr ""
 
 #. Random Play
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:211
-msgid "asterisk_moh_random"
+msgid "Random Play"
 msgstr ""
 
 #. SIP Connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:212
-msgid "asterisk_sip"
+msgid "SIP Connection"
 msgstr ""
 
 #. Always Dial International
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:213
-msgid "asterisk_sip_alwaysinternational"
+msgid "Always Dial International"
 msgstr ""
 
 #. Reinvite/redirect media connections
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:214
-msgid "asterisk_sip_canreinvite"
+msgid "Reinvite/redirect media connections"
 msgstr ""
 
 #. context
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:215
-msgid "asterisk_sip_context"
+msgid "context"
 msgstr ""
 
 #. Country Code for connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:216
-msgid "asterisk_sip_countrycode"
+msgid "Country Code for connection"
 msgstr ""
 
 #. DTMF mode
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:217
-msgid "asterisk_sip_dtmfmode"
+msgid "DTMF mode"
 msgstr ""
 
 #. Add as Extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:218
-msgid "asterisk_sip_extension"
+msgid "Add as Extension"
 msgstr ""
 
 #. Primary domain identity for From: headers
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:219
-msgid "asterisk_sip_fromdomain"
+msgid "Primary domain identity for From: headers"
 msgstr ""
 
 #. From user (required by many SIP providers)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:220
-msgid "asterisk_sip_fromuser"
+msgid "From user (required by many SIP providers)"
 msgstr ""
 
 #. Host name (or blank)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:221
-msgid "asterisk_sip_host"
+msgid "Host name (or blank)"
 msgstr ""
 
 #. Ring on incoming dialplan contexts
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:222
-msgid "asterisk_sip_incoming"
+msgid "Ring on incoming dialplan contexts"
 msgstr ""
 
 #. Allow Insecure for
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:223
-msgid "asterisk_sip_insecure"
+msgid "Allow Insecure for"
 msgstr ""
 
 #. International Dial Prefix
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:224
-msgid "asterisk_sip_internationalprefix"
+msgid "International Dial Prefix"
 msgstr ""
 
 #. Mailbox for MWI
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:225
-msgid "asterisk_sip_mailbox"
+msgid "Mailbox for MWI"
 msgstr ""
 
 #. NAT between phone and Asterisk
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:226
-msgid "asterisk_sip_nat"
+msgid "NAT between phone and Asterisk"
 msgstr ""
 
 #. Check tags in headers
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:227
-msgid "asterisk_sip_pedantic"
+msgid "Check tags in headers"
 msgstr ""
 
 #. SIP Port
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:228
-msgid "asterisk_sip_port"
+msgid "SIP Port"
 msgstr ""
 
 #. Dial Prefix (for external line)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:229
-msgid "asterisk_sip_prefix"
+msgid "Dial Prefix (for external line)"
 msgstr ""
 
 #. Reply Timeout (ms) for down connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:230
-msgid "asterisk_sip_qualify"
+msgid "Reply Timeout (ms) for down connection"
 msgstr ""
 
 #. Register connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:231
-msgid "asterisk_sip_register"
+msgid "Register connection"
 msgstr ""
 
 #. Secret
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:232
-msgid "asterisk_sip_secret"
+msgid "Secret"
 msgstr ""
 
 #. Dial own extension for mailbox
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:233
-msgid "asterisk_sip_selfmailbox"
+msgid "Dial own extension for mailbox"
 msgstr ""
 
 #. Dial Timeout (sec)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:234
-msgid "asterisk_sip_timeout"
+msgid "Dial Timeout (sec)"
 msgstr ""
 
 #. Client Type
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:235
-msgid "asterisk_sip_type"
+msgid "Client Type"
 msgstr ""
 
 #. Username
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:236
-msgid "asterisk_sip_username"
+msgid "Username"
 msgstr ""
 
 #. Section sipgeneral
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:237
 #, fuzzy
-msgid "asterisk_sipgeneral"
+msgid "Section sipgeneral"
 msgstr "Opções Gerais do Plano de Marcação"
 
 #. Allow codecs
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:238
-msgid "asterisk_sipgeneral_allow"
+msgid "Allow codecs"
 msgstr ""
 
 #. SIP Port
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:239
-msgid "asterisk_sipgeneral_port"
+msgid "SIP Port"
 msgstr ""
 
 #. SIP realm
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:240
-msgid "asterisk_sipgeneral_realm"
+msgid "SIP realm"
 msgstr ""
 
 #. Voicemail general options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:241
-msgid "asterisk_voicegeneral"
+msgid "Voicemail general options"
 msgstr ""
 
 #. From Email address of server
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:242
-msgid "asterisk_voicegeneral_serveremail"
+msgid "From Email address of server"
 msgstr ""
 
 #. Voice Mail boxes
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:243
-msgid "asterisk_voicemail"
+msgid "Voice Mail boxes"
 msgstr ""
 
 #. Email contains attachment
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:244
-msgid "asterisk_voicemail_attach"
+msgid "Email contains attachment"
 msgstr ""
 
 #. Email
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:245
-msgid "asterisk_voicemail_email"
+msgid "Email"
 msgstr ""
 
 #. Display Name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:246
-msgid "asterisk_voicemail_name"
+msgid "Display Name"
 msgstr ""
 
 #. Password
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:247
-msgid "asterisk_voicemail_password"
+msgid "Password"
 msgstr ""
 
 #. zone
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:248
-msgid "asterisk_voicemail_zone"
+msgid "zone"
 msgstr ""
 
 #. Voice Zone settings
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:249
-msgid "asterisk_voicezone"
+msgid "Voice Zone settings"
 msgstr ""
 
 #. Message Format
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:250
-msgid "asterisk_voicezone_message"
+msgid "Message Format"
 msgstr ""
 
 #. Time Zone
diff --git a/po/pt_BR/cbi.po b/po/pt_BR/cbi.po
index 3faded6c5..505a9031a 100644
--- a/po/pt_BR/cbi.po
+++ b/po/pt_BR/cbi.po
@@ -13,86 +13,86 @@ msgstr ""
 
 #. Add entry
 #: i18n/english/luasrc/i18n/cbi.en.lua:1
-msgid "cbi_add"
+msgid "Add"
 msgstr "Adicionar entrada"
 
 #. Remove entry
 #: i18n/english/luasrc/i18n/cbi.en.lua:2
-msgid "cbi_del"
+msgid "Delete"
 msgstr "Remover entrada"
 
 #. Replace entry
 #: i18n/english/luasrc/i18n/cbi.en.lua:3
-msgid "cbi_replace"
+msgid "Replace entry"
 msgstr "Substituir entrada"
 
 #. Invalid input value
 #: i18n/english/luasrc/i18n/cbi.en.lua:4
-msgid "cbi_invalid"
+msgid "Invalid"
 msgstr "Valor inválido"
 
 #. <strong>Validation failed:</strong> Please check any input fields for mistakes.
 #: i18n/english/luasrc/i18n/cbi.en.lua:5
-msgid "cbi_invalid_section"
+msgid "<strong>Validation failed:</strong> Please check any input fields for mistakes."
 msgstr ""
 "<strong>A validação falhou:</strong> Por favor, verifique por erros em algum "
 "dos campos de entrada."
 
 #. This field is mandatory
 #: i18n/english/luasrc/i18n/cbi.en.lua:6
-msgid "cbi_missing"
+msgid "This field is mandatory"
 msgstr "Este campo é obrigatório"
 
 #. <strong>Validation failed:</strong> At least one mandatory field has no or an invalid value
 #: i18n/english/luasrc/i18n/cbi.en.lua:7
-msgid "cbi_deperror"
+msgid "<strong>Validation failed:</strong> At least one mandatory field has no or an invalid value"
 msgstr ""
 "<strong>A validação falhou:</strong> É obrigatório pelo menos um campo com o "
 "valor correcto."
 
 #. A requirement for this option was not met
 #: i18n/english/luasrc/i18n/cbi.en.lua:8
-msgid "cbi_reqerror"
+msgid "A requirement for this option was not met"
 msgstr "Um requisito para esta opção não foi cumprido"
 
 #. -- Additional Field --
 #: i18n/english/luasrc/i18n/cbi.en.lua:9
-msgid "cbi_addopt"
+msgid "-- Additional Field --"
 msgstr "-- Campo Adicional --"
 
 #.  (optional)
 #: i18n/english/luasrc/i18n/cbi.en.lua:10
-msgid "cbi_optional"
+msgid " (optional)"
 msgstr " (opcional)"
 
 #. This section contains no values yet
 #: i18n/english/luasrc/i18n/cbi.en.lua:11
-msgid "cbi_sectempty"
+msgid "This section contains no values yet"
 msgstr "Esta secção ainda não contêm valores"
 
 #. -- custom --
 #: i18n/english/luasrc/i18n/cbi.en.lua:12
-msgid "cbi_manual"
+msgid "-- custom --"
 msgstr "-- personalizado --"
 
 #. -- Please choose --
 #: i18n/english/luasrc/i18n/cbi.en.lua:13
-msgid "cbi_select"
+msgid "-- Please choose --"
 msgstr "-- Por favor escolha --"
 
 #. Go to relevant configuration page
 #: i18n/english/luasrc/i18n/cbi.en.lua:14
-msgid "cbi_gorel"
+msgid " "
 msgstr "Ir para a página respectiva de configuração"
 
 #. Applying changes
 #: i18n/english/luasrc/i18n/cbi.en.lua:15
-msgid "cbi_applying"
+msgid "Applying changes"
 msgstr "A aplicar as alterações"
 
 #. Uploaded File
 #: i18n/english/luasrc/i18n/cbi.en.lua:16
-msgid "cbi_upload"
+msgid "Uploaded File"
 msgstr "Ficheiro carregado"
 
 #. Search file...
diff --git a/po/pt_BR/coovachilli.po b/po/pt_BR/coovachilli.po
index 325b68957..f9612dd9c 100644
--- a/po/pt_BR/coovachilli.po
+++ b/po/pt_BR/coovachilli.po
@@ -13,37 +13,37 @@ msgstr ""
 
 #. CoovaChilli
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:1
-msgid "coovachilli"
+msgid "CoovaChilli"
 msgstr "CoovaChilli"
 
 #. General configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:2
-msgid "coovachilli_general"
+msgid "General configuration"
 msgstr "Configuração Geral"
 
 #. General CoovaChilli settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:3
-msgid "coovachilli_general_desc"
+msgid "General CoovaChilli settings"
 msgstr "Definições gerais do CoovaChilli"
 
 #. Command socket
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:4
-msgid "coovachilli_general_cmdsock"
+msgid "Command socket"
 msgstr "Socket de comando"
 
 #. UNIX socket used for communication with chilli_query
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:5
-msgid "coovachilli_general_cmdsock_desc"
+msgid "UNIX socket used for communication with chilli_query"
 msgstr "Socket UNIX para comunicação com  chilli_query"
 
 #. Config refresh interval
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:6
-msgid "coovachilli_general_interval"
+msgid "Config refresh interval"
 msgstr "Intervalo de refrescamento da configuração"
 
 #. Re-read configuration file and do DNS lookups every interval seconds. This has the same effect as sending the HUP signal. If interval is 0 (zero) this feature is disabled. 
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:7
-msgid "coovachilli_general_interval_desc"
+msgid "Re-read configuration file and do DNS lookups every interval seconds. This has the same effect as sending the HUP signal. If interval is 0 (zero) this feature is disabled. "
 msgstr ""
 "Reler o ficheiro de configuração e executar verificações DNS n segundos de "
 "intervalo. Tem o mesmo efeito que o envio do sinal HUP. Se o intervalo for 0 "
@@ -51,101 +51,101 @@ msgstr ""
 
 #. Pid file
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:8
-msgid "coovachilli_general_pidfile"
+msgid "Pid file"
 msgstr "Ficheiro PID"
 
 #. Filename to put the process id
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:9
-msgid "coovachilli_general_pidfile_desc"
+msgid "Filename to put the process id"
 msgstr "Nome do ficheiro onde será guardado o PID"
 
 #. State directory
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:10
-msgid "coovachilli_general_statedir"
+msgid "State directory"
 msgstr "Directorio de estado"
 
 #. Directory of non-volatile data
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:11
-msgid "coovachilli_general_statedir_desc"
+msgid "Directory of non-volatile data"
 msgstr "Directorio para dados não-volateis"
 
 #. TUN/TAP configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:12
-msgid "coovachilli_tun"
+msgid "TUN/TAP configuration"
 msgstr "Configuração tun/tap"
 
 #. Network/Tun configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:13
-msgid "coovachilli_tun_desc"
+msgid "Network/Tun configuration"
 msgstr "Configuração de rede/tun"
 
 #. Network down script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:14
-msgid "coovachilli_tun_condown"
+msgid "Network down script"
 msgstr "Script de rede/tun em baixo"
 
 #. Script executed after a session has moved from authorized state to unauthorized
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:15
-msgid "coovachilli_tun_condown_desc"
+msgid "Script executed after a session has moved from authorized state to unauthorized"
 msgstr ""
 "Script executado após o estado de uma sessão ser alterado de autorizado para "
 "não-autorizado "
 
 #. Network up script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:16
-msgid "coovachilli_tun_conup"
+msgid "Network up script"
 msgstr "Script de rede/tun em cima"
 
 #. Script executed after the tun network interface has been brought up
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:17
-msgid "coovachilli_tun_conup_desc"
+msgid "Script executed after the tun network interface has been brought up"
 msgstr "Script executado apos o interface tun de rede ter sido levantado"
 
 #. Primary DNS Server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:18
-msgid "coovachilli_tun_dns1"
+msgid "Primary DNS Server"
 msgstr "Servidor primário de DNS"
 
 #. Is used to inform the client about the DNS address to use for host name resolution
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:19
-msgid "coovachilli_tun_dns1_desc"
+msgid "Is used to inform the client about the DNS address to use for host name resolution"
 msgstr ""
 "Usado para informar o cliente sobre o endereço de servidor DNS a usar para a "
 "resolução de nomes"
 
 #. Secondary DNS Server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:20
-msgid "coovachilli_tun_dns2"
+msgid "Secondary DNS Server"
 msgstr "Servidor secundário de DNS"
 
 #. Is used to inform the client about the DNS address to use for host name resolution
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:21
-msgid "coovachilli_tun_dns2_desc"
+msgid "Is used to inform the client about the DNS address to use for host name resolution"
 msgstr ""
 "Usado para informar o cliente sobre o endereço de servidor secundário de DNS "
 "a usar para a resolução de nomes"
 
 #. Domain name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:22
-msgid "coovachilli_tun_domain"
+msgid "Domain name"
 msgstr "Domínio"
 
 #. Is used to inform the client about the domain name to use for DNS lookups
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:23
-msgid "coovachilli_tun_domain_desc"
+msgid "Is used to inform the client about the domain name to use for DNS lookups"
 msgstr ""
 "Usado para informar o cliente sobre o dominio a utilizar para pedidos DNS"
 
 #. Dynamic IP address pool
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:24
 #, fuzzy
-msgid "coovachilli_tun_dynip"
+msgid "Dynamic IP address pool"
 msgstr "Servidor primário de DNS"
 
 #. Specifies a pool of dynamic IP addresses
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:25
 #, fuzzy
-msgid "coovachilli_tun_dynip_desc"
+msgid "Specifies a pool of dynamic IP addresses"
 msgstr ""
 "Usado para informar o cliente sobre o endereço de servidor DNS a usar para a "
 "resolução de nomes"
@@ -153,13 +153,13 @@ msgstr ""
 #. IP down script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:26
 #, fuzzy
-msgid "coovachilli_tun_ipdown"
+msgid "IP down script"
 msgstr "Script de rede/tun em baixo"
 
 #. Script executed after the tun network interface has been taken down
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:27
 #, fuzzy
-msgid "coovachilli_tun_ipdown_desc"
+msgid "Script executed after the tun network interface has been taken down"
 msgstr ""
 "Script executado após o estado de uma sessão ser alterado de autorizado para "
 "não-autorizado "
@@ -167,25 +167,25 @@ msgstr ""
 #. IP up script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:28
 #, fuzzy
-msgid "coovachilli_tun_ipup"
+msgid "IP up script"
 msgstr "Script de rede/tun em cima"
 
 #. Script executed after the TUN/TAP network interface has been brought up
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:29
 #, fuzzy
-msgid "coovachilli_tun_ipup_desc"
+msgid "Script executed after the TUN/TAP network interface has been brought up"
 msgstr "Script executado apos o interface tun de rede ter sido levantado"
 
 #. Uplink subnet
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:30
 #, fuzzy
-msgid "coovachilli_tun_net"
+msgid "Uplink subnet"
 msgstr "Configuração de rede/tun"
 
 #. Network address of the uplink interface (CIDR notation)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:31
 #, fuzzy
-msgid "coovachilli_tun_net_desc"
+msgid "Network address of the uplink interface (CIDR notation)"
 msgstr ""
 "Usado para informar o cliente sobre o endereço de servidor DNS a usar para a "
 "resolução de nomes"
@@ -193,25 +193,25 @@ msgstr ""
 #. Static IP address pool
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:32
 #, fuzzy
-msgid "coovachilli_tun_statip"
+msgid "Static IP address pool"
 msgstr "Script de rede/tun em cima"
 
 #. Specifies a pool of static IP addresses
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:33
 #, fuzzy
-msgid "coovachilli_tun_statip_desc"
+msgid "Specifies a pool of static IP addresses"
 msgstr "Script executado apos o interface tun de rede ter sido levantado"
 
 #. TUN/TAP device
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:34
 #, fuzzy
-msgid "coovachilli_tun_tundev"
+msgid "TUN/TAP device"
 msgstr "Script de rede/tun em baixo"
 
 #. The specific device to use for the TUN/TAP interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:35
 #, fuzzy
-msgid "coovachilli_tun_tundev_desc"
+msgid "The specific device to use for the TUN/TAP interface"
 msgstr ""
 "Script executado após o estado de uma sessão ser alterado de autorizado para "
 "não-autorizado "
@@ -219,721 +219,721 @@ msgstr ""
 #. TX queue length
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:36
 #, fuzzy
-msgid "coovachilli_tun_txqlen"
+msgid "TX queue length"
 msgstr "Domínio"
 
 #. The TX queue length to set on the TUN/TAP interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:37
 #, fuzzy
-msgid "coovachilli_tun_txqlen_desc"
+msgid "The TX queue length to set on the TUN/TAP interface"
 msgstr ""
 "Usado para informar o cliente sobre o dominio a utilizar para pedidos DNS"
 
 #. Use TAP device
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:38
 #, fuzzy
-msgid "coovachilli_tun_usetap"
+msgid "Use TAP device"
 msgstr "Configuração de rede/tun"
 
 #. Use the TAP interface instead of TUN
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:39
 #, fuzzy
-msgid "coovachilli_tun_usetap_desc"
+msgid "Use the TAP interface instead of TUN"
 msgstr "Script executado apos o interface tun de rede ter sido levantado"
 
 #. DHCP configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:40
 #, fuzzy
-msgid "coovachilli_dhcp"
+msgid "DHCP configuration"
 msgstr "Configuração tun/tap"
 
 #. Set DHCP options for connecting clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:41
 #, fuzzy
-msgid "coovachilli_dhcp_desc"
+msgid "Set DHCP options for connecting clients"
 msgstr "Configuração de rede/tun"
 
 #. DHCP end number
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:42
-msgid "coovachilli_dhcp_dhcpend"
+msgid "DHCP end number"
 msgstr ""
 
 #. Where to stop assigning IP addresses (default 254)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:43
-msgid "coovachilli_dhcp_dhcpend_desc"
+msgid "Where to stop assigning IP addresses (default 254)"
 msgstr ""
 
 #. DHCP interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:44
-msgid "coovachilli_dhcp_dhcpif"
+msgid "DHCP interface"
 msgstr ""
 
 #. Ethernet interface to listen to for the downlink interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:45
-msgid "coovachilli_dhcp_dhcpif_desc"
+msgid "Ethernet interface to listen to for the downlink interface"
 msgstr ""
 
 #. Listen MAC address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:46
-msgid "coovachilli_dhcp_dhcpmac"
+msgid "Listen MAC address"
 msgstr ""
 
 #. MAC address to listen to. If not specified the MAC address of the interface will be used
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:47
-msgid "coovachilli_dhcp_dhcpmac_desc"
+msgid "MAC address to listen to. If not specified the MAC address of the interface will be used"
 msgstr ""
 
 #. DHCP start number
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:48
-msgid "coovachilli_dhcp_dhcpstart"
+msgid "DHCP start number"
 msgstr ""
 
 #. Where to start assigning IP addresses (default 10)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:49
-msgid "coovachilli_dhcp_dhcpstart_desc"
+msgid "Where to start assigning IP addresses (default 10)"
 msgstr ""
 
 #. Enable IEEE 802.1x
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:50
-msgid "coovachilli_dhcp_eapolenable"
+msgid "Enable IEEE 802.1x"
 msgstr ""
 
 #. Enable IEEE 802.1x authentication and listen for EAP requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:51
-msgid "coovachilli_dhcp_eapolenable_desc"
+msgid "Enable IEEE 802.1x authentication and listen for EAP requests"
 msgstr ""
 
 #. Leasetime
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:52
-msgid "coovachilli_dhcp_lease"
+msgid "Leasetime"
 msgstr ""
 
 #. Use a DHCP lease of seconds (default 600)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:53
-msgid "coovachilli_dhcp_lease_desc"
+msgid "Use a DHCP lease of seconds (default 600)"
 msgstr ""
 
 #. RADIUS configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:54
-msgid "coovachilli_radius"
+msgid "RADIUS configuration"
 msgstr ""
 
 #. RADIUS configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:55
 #, fuzzy
-msgid "coovachilli_radius_desc"
+msgid "RADIUS configuration"
 msgstr "Configuração de rede/tun"
 
 #. Allow session update through RADIUS
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:56
-msgid "coovachilli_radius_acctupdate"
+msgid "Allow session update through RADIUS"
 msgstr ""
 
 #. Allow updating of session parameters with RADIUS attributes sent in Accounting-Response
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:57
-msgid "coovachilli_radius_acctupdate_desc"
+msgid "Allow updating of session parameters with RADIUS attributes sent in Accounting-Response"
 msgstr ""
 
 #. Admin password
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:58
-msgid "coovachilli_radius_adminpasswd"
+msgid "Admin password"
 msgstr ""
 
 #. Password to use for Administrative-User authentication in order to pick up chilli configurations and establish a device &quot;system&quot; session
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:59
-msgid "coovachilli_radius_adminpasswd_desc"
+msgid "Password to use for Administrative-User authentication in order to pick up chilli configurations and establish a device \"system\" session"
 msgstr ""
 
 #. Admin user
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:60
-msgid "coovachilli_radius_adminuser"
+msgid "Admin user"
 msgstr ""
 
 #. User-name to use for Administrative-User authentication in order to pick up chilli configurations and establish a device &quot;system&quot; session
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:61
-msgid "coovachilli_radius_adminuser_desc"
+msgid "User-name to use for Administrative-User authentication in order to pick up chilli configurations and establish a device \"system\" session"
 msgstr ""
 
 #. Do not check disconnection requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:62
-msgid "coovachilli_radius_coanoipcheck"
+msgid "Do not check disconnection requests"
 msgstr ""
 
 #. Do not check the source IP address of radius disconnect requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:63
-msgid "coovachilli_radius_coanoipcheck_desc"
+msgid "Do not check the source IP address of radius disconnect requests"
 msgstr ""
 
 #. RADIUS disconnect port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:64
-msgid "coovachilli_radius_coaport"
+msgid "RADIUS disconnect port"
 msgstr ""
 
 #. UDP port to listen to for accepting radius disconnect requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:65
-msgid "coovachilli_radius_coaport_desc"
+msgid "UDP port to listen to for accepting radius disconnect requests"
 msgstr ""
 
 #. NAS IP
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:66
-msgid "coovachilli_radius_nasip"
+msgid "NAS IP"
 msgstr ""
 
 #. Value to use in RADIUS NAS-IP-Address attribute
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:67
-msgid "coovachilli_radius_nasip_desc"
+msgid "Value to use in RADIUS NAS-IP-Address attribute"
 msgstr ""
 
 #. NAS MAC
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:68
-msgid "coovachilli_radius_nasmac"
+msgid "NAS MAC"
 msgstr ""
 
 #. MAC address value to use in RADIUS Called-Station-ID attribute
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:69
-msgid "coovachilli_radius_nasmac_desc"
+msgid "MAC address value to use in RADIUS Called-Station-ID attribute"
 msgstr ""
 
 #. Allow OpenID authentication
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:70
-msgid "coovachilli_radius_openidauth"
+msgid "Allow OpenID authentication"
 msgstr ""
 
 #. Allows OpenID authentication by sending ChilliSpot-Config=allow-openidauth in RADIUS Access-Requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:71
-msgid "coovachilli_radius_openidauth_desc"
+msgid "Allows OpenID authentication by sending ChilliSpot-Config=allow-openidauth in RADIUS Access-Requests"
 msgstr ""
 
 #. RADIUS accounting port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:72
-msgid "coovachilli_radius_radiusacctport"
+msgid "RADIUS accounting port"
 msgstr ""
 
 #. The UDP port number to use for radius accounting requests (default 1813)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:73
-msgid "coovachilli_radius_radiusacctport_desc"
+msgid "The UDP port number to use for radius accounting requests (default 1813)"
 msgstr ""
 
 #. RADIUS authentication port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:74
-msgid "coovachilli_radius_radiusauthport"
+msgid "RADIUS authentication port"
 msgstr ""
 
 #. The UDP port number to use for radius authentication requests (default 1812)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:75
-msgid "coovachilli_radius_radiusauthport_desc"
+msgid "The UDP port number to use for radius authentication requests (default 1812)"
 msgstr ""
 
 #. Option radiuscalled
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:76
-msgid "coovachilli_radius_radiuscalled"
+msgid "Option radiuscalled"
 msgstr ""
 
 #. RADIUS listen address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:77
-msgid "coovachilli_radius_radiuslisten"
+msgid "RADIUS listen address"
 msgstr ""
 
 #. Local interface IP address to use for the radius interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:78
-msgid "coovachilli_radius_radiuslisten_desc"
+msgid "Local interface IP address to use for the radius interface"
 msgstr ""
 
 #. RADIUS location ID
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:79
-msgid "coovachilli_radius_radiuslocationid"
+msgid "RADIUS location ID"
 msgstr ""
 
 #. WISPr Location ID
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:80
-msgid "coovachilli_radius_radiuslocationid_desc"
+msgid "WISPr Location ID"
 msgstr ""
 
 #. RADIUS location name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:81
-msgid "coovachilli_radius_radiuslocationname"
+msgid "RADIUS location name"
 msgstr ""
 
 #. WISPr Location Name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:82
-msgid "coovachilli_radius_radiuslocationname_desc"
+msgid "WISPr Location Name"
 msgstr ""
 
 #. NAS ID
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:83
-msgid "coovachilli_radius_radiusnasid"
+msgid "NAS ID"
 msgstr ""
 
 #. Network access server identifier
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:84
-msgid "coovachilli_radius_radiusnasid_desc"
+msgid "Network access server identifier"
 msgstr ""
 
 #. Option radiusnasip
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:85
-msgid "coovachilli_radius_radiusnasip"
+msgid "Option radiusnasip"
 msgstr ""
 
 #. NAS port type
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:86
-msgid "coovachilli_radius_radiusnasporttype"
+msgid "NAS port type"
 msgstr ""
 
 #. Value of NAS-Port-Type attribute. Defaults to 19 (Wireless-IEEE-802.11)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:87
-msgid "coovachilli_radius_radiusnasporttype_desc"
+msgid "Value of NAS-Port-Type attribute. Defaults to 19 (Wireless-IEEE-802.11)"
 msgstr ""
 
 #. Send RADIUS VSA
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:88
-msgid "coovachilli_radius_radiusoriginalurl"
+msgid "Send RADIUS VSA"
 msgstr ""
 
 #. Send the ChilliSpot-OriginalURL RADIUS VSA in Access-Request
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:89
-msgid "coovachilli_radius_radiusoriginalurl_desc"
+msgid "Send the ChilliSpot-OriginalURL RADIUS VSA in Access-Request"
 msgstr ""
 
 #. RADIUS secret
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:90
-msgid "coovachilli_radius_radiussecret"
+msgid "RADIUS secret"
 msgstr ""
 
 #. Radius shared secret for both servers
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:91
-msgid "coovachilli_radius_radiussecret_desc"
+msgid "Radius shared secret for both servers"
 msgstr ""
 
 #. RADIUS server 1
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:92
-msgid "coovachilli_radius_radiusserver1"
+msgid "RADIUS server 1"
 msgstr ""
 
 #. The IP address of radius server 1
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:93
-msgid "coovachilli_radius_radiusserver1_desc"
+msgid "The IP address of radius server 1"
 msgstr ""
 
 #. RADIUS server 2
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:94
-msgid "coovachilli_radius_radiusserver2"
+msgid "RADIUS server 2"
 msgstr ""
 
 #. The IP address of radius server 2
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:95
-msgid "coovachilli_radius_radiusserver2_desc"
+msgid "The IP address of radius server 2"
 msgstr ""
 
 #. Swap octets
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:96
-msgid "coovachilli_radius_swapoctets"
+msgid "Swap octets"
 msgstr ""
 
 #. Swap the meaning of &quot;input octets&quot; and &quot;output octets&quot; as it related to RADIUS attribtues
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:97
-msgid "coovachilli_radius_swapoctets_desc"
+msgid "Swap the meaning of \"input octets\" and \"output octets\" as it related to RADIUS attribtues"
 msgstr ""
 
 #. Allow WPA guests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:98
-msgid "coovachilli_radius_wpaguests"
+msgid "Allow WPA guests"
 msgstr ""
 
 #. Allows WPA Guest authentication by sending ChilliSpot-Config=allow-wpa-guests in RADIUS Access-Requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:99
-msgid "coovachilli_radius_wpaguests_desc"
+msgid "Allows WPA Guest authentication by sending ChilliSpot-Config=allow-wpa-guests in RADIUS Access-Requests"
 msgstr ""
 
 #. RADIUS proxy settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:100
-msgid "coovachilli_proxy"
+msgid "RADIUS proxy settings"
 msgstr ""
 
 #. RADIUS proxy settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:101
 #, fuzzy
-msgid "coovachilli_proxy_desc"
+msgid "RADIUS proxy settings"
 msgstr "Configuração de rede/tun"
 
 #. Proxy client
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:102
-msgid "coovachilli_proxy_proxyclient"
+msgid "Proxy client"
 msgstr ""
 
 #. IP address from which radius requests are accepted. If omitted the server will not accept radius requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:103
-msgid "coovachilli_proxy_proxyclient_desc"
+msgid "IP address from which radius requests are accepted. If omitted the server will not accept radius requests"
 msgstr ""
 
 #. Proxy listen address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:104
-msgid "coovachilli_proxy_proxylisten"
+msgid "Proxy listen address"
 msgstr ""
 
 #. Local interface IP address to use for accepting radius requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:105
-msgid "coovachilli_proxy_proxylisten_desc"
+msgid "Local interface IP address to use for accepting radius requests"
 msgstr ""
 
 #. Proxy port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:106
-msgid "coovachilli_proxy_proxyport"
+msgid "Proxy port"
 msgstr ""
 
 #. UDP Port to listen to for accepting radius requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:107
-msgid "coovachilli_proxy_proxyport_desc"
+msgid "UDP Port to listen to for accepting radius requests"
 msgstr ""
 
 #. Proxy secret
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:108
-msgid "coovachilli_proxy_proxysecret"
+msgid "Proxy secret"
 msgstr ""
 
 #. Radius shared secret for clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:109
-msgid "coovachilli_proxy_proxysecret_desc"
+msgid "Radius shared secret for clients"
 msgstr ""
 
 #. UAM configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:110
 #, fuzzy
-msgid "coovachilli_uam"
+msgid "UAM configuration"
 msgstr "Configuração tun/tap"
 
 #. Unified Configuration Method settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:111
 #, fuzzy
-msgid "coovachilli_uam_desc"
+msgid "Unified Configuration Method settings"
 msgstr "Configuração de rede/tun"
 
 #. Use Chilli XML
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:112
-msgid "coovachilli_uam_chillixml"
+msgid "Use Chilli XML"
 msgstr ""
 
 #. Return the so-called Chilli XML along with WISPr XML
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:113
-msgid "coovachilli_uam_chillixml_desc"
+msgid "Return the so-called Chilli XML along with WISPr XML"
 msgstr ""
 
 #. Default idle timeout
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:114
-msgid "coovachilli_uam_defidletimeout"
+msgid "Default idle timeout"
 msgstr ""
 
 #. Default idle timeout unless otherwise set by RADIUS (defaults to 0)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:115
-msgid "coovachilli_uam_defidletimeout_desc"
+msgid "Default idle timeout unless otherwise set by RADIUS (defaults to 0)"
 msgstr ""
 
 #. Default interim interval
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:116
-msgid "coovachilli_uam_definteriminterval"
+msgid "Default interim interval"
 msgstr ""
 
 #. Default interim-interval for RADIUS accounting unless otherwise set by RADIUS (defaults to 0)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:117
-msgid "coovachilli_uam_definteriminterval_desc"
+msgid "Default interim-interval for RADIUS accounting unless otherwise set by RADIUS (defaults to 0)"
 msgstr ""
 
 #. Default session timeout
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:118
-msgid "coovachilli_uam_defsessiontimeout"
+msgid "Default session timeout"
 msgstr ""
 
 #. Default session timeout unless otherwise set by RADIUS (defaults to 0)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:119
-msgid "coovachilli_uam_defsessiontimeout_desc"
+msgid "Default session timeout unless otherwise set by RADIUS (defaults to 0)"
 msgstr ""
 
 #. Inspect DNS traffic
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:120
-msgid "coovachilli_uam_dnsparanoia"
+msgid "Inspect DNS traffic"
 msgstr ""
 
 #. Inspect DNS packets and drop responses with any non- A, CNAME, SOA, or MX records to prevent dns tunnels (experimental)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:121
-msgid "coovachilli_uam_dnsparanoia_desc"
+msgid "Inspect DNS packets and drop responses with any non- A, CNAME, SOA, or MX records to prevent dns tunnels (experimental)"
 msgstr ""
 
 #. Local users file
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:122
-msgid "coovachilli_uam_localusers"
+msgid "Local users file"
 msgstr ""
 
 #. A colon seperated file containing usernames and passwords of locally authenticated users
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:123
-msgid "coovachilli_uam_localusers_desc"
+msgid "A colon seperated file containing usernames and passwords of locally authenticated users"
 msgstr ""
 
 #. Location name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:124
-msgid "coovachilli_uam_locationname"
+msgid "Location name"
 msgstr ""
 
 #. Human readable location name used in JSON interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:125
-msgid "coovachilli_uam_locationname_desc"
+msgid "Human readable location name used in JSON interface"
 msgstr ""
 
 #. Do not redirect to UAM server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:126
-msgid "coovachilli_uam_nouamsuccess"
+msgid "Do not redirect to UAM server"
 msgstr ""
 
 #. Do not return to UAM server on login success, just redirect to original URL
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:127
-msgid "coovachilli_uam_nouamsuccess_desc"
+msgid "Do not return to UAM server on login success, just redirect to original URL"
 msgstr ""
 
 #. Do not do WISPr
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:128
-msgid "coovachilli_uam_nouamwispr"
+msgid "Do not do WISPr"
 msgstr ""
 
 #. Do not do any WISPr XML, assume the back-end is doing this instead
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:129
-msgid "coovachilli_uam_nouamwispr_desc"
+msgid "Do not do any WISPr XML, assume the back-end is doing this instead"
 msgstr ""
 
 #. Post auth proxy
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:130
-msgid "coovachilli_uam_postauthproxy"
+msgid "Post auth proxy"
 msgstr ""
 
 #. Used with postauthproxyport to define a post authentication HTTP proxy server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:131
-msgid "coovachilli_uam_postauthproxy_desc"
+msgid "Used with postauthproxyport to define a post authentication HTTP proxy server"
 msgstr ""
 
 #. Post auth proxy port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:132
-msgid "coovachilli_uam_postauthproxyport"
+msgid "Post auth proxy port"
 msgstr ""
 
 #. Used with postauthproxy to define a post authentication HTTP proxy server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:133
-msgid "coovachilli_uam_postauthproxyport_desc"
+msgid "Used with postauthproxy to define a post authentication HTTP proxy server"
 msgstr ""
 
 #. Allowed resources
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:134
-msgid "coovachilli_uam_uamallowed"
+msgid "Allowed resources"
 msgstr ""
 
 #. List of resources the client can access without first authenticating
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:135
-msgid "coovachilli_uam_uamallowed_desc"
+msgid "List of resources the client can access without first authenticating"
 msgstr ""
 
 #. Allow any DNS server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:136
-msgid "coovachilli_uam_uamanydns"
+msgid "Allow any DNS server"
 msgstr ""
 
 #. Allow any DNS server for unauthenticated clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:137
-msgid "coovachilli_uam_uamanydns_desc"
+msgid "Allow any DNS server for unauthenticated clients"
 msgstr ""
 
 #. Allow any IP address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:138
-msgid "coovachilli_uam_uamanyip"
+msgid "Allow any IP address"
 msgstr ""
 
 #. Allow clients to use any IP settings they wish by spoofing ARP (experimental)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:139
-msgid "coovachilli_uam_uamanyip_desc"
+msgid "Allow clients to use any IP settings they wish by spoofing ARP (experimental)"
 msgstr ""
 
 #. Allowed domains
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:140
 #, fuzzy
-msgid "coovachilli_uam_uamdomain"
+msgid "Allowed domains"
 msgstr "Domínio"
 
 #. Defines a list of domain names to automatically add to the walled garden
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:141
 #, fuzzy
-msgid "coovachilli_uam_uamdomain_desc"
+msgid "Defines a list of domain names to automatically add to the walled garden"
 msgstr ""
 "Usado para informar o cliente sobre o dominio a utilizar para pedidos DNS"
 
 #. UAM homepage
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:142
-msgid "coovachilli_uam_uamhomepage"
+msgid "UAM homepage"
 msgstr ""
 
 #. URL of homepage to redirect unauthenticated users to
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:143
-msgid "coovachilli_uam_uamhomepage_desc"
+msgid "URL of homepage to redirect unauthenticated users to"
 msgstr ""
 
 #. UAM static content port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:144
-msgid "coovachilli_uam_uamiport"
+msgid "UAM static content port"
 msgstr ""
 
 #. TCP port to bind to for only serving embedded content
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:145
-msgid "coovachilli_uam_uamiport_desc"
+msgid "TCP port to bind to for only serving embedded content"
 msgstr ""
 
 #. UAM listening address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:146
-msgid "coovachilli_uam_uamlisten"
+msgid "UAM listening address"
 msgstr ""
 
 #. IP address to listen to for authentication of clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:147
-msgid "coovachilli_uam_uamlisten_desc"
+msgid "IP address to listen to for authentication of clients"
 msgstr ""
 
 #. UAM logout IP
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:148
-msgid "coovachilli_uam_uamlogoutip"
+msgid "UAM logout IP"
 msgstr ""
 
 #. Use this IP address to instantly logout a client accessing it (defaults to 1.1.1.1)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:149
-msgid "coovachilli_uam_uamlogoutip_desc"
+msgid "Use this IP address to instantly logout a client accessing it (defaults to 1.1.1.1)"
 msgstr ""
 
 #. UAM listening port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:150
-msgid "coovachilli_uam_uamport"
+msgid "UAM listening port"
 msgstr ""
 
 #. TCP port to bind to for authenticating clients (default 3990)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:151
-msgid "coovachilli_uam_uamport_desc"
+msgid "TCP port to bind to for authenticating clients (default 3990)"
 msgstr ""
 
 #. UAM secret
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:152
-msgid "coovachilli_uam_uamsecret"
+msgid "UAM secret"
 msgstr ""
 
 #. Shared secret between uamserver and chilli
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:153
-msgid "coovachilli_uam_uamsecret_desc"
+msgid "Shared secret between uamserver and chilli"
 msgstr ""
 
 #. UAM server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:154
-msgid "coovachilli_uam_uamserver"
+msgid "UAM server"
 msgstr ""
 
 #. URL of web server to use for authenticating clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:155
-msgid "coovachilli_uam_uamserver_desc"
+msgid "URL of web server to use for authenticating clients"
 msgstr ""
 
 #. UAM user interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:156
-msgid "coovachilli_uam_uamui"
+msgid "UAM user interface"
 msgstr ""
 
 #. An init.d style program to handle local content on the uamuiport web server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:157
-msgid "coovachilli_uam_uamui_desc"
+msgid "An init.d style program to handle local content on the uamuiport web server"
 msgstr ""
 
 #. Use status file
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:158
-msgid "coovachilli_uam_usestatusfile"
+msgid "Use status file"
 msgstr ""
 
 #. Write the status of clients in a non-volatile state file (experimental)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:159
-msgid "coovachilli_uam_usestatusfile_desc"
+msgid "Write the status of clients in a non-volatile state file (experimental)"
 msgstr ""
 
 #. WISPr login url
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:160
-msgid "coovachilli_uam_wisprlogin"
+msgid "WISPr login url"
 msgstr ""
 
 #. Specific URL to be given in WISPr XML LoginURL
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:161
-msgid "coovachilli_uam_wisprlogin_desc"
+msgid "Specific URL to be given in WISPr XML LoginURL"
 msgstr ""
 
 #. CGI program
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:162
-msgid "coovachilli_uam_wwwbin"
+msgid "CGI program"
 msgstr ""
 
 #. Executable to run as a CGI type program (like haserl) for URLs with extention .chi
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:163
-msgid "coovachilli_uam_wwwbin_desc"
+msgid "Executable to run as a CGI type program (like haserl) for URLs with extention .chi"
 msgstr ""
 
 #. Web content directory
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:164
-msgid "coovachilli_uam_wwwdir"
+msgid "Web content directory"
 msgstr ""
 
 #. Directory where embedded local web content is placed
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:165
-msgid "coovachilli_uam_wwwdir_desc"
+msgid "Directory where embedded local web content is placed"
 msgstr ""
 
 #. MAC configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:166
-msgid "coovachilli_macauth"
+msgid "MAC configuration"
 msgstr ""
 
 #. Configure MAC authentication
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:167
 #, fuzzy
-msgid "coovachilli_macauth_desc"
+msgid "Configure MAC authentication"
 msgstr "Configuração de rede/tun"
 
 #. Allowed MAC addresses
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:168
-msgid "coovachilli_macauth_macallowed"
+msgid "Allowed MAC addresses"
 msgstr ""
 
 #. List of MAC addresses for which MAC authentication will be performed
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:169
-msgid "coovachilli_macauth_macallowed_desc"
+msgid "List of MAC addresses for which MAC authentication will be performed"
 msgstr ""
 
 #. Authenticate locally allowed MACs
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:170
-msgid "coovachilli_macauth_macallowlocal"
+msgid "Authenticate locally allowed MACs"
 msgstr ""
 
 #. Authenticate allowed MAC addresses without the use of RADIUS
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:171
-msgid "coovachilli_macauth_macallowlocal_desc"
+msgid "Authenticate allowed MAC addresses without the use of RADIUS"
 msgstr ""
 
 #. Enable MAC authentification
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:172
-msgid "coovachilli_macauth_macauth"
+msgid "Enable MAC authentification"
 msgstr ""
 
 #. Try to authenticate all users based on their mac address alone
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:173
-msgid "coovachilli_macauth_macauth_desc"
+msgid "Try to authenticate all users based on their mac address alone"
 msgstr ""
 
 #. Password
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:174
-msgid "coovachilli_macauth_macpasswd"
+msgid "Password"
 msgstr ""
 
 #. Password used when performing MAC authentication
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:175
-msgid "coovachilli_macauth_macpasswd_desc"
+msgid "Password used when performing MAC authentication"
 msgstr ""
 
 #. Suffix
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:176
-msgid "coovachilli_macauth_macsuffix"
+msgid "Suffix"
 msgstr ""
 
 #. Suffix to add to the MAC address in order to form the User-Name, which is sent to the radius server
diff --git a/po/pt_BR/ddns.po b/po/pt_BR/ddns.po
index 82d0c16a2..4ede7224c 100644
--- a/po/pt_BR/ddns.po
+++ b/po/pt_BR/ddns.po
@@ -13,39 +13,39 @@ msgstr ""
 
 #. Dynamic DNS
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:1
-msgid "ddns"
+msgid "Dynamic DNS"
 msgstr "DNS Dinâmico"
 
 #. Dynamic DNS allows that your router can be reached with a fixed hostname while having a dynamically changing IP-Address.
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:2
-msgid "ddns_desc"
+msgid "Dynamic DNS allows that your router can be reached with a fixed hostname while having a dynamically changing IP-Address."
 msgstr ""
 "O DNS dinâmico permite que o seu router possa ser encontrado a partir de um "
 "hostname fixo, mesmo usando um Endereço IP dinâmico."
 
 #. Source of IP-Address
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:3
-msgid "ddns_service_ipsource"
+msgid "Source of IP-Address"
 msgstr "Origem do Endereço IP"
 
 #. Check for changed IP every
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:4
-msgid "ddns_service_checkinterval"
+msgid "Check for changed IP every"
 msgstr "Intervalo para verificação de alteração do endereço IP"
 
 #. Check-Time unit
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:5
-msgid "ddns_service_checkunit"
+msgid "Check-Time unit"
 msgstr "Unidade de tempo para verificação"
 
 #. Force update every
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:6
-msgid "ddns_service_forceinterval"
+msgid "Force update every"
 msgstr "Forçar actualização a cada"
 
 #. Force-Time unit
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:7
-msgid "ddns_service_forceunit"
+msgid "Force-Time unit"
 msgstr "Unidade de tempo para actualização forçada"
 
 #. Custom Update-URL
diff --git a/po/pt_BR/default.po b/po/pt_BR/default.po
index a6824cd31..f94515513 100644
--- a/po/pt_BR/default.po
+++ b/po/pt_BR/default.po
@@ -13,37 +13,37 @@ msgstr ""
 
 #. Skip to navigation
 #: i18n/english/luasrc/i18n/default.en.lua:1
-msgid "skiplink1"
+msgid "Skip to navigation"
 msgstr "Ir para a navegação"
 
 #. Skip to content
 #: i18n/english/luasrc/i18n/default.en.lua:2
-msgid "skiplink2"
+msgid "Skip to content"
 msgstr "Ir para o conteúdo"
 
 #. Navigation
 #: i18n/english/luasrc/i18n/default.en.lua:3
-msgid "navigation"
+msgid "Navigation"
 msgstr "Navegação"
 
 #. About
 #: i18n/english/luasrc/i18n/default.en.lua:4
-msgid "about"
+msgid "About"
 msgstr "Sobre"
 
 #. Add
 #: i18n/english/luasrc/i18n/default.en.lua:5
-msgid "add"
+msgid "Add"
 msgstr "Adicionar"
 
 #. Addresses
 #: i18n/english/luasrc/i18n/default.en.lua:6
-msgid "addresses"
+msgid "Addresses"
 msgstr "Endereços"
 
 #. Aliases
 #: i18n/english/luasrc/i18n/default.en.lua:7
-msgid "aliases"
+msgid "Aliases"
 msgstr "Aliases"
 
 #. all
@@ -58,99 +58,99 @@ msgstr "voltar"
 
 #. Administration
 #: i18n/english/luasrc/i18n/default.en.lua:10
-msgid "administration"
+msgid "Administration"
 msgstr "Administração"
 
 #. Essentials
 #: i18n/english/luasrc/i18n/default.en.lua:11
-msgid "essentials"
+msgid "Essentials"
 msgstr "Básico"
 
 #. Apply
 #: i18n/english/luasrc/i18n/default.en.lua:12
-msgid "apply"
+msgid "Apply"
 msgstr "Aplicar"
 
 #. Basic Settings
 #: i18n/english/luasrc/i18n/default.en.lua:13
-msgid "basicsettings"
+msgid "Basic Settings"
 msgstr "Configurações Básicas"
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast
 #: i18n/english/luasrc/i18n/default.en.lua:14
-msgid "broadcast"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"
 msgstr "Broadcast <abbr title=\"Protocolo de Internet Versão 4\">IPv4</abbr>"
 
 #. Cancel
 #: i18n/english/luasrc/i18n/default.en.lua:15
-msgid "cancel"
+msgid "Cancel"
 msgstr "Cancelar"
 
 #. Changes
 #: i18n/english/luasrc/i18n/default.en.lua:16
-msgid "changes"
+msgid "Changes"
 msgstr "Alterações"
 
 #. Channel
 #: i18n/english/luasrc/i18n/default.en.lua:17
-msgid "channel"
+msgid "Channel"
 msgstr "Canal"
 
 #. <abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/prefix
 #: i18n/english/luasrc/i18n/default.en.lua:18
-msgid "cidr6"
+msgid "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/prefix"
 msgstr ""
 "Notação <abbr title=\"Roteamento entre Domínios sem Classe\">CIDR</abbr>: "
 "endereço/prefixo"
 
 #. Code
 #: i18n/english/luasrc/i18n/default.en.lua:19
-msgid "code"
+msgid "Code"
 msgstr "Código"
 
 #. Configuration
 #: i18n/english/luasrc/i18n/default.en.lua:20
-msgid "config"
+msgid "Configuration"
 msgstr "Configuração"
 
 #. Configuration file
 #: i18n/english/luasrc/i18n/default.en.lua:21
-msgid "configfile"
+msgid "Configuration file"
 msgstr "Ficheiro de configuração"
 
 #. Confirmation
 #: i18n/english/luasrc/i18n/default.en.lua:22
-msgid "confirmation"
+msgid "Confirmation"
 msgstr "Confirmação"
 
 #. Delete
 #: i18n/english/luasrc/i18n/default.en.lua:23
-msgid "delete"
+msgid "Delete"
 msgstr "Apagar"
 
 #. Description
 #: i18n/english/luasrc/i18n/default.en.lua:24
-msgid "descr"
+msgid "Description"
 msgstr "Descrição"
 
 #. Design
 #: i18n/english/luasrc/i18n/default.en.lua:25
-msgid "design"
+msgid "Design"
 msgstr "Tema"
 
 #. Destination
 #: i18n/english/luasrc/i18n/default.en.lua:26
-msgid "destination"
+msgid "Destination"
 msgstr "Destino"
 
 #. Device
 #: i18n/english/luasrc/i18n/default.en.lua:27
-msgid "device"
+msgid "Device"
 msgstr "Dispositivo"
 
 #. Devices
 #: i18n/english/luasrc/i18n/default.en.lua:28
-msgid "devices"
+msgid "Devices"
 msgstr "Dispositivos"
 
 #. disable
@@ -160,22 +160,22 @@ msgstr "desactivar"
 
 #. Distance
 #: i18n/english/luasrc/i18n/default.en.lua:30
-msgid "distance"
+msgid "Distance"
 msgstr "Distância"
 
 #. Kernel Log
 #: i18n/english/luasrc/i18n/default.en.lua:31
-msgid "dmesg"
+msgid "Kernel Log"
 msgstr "Registo do Kernel"
 
 #. <abbr title=\"Domain Name System\">DNS</abbr>-Server
 #: i18n/english/luasrc/i18n/default.en.lua:32
-msgid "dnsserver"
+msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Server"
 msgstr "Servidor <abbr title=\"Sistema de Nomes de Domínios\">DNS</abbr>"
 
 #. Edit
 #: i18n/english/luasrc/i18n/default.en.lua:33
-msgid "edit"
+msgid "Edit"
 msgstr "Editar"
 
 #. enable
@@ -185,47 +185,47 @@ msgstr "activar"
 
 #. Encryption
 #: i18n/english/luasrc/i18n/default.en.lua:35
-msgid "encryption"
+msgid "Encryption"
 msgstr "Encriptação"
 
 #. Error
 #: i18n/english/luasrc/i18n/default.en.lua:36
-msgid "error"
+msgid "Error"
 msgstr "Erro"
 
 #. Filesystem
 #: i18n/english/luasrc/i18n/default.en.lua:37
-msgid "filesystem"
+msgid "Filesystem"
 msgstr "Sistema de Ficheiros"
 
 #. Filter
 #: i18n/english/luasrc/i18n/default.en.lua:38
-msgid "filter"
+msgid "Filter"
 msgstr "Filtro"
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway
 #: i18n/english/luasrc/i18n/default.en.lua:39
-msgid "gateway"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
 msgstr "Gateway <abbr title=\"Protocolo de Internet Versão 4\">IPv4</abbr>"
 
 #. <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway
 #: i18n/english/luasrc/i18n/default.en.lua:40
-msgid "gateway6"
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 msgstr "Gateway <abbr title=\"Protocolo de Internet Versão 6\">IPv6</abbr>"
 
 #. General
 #: i18n/english/luasrc/i18n/default.en.lua:41
-msgid "general"
+msgid "General"
 msgstr "Geral"
 
 #. Hostname
 #: i18n/english/luasrc/i18n/default.en.lua:42
-msgid "hostname"
+msgid "Hostname"
 msgstr "Hostname"
 
 #. Install
 #: i18n/english/luasrc/i18n/default.en.lua:43
-msgid "install"
+msgid "Install"
 msgstr "Instalar"
 
 #. installed
@@ -235,103 +235,103 @@ msgstr "instalado"
 
 #. Interface
 #: i18n/english/luasrc/i18n/default.en.lua:45
-msgid "interface"
+msgid "Interface"
 msgstr "Interface"
 
 #. Interfaces
 #: i18n/english/luasrc/i18n/default.en.lua:46
-msgid "interfaces"
+msgid "Interfaces"
 msgstr "Interfaces"
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address
 #: i18n/english/luasrc/i18n/default.en.lua:47
-msgid "ipaddress"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
 msgstr "Endereço <abbr title=\"Protocolo de Internet Versão 4\">IPv4</abbr>"
 
 #. <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address
 #: i18n/english/luasrc/i18n/default.en.lua:48
-msgid "ip6address"
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address"
 msgstr "Endereço <abbr title=\"Protocolo de Internet Versão 6\">IPv6</abbr>"
 
 #. Legend
 #: i18n/english/luasrc/i18n/default.en.lua:49
-msgid "legend"
+msgid "Legend"
 msgstr "Legenda"
 
 #. Library
 #: i18n/english/luasrc/i18n/default.en.lua:50
-msgid "library"
+msgid "Library"
 msgstr "Biblioteca"
 
 #. Logout
 #: i18n/english/luasrc/i18n/default.en.lua:51
-msgid "logout"
+msgid "Logout"
 msgstr "Logout"
 
 #. Key
 #: i18n/english/luasrc/i18n/default.en.lua:52
-msgid "key"
+msgid "Key"
 msgstr "Chave"
 
 #. Language
 #: i18n/english/luasrc/i18n/default.en.lua:53
-msgid "language"
+msgid "Language"
 msgstr "Idioma"
 
 #. Limit
 #: i18n/english/luasrc/i18n/default.en.lua:54
-msgid "limit"
+msgid "Limit"
 msgstr "Limite"
 
 #. Load
 #: i18n/english/luasrc/i18n/default.en.lua:55
-msgid "load"
+msgid "Load"
 msgstr "Carga"
 
 #. Login
 #: i18n/english/luasrc/i18n/default.en.lua:56
-msgid "login"
+msgid "Login"
 msgstr "Login"
 
 #. <abbr title=\"Media Access Control\">MAC</abbr>-Address
 #: i18n/english/luasrc/i18n/default.en.lua:57
-msgid "macaddress"
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr "Endereço <abbr title=\"Controle de Acesso ao Meio\">MAC</abbr>"
 
 #. see &#39;%s&#39; manpage
 #: i18n/english/luasrc/i18n/default.en.lua:58
-msgid "manpage"
+msgid "see '%s' manpage"
 msgstr "veja sobre &#39;%s&#39; na página de manual (man)"
 
 #. Metric
 #: i18n/english/luasrc/i18n/default.en.lua:59
-msgid "metric"
+msgid "Metric"
 msgstr "Métrica"
 
 #. Mode
 #: i18n/english/luasrc/i18n/default.en.lua:60
-msgid "mode"
+msgid "Mode"
 msgstr "Modo"
 
 #. Name
 #: i18n/english/luasrc/i18n/default.en.lua:61
-msgid "name"
+msgid "Name"
 msgstr "Nome"
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask
 #: i18n/english/luasrc/i18n/default.en.lua:62
-msgid "netmask"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr ""
 "Máscara de rede <abbr title=\"Protocolo de Internet Versão 4\">IPv4</abbr>"
 
 #. Network
 #: i18n/english/luasrc/i18n/default.en.lua:63
-msgid "network"
+msgid "Network"
 msgstr "Rede"
 
 #. Networks
 #: i18n/english/luasrc/i18n/default.en.lua:64
-msgid "networks"
+msgid "Networks"
 msgstr "Redes"
 
 #. none
@@ -341,117 +341,117 @@ msgstr "nenhum"
 
 #. not installed
 #: i18n/english/luasrc/i18n/default.en.lua:66
-msgid "notinstalled"
+msgid "not installed"
 msgstr "não instalado"
 
 #. OK
 #: i18n/english/luasrc/i18n/default.en.lua:67
-msgid "ok"
+msgid "OK"
 msgstr "OK"
 
 #. Options
 #: i18n/english/luasrc/i18n/default.en.lua:68
-msgid "options"
+msgid "Options"
 msgstr "Opções"
 
 #. Overview
 #: i18n/english/luasrc/i18n/default.en.lua:69
-msgid "overview"
+msgid "Overview"
 msgstr "Visão geral"
 
 #. Package Manager
 #: i18n/english/luasrc/i18n/default.en.lua:70
-msgid "packagemanager"
+msgid "Package Manager"
 msgstr "Gestor de Pacotes"
 
 #. Password
 #: i18n/english/luasrc/i18n/default.en.lua:71
-msgid "password"
+msgid "Password"
 msgstr "Senha"
 
 #. Path
 #: i18n/english/luasrc/i18n/default.en.lua:72
-msgid "path"
+msgid "Path"
 msgstr "Directório"
 
 #. Port
 #: i18n/english/luasrc/i18n/default.en.lua:73
-msgid "port"
+msgid "Port"
 msgstr "Porta"
 
 #. Ports
 #: i18n/english/luasrc/i18n/default.en.lua:74
-msgid "ports"
+msgid "Ports"
 msgstr "Portas"
 
 #. Proceed
 #: i18n/english/luasrc/i18n/default.en.lua:75
-msgid "proceed"
+msgid "Proceed"
 msgstr "Proceder"
 
 #. Protocol
 #: i18n/english/luasrc/i18n/default.en.lua:76
-msgid "protocol"
+msgid "Protocol"
 msgstr "Protocolo"
 
 #. Reboot
 #: i18n/english/luasrc/i18n/default.en.lua:77
-msgid "reboot"
+msgid "Reboot"
 msgstr "Reboot"
 
 #. Reset
 #: i18n/english/luasrc/i18n/default.en.lua:78
-msgid "reset"
+msgid "Reset"
 msgstr "Reset"
 
 #. Revert
 #: i18n/english/luasrc/i18n/default.en.lua:79
-msgid "revert"
+msgid "Revert"
 msgstr "Reverter"
 
 #. Save
 #: i18n/english/luasrc/i18n/default.en.lua:80
-msgid "save"
+msgid "Save"
 msgstr "Salvar"
 
 #. Save &amp; Apply
 #: i18n/english/luasrc/i18n/default.en.lua:81
-msgid "saveapply"
+msgid "Save & Apply"
 msgstr "Salvar &amp; Aplicar"
 
 #. Scan
 #: i18n/english/luasrc/i18n/default.en.lua:82
-msgid "scan"
+msgid "Scan"
 msgstr "Procurar"
 
 #. Service
 #: i18n/english/luasrc/i18n/default.en.lua:83
-msgid "service"
+msgid "Service"
 msgstr "Serviço"
 
 #. Services
 #: i18n/english/luasrc/i18n/default.en.lua:84
-msgid "services"
+msgid "Services"
 msgstr "Serviços"
 
 #. Settings
 #: i18n/english/luasrc/i18n/default.en.lua:85
-msgid "settings"
+msgid "Settings"
 msgstr "Definições"
 
 #. Size
 #: i18n/english/luasrc/i18n/default.en.lua:86
-msgid "size"
+msgid "Size"
 msgstr "Tamanho"
 
 #. Source
 #: i18n/english/luasrc/i18n/default.en.lua:87
-msgid "source"
+msgid "Source"
 msgstr "Origem"
 
 #. Start
 #: i18n/english/luasrc/i18n/default.en.lua:88
-msgid "start"
+msgid "Start"
 msgstr "Início"
 
 #. static
@@ -461,72 +461,72 @@ msgstr "estático"
 
 #. Status
 #: i18n/english/luasrc/i18n/default.en.lua:90
-msgid "status"
+msgid "Status"
 msgstr "Status"
 
 #. Statistics
 #: i18n/english/luasrc/i18n/default.en.lua:91
-msgid "statistics"
+msgid "Statistics"
 msgstr "Estatísticas"
 
 #. Submit
 #: i18n/english/luasrc/i18n/default.en.lua:92
-msgid "submit"
+msgid "Submit"
 msgstr "Enviar"
 
 #. System Log
 #: i18n/english/luasrc/i18n/default.en.lua:93
-msgid "syslog"
+msgid "System Log"
 msgstr "Registo do Sistema"
 
 #. System
 #: i18n/english/luasrc/i18n/default.en.lua:94
-msgid "system"
+msgid "System"
 msgstr "Sistema"
 
 #. Target
 #: i18n/english/luasrc/i18n/default.en.lua:95
-msgid "target"
+msgid "Target"
 msgstr "Destino"
 
 #. Timezone
 #: i18n/english/luasrc/i18n/default.en.lua:96
-msgid "timezone"
+msgid "Timezone"
 msgstr "Fuso Horário"
 
 #. Type
 #: i18n/english/luasrc/i18n/default.en.lua:97
-msgid "type"
+msgid "Type"
 msgstr "Tipo"
 
 #. Unknown Error
 #: i18n/english/luasrc/i18n/default.en.lua:98
-msgid "unknownerror"
+msgid "Unknown Error"
 msgstr "Erro Desconhecido"
 
 #. Unsaved Changes
 #: i18n/english/luasrc/i18n/default.en.lua:99
-msgid "unsavedchanges"
+msgid "Unsaved Changes"
 msgstr "Alterações não Salvas"
 
 #. Username
 #: i18n/english/luasrc/i18n/default.en.lua:100
-msgid "username"
+msgid "Username"
 msgstr "Utilizador"
 
 #. Version
 #: i18n/english/luasrc/i18n/default.en.lua:101
-msgid "version"
+msgid "Version"
 msgstr "Versão"
 
 #. Web <abbr title=\"User Interface\">UI</abbr>
 #: i18n/english/luasrc/i18n/default.en.lua:102
-msgid "webui"
+msgid "Web <abbr title=\"User Interface\">UI</abbr>"
 msgstr "Web <abbr title=\"Interface do Utilizador\">UI</abbr>"
 
 #. Wifi
 #: i18n/english/luasrc/i18n/default.en.lua:103
-msgid "wifi"
+msgid "Wifi"
 msgstr "Wifi"
 
 #. Zone
diff --git a/po/pt_BR/freifunk.po b/po/pt_BR/freifunk.po
index 63c89bb80..dd1bc3a56 100644
--- a/po/pt_BR/freifunk.po
+++ b/po/pt_BR/freifunk.po
@@ -13,207 +13,207 @@ msgstr ""
 
 #. Hello and welcome in the network of
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:1
-msgid "ff_hellonet"
+msgid "Hello and welcome in the network of"
 msgstr "Olá e benvindo à rede "
 
 #. We are an initiative to establish a free, independent and open wireless mesh network.
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:2
-msgid "ff_public1"
+msgid "We are an initiative to establish a free, independent and open wireless mesh network."
 msgstr ""
 "Somos uma iniciativa para implementação de uma rede livre, independente e "
 "não-comercial."
 
 #. This is the access point
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:3
-msgid "ff_public2"
+msgid "This is the access point"
 msgstr "Este é o ponto de acesso "
 
 #. It is operated by
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:4
-msgid "ff_public3"
+msgid "It is operated by"
 msgstr "É operado por "
 
 #. You can find further information about the global Freifunk initiative at
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:5
-msgid "ff_public4"
+msgid "You can find further information about the global Freifunk initiative at"
 msgstr "Pode encontrar mais informações sobre a iniciativa global Freifunk em "
 
 #. If you are interested in our project then contact the local community
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:6
-msgid "ff_public5"
+msgid "If you are interested in our project then contact the local community"
 msgstr ""
 "Se estiver interessado no nosso projecto, entre em contacto com a sua "
 "comunidade local"
 
 #. Internet access depends on technical and organisational conditions and may or may not work for you.
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:7
-msgid "ff_public6"
+msgid "Internet access depends on technical and organisational conditions and may or may not work for you."
 msgstr ""
 "O acesso à Internet depende de factores técnicos e organizacionais, e pode "
 "funcionar ou não no seu caso."
 
 #. Location
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:8
-msgid "ff_location"
+msgid "Location"
 msgstr "Localização"
 
 #. E-Mail
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:9
-msgid "ff_mail"
+msgid "E-Mail"
 msgstr "email"
 
 #. You really should provide your address here!
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:10
-msgid "ff_mail1"
+msgid "You really should provide your address here!"
 msgstr "É realmente importante que indique o seu endereço email!"
 
 #. Nickname
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:11
-msgid "ff_nickname"
+msgid "Nickname"
 msgstr "Nome curto (nick)"
 
 #. Realname
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:12
-msgid "ff_name"
+msgid "Realname"
 msgstr "Nome"
 
 #. Node
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:13
-msgid "ff_node"
+msgid "Node"
 msgstr "Nó"
 
 #. Notice
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:14
-msgid "ff_note"
+msgid "Notice"
 msgstr "Notas"
 
 #. Phone
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:15
-msgid "ff_phone"
+msgid "Phone"
 msgstr "Telefone"
 
 #. Memory
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:16
-msgid "ff_ram"
+msgid "Memory"
 msgstr "Memória"
 
 #. Free
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:17
-msgid "ff_free"
+msgid "Free"
 msgstr "Livre"
 
 #. Buffers
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:18
-msgid "ff_buffers"
+msgid "Buffers"
 msgstr "Buffers"
 
 #. Cached
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:19
-msgid "ff_cached"
+msgid "Cached"
 msgstr "Em cache"
 
 #. Total
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:20
-msgid "ff_total"
+msgid "Total"
 msgstr "Total"
 
 #. Coordinates
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:21
-msgid "ff_geocoord"
+msgid "Coordinates"
 msgstr "Coordenadas"
 
 #. Client-Splash
-msgid "ff_splash"
+msgid "Client-Splash"
 msgstr ""
 
 #. Active Clients
-msgid "ff_splash_clients"
+msgid "Active Clients"
 msgstr ""
 
 #. Hostname
-msgid "ff_splash_hostname"
+msgid "Hostname"
 msgstr ""
 
 #. IP Address
-msgid "ff_splash_ip"
+msgid "IP Address"
 msgstr ""
 
 #. MAC Address
-msgid "ff_splash_mac"
+msgid "MAC Address"
 msgstr ""
 
 #. Time remaining
-msgid "ff_splash_timeleft"
+msgid "Time remaining"
 msgstr ""
 
 #. Outgoing traffic
-msgid "ff_splash_traffic"
+msgid "Traffic (down/up)"
 msgstr ""
 
 #. Policy
-msgid "ff_splash_policy"
+msgid "Policy"
 msgstr ""
 
 #. unknown
-msgid "ff_splash_unknown"
+msgid "unknown"
 msgstr ""
 
 #. expired
-msgid "ff_splash_expired"
+msgid "expired"
 msgstr ""
 
 #. whitelisted
-msgid "ff_splash_whitelisted"
+msgid "whitelisted"
 msgstr ""
 
 #. splashed
-msgid "ff_splash_splashed"
+msgid "splashed"
 msgstr ""
 
 #. blacklisted
-msgid "ff_splash_blacklisted"
+msgid "blacklisted"
 msgstr ""
 
 #. temporarily blocked
-msgid "ff_splash_tempblock"
+msgid "temporarily blocked"
 msgstr ""
 
 #. No clients connected
-msgid "ff_splash_noclients"
+msgid "No clients connected"
 msgstr ""
 
 #. P2P-Block
-msgid "ff_p2pblock"
+msgid "P2P-Block"
 msgstr ""
 
 #. P2P-Block is a greylisting mechanism to block various peer-to-peer protocols for non-whitelisted clients.
-msgid "ff_p2pblock_desc"
+msgid "P2P-Block is a greylisting mechanism to block various peer-to-peer protocols for non-whitelisted clients."
 msgstr ""
 
 #. Enable P2P-Block
-msgid "ff_p2pblock_enabled"
+msgid "Enable P2P-Block"
 msgstr ""
 
 #. Portrange
-msgid "ff_p2pblock_portrange"
+msgid "Portrange"
 msgstr ""
 
 #. Block Time
-msgid "ff_p2pblock_blocktime"
+msgid "Block Time"
 msgstr ""
 
 #. seconds
-msgid "ff_p2pblock_blocktime_desc"
+msgid "seconds"
 msgstr ""
 
 #. Whitelisted IPs
-msgid "ff_p2pblock_whitelist"
+msgid "Whitelisted IPs"
 msgstr ""
 
 #. Layer7-Protokolle
-msgid "ff_p2pblock_layer7"
+msgid "Layer7-Protocols"
 msgstr ""
 
 #. IP-P2P
-msgid "ff_p2pblock_ipp2p"
+msgid "IP-P2P"
 msgstr ""
diff --git a/po/pt_BR/hd_idle.po b/po/pt_BR/hd_idle.po
index d3e712a59..6e0c48d2c 100644
--- a/po/pt_BR/hd_idle.po
+++ b/po/pt_BR/hd_idle.po
@@ -13,22 +13,22 @@ msgstr ""
 
 #. Disk
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:1
-msgid "disk"
+msgid "Disk"
 msgstr "Disco"
 
 #. Enable debug
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:2
-msgid "enable_debug"
+msgid "Enable debug"
 msgstr "Activar debug"
 
 #. hd-idle
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:3
-msgid "hd_idle"
+msgid "hd-idle"
 msgstr "Hd-idle"
 
 #. hd-idle is a utility program for spinning-down external disks after a period of idle time.
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:4
-msgid "hd_idle_desc"
+msgid "hd-idle is a utility program for spinning-down external disks after a period of idle time."
 msgstr ""
 "Hd-idle é um programa utilitário para activar o modo &quot;economia de "
 "energia&quot; (spinning-down) de discos externos após um período de "
@@ -36,15 +36,15 @@ msgstr ""
 
 #. Idle-Time
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:5
-msgid "idle_time_interval"
+msgid "Idle-Time"
 msgstr "Tempo de ociosidade"
 
 #. Idle-Time unit
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:6
-msgid "idle_time_unit"
+msgid "Idle-Time unit"
 msgstr "Unidade do tempo de ociosidade"
 
 #. Settings
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:7
-msgid "settings"
+msgid "Settings"
 msgstr "Configurações"
diff --git a/po/pt_BR/initmgr.po b/po/pt_BR/initmgr.po
index eaed5ec4c..d097f3727 100644
--- a/po/pt_BR/initmgr.po
+++ b/po/pt_BR/initmgr.po
@@ -14,12 +14,12 @@ msgstr ""
 
 #. Initscripts
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:1
-msgid "initmgr"
+msgid "Initscripts"
 msgstr "Scripts de Inicialização"
 
 #. You can enable or disable installed init scripts here. Changes will applied after a device reboot.<br /><strong>Warning: If you disable essential init scripts like &quot;network&quot;, your device might become inaccesable!</strong>
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:2
-msgid "initmgr_desc"
+msgid "You can enable or disable installed init scripts here. Changes will applied after a device reboot.<br /><strong>Warning: If you disable essential init scripts like \"network\", your device might become inaccesable!</strong>"
 msgstr ""
 "Você pode ativar ou desativar os scripts de inicialização instalados aqui. "
 "As mudanças serão aplicadas após a reinicialização do equipamento.<br "
@@ -29,12 +29,12 @@ msgstr ""
 
 #. Start priority
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:3
-msgid "initmgr_index"
+msgid "Start priority"
 msgstr "Prioridade de inicialização"
 
 #. Initscript
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:4
-msgid "initmgr_name"
+msgid "Initscript"
 msgstr "Script de inicialização"
 
 #. Enable/Disable
diff --git a/po/pt_BR/livestats.po b/po/pt_BR/livestats.po
index a4816446d..151900711 100644
--- a/po/pt_BR/livestats.po
+++ b/po/pt_BR/livestats.po
@@ -13,32 +13,32 @@ msgstr ""
 
 #. incoming
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:1
-msgid "livestats_incoming"
+msgid "incoming"
 msgstr "entrada"
 
 #. outgoing
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:2
-msgid "livestats_outgoing"
+msgid "outgoing"
 msgstr "saída"
 
 #. traffic on
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:3
-msgid "livestats_traffic"
+msgid "traffic on"
 msgstr "tráfego"
 
 #. signal-to-noise ratio for
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:4
-msgid "livestats_wifi"
+msgid "signal-to-noise ratio for"
 msgstr "SNR para"
 
 #. load average
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:5
-msgid "livestats_loadavg"
+msgid "load average"
 msgstr "carga média"
 
 #. Realtime Wireless Status
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:6
-msgid "livestats_stat_wireless"
+msgid "Realtime Wireless Status"
 msgstr "Estado wireless em tempo-real"
 
 #. Realtime Network Traffic
diff --git a/po/pt_BR/luci-fw.po b/po/pt_BR/luci-fw.po
index 3b2519a5b..a0800a62f 100644
--- a/po/pt_BR/luci-fw.po
+++ b/po/pt_BR/luci-fw.po
@@ -13,61 +13,61 @@ msgstr ""
 
 #. Port forwarding
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:1
-msgid "fw_portfw"
+msgid "Port forwarding"
 msgstr "Redirecionamento de portas"
 
 #. Traffic Redirection
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:2
-msgid "fw_redirect"
+msgid "Traffic Redirection"
 msgstr "Redirecionamento de Tráfego"
 
 #. Traffic redirection allows you to change the destination address of forwarded packets.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:3
-msgid "fw_redirect_desc"
+msgid "Traffic redirection allows you to change the destination address of forwarded packets."
 msgstr ""
 "Redirecionamento do tráfego permite a alteração do endereço de destino dos "
 "pacotes enviados."
 
 #. Zone-to-Zone traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:4
-msgid "fw_forwarding"
+msgid "Zone-to-Zone traffic"
 msgstr "Tráfego de Zona-para-Zona"
 
 #. Firewall
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:5
-msgid "fw_fw"
+msgid "Firewall"
 msgstr "Firewall"
 
 #. Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:6
-msgid "fw_zone"
+msgid "Zone"
 msgstr "Zona"
 
 #. Zones
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:7
-msgid "fw_zones"
+msgid "Zones"
 msgstr "Zonas"
 
 #. Custom forwarding
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:8
-msgid "fw_custfwd"
+msgid "Custom forwarding"
 msgstr "Redirecionamento personalizado"
 
 #. The firewall creates zones over your network interfaces to control network traffic flow.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:9
-msgid "fw_fw1"
+msgid "The firewall creates zones over your network interfaces to control network traffic flow."
 msgstr ""
 "O firewall cria zonas sobre as interfaces de rede para controlar o fluxo do "
 "tráfego."
 
 #. Advanced Rules
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:10
-msgid "firewall_rule"
+msgid "Advanced Rules"
 msgstr "Regras Avançadas"
 
 #. Advanced rules let you customize the firewall to your needs. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:11
-msgid "firewall_rule_desc"
+msgid "Advanced rules let you customize the firewall to your needs. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall."
 msgstr ""
 "As regras avançadas permitem a personalização da firewall de acordo com as "
 "necessidades. Apenas as novas ligações serão processadas. Pacotes que "
@@ -76,139 +76,139 @@ msgstr ""
 
 #. Input Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:12
-msgid "firewall_rule_src"
+msgid "Input Zone"
 msgstr "Zona de Entrada"
 
 #. Output Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:13
-msgid "firewall_rule_dest"
+msgid "Output Zone"
 msgstr "Zona de Saída"
 
 #. Source address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:14
-msgid "firewall_rule_srcip"
+msgid "Source address"
 msgstr "Endereço de origem"
 
 #. Destination address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:15
-msgid "firewall_rule_destip"
+msgid "Destination address"
 msgstr "Endereço de destino"
 
 #. Source MAC-Address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:16
-msgid "firewall_rule_srcmac"
+msgid "Source MAC-Address"
 msgstr "Endereço MAC de origem"
 
 #. Source port
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:17
-msgid "firewall_rule_srcport"
+msgid "Source port"
 msgstr "Porta de origem"
 
 #. Destination port
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:18
-msgid "firewall_rule_destport"
+msgid "Destination port"
 msgstr "Porta de destino"
 
 #. Action
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:19
-msgid "firewall_rule_target"
+msgid "Action"
 msgstr "Acção"
 
 #. accept
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:20
-msgid "fw_accept"
+msgid "accept"
 msgstr "aceitar"
 
 #. reject
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:21
-msgid "fw_reject"
+msgid "reject"
 msgstr "rejeitar"
 
 #. drop
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:22
-msgid "fw_drop"
+msgid "drop"
 msgstr "dropar"
 
 #. Source
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:23
-msgid "fw_src"
+msgid "Source"
 msgstr "Origem"
 
 #. Destination
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:24
-msgid "fw_dest"
+msgid "Destination"
 msgstr "Destino"
 
 #. Traffic Control
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:25
-msgid "fw_traffic"
+msgid "Traffic Control"
 msgstr "Controle de Tráfego"
 
 #. MSS Clamping
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:26
-msgid "fw_mtufix"
+msgid "MSS Clamping"
 msgstr "MSS-Correction"
 
 #. Drop invalid packets
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:27
-msgid "fw_dropinvalid"
+msgid "Drop invalid packets"
 msgstr "Dropar pacotes inválidos"
 
 #. Port forwarding allows to provide network services in the internal network to an external network.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:28
-msgid "fw_portfw1"
+msgid "Port forwarding allows to provide network services in the internal network to an external network."
 msgstr ""
 "O redirecionamento de portas permite disponibilizar serviços na rede interna "
 "para uma rede externa."
 
 #. External Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:29
-msgid "firewall_redirect_src_desc"
+msgid "External Zone"
 msgstr "Zona Externa"
 
 #. External port
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:30
-msgid "firewall_redirect_srcdport"
+msgid "External port"
 msgstr "Porta Externa"
 
 #. port or range as first-last
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:31
-msgid "firewall_redirect_srcdport_desc"
+msgid "port or range as first-last"
 msgstr "porta ou gama no formato \"primeira-última\""
 
 #. Source address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:32
-msgid "firewall_redirect_srcip"
+msgid "Source address"
 msgstr "Endereço de origem"
 
 #. Source MAC
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:33
-msgid "firewall_redirect_srcmac"
+msgid "Source MAC"
 msgstr "MAC de origem"
 
 #. Internal address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:34
-msgid "firewall_redirect_destip"
+msgid "Internal address"
 msgstr "Endereço interno"
 
 #. IP-Address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:35
-msgid "firewall_redirect_destip_desc"
+msgid "IP-Address"
 msgstr "Endereço IP"
 
 #. Internal port (optional)
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:36
-msgid "firewall_redirect_destport"
+msgid "Internal port (optional)"
 msgstr "Porta interna (opcional)"
 
 #. port or range as first-last
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:37
-msgid "firewall_redirect_destport_desc"
+msgid "port or range as first-last"
 msgstr "porta ou gama no formato \"primeira-última\""
 
 #. Here you can specify which network traffic is allowed to flow between network zones. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall. If you experience occasional connection problems try enabling MSS Clamping otherwise disable it for performance reasons.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:38
-msgid "fw_forwarding1"
+msgid "Here you can specify which network traffic is allowed to flow between network zones. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall. If you experience occasional connection problems try enabling MSS Clamping otherwise disable it for performance reasons."
 msgstr ""
 "Aqui você pode especificar qual tráfego de rede será permitido para o fluxo "
 "entre zonas das redes. Somente novas conexões serão processadas. Pacotes "
@@ -217,49 +217,49 @@ msgstr ""
 
 #. Input
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:39
-msgid "firewall_forwarding_src"
+msgid "Input"
 msgstr "Entrada"
 
 #. Output
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:40
-msgid "firewall_forwarding_dest"
+msgid "Output"
 msgstr "Saída"
 
 #. Defaults
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:41
-msgid "firewall_defaults"
+msgid "Defaults"
 msgstr "Padrões"
 
 #. These are the default settings that are used if no other rules match.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:42
-msgid "firewall_defaults_desc"
+msgid "These are the default settings that are used if no other rules match."
 msgstr ""
 "Estas são as configurações padrões, que serão usadas se não houver outras "
 "regras."
 
 #. SYN-flood protection
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:43
-msgid "firewall_defaults_synflood"
+msgid "SYN-flood protection"
 msgstr "Proteção SYN-flood"
 
 #. Incoming Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:44
-msgid "firewall_defaults_input"
+msgid "Incoming Traffic"
 msgstr "Tráfego de Entrada"
 
 #. Outgoing Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:45
-msgid "firewall_defaults_output"
+msgid "Outgoing Traffic"
 msgstr "Tráfego de Saída"
 
 #. Forwarded Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:46
-msgid "firewall_defaults_forward"
+msgid "Forwarded Traffic"
 msgstr "Tráfego Redirecionado"
 
 #. Zones part the network interfaces into certain isolated areas to separate network traffic. One or more networks can belong to a zone. The MASQ-flag enables NAT masquerading for all outgoing traffic on this zone.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:47
-msgid "firewall_zone_desc"
+msgid "Zones part the network interfaces into certain isolated areas to separate network traffic. One or more networks can belong to a zone. The MASQ-flag enables NAT masquerading for all outgoing traffic on this zone."
 msgstr ""
 "Zonas são interfaces de redes usadas para separar o tráfego da rede. Uma ou "
 "mais redes podem pertencer a uma zona. A flag-MASQ ativa o mascaramento NAT "
@@ -267,42 +267,42 @@ msgstr ""
 
 #. Incoming Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:48
-msgid "firewall_zone_input"
+msgid "Incoming Traffic"
 msgstr "Tráfego de Entrada"
 
 #. Default Policy
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:49
-msgid "firewall_zone_input_desc"
+msgid "Default Policy"
 msgstr "Política Padrão"
 
 #. Outgoing Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:50
-msgid "firewall_zone_output"
+msgid "Outgoing Traffic"
 msgstr "Tráfego de Saída"
 
 #. Default Policy
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:51
-msgid "firewall_zone_output_desc"
+msgid "Default Policy"
 msgstr "Política Padrão"
 
 #. Forwarded Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:52
-msgid "firewall_zone_forward"
+msgid "Forwarded Traffic"
 msgstr "Tráfego Redirecionado"
 
 #. Default Policy
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:53
-msgid "firewall_zone_forward_desc"
+msgid "Default Policy"
 msgstr "Política Padrão"
 
 #. MASQ
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:54
-msgid "firewall_zone_masq"
+msgid "MASQ"
 msgstr "MASQ"
 
 #. Networks
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:55
-msgid "firewall_zone_network"
+msgid "Networks"
 msgstr "Redes"
 
 #. contained networks
diff --git a/po/pt_BR/mmc_over_gpio.po b/po/pt_BR/mmc_over_gpio.po
index 873a30a21..eedbf0c05 100644
--- a/po/pt_BR/mmc_over_gpio.po
+++ b/po/pt_BR/mmc_over_gpio.po
@@ -14,15 +14,15 @@ msgstr ""
 
 #. MMC/SD driver configuration
 #: applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua:1
-msgid "mmc_over_gpio"
+msgid "MMC/SD driver configuration"
 msgstr "Configuração do driver MMC/SD"
 
 #. MMC/SD driver configuration
 #: applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua:2
-msgid "mmc_over_gpio_desc"
+msgid "MMC/SD driver configuration"
 msgstr "Configuração do driver MMC/SD"
 
 #. Settings
 #: applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua:3
-msgid "settings"
+msgid "Settings"
 msgstr "Configurações"
diff --git a/po/pt_BR/ntpc.po b/po/pt_BR/ntpc.po
index 052944fcb..3255e648b 100644
--- a/po/pt_BR/ntpc.po
+++ b/po/pt_BR/ntpc.po
@@ -13,42 +13,42 @@ msgstr ""
 
 #. Time Synchronisation
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:1
-msgid "ntpc"
+msgid "Time Synchronisation"
 msgstr "Sincronização de Horário"
 
 #. Synchronizes the system time
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:2
-msgid "ntpc_desc"
+msgid "Synchronizes the system time"
 msgstr "Sincroniza a hora do sistema"
 
 #. Time Server
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:3
-msgid "ntpc_timeserver"
+msgid "Time Server"
 msgstr "Servidor de Hora"
 
 #. Update Interval (in s)
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:4
-msgid "ntpc_interval"
+msgid "Update Interval (in s)"
 msgstr "Intervalo de Actualização (em s)"
 
 #. Count of Time Measurements
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:5
-msgid "ntpc_count"
+msgid "Count of Time Measurements"
 msgstr "Quantas vezes irá atualizar"
 
 #. empty = infinite
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:6
-msgid "ntpc_count_desc"
+msgid "empty = infinite"
 msgstr "vazio = infinito"
 
 #. Clock Adjustment
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:7
-msgid "ntpc_drift"
+msgid "Clock Adjustment"
 msgstr "Ajuste do Relógio"
 
 #. Offset Frequency
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:8
-msgid "ntpc_drift_freq"
+msgid "Offset Frequency"
 msgstr "Frequência do Offset"
 
 #. Current system time
diff --git a/po/pt_BR/olsr.po b/po/pt_BR/olsr.po
index 9cc00a2c1..147022f6c 100644
--- a/po/pt_BR/olsr.po
+++ b/po/pt_BR/olsr.po
@@ -14,42 +14,42 @@ msgstr ""
 
 #. OLSR Daemon
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:1
-msgid "olsrd"
+msgid "OLSR Daemon"
 msgstr "Servidor OLSR"
 
 #. Neighbour IP
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:2
-msgid "olsrd_neighbour_ip"
+msgid "Neighbour IP"
 msgstr "Endereço IP do Vizinho"
 
 #. Local interface IP
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:3
-msgid "olsrd_local_ip"
+msgid "Local interface IP"
 msgstr "Endereço IP do interface local"
 
 #. Announced network
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:4
-msgid "olsrd_network"
+msgid "Announced network"
 msgstr "Rede anunciada"
 
 #. OLSR gateway
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:5
-msgid "olsrd_gateway"
+msgid "OLSR gateway"
 msgstr "gateway OLSR"
 
 #. OLSR node
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:6
-msgid "olsrd_node"
+msgid "OLSR node"
 msgstr "Nó OLSR"
 
 #. Unable to connect to the OLSR daemon!
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:7
-msgid "olsrd_error"
+msgid "Unable to connect to the OLSR daemon!"
 msgstr "Não foi possivel ligar ao servidor OLSR!"
 
 #. Make sure that OLSRd is running, the &quot;txtinfo&quot; plugin is loaded, configured on port 2006 and accepts connections from &quot;127.0.0.1&quot;.
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:8
-msgid "olsrd_error_desc"
+msgid "Make sure that OLSRd is running, the \"txtinfo\" plugin is loaded, configured on port 2006 and accepts connections from \"127.0.0.1\"."
 msgstr ""
 "Certifique-se que o processo olsrd está em execução, que o plugin "
 "&quot;txtinfo&quot; está carregado e configurado para a porta 2006 e que "
@@ -57,621 +57,621 @@ msgstr ""
 
 #. OLSR - HNA-Announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:9
-msgid "olsrd_hna"
+msgid "OLSR - HNA-Announcements"
 msgstr "OLSR - Anuncios HNA4"
 
 #. OLSR - Plugins
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:10
-msgid "olsrd_plugins"
+msgid "OLSR - Plugins"
 msgstr "OLSR - Plugins"
 
 #. OLSR connections
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:11
-msgid "olsrd_links"
+msgid "OLSR connections"
 msgstr "OLSR - Ligações"
 
 #. Overview of currently established OLSR connections
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:12
-msgid "olsrd_links_desc"
+msgid "Overview of currently established OLSR connections"
 msgstr "Resumo das ligações OLSR actualmente estabelecidas"
 
 #. Expected retransmission count
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:13
-msgid "olsrd_links_etx_desc"
+msgid "Expected retransmission count"
 msgstr "Contagem esperada de retransmissões"
 
 #. Success rate of sent packages
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:14
-msgid "olsrd_links_lq_desc"
+msgid "Success rate of sent packages"
 msgstr "Racio de sucesso de pacotes enviados"
 
 #. Success rate of received packages
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:15
-msgid "olsrd_links_nlq_desc"
+msgid "Success rate of received packages"
 msgstr "Racio de sucesso de pacotes recebidos"
 
 #. Known OLSR routes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:16
-msgid "olsrd_routes"
+msgid "Known OLSR routes"
 msgstr "Rotas OLSR conhecidas"
 
 #. Overview of currently known routes to other OLSR nodes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:17
-msgid "olsrd_routes_desc"
+msgid "Overview of currently known routes to other OLSR nodes"
 msgstr "Resumo das rotas conhecidas para outros nós OLSR"
 
 #. Active OLSR nodes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:18
-msgid "olsrd_topology"
+msgid "Active OLSR nodes"
 msgstr "Nós OLSR activos"
 
 #. Overview of currently known OLSR nodes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:19
-msgid "olsrd_topology_desc"
+msgid "Overview of currently known OLSR nodes"
 msgstr "Resumo dos nós OLSR conhecidos"
 
 #. Last hop
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:20
-msgid "olsrd_topology_lasthop"
+msgid "Last hop"
 msgstr "Ultimo salto"
 
 #. Active host net announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:21
 #, fuzzy
-msgid "olsrd_hna2"
+msgid "Active host net announcements"
 msgstr "Anuncios activos de hosts"
 
 #. Overview of currently active OLSR host net announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:22
 #, fuzzy
-msgid "olsrd_hna_desc"
+msgid "Overview of currently active OLSR host net announcements"
 msgstr "Resumo de anuncios activos de hosts"
 
 #. Active MID announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:23
-msgid "olsrd_mid"
+msgid "Active MID announcements"
 msgstr "Anuncios MID activos"
 
 #. Overview of known multiple interface announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:24
-msgid "olsrd_mid_desc"
+msgid "Overview of known multiple interface announcements"
 msgstr "Resumo de anuncios de nós com multiplos interfaces activos"
 
 #. Secondary OLSR interfaces
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:25
-msgid "olsrd_mid_aliases"
+msgid "Secondary OLSR interfaces"
 msgstr "Interfaces OLSR secundários"
 
 #. Freifunk
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:26
-msgid "olsrd_etx_ff"
+msgid "Freifunk"
 msgstr "Freifunk"
 
 #. floating point
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:27
-msgid "olsrd_etx_float"
+msgid "floating point"
 msgstr "Virgula flutuante"
 
 #. fixed point math
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:28
-msgid "olsrd_etx_fpm"
+msgid "fixed point math"
 msgstr "Matemática de virgula fixa"
 
 #. General settings
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:29
-msgid "olsrd_olsrd"
+msgid "General settings"
 msgstr "Definições gerais"
 
 #. Start without network
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:30
-msgid "olsrd_olsrd_allownoint"
+msgid "Start without network"
 msgstr "Iniciar sem rede"
 
 #. Clear screen
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:31
-msgid "olsrd_olsrd_clearscreen"
+msgid "Clear screen"
 msgstr "Limpar ecran"
 
 #. Debugmode
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:32
-msgid "olsrd_olsrd_debuglevel"
+msgid "Debugmode"
 msgstr "Nível de mensagens de diagnóstico"
 
 #. FIB metric
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:33
-msgid "olsrd_olsrd_fibmetric"
+msgid "FIB metric"
 msgstr "métrica FIB"
 
 #. Internet protocol
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:34
-msgid "olsrd_olsrd_ipversion"
+msgid "Internet protocol"
 msgstr "Versão IP"
 
 #. LQ aging
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:35
-msgid "olsrd_olsrd_linkqualityaging"
+msgid "LQ aging"
 msgstr "Envelhecimento LQ"
 
 #. LQ algorithm
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:36
-msgid "olsrd_olsrd_linkqualityalgorithm"
+msgid "LQ algorithm"
 msgstr "Algoritmo LQ"
 
 #. LQ Dijkstra limit
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:37
-msgid "olsrd_olsrd_linkqualitydijkstralimit"
+msgid "LQ Dijkstra limit"
 msgstr "Limite Dijkstra LQ"
 
 #. LQ fisheye
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:38
 #, fuzzy
-msgid "olsrd_olsrd_linkqualityfisheye"
+msgid "LQ fisheye"
 msgstr "LQ Fisheye"
 
 #. LQ level
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:39
-msgid "olsrd_olsrd_linkqualitylevel"
+msgid "LQ level"
 msgstr "Nível LQ"
 
 #. MPR selection
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:40
 #, fuzzy
-msgid "olsrd_olsrd_linkqualitylevel_1"
+msgid "MPR selection"
 msgstr "Selecção MPR"
 
 #. MPR selection and routing
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:41
 #, fuzzy
-msgid "olsrd_olsrd_linkqualitylevel_2"
+msgid "MPR selection and routing"
 msgstr "Selecção e Routing MPR"
 
 #. LQ window size
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:42
 #, fuzzy
-msgid "olsrd_olsrd_linkqualitywinsize"
+msgid "LQ window size"
 msgstr "Janela de Amostragem LQ"
 
 #. MPR coverage
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:43
-msgid "olsrd_olsrd_mprcoverage"
+msgid "MPR coverage"
 msgstr "Cobertura MPR"
 
 #. Pollrate
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:44
-msgid "olsrd_olsrd_pollrate"
+msgid "Pollrate"
 msgstr "Pollrate"
 
 #. TC redundancy
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:45
-msgid "olsrd_olsrd_tcredundancy"
+msgid "TC redundancy"
 msgstr "Redundância TC"
 
 #. MPR selectors
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:46
-msgid "olsrd_olsrd_tcredundancy_0"
+msgid "MPR selectors"
 msgstr "Selectores MPR"
 
 #. MPR selectors and MPR
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:47
-msgid "olsrd_olsrd_tcredundancy_1"
+msgid "MPR selectors and MPR"
 msgstr "MPR e selectores MPR"
 
 #. all neighbours
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:48
-msgid "olsrd_olsrd_tcredundancy_2"
+msgid "all neighbours"
 msgstr "Todos os vizinhos"
 
 #. Use hysteresis
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:49
-msgid "olsrd_olsrd_usehysteresis"
+msgid "Use hysteresis"
 msgstr "Usar histerese"
 
 #. Willingness
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:50
-msgid "olsrd_olsrd_willingness"
+msgid "Willingness"
 msgstr "Disponibilidade"
 
 #. Hello interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:51
-msgid "olsrd_interface_hellointerval"
+msgid "Hello interval"
 msgstr "Intervalo entre Hello"
 
 #. Hello validity time
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:52
-msgid "olsrd_interface_hellovaliditytime"
+msgid "Hello validity time"
 msgstr "Validade de Hello"
 
 #. HNA interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:53
-msgid "olsrd_interface_hnainterval"
+msgid "HNA interval"
 msgstr "Intervalo entre HNA"
 
 #. HNA validity time
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:54
-msgid "olsrd_interface_hnavaliditytime"
+msgid "HNA validity time"
 msgstr "Validade de HNA"
 
 #. IPv4 broadcast
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:55
-msgid "olsrd_interface_ip4broadcast"
+msgid "IPv4 broadcast"
 msgstr "Endereço IPv4 de Broadcast"
 
 #. MID interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:56
-msgid "olsrd_interface_midinterval"
+msgid "MID interval"
 msgstr "Intervalo de MID"
 
 #. MID validity time
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:57
-msgid "olsrd_interface_midvaliditytime"
+msgid "MID validity time"
 msgstr "Validade de MID"
 
 #. TC interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:58
-msgid "olsrd_interface_tcinterval"
+msgid "TC interval"
 msgstr "Intervalo de TC"
 
 #. TC validity time
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:59
-msgid "olsrd_interface_tcvaliditytime"
+msgid "TC validity time"
 msgstr "Validade de TC"
 
 #. IPv6 address type
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:60
-msgid "olsrd_interface_ip6addrtype"
+msgid "IPv6 address type"
 msgstr "Tipo de Endereço IPv6"
 
 #. IPC settings
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:61
-msgid "olsrd_ipcconnect"
+msgid "IPC settings"
 msgstr "Definições IPC"
 
 #. IPC connections enable you to remote-control the local OLSRd instance using external programs
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:62
-msgid "olsrd_ipcconnect_desc"
+msgid "IPC connections enable you to remote-control the local OLSRd instance using external programs"
 msgstr ""
 "As ligações IPC permitem-lhe controlar a instancia local de OLSRd com "
 "aplicações externas"
 
 #. Allowed host addresses
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:63
-msgid "olsrd_ipcconnect_host"
+msgid "Allowed host addresses"
 msgstr "Endereços de hosts permitidos"
 
 #. Multiple separated by spaces
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:64
-msgid "olsrd_ipcconnect_host_desc"
+msgid "Multiple separated by spaces"
 msgstr "Multiplas entradas, separadas por espaços"
 
 #. Maxmimum connection count
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:65
-msgid "olsrd_ipcconnect_maxconnections"
+msgid "Maxmimum connection count"
 msgstr "Máximo de ligações permitidas"
 
 #. Set to 0 to disable IPC
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:66
-msgid "olsrd_ipcconnect_maxconnections_desc"
+msgid "Set to 0 to disable IPC"
 msgstr "Defina 0 para desactivar IPC"
 
 #. Allowed subnets
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:67
-msgid "olsrd_ipcconnect_net"
+msgid "Allowed subnets"
 msgstr "Subredes permitidas"
 
 #. Address Mask; multiple separated by space
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:68
-msgid "olsrd_ipcconnect_net_desc"
+msgid "Address Mask; multiple separated by space"
 msgstr "Máscara de subrede; multiplas entradas, separadas por espaços"
 
 #. IPv4 HNA announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:69
 #, fuzzy
-msgid "olsrd_hna4"
+msgid "IPv4 HNA announcements"
 msgstr "OLSR - Anuncios HNA4"
 
 #. Hna4 entries allow you to propagate local IPv4 host- and network-routes into the mesh network
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:70
 #, fuzzy
-msgid "olsrd_hna4_desc"
+msgid "Hna4 entries allow you to propagate local IPv4 host- and network-routes into the mesh network"
 msgstr "Resumo de anuncios activos de hosts"
 
 #. Network address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:71
-msgid "olsrd_hna4_netaddr"
+msgid "Network address"
 msgstr "Endereço de Rede"
 
 #. IPv4 address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:72
-msgid "olsrd_hna4_netaddr_desc"
+msgid "IPv4 address"
 msgstr "Endereço IPv4"
 
 #. Netmask
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:73
-msgid "olsrd_hna4_netmask"
+msgid "Netmask"
 msgstr "Máscara de subrede"
 
 #. IPv4 address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:74
-msgid "olsrd_hna4_netmask_desc"
+msgid "IPv4 address"
 msgstr "Endereço IPv4"
 
 #. IPv6 HNA announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:75
 #, fuzzy
-msgid "olsrd_hna6"
+msgid "IPv6 HNA announcements"
 msgstr "OLSR - Anuncios HNA4"
 
 #. Hna6 entries allow you to propagate local IPv6 host- and network-routes into the mesh network
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:76
 #, fuzzy
-msgid "olsrd_hna6_desc"
+msgid "Hna6 entries allow you to propagate local IPv6 host- and network-routes into the mesh network"
 msgstr "Resumo de anuncios activos de hosts"
 
 #. Network address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:77
-msgid "olsrd_hna6_netaddr"
+msgid "Network address"
 msgstr "Endereço de Rede"
 
 #. IPv6 address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:78
-msgid "olsrd_hna6_netaddr_desc"
+msgid "IPv6 address"
 msgstr "Endereço IPv6"
 
 #. Prefix
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:79
-msgid "olsrd_hna6_prefix"
+msgid "Prefix"
 msgstr "Prefixo"
 
 #. IPv6 prefix
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:80
-msgid "olsrd_hna6_prefix_desc"
+msgid "IPv6 prefix"
 msgstr "Prefixo IPv6"
 
 #. Plugin configuration
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:81
-msgid "olsrd_loadplugin"
+msgid "Plugin configuration"
 msgstr "Configuração de Plugin"
 
 #. Enable plugin
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:82
-msgid "olsrd_loadplugin_ignore"
+msgid "Enable plugin"
 msgstr "Activar Plugin"
 
 #. Library
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:83
-msgid "olsrd_loadplugin_library"
+msgid "Library"
 msgstr "Biblioteca"
 
 #. Allow connections from this hosts
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:84
-msgid "olsrd_loadplugin_accept"
+msgid "Allow connections from this hosts"
 msgstr "Aceitar ligações a partir destes hosts"
 
 #. Ping test addresses
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:85
-msgid "olsrd_loadplugin_ping"
+msgid "Ping test addresses"
 msgstr "Endereços a testar por ping"
 
 #. Interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:86
-msgid "olsrd_loadplugin_interval"
+msgid "Refresh interval in seconds"
 msgstr "Intervalo"
 
 #. HNA announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:87
-msgid "olsrd_loadplugin_hna"
+msgid "HNA announcements"
 msgstr "Anúncios HNA"
 
 #. Format: IP-Address Netmask / OLSR will announce this network once it is reachable
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:88
-msgid "olsrd_loadplugin_hna_desc"
+msgid "Format: IP-Address Netmask / OLSR will announce this network once it is reachable"
 msgstr ""
 "Formato: \"Endereço IP\" \"máscara de subrede\" / o OLSR anunciará esta rede "
 "logo que esta seja acessível "
 
 #. Alternative \"hosts\" file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:89
-msgid "olsrd_loadplugin_addhosts"
+msgid "Alternative \"hosts\" file"
 msgstr "Ficheiro de \"hosts\" alternativo"
 
 #. The contents of this file will be appended to the autogenerated \"hosts\" file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:90
-msgid "olsrd_loadplugin_addhosts_desc"
+msgid "The contents of this file will be appended to the autogenerated \"hosts\" file"
 msgstr ""
 "Os conteúdos deste ficheiro serão acrescentados ao ficheiro automaticamente "
 "gerado de \"hosts\""
 
 #. DNS server
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:91
-msgid "olsrd_loadplugin_dnsserver"
+msgid "DNS server"
 msgstr "Servidor de DNS"
 
 #. Alternative hostnames
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:92
-msgid "olsrd_loadplugin_hosts"
+msgid "Alternative hostnames"
 msgstr "Hostnames alternativos"
 
 #. Format: Interface-IP Hostname
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:93
-msgid "olsrd_loadplugin_hosts_desc"
+msgid "Format: Interface-IP Hostname"
 msgstr "Formato: \"Endereço IP do interface\" \"hostname\""
 
 #. Path to the \"hosts\" file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:94
-msgid "olsrd_loadplugin_hostsfile"
+msgid "Path to the \"hosts\" file"
 msgstr "Caminho completo do ficheiro de \"hosts\""
 
 #. Latitude
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:95
-msgid "olsrd_loadplugin_lat"
+msgid "Latitude"
 msgstr "Latitude"
 
 #. Output file for coordinates
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:96
-msgid "olsrd_loadplugin_latlonfile"
+msgid "Output file for coordinates"
 msgstr "Ficheiro para output das coordenadas"
 
 #. OLSR will write received coordinates of other nodes to this file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:97
-msgid "olsrd_loadplugin_latlonfile_desc"
+msgid "OLSR will write received coordinates of other nodes to this file"
 msgstr ""
 "O OLSR irá escrever as coordenadas que receba de outros hosts neste ficheiro"
 
 #. Input file for coordinates
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:98
-msgid "olsrd_loadplugin_latloninfile"
+msgid "Input file for coordinates"
 msgstr "Ficheiro de entrada para coordenadas"
 
 #. OLSR periodically checks this file for new coordinates and propagates them
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:99
-msgid "olsrd_loadplugin_latloninfile_desc"
+msgid "OLSR periodically checks this file for new coordinates and propagates them"
 msgstr ""
 "O OLSR verifica periodicamente este ficheiro por novas coordenadas e "
 "propaga-as"
 
 #. Longitude
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:100
-msgid "olsrd_loadplugin_lon"
+msgid "Longitude"
 msgstr "Longitude"
 
 #. Hostnames
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:101
-msgid "olsrd_loadplugin_name"
+msgid "Hostnames"
 msgstr "Hostnames"
 
 #. Command for name changes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:102
-msgid "olsrd_loadplugin_namechangescript"
+msgid "Command for name changes"
 msgstr "Comando para alterações de nome"
 
 #. OLSR executes this command once entries in the \"hosts\" are changed
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:103
-msgid "olsrd_loadplugin_namechangescript_desc"
+msgid "OLSR executes this command once entries in the \"hosts\" are changed"
 msgstr ""
 "O OLSR executa este comando logo que existam alterações no ficheiro de hosts"
 
 #. Path to the \"resolv\" file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:104
-msgid "olsrd_loadplugin_resolvfile"
+msgid "Path to the \"resolv\" file"
 msgstr "Caminho para o ficheiro \"resolv.conf\""
 
 #. Command for service changes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:105
-msgid "olsrd_loadplugin_serviceschangescript"
+msgid "Command for service changes"
 msgstr "Comando para alterações ao serviço"
 
 #. OLSR excutes this command once new service announcements are received
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:106
-msgid "olsrd_loadplugin_serviceschangescript_desc"
+msgid "OLSR excutes this command once new service announcements are received"
 msgstr ""
 "O OLSR executa este comando sempre que sejam recebidos novos anuncios de "
 "serviços"
 
 #. PID file for SIGHUP signals
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:107
-msgid "olsrd_loadplugin_sighuppidfile"
+msgid "PID file for SIGHUP signals"
 msgstr "Ficheiro PID para sinais SIGHUP"
 
 #. OLSR sends a HUP signal to this PID once the \"hosts\" oder \"resolv\" file is changed
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:108
-msgid "olsrd_loadplugin_sighuppidfile_desc"
+msgid "OLSR sends a HUP signal to this PID once the \"hosts\" oder \"resolv\" file is changed"
 msgstr ""
 "O OLSR envia um sinal HUP a este PID sempre que o ficheiro \\\"hosts\\\" ou "
 "\\\"resolv.conf\\\" seja alterado"
 
 #. Domain suffix
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:109
-msgid "olsrd_loadplugin_suffix"
+msgid "Domain suffix"
 msgstr "Sufixo de domínio"
 
 #. Timeout
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:110
-msgid "olsrd_loadplugin_timeout"
+msgid "Timeout"
 msgstr "Timeout"
 
 #. Name of the BMF interface
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:111
-msgid "olsrd_loadplugin_bmfinterface"
+msgid "Name of the BMF interface"
 msgstr "Nome do interface BMF"
 
 #. IP address of the BMF interface
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:112
-msgid "olsrd_loadplugin_bmfinterfaceid"
+msgid "IP address of the BMF interface"
 msgstr "Endereço IP do interface BMF"
 
 #. Redirect local broadcasts
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:113
-msgid "olsrd_loadplugin_dolocalbroadcast"
+msgid "Redirect local broadcasts"
 msgstr "Redireccionar broadcasts locais"
 
 #. Also redirect broadcasts from OLSR interfaces
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:114
-msgid "olsrd_loadplugin_capturepacketsonolsrinterfaces"
+msgid "Also redirect broadcasts from OLSR interfaces"
 msgstr "Também redireccionar broadcasts de interfaces OLSR"
 
 #. Propagation mechanism
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:115
-msgid "olsrd_loadplugin_bmfmechanism"
+msgid "Propagation mechanism"
 msgstr "Mecanismo de propagação"
 
 #. Number of retransmissions per package
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:116
-msgid "olsrd_loadplugin_broadcastretransmitcount"
+msgid "Number of retransmissions per package"
 msgstr "Número de retransmissões por pacote"
 
 #. Minimum number of neighbours for broadcast redirection
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:117
-msgid "olsrd_loadplugin_fanoutlimit"
+msgid "Minimum number of neighbours for broadcast redirection"
 msgstr "Número mínimo de vizinhos para redireccionamento de broadcasts"
 
 #. Non-OLSR interfaces
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:118
-msgid "olsrd_loadplugin_nonolsrif"
+msgid "Non-OLSR interfaces"
 msgstr "Interfaces não-OLSR"
 
 #. Used port
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:119
-msgid "olsrd_loadplugin_port"
+msgid "Used port"
 msgstr "Porta utilizada"
 
 #. Allow connections from hosts
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:120
-msgid "olsrd_loadplugin_host"
+msgid "Allow connections from hosts"
 msgstr "Permitir ligações de hosts"
 
 #. Allow connections from subnets
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:121
-msgid "olsrd_loadplugin_net"
+msgid "Allow connections from subnets"
 msgstr "permitir ligações de subredes"
 
 #. Format: IP-AddresseNetmask
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:122
-msgid "olsrd_loadplugin_net_desc"
+msgid "Format: IP-AddresseNetmask"
 msgstr "Formato: \\\"Endereço IP\\\" \\\"Máscara de subrede\\\""
 
 #. Used protocols
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:123
-msgid "olsrd_loadplugin_redistribute"
+msgid "Used protocols"
 msgstr "Protocolos utilizados"
 
 #. Only export routes to Quagga or to kernel too
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:124
-msgid "olsrd_loadplugin_exportroutes"
+msgid "Only export routes to Quagga or to kernel too"
 msgstr "Exportar rotas apenas para quagga ou kernel"
 
 #. Always prefer local routes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:125
-msgid "olsrd_loadplugin_localpref"
+msgid "Always prefer local routes"
 msgstr "Preferir sempre as rotas locais"
 
 #. Distance of exported routes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:126
-msgid "olsrd_loadplugin_distance"
+msgid "Distance of exported routes"
 msgstr "Distância das rotas exportadas"
 
 #. Key file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:127
-msgid "olsrd_loadplugin_keyfile"
+msgid "Key file"
 msgstr "Ficheiro de chave"
 
 #. Watchdog timestamp file
diff --git a/po/pt_BR/openvpn.po b/po/pt_BR/openvpn.po
index 6613119a8..d74e0261b 100644
--- a/po/pt_BR/openvpn.po
+++ b/po/pt_BR/openvpn.po
@@ -13,949 +13,949 @@ msgstr ""
 
 #. OpenVPN
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:1
-msgid "openvpn"
+msgid "OpenVPN"
 msgstr "OpenVPN"
 
 #. Switch to basic configuration
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:3
-msgid "openvpn_switch_basic"
+msgid "« Switch to basic configuration"
 msgstr "Mudar para configuração básica"
 
 #. Switch to advanced configuration
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:4
-msgid "openvpn_switch_advanced"
+msgid "Switch to advanced configuration »"
 msgstr "Mudar para configuração avançada"
 
 #. Enabled
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:6
-msgid "openvpn_enable"
+msgid "Enabled"
 msgstr "Activado"
 
 #. Started
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:7
-msgid "openvpn_active"
+msgid "Started"
 msgstr "Iniciado"
 
 #. no
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:8
-msgid "openvpn_active_no"
+msgid "no"
 msgstr "não"
 
 #. yes (%i)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:9
-msgid "openvpn_active_yes"
+msgid "yes (%i)"
 msgstr "sim (%i)"
 
 #. Port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:10
-msgid "openvpn_port"
+msgid "Port"
 msgstr "Porta"
 
 #. Protocol
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:11
-msgid "openvpn_proto"
+msgid "Protocol"
 msgstr "Protocolo"
 
 #. Instance \"%s\"
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:13
-msgid "openvpn_instance"
+msgid "Instance \"%s\""
 msgstr "Instância \\\"%s\\\""
 
 #. OpenVPN instances
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:15
-msgid "openvpn_overview"
+msgid "OpenVPN instances"
 msgstr "Instâncias OpenVPN"
 
 #. Below is a list of configured OpenVPN instances and their current state
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:16
-msgid "openvpn_overview_desc"
+msgid "Below is a list of configured OpenVPN instances and their current state"
 msgstr ""
 "Abaixo está uma lista de todas as instâncias OpenVPN configuradas e o seu "
 "estado actual"
 
 #. Daemon configuration
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:18
-msgid "openvpn_service"
+msgid "Daemon configuration"
 msgstr "Configuração do processo"
 
 #. Networking options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:19
-msgid "openvpn_networking"
+msgid "Networking options"
 msgstr "Opções de rede"
 
 #. VPN options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:20
-msgid "openvpn_vpn"
+msgid "VPN options"
 msgstr "Opções de VPN"
 
 #. Cryptography settings
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:21
-msgid "openvpn_cryptography"
+msgid "Cryptography settings"
 msgstr "Definições criptográficas"
 
 #. Read configuration options from file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:23
-msgid "openvpn_param_config"
+msgid "Read configuration options from file"
 msgstr "Obter definições a partir de ficheiro"
 
 #. Local host name or ip address
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:24
-msgid "openvpn_param_local"
+msgid "Local host name or ip address"
 msgstr "Hostname ou endereço IP local"
 
 #. Remote host name or ip address
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:25
-msgid "openvpn_param_remote"
+msgid "Remote host name or ip address"
 msgstr "Hostname endereço IP remoto"
 
 #. Randomly choose remote server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:26
-msgid "openvpn_param_remote_random"
+msgid "Randomly choose remote server"
 msgstr "Escolher o server remoto aleatoriamente"
 
 #. Major mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:27
-msgid "openvpn_param_mode"
+msgid "Major mode"
 msgstr "Modo principal"
 
 #. Use protocol
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:28
-msgid "openvpn_param_proto"
+msgid "Use protocol"
 msgstr "Usar protocolo"
 
 #. Connection retry interval
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:29
-msgid "openvpn_param_connect_retry"
+msgid "Connection retry interval"
 msgstr "Intervalo de reestabelecimento de ligação"
 
 #. Connection timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:30
-msgid "openvpn_param_connect_timeout"
+msgid "Connection timeout"
 msgstr "Timeout da ligação"
 
 #. Maximum connection attempt retries
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:31
-msgid "openvpn_param_connect_retry_max"
+msgid "Maximum connection attempt retries"
 msgstr "Máximo de tentativas de estabelecimento de ligação"
 
 #. Try to sense proxy settings automatically
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:32
-msgid "openvpn_param_auto_proxy"
+msgid "Try to sense proxy settings automatically"
 msgstr "Descobrir proxy automaticamente"
 
 #. Connect to remote host
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:33
-msgid "openvpn_param_http_proxy"
+msgid "Connect to remote host"
 msgstr "Ligar a host remoto"
 
 #. Retry indefinitely on HTTP proxy errors
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:34
-msgid "openvpn_param_http_proxy_retry"
+msgid "Retry indefinitely on HTTP proxy errors"
 msgstr "Tentar infinitamente sempre que existam erros de proxy HTTP"
 
 #. Proxy timeout in seconds
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:35
-msgid "openvpn_param_http_proxy_timeout"
+msgid "Proxy timeout in seconds"
 msgstr "Timeout do proxy em segundos"
 
 #. Set extended HTTP proxy options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:36
-msgid "openvpn_param_http_proxy_option"
+msgid "Set extended HTTP proxy options"
 msgstr "Definir opções extra para o proxy HTTP"
 
 #. Connect through Socks5 proxy
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:37
-msgid "openvpn_param_socks_proxy"
+msgid "Connect through Socks5 proxy"
 msgstr "Ligar através de um proxy Socks5"
 
 #. Retry indefinitely on Socks proxy errors
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:38
-msgid "openvpn_param_socks_proxy_retry"
+msgid "Retry indefinitely on Socks proxy errors"
 msgstr "Tentar continuamente a ligação quando existirem erros de proxy Socks"
 
 #. If hostname resolve fails, retry
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:39
-msgid "openvpn_param_resolv_retry"
+msgid "If hostname resolve fails, retry"
 msgstr "Se a resolução de nomes falhar, tentar novamente"
 
 #. Allow remote to change its IP or port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:40
-msgid "openvpn_param_float"
+msgid "Allow remote to change its IP or port"
 msgstr "Permitir a um host remoto que altere o seu IP ou porta"
 
 #. Execute shell command on remote ip change
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:41
-msgid "openvpn_param_ipchange"
+msgid "Execute shell command on remote ip change"
 msgstr "Executar o comando shell quando existir alteração do IP remoto"
 
 #. TCP/UDP port # for both local and remote
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:42
-msgid "openvpn_param_port"
+msgid "TCP/UDP port # for both local and remote"
 msgstr "Porta TCP/UDP para local e remoto"
 
 #. TCP/UDP port # for local (default=1194)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:43
-msgid "openvpn_param_lport"
+msgid "TCP/UDP port # for local (default=1194)"
 msgstr "Porta TCP/UDP para local (predefinição=1194)"
 
 #. TCP/UDP port # for remote (default=1194)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:44
-msgid "openvpn_param_rport"
+msgid "TCP/UDP port # for remote (default=1194)"
 msgstr "Porta TCP/UDP para remoto (predefinição=1194)"
 
 #. Bind to local address and port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:45
-msgid "openvpn_param_bind"
+msgid "Bind to local address and port"
 msgstr "Activar no endereço e porta locais"
 
 #. Do not bind to local address and port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:46
-msgid "openvpn_param_nobind"
+msgid "Do not bind to local address and port"
 msgstr "Não activar no endereço e porta locais"
 
 #. tun/tap device
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:47
-msgid "openvpn_param_dev"
+msgid "tun/tap device"
 msgstr "Dispositivo tun/tap"
 
 #. Type of used device
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:48
-msgid "openvpn_param_dev_type"
+msgid "Type of used device"
 msgstr "Tipo de dispositivo utilizado"
 
 #. Use tun/tap device node
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:49
-msgid "openvpn_param_dev_node"
+msgid "Use tun/tap device node"
 msgstr "Utilizar dispositivo tun/tap"
 
 #. Set the link layer address of the tap device
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:50
-msgid "openvpn_param_lladdr"
+msgid "Set the link layer address of the tap device"
 msgstr "Definir o endereço de link do dispositivo tap"
 
 #. 'net30', 'p2p', or 'subnet'
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:51
-msgid "openvpn_param_topology"
+msgid "'net30', 'p2p', or 'subnet'"
 msgstr "'net30', 'p2p', ou 'subnet'"
 
 #. Make tun device IPv6 capable
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:52
-msgid "openvpn_param_tun_ipv6"
+msgid "Make tun device IPv6 capable"
 msgstr "Tornar o dispositivo tun capaz de IPv6"
 
 #. Configure device to use IP address
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:53
-msgid "openvpn_param_ifconfig"
+msgid "Configure device to use IP address"
 msgstr "Configurar o dispositivo para usar endereço IP"
 
 #. Don't actually execute ifconfig
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:54
-msgid "openvpn_param_ifconfig_noexec"
+msgid "Don't actually execute ifconfig"
 msgstr "Não executar ifconfig"
 
 #. Don't warn on ifconfig inconsistencies
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:55
-msgid "openvpn_param_ifconfig_nowarn"
+msgid "Don't warn on ifconfig inconsistencies"
 msgstr "Não avisar quando existirem inconsistencias no ifconfig"
 
 #. Add route after establishing connection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:56
-msgid "openvpn_param_route"
+msgid "Add route after establishing connection"
 msgstr "Adicionar rota após estabelecimento da ligação"
 
 #. Specify a default gateway for routes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:57
-msgid "openvpn_param_route_gateway"
+msgid "Specify a default gateway for routes"
 msgstr "Especificar uma gateway para as rotas"
 
 #. Specify a default metric for routes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:58
-msgid "openvpn_param_route_metric"
+msgid "Specify a default metric for routes"
 msgstr "Especificar uma métrica para as rotas"
 
 #. Delay n seconds after connection 
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:59
-msgid "openvpn_param_route_delay"
+msgid "Delay n seconds after connection "
 msgstr "Aguardar n segundos após a ligação"
 
 #. Execute shell cmd after routes are added
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:60
-msgid "openvpn_param_route_up"
+msgid "Execute shell cmd after routes are added"
 msgstr "Executar o comando shell após as rotas serem adicionadas"
 
 #. Don't add routes automatically
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:61
-msgid "openvpn_param_route_noexec"
+msgid "Don't add routes automatically"
 msgstr "Não adicionar rotas automaticamente"
 
 #. Don't pull options from server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:62
-msgid "openvpn_param_route_nopull"
+msgid "Don't pull options from server"
 msgstr "Não obter opções do servidor"
 
 #. Automatically redirect default route
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:63
-msgid "openvpn_param_redirect_gateway"
+msgid "Automatically redirect default route"
 msgstr "Redireccionar automaticamente a rota pre-definida"
 
 #. Pass environment variables to script
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:64
-msgid "openvpn_param_setenv"
+msgid "Pass environment variables to script"
 msgstr "Passar variaveis de ambiente ao script"
 
 #. Shaping for peer bandwidth
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:65
-msgid "openvpn_param_shaper"
+msgid "Shaping for peer bandwidth"
 msgstr "Restringir a largura de banda ao remoto"
 
 #. Set timeouts in server mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:66
-msgid "openvpn_param_keepalive"
+msgid "Set timeouts in server mode"
 msgstr "Definir timeouts em modo de servidor"
 
 #. tun/tap inactivity timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:67
-msgid "openvpn_param_inactive"
+msgid "tun/tap inactivity timeout"
 msgstr "Timeout de inactividade tun/tap"
 
 #. Remote ping timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:68
-msgid "openvpn_param_ping_exit"
+msgid "Remote ping timeout"
 msgstr "Timeout do ping remoto"
 
 #. Restart after remote ping timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:69
-msgid "openvpn_param_ping_restart"
+msgid "Restart after remote ping timeout"
 msgstr "Reiniciar após timeout do ping remoto"
 
 #. Only process ping timeouts if routes exist
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:70
-msgid "openvpn_param_ping_timer_rem"
+msgid "Only process ping timeouts if routes exist"
 msgstr "Só processar timeouts de pings se existirem rotas"
 
 #. Ping remote every n seconds over TCP/UDP port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:71
-msgid "openvpn_param_ping"
+msgid "Ping remote every n seconds over TCP/UDP port"
 msgstr "Pingar o remoto a cada n segundos sobre a porta TCP/UDP"
 
 #. Configure a multi-homed UDP server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:72
-msgid "openvpn_param_multihome"
+msgid "Configure a multi-homed UDP server"
 msgstr "Configurar um servidor UDP com vários endereços no interface"
 
 #. Optimize TUN/TAP/UDP writes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:73
-msgid "openvpn_param_fast_io"
+msgid "Optimize TUN/TAP/UDP writes"
 msgstr "Optimizar as escritas TUN/TAP/UDP"
 
 #. Remap SIGUSR1 signals
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:74
-msgid "openvpn_param_remap_usr1"
+msgid "Remap SIGUSR1 signals"
 msgstr "Mapear os sinais SIGUSR1"
 
 #. Keep tun/tap device open on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:75
-msgid "openvpn_param_persist_tun"
+msgid "Keep tun/tap device open on restart"
 msgstr "Manter o dispositivo tun/tap aberto entre reinicios"
 
 #. Keep remote IP address on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:76
-msgid "openvpn_param_persist_remote_ip"
+msgid "Keep remote IP address on restart"
 msgstr "Manter o endereço IP remoto entre reinicios"
 
 #. Keep local IP address on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:77
-msgid "openvpn_param_persist_local_ip"
+msgid "Keep local IP address on restart"
 msgstr "Manter o endereço IP local entre reinicios"
 
 #. Don't re-read key on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:78
-msgid "openvpn_param_persist_key"
+msgid "Don't re-read key on restart"
 msgstr "Não reler a chave entre reinicios"
 
 #. TOS passthrough (applies to IPv4 only)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:79
-msgid "openvpn_param_passtos"
+msgid "TOS passthrough (applies to IPv4 only)"
 msgstr "Passthrough TOS (aplicavel apenas a IPv4)"
 
 #. Set tun/tap device MTU
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:80
-msgid "openvpn_param_tun_mtu"
+msgid "Set tun/tap device MTU"
 msgstr "Definir o MTU do dispositivo tun/tap"
 
 #. Set tun/tap device overhead
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:81
-msgid "openvpn_param_tun_mtu_extra"
+msgid "Set tun/tap device overhead"
 msgstr "Definir o overhead do dispositivo tun/tap"
 
 #. Set TCP/UDP MTU
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:82
-msgid "openvpn_param_link_mtu"
+msgid "Set TCP/UDP MTU"
 msgstr "Definir o MTU TCP/UDP"
 
 #. Enable Path MTU discovery
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:83
-msgid "openvpn_param_mtu_disc"
+msgid "Enable Path MTU discovery"
 msgstr "Activar a descoberta do MTU do caminho"
 
 #. Empirically measure MTU
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:84
-msgid "openvpn_param_mtu_test"
+msgid "Empirically measure MTU"
 msgstr "Medição empírica de MTU"
 
 #. Enable internal datagram fragmentation
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:85
-msgid "openvpn_param_fragment"
+msgid "Enable internal datagram fragmentation"
 msgstr "Activar a fragmentação interna de datagramas"
 
 #. Set upper bound on TCP MSS
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:86
-msgid "openvpn_param_mssfix"
+msgid "Set upper bound on TCP MSS"
 msgstr "Definir tecto do MSS TCP"
 
 #. Set the TCP/UDP send buffer size
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:87
-msgid "openvpn_param_sndbuf"
+msgid "Set the TCP/UDP send buffer size"
 msgstr "Definir o buffer de envio TCP/UDP"
 
 #. Set the TCP/UDP receive buffer size
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:88
-msgid "openvpn_param_rcvbuf"
+msgid "Set the TCP/UDP receive buffer size"
 msgstr "Definir o buffer de recepção TCP/UDP"
 
 #. Set tun/tap TX queue length
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:89
-msgid "openvpn_param_txqueuelen"
+msgid "Set tun/tap TX queue length"
 msgstr "Definir o tamanho da queue de transmissão tun/tap"
 
 #. Disable Paging
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:90
-msgid "openvpn_param_mlock"
+msgid "Disable Paging"
 msgstr "Desactivar Paging"
 
 #. Shell cmd to execute after tun device open
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:91
-msgid "openvpn_param_up"
+msgid "Shell cmd to execute after tun device open"
 msgstr "Comando shell a executar após abertura do dispositivo tun"
 
 #. Delay tun/tap open and up script execution
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:92
-msgid "openvpn_param_up_delay"
+msgid "Delay tun/tap open and up script execution"
 msgstr "Retardar o script de abertura/activação tun/tap"
 
 #. Shell cmd to run after tun device close
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:93
-msgid "openvpn_param_down"
+msgid "Shell cmd to run after tun device close"
 msgstr "Comando shell a executar após fecho do dispositivo tun"
 
 #. Call down cmd/script before TUN/TAP close
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:94
-msgid "openvpn_param_down_pre"
+msgid "Call down cmd/script before TUN/TAP close"
 msgstr "Executar o comando/script antes do fecho tun/tap"
 
 #. Run up/down scripts for all restarts
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:95
-msgid "openvpn_param_up_restart"
+msgid "Run up/down scripts for all restarts"
 msgstr "Executar scripts de abertura/activação para todos os reinicios"
 
 #. Set UID to user
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:96
-msgid "openvpn_param_user"
+msgid "Set UID to user"
 msgstr "Assumir UID para o utilizador"
 
 #. Set GID to group
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:97
-msgid "openvpn_param_group"
+msgid "Set GID to group"
 msgstr "Assumir GID para o grupo"
 
 #. Chroot to directory after initialization
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:98
-msgid "openvpn_param_chroot"
+msgid "Chroot to directory after initialization"
 msgstr "Chroot para o directorio apos a inicialização"
 
 #. Change to directory before initialization
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:99
-msgid "openvpn_param_cd"
+msgid "Change to directory before initialization"
 msgstr "Mudar para o directório antes da inicialização"
 
 #. Daemonize after initialization
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:100
-msgid "openvpn_param_daemon"
+msgid "Daemonize after initialization"
 msgstr "Passar a daemon após a inicialização"
 
 #. Output to syslog and do not daemonize
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:101
-msgid "openvpn_param_syslog"
+msgid "Output to syslog and do not daemonize"
 msgstr "Registos para o syslog e não passar a daemon"
 
 #. Run as an inetd or xinetd server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:102
-msgid "openvpn_param_inetd"
+msgid "Run as an inetd or xinetd server"
 msgstr "Executar via inetd ou xinetd"
 
 #. Write log to file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:103
-msgid "openvpn_param_log"
+msgid "Write log to file"
 msgstr "Escrever registo para o ficheiro"
 
 #. Append log to file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:104
-msgid "openvpn_param_log_append"
+msgid "Append log to file"
 msgstr "Acrescentar registos ao ficheiro"
 
 #. Don't log timestamps
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:105
-msgid "openvpn_param_suppress_timestamps"
+msgid "Don't log timestamps"
 msgstr "Não registar timestamps"
 
 #. Write process ID to file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:106
-msgid "openvpn_param_writepid"
+msgid "Write process ID to file"
 msgstr "Escrever PID no ficheiro"
 
 #. Change process priority
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:107
-msgid "openvpn_param_nice"
+msgid "Change process priority"
 msgstr "Alterar prioridade do processo"
 
 #. Echo parameters to log
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:108
-msgid "openvpn_param_echo"
+msgid "Echo parameters to log"
 msgstr "Escrever parametros no registo"
 
 #. Set output verbosity
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:109
-msgid "openvpn_param_verb"
+msgid "Set output verbosity"
 msgstr "Definir verbosidade do registo"
 
 #. Limit repeated log messages
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:110
-msgid "openvpn_param_mute"
+msgid "Limit repeated log messages"
 msgstr "Limitar repetição de entradas no registo"
 
 #. Write status to file every n seconds
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:111
-msgid "openvpn_param_status"
+msgid "Write status to file every n seconds"
 msgstr "Escrever estado para ficheiro a cada n segundos"
 
 #. Status file format version
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:112
-msgid "openvpn_param_status_version"
+msgid "Status file format version"
 msgstr "Versão de formato do ficheiro de estado"
 
 #. Disable options consistency check
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:113
-msgid "openvpn_param_disable_occ"
+msgid "Disable options consistency check"
 msgstr "Desactivar opções de verificação de consistência"
 
 #. Special stress testing mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:114
-msgid "openvpn_param_gremlin"
+msgid "Special stress testing mode"
 msgstr "Modo especial de teste de stress"
 
 #. Use fast LZO compression
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:115
-msgid "openvpn_param_comp_lzo"
+msgid "Use fast LZO compression"
 msgstr "Usar compressão LZO rápida"
 
 #. Don't use adaptive lzo compression
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:116
-msgid "openvpn_param_comp_noadapt"
+msgid "Don't use adaptive lzo compression"
 msgstr "Não usar compressão LZO adaptiva"
 
 #. Enable management interface on <em>IP</em> <em>port</em>
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:117
-msgid "openvpn_param_management"
+msgid "Enable management interface on <em>IP</em> <em>port</em>"
 msgstr "Activar o interface de gestão em <em>IP</em> <em>porta</em>"
 
 #. Management interface will connect as a TCP client
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:118
-msgid "openvpn_param_management_client"
+msgid "Management interface will connect as a TCP client"
 msgstr "O interface de gestão ligará como um cliente TCP"
 
 #. Query management channel for private key
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:119
-msgid "openvpn_param_management_query_passwords"
+msgid "Query management channel for private key"
 msgstr "Solicitar chave privada ao canal de gestão"
 
 #. Start OpenVPN in a hibernating state
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:120
-msgid "openvpn_param_management_hold"
+msgid "Start OpenVPN in a hibernating state"
 msgstr "Iniciar o OpenVPN em estado de hibernação"
 
 #. Issue SIGUSR1 on management disconnect
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:121
-msgid "openvpn_param_management_signal"
+msgid "Issue SIGUSR1 on management disconnect"
 msgstr "Enviar um SIGUSR1 no fim de uma ligação de gestão"
 
 #. Forget passwords on management disconnect
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:122
-msgid "openvpn_param_management_forget_disconnect"
+msgid "Forget passwords on management disconnect"
 msgstr "Esquecer passwords no fim de uma ligação de gestão"
 
 #. Number of lines for log file history
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:123
-msgid "openvpn_param_management_log_cache"
+msgid "Number of lines for log file history"
 msgstr "Numero de linhas para o historico do registo"
 
 #. Load plug-in module
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:124
-msgid "openvpn_param_plugin"
+msgid "Load plug-in module"
 msgstr "Carregar plugin"
 
 #. Configure server mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:125
-msgid "openvpn_param_server"
+msgid "Configure server mode"
 msgstr "Configurar modo de servidor"
 
 #. Configure server bridge
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:126
-msgid "openvpn_param_server_bridge"
+msgid "Configure server bridge"
 msgstr "Configurar ponte de servidor"
 
 #. Push options to peer
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:127
-msgid "openvpn_param_push"
+msgid "Push options to peer"
 msgstr "Enviar opções ao remoto"
 
 #. Don't inherit global push options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:128
-msgid "openvpn_param_push_reset"
+msgid "Don't inherit global push options"
 msgstr "Não herdar as opções globais de envio (push)"
 
 #. Set aside a pool of subnets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:129
-msgid "openvpn_param_ifconfig_pool"
+msgid "Set aside a pool of subnets"
 msgstr "Reservar um conjunto de subredes"
 
 #. Use individual addresses rather than /30 subnets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:130
-msgid "openvpn_param_ifconfig_pool_linear"
+msgid "Use individual addresses rather than /30 subnets"
 msgstr "Usar endereços individuais em vez de subredes /30"
 
 #. Persist/unpersist ifconfig-pool
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:131
-msgid "openvpn_param_ifconfig_pool_persist"
+msgid "Persist/unpersist ifconfig-pool"
 msgstr "Manter ou não o conjunto de subredes"
 
 #. Push an ifconfig option to remote
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:132
-msgid "openvpn_param_ifconfig_push"
+msgid "Push an ifconfig option to remote"
 msgstr "Enviar uma opção ifconfig ao remoto"
 
 #. Route subnet to client
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:133
-msgid "openvpn_param_iroute"
+msgid "Route subnet to client"
 msgstr "Encaminhar rota da subrede para o cliente"
 
 #. Client is disabled
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:134
-msgid "openvpn_param_disable"
+msgid "Client is disabled"
 msgstr "Cliente desactivado"
 
 #. Don't require client certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:135
-msgid "openvpn_param_client_cert_not_required"
+msgid "Don't require client certificate"
 msgstr "Não solicitar certificado ao cliente"
 
 #. Use username as common name
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:136
-msgid "openvpn_param_username_as_common_name"
+msgid "Use username as common name"
 msgstr "Usar o username como nome comum"
 
 #. Script to verify interactive authentication
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:137
-msgid "openvpn_param_auth_user_pass_verify"
+msgid "Script to verify interactive authentication"
 msgstr "Script para verificar a autenticação interactiva"
 
 #. Allow client-to-client traffic
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:138
-msgid "openvpn_param_client_to_client"
+msgid "Allow client-to-client traffic"
 msgstr "Permitir tráfego cliente-a-cliente"
 
 #. Allow multiple clients with same certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:139
-msgid "openvpn_param_duplicate_cn"
+msgid "Allow multiple clients with same certificate"
 msgstr "Permitir multiplos clientes com o mesmo certificado"
 
 #. Run script cmd on client connection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:140
-msgid "openvpn_param_client_connect"
+msgid "Run script cmd on client connection"
 msgstr "Executar script quando o cliente ligar"
 
 #. Run script cmd on client disconnection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:141
-msgid "openvpn_param_client_disconnect"
+msgid "Run script cmd on client disconnection"
 msgstr "Executar script quando o cliente desligar"
 
 #. Directory for custom client config files
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:142
-msgid "openvpn_param_client_config_dir"
+msgid "Directory for custom client config files"
 msgstr "Directório para configurações personalizadas dos clientes"
 
 #. Refuse connection if no custom client config
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:143
-msgid "openvpn_param_ccd_exclusive"
+msgid "Refuse connection if no custom client config"
 msgstr "Recusar ligações de clientes que não tenham configurações "
 
 #. Temporary directory for client-connect return file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:144
-msgid "openvpn_param_tmp_dir"
+msgid "Temporary directory for client-connect return file"
 msgstr "Directório temporário para ficheiro de retorno de ligação-cliente"
 
 #. Set size of real and virtual address hash tables
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:145
-msgid "openvpn_param_hash_size"
+msgid "Set size of real and virtual address hash tables"
 msgstr "Definir tamanho das tabelas hash de endereços reais e virtuais"
 
 #. Number of allocated broadcast buffers
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:146
-msgid "openvpn_param_bcast_buffers"
+msgid "Number of allocated broadcast buffers"
 msgstr "Numero de buffers de broadcast alocados"
 
 #. Maximum number of queued TCP output packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:147
-msgid "openvpn_param_tcp_queue_limit"
+msgid "Maximum number of queued TCP output packets"
 msgstr "Maximo de pacotes TCP na queue de output"
 
 #. Script to validate client virtual addresses
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:148
-msgid "openvpn_param_learn_address"
+msgid "Script to validate client virtual addresses"
 msgstr "Script de validação de endereços virtuais de clientes"
 
 #. Allowed maximum of new connections
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:149
-msgid "openvpn_param_connect_freq"
+msgid "Allowed maximum of new connections"
 msgstr "Maximo permitido de novas ligações"
 
 #. Allowed maximum of connected clients
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:150
-msgid "openvpn_param_max_clients"
+msgid "Allowed maximum of connected clients"
 msgstr "Máximo permitido de clientes ligados"
 
 #. Allowed maximum of internal
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:151
-msgid "openvpn_param_max_routes_per_client"
+msgid "Allowed maximum of internal"
 msgstr "Máximo permitido internamente para rotas de clientes"
 
 #. Proxy incoming HTTPS sessions
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:152
-msgid "openvpn_param_port_share"
+msgid "Proxy incoming HTTPS sessions"
 msgstr "Sessões recebidas HTTPS por proxy "
 
 #. Configure client mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:153
-msgid "openvpn_param_client"
+msgid "Configure client mode"
 msgstr "Configurar modo cliente"
 
 #. Authenticate using username/password
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:154
-msgid "openvpn_param_auth_user_pass"
+msgid "Authenticate using username/password"
 msgstr "Autenticar com username/password"
 
 #. Accept options pushed from server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:155
-msgid "openvpn_param_pull"
+msgid "Accept options pushed from server"
 msgstr "Aceitar opções enviadas pelo servidor"
 
 #. Handling of authentication failures
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:156
-msgid "openvpn_param_auth_retry"
+msgid "Handling of authentication failures"
 msgstr "Gestão de falhas de autenticação"
 
 #. Send notification to peer on disconnect
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:157
-msgid "openvpn_param_explicit_exit_notify"
+msgid "Send notification to peer on disconnect"
 msgstr "Notificar remoto ao desligar"
 
 #. Enable Static Key encryption mode (non-TLS)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:158
-msgid "openvpn_param_secret"
+msgid "Enable Static Key encryption mode (non-TLS)"
 msgstr "Activar modo de encriptação por chave estática (não-TLS)"
 
 #. HMAC authentication for packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:159
-msgid "openvpn_param_auth"
+msgid "HMAC authentication for packets"
 msgstr "Autenticação HMAC para pacotes"
 
 #. Encryption cipher for packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:160
-msgid "openvpn_param_cipher"
+msgid "Encryption cipher for packets"
 msgstr "Cifra de encriptação para pacotes"
 
 #. Size of cipher key
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:161
-msgid "openvpn_param_keysize"
+msgid "Size of cipher key"
 msgstr "Tamanho da chave de cifra"
 
 #. Enable OpenSSL hardware crypto engines
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:162
-msgid "openvpn_param_engine"
+msgid "Enable OpenSSL hardware crypto engines"
 msgstr "Activar motor OpenSSL por hardware"
 
 #. Disable replay protection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:163
-msgid "openvpn_param_no_replay"
+msgid "Disable replay protection"
 msgstr "Desactivar protecção contra replay"
 
 #. Silence the output of replay warnings
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:164
-msgid "openvpn_param_mute_replay_warnings"
+msgid "Silence the output of replay warnings"
 msgstr "Silenciar o output dos avisos de replay"
 
 #. Replay protection sliding window size
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:165
-msgid "openvpn_param_replay_window"
+msgid "Replay protection sliding window size"
 msgstr "Tamanho da janela de protecção conta replay"
 
 #. Disable cipher initialisation vector
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:166
-msgid "openvpn_param_no_iv"
+msgid "Disable cipher initialisation vector"
 msgstr "Desactivar o vector de inicialização da cifra"
 
 #. Persist replay-protection state
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:167
-msgid "openvpn_param_replay_persist"
+msgid "Persist replay-protection state"
 msgstr "Manter persistência da protecção replay"
 
 #. Run a self-test of crypto features
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:168
-msgid "openvpn_param_test_crypto"
+msgid "Run a self-test of crypto features"
 msgstr "Executar um auto-teste das funcionalidades criptograficas"
 
 #. Enable TLS and assume server role
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:169
-msgid "openvpn_param_tls_server"
+msgid "Enable TLS and assume server role"
 msgstr "Activar TLS e assumir papel de servidor"
 
 #. Enable TLS and assume client role
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:170
-msgid "openvpn_param_tls_client"
+msgid "Enable TLS and assume client role"
 msgstr "Activar TLS e assumir papel de cliente"
 
 #. Data channel key exchange method
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:171
-msgid "openvpn_param_key_method"
+msgid "Data channel key exchange method"
 msgstr "Método de troca de chave do canal"
 
 #. Certificate authority
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:172
-msgid "openvpn_param_ca"
+msgid "Certificate authority"
 msgstr "Autoridade certificadora"
 
 #. Directory of trusted certificates (CAs and CRLs)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:173
-msgid "openvpn_param_capath"
+msgid "Directory of trusted certificates (CAs and CRLs)"
 msgstr "Directorio de certificados fidedignos (CAs e CRLs)"
 
 #. Diffie Hellman parameters
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:174
-msgid "openvpn_param_dh"
+msgid "Diffie Hellman parameters"
 msgstr "Parametros Diffie-Hellman"
 
 #. Local certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:175
-msgid "openvpn_param_cert"
+msgid "Local certificate"
 msgstr "Certificado local"
 
 #. Local private key
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:176
-msgid "openvpn_param_key"
+msgid "Local private key"
 msgstr "Chave privada local"
 
 #. PKCS#12 file containing keys
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:177
-msgid "openvpn_param_pkcs12"
+msgid "PKCS#12 file containing keys"
 msgstr "Ficheiro PKCS#12 com chaves"
 
 #. TLS cipher
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:178
-msgid "openvpn_param_tls_cipher"
+msgid "TLS cipher"
 msgstr "Cifra TLS"
 
 #. Retransmit timeout on TLS control channel
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:179
-msgid "openvpn_param_tls_timeout"
+msgid "Retransmit timeout on TLS control channel"
 msgstr "Timeout de retransmissão no canal de controlo TLS"
 
 #. Renegotiate data chan. key after bytes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:180
-msgid "openvpn_param_reneg_bytes"
+msgid "Renegotiate data chan. key after bytes"
 msgstr "Renegociar chave do canal de dados após n bytes "
 
 #. Renegotiate data chan. key after packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:181
-msgid "openvpn_param_reneg_pkts"
+msgid "Renegotiate data chan. key after packets"
 msgstr "Renegociar chave do canal de dados após n pacotes"
 
 #. Renegotiate data chan. key after seconds
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:182
-msgid "openvpn_param_reneg_sec"
+msgid "Renegotiate data chan. key after seconds"
 msgstr "Renegociar chave do canal de dados após n segundos"
 
 #. Timeframe for key exchange
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:183
-msgid "openvpn_param_hand_window"
+msgid "Timeframe for key exchange"
 msgstr "Janela temporal para troca de chaves"
 
 #. Key transition window
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:184
-msgid "openvpn_param_tran_window"
+msgid "Key transition window"
 msgstr "Janela para transição de chaves"
 
 #. Allow only one session
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:185
-msgid "openvpn_param_single_session"
+msgid "Allow only one session"
 msgstr "Permitir apenas uma sessão"
 
 #. Exit on TLS negotiation failure
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:186
-msgid "openvpn_param_tls_exit"
+msgid "Exit on TLS negotiation failure"
 msgstr "Fechar quando existir falha na negociacao TLS"
 
 #. Additional authentication over TLS
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:187
-msgid "openvpn_param_tls_auth"
+msgid "Additional authentication over TLS"
 msgstr "Autenticação adicional por TLS"
 
 #. Get PEM password from controlling tty before we daemonize
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:188
-msgid "openvpn_param_askpass"
+msgid "Get PEM password from controlling tty before we daemonize"
 msgstr "Obter password PEM do terminal de controlo antes de passar a daemon"
 
 #. Don't cache --askpass or --auth-user-pass passwords
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:189
-msgid "openvpn_param_auth_nocache"
+msgid "Don't cache --askpass or --auth-user-pass passwords"
 msgstr "Não colocar em cache as passwords --askpass ou --auth-user-pass "
 
 #. Check peer certificate against a CRL
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:190
-msgid "openvpn_param_crl_verify"
+msgid "Check peer certificate against a CRL"
 msgstr "Verificar certificado do remoto conta uma CRL"
 
 #. Shell command to verify X509 name
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:191
-msgid "openvpn_param_tls_verify"
+msgid "Shell command to verify X509 name"
 msgstr "Comando shell para verificar o nome X509"
 
 #. Only accept connections from given X509 name
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:192
-msgid "openvpn_param_tls_remote"
+msgid "Only accept connections from given X509 name"
 msgstr "Aceitar ligações apenas de um dado nome X509"
 
 #. Require explicit designation on certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:193
-msgid "openvpn_param_ns_cert_type"
+msgid "Require explicit designation on certificate"
 msgstr "Requerer designação específica no certificado"
 
 #. Require explicit key usage on certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:194
-msgid "openvpn_param_remote_cert_ku"
+msgid "Require explicit key usage on certificate"
 msgstr "Requerer utilização explicita de utilização de chave no certificado"
 
 #. Require extended explicit key usage on certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:195
-msgid "openvpn_param_remote_cert_eku"
+msgid "Require extended explicit key usage on certificate"
 msgstr ""
 "Requerer utilização explicita extendida de utilização de chave no "
 "certificado"
diff --git a/po/pt_BR/p910nd.po b/po/pt_BR/p910nd.po
index 412ee6e40..061d6413e 100644
--- a/po/pt_BR/p910nd.po
+++ b/po/pt_BR/p910nd.po
@@ -14,19 +14,19 @@ msgstr ""
 
 #. p910nd - Printer server
 #: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:1
-msgid "p910nd"
+msgid "p910nd - Printer server"
 msgstr "P910nd - Servidor de impressão"
 
 #. First you have to install the packages to get support for USB (kmod-usb-printer) or parallel port (kmod-lp).
 #: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:2
-msgid "p910nd_desc"
+msgid "First you have to install the packages to get support for USB (kmod-usb-printer) or parallel port (kmod-lp)."
 msgstr ""
 "Primeiro você deve instalar os pacotes para obter suporte USB (kmod-usb-"
 "printer) ou porta paralela (kmod-lp)."
 
 #. Bidirectional mode
 #: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:3
-msgid "bidirectional"
+msgid "Bidirectional mode"
 msgstr "Modo bidirecional"
 
 #. p910nd listens on port 910+N. E.g. 9100 for the first printer.
diff --git a/po/pt_BR/polipo.po b/po/pt_BR/polipo.po
index 1cdbd68c7..c7cd4b919 100644
--- a/po/pt_BR/polipo.po
+++ b/po/pt_BR/polipo.po
@@ -13,27 +13,27 @@ msgstr ""
 
 #. Polipo
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:1
-msgid "polipo"
+msgid "Polipo"
 msgstr "Polipo"
 
 #. On-Disk Cache
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:2
-msgid "polipo_cache"
+msgid "On-Disk Cache"
 msgstr "Cache em disco"
 
 #. Shared cache
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:3
-msgid "polipo_cache_cacheisshared"
+msgid "Shared cache"
 msgstr "Cache partilhada"
 
 #. Enable if cache (proxy) is shared by multiple users.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:4
-msgid "polipo_cache_cacheisshared_desc"
+msgid "Enable if cache (proxy) is shared by multiple users."
 msgstr "Activar se a cache (proxy) for partilhada por multiplos utilizadores."
 
 #. To enable polipo on-disk cache cleaning (highly recommended), you should add a cron job in Scheduled Tasks services that will execute /usr/sbin/polipo_purge script. For example to perform disk cache cleanup every day at 6:00 in the morning you should add the following line in Scheduled Tasks &quot;0 6 * * *	/usr/sbin/polipo_purge&quot; (without quotes).
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:5
-msgid "polipo_cache_desc"
+msgid "To enable polipo on-disk cache cleaning (highly recommended), you should add a cron job in Scheduled Tasks services that will execute /usr/sbin/polipo_purge script. For example to perform disk cache cleanup every day at 6:00 in the morning you should add the following line in Scheduled Tasks \"0 6 * * *\\t/usr/sbin/polipo_purge\" (without quotes)."
 msgstr ""
 "Para activar a limpeza de cache em disco (altamente recomendado), deve "
 "acrescentar uma tarefa cron (\"Serviços\") que execute o script "
@@ -43,12 +43,12 @@ msgstr ""
 
 #. Disk cache location
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:6
-msgid "polipo_cache_diskcacheroot"
+msgid "Disk cache location"
 msgstr "Localização da cache em disco"
 
 #. Location where polipo will cache files permanently. Use of external storage devices is recommended, because the cache can grow considerably. Leave it empty to disable on-disk cache.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:7
-msgid "polipo_cache_diskcacheroot_desc"
+msgid "Location where polipo will cache files permanently. Use of external storage devices is recommended, because the cache can grow considerably. Leave it empty to disable on-disk cache."
 msgstr ""
 "Local onde o polipo guardará permanentemente os ficheiros de cache. É "
 "recomendada a utilização de dispositivos de armazenamento remoto devido ao "
@@ -57,58 +57,58 @@ msgstr ""
 
 #. Truncate cache files size (in bytes)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:8
-msgid "polipo_cache_diskcachetruncatesize"
+msgid "Truncate cache files size (in bytes)"
 msgstr "Tamanho de trancagem dos ficheiros de cache (bytes)"
 
 #. Size to which cached files should be truncated. (default value: 1048576)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:9
-msgid "polipo_cache_diskcachetruncatesize_desc"
+msgid "Size to which cached files should be truncated. (default value: 1048576)"
 msgstr ""
 "Tamanho com o qual devem ser trancados os ficheiros da cache. (valor pre-"
 "definido: 1048576)"
 
 #. Truncate cache files time
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:10
-msgid "polipo_cache_diskcachetruncatetime"
+msgid "Truncate cache files time"
 msgstr "Tempo de trancagem dos ficheiros de cache"
 
 #. Time after which cached files will be truncated. (default value: 4d12h)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:11
-msgid "polipo_cache_diskcachetruncatetime_desc"
+msgid "Time after which cached files will be truncated. (default value: 4d12h)"
 msgstr ""
 "Tempo após o qual os ficheiros de cache serão trancados. (valor pre-"
 "definido: 4d12h)"
 
 #. Delete cache files time
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:12
-msgid "polipo_cache_diskcacheunlinktime"
+msgid "Delete cache files time"
 msgstr "Tempo para remoção dos ficheiros de cache"
 
 #. Time after which cached files will be deleted. (default value: 32d)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:13
-msgid "polipo_cache_diskcacheunlinktime_desc"
+msgid "Time after which cached files will be deleted. (default value: 32d)"
 msgstr ""
 "Tempo apos o qual os ficheiros de cache serão removidos. (valor "
 "pré-definido: 32d)"
 
 #. Polipo is a small and fast caching web proxy.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:14
-msgid "polipo_desc"
+msgid "Polipo is a small and fast caching web proxy."
 msgstr "O polipo é um proxy web ligeiro e rápido."
 
 #. General
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:15
-msgid "polipo_general"
+msgid "General"
 msgstr "Geral"
 
 #. Allowed clients
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:16
-msgid "polipo_general_allowedclients"
+msgid "Allowed clients"
 msgstr "Clientes permitidos"
 
 #. When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients that are allowed to connect. The format is IP address or network address (192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6)).
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:17
-msgid "polipo_general_allowedclients_desc"
+msgid "When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients that are allowed to connect. The format is IP address or network address (192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))."
 msgstr ""
 "Quando o endereço de listen fôr 0.0.0.0 (IPv4) ou :: (IPv6), deve listar os "
 "clientes que tiverem permissão para ligação. O formato é endereço de host ou "
@@ -116,46 +116,46 @@ msgstr ""
 
 #. In RAM cache size (in bytes)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:18
-msgid "polipo_general_chunkhighmark"
+msgid "In RAM cache size (in bytes)"
 msgstr "Tamanho da cache em RAM (bytes)"
 
 #. How much RAM should Polipo use for its cache.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:19
-msgid "polipo_general_chunkhighmark_desc"
+msgid "How much RAM should Polipo use for its cache."
 msgstr "Quanta memória RAM deverá ser usada pelo polipo para a sua cache."
 
 #. DNS server address
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:20
-msgid "polipo_general_dnsnameserver"
+msgid "DNS server address"
 msgstr "Endereço do servidor DNS"
 
 #. Set the DNS server address to use, if you want Polipo to use different DNS server than the host system.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:21
-msgid "polipo_general_dnsnameserver_desc"
+msgid "Set the DNS server address to use, if you want Polipo to use different DNS server than the host system."
 msgstr ""
 "Define o endereço do servidor de DNS a usar, caso pretenda que o polipo "
 "utilize um servidor alternativo ao do sistema."
 
 #. Query DNS for IPv6
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:22
-msgid "polipo_general_dnsqueryipv6"
+msgid "Query DNS for IPv6"
 msgstr "Pedidos IPv6 ao DNS"
 
 #. false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = Query both, prefer IPv6; true = Query only IPv6
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:23
-msgid "polipo_general_dnsqueryipv6_desc"
+msgid "false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = Query both, prefer IPv6; true = Query only IPv6"
 msgstr ""
 "false = Não pedir IPv6; reluctantly=Pedir ambos e preferir IPv4; "
 "happily=Pedir ambos, preferir IPv6; true=Pedir apenas IPv6"
 
 #. Query DNS by hostname
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:24
-msgid "polipo_general_dnsusegethostbyname"
+msgid "Query DNS by hostname"
 msgstr "Pedidos ao DNS através de hostname"
 
 #. false = Never use system DNS resolver; reluctantly = Query DNS directly, if DNS server is unavailable fail to system DNS resolver; happily = Query DNS directly, if host could not be found fallback to system DNS resolver; true = Always use system DNS resolver
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:25
-msgid "polipo_general_dnsusegethostbyname_desc"
+msgid "false = Never use system DNS resolver; reluctantly = Query DNS directly, if DNS server is unavailable fail to system DNS resolver; happily = Query DNS directly, if host could not be found fallback to system DNS resolver; true = Always use system DNS resolver"
 msgstr ""
 "false=nunca usar o resolver do sistema; reluctantly=pedir DNS directamente, "
 "se o servidor DNS estiver indisponivel recorrer do resolver DNS do sistema; "
@@ -164,80 +164,80 @@ msgstr ""
 
 #. Syslog facility
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:26
-msgid "polipo_general_logfacility"
+msgid "Syslog facility"
 msgstr "Categoria dos eventos polipo no registo do sistema"
 
 #. Log file location
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:27
-msgid "polipo_general_logfile"
+msgid "Log file location"
 msgstr "Localização do ficheiro de registo"
 
 #. Use of external storage device is recommended, because the log file is written frequently and can grow considerably.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:28
-msgid "polipo_general_logfile_desc"
+msgid "Use of external storage device is recommended, because the log file is written frequently and can grow considerably."
 msgstr ""
 "É recomendado o recurso a sistemas de armazenamento de ficheiros externos, "
 "devido ao rápido crescimento do ficheiro de registo."
 
 #. Log to syslog
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:29
-msgid "polipo_general_logsyslog"
+msgid "Log to syslog"
 msgstr "Registar para o syslog"
 
 #. Parent proxy authentication
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:30
-msgid "polipo_general_parentauthcredentials"
+msgid "Parent proxy authentication"
 msgstr "Autenticação em cache de hierarquia superior"
 
 #. Basic HTTP authentication supported. Provide username and password in username:password format.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:31
-msgid "polipo_general_parentauthcredentials_desc"
+msgid "Basic HTTP authentication supported. Provide username and password in username:password format."
 msgstr ""
 "É suportada a autenticação basica HTTP. Indique username e password no "
 "formato username:password."
 
 #. Parent proxy address
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:32
-msgid "polipo_general_parentproxy"
+msgid "Parent proxy address"
 msgstr "Endereço do proxy de hierarquia superior."
 
 #. Parent proxy address (in host:port format), to which Polipo will forward the requests.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:33
-msgid "polipo_general_parentproxy_desc"
+msgid "Parent proxy address (in host:port format), to which Polipo will forward the requests."
 msgstr ""
 "Endereço do proxy de hierarquia superior (no formato host:porta), ao qual o "
 "polipo irá encaminhar os seus pedidos."
 
 #. Listen address
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:34
-msgid "polipo_general_proxyaddress"
+msgid "Listen address"
 msgstr "Endereço local"
 
 #. The interface on which Polipo will listen. To listen on all interfaces use 0.0.0.0 or :: (IPv6).
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:35
-msgid "polipo_general_proxyaddress_desc"
+msgid "The interface on which Polipo will listen. To listen on all interfaces use 0.0.0.0 or :: (IPv6)."
 msgstr ""
 "O interface no qual o polipo será activado. Para activar em todos os "
 "endereços, use 0.0.0.0 ou :: (IPv6)."
 
 #. Listen port
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:36
-msgid "polipo_general_proxyport"
+msgid "Listen port"
 msgstr "Porta local"
 
 #. Port on which Polipo will listen. (default value: 8123)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:37
-msgid "polipo_general_proxyport_desc"
+msgid "Port on which Polipo will listen. (default value: 8123)"
 msgstr "Porta local na qual o polipo será activado. (pre-definido: 8123)"
 
 #. Poor Man&#39;s Multiplexing
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:38
-msgid "polipo_pmm"
+msgid "Poor Man's Multiplexing"
 msgstr "Multiplexagem simples"
 
 #. Poor Man&#39;s Multiplexing (PMM) is a technique that simulates multiplexing by requesting an instance in multiple segments. It tries to lower the latency caused by the weakness of HTTP protocol. NOTE: some sites may not work with PMM enabled.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:39
-msgid "polipo_pmm_desc"
+msgid "Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by requesting an instance in multiple segments. It tries to lower the latency caused by the weakness of HTTP protocol. NOTE: some sites may not work with PMM enabled."
 msgstr ""
 "A multiplexagem simples (PMM) consiste na simulação de multiplexagem através "
 "da requesição de um pedido em multiplos segmentos. O método tenta baixar a "
@@ -246,19 +246,19 @@ msgstr ""
 
 #. First PMM segment size (in bytes)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:40
-msgid "polipo_pmm_pmmfirstsize"
+msgid "First PMM segment size (in bytes)"
 msgstr "Tamanho do primeiro segmento PMM (em bytes)"
 
 #. Size of the first PMM segment. If not defined, it defaults to twice the PMM segment size.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:41
-msgid "polipo_pmm_pmmfirstsize_desc"
+msgid "Size of the first PMM segment. If not defined, it defaults to twice the PMM segment size."
 msgstr ""
 "Tamanho do primeiro segmento PMM. Se não estiver definido, reverte para o "
 "dobro do tamanho do segmento PMM."
 
 #. PMM segments size (in bytes)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:42
-msgid "polipo_pmm_pmmsize"
+msgid "PMM segments size (in bytes)"
 msgstr "Tamanho do segmento PMM (em bytes)"
 
 #. To enable PMM, PMM segment size must be set to some positive value.
diff --git a/po/pt_BR/qos.po b/po/pt_BR/qos.po
index cdb3e0693..6399219fa 100644
--- a/po/pt_BR/qos.po
+++ b/po/pt_BR/qos.po
@@ -15,94 +15,94 @@ msgstr ""
 
 #. Quality of Service
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:1
-msgid "qos"
+msgid "Quality of Service"
 msgstr "Qualidade de Serviço"
 
 #. With QoS you can priorize network traffic selected by adresses, ports or services.
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:2
-msgid "qos_desc"
+msgid "With QoS you can priorize network traffic selected by adresses, ports or services."
 msgstr ""
 "Com QoS você pode priozirar o tráfego da rede selecionada por endereços, "
 "portas ou serviços."
 
 #. Classification
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:3
-msgid "qos_interface_classgroup"
+msgid "Classification"
 msgstr "Classificação"
 
 #. Calculate Overhead
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:4
-msgid "qos_interface_overhead"
+msgid "Calculate Overhead"
 msgstr "Calcular Overhead"
 
 #. Half-Duplex
 #, fuzzy
-msgid "qos_interface_halfduplex"
+msgid "Half-Duplex"
 msgstr "Link para upload"
 
 #. Downlink
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:5
-msgid "qos_interface_download"
+msgid "Downlink"
 msgstr "Link para download"
 
 #. Uplink
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:6
-msgid "qos_interface_upload"
+msgid "Uplink"
 msgstr "Link para upload"
 
 #. Prioritization
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:7
-msgid "qos_classify"
+msgid "Prioritization"
 msgstr "Priorização"
 
 #. Priority
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:8
-msgid "qos_classify_target"
+msgid "Priority"
 msgstr "Prioridade"
 
 #. Source address
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:9
-msgid "qos_classify_srchost"
+msgid "Source address"
 msgstr "Endereço de origem"
 
 #. source network / source host
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:10
-msgid "qos_classify_srchost_dest"
+msgid "source network / source host"
 msgstr "rede de origem / host de origem"
 
 #. Target address
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:11
-msgid "qos_classify_dsthost"
+msgid "Target address"
 msgstr "Endereço de destino"
 
 #. target network / target host
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:12
-msgid "qos_classify_dsthost_dest"
+msgid "target network / target host"
 msgstr "rede de destino / host de destino"
 
 #. portrange
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:13
-msgid "qos_classify_portrange"
+msgid "portrange"
 msgstr "faixa de portas"
 
 #. low
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:14
-msgid "qos_bulk"
+msgid "low"
 msgstr "baixa"
 
 #. normal
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:15
-msgid "qos_normal"
+msgid "normal"
 msgstr "normal"
 
 #. express
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:16
-msgid "qos_express"
+msgid "express"
 msgstr "expressa"
 
 #. priority
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:17
-msgid "qos_priority"
+msgid "priority"
 msgstr "alta"
 
 #. Bytes sent
diff --git a/po/pt_BR/rrdtool.po b/po/pt_BR/rrdtool.po
index ef85c04c3..9759f5eba 100644
--- a/po/pt_BR/rrdtool.po
+++ b/po/pt_BR/rrdtool.po
@@ -13,342 +13,342 @@ msgstr ""
 
 #. %H: Wireless - Signal Noise Ratio
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:1
-msgid "stat_dg_title_wireless__signal_noise"
+msgid "%H: Wireless - Signal Noise Ratio"
 msgstr "%H: Wireless - Relação Sinal/Ruido"
 
 #. dBm
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:2
-msgid "stat_dg_label_wireless__signal_noise"
+msgid "dBm"
 msgstr "dBm"
 
 #. Noise Level
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:3
-msgid "stat_ds_signal_noise"
+msgid "Noise Level"
 msgstr "Nivel de Ruido"
 
 #. Signal Strength
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:4
-msgid "stat_ds_signal_power"
+msgid "Signal Strength"
 msgstr "Forca do Sinal"
 
 #. %H: Wireless - Signal Quality
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:5
-msgid "stat_dg_title_wireless__signal_quality"
+msgid "%H: Wireless - Signal Quality"
 msgstr "%H: Wireless - Qualidade do Sinal"
 
 #. n
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:6
-msgid "stat_dg_label_wireless__signal_quality"
+msgid "n"
 msgstr "n"
 
 #. Signal Quality
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:7
-msgid "stat_ds_signal_quality"
+msgid "Signal Quality"
 msgstr "Qualidade do Sinal"
 
 #. %H: ICMP Roundtrip Times
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:8
-msgid "stat_dg_title_ping"
+msgid "%H: ICMP Roundtrip Times"
 msgstr "%H: Tempo de resposta ICMP"
 
 #. ms
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:9
-msgid "stat_dg_label_ping"
+msgid "ms"
 msgstr "ms"
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:10
-msgid "stat_ds_ping"
+msgid "%di"
 msgstr "%di"
 
 #. %H: Firewall - Processed Packets
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:11
-msgid "stat_dg_title_iptables__ipt_packets"
+msgid "%H: Firewall - Processed Packets"
 msgstr "%H: Firewall - Pacotes Processados"
 
 #. Packets/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:12
-msgid "stat_dg_label_iptables__ipt_packets"
+msgid "Packets/s"
 msgstr "Pacote/s"
 
 #. Chain \"%di\"
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:13
-msgid "stat_ds_ipt_packets"
+msgid "Chain \"%di\""
 msgstr "Cadeia &quot;%di&quot;"
 
 #. %H: Netlink - Transfer on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:14
-msgid "stat_dg_title_netlink__if_octets"
+msgid "%H: Netlink - Transfer on %pi"
 msgstr "%H: Netlink - Transferencia na %pi"
 
 #. Bytes/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:15
-msgid "stat_dg_label_netlink__if_octets"
+msgid "Bytes/s"
 msgstr "Bytes/s"
 
 #. Bytes (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:16
-msgid "stat_ds_if_octets"
+msgid "Bytes (%ds)"
 msgstr "Bytes (%ds)"
 
 #. %H: Netlink - Packets on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:17
-msgid "stat_dg_title_netlink__if_packets"
+msgid "%H: Netlink - Packets on %pi"
 msgstr "%H: Netlink - Pacotes na %pi"
 
 #. Packets/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:18
-msgid "stat_dg_label_netlink__if_packets"
+msgid "Packets/s"
 msgstr "Packets/s"
 
 #. Processed (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:19
-msgid "stat_ds_if_packets"
+msgid "Processed (%ds)"
 msgstr "Processado (%ds)"
 
 #. Dropped   (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:20
-msgid "stat_ds_if_dropped"
+msgid "Dropped (%ds)"
 msgstr "Dropado    (%ds)"
 
 #. Errors    (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:21
-msgid "stat_ds_if_errors"
+msgid "Errors (%ds)"
 msgstr "Erros      (%ds)"
 
 #. %H: Netlink - Multicast on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:22
-msgid "stat_dg_title_netlink__if_multicast"
+msgid "%H: Netlink - Multicast on %pi"
 msgstr "%H: Netlink - Multicast na %pi"
 
 #. Packets/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:23
-msgid "stat_dg_label_netlink__if_multicast"
+msgid "Packets/s"
 msgstr "Pacote/s"
 
 #. Packets
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:24
-msgid "stat_ds_if_multicast"
+msgid "Packets"
 msgstr "Pacotes"
 
 #. %H: Netlink - Collisions on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:25
-msgid "stat_dg_title_netlink__if_collisions"
+msgid "%H: Netlink - Collisions on %pi"
 msgstr "%H: Netlink - Colisoes na %pi"
 
 #. Collisions/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:26
-msgid "stat_dg_label_netlink__if_collisions"
+msgid "Collisions/s"
 msgstr "Colisao(es)"
 
 #. Collisions
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:27
-msgid "stat_ds_if_collisions"
+msgid "Collisions"
 msgstr "Colisoes"
 
 #. %H: Netlink - Errors on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:28
-msgid "stat_dg_title_netlink__if_tx_errors"
+msgid "%H: Netlink - Errors on %pi"
 msgstr "%H: Netlink - Erros na %pi"
 
 #. Errors/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:29
-msgid "stat_dg_label_netlink__if_tx_errors"
+msgid "Errors/s"
 msgstr "Erro/s"
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:30
-msgid "stat_ds_if_tx_errors"
+msgid "%di"
 msgstr "%di"
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:31
-msgid "stat_ds_if_rx_errors"
+msgid "%di"
 msgstr "%di"
 
 #. %H: Processes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:32
-msgid "stat_dg_title_processes"
+msgid "%H: Processes"
 msgstr "%H: Processos"
 
 #. Processes/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:33
-msgid "stat_dg_label_processes"
+msgid "Processes/s"
 msgstr "Processo/s"
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:34
-msgid "stat_ds_ps_state"
+msgid "%di"
 msgstr "%di"
 
 #. %H: Process %pi - used cpu time
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:35
-msgid "stat_dg_title_processes__ps_cputime"
+msgid "%H: Process %pi - used cpu time"
 msgstr "%H: Processo %pi - tempo usado da cpu"
 
 #. Jiffies
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:36
-msgid "stat_dg_label_processes__ps_cputime"
+msgid "Jiffies"
 msgstr "Jiffies"
 
 #. system
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:37
-msgid "stat_ds_ps_cputime__syst"
+msgid "System"
 msgstr "sistema"
 
 #. user
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:38
-msgid "stat_ds_ps_cputime__user"
+msgid "user"
 msgstr "utilizador"
 
 #. %H: Process %pi - threads and processes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:39
-msgid "stat_dg_title_processes__ps_count"
+msgid "%H: Process %pi - threads and processes"
 msgstr "%H: Processo %pi - threads e processos"
 
 #. Count
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:40
-msgid "stat_dg_label_processes__ps_count"
+msgid "Count"
 msgstr "Contagem"
 
 #. %ds
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:41
-msgid "stat_ds_ps_count"
+msgid "%ds"
 msgstr "%ds"
 
 #. %H: Process %pi - page faults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:42
-msgid "stat_dg_title_processes__ps_pagefaults"
+msgid "%H: Process %pi - page faults"
 msgstr "%H: Prcesso %pi - pagina de erros"
 
 #. Pagefaults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:43
-msgid "stat_dg_label_processes__ps_pagefaults"
+msgid "Pagefaults"
 msgstr "Pagina de erros"
 
 #. page faults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:44
-msgid "stat_ds_ps_pagefaults"
+msgid "page faults"
 msgstr "pagina de erros"
 
 #. %H: Process %pi - virtual memory size
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:45
-msgid "stat_dg_title_processes__ps_rss"
+msgid "%H: Process %pi - virtual memory size"
 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"
+msgid "Bytes"
 msgstr "Bytes"
 
 #. virtual memory
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:47
-msgid "stat_ds_ps_rss"
+msgid "virtual memory"
 msgstr "memoria virtual"
 
 #. %H: Usage on Processor #%pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:48
-msgid "stat_dg_title_cpu"
+msgid "%H: Usage on Processor #%pi"
 msgstr "%H: Usado no Processado #%pi"
 
 #. %
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:49
-msgid "stat_dg_label_cpu"
+msgid "%"
 msgstr "%"
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:50
-msgid "stat_ds_cpu"
+msgid "%di"
 msgstr "%di"
 
 #. %H: Transfer on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:51
-msgid "stat_dg_title_interface__if_octets"
+msgid "%H: Transfer on %di"
 msgstr "%H: Transferencia na %di"
 
 #. Bytes/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:52
-msgid "stat_dg_label_interface__if_octets"
+msgid "Bytes/s"
 msgstr "Bytes/s"
 
 #. %H: Packets on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:53
-msgid "stat_dg_title_interface__if_packets"
+msgid "%H: Packets on %di"
 msgstr "%H: Pacotes na %di"
 
 #. Packets/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:54
-msgid "stat_dg_label_interface__if_packets"
+msgid "Packets/s"
 msgstr "Pacote/s"
 
 #. %H: TCP-Connections to Port %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:55
-msgid "stat_dg_title_tcpconns"
+msgid "%H: TCP-Connections to Port %pi"
 msgstr "%H: Ligações TCP na Porta %pi"
 
 #. Connections/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:56
-msgid "stat_dg_label_tcpconns"
+msgid "Connections/s"
 msgstr "Ligação(ões)"
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:57
-msgid "stat_ds_tcp_connections"
+msgid "%di"
 msgstr "%di"
 
 #. %H: Disk Space Usage on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:58
-msgid "stat_dg_title_df"
+msgid "%H: Disk Space Usage on %di"
 msgstr "%H: Utilizacao de Espaco em Disco em %di"
 
 #. Bytes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:59
-msgid "stat_dg_label_df"
+msgid "Bytes"
 msgstr "Bytes"
 
 #. %ds
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:60
-msgid "stat_ds_df__free"
+msgid "%ds"
 msgstr "%ds"
 
 #. %ds
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:61
-msgid "stat_ds_df__used"
+msgid "%ds"
 msgstr "%ds"
 
 #. %H: Interrupts
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:62
-msgid "stat_dg_title_irq"
+msgid "%H: Interrupts"
 msgstr "%H: Interrupcoes"
 
 #. Issues/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:63
-msgid "stat_dg_label_irq"
+msgid "Issues/s"
 msgstr "Erro/s"
 
 #. IRQ %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:64
-msgid "stat_ds_irq"
+msgid "IRQ %di"
 msgstr "IRQ %di"
 
 #. %H: System Load
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:65
-msgid "stat_dg_title_load"
+msgid "%H: System Load"
 msgstr "%H: Carga do Sistema"
 
 #. Load
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:66
-msgid "stat_dg_label_load"
+msgid "Load"
 msgstr "Carga"
 
 #. 1 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:67
-msgid "stat_ds_load__shortterm"
+msgid "1 min"
 msgstr "1 min"
 
 #. 5 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:68
-msgid "stat_ds_load__midterm"
+msgid "5 min"
 msgstr "5 min"
 
 #. 15 min
diff --git a/po/pt_BR/samba.po b/po/pt_BR/samba.po
index 705c0f7be..2e84f90af 100644
--- a/po/pt_BR/samba.po
+++ b/po/pt_BR/samba.po
@@ -14,84 +14,84 @@ msgstr ""
 
 #. Network Shares
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:1
-msgid "samba"
+msgid "Network Shares"
 msgstr "Compartilhamentos de Rede"
 
 #. Hostname
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:2
-msgid "samba_samba_name"
+msgid "Hostname"
 msgstr "Hostname"
 
 #. Description
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:3
-msgid "samba_samba_description"
+msgid "Description"
 msgstr "Descrição"
 
 #. Workgroup
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:4
-msgid "samba_samba_workgroup"
+msgid "Workgroup"
 msgstr "Grupo de Trabalho"
 
 #. Share home-directories
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:5
-msgid "samba_samba_homes"
+msgid "Share home-directories"
 msgstr "Compartilhar diretórios home"
 
 #. System users can reach their home directories via network shares.
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:6
-msgid "samba_samba_homes_desc"
+msgid "System users can reach their home directories via network shares."
 msgstr ""
 "Usuários do sistema poderão acessar seu diretório home através dos "
 "compartilhamentos de rede."
 
 #. Shared Directories
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:7
-msgid "samba_sambashare"
+msgid "Shared Directories"
 msgstr "Diretórios Compartilhados"
 
 #. Shared Directory
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:8
-msgid "samba_sambashare_path"
+msgid "Shared Directory"
 msgstr "Diretório Compartilhado"
 
 #. Physical Path
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:9
-msgid "samba_sambashare_path_desc"
+msgid "Physical Path"
 msgstr "Caminho Físico"
 
 #. Allowed Users
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:10
-msgid "samba_sambashare_users"
+msgid "Allowed Users"
 msgstr "Usuários Permitidos"
 
 #. optional
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:11
-msgid "samba_sambashare_users_desc"
+msgid "optional"
 msgstr "opcional"
 
 #. Read Only
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:12
-msgid "samba_sambashare_readonly"
+msgid "Read Only"
 msgstr "Somente Leitura"
 
 #. Allow Guests
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:13
-msgid "samba_sambashare_guestok"
+msgid "Allow Guests"
 msgstr "Permitir Convidados"
 
 #. Create Mask
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:14
-msgid "samba_sambashare_createmask"
+msgid "Create Mask"
 msgstr "Criar Máscara"
 
 #. Mask for new files
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:15
-msgid "samba_sambashare_createmask_desc"
+msgid "Mask for new files"
 msgstr "Máscara para novos arquivos"
 
 #. Directory Mask
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:16
-msgid "samba_sambashare_dirmask"
+msgid "Directory Mask"
 msgstr "Máscara do Diretório"
 
 #. Mask for new directories
diff --git a/po/pt_BR/statistics.po b/po/pt_BR/statistics.po
index 1841e428e..30a9c2599 100644
--- a/po/pt_BR/statistics.po
+++ b/po/pt_BR/statistics.po
@@ -14,12 +14,12 @@ msgstr ""
 
 #. Statistics
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:1
-msgid "stat_statistics"
+msgid "Statistics"
 msgstr "Estatísticas"
 
 #. The statistics package is based on <a href=\"http://collectd.org/index.shtml\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD Tool</a> to render diagram images from collected data.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:2
-msgid "stat_desc"
+msgid "The statistics package is based on <a href=\"http://collectd.org/index.shtml\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD Tool</a> to render diagram images from collected data."
 msgstr ""
 "As estatísticas são baseadas no <a "
 "href=\"http://collectd.org/index.shtml\">Collectd</a> e é utilizado o <a "
@@ -28,142 +28,142 @@ msgstr ""
 
 #. System plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:3
-msgid "stat_systemplugins"
+msgid "System plugins"
 msgstr "Plugis de Sistema"
 
 #. Network plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:4
-msgid "stat_networkplugins"
+msgid "Network plugins"
 msgstr "Plugins de rede"
 
 #. Output plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:5
-msgid "stat_outputplugins"
+msgid "Output plugins"
 msgstr "Plugins de saída"
 
 #. Display timespan
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:6
-msgid "stat_showtimespan"
+msgid "Display timespan »"
 msgstr "Mostrar intervalo »"
 
 #. Graphs
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:7
-msgid "stat_graphs"
+msgid "Graphs"
 msgstr "Gráficos"
 
 #. Collectd
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:8
-msgid "stat_collectd"
+msgid "Collectd"
 msgstr "Collectd"
 
 #. Processor
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:9
-msgid "stat_cpu"
+msgid "Processor"
 msgstr "Processador"
 
 #. Ping
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:10
-msgid "stat_ping"
+msgid "Ping"
 msgstr "Ping"
 
 #. Firewall
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:11
-msgid "stat_iptables"
+msgid "Firewall"
 msgstr "Firewall"
 
 #. Netlink
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:12
-msgid "stat_netlink"
+msgid "Netlink"
 msgstr "Netlink"
 
 #. Processes
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:13
-msgid "stat_processes"
+msgid "Processes"
 msgstr "Processos"
 
 #. Wireless
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:14
-msgid "stat_wireless"
+msgid "Wireless"
 msgstr "Wireless"
 
 #. TCP Connections
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:15
-msgid "stat_tcpconns"
+msgid "TCP Connections"
 msgstr "Conexões TCP"
 
 #. Interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:16
-msgid "stat_interface"
+msgid "Interfaces"
 msgstr "Interfaces"
 
 #. Disk Space Usage
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:17
-msgid "stat_df"
+msgid "Disk Space Usage"
 msgstr "Utilização de espaço em disco"
 
 #. Interrupts
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:18
-msgid "stat_irq"
+msgid "Interrupts"
 msgstr "Interrupções"
 
 #. Disk Usage
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:19
-msgid "stat_disk"
+msgid "Disk Usage"
 msgstr "Utilização do Disco"
 
 #. Exec
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:20
-msgid "stat_exec"
+msgid "Exec"
 msgstr "Exec"
 
 #. RRDTool
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:21
-msgid "stat_rrdtool"
+msgid "RRDTool"
 msgstr "RRDTool"
 
 #. Network
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:22
-msgid "stat_network"
+msgid "Network"
 msgstr "Rede"
 
 #. CSV Output
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:23
-msgid "stat_csv"
+msgid "CSV Output"
 msgstr "Formato CSV"
 
 #. System Load
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:24
-msgid "stat_load"
+msgid "System Load"
 msgstr "Carga do Sistema"
 
 #. DNS
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:25
-msgid "stat_dns"
+msgid "DNS"
 msgstr "DNS"
 
 #. Email
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:26
-msgid "stat_email"
+msgid "Email"
 msgstr "Email"
 
 #. UnixSock
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:27
-msgid "stat_unixsock"
+msgid "UnixSock"
 msgstr "UnixSock"
 
 #. Statistics
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:28
-msgid "lucistatistics"
+msgid "Statistics"
 msgstr "Estatísticas"
 
 #. Collectd Settings
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:29
-msgid "lucistatistics_collectd"
+msgid "Collectd Settings"
 msgstr "Configurações do Collectd"
 
 #. Collectd is a small daeomon for collecting data from various sources through different plugins. On this page you can change general settings for the collectd daemon.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:30
-msgid "lucistatistics_collectd_desc"
+msgid "Collectd is a small daeomon for collecting data from various sources through different plugins. On this page you can change general settings for the collectd daemon."
 msgstr ""
 "Collectd é um pequeno daemon que coleta dados de várias fontes através de "
 "diferentes plugins. Nesta página você pode alterar as configurações gerais "
@@ -171,104 +171,104 @@ msgstr ""
 
 #. Hostname
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:31
-msgid "lucistatistics_collectd_hostname"
+msgid "Hostname"
 msgstr "Hostname"
 
 #. Base Directory
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:32
-msgid "lucistatistics_collectd_basedir"
+msgid "Base Directory"
 msgstr "Diretório Base"
 
 #. Directory for sub-configurations
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:33
-msgid "lucistatistics_collectd_include"
+msgid "Directory for sub-configurations"
 msgstr "Diretório para sub-configurações"
 
 #. Directory for collectd plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:34
-msgid "lucistatistics_collectd_plugindir"
+msgid "Directory for collectd plugins"
 msgstr "Diretório para os plugins do collectd"
 
 #. Used PID file
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:35
-msgid "lucistatistics_collectd_pidfile"
+msgid "Used PID file"
 msgstr "Arquivo PID usado"
 
 #. Datasets definition file
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:36
-msgid "lucistatistics_collectd_typesdb"
+msgid "Datasets definition file"
 msgstr "Arquivo com a definição de dados"
 
 #. Data collection interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:37
-msgid "lucistatistics_collectd_interval"
+msgid "Data collection interval"
 msgstr "Intervalo da coleta de dados"
 
 #. Seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:38
-msgid "lucistatistics_collectd_interval_desc"
+msgid "Seconds"
 msgstr "Segundos"
 
 #. Number of threads for data collection
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:39
-msgid "lucistatistics_collectd_readthreads"
+msgid "Number of threads for data collection"
 msgstr "Número de threads para o coletor de dados"
 
 #. Try to lookup fully qualified hostname
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:40
-msgid "lucistatistics_collectd_fqdnlookup"
+msgid "Try to lookup fully qualified hostname"
 msgstr "Tentar encontrar o nome do host completo (FQDN)"
 
 #. CPU Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:41
-msgid "lucistatistics_collectdcpu"
+msgid "CPU Plugin Configuration"
 msgstr "Configuração do plugin CPU"
 
 #. The cpu plugin collects basic statistics about the processor usage.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:42
-msgid "lucistatistics_collectdcpu_desc"
+msgid "The cpu plugin collects basic statistics about the processor usage."
 msgstr "O plugin cpu coleta as estatísticas básicas sobre o uso do processador."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:43
-msgid "lucistatistics_collectdcpu_enable"
+msgid "Enable this plugin"
 msgstr "Habilitar este plugin"
 
 #. CSV Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:44
-msgid "lucistatistics_collectdcsv"
+msgid "CSV Plugin Configuration"
 msgstr "Configuração do plugin CSV"
 
 #. The csv plugin stores collected data in csv file format for further processing by external programs.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:45
-msgid "lucistatistics_collectdcsv_desc"
+msgid "The csv plugin stores collected data in csv file format for further processing by external programs."
 msgstr ""
 "O plugin csv armazena os dados coletados em um arquivo no formato csv para "
 "um futuro processamento por outros programas."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:46
-msgid "lucistatistics_collectdcsv_enable"
+msgid "Enable this plugin"
 msgstr "Habilitar este plugin"
 
 #. Storage directory for the csv files
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:47
-msgid "lucistatistics_collectdcsv_datadir"
+msgid "Storage directory for the csv files"
 msgstr "Diretório para armazenamento dos arquivos csv"
 
 #. Store data values as rates instead of absolute values
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:48
-msgid "lucistatistics_collectdcsv_storerates"
+msgid "Store data values as rates instead of absolute values"
 msgstr "Armazenar os valores dos dados como taxas em vez de valores absolutos"
 
 #. DF Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:49
-msgid "lucistatistics_collectddf"
+msgid "DF Plugin Configuration"
 msgstr "Configuração do plugin DF"
 
 #. The df plugin collects statistics about the disk space usage on different devices, mount points or filesystem types.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:50
-msgid "lucistatistics_collectddf_desc"
+msgid "The df plugin collects statistics about the disk space usage on different devices, mount points or filesystem types."
 msgstr ""
 "O plugin df coleta estatísticas sobre a utilização de espaço em disco em "
 "diferentes dispositivos, pontos de montagem ou tipos de sistemas de "
@@ -276,121 +276,121 @@ msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:51
-msgid "lucistatistics_collectddf_enable"
+msgid "Enable this plugin"
 msgstr "Habilitar este plugin"
 
 #. Monitor devices
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:52
-msgid "lucistatistics_collectddf_devices"
+msgid "Monitor devices"
 msgstr "Monitorar dispositivos"
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:53
-msgid "lucistatistics_collectddf_devices_desc"
+msgid "multiple separated by space"
 msgstr "múltiplos valores, separados por espaço"
 
 #. Monitor mount points
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:54
-msgid "lucistatistics_collectddf_mountpoints"
+msgid "Monitor mount points"
 msgstr "Monitorar pontos de montagem"
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:55
-msgid "lucistatistics_collectddf_mountpoints_desc"
+msgid "multiple separated by space"
 msgstr "múltiplos valores, separados por espaço"
 
 #. Monitor filesystem types
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:56
-msgid "lucistatistics_collectddf_fstypes"
+msgid "Monitor filesystem types"
 msgstr "Monitorar tipos de sistemas de arquivos"
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:57
-msgid "lucistatistics_collectddf_fstypes_desc"
+msgid "multiple separated by space"
 msgstr "múltiplos valores, separados por espaço"
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:58
-msgid "lucistatistics_collectddf_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr "Monitorar tudo exceto os selecionados"
 
 #. Disk Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:59
-msgid "lucistatistics_collectddisk"
+msgid "Disk Plugin Configuration"
 msgstr "Configuração do plugin Disco"
 
 #. The disk plugin collects detailled usage statistics for selected partitions or whole disks.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:60
-msgid "lucistatistics_collectddisk_desc"
+msgid "The disk plugin collects detailled usage statistics for selected partitions or whole disks."
 msgstr ""
 "O plugin disco coleta estatísticas de uso detalhadas das partições "
 "selecionadas ou discos inteiros."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:61
-msgid "lucistatistics_collectddisk_enable"
+msgid "Enable this plugin"
 msgstr "Habilitar este plugin"
 
 #. Monitor disks and partitions
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:62
-msgid "lucistatistics_collectddisk_disks"
+msgid "Monitor disks and partitions"
 msgstr "Monitoras discos e partições"
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:63
-msgid "lucistatistics_collectddisk_disks_desc"
+msgid "multiple separated by space"
 msgstr "múltiplos valores, separados por espaço"
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:64
-msgid "lucistatistics_collectddisk_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr "Monitorar tudo exceto os selecionados"
 
 #. DNS Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:65
-msgid "lucistatistics_collectddns"
+msgid "DNS Plugin Configuration"
 msgstr "Configuração do plugin DNS"
 
 #. The dns plugin collects detailled statistics about dns related traffic on selected interfaces.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:66
-msgid "lucistatistics_collectddns_desc"
+msgid "The dns plugin collects detailled statistics about dns related traffic on selected interfaces."
 msgstr ""
 "O plugin dns coleta estatísticas detalhadas sobre o tráfego do dns nas "
 "interfaces selecionadas."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:67
-msgid "lucistatistics_collectddns_enable"
+msgid "Enable this plugin"
 msgstr "Habilitar este plugin"
 
 #. Monitor interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:68
-msgid "lucistatistics_collectddns_interfaces"
+msgid "Monitor interfaces"
 msgstr "Monitorar interfaces"
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:69
-msgid "lucistatistics_collectddns_interfaces_desc"
+msgid "multiple separated by space"
 msgstr "múltiplos valores, separados por espaço"
 
 #. Ignore source addresses
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:70
-msgid "lucistatistics_collectddns_ignoresources"
+msgid "Ignore source addresses"
 msgstr "Ignorar endereços de origem"
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:71
-msgid "lucistatistics_collectddns_ignoresources_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr "pressione Ctrl enquanto clica para selecionar várias interfaces"
 
 #. E-Mail Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:72
-msgid "lucistatistics_collectdemail"
+msgid "E-Mail Plugin Configuration"
 msgstr "Configuração do plugin E-Mail"
 
 #. The email plugin creates a unix socket which can be used to transmit email-statistics to a running collectd daemon. This plugin is primarily intended to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can be used in other ways as well.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:73
-msgid "lucistatistics_collectdemail_desc"
+msgid "The email plugin creates a unix socket which can be used to transmit email-statistics to a running collectd daemon. This plugin is primarily intended to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can be used in other ways as well."
 msgstr ""
 "O plugin de email cria um socket unix que pode ser usado para transmitir "
 "estatísticas de email o daemon collectd. Este plugin é essencialmente "
@@ -400,91 +400,91 @@ msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:74
-msgid "lucistatistics_collectdemail_enable"
+msgid "Enable this plugin"
 msgstr "Habilitar este plugin"
 
 #. Filepath of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:75
-msgid "lucistatistics_collectdemail_socketfile"
+msgid "Filepath of the unix socket"
 msgstr "Caminho do arquivo do socket unix"
 
 #. Group ownership of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:76
-msgid "lucistatistics_collectdemail_socketgroup"
+msgid "Group ownership of the unix socket"
 msgstr "Grupo dono do socket unix"
 
 #. group name
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:77
-msgid "lucistatistics_collectdemail_socketgroup_desc"
+msgid "group name"
 msgstr "nome do grupo"
 
 #. File permissions of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:78
-msgid "lucistatistics_collectdemail_socketperms"
+msgid "File permissions of the unix socket"
 msgstr "Permissões de arquivo do socket unix"
 
 #. octal
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:79
-msgid "lucistatistics_collectdemail_socketperms_desc"
+msgid "octal"
 msgstr "octal"
 
 #. Maximum allowed connections
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:80
-msgid "lucistatistics_collectdemail_maxconns"
+msgid "Maximum allowed connections"
 msgstr "Máximo de conexões permitidas"
 
 #. Exec Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:81
-msgid "lucistatistics_collectdexec"
+msgid "Exec Plugin Configuration"
 msgstr "Configuração do plugin Exec"
 
 #. The exec plugin starts external commands to read values from or to notify external processes when certain threshold values have been reached.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:82
-msgid "lucistatistics_collectdexec_desc"
+msgid "The exec plugin starts external commands to read values from or to notify external processes when certain threshold values have been reached."
 msgstr ""
 "O plugin exec inicia comandos externos para leitura de valores ou notificar "
 "processos externos quando um determinado valor limite for atingido."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:83
-msgid "lucistatistics_collectdexec_enable"
+msgid "Enable this plugin"
 msgstr "Habilitar este plugin"
 
 #. Add command for reading values
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:84
-msgid "lucistatistics_collectdexecinput"
+msgid "Add command for reading values"
 msgstr "Adicionar comando para leitura de valores"
 
 #. Here you can define external commands which will be started by collectd in order to read certain values. The values will be read from stdout.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:85
-msgid "lucistatistics_collectdexecinput_desc"
+msgid "Here you can define external commands which will be started by collectd in order to read certain values. The values will be read from stdout."
 msgstr ""
 "Aqui você pode definir comandos externos que serão iniciados pelo collectd a "
 "fim de ler determinados valores. Os valores serão lidos a partir do stdout."
 
 #. Commandline
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:86
-msgid "lucistatistics_collectdexecinput_cmdline"
+msgid "Commandline"
 msgstr "Linha de comando"
 
 #. Run as user
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:87
-msgid "lucistatistics_collectdexecinput_cmduser"
+msgid "Run as user"
 msgstr "Executar como usuário"
 
 #. Run as group
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:88
-msgid "lucistatistics_collectdexecinput_cmdgroup"
+msgid "Run as group"
 msgstr "Executar como grupo"
 
 #. Add notification command
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:89
-msgid "lucistatistics_collectdexecnotify"
+msgid "Add notification command"
 msgstr "Adicionar o comando de notificação"
 
 #. Here you can define external commands which will be started by collectd when certain threshold values have been reached. The values leading to invokation will be feeded to the the called programs stdin.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:90
-msgid "lucistatistics_collectdexecnotify_desc"
+msgid "Here you can define external commands which will be started by collectd when certain threshold values have been reached. The values leading to invokation will be feeded to the the called programs stdin."
 msgstr ""
 "Aqui você pode definir os comandos externos que serão iniciados pelo "
 "collectd quando determinados valores limite forem  atingidos. Os valores "
@@ -492,168 +492,168 @@ msgstr ""
 
 #. Commandline
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:91
-msgid "lucistatistics_collectdexecnotify_cmdline"
+msgid "Commandline"
 msgstr "Linha de comando"
 
 #. Run as user
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:92
-msgid "lucistatistics_collectdexecnotify_cmduser"
+msgid "Run as user"
 msgstr "Executar como usuário"
 
 #. Run as group
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:93
-msgid "lucistatistics_collectdexecnotify_cmdgroup"
+msgid "Run as group"
 msgstr "Executar como grupo"
 
 #. Interface Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:94
-msgid "lucistatistics_collectdinterface"
+msgid "Interface Plugin Configuration"
 msgstr "Configuração do plugin Interface"
 
 #. The interface plugin collects traffic statistics on selected interfaces.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:95
-msgid "lucistatistics_collectdinterface_desc"
+msgid "The interface plugin collects traffic statistics on selected interfaces."
 msgstr ""
 "O plugin interface plugin coleta estatísticas sobre o tráfego das interfaces "
 "selecionadas."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:96
-msgid "lucistatistics_collectdinterface_enable"
+msgid "Enable this plugin"
 msgstr "Habilitar este plugin"
 
 #. Monitor interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:97
-msgid "lucistatistics_collectdinterface_interfaces"
+msgid "Monitor interfaces"
 msgstr "Monitorar interfaces"
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:98
-msgid "lucistatistics_collectdinterface_interfaces_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr "pressione Ctrl enquanto clica para selecionar várias interfaces"
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:99
-msgid "lucistatistics_collectdinterface_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr "Monitorar todas exceto as selecionadas"
 
 #. Iptables Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:100
-msgid "lucistatistics_collectdiptables"
+msgid "Iptables Plugin Configuration"
 msgstr "Configuração do plugin Iptables"
 
 #. The iptables plugin will monitor selected firewall rules and collect informations about processed bytes and packets per rule.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:101
-msgid "lucistatistics_collectdiptables_desc"
+msgid "The iptables plugin will monitor selected firewall rules and collect informations about processed bytes and packets per rule."
 msgstr ""
 "O plugin iptables irá monitorar as regras de firewall selecionadas e coletar "
 "informações sobre pacotes e bytes processados pela regra."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:102
-msgid "lucistatistics_collectdiptables_enable"
+msgid "Enable this plugin"
 msgstr "Habilitar este plugin"
 
 #. Add matching rule
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:103
-msgid "lucistatistics_collectdiptablesmatch"
+msgid "Add matching rule"
 msgstr "Adicionar regra"
 
 #. Here you can define various criteria by which the monitored iptables rules are selected.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:104
-msgid "lucistatistics_collectdiptablesmatch_desc"
+msgid "Here you can define various criteria by which the monitored iptables rules are selected."
 msgstr ""
 "Aqui você pode definir diversos critérios para as regras iptables "
 "selecionadas serem monitoradas."
 
 #. Name of the rule
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:105
-msgid "lucistatistics_collectdiptablesmatch_name"
+msgid "Name of the rule"
 msgstr "Nome da regra"
 
 #. max. 16 chars
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:106
-msgid "lucistatistics_collectdiptablesmatch_name_desc"
+msgid "max. 16 chars"
 msgstr "max. 16 caract."
 
 #. Table
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:107
-msgid "lucistatistics_collectdiptablesmatch_table"
+msgid "Table"
 msgstr "Tabela"
 
 #. Chain
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:108
-msgid "lucistatistics_collectdiptablesmatch_chain"
+msgid "Chain"
 msgstr "Cadeia"
 
 #. Action (target)
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:109
-msgid "lucistatistics_collectdiptablesmatch_target"
+msgid "Action (target)"
 msgstr "Ação (destino)"
 
 #. Network protocol
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:110
-msgid "lucistatistics_collectdiptablesmatch_protocol"
+msgid "Network protocol"
 msgstr "Protocolo de rede"
 
 #. Source ip range
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:111
-msgid "lucistatistics_collectdiptablesmatch_source"
+msgid "Source ip range"
 msgstr "IP de origem"
 
 #. CIDR notation
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:112
-msgid "lucistatistics_collectdiptablesmatch_source_desc"
+msgid "CIDR notation"
 msgstr "Notação CIDR"
 
 #. Destination ip range
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:113
-msgid "lucistatistics_collectdiptablesmatch_destination"
+msgid "Destination ip range"
 msgstr "IP de destino"
 
 #. CIDR notation
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:114
-msgid "lucistatistics_collectdiptablesmatch_destination_desc"
+msgid "CIDR notation"
 msgstr "Notação CIDR"
 
 #. Incoming interface
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:115
-msgid "lucistatistics_collectdiptablesmatch_inputif"
+msgid "Incoming interface"
 msgstr "Interface de entrada"
 
 #. e.g. br-lan
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:116
-msgid "lucistatistics_collectdiptablesmatch_inputif_desc"
+msgid "e.g. br-lan"
 msgstr "ex. br-lan"
 
 #. Outgoing interface
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:117
-msgid "lucistatistics_collectdiptablesmatch_outputif"
+msgid "Outgoing interface"
 msgstr "Interface de saída"
 
 #. e.g. br-ff
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:118
-msgid "lucistatistics_collectdiptablesmatch_outputif_desc"
+msgid "e.g. br-ff"
 msgstr "ex. br-ff"
 
 #. Options
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:119
-msgid "lucistatistics_collectdiptablesmatch_options"
+msgid "Options"
 msgstr "Opções"
 
 #. e.g. reject-with tcp-reset
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:120
-msgid "lucistatistics_collectdiptablesmatch_options_desc"
+msgid "e.g. reject-with tcp-reset"
 msgstr "ex. rejeitar-com tcp-reset"
 
 #. IRQ Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:121
-msgid "lucistatistics_collectdirq"
+msgid "IRQ Plugin Configuration"
 msgstr "Configuração do plugin IRQ"
 
 #. The irq plugin will monitor the rate of issues per second for each selected interrupt. If no interrupt is selected then all interrupts are monitored.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:122
-msgid "lucistatistics_collectdirq_desc"
+msgid "The irq plugin will monitor the rate of issues per second for each selected interrupt. If no interrupt is selected then all interrupts are monitored."
 msgstr ""
 "O plugin irq irá monitorar a taxa de erros por segundo de cada interrupção "
 "selecionada. Se nenhuma interrupção for selecionada então todas as "
@@ -661,119 +661,119 @@ msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:123
-msgid "lucistatistics_collectdirq_enable"
+msgid "Enable this plugin"
 msgstr "Habilitar este plugin"
 
 #. Monitor interrupts
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:124
-msgid "lucistatistics_collectdirq_irqs"
+msgid "Monitor interrupts"
 msgstr "Monitorar interrupções"
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:125
-msgid "lucistatistics_collectdirq_irqs_desc"
+msgid "multiple separated by space"
 msgstr "múltiplos valores, separados por espaço"
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:126
-msgid "lucistatistics_collectdirq_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr "Monitorar todas exceto as selecionadas"
 
 #. Load Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:127
-msgid "lucistatistics_collectdload"
+msgid "Load Plugin Configuration"
 msgstr "Configuração do plugin carga"
 
 #. The load plugin collects statistics about the general system load.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:128
-msgid "lucistatistics_collectdload_desc"
+msgid "The load plugin collects statistics about the general system load."
 msgstr "O plugin carga coleta estatísticas gerais sobre a carga do sistema."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:129
-msgid "lucistatistics_collectdload_enable"
+msgid "Enable this plugin"
 msgstr "Habilitar este plugin"
 
 #. Netlink Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:130
-msgid "lucistatistics_collectdnetlink"
+msgid "Netlink Plugin Configuration"
 msgstr "Configuração do plugin Netlink"
 
 #. The netlink plugin collects extended informations like qdisc-, class- and filter-statistics for selected interfaces.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:131
-msgid "lucistatistics_collectdnetlink_desc"
+msgid "The netlink plugin collects extended informations like qdisc-, class- and filter-statistics for selected interfaces."
 msgstr ""
 "O plugin Netlink coleta informações detalhadas como qdisc-, classe- e filtro "
 "de estatísticas das interfaces selecionadas."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:132
-msgid "lucistatistics_collectdnetlink_enable"
+msgid "Enable this plugin"
 msgstr "Habilitar este plugin"
 
 #. Basic monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:133
-msgid "lucistatistics_collectdnetlink_interfaces"
+msgid "Basic monitoring"
 msgstr "Monitoramento básico"
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:134
-msgid "lucistatistics_collectdnetlink_interfaces_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr "pressione Ctrl enquanto clica para selecionar várias interfaces"
 
 #. Verbose monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:135
-msgid "lucistatistics_collectdnetlink_verboseinterfaces"
+msgid "Verbose monitoring"
 msgstr "Monitoramento no modo verbose"
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:136
-msgid "lucistatistics_collectdnetlink_verboseinterfaces_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr "pressione Ctrl enquanto clica para selecionar várias interfaces"
 
 #. Qdisc monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:137
-msgid "lucistatistics_collectdnetlink_qdiscs"
+msgid "Qdisc monitoring"
 msgstr "Monitoramento do Qdisc"
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:138
-msgid "lucistatistics_collectdnetlink_qdiscs_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr "pressione Ctrl enquanto clica para selecionar várias interfaces"
 
 #. Shaping class monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:139
-msgid "lucistatistics_collectdnetlink_classes"
+msgid "Shaping class monitoring"
 msgstr "Monitoramento das Classes de Shaping"
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:140
-msgid "lucistatistics_collectdnetlink_classes_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr "pressione Ctrl enquanto clica para selecionar várias interfaces"
 
 #. Filter class monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:141
-msgid "lucistatistics_collectdnetlink_filters"
+msgid "Filter class monitoring"
 msgstr "Monitoramento das Classes de Filtros"
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:142
-msgid "lucistatistics_collectdnetlink_filters_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr "pressione Ctrl enquanto clica para selecionar várias interfaces"
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:143
-msgid "lucistatistics_collectdnetlink_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr "Monitorar todas exceto as selecionadas"
 
 #. Network Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:144
-msgid "lucistatistics_collectdnetwork"
+msgid "Network Plugin Configuration"
 msgstr "Configuração do plugin Rede"
 
 #. The network plugin provides network based communication between different collectd instances. Collectd can operate both in client and server mode. In client mode locally collected date is transferred to a collectd server instance, in server mode the local instance receives data from other hosts.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:145
-msgid "lucistatistics_collectdnetwork_desc"
+msgid "The network plugin provides network based communication between different collectd instances. Collectd can operate both in client and server mode. In client mode locally collected date is transferred to a collectd server instance, in server mode the local instance receives data from other hosts."
 msgstr ""
 "O plugin rede fornece informações de rede baseadas na comunicação entre as "
 "diferentes instâncias do collectd. O Collectd pode operar tanto no modo "
@@ -783,170 +783,170 @@ msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:146
-msgid "lucistatistics_collectdnetwork_enable"
+msgid "Enable this plugin"
 msgstr "Habilitar este plugin"
 
 #. Listener interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:147
-msgid "lucistatistics_collectdnetworklisten"
+msgid "Listener interfaces"
 msgstr "Escutar na(s) interface(s)"
 
 #. This section defines on which interfaces collectd will wait for incoming connections.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:148
-msgid "lucistatistics_collectdnetworklisten_desc"
+msgid "This section defines on which interfaces collectd will wait for incoming connections."
 msgstr ""
 "Esta seção define em quais interfaces o collectd irá aguardar para receber "
 "conexões."
 
 #. Listen host
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:149
-msgid "lucistatistics_collectdnetworklisten_host"
+msgid "Listen host"
 msgstr "Endereço de escuta do Host"
 
 #. host-, ip- or ip6 address
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:150
-msgid "lucistatistics_collectdnetworklisten_host_desc"
+msgid "host-, ip- or ip6 address"
 msgstr "hostname, ip ou ip6"
 
 #. Listen port
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:151
-msgid "lucistatistics_collectdnetworklisten_port"
+msgid "Listen port"
 msgstr "Porta de escuta"
 
 #. 0 - 65535
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:152
-msgid "lucistatistics_collectdnetworklisten_port_desc"
+msgid "0 - 65535"
 msgstr "0 - 65535"
 
 #. server interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:153
-msgid "lucistatistics_collectdnetworkserver"
+msgid "server interfaces"
 msgstr "Interfaces do servidor"
 
 #. This section defines to which servers the locally collected data is sent to.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:154
-msgid "lucistatistics_collectdnetworkserver_desc"
+msgid "This section defines to which servers the locally collected data is sent to."
 msgstr ""
 "Esta seção define para qual servidor os dados coletados localmente serão "
 "enviados."
 
 #. Server host
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:155
-msgid "lucistatistics_collectdnetworkserver_host"
+msgid "Server host"
 msgstr "IP/Hostname do servidor"
 
 #. host-, ip- or ip6 address
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:156
-msgid "lucistatistics_collectdnetworkserver_host_desc"
+msgid "host-, ip- or ip6 address"
 msgstr "hostname, ip ou ip6"
 
 #. Server port
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:157
-msgid "lucistatistics_collectdnetworkserver_port"
+msgid "Server port"
 msgstr "Porta do servidor"
 
 #. 0 - 65535
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:158
-msgid "lucistatistics_collectdnetworkserver_port_desc"
+msgid "0 - 65535"
 msgstr "0 - 65535"
 
 #. TTL for network packets
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:159
-msgid "lucistatistics_collectdnetwork_timetolive"
+msgid "TTL for network packets"
 msgstr "TTL para os pacotes de rede"
 
 #. 0 - 255
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:160
-msgid "lucistatistics_collectdnetwork_timetolive_desc"
+msgid "0 - 255"
 msgstr "0 - 255"
 
 #. Forwarding between listen and server addresses
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:161
-msgid "lucistatistics_collectdnetwork_forward"
+msgid "Forwarding between listen and server addresses"
 msgstr "Transmissão entre o endereço de escuta e dos servidores"
 
 #. Cache flush interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:162
-msgid "lucistatistics_collectdnetwork_cacheflush"
+msgid "Cache flush interval"
 msgstr "Intervalo de limpeza do cache"
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:163
-msgid "lucistatistics_collectdnetwork_cacheflush_desc"
+msgid "seconds"
 msgstr "segundos"
 
 #. Ping Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:164
-msgid "lucistatistics_collectdping"
+msgid "Ping Plugin Configuration"
 msgstr "Configuração do plugin Ping"
 
 #. The ping plugin will send icmp echo replies to selected hosts and measure the roundtrip time for each host.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:165
-msgid "lucistatistics_collectdping_desc"
+msgid "The ping plugin will send icmp echo replies to selected hosts and measure the roundtrip time for each host."
 msgstr ""
 "O plugin ping irá enviar pacotes ICMP to tipo echo aos hosts selecionados e "
 "medir o tempo de resposta para cada host."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:166
-msgid "lucistatistics_collectdping_enable"
+msgid "Enable this plugin"
 msgstr "Habilitar este plugin"
 
 #. Monitor hosts
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:167
-msgid "lucistatistics_collectdping_hosts"
+msgid "Monitor hosts"
 msgstr "Monitorar os hosts"
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:168
-msgid "lucistatistics_collectdping_hosts_desc"
+msgid "multiple separated by space"
 msgstr "múltiplos valores, separados por espaço"
 
 #. TTL for ping packets
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:169
-msgid "lucistatistics_collectdping_ttl"
+msgid "TTL for ping packets"
 msgstr "TTL para os pacotes do ping"
 
 #. 0 - 255
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:170
-msgid "lucistatistics_collectdping_ttl_desc"
+msgid "0 - 255"
 msgstr "0 - 255"
 
 #. Processes Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:171
-msgid "lucistatistics_collectdprocesses"
+msgid "Processes Plugin Configuration"
 msgstr "Configuração do plugin Processos"
 
 #. The processes plugin collects informations like cpu time, page faults and memory usage of selected processes.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:172
-msgid "lucistatistics_collectdprocesses_desc"
+msgid "The processes plugin collects informations like cpu time, page faults and memory usage of selected processes."
 msgstr ""
 "O plugin processo coleta informações como o tempo da cpu, página falhas e "
 "uso de memória dos processos selecionados."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:173
-msgid "lucistatistics_collectdprocesses_enable"
+msgid "Enable this plugin"
 msgstr "Habilitar este plugin"
 
 #. Monitor processes
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:174
-msgid "lucistatistics_collectdprocesses_processes"
+msgid "Monitor processes"
 msgstr "Monitorar processos"
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:175
-msgid "lucistatistics_collectdprocesses_processes_desc"
+msgid "multiple separated by space"
 msgstr "múltiplos valores, separados por espaço"
 
 #. RRDTool Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:176
-msgid "lucistatistics_collectdrrdtool"
+msgid "RRDTool Plugin Configuration"
 msgstr "Configuração do plugin RRDTool"
 
 #. The rrdtool plugin stores the collected data in rrd database files, the foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong values will result in a very high memory consumption in the temporary directory. This can render the device unusable!</strong>
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:177
-msgid "lucistatistics_collectdrrdtool_desc"
+msgid "The rrdtool plugin stores the collected data in rrd database files, the foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong values will result in a very high memory consumption in the temporary directory. This can render the device unusable!</strong>"
 msgstr ""
 "O plugin rrdtool armazena os dados coletados no arquivo de banco de dados "
 "rrd.<br /><br /><strong>Aviso: A má configuração desses valores, resultará "
@@ -955,176 +955,176 @@ msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:178
-msgid "lucistatistics_collectdrrdtool_enable"
+msgid "Enable this plugin"
 msgstr "Habilitar este plugin"
 
 #. Storage directory
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:179
-msgid "lucistatistics_collectdrrdtool_datadir"
+msgid "Storage directory"
 msgstr "Diretório de armazenamento"
 
 #. RRD step interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:180
-msgid "lucistatistics_collectdrrdtool_stepsize"
+msgid "RRD step interval"
 msgstr "Intervalo de atualização"
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:181
-msgid "lucistatistics_collectdrrdtool_stepsize_desc"
+msgid "seconds"
 msgstr "segundos"
 
 #. RRD heart beat interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:182
-msgid "lucistatistics_collectdrrdtool_heartbeat"
+msgid "RRD heart beat interval"
 msgstr "Intervalo entre duas atualizações"
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:183
-msgid "lucistatistics_collectdrrdtool_heartbeat_desc"
+msgid "seconds"
 msgstr "segundos"
 
 #. Only create average RRAs
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:184
-msgid "lucistatistics_collectdrrdtool_rrasingle"
+msgid "Only create average RRAs"
 msgstr "Somente criar RRAs de média"
 
 #. reduces rrd size
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:185
-msgid "lucistatistics_collectdrrdtool_rrasingle_desc"
+msgid "reduces rrd size"
 msgstr "reduzir o tamanho do rrd"
 
 #. Stored timespans
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:186
-msgid "lucistatistics_collectdrrdtool_rratimespans"
+msgid "Stored timespans"
 msgstr "Intervalos armazenados"
 
 #. seconds; multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:187
-msgid "lucistatistics_collectdrrdtool_rratimespans_desc"
+msgid "seconds; multiple separated by space"
 msgstr "segundos; vários valores, separar com espaço"
 
 #. Rows per RRA
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:188
-msgid "lucistatistics_collectdrrdtool_rrarows"
+msgid "Rows per RRA"
 msgstr "Linhas por RRA"
 
 #. RRD XFiles Factor
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:189
-msgid "lucistatistics_collectdrrdtool_xff"
+msgid "RRD XFiles Factor"
 msgstr "Arquivos RRD XFiles Factor"
 
 #. Cache collected data for
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:190
-msgid "lucistatistics_collectdrrdtool_cachetimeout"
+msgid "Cache collected data for"
 msgstr "Cache dos dados coletados"
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:191
-msgid "lucistatistics_collectdrrdtool_cachetimeout_desc"
+msgid "seconds"
 msgstr "segundos"
 
 #. Flush cache after
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:192
-msgid "lucistatistics_collectdrrdtool_cacheflush"
+msgid "Flush cache after"
 msgstr "Limpar cache após"
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:193
-msgid "lucistatistics_collectdrrdtool_cacheflush_desc"
+msgid "seconds"
 msgstr "segundos"
 
 #. TCPConns Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:194
-msgid "lucistatistics_collectdtcpconns"
+msgid "TCPConns Plugin Configuration"
 msgstr "Configuração do plugin TCPConns"
 
 #. The tcpconns plugin collects informations about open tcp connections on selected ports.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:195
-msgid "lucistatistics_collectdtcpconns_desc"
+msgid "The tcpconns plugin collects informations about open tcp connections on selected ports."
 msgstr ""
 "O plugin tcpconns coleta informações sobre as conexões TCP abertas das "
 "portas selecionadas."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:196
-msgid "lucistatistics_collectdtcpconns_enable"
+msgid "Enable this plugin"
 msgstr "Habilitar este plugin"
 
 #. Monitor all local listen ports
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:197
-msgid "lucistatistics_collectdtcpconns_listeningports"
+msgid "Monitor all local listen ports"
 msgstr "Monitorar todas as portas locais"
 
 #. Monitor local ports
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:198
-msgid "lucistatistics_collectdtcpconns_localports"
+msgid "Monitor local ports"
 msgstr "Monitorar as portas locais"
 
 #. 0 - 65535; multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:199
-msgid "lucistatistics_collectdtcpconns_localports_desc"
+msgid "0 - 65535; multiple separated by space"
 msgstr "0 - 65535; vários valores, separar com espaço"
 
 #. Monitor remote ports
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:200
-msgid "lucistatistics_collectdtcpconns_remoteports"
+msgid "Monitor remote ports"
 msgstr "Monitorar portas remotas"
 
 #. 0 - 65535; multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:201
-msgid "lucistatistics_collectdtcpconns_remoteports_desc"
+msgid "0 - 65535; multiple separated by space"
 msgstr "0 - 65535; vários valores, separar com espaço"
 
 #. Unixsock Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:202
-msgid "lucistatistics_collectdunixsock"
+msgid "Unixsock Plugin Configuration"
 msgstr "Configuração do plugin Unixsock"
 
 #. The unixsock plugin creates a unix socket which can be used to read collected data from a running collectd instance.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:203
-msgid "lucistatistics_collectdunixsock_desc"
+msgid "The unixsock plugin creates a unix socket which can be used to read collected data from a running collectd instance."
 msgstr ""
 "O plugin unixsock cria um socket unix, que pode ser usado para ler os dados "
 "coletados a partir de uma instância do collectd."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:204
-msgid "lucistatistics_collectdunixsock_enable"
+msgid "Enable this plugin"
 msgstr "Habilitar este plugin"
 
 #. Filepath of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:205
-msgid "lucistatistics_collectdunixsock_socketfile"
+msgid "Filepath of the unix socket"
 msgstr "Caminho do arquivo socket unix"
 
 #. Group ownership of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:206
-msgid "lucistatistics_collectdunixsock_socketgroup"
+msgid "Group ownership of the unix socket"
 msgstr "Grupo dono do socket unix"
 
 #. group name
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:207
-msgid "lucistatistics_collectdunixsock_socketgroup_desc"
+msgid "group name"
 msgstr "nome do grupo"
 
 #. File permissions of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:208
-msgid "lucistatistics_collectdunixsock_socketperms"
+msgid "File permissions of the unix socket"
 msgstr "Permissões de arquivo do socket unix"
 
 #. octal
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:209
-msgid "lucistatistics_collectdunixsock_socketperms_desc"
+msgid "octal"
 msgstr "octal"
 
 #. Wireless Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:210
-msgid "lucistatistics_collectdwireless"
+msgid "Wireless Plugin Configuration"
 msgstr "Configuração do plugin Wireless"
 
 #. The wireless plugin collects statistics about wireless signal strength, noise and quality.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:211
-msgid "lucistatistics_collectdwireless_desc"
+msgid "The wireless plugin collects statistics about wireless signal strength, noise and quality."
 msgstr ""
 "O plugin wireless coleta estatísticas sobre o nível de sinal wireless, o "
 "ruído e qualidade."
diff --git a/po/pt_BR/sysauth.po b/po/pt_BR/sysauth.po
index ac3ebabf8..4a2dadb68 100644
--- a/po/pt_BR/sysauth.po
+++ b/po/pt_BR/sysauth.po
@@ -13,12 +13,12 @@ msgstr ""
 
 #. Authorization Required
 #: i18n/english/luasrc/i18n/sysauth.en.lua:1
-msgid "sysauth_head"
+msgid "Authorization Required"
 msgstr "Autorização Requerida"
 
 #. Please enter your username and password.
 #: i18n/english/luasrc/i18n/sysauth.en.lua:2
-msgid "sysauth_prompt"
+msgid "Please enter your username and password."
 msgstr "Insira o seu username e password."
 
 #. Invalid username and/or password! Please try again.
diff --git a/po/pt_BR/tinyproxy.po b/po/pt_BR/tinyproxy.po
index 5802db344..5f7a85107 100644
--- a/po/pt_BR/tinyproxy.po
+++ b/po/pt_BR/tinyproxy.po
@@ -14,157 +14,157 @@ msgstr ""
 
 #. Tinyproxy
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:1
-msgid "tinyproxy"
+msgid "Tinyproxy"
 msgstr "Tinyproxy"
 
 #. Tinyproxy is a small and fast non-caching HTTP(S)-Proxy
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:2
-msgid "tinyproxy_desc"
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
 msgstr "Tinyproxy é um pequeno e rápido Proxy-HTTP(S) sem suporte à cache"
 
 #. Allow access from
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:3
-msgid "tinyproxy_tinyproxy_allow"
+msgid "Allow access from"
 msgstr "Permitir acesso de"
 
 #. Allowed headers for anonymous proxy
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:4
-msgid "tinyproxy_tinyproxy_anonymous"
+msgid "Allowed headers for anonymous proxy"
 msgstr "Cabeçalhos permitidos para proxy anônimo"
 
 #. Bind outgoing traffic to address
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:5
-msgid "tinyproxy_tinyproxy_bind"
+msgid "Bind outgoing traffic to address"
 msgstr "Associar o tráfego de saída ao endereço"
 
 #. Ports allowed for CONNECT method
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:6
-msgid "tinyproxy_tinyproxy_connectport"
+msgid "Ports allowed for CONNECT method"
 msgstr "Portas permitidas para o método CONNECT "
 
 #. 0 = disabled, empty = all
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:7
-msgid "tinyproxy_tinyproxy_connectport_desc"
+msgid "0 = disabled, empty = all"
 msgstr "0 = desativado, vazio = todas"
 
 #. Error document
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:8
-msgid "tinyproxy_tinyproxy_defaulterrorfile"
+msgid "Error document"
 msgstr "Documento de erro"
 
 #. Filter list
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:9
-msgid "tinyproxy_tinyproxy_filter"
+msgid "Filter list"
 msgstr "Lista de filtros"
 
 #. Case sensitive filters
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:10
-msgid "tinyproxy_tinyproxy_filtercasesensitive"
+msgid "Case sensitive filters"
 msgstr "Filtros &quot;case sensitive&quot;"
 
 #. Filter list is a whitelist
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:11
-msgid "tinyproxy_tinyproxy_filterdefaultdeny"
+msgid "Filter list is a whitelist"
 msgstr "A lista de filtros é uma lista branca"
 
 #. Extended regular expression filters
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:12
-msgid "tinyproxy_tinyproxy_filterextended"
+msgid "Extended regular expression filters"
 msgstr "Filtros com suporte à expressões regulares"
 
 #. Filter URLs instead of domains
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:13
-msgid "tinyproxy_tinyproxy_filterurls"
+msgid "Filter URLs instead of domains"
 msgstr "Filtrar URLs em vez de domínios"
 
 #. Listen on address
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:14
-msgid "tinyproxy_tinyproxy_listen"
+msgid "Listen on address"
 msgstr "Escutar no endereço"
 
 #. Logfile
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:15
-msgid "tinyproxy_tinyproxy_logfile"
+msgid "Logfile"
 msgstr "Arquivo de log"
 
 #. Log level
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:16
-msgid "tinyproxy_tinyproxy_loglevel"
+msgid "Log level"
 msgstr "Nível do log"
 
 #. Maximum number of clients
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:17
-msgid "tinyproxy_tinyproxy_maxclients"
+msgid "Maximum number of clients"
 msgstr "Número máximo de clientes"
 
 #. Maximum requests per thread
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:18
-msgid "tinyproxy_tinyproxy_maxrequestsperchild"
+msgid "Maximum requests per thread"
 msgstr "Máximo de solicitações por thread"
 
 #. Max. spare servers
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:19
-msgid "tinyproxy_tinyproxy_maxspareservers"
+msgid "Max. spare servers"
 msgstr "Max. servidores sobressalentes"
 
 #. Min. spare servers
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:20
-msgid "tinyproxy_tinyproxy_minspareservers"
+msgid "Min. spare servers"
 msgstr "Min. servidores sobressalentes"
 
 #. Spare servers to start with
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:21
-msgid "tinyproxy_tinyproxy_startservers"
+msgid "Spare servers to start with"
 msgstr "Servidores sobressalentes iniciar com"
 
 #. Statistic document
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:22
-msgid "tinyproxy_tinyproxy_statfile"
+msgid "Statistic document"
 msgstr "Documento de estatísticas"
 
 #. Write to syslog
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:23
-msgid "tinyproxy_tinyproxy_syslog"
+msgid "Write to syslog"
 msgstr "Escrever para syslog"
 
 #. Connection Timeout
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:24
-msgid "tinyproxy_tinyproxy_timeout"
+msgid "Connection Timeout"
 msgstr "Timeout de conexão"
 
 #. Value of Via-Header
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:25
-msgid "tinyproxy_tinyproxy_viaproxyname"
+msgid "Value of Via-Header"
 msgstr "Valor do cabeçalho &quot;Via-Header&quot;"
 
 #. Include client IP
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:26
-msgid "tinyproxy_tinyproxy_xtinyproxy"
+msgid "Include client IP"
 msgstr "Incluir o IP do cliente"
 
 #. Via proxy
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:27
-msgid "tinyproxy_type_proxy"
+msgid "Via proxy"
 msgstr "Via proxy"
 
 #. Reject access
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:28
-msgid "tinyproxy_type_reject"
+msgid "Reject access"
 msgstr "Rejeitar o acesso"
 
 #. Upstream Control
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:29
-msgid "tinyproxy_upstream"
+msgid "Upstream Control"
 msgstr "Controle de Upstream"
 
 #. Target host
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:30
-msgid "tinyproxy_upstream_target"
+msgid "Target host"
 msgstr "Host de destino"
 
 #. Type
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:31
-msgid "tinyproxy_upstream_type"
+msgid "Type"
 msgstr "Tipo"
 
 #. Upstream Proxy
diff --git a/po/pt_BR/upnp.po b/po/pt_BR/upnp.po
index d2a01155c..d58e38ddf 100644
--- a/po/pt_BR/upnp.po
+++ b/po/pt_BR/upnp.po
@@ -14,36 +14,36 @@ msgstr ""
 
 #. Universal Plug &amp; Play
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:1
-msgid "upnpd"
+msgid "Universal Plug & Play"
 msgstr "Plug &amp; Play Universal"
 
 #. UPNP allows clients in the local network to automatically configure the router.
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:2
-msgid "upnpd_desc"
+msgid "UPNP allows clients in the local network to automatically configure the router."
 msgstr ""
 "UPNP permite os clientes da rede local automaticamente configurar o "
 "roteador."
 
 #. UPNP should only be enabled if absolutely necessary as it can result in high security risks for your network.
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:3
-msgid "upnpd_config_desc"
+msgid "UPNP should only be enabled if absolutely necessary as it can result in high security risks for your network."
 msgstr ""
 "O UPNP deve ser ativado apenas se for absolutamente necessário, pois ele "
 "pode resultar em elevados riscos de segurança para sua rede."
 
 #. Enable secure mode
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:4
-msgid "upnpd_config_securemode"
+msgid "Enable secure mode"
 msgstr "Enable secure mode"
 
 #. Log output
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:5
-msgid "upnpd_config_logoutput"
+msgid "Log output"
 msgstr "Log de saída"
 
 #. Downlink
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:6
-msgid "upnpd_config_download"
+msgid "Downlink"
 msgstr "Link para download"
 
 #. Uplink
diff --git a/po/pt_BR/ushare.po b/po/pt_BR/ushare.po
index f3dcea5cf..c883de08b 100644
--- a/po/pt_BR/ushare.po
+++ b/po/pt_BR/ushare.po
@@ -14,37 +14,37 @@ msgstr ""
 
 #. Content directories
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:1
-msgid "content_directories"
+msgid "Content directories"
 msgstr "Diretórios de conteúdo"
 
 #. Disable telnet console
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:2
-msgid "disable_telnet"
+msgid "Disable telnet console"
 msgstr "Desativar console telnet"
 
 #. Disable webinterface
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:3
-msgid "disable_webif"
+msgid "Disable webinterface"
 msgstr "Desativar interface web"
 
 #. Options
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:4
-msgid "options"
+msgid "Options"
 msgstr "Opções"
 
 #. Servername
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:5
-msgid "servername"
+msgid "Servername"
 msgstr "Nome do servidor"
 
 #. Settings
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:6
-msgid "settings"
+msgid "Settings"
 msgstr "Configurações"
 
 #. uShare
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:7
-msgid "ushare"
+msgid "uShare"
 msgstr "uShare"
 
 #. uShare
diff --git a/po/pt_BR/uvc_streamer.po b/po/pt_BR/uvc_streamer.po
index 7ef17f93b..4b100a14b 100644
--- a/po/pt_BR/uvc_streamer.po
+++ b/po/pt_BR/uvc_streamer.po
@@ -14,22 +14,22 @@ msgstr ""
 
 #. Frames per second
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
-msgid "framespersecond"
+msgid "Frames per second"
 msgstr "Frames por segundo"
 
 #. Resolution
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
-msgid "resolution"
+msgid "Resolution"
 msgstr "Resolução"
 
 #. Settings
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
-msgid "settings"
+msgid "Settings"
 msgstr "Configurações"
 
 #. Webcam streaming
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
-msgid "uvc_streamer"
+msgid "Webcam streaming"
 msgstr "Webcam streaming"
 
 #. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
diff --git a/po/pt_BR/uvl.po b/po/pt_BR/uvl.po
index 436442056..7651701ee 100644
--- a/po/pt_BR/uvl.po
+++ b/po/pt_BR/uvl.po
@@ -14,219 +14,219 @@ msgstr ""
 
 #. Unable to load config \"%p\": %1
 #: libs/uvl/luasrc/i18n/uvl.en.lua:1
-msgid "uvl_err_uciload"
+msgid "Unable to load config \"%p\": %1"
 msgstr "Não foi possível carregar a configuração \"%p\": %1"
 
 #. Error in scheme \"%p\":\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:2
-msgid "uvl_err_scheme"
+msgid "Error in scheme \"%p\":\\n%c"
 msgstr ""
 "Erro no esquema \"%p\":\n"
 "%c"
 
 #. Error in config \"%p\":\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:3
-msgid "uvl_err_config"
+msgid "Error in config \"%p\":\\n%c"
 msgstr ""
 "Erro na configuração \"%p\":\n"
 "%c"
 
 #. Error in section \"%i\" (%I):\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:4
-msgid "uvl_err_section"
+msgid "Error in section \"%i\" (%I):\\n%c"
 msgstr ""
 "Erro na seção \"%i\" (%I):\n"
 "%c"
 
 #. Error in option \"%i\" (%I):\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:5
-msgid "uvl_err_option"
+msgid "Error in option \"%i\" (%I):\\n%c"
 msgstr ""
 "Erro na opção \"%i\" (%I):\n"
 "%c"
 
 #. Option \"%i\" has invalid reference specification %1:\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:6
-msgid "uvl_err_reference"
+msgid "Option \"%i\" has invalid reference specification %1:\\n%c"
 msgstr ""
 "Opção \"%i\" tem especificação de referência inválida %1:\n"
 "%c"
 
 #. In dependency check for %t \"%i\":\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:7
-msgid "uvl_err_dependency"
+msgid "In dependency check for %t \"%i\":\\n%c"
 msgstr ""
 "Na dependência de verificação %t \"%i\":\n"
 "%c"
 
 #. Can not find scheme \"%p\" in \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:8
-msgid "uvl_err_sme_find"
+msgid "Can not find scheme \"%p\" in \"%1\""
 msgstr "Não é possível encontrar o esquema \"%p\" in \"%1\""
 
 #. Can not access file \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:9
-msgid "uvl_err_sme_read"
+msgid "Can not access file \"%1\""
 msgstr "Não é possível acessar o arquivo \"%1\""
 
 #. Missing required scheme field \"%1\" in \"%i\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:10
-msgid "uvl_err_sme_reqfld"
+msgid "Missing required scheme field \"%1\" in \"%i\""
 msgstr "Faltando campo requerido no esquema: \"%1\" em \"%i\""
 
 #. Illegal reference \"%1\" to an anonymous section
 #: libs/uvl/luasrc/i18n/uvl.en.lua:11
-msgid "uvl_err_sme_invref"
+msgid "Illegal reference \"%1\" to an anonymous section"
 msgstr "Referência \"1%\" ilegal para uma seção anônima"
 
 #. Malformed reference in \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:12
-msgid "uvl_err_sme_badref"
+msgid "Malformed reference in \"%1\""
 msgstr "Referência mal elaborada em \"%1\""
 
 #. Malformed dependency specification \"%1\" in \"%i\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:13
-msgid "uvl_err_sme_baddep"
+msgid "Malformed dependency specification \"%1\" in \"%i\""
 msgstr "Especificação de dependência mal elaborada: \"%1\" em \"%i\""
 
 #. Malformed validator specification \"%1\" in \"%i\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:14
-msgid "uvl_err_sme_badval"
+msgid "Malformed validator specification \"%1\" in \"%i\""
 msgstr "Especificação de validador mal elaborada: \"%1\" em \"%i\""
 
 #. External validator \"%1\" failed: %2
 #: libs/uvl/luasrc/i18n/uvl.en.lua:15
-msgid "uvl_err_sme_errval"
+msgid "External validator \"%1\" failed: %2"
 msgstr "Validador externo \"%1\" falhou: %2"
 
 #. Variable \"%o\" in scheme \"%p\" references unknown package \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:16
-msgid "uvl_err_sme_vbadpack"
+msgid "Variable \"%o\" in scheme \"%p\" references unknown package \"%1\""
 msgstr ""
 "Variável \"%o\" no esquema \"%p\" faz referência para um pacote desconecido \"%1\""
 
 #. Variable \"%o\" in scheme \"%p\" references unknown section \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:17
-msgid "uvl_err_sme_vbadsect"
+msgid "Variable \"%o\" in scheme \"%p\" references unknown section \"%1\""
 msgstr ""
 "Variável \"%o\" no esquema \"%p\" faz referência para uma seção desconecida \"%1\""
 
 #. Enum \"%v\" in scheme \"%p\" references unknown package \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:18
-msgid "uvl_err_sme_ebadpack"
+msgid "Enum \"%v\" in scheme \"%p\" references unknown package \"%1\""
 msgstr ""
 "Enum \"%v\" no esquema \"%p\" faz referência para um pacote desconecido \"%1\""
 
 #. Enum \"%v\" in scheme \"%p\" references unknown section \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:19
-msgid "uvl_err_sme_ebadsect"
+msgid "Enum \"%v\" in scheme \"%p\" references unknown section \"%1\""
 msgstr ""
 "Enum \"%v\" no esquema \"%p\" faz referência para uma seção desconecida \"%1\""
 
 #. Enum \"%v\" in scheme \"%p\" references unknown option \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:20
-msgid "uvl_err_sme_ebadopt"
+msgid "Enum \"%v\" in scheme \"%p\" references unknown option \"%1\""
 msgstr ""
 "Enum \"%v\" no esquema \"%p\" faz referência para uma opção desconecida \"%1\""
 
 #. Enum \"%v\" in scheme \"%p\" references non-enum option \"%p.%s.%o\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:21
-msgid "uvl_err_sme_ebadtype"
+msgid "Enum \"%v\" in scheme \"%p\" references non-enum option \"%p.%s.%o\""
 msgstr ""
 "Enum \"%v\" no esquema \"%p\" faz referência para uma opção não-enum \"%p.%s.%o\""
 
 #. Enum \"%v\" in scheme \"%p\" redeclares the default value of \"%p.%s.%o\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:22
-msgid "uvl_err_sme_ebaddef"
+msgid "Enum \"%v\" in scheme \"%p\" redeclares the default value of \"%p.%s.%o\""
 msgstr "Enum \"%v\" no esquema \"%p\" redeclara o valor padrão de \"%p.%s.%o\""
 
 #. Section \"%i\" (%I) not found in scheme
 #: libs/uvl/luasrc/i18n/uvl.en.lua:23
-msgid "uvl_err_sect_unknown"
+msgid "Section \"%i\" (%I) not found in scheme"
 msgstr "Seção \"%i\" (%I) não encontrada no esquema"
 
 #. Required section \"%p.%s\" not found in config
 #: libs/uvl/luasrc/i18n/uvl.en.lua:24
-msgid "uvl_err_sect_required"
+msgid "Required section \"%p.%s\" not found in config"
 msgstr "Seção requerida \"%p.%s\" não encontrada na configuração"
 
 #. Unique section \"%p.%s\" occurs multiple times in config
 #: libs/uvl/luasrc/i18n/uvl.en.lua:25
-msgid "uvl_err_sect_unique"
+msgid "Unique section \"%p.%s\" occurs multiple times in config"
 msgstr "Seção única \"%p.%s\" ocorre várias vezes na configuração"
 
 #. The section of type \"%p.%s\" is stored anonymously in config but must be named
 #: libs/uvl/luasrc/i18n/uvl.en.lua:26
-msgid "uvl_err_sect_named"
+msgid "The section of type \"%p.%s\" is stored anonymously in config but must be named"
 msgstr ""
 "A seção do tipo \"%p.%s\" está armazenada na configuração como anônima, mas "
 "deve ser nomeada"
 
 #. Section \"%p.%s\" not found in config
 #: libs/uvl/luasrc/i18n/uvl.en.lua:27
-msgid "uvl_err_sect_notfound"
+msgid "Section \"%p.%s\" not found in config"
 msgstr "Seção \"%p.%s\" não encontrada na configuração"
 
 #. Option \"%i\" (%I) not found in scheme
 #: libs/uvl/luasrc/i18n/uvl.en.lua:28
-msgid "uvl_err_opt_unknown"
+msgid "Option \"%i\" (%I) not found in scheme"
 msgstr "Opção \"%i\" (%I) não encontrada no esquema"
 
 #. Required option \"%i\" has no value
 #: libs/uvl/luasrc/i18n/uvl.en.lua:29
-msgid "uvl_err_opt_required"
+msgid "Required option \"%i\" has no value"
 msgstr "Opção requerida \"%i\" não tem nenhum valor"
 
 #. Value \"%1\" of option \"%i\" is not defined in enum %2
 #: libs/uvl/luasrc/i18n/uvl.en.lua:30
-msgid "uvl_err_opt_badvalue"
+msgid "Value \"%1\" of option \"%i\" is not defined in enum %2"
 msgstr "Valor \"%1\" da opção \"%i\" não está definido no enum %2"
 
 #. Value \"%1\" of option \"%i\" does not validate as datatype \"%2\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:31
-msgid "uvl_err_opt_invvalue"
+msgid "Value \"%1\" of option \"%i\" does not validate as datatype \"%2\""
 msgstr "Valor \"%1\" da opção \"%i\" não foi validado como tipo de dados \"%2\""
 
 #. Option \"%i\" is defined as list but stored as plain value
 #: libs/uvl/luasrc/i18n/uvl.en.lua:32
-msgid "uvl_err_opt_notlist"
+msgid "Option \"%i\" is defined as list but stored as plain value"
 msgstr ""
 "Opção \"%i\" está definida como lista, mas armazenada como um valor simples"
 
 #. Option \"%i\" has unknown datatype \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:33
-msgid "uvl_err_opt_datatype"
+msgid "Option \"%i\" has unknown datatype \"%1\""
 msgstr "Opção \"%i\" tem o tipo de dados desconhecido \"%1\""
 
 #. Option \"%p.%s.%o\" not found in config
 #: libs/uvl/luasrc/i18n/uvl.en.lua:34
-msgid "uvl_err_opt_notfound"
+msgid "Option \"%p.%s.%o\" not found in config"
 msgstr "Opção \"%p.%s.%o\" não encontrada na configuração"
 
 #. Dependency (%1) failed:\noption \"%i\" is not eqal \"%2\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:35
-msgid "uvl_err_dep_notequal"
+msgid "Dependency (%1) failed:\\noption \"%i\" is not eqal \"%2\""
 msgstr ""
 "Dependência (%1) falhou:\n"
 "opção \"%i\" is not eqal à \"%2\""
 
 #. Dependency (%1) failed:\noption \"%i\" has no value
 #: libs/uvl/luasrc/i18n/uvl.en.lua:36
-msgid "uvl_err_dep_novalue"
+msgid "Dependency (%1) failed:\\noption \"%i\" has no value"
 msgstr ""
 "Dependência (%1) falhou:\n"
 "opção \"%i\" não tem nenhum valor"
 
 #. Dependency (%1) failed:\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:37
-msgid "uvl_err_dep_notvalid"
+msgid "Dependency (%1) failed:\\n%c"
 msgstr ""
 "Dependência (%1) falhou:\n"
 "%c"
 
 #. Recursive dependency for option \"%i\" detected
 #: libs/uvl/luasrc/i18n/uvl.en.lua:38
-msgid "uvl_err_dep_recursive"
+msgid "Recursive dependency for option \"%i\" detected"
 msgstr "Dependência recursiva para a opção \"%i\" detectada"
 
 #. In dependency check for enum value \"%i\":\n%c
diff --git a/po/pt_BR/wifi.po b/po/pt_BR/wifi.po
index d5e03fcd4..51ed608da 100644
--- a/po/pt_BR/wifi.po
+++ b/po/pt_BR/wifi.po
@@ -13,195 +13,195 @@ msgstr ""
 
 #. auto
 #: i18n/english/luasrc/i18n/wifi.en.lua:1
-msgid "wifi_auto"
+msgid "auto"
 msgstr "automático"
 
 #. Frequency Hopping
 #: i18n/english/luasrc/i18n/wifi.en.lua:2
-msgid "wifi_fh"
+msgid "Frequency Hopping"
 msgstr "Salto de Frequência"
 
 #. Diversity
 #: i18n/english/luasrc/i18n/wifi.en.lua:3
-msgid "wifi_diversity"
+msgid "Diversity"
 msgstr "Diversidade"
 
 #. Transmitter Antenna
 #: i18n/english/luasrc/i18n/wifi.en.lua:4
-msgid "wifi_txantenna"
+msgid "Transmitter Antenna"
 msgstr "Antena de Transmissão"
 
 #. Receiver Antenna
 #: i18n/english/luasrc/i18n/wifi.en.lua:5
-msgid "wifi_rxantenna"
+msgid "Receiver Antenna"
 msgstr "Antena de Recepção"
 
 #. Distance Optimization
 #: i18n/english/luasrc/i18n/wifi.en.lua:6
-msgid "wifi_distance"
+msgid "Distance Optimization"
 msgstr "Optimização de Distância"
 
 #. Distance to farthest network member in meters.
 #: i18n/english/luasrc/i18n/wifi.en.lua:7
-msgid "wifi_distance_desc"
+msgid "Distance to farthest network member in meters."
 msgstr "Distância para o último host da rede (em metros)."
 
 #. MAC-Address Filter
 #: i18n/english/luasrc/i18n/wifi.en.lua:8
-msgid "wifi_macpolicy"
+msgid "MAC-Address Filter"
 msgstr "Filtro de Endereço-MAC"
 
 #. Allow listed only
 #: i18n/english/luasrc/i18n/wifi.en.lua:9
-msgid "wifi_whitelist"
+msgid "Allow listed only"
 msgstr "Permitir somente os listados"
 
 #. Allow all except listed
 #: i18n/english/luasrc/i18n/wifi.en.lua:10
-msgid "wifi_blacklist"
+msgid "Allow all except listed"
 msgstr "Permitir todos, excepto os listados"
 
 #. MAC-List
 #: i18n/english/luasrc/i18n/wifi.en.lua:11
-msgid "wifi_maclist"
+msgid "MAC-List"
 msgstr "Lista de MAC"
 
 #. Frame Bursting
 #: i18n/english/luasrc/i18n/wifi.en.lua:12
-msgid "wifi_bursting"
+msgid "Frame Bursting"
 msgstr "Frame Bursting"
 
 #. Regulatory Domain
 #: i18n/english/luasrc/i18n/wifi.en.lua:13
-msgid "wifi_regdomain"
+msgid "Regulatory Domain"
 msgstr "Domínio Regulatório"
 
 #. Country Code
 #: i18n/english/luasrc/i18n/wifi.en.lua:14
-msgid "wifi_country"
+msgid "Country Code"
 msgstr "Código do País"
 
 #. Outdoor Channels
 #: i18n/english/luasrc/i18n/wifi.en.lua:15
-msgid "wifi_outdoor"
+msgid "Outdoor Channels"
 msgstr "Canais de Outdoor"
 
 #. Connection Limit
 #: i18n/english/luasrc/i18n/wifi.en.lua:16
-msgid "wifi_maxassoc"
+msgid "Connection Limit"
 msgstr "Máximo de Associações"
 
 #. <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:17
-msgid "wifi_essid"
+msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 "<abbr title=\"Identificador de Conjunto de Serviços Estendidos\">ESSID</abbr>"
 
 #. <abbr title=\"Basic Service Set Identifier\">BSSID</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:18
-msgid "wifi_bssid"
+msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr "<abbr title=\"Identificador de Conjunto Básico de Serviços\">BSSID</abbr>"
 
 #. Fragmentation Threshold
 #: i18n/english/luasrc/i18n/wifi.en.lua:19
-msgid "wifi_frag"
+msgid "Fragmentation Threshold"
 msgstr "Fragmentation Threshold"
 
 #. RTS/CTS Threshold
 #: i18n/english/luasrc/i18n/wifi.en.lua:20
-msgid "wifi_rts"
+msgid "RTS/CTS Threshold"
 msgstr "RTS/CTS Threshold"
 
 #. <abbr title=\"Wireless Distribution System\">WDS</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:21
-msgid "wifi_wds"
+msgid "<abbr title=\"Wireless Distribution System\">WDS</abbr>"
 msgstr "<abbr title=\"Sistema de Distribuição Wireless\">WDS</abbr>"
 
 #. Separate WDS
 #: i18n/english/luasrc/i18n/wifi.en.lua:22
-msgid "wifi_wdssep"
+msgid "Separate WDS"
 msgstr "Separar WDS"
 
 #. Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:23
-msgid "wifi_hidden"
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 "Ocultar <abbr title=\"Identificador de Conjunto de Serviços "
 "Estendidos\">ESSID</abbr>"
 
 #. Isolate Clients
 #: i18n/english/luasrc/i18n/wifi.en.lua:24
-msgid "wifi_isloate"
+msgid "Isolate Clients"
 msgstr "Isolar Clientes"
 
 #. Prevent Client to Client Communication
 #: i18n/english/luasrc/i18n/wifi.en.lua:25
-msgid "wifi_isloate_desc"
+msgid "Prevent Client to Client Communication"
 msgstr "Previnir Comunicação de Cliente para Cliente"
 
 #. Background Scan
 #: i18n/english/luasrc/i18n/wifi.en.lua:26
-msgid "wifi_bgscan"
+msgid "Background Scan"
 msgstr "Procurar em Segundo Plano"
 
 #. Transmission Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:27
-msgid "wifi_rate"
+msgid "Transmission Rate"
 msgstr "Taxa de Transmissão"
 
 #. Multicast Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:28
-msgid "wifi_mcast_rate"
+msgid "Multicast Rate"
 msgstr "Taxa de Multicast"
 
 #. Minimum Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:29
-msgid "wifi_minrate"
+msgid "Minimum Rate"
 msgstr "Taxa Mínima"
 
 #. Maximum Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:30
-msgid "wifi_maxrate"
+msgid "Maximum Rate"
 msgstr "Taxa Máxima"
 
 #. Compression
 #: i18n/english/luasrc/i18n/wifi.en.lua:31
-msgid "wifi_compression"
+msgid "Compression"
 msgstr "Compressão"
 
 #. Turbo Mode
 #: i18n/english/luasrc/i18n/wifi.en.lua:32
-msgid "wifi_turbo"
+msgid "Turbo Mode"
 msgstr "Modo Turbo"
 
 #. Fast Frames
 #: i18n/english/luasrc/i18n/wifi.en.lua:33
-msgid "wifi_ff"
+msgid "Fast Frames"
 msgstr "Frames Rápidas"
 
 #. WMM Mode
 #: i18n/english/luasrc/i18n/wifi.en.lua:34
-msgid "wifi_wmm"
+msgid "WMM Mode"
 msgstr "Modo WMM"
 
 #. XR Support
 #: i18n/english/luasrc/i18n/wifi.en.lua:35
-msgid "wifi_xr"
+msgid "XR Support"
 msgstr "Suporte XR"
 
 #. AR Support
 #: i18n/english/luasrc/i18n/wifi.en.lua:36
-msgid "wifi_ar"
+msgid "AR Support"
 msgstr "Suporte AR"
 
 #. Disable HW-Beacon timer
 #: i18n/english/luasrc/i18n/wifi.en.lua:37
-msgid "wifi_nosbeacon"
+msgid "Disable HW-Beacon timer"
 msgstr "Desactivar temporizador de HW-Beacon"
 
 #. Do not send probe responses
 #: i18n/english/luasrc/i18n/wifi.en.lua:38
-msgid "wifi_noprobereq"
+msgid "Do not send probe responses"
 msgstr "Não enviar respostas a sondas"
 
 #. WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP and ad-hoc mode) to be installed.
diff --git a/po/ru/admin-core.po b/po/ru/admin-core.po
index e42189ca7..22790576f 100644
--- a/po/ru/admin-core.po
+++ b/po/ru/admin-core.po
@@ -13,22 +13,22 @@ msgstr ""
 
 #. The following changes have been applied
 #: i18n/english/luasrc/i18n/admin-core.en.lua:1
-msgid "uci_applied"
+msgid "The following changes have been applied"
 msgstr "Данные изменения были приняты"
 
 #. The following changes have been reverted
 #: i18n/english/luasrc/i18n/admin-core.en.lua:2
-msgid "uci_reverted"
+msgid "The following changes have been reverted"
 msgstr "Данные изменения были отвергнуты"
 
 #. User Interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:3
-msgid "a_i_ui"
+msgid "User Interface"
 msgstr "Пользовательский интерфейс"
 
 #. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a collection of free Lua software including an <abbr title=\"Model-View-Controller\">MVC</abbr>-Webframework and webinterface for embedded devices. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is licensed under the Apache-License.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:4
-msgid "c_lucidesc"
+msgid "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a collection of free Lua software including an <abbr title=\"Model-View-Controller\">MVC</abbr>-Webframework and webinterface for embedded devices. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is licensed under the Apache-License."
 msgstr ""
 "<abbr title=\"Lua Конфигурационный Интерфейс\">LuCI</abbr> это свободное Lua "
 "програмное обеспечение включая <abbr title=\"Model-View-"
@@ -38,88 +38,88 @@ msgstr ""
 
 #. Project Homepage
 #: i18n/english/luasrc/i18n/admin-core.en.lua:5
-msgid "c_projecthome"
+msgid "Project Homepage"
 msgstr "Домашняя страница проекта"
 
 #. Lead Development
 #: i18n/english/luasrc/i18n/admin-core.en.lua:6
-msgid "c_leaddev"
+msgid "Lead Development"
 msgstr "Ведущие разработчики"
 
 #. Contributing Developers
 #: i18n/english/luasrc/i18n/admin-core.en.lua:7
-msgid "c_contributors"
+msgid "Contributing Developers"
 msgstr "Помогавшие в разработке"
 
 #. Thanks To
 #: i18n/english/luasrc/i18n/admin-core.en.lua:8
-msgid "c_thanksto"
+msgid "Thanks To"
 msgstr "Благодаря"
 
 #. Hello!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:9
-msgid "a_i_i_hello"
+msgid "Hello!"
 msgstr "Добро пожаловать."
 
 #. This is the administration area of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:10
-msgid "a_i_i_admin1"
+msgid "This is the administration area of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>."
 msgstr ""
 "Это зона управления <abbr title=\"Lua Конфигурационный "
 "Интерфейс\">LuCI</abbr>."
 
 #. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a free, flexible, and user friendly graphical interface for configuring OpenWrt Kamikaze.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:11
-msgid "a_i_i_admin2"
+msgid "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a free, flexible, and user friendly graphical interface for configuring OpenWrt Kamikaze."
 msgstr ""
 "<abbr title=\"Lua Конфигурационный Интерфейс\">LuCI</abbr> свободный, гибкий и "
 "дружелюбный графический интерфейс для настройки OpenWrt Kamikaze."
 
 #. On the following pages you can adjust all important settings of your router.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:12
-msgid "a_i_i_admin3"
+msgid "On the following pages you can adjust all important settings of your router."
 msgstr ""
 "С помощью этих страниц вы можете изменить основные настройки вашего роутера."
 
 #. Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> changes have to be confirmed by clicking Changes - Save &amp; Apply before being applied.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:13
-msgid "a_i_i_admin4"
+msgid "Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> changes have to be confirmed by clicking Changes - Save & Apply before being applied."
 msgstr ""
 "Внимание: В <abbr title=\"Lua Конфигурационный Интерфейс\">LuCI</abbr> "
 "изменения принимаются после нажатия  - Принять."
 
 #. As we always want to improve this interface we are looking forward to your feedback and suggestions.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:14
-msgid "a_i_i_admin5"
+msgid "As we always want to improve this interface we are looking forward to your feedback and suggestions."
 msgstr ""
 "Так же мы всегда желаем улучшить этот интерфейс, мы всегда обратим внимание "
 "на ваши вопросы и предложения."
 
 #. And now have fun with your router!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:15
-msgid "a_i_i_admin6"
+msgid "And now have fun with your router!"
 msgstr "А теперь повеселитесь со своим роутером!"
 
 #. The <abbr title=\"Lua Configuration Interface\">LuCI</abbr> Team
 #: i18n/english/luasrc/i18n/admin-core.en.lua:16
-msgid "a_i_i_team"
+msgid "The <abbr title=\"Lua Configuration Interface\">LuCI</abbr> Team"
 msgstr "Команда <abbr title=\"Lua Конфигурационный Интерфейс\">LuCI</abbr>"
 
 #. Here you can customize the settings and the functionality of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:17
-msgid "a_i_luci1"
+msgid "Here you can customize the settings and the functionality of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>."
 msgstr ""
 "Здесь вы можете изменить настройки и функциональность <abbr title=\"Lua "
 "Конфигурационный Интерфейс\">LuCI</abbr>."
 
 #. Post-commit actions
 #: i18n/english/luasrc/i18n/admin-core.en.lua:18
-msgid "a_i_ucicommit"
+msgid "Post-commit actions"
 msgstr "Запуск команд"
 
 #. These commands will be executed automatically when a given <abbr title=\"Unified Configuration Interface\">UCI</abbr> configuration is committed allowing changes to be applied instantly.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:19
-msgid "a_i_ucicommit1"
+msgid "These commands will be executed automatically when a given <abbr title=\"Unified Configuration Interface\">UCI</abbr> configuration is committed allowing changes to be applied instantly."
 msgstr ""
 "Эти команды будут запущенны автоматически когда данная <abbr title=\"Единый "
 "Конфигурационный Интерфейс\">UCI</abbr> конфигурация добавлена и изменения "
@@ -127,115 +127,115 @@ msgstr ""
 
 #. Files to be kept when flashing a new firmware
 #: i18n/english/luasrc/i18n/admin-core.en.lua:20
-msgid "a_i_keepflash"
+msgid "Files to be kept when flashing a new firmware"
 msgstr "Файлы которые необходимо сохранить при перепрошивании"
 
 #. When flashing a new firmware with <abbr title=\"Lua Configuration Interface\">LuCI</abbr> these files will be added to the new firmware installation.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:21
-msgid "a_i_keepflash1"
+msgid "When flashing a new firmware with <abbr title=\"Lua Configuration Interface\">LuCI</abbr> these files will be added to the new firmware installation."
 msgstr ""
 "После перепрошивки <abbr title=\"Lua Конфигурационный Интерфейс\">LuCI</abbr> "
 "эти файлы будут добавлены в обновлённую систему ."
 
 #. Here you can find information about the current system status like <abbr title=\"Central Processing Unit\">CPU</abbr> clock frequency, memory usage or network interface data.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:22
-msgid "a_st_i_status1"
+msgid "Here you can find information about the current system status like <abbr title=\"Central Processing Unit\">CPU</abbr> clock frequency, memory usage or network interface data."
 msgstr ""
 "Здесь вы можете найти информацию о текущей статистики системы вроде частоты "
 "процессора, использования памяти или сетевого интерфейса."
 
 #. Also kernel or service logfiles can be viewed here to get an overview over their current state.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:23
-msgid "a_st_i_status2"
+msgid "Also kernel or service logfiles can be viewed here to get an overview over their current state."
 msgstr ""
 "А так же ядра или сервисов, системный журнал может быть так же просмотрен "
 "здесь для того что бы получить полный обзор текущего состояния системы."
 
 #. <abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan
 #: i18n/english/luasrc/i18n/admin-core.en.lua:24
-msgid "iwscan"
+msgid "<abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan"
 msgstr "<abbr title=\"Беспроводная локальная сеть\">WLAN</abbr>-Сканирование"
 
 #. Wifi networks in your local environment
 #: i18n/english/luasrc/i18n/admin-core.en.lua:25
-msgid "iwscan1"
+msgid "Wifi networks in your local environment"
 msgstr "Обзор существующих Wi-Fi сетей"
 
 #. <abbr title=\"Encrypted\">Encr.</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:26
-msgid "iwscan_encr"
+msgid "<abbr title=\"Encrypted\">Encr.</abbr>"
 msgstr "<abbr title=\"Зашифрованно\">Шифрование</abbr>"
 
 #. Link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:27
-msgid "iwscan_link"
+msgid "Link"
 msgstr "Связь"
 
 #. Signal
 #: i18n/english/luasrc/i18n/admin-core.en.lua:28
-msgid "iwscan_signal"
+msgid "Signal"
 msgstr "Сигнал"
 
 #. Noise
 #: i18n/english/luasrc/i18n/admin-core.en.lua:29
-msgid "iwscan_noise"
+msgid "Noise"
 msgstr "Шум"
 
 #. Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:30
-msgid "routes"
+msgid "Routes"
 msgstr "Маршруты"
 
 #. Netmask
 #: i18n/english/luasrc/i18n/admin-core.en.lua:31
-msgid "routes_netmask"
+msgid "Netmask"
 msgstr "Сетевая маска"
 
 #. Gateway
 #: i18n/english/luasrc/i18n/admin-core.en.lua:32
-msgid "routes_gateway"
+msgid "Gateway"
 msgstr "Шлюз"
 
 #. Metric
 #: i18n/english/luasrc/i18n/admin-core.en.lua:33
-msgid "routes_metric"
+msgid "Metric"
 msgstr "Метрика"
 
 #. Here you can configure the basic aspects of your device like its hostname or the timezone.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:34
-msgid "a_s_desc"
+msgid "Here you can configure the basic aspects of your device like its hostname or the timezone."
 msgstr ""
 "Здесь вы можете настроить основные параметры вашего устройства такие как имя "
 "хоста или часовой пояс."
 
 #. Software
 #: i18n/english/luasrc/i18n/admin-core.en.lua:35
-msgid "a_s_packages"
+msgid "Software"
 msgstr "Программное обеспечение"
 
 #. Admin Password
 #: i18n/english/luasrc/i18n/admin-core.en.lua:36
-msgid "a_s_changepw"
+msgid "Admin Password"
 msgstr "Пароль администратора"
 
 #. OPKG-Configuration
 #: i18n/english/luasrc/i18n/admin-core.en.lua:37
-msgid "a_s_p_ipkg"
+msgid "OPKG-Configuration"
 msgstr "<abbr title=\"Openmoko Package Management System\">OPKG</abbr>-Настройка"
 
 #. <abbr title=\"Secure Shell\">SSH</abbr>-Keys
 #: i18n/english/luasrc/i18n/admin-core.en.lua:38
-msgid "a_s_sshkeys"
+msgid "<abbr title=\"Secure Shell\">SSH</abbr>-Keys"
 msgstr "<abbr title=\"Secure Shell\">SSH</abbr>-Ключи"
 
 #. Mount Points
 #: i18n/english/luasrc/i18n/admin-core.en.lua:39
-msgid "a_s_fstab"
+msgid "Mount Points"
 msgstr "Дисковые разделы"
 
 #. Change settings related to the system itself, its identification, installed hard- and software, authentication or mount points.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:40
-msgid "a_s_i_system1"
+msgid "Change settings related to the system itself, its identification, installed hard- and software, authentication or mount points."
 msgstr ""
 "Изменение настроек системы связанных с самоидентификацией, устстанвкой "
 "аппаратно и/или програмного обеспечения, идентификацией или дисковыми "
@@ -243,12 +243,12 @@ msgstr ""
 
 #. These settings define the base of your system.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:41
-msgid "a_s_i_system2"
+msgid "These settings define the base of your system."
 msgstr "Эти настройки определяют основу вашей системы."
 
 #. Pay attention as any misconfiguration here may prevent your device from booting or may lock yourself out of it.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:42
-msgid "a_s_i_system3"
+msgid "Pay attention as any misconfiguration here may prevent your device from booting or may lock yourself out of it."
 msgstr ""
 "Необходимо тчательно отнестись к нижеследующим настройкам, в результате "
 "неправильной конфигурации которых вы можете потерять управление над системой "
@@ -256,502 +256,502 @@ msgstr ""
 
 #. Interfaces
 #: i18n/english/luasrc/i18n/admin-core.en.lua:43
-msgid "a_s_if"
+msgid "Interfaces"
 msgstr ""
 
 #. Bridge
 #: i18n/english/luasrc/i18n/admin-core.en.lua:44
-msgid "a_s_if_bridge"
+msgid "Bridge"
 msgstr "Мост"
 
 #. ID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:45
 #, fuzzy
-msgid "a_s_if_bridge_id"
+msgid "ID"
 msgstr "Мост"
 
 #. Bridge Port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:46
 #, fuzzy
-msgid "a_s_if_bridge_port"
+msgid "Bridge Port"
 msgstr "Мост"
 
 #. STP
 #: i18n/english/luasrc/i18n/admin-core.en.lua:47
 #, fuzzy
-msgid "a_s_if_bridge_stp"
+msgid "STP"
 msgstr "Мост"
 
 #. Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:48
-msgid "a_s_if_device"
+msgid "Device"
 msgstr ""
 
 #. Ethernet Bridge
 #: i18n/english/luasrc/i18n/admin-core.en.lua:49
 #, fuzzy
-msgid "a_s_if_ethbridge"
+msgid "Ethernet Bridge"
 msgstr "Мост"
 
 #. Ethernet Adapter
 #: i18n/english/luasrc/i18n/admin-core.en.lua:50
-msgid "a_s_if_ethdev"
+msgid "Ethernet Adapter"
 msgstr ""
 
 #. Ethernet Switch
 #: i18n/english/luasrc/i18n/admin-core.en.lua:51
-msgid "a_s_if_ethswitch"
+msgid "Ethernet Switch"
 msgstr ""
 
 #. Interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:52
-msgid "a_s_if_interface"
+msgid "Interface"
 msgstr ""
 
 #. IP Configuration
 #: i18n/english/luasrc/i18n/admin-core.en.lua:53
-msgid "a_s_if_ipconfig"
+msgid "IP Configuration"
 msgstr ""
 
 #. Alias
 #: i18n/english/luasrc/i18n/admin-core.en.lua:54
-msgid "a_s_if_ipconfig_alias"
+msgid "Alias"
 msgstr ""
 
 #. DHCP assigned
 #: i18n/english/luasrc/i18n/admin-core.en.lua:55
-msgid "a_s_if_ipconfig_dhcp"
+msgid "DHCP assigned"
 msgstr ""
 
 #. IPv6
 #: i18n/english/luasrc/i18n/admin-core.en.lua:56
-msgid "a_s_if_ipconfig_ipv6"
+msgid "IPv6"
 msgstr ""
 
 #. Not configured
 #: i18n/english/luasrc/i18n/admin-core.en.lua:57
-msgid "a_s_if_ipconfig_none"
+msgid "Not configured"
 msgstr ""
 
 #. Primary
 #: i18n/english/luasrc/i18n/admin-core.en.lua:58
-msgid "a_s_if_ipconfig_primary"
+msgid "Primary"
 msgstr ""
 
 #. Channel
 #: i18n/english/luasrc/i18n/admin-core.en.lua:59
-msgid "a_s_if_iwchannel"
+msgid "Channel"
 msgstr ""
 
 #. Mode
 #: i18n/english/luasrc/i18n/admin-core.en.lua:60
-msgid "a_s_if_iwmode"
+msgid "Mode"
 msgstr ""
 
 #. Ad-Hoc
 #: i18n/english/luasrc/i18n/admin-core.en.lua:61
-msgid "a_s_if_iwmode_adhoc"
+msgid "Ad-Hoc"
 msgstr ""
 
 #. Pseudo Ad-Hoc
 #: i18n/english/luasrc/i18n/admin-core.en.lua:62
-msgid "a_s_if_iwmode_ahdemo"
+msgid "Pseudo Ad-Hoc"
 msgstr ""
 
 #. Master
 #: i18n/english/luasrc/i18n/admin-core.en.lua:63
-msgid "a_s_if_iwmode_ap"
+msgid "Master"
 msgstr ""
 
 #. Master + WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:64
-msgid "a_s_if_iwmode_apwds"
+msgid "Master + WDS"
 msgstr ""
 
 #. Client
 #: i18n/english/luasrc/i18n/admin-core.en.lua:65
-msgid "a_s_if_iwmode_sta"
+msgid "Client"
 msgstr ""
 
 #. Client + WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:66
-msgid "a_s_if_iwmode_stawds"
+msgid "Client + WDS"
 msgstr ""
 
 #. WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:67
-msgid "a_s_if_iwmode_wds"
+msgid "WDS"
 msgstr ""
 
 #. SSID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:68
-msgid "a_s_if_iwssid"
+msgid "SSID"
 msgstr ""
 
 #. MAC
 #: i18n/english/luasrc/i18n/admin-core.en.lua:69
-msgid "a_s_if_mac"
+msgid "MAC"
 msgstr ""
 
 #. Pkts.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:70
-msgid "a_s_if_pkts"
+msgid "Pkts."
 msgstr ""
 
 #. Interface Status
 #: i18n/english/luasrc/i18n/admin-core.en.lua:71
 #, fuzzy
-msgid "a_s_if_status"
+msgid "Interface Status"
 msgstr ""
 "Здесь вы можете найти информацию о текущей статистики системы вроде частоты "
 "процессора, использования памяти или сетевого интерфейса."
 
 #. Transfer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:72
-msgid "a_s_if_transfer"
+msgid "Transfer"
 msgstr ""
 
 #. RX
 #: i18n/english/luasrc/i18n/admin-core.en.lua:73
-msgid "a_s_if_transfer_rx"
+msgid "RX"
 msgstr ""
 
 #. TX
 #: i18n/english/luasrc/i18n/admin-core.en.lua:74
-msgid "a_s_if_transfer_tx"
+msgid "TX"
 msgstr ""
 
 #. Type
 #: i18n/english/luasrc/i18n/admin-core.en.lua:75
-msgid "a_s_if_type"
+msgid "Type"
 msgstr ""
 
 #. VLAN
 #: i18n/english/luasrc/i18n/admin-core.en.lua:76
-msgid "a_s_if_vlan"
+msgid "VLAN"
 msgstr ""
 
 #. Ports
 #: i18n/english/luasrc/i18n/admin-core.en.lua:77
-msgid "a_s_if_vlanports"
+msgid "Ports"
 msgstr ""
 
 #. Wireless Adapter
 #: i18n/english/luasrc/i18n/admin-core.en.lua:78
-msgid "a_s_if_wifidev"
+msgid "Wireless Adapter"
 msgstr ""
 
 #. Firewall
 #: i18n/english/luasrc/i18n/admin-core.en.lua:79
-msgid "a_s_ipt"
+msgid "Firewall"
 msgstr ""
 
 #. Actions
 #: i18n/english/luasrc/i18n/admin-core.en.lua:80
-msgid "a_s_ipt_actions"
+msgid "Actions"
 msgstr ""
 
 #. Traffic
 #: i18n/english/luasrc/i18n/admin-core.en.lua:81
-msgid "a_s_ipt_bytes"
+msgid "Traffic"
 msgstr ""
 
 #. Chain
 #: i18n/english/luasrc/i18n/admin-core.en.lua:82
-msgid "a_s_ipt_chain"
+msgid "Chain"
 msgstr ""
 
 #. Destination
 #: i18n/english/luasrc/i18n/admin-core.en.lua:83
-msgid "a_s_ipt_destination"
+msgid "Destination"
 msgstr ""
 
 #. Flags
 #: i18n/english/luasrc/i18n/admin-core.en.lua:84
-msgid "a_s_ipt_flags"
+msgid "Flags"
 msgstr ""
 
 #. In
 #: i18n/english/luasrc/i18n/admin-core.en.lua:85
-msgid "a_s_ipt_inputif"
+msgid "In"
 msgstr ""
 
 #. No chains in this table
 #: i18n/english/luasrc/i18n/admin-core.en.lua:86
-msgid "a_s_ipt_nochains"
+msgid "No chains in this table"
 msgstr ""
 
 #. No Rules in this chain
 #: i18n/english/luasrc/i18n/admin-core.en.lua:87
-msgid "a_s_ipt_norules"
+msgid "No Rules in this chain"
 msgstr ""
 
 #. Options
 #: i18n/english/luasrc/i18n/admin-core.en.lua:88
-msgid "a_s_ipt_options"
+msgid "Options"
 msgstr ""
 
 #. Out
 #: i18n/english/luasrc/i18n/admin-core.en.lua:89
-msgid "a_s_ipt_outputif"
+msgid "Out"
 msgstr ""
 
 #. Packets
 #: i18n/english/luasrc/i18n/admin-core.en.lua:90
-msgid "a_s_ipt_packets"
+msgid "Packets"
 msgstr ""
 
 #. Pkts.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:91
-msgid "a_s_ipt_pkts"
+msgid "Pkts."
 msgstr ""
 
 #. Policy
 #: i18n/english/luasrc/i18n/admin-core.en.lua:92
-msgid "a_s_ipt_policy"
+msgid "Policy"
 msgstr ""
 
 #. Prot.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:93
-msgid "a_s_ipt_prot"
+msgid "Prot."
 msgstr ""
 
 #. References
 #: i18n/english/luasrc/i18n/admin-core.en.lua:94
-msgid "a_s_ipt_references"
+msgid "References"
 msgstr ""
 
 #. Reset Counters
 #: i18n/english/luasrc/i18n/admin-core.en.lua:95
-msgid "a_s_ipt_reset"
+msgid "Reset Counters"
 msgstr ""
 
 #. Restart Firewall
 #: i18n/english/luasrc/i18n/admin-core.en.lua:96
-msgid "a_s_ipt_restart"
+msgid "Restart Firewall"
 msgstr ""
 
 #. #
 #: i18n/english/luasrc/i18n/admin-core.en.lua:97
-msgid "a_s_ipt_rulenum"
+msgid "#"
 msgstr ""
 
 #. Source
 #: i18n/english/luasrc/i18n/admin-core.en.lua:98
-msgid "a_s_ipt_source"
+msgid "Source"
 msgstr ""
 
 #. Firewall Status
 #: i18n/english/luasrc/i18n/admin-core.en.lua:99
 #, fuzzy
-msgid "a_s_ipt_status"
+msgid "Firewall Status"
 msgstr ""
 "Здесь вы можете найти информацию о текущей статистики системы вроде частоты "
 "процессора, использования памяти или сетевого интерфейса."
 
 #. Table
 #: i18n/english/luasrc/i18n/admin-core.en.lua:100
-msgid "a_s_ipt_table"
+msgid "Table"
 msgstr ""
 
 #. Target
 #: i18n/english/luasrc/i18n/admin-core.en.lua:101
-msgid "a_s_ipt_target"
+msgid "Target"
 msgstr ""
 
 #. Perform Actions
 #: i18n/english/luasrc/i18n/admin-core.en.lua:102
-msgid "a_s_packages_do"
+msgid "Perform Actions"
 msgstr "Принять изменения"
 
 #. Install
 #: i18n/english/luasrc/i18n/admin-core.en.lua:103
-msgid "a_s_packages_install"
+msgid "Install"
 msgstr "Установка"
 
 #. Download and install package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:104
-msgid "a_s_packages_installurl"
+msgid "Download and install package"
 msgstr "Загрузить и установить пакеты"
 
 #. Edit package lists and installation targets
 #: i18n/english/luasrc/i18n/admin-core.en.lua:105
-msgid "a_s_packages_ipkg"
+msgid "Edit package lists and installation targets"
 msgstr "Изменить листинг пакетов и путей установки"
 
 #. Package name
 #: i18n/english/luasrc/i18n/admin-core.en.lua:106
-msgid "a_s_packages_name"
+msgid "Package name"
 msgstr "Имя пакета"
 
 #. Remove
 #: i18n/english/luasrc/i18n/admin-core.en.lua:107
-msgid "a_s_packages_remove"
+msgid "Remove"
 msgstr "Удалить"
 
 #. Find package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:108
-msgid "a_s_packages_search"
+msgid "Find package"
 msgstr "Найти пакет"
 
 #. Package lists updated
 #: i18n/english/luasrc/i18n/admin-core.en.lua:109
-msgid "a_s_packages_update"
+msgid "Package lists updated"
 msgstr "Листинг пакетов обновлён"
 
 #. Update package lists
 #: i18n/english/luasrc/i18n/admin-core.en.lua:110
-msgid "a_s_packages_updatelist"
+msgid "Update package lists"
 msgstr "Обновить листинг пакетов"
 
 #. Upgrade installed packages
 #: i18n/english/luasrc/i18n/admin-core.en.lua:111
-msgid "a_s_packages_upgrade"
+msgid "Upgrade installed packages"
 msgstr "Заменить установленные пакеты"
 
 #. Could not set default destination
 #: i18n/english/luasrc/i18n/admin-core.en.lua:112
 #, fuzzy
-msgid "a_s_packages_code1"
+msgid "Could not set default destination"
 msgstr "Принять изменения"
 
 #. Error parsing config file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:113
 #, fuzzy
-msgid "a_s_packages_code2"
+msgid "Error parsing config file"
 msgstr "Принять изменения"
 
 #. Could not create temporary directory (ran out of space?)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:114
 #, fuzzy
-msgid "a_s_packages_code3"
+msgid "Could not create temporary directory (ran out of space?)"
 msgstr "Принять изменения"
 
 #. Could not get adminstrative lock (ran out of space?)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:115
 #, fuzzy
-msgid "a_s_packages_code4"
+msgid "Could not get adminstrative lock (ran out of space?)"
 msgstr "Принять изменения"
 
 #. Unsatisfied Dependencies
 #: i18n/english/luasrc/i18n/admin-core.en.lua:116
 #, fuzzy
-msgid "a_s_packages_code5"
+msgid "Unsatisfied Dependencies"
 msgstr "Принять изменения"
 
 #. Refused to remove essential package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:117
 #, fuzzy
-msgid "a_s_packages_code6"
+msgid "Refused to remove essential package"
 msgstr "Принять изменения"
 
 #. Package has dependents
 #: i18n/english/luasrc/i18n/admin-core.en.lua:118
 #, fuzzy
-msgid "a_s_packages_code7"
+msgid "Package has dependents"
 msgstr "Принять изменения"
 
 #. Package has no installation candidate (wrong name?)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:119
 #, fuzzy
-msgid "a_s_packages_code8"
+msgid "Package has no installation candidate (wrong name?)"
 msgstr "Принять изменения"
 
 #. Package has no available architecture 
 #: i18n/english/luasrc/i18n/admin-core.en.lua:120
 #, fuzzy
-msgid "a_s_packages_code9"
+msgid "Package has no available architecture "
 msgstr "Принять изменения"
 
 #. Package is not trusted
 #: i18n/english/luasrc/i18n/admin-core.en.lua:121
 #, fuzzy
-msgid "a_s_packages_code10"
+msgid "Package is not trusted"
 msgstr "Принять изменения"
 
 #. Error while downloading
 #: i18n/english/luasrc/i18n/admin-core.en.lua:122
 #, fuzzy
-msgid "a_s_packages_code11"
+msgid "Error while downloading"
 msgstr "Принять изменения"
 
 #. Conflicts with other packages
 #: i18n/english/luasrc/i18n/admin-core.en.lua:123
 #, fuzzy
-msgid "a_s_packages_code12"
+msgid "Conflicts with other packages"
 msgstr "Принять изменения"
 
 #. Package is already installed
 #: i18n/english/luasrc/i18n/admin-core.en.lua:124
 #, fuzzy
-msgid "a_s_packages_code13"
+msgid "Package is already installed"
 msgstr "Принять изменения"
 
 #. Package has unresolved dependencies
 #: i18n/english/luasrc/i18n/admin-core.en.lua:125
 #, fuzzy
-msgid "a_s_packages_code14"
+msgid "Package has unresolved dependencies"
 msgstr "Принять изменения"
 
 #. Refused to downgrade package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:126
 #, fuzzy
-msgid "a_s_packages_code15"
+msgid "Refused to downgrade package"
 msgstr "Принять изменения"
 
 #. Package manager ran out of space
 #: i18n/english/luasrc/i18n/admin-core.en.lua:127
 #, fuzzy
-msgid "a_s_packages_code16"
+msgid "Package manager ran out of space"
 msgstr "Принять изменения"
 
 #. Bad signature while verifiying package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:128
 #, fuzzy
-msgid "a_s_packages_code17"
+msgid "Bad signature while verifiying package"
 msgstr "Принять изменения"
 
 #. MD5 error while verifiying package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:129
 #, fuzzy
-msgid "a_s_packages_code18"
+msgid "MD5 error while verifiying package"
 msgstr "Принять изменения"
 
 #. Internal error occured
 #: i18n/english/luasrc/i18n/admin-core.en.lua:130
 #, fuzzy
-msgid "a_s_packages_code19"
+msgid "Internal error occured"
 msgstr "Принять изменения"
 
 #. Package lists
 #: i18n/english/luasrc/i18n/admin-core.en.lua:131
-msgid "a_s_p_ipkg_pkglists"
+msgid "Package lists"
 msgstr "Листинг пакетов"
 
 #. Installation targets
 #: i18n/english/luasrc/i18n/admin-core.en.lua:132
-msgid "a_s_p_ipkg_targets"
+msgid "Installation targets"
 msgstr "Путь установки"
 
 #. Change the password of the system administrator (User <code>root</code>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:133
-msgid "a_s_changepw1"
+msgid "Change the password of the system administrator (User <code>root</code>)"
 msgstr ""
 "Изменение пароля системного администратора (Пользователь <code>root</code>)"
 
 #. Password successfully changed
 #: i18n/english/luasrc/i18n/admin-core.en.lua:134
-msgid "a_s_changepw_changed"
+msgid "Password successfully changed"
 msgstr "Пароль успешно изменён"
 
 #. Error: Passwords do not match
 #: i18n/english/luasrc/i18n/admin-core.en.lua:135
-msgid "a_s_changepw_nomatch"
+msgid "Error: Passwords do not match"
 msgstr "Ошибка: Пароли не совпадают"
 
 #. Here you can paste public <abbr title=\"Secure Shell\">SSH</abbr>-Keys (one per line) for <abbr title=\"Secure Shell\">SSH</abbr> public-key authentication.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:136
-msgid "a_s_sshkeys1"
+msgid "Here you can paste public <abbr title=\"Secure Shell\">SSH</abbr>-Keys (one per line) for <abbr title=\"Secure Shell\">SSH</abbr> public-key authentication."
 msgstr ""
 "Здесь вы можете вставить публичный <abbr title=\"Secure "
 "Shell\">SSH</abbr>-Ключ для <abbr title=\"Secure Shell\">SSH</abbr> "
@@ -759,53 +759,53 @@ msgstr ""
 
 #. Mount Points
 #: i18n/english/luasrc/i18n/admin-core.en.lua:137
-msgid "a_s_fstab_mountpoints"
+msgid "Mount Points"
 msgstr "Точки монтирования"
 
 #. Mount Points define at which point a memory device will be attached to the filesystem
 #: i18n/english/luasrc/i18n/admin-core.en.lua:138
-msgid "a_s_fstab_mountpoints1"
+msgid "Mount Points define at which point a memory device will be attached to the filesystem"
 msgstr ""
 "Точки монтирования определяют к каком запоминающему устройству будет "
 "присоединена файловая система"
 
 #. Mounted file systems
 #: i18n/english/luasrc/i18n/admin-core.en.lua:139
-msgid "a_s_fstab_active"
+msgid "Mounted file systems"
 msgstr "Монтированные файловые системы&quot;"
 
 #. Used
 #: i18n/english/luasrc/i18n/admin-core.en.lua:140
-msgid "a_s_fstab_used"
+msgid "Used"
 msgstr "Использованно&quot;"
 
 #. Available
 #: i18n/english/luasrc/i18n/admin-core.en.lua:141
-msgid "a_s_fstab_avail"
+msgid "Available"
 msgstr "Доступно&quot;"
 
 #. Mount Point
 #: i18n/english/luasrc/i18n/admin-core.en.lua:142
-msgid "a_s_fstab_mountpoint"
+msgid "Mount Point"
 msgstr "Точка присоединения"
 
 #. The device file of the memory or partition (<abbr title=\"for example\">e.g.</abbr> <code>/dev/sda1</code>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:143
-msgid "a_s_fstab_device1"
+msgid "The device file of the memory or partition (<abbr title=\"for example\">e.g.</abbr> <code>/dev/sda1</code>)"
 msgstr ""
 "Устройство или раздел (<abbr title=\"for example\">пример</abbr> "
 "<code>/dev/sda1</code>)"
 
 #. The filesystem that was used to format the memory (<abbr title=\"for example\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></samp>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:144
-msgid "a_s_fstab_fs1"
+msgid "The filesystem that was used to format the memory (<abbr title=\"for example\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></samp>)"
 msgstr ""
 "Формат файловой системы (<abbr title=\"for example\">пример</abbr> <samp><abbr "
 "title=\"Third Extended Filesystem\">ext3</abbr></samp>)"
 
 #. If your physical memory is insufficient unused data can be temporarily swapped to a swap-device resulting in a higher amount of usable <abbr title=\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very slow process as the swap-device cannot be accessed with the high datarates of the <abbr title=\"Random Access Memory\">RAM</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:145
-msgid "a_s_fstab_swap1"
+msgid "If your physical memory is insufficient unused data can be temporarily swapped to a swap-device resulting in a higher amount of usable <abbr title=\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very slow process as the swap-device cannot be accessed with the high datarates of the <abbr title=\"Random Access Memory\">RAM</abbr>."
 msgstr ""
 "Если физической <abbr title=\"Random Access Memory\">RAM</abbr> не хватает "
 "можно воспользоваться временным хранением данных в файле-подкачке. В "
@@ -817,87 +817,87 @@ msgstr ""
 
 #. Reboots the operating system of your device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:146
-msgid "a_s_reboot1"
+msgid "Reboots the operating system of your device"
 msgstr "Сразу произойдёт перезагрузка вашей системы"
 
 #. Perform reboot
 #: i18n/english/luasrc/i18n/admin-core.en.lua:147
-msgid "a_s_reboot_do"
+msgid "Perform reboot"
 msgstr "Выполнить перезагрузку"
 
 #. Please wait: Device rebooting...
 #: i18n/english/luasrc/i18n/admin-core.en.lua:148
-msgid "a_s_reboot_running"
+msgid "Please wait: Device rebooting..."
 msgstr "Позалуйста подождите: Устройство перезагружается..."
 
 #. Warning: There are unsaved changes that will be lost while rebooting!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:149
-msgid "a_s_reboot_u"
+msgid "Warning: There are unsaved changes that will be lost while rebooting!"
 msgstr ""
 "Внимание: Есть несохранённые изменения которые потеряются после "
 "перезагрузки!"
 
 #. Changes applied.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:150
-msgid "a_s_applyreboot1"
+msgid "Changes applied."
 msgstr "Изменения приняты."
 
 #. Backup / Restore
 #: i18n/english/luasrc/i18n/admin-core.en.lua:151
-msgid "a_s_backup"
+msgid "Backup / Restore"
 msgstr "Резервирование / Восстановление"
 
 #. Create backup
 #: i18n/english/luasrc/i18n/admin-core.en.lua:152
-msgid "a_s_backup_backup"
+msgid "Create backup"
 msgstr "Создать резервную копию"
 
 #. Backup Archive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:153
-msgid "a_s_backup_archive"
+msgid "Backup Archive"
 msgstr "Архив восстановления"
 
 #. Reset router to defaults
 #: i18n/english/luasrc/i18n/admin-core.en.lua:154
-msgid "a_s_backup_reset"
+msgid "Reset router to defaults"
 msgstr "Сбросить роутер к настройкам по умолчанию"
 
 #. Proceed reverting all settings and resetting to firmware defaults?
 #: i18n/english/luasrc/i18n/admin-core.en.lua:155
-msgid "a_s_backup_reset1"
+msgid "Proceed reverting all settings and resetting to firmware defaults?"
 msgstr ""
 "Перейти к возврашению всех настроек и установить настройки по умолчанию?"
 
 #. Restore backup
 #: i18n/english/luasrc/i18n/admin-core.en.lua:156
-msgid "a_s_backup_restore"
+msgid "Restore backup"
 msgstr "Восстановить резервную копию"
 
 #. Here you can backup and restore your router configuration and - if possible - reset the router to the default settings.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:157
-msgid "a_s_backup1"
+msgid "Here you can backup and restore your router configuration and - if possible - reset the router to the default settings."
 msgstr ""
 "Здесь вы можете сделать резевную копию и воссановить конфигурацию вашего "
 "роутера, если это возможно, или установить настройки по умолчанию."
 
 #. <abbr title=\"Hypertext Transfer Protocol\">HTTP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:158
-msgid "a_srv_http"
+msgid "<abbr title=\"Hypertext Transfer Protocol\">HTTP</abbr>-Server"
 msgstr "<abbr title=\"Hypertext Transfer Protocol\">HTTP</abbr>-Сервер"
 
 #. <abbr title=\"Secure Shell\">SSH</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:159
-msgid "a_srv_ssh"
+msgid "<abbr title=\"Secure Shell\">SSH</abbr>-Server"
 msgstr "<abbr title=\"Secure Shell\">SSH</abbr>-Сервер"
 
 #. Services and daemons perform certain tasks on your device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:160
-msgid "a_srv_services1"
+msgid "Services and daemons perform certain tasks on your device."
 msgstr "Сервисы и демоны выполняющие определённые задачи на устройствах."
 
 #. Most of them are network servers, that offer a certain service for your device or network like shell access, serving webpages like <abbr title=\"Lua Configuration Interface\">LuCI</abbr>, doing mesh routing, sending e-mails, ...
 #: i18n/english/luasrc/i18n/admin-core.en.lua:161
-msgid "a_srv_services2"
+msgid "Most of them are network servers, that offer a certain service for your device or network like shell access, serving webpages like <abbr title=\"Lua Configuration Interface\">LuCI</abbr>, doing mesh routing, sending e-mails, ..."
 msgstr ""
 "Большинство из них сетевые серверы, которые выполняют определённые задачи "
 "для ваших устройств или сетей наподобие shell-доступа, web-страниц таких как "
@@ -906,84 +906,84 @@ msgstr ""
 
 #. A small webserver which can be used to serve <abbr title=\"Lua Configuration Interface\">LuCI</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:162
-msgid "a_srv_http1"
+msgid "A small webserver which can be used to serve <abbr title=\"Lua Configuration Interface\">LuCI</abbr>."
 msgstr ""
 "Маленький веб-сервер, служащий для предоставления <abbr title=\"Lua "
 "Configuration Interface\">LuCI</abbr>."
 
 #. Authentication Realm
 #: i18n/english/luasrc/i18n/admin-core.en.lua:163
-msgid "a_srv_http_authrealm"
+msgid "Authentication Realm"
 msgstr "Аутентификационная область"
 
 #. The realm which will be displayed at the authentication prompt for protected pages.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:164
-msgid "a_srv_http_authrealm1"
+msgid "The realm which will be displayed at the authentication prompt for protected pages."
 msgstr "Что будет показано при авторизации на защищённых страницах."
 
 #. defaults to <code>/etc/httpd.conf</code>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:165
-msgid "a_srv_http_config1"
+msgid "defaults to <code>/etc/httpd.conf</code>"
 msgstr "по умолчанию <code>/etc/httpd.conf</code>"
 
 #. Document root
 #: i18n/english/luasrc/i18n/admin-core.en.lua:166
-msgid "a_srv_http_root"
+msgid "Document root"
 msgstr "Корневая папка"
 
 #. Enable Keep-Alive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:167
-msgid "a_srv_http_keepalive"
+msgid "Enable Keep-Alive"
 msgstr ""
 
 #. Connection timeout
 #: i18n/english/luasrc/i18n/admin-core.en.lua:168
-msgid "a_srv_http_timeout"
+msgid "Connection timeout"
 msgstr ""
 
 #. Plugin path
 #: i18n/english/luasrc/i18n/admin-core.en.lua:169
-msgid "a_srv_http_path"
+msgid "Plugin path"
 msgstr ""
 
 #. A lightweight HTTP/1.1 webserver written in C and Lua designed to serve LuCI
 #: i18n/english/luasrc/i18n/admin-core.en.lua:170
-msgid "a_srv_lucittpd"
+msgid "A lightweight HTTP/1.1 webserver written in C and Lua designed to serve LuCI"
 msgstr ""
 
 #. Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:171
-msgid "a_srv_dropbear1"
+msgid "Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
 msgstr ""
 "Dropbear это <abbr title=\"Secure Shell\">SSH</abbr>-сервер со встроенным "
 "<abbr title=\"Secure Copy\">SCP</abbr>"
 
 #. Password authentication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:172
-msgid "a_srv_d_pwauth"
+msgid "Password authentication"
 msgstr "Аутентификация по паролю"
 
 #. Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:173
-msgid "a_srv_d_pwauth1"
+msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
 msgstr ""
 "Разрешить <abbr title=\"Secure Shell\">SSH</abbr> аутентификацию по паролю"
 
 #. Channel
 #: i18n/english/luasrc/i18n/admin-core.en.lua:174
-msgid "a_w_channel"
+msgid "Channel"
 msgstr "Канал"
 
 #. On this pages you can find configuration options for <abbr title=\"Wireless Local Area Network\">WLAN</abbr> based wireless networks.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:175
-msgid "a_w_wifi1"
+msgid "On this pages you can find configuration options for <abbr title=\"Wireless Local Area Network\">WLAN</abbr> based wireless networks."
 msgstr ""
 "На этой страничке можно настроить <abbr title=\"Wireless Local Area "
 "Network\">WLAN</abbr> основанную на беспроводных сетях."
 
 #. You can easily integrate your 802.11a/b/g/n-devices into your physical network and use the virtual adapter support to build wireless repeaters or offer several networks with one device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:176
-msgid "a_w_wifi2"
+msgid "You can easily integrate your 802.11a/b/g/n-devices into your physical network and use the virtual adapter support to build wireless repeaters or offer several networks with one device."
 msgstr ""
 "Вы можете легко интегрировать ваши 802.11a/b/g/n-устройства в вашу "
 "физическую сеть и использовать виртуальные стройства для построения "
@@ -992,7 +992,7 @@ msgstr ""
 
 #. There is support for Managed, Client, Ad-Hoc and <abbr title=\"Wireless Distribution System\">WDS</abbr> operating modes as well as <abbr title=\"Wi-Fi Protected Access\">WPA</abbr> and <abbr title=\"Wi-Fi Protected Access 2\">WPA2</abbr> encryption for secure communnication.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:177
-msgid "a_w_wifi3"
+msgid "There is support for Managed, Client, Ad-Hoc and <abbr title=\"Wireless Distribution System\">WDS</abbr> operating modes as well as <abbr title=\"Wi-Fi Protected Access\">WPA</abbr> and <abbr title=\"Wi-Fi Protected Access 2\">WPA2</abbr> encryption for secure communnication."
 msgstr ""
 "Поддерживаемые режимы: Точка, Клиент, Ad-Hoc и <abbr title=\"Wireless "
 "Distribution System\">WDS</abbr>, а так же <abbr title=\"Wi-Fi Protected "
@@ -1001,42 +1001,42 @@ msgstr ""
 
 #. Here you can configure installed wifi devices.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:178
-msgid "a_w_devices1"
+msgid "Here you can configure installed wifi devices."
 msgstr "Здесь вы можете настроить установленные Wi-Fi устройства."
 
 #. Transmit Antenna
 #: i18n/english/luasrc/i18n/admin-core.en.lua:179
-msgid "a_w_txantenna"
+msgid "Transmit Antenna"
 msgstr "Передающая антенна"
 
 #. Receive Antenna
 #: i18n/english/luasrc/i18n/admin-core.en.lua:180
-msgid "a_w_rxantenna"
+msgid "Receive Antenna"
 msgstr "Принимающая антенна"
 
 #. Distance to furthest station (in meter)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:181
-msgid "a_w_distance1"
+msgid "Distance to furthest station (in meter)"
 msgstr "Дистанция до самой дальней станции (в метрах)"
 
 #. Diversity
 #: i18n/english/luasrc/i18n/admin-core.en.lua:182
-msgid "a_w_diversity"
+msgid "Diversity"
 msgstr "Разновидность антенн"
 
 #. Country Code
 #: i18n/english/luasrc/i18n/admin-core.en.lua:183
-msgid "a_w_countrycode"
+msgid "Country Code"
 msgstr "Код страны"
 
 #. Connection Limit
 #: i18n/english/luasrc/i18n/admin-core.en.lua:184
-msgid "a_w_connlimit"
+msgid "Connection Limit"
 msgstr "Ограничение соединений"
 
 #. You can run several wifi networks with one device. Be aware that there are certain hardware and driverspecific restrictions. Normally you can operate 1 Ad-Hoc or up to 3 Master-Mode and 1 Client-Mode network simultaneously.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:185
-msgid "a_w_networks1"
+msgid "You can run several wifi networks with one device. Be aware that there are certain hardware and driverspecific restrictions. Normally you can operate 1 Ad-Hoc or up to 3 Master-Mode and 1 Client-Mode network simultaneously."
 msgstr ""
 "Вы можете настраивать различные wifi сети на одном устройстве. Помните что "
 "есть определённые програмные и аппаратные ограничения. Нормально вы можете "
@@ -1044,93 +1044,93 @@ msgstr ""
 
 #. Network Name (<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:186
-msgid "a_w_netid"
+msgid "Network Name (<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>)"
 msgstr ""
 "Название сети (<abbr title=\"Расширенный идентификатор сети\">ESSID</abbr>)"
 
 #. Add the Wifi network to physical network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:187
-msgid "a_w_network1"
+msgid "Add the Wifi network to physical network"
 msgstr "Добавить Wifi сеть в физическую сеть"
 
 #.  - Create new Network - 
 #: i18n/english/luasrc/i18n/admin-core.en.lua:188
-msgid "a_w_netmanual"
+msgid " - Create new Network - "
 msgstr ""
 
 #. Transmit Power
 #: i18n/english/luasrc/i18n/admin-core.en.lua:189
-msgid "a_w_txpwr"
+msgid "Transmit Power"
 msgstr "Мощьность передатчика"
 
 #. Broadcom Frameburst
 #: i18n/english/luasrc/i18n/admin-core.en.lua:190
-msgid "a_w_brcmburst"
+msgid "Broadcom Frameburst"
 msgstr "Broadcom Frameburst"
 
 #. Atheros Frameburst
 #: i18n/english/luasrc/i18n/admin-core.en.lua:191
-msgid "a_w_athburst"
+msgid "Atheros Frameburst"
 msgstr "Atheros Frameburst"
 
 #. RadiusServer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:192
-msgid "a_w_radiussrv"
+msgid "RadiusServer"
 msgstr "RadiusServer"
 
 #. Radius-Port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:193
-msgid "a_w_radiusport"
+msgid "Radius-Port"
 msgstr "Radius-Port"
 
 #. AP-Isolation
 #: i18n/english/luasrc/i18n/admin-core.en.lua:194
-msgid "a_w_apisolation"
+msgid "AP-Isolation"
 msgstr "AP-Isolation"
 
 #. Prevents Client to Client communication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:195
-msgid "a_w_apisolation1"
+msgid "Prevents Client to Client communication"
 msgstr "Не позволяет клиентам обмениваться друг с другом информацией"
 
 #. Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:196
-msgid "a_w_hideessid"
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "Скрыть <abbr title=\"Расширенный идентификатор сети\">ESSID</abbr>"
 
 #. Access Point
 #: i18n/english/luasrc/i18n/admin-core.en.lua:197
-msgid "a_w_ap"
+msgid "Access Point"
 msgstr "Точка доступа"
 
 #. Ad-Hoc
 #: i18n/english/luasrc/i18n/admin-core.en.lua:198
-msgid "a_w_adhoc"
+msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
 #. Pseudo Ad-Hoc (ahdemo)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:199
-msgid "a_w_ahdemo"
+msgid "Pseudo Ad-Hoc (ahdemo)"
 msgstr "Псевдо Ad-Hoc (ahdemo)"
 
 #. Client
 #: i18n/english/luasrc/i18n/admin-core.en.lua:200
-msgid "a_w_client"
+msgid "Client"
 msgstr "Клиент"
 
 #. WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:201
-msgid "a_w_wds"
+msgid "WDS"
 msgstr "WDS"
 
 #. Monitor
 #: i18n/english/luasrc/i18n/admin-core.en.lua:202
-msgid "a_w_monitor"
+msgid "Monitor"
 msgstr "Monitor"
 
 #. Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> firewalls
 #: i18n/english/luasrc/i18n/admin-core.en.lua:203
-msgid "dhcp_dnsmasq_desc"
+msgid "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> firewalls"
 msgstr ""
 "Dnsmasq содержит в себе <abbr title=\"Протокол динамической конфигурации "
 "узла\">DHCP</abbr>-Сервер и <abbr title=\"Служба доменных "
@@ -1139,249 +1139,249 @@ msgstr ""
 
 #. Domain required
 #: i18n/english/luasrc/i18n/admin-core.en.lua:204
-msgid "dhcp_dnsmasq_domainneeded"
+msgid "Domain required"
 msgstr "Domain required"
 
 #. Don&#39;t forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without <abbr title=\"Domain Name System\">DNS</abbr>-Name
 #: i18n/english/luasrc/i18n/admin-core.en.lua:205
-msgid "dhcp_dnsmasq_domainneeded_desc"
+msgid "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without <abbr title=\"Domain Name System\">DNS</abbr>-Name"
 msgstr ""
 "Не форвардить <abbr title=\"Служба доменных имён\">DNS</abbr>-запросы без "
 "<abbr title=\"Служба доменных имён\">DNS</abbr>-имени"
 
 #. Authoritative
 #: i18n/english/luasrc/i18n/admin-core.en.lua:206
-msgid "dhcp_dnsmasq_authoritative"
+msgid "Authoritative"
 msgstr "Authoritative"
 
 #. This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> in the local network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:207
-msgid "dhcp_dnsmasq_authoritative_desc"
+msgid "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> in the local network"
 msgstr ""
 "Только <abbr title=\"Протокол динамической конфигурации узла\">DHCP</abbr> в "
 "локальной сети"
 
 #. Filter private
 #: i18n/english/luasrc/i18n/admin-core.en.lua:208
-msgid "dhcp_dnsmasq_boguspriv"
+msgid "Filter private"
 msgstr "Filter private"
 
 #. Don&#39;t forward reverse lookups for local networks
 #: i18n/english/luasrc/i18n/admin-core.en.lua:209
-msgid "dhcp_dnsmasq_boguspriv_desc"
+msgid "Don't forward reverse lookups for local networks"
 msgstr "не форвардить реверсные-днс запросы для локальной сети"
 
 #. Filter useless
 #: i18n/english/luasrc/i18n/admin-core.en.lua:210
-msgid "dhcp_dnsmasq_filterwin2k"
+msgid "Filter useless"
 msgstr "Filter useless"
 
 #. filter useless <abbr title=\"Domain Name System\">DNS</abbr>-queries of Windows-systems
 #: i18n/english/luasrc/i18n/admin-core.en.lua:211
-msgid "dhcp_dnsmasq_filterwin2k_desc"
+msgid "filter useless <abbr title=\"Domain Name System\">DNS</abbr>-queries of Windows-systems"
 msgstr ""
 "фильтровать ненужные <abbr title=\"Служба доменных имён\">DNS</abbr>-запросы "
 "Windows-систем"
 
 #. Localise queries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:212
-msgid "dhcp_dnsmasq_localisequeries"
+msgid "Localise queries"
 msgstr "Localise queries"
 
 #. localises the hostname depending on its subnet
 #: i18n/english/luasrc/i18n/admin-core.en.lua:213
-msgid "dhcp_dnsmasq_localisequeries_desc"
+msgid "localises the hostname depending on its subnet"
 msgstr "локализировать имя хоста относящегося к данной подсети"
 
 #. Local Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:214
-msgid "dhcp_dnsmasq_local"
+msgid "Local Server"
 msgstr "Локальный сервер"
 
 #. Local Domain
 #: i18n/english/luasrc/i18n/admin-core.en.lua:215
-msgid "dhcp_dnsmasq_domain"
+msgid "Local Domain"
 msgstr "Локальный домен"
 
 #. Expand Hosts
 #: i18n/english/luasrc/i18n/admin-core.en.lua:216
-msgid "dhcp_dnsmasq_expandhosts"
+msgid "Expand Hosts"
 msgstr "Expand Hosts"
 
 #. adds domain names to hostentries in the resolv file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:217
-msgid "dhcp_dnsmasq_expandhosts_desc"
+msgid "adds domain names to hostentries in the resolv file"
 msgstr "Добавлять доменные имена в хосты"
 
 #. don&#39;t cache unknown
 #: i18n/english/luasrc/i18n/admin-core.en.lua:218
-msgid "dhcp_dnsmasq_nonegcache"
+msgid "don't cache unknown"
 msgstr "Don&#39;t cache unknown"
 
 #. prevents caching of negative <abbr title=\"Domain Name System\">DNS</abbr>-replies
 #: i18n/english/luasrc/i18n/admin-core.en.lua:219
-msgid "dhcp_dnsmasq_nonegcache_desc"
+msgid "prevents caching of negative <abbr title=\"Domain Name System\">DNS</abbr>-replies"
 msgstr ""
 "Запрещать кешировать негативные <abbr title=\"Служба доменных "
 "имён\">DNS</abbr>-ответы"
 
 #. Use <code>/etc/ethers</code>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:220
-msgid "dhcp_dnsmasq_readethers"
+msgid "Use <code>/etc/ethers</code>"
 msgstr "Use <code>/etc/ethers</code>"
 
 #. Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:221
-msgid "dhcp_dnsmasq_readethers_desc"
+msgid "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server"
 msgstr ""
 "Читать <code>/etc/ethers</code> для настройки <abbr title=\"Протокол "
 "динамической конфигурации узла\">DHCP</abbr>-Сервера"
 
 #. Leasefile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:222
-msgid "dhcp_dnsmasq_leasefile"
+msgid "Leasefile"
 msgstr "Leasefile"
 
 #. file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-leases will be stored
 #: i18n/english/luasrc/i18n/admin-core.en.lua:223
-msgid "dhcp_dnsmasq_leasefile_desc"
+msgid "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-leases will be stored"
 msgstr ""
 "файл где выданные <abbr title=\"Протокол динамической конфигурации "
 "узла\">DHCP</abbr>-leases хранятся"
 
 #. Resolvfile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:224
-msgid "dhcp_dnsmasq_resolvfile"
+msgid "Resolvfile"
 msgstr "Resolvfile"
 
 #. local <abbr title=\"Domain Name System\">DNS</abbr> file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:225
-msgid "dhcp_dnsmasq_resolvfile_desc"
+msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "Локальный <abbr title=\"Служба доменных имён\">DNS</abbr> файл"
 
 #. Ignore <code>/etc/hosts</code>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:226
-msgid "dhcp_dnsmasq_nohosts"
+msgid "Ignore <code>/etc/hosts</code>"
 msgstr "Ignore <code>/etc/hosts</code>"
 
 #. Strict order
 #: i18n/english/luasrc/i18n/admin-core.en.lua:227
-msgid "dhcp_dnsmasq_strictorder"
+msgid "Strict order"
 msgstr "Strict order"
 
 #. <abbr title=\"Domain Name System\">DNS</abbr>-Server will be queried in the order of the resolvfile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:228
-msgid "dhcp_dnsmasq_strictorder_desc"
+msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Server will be queried in the order of the resolvfile"
 msgstr ""
 "<abbr title=\"Служба доменных имён\">DNS</abbr>-Сервер будет обращаться к "
 "resolvfile"
 
 #. Log queries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:229
-msgid "dhcp_dnsmasq_logqueries"
+msgid "Log queries"
 msgstr "Log queries"
 
 #. Ignore resolve file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:230
-msgid "dhcp_dnsmasq_noresolv"
+msgid "Ignore resolve file"
 msgstr "Ignore resolvfile"
 
 #. concurrent queries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:231
-msgid "dhcp_dnsmasq_dnsforwardmax"
+msgid "concurrent queries"
 msgstr "concurrent queries"
 
 #. <abbr title=\"Domain Name System\">DNS</abbr>-Port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:232
-msgid "dhcp_dnsmasq_port"
+msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Port"
 msgstr "<abbr title=\"Служба доменных имён\">DNS</abbr>-Port"
 
 #. <abbr title=\"maximal\">max.</abbr> <abbr title=\"Extension Mechanisms for Domain Name System\">EDNS0</abbr> paket size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:233
-msgid "dhcp_dnsmasq_ednspacket_max"
+msgid "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Extension Mechanisms for Domain Name System\">EDNS0</abbr> paket size"
 msgstr ""
 "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Расширенный механизм службы "
 "доменных имён\">EDNS0</abbr> размер пакета"
 
 #. <abbr title=\"maximal\">max.</abbr> <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:234
-msgid "dhcp_dnsmasq_dhcpleasemax"
+msgid "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Leases"
 msgstr ""
 "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Протокол динамической "
 "конфигурации узла\">DHCP</abbr>-Leases"
 
 #. additional hostfile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:235
-msgid "dhcp_dnsmasq_addnhosts"
+msgid "additional hostfile"
 msgstr "дополнительный hostfile"
 
 #. query port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:236
-msgid "dhcp_dnsmasq_queryport"
+msgid "query port"
 msgstr "порт запросов"
 
 #. Enable TFTP-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:237
-msgid "dhcp_dnsmasq_enabletftp"
+msgid "Enable TFTP-Server"
 msgstr ""
 
 #. TFTP-Server Root
 #: i18n/english/luasrc/i18n/admin-core.en.lua:238
 #, fuzzy
-msgid "dhcp_dnsmasq_tftproot"
+msgid "TFTP-Server Root"
 msgstr "<abbr title=\"Служба доменных имён\">DNS</abbr>-Port"
 
 #. Network Boot Image
 #: i18n/english/luasrc/i18n/admin-core.en.lua:239
 #, fuzzy
-msgid "dhcp_dnsmasq_dhcpboot"
+msgid "Network Boot Image"
 msgstr "<abbr title=\"Служба доменных имён\">DNS</abbr>-Port"
 
 #. Switch
 #: i18n/english/luasrc/i18n/admin-core.en.lua:240
-msgid "a_n_switch"
+msgid "Switch"
 msgstr "Свитч"
 
 #. Active Connections
 #: i18n/english/luasrc/i18n/admin-core.en.lua:241
-msgid "a_n_conntrack"
+msgid "Active Connections"
 msgstr ""
 
 #. This page gives an overview over currently active network connections.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:242
-msgid "a_n_conntrack_desc"
+msgid "This page gives an overview over currently active network connections."
 msgstr ""
 
 #. Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:243
-msgid "a_n_routes"
+msgid "Routes"
 msgstr "Маршрутизация"
 
 #. IPv4 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:244
-msgid "a_n_routes4"
+msgid "IPv4 Routes"
 msgstr "Маршрутизация IPv4"
 
 #. IPv6 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:245
-msgid "a_n_routes6"
+msgid "IPv6 Routes"
 msgstr "Маршрутизация IPv6"
 
 #. In this area you find all network-related settings.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:246
-msgid "a_network1"
+msgid "In this area you find all network-related settings."
 msgstr "В этом разделе вы сможете найти всё что касается настроек сети."
 
 #. On most routers the network switch can be freely configured and splitted up into several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:247
-msgid "a_network2"
+msgid "On most routers the network switch can be freely configured and splitted up into several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s."
 msgstr ""
 "В большенстве роутеров сетевой свитч может быть свободно настроен и добавлен "
 "в различные <abbr title=\"Виртуальные локальные сети\">VLAN</abbr>&#39;ы."
 
 #. Interfaces and <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> / <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Settings allow a custom organisation of the network and connections to other networks like the internet.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:248
-msgid "a_network3"
+msgid "Interfaces and <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> / <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Settings allow a custom organisation of the network and connections to other networks like the internet."
 msgstr ""
 "Настройка <abbr title=\"протокол передачи кадров PPP через "
 "Ethernet\">PPPoE</abbr> / <abbr title=\"протокол передачи кадров PPP через "
@@ -1390,7 +1390,7 @@ msgstr ""
 
 #. With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> devices in your local network can be automatically configured for network communication.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:249
-msgid "a_network4"
+msgid "With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> devices in your local network can be automatically configured for network communication."
 msgstr ""
 "C <abbr title=\"Протокол динамической конфигурации узла\">DHCP</abbr> "
 "устройства находящиеся в вашей сети могут автоматически <abbr "
@@ -1398,14 +1398,14 @@ msgstr ""
 
 #. Firewall and portforwarding can be used to secure your network while providing services to external networks.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:250
-msgid "a_network5"
+msgid "Firewall and portforwarding can be used to secure your network while providing services to external networks."
 msgstr ""
 "Файрволл и проброс портов используется для увеличения надёжность и гибкости "
 "вашей сети."
 
 #. The network ports on your router can be combined to several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s in which computers can communicate directly with each other. <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s are often used to separate different network segments. Often there is by default one Uplink port for a connection to the next greater network like the internet and other ports for a local network.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:251
-msgid "a_n_switch1"
+msgid "The network ports on your router can be combined to several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s in which computers can communicate directly with each other. <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s are often used to separate different network segments. Often there is by default one Uplink port for a connection to the next greater network like the internet and other ports for a local network."
 msgstr ""
 "Сетевые порты на вашем роутере могут маршрутизироваться в различные <abbr "
 "title=\"Виртуальные локальные сети\">VLAN</abbr>&#39;ы и соединять компютеры "
@@ -1414,7 +1414,7 @@ msgstr ""
 
 #. Ports belonging to a <abbr title=\"Virtual Local Area Network\">VLAN</abbr> are separated with spaces. The port with the highest number (usually 5) is oftern the connection to the internal network interface of the router. On devices with 5 ports often the one with the lowest number (0) is the predefined Uplink port.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:252
-msgid "network_switch_desc"
+msgid "Ports belonging to a <abbr title=\"Virtual Local Area Network\">VLAN</abbr> are separated with spaces. The port with the highest number (usually 5) is oftern the connection to the internal network interface of the router. On devices with 5 ports often the one with the lowest number (0) is the predefined Uplink port."
 msgstr ""
 "Порты принадлежашие <abbr title=\"Виртуальные локальные "
 "сети\">VLAN</abbr>&#39;ам разделяются пробелами. Порт с наибольшим значением "
@@ -1423,7 +1423,7 @@ msgstr ""
 
 #. On this page you can configure the network interfaces. You can bridge several interfaces by ticking the &quot;bridge interfaces&quot; field and enter the names of several network interfaces separated by spaces. You can also use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation <samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: <samp>eth0.1</samp>).
 #: i18n/english/luasrc/i18n/admin-core.en.lua:253
-msgid "a_n_ifaces1"
+msgid "On this page you can configure the network interfaces. You can bridge several interfaces by ticking the \"bridge interfaces\" field and enter the names of several network interfaces separated by spaces. You can also use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation <samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: <samp>eth0.1</samp>)."
 msgstr ""
 "На этой страничке вы можете сконфигурировать сетевые интерфейсы. Вы можете "
 "соединять различные интерфейсы в &quot;мост&quot; помечая их как "
@@ -1435,17 +1435,17 @@ msgstr ""
 
 #. Bridge interfaces
 #: i18n/english/luasrc/i18n/admin-core.en.lua:254
-msgid "a_n_i_bridge"
+msgid "Bridge interfaces"
 msgstr "Мост"
 
 #. creates a bridge over specified interface(s)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:255
-msgid "a_n_i_bridge1"
+msgid "creates a bridge over specified interface(s)"
 msgstr "создаёт мост для выбранных сетевых интерфейсов"
 
 #. With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> network members can automatically receive their network settings (<abbr title=\"Internet Protocol\">IP</abbr>-address, netmask, <abbr title=\"Domain Name System\">DNS</abbr>-server, ...).
 #: i18n/english/luasrc/i18n/admin-core.en.lua:256
-msgid "dhcp_desc"
+msgid "With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> network members can automatically receive their network settings (<abbr title=\"Internet Protocol\">IP</abbr>-address, netmask, <abbr title=\"Domain Name System\">DNS</abbr>-server, ...)."
 msgstr ""
 "С помощью <abbr title=\"Протокол динамической конфигурации узла\">DHCP</abbr> "
 "члены сетей могут автоматически получить такие настройки как (<abbr "
@@ -1454,80 +1454,80 @@ msgstr ""
 
 #. Leasetime
 #: i18n/english/luasrc/i18n/admin-core.en.lua:257
-msgid "dhcp_dhcp_leasetime"
+msgid "Leasetime"
 msgstr "Leasetime"
 
 #. Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:258
-msgid "dhcp_dhcp_dynamicdhcp"
+msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 msgstr ""
 "Dynamic <abbr title=\"Протокол динамической конфигурации узла\">DHCP</abbr>"
 
 #. Ignore interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:259
-msgid "dhcp_dhcp_ignore"
+msgid "Ignore interface"
 msgstr "Ignore interface"
 
 #. disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for this interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:260
-msgid "dhcp_dhcp_ignore_desc"
+msgid "disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for this interface"
 msgstr ""
 "отключить <abbr title=\"Протокол динамической конфигурации узла\">DHCP</abbr> "
 "для данного интерфейса"
 
 #. Force
 #: i18n/english/luasrc/i18n/admin-core.en.lua:261
-msgid "dhcp_dhcp_force"
+msgid "Force"
 msgstr "Force"
 
 #. first address (last octet)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:262
-msgid "dhcp_dhcp_start_desc"
+msgid "first address (last octet)"
 msgstr "первый адрес (последний октет)"
 
 #. number of leased addresses -1
 #: i18n/english/luasrc/i18n/admin-core.en.lua:263
-msgid "dhcp_dhcp_limit_desc"
+msgid "number of leased addresses -1"
 msgstr "количество арендованных адресов -1"
 
 #. DHCP-Options
 #: i18n/english/luasrc/i18n/admin-core.en.lua:264
-msgid "dhcp_dhcp_dhcpoption"
+msgid "DHCP-Options"
 msgstr ""
 
 #. See &quot;dnsmasq --help dhcp&quot; for a list of available options.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:265
-msgid "dhcp_dhcp_dhcpoption_desc"
+msgid "See \"dnsmasq --help dhcp\" for a list of available options."
 msgstr ""
 
 #. Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:266
-msgid "dhcp_leases"
+msgid "Leases"
 msgstr "Leases"
 
 #. Static Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:267
-msgid "luci_ethers"
+msgid "Static Leases"
 msgstr "Static Leases"
 
 #. Leasetime remaining
 #: i18n/english/luasrc/i18n/admin-core.en.lua:268
-msgid "dhcp_timeremain"
+msgid "Leasetime remaining"
 msgstr "Leasetime remaining"
 
 #. Active Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:269
-msgid "dhcp_leases_active"
+msgid "Active Leases"
 msgstr "Active Leases"
 
 #. Point-to-Point Connections
 #: i18n/english/luasrc/i18n/admin-core.en.lua:270
-msgid "a_n_ptp"
+msgid "Point-to-Point Connections"
 msgstr "Соединения точка-точка"
 
 #. Point-to-Point connections with <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> or <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr> are often used to connect a device over <abbr title=\"Digital Subscriber Line\">DSL</abbr> or similar technologies to an internet access point.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:271
-msgid "a_n_ptp1"
+msgid "Point-to-Point connections with <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> or <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr> are often used to connect a device over <abbr title=\"Digital Subscriber Line\">DSL</abbr> or similar technologies to an internet access point."
 msgstr ""
 "Соединения типа <abbr title=\"протокол передачи кадров PPP через "
 "Ethernet\">PPPoE</abbr> или <abbr title=\"протокол передачи кадров PPP через "
@@ -1538,39 +1538,39 @@ msgstr ""
 #. You need to install &quot;comgt&quot; for UMTS/GPRS, &quot;ppp-mod-pppoe&quot; for PPPoE, &quot;ppp-mod-pppoa&quot; for PPPoA or &quot;pptp&quot; for PPtP support
 #: i18n/english/luasrc/i18n/admin-core.en.lua:272
 #, fuzzy
-msgid "network_interface_prereq"
+msgid "You need to install \"comgt\" for UMTS/GPRS, \"ppp-mod-pppoe\" for PPPoE, \"ppp-mod-pppoa\" for PPPoA or \"pptp\" for PPtP support"
 msgstr "Ошибок"
 
 #. You need to install &quot;ppp-mod-pppoe&quot; for PPPoE or &quot;pptp&quot; for PPtP support
 #: i18n/english/luasrc/i18n/admin-core.en.lua:273
 #, fuzzy
-msgid "network_interface_prereq_mini"
+msgid "You need to install \"ppp-mod-pppoe\" for PPPoE or \"pptp\" for PPtP support"
 msgstr "Ошибок"
 
 #. <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:274
-msgid "network_interface_server"
+msgid "<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"
 msgstr ""
 "<abbr title=\"протокол передачи кадров PPP через Тоннель\">PPTP</abbr>-Сервер"
 
 #. Automatic Disconnect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:275
-msgid "network_interface_demand"
+msgid "Automatic Disconnect"
 msgstr "Automatic Disconnect"
 
 #. Time (in seconds) after which an unused connection will be closed
 #: i18n/english/luasrc/i18n/admin-core.en.lua:276
-msgid "network_interface_demand_desc"
+msgid "Time (in seconds) after which an unused connection will be closed"
 msgstr "Время (в сек.) после которого неиспользованное соединение будет закрыто"
 
 #. Keep-Alive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:277
-msgid "network_interface_keepalive"
+msgid "Keep-Alive"
 msgstr "Keep-Alive"
 
 #. Number of failed connection tests to initiate automatic reconnect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:278
-msgid "network_interface_keepalive_desc"
+msgid "Number of failed connection tests to initiate automatic reconnect"
 msgstr ""
 "Количество неудачных соединений для инициализации переподсоединения к "
 "серверу"
@@ -1578,684 +1578,684 @@ msgstr ""
 #. Modem device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:279
 #, fuzzy
-msgid "network_interface_device"
+msgid "Modem device"
 msgstr "Automatic Disconnect"
 
 #. The device node of your modem, e.g. /dev/ttyUSB0
 #: i18n/english/luasrc/i18n/admin-core.en.lua:280
 #, fuzzy
-msgid "network_interface_device_desc"
+msgid "The device node of your modem, e.g. /dev/ttyUSB0"
 msgstr "Время (в сек.) после которого неиспользованное соединение будет закрыто"
 
 #. Replace default route
 #: i18n/english/luasrc/i18n/admin-core.en.lua:281
-msgid "network_interface_defaultroute"
+msgid "Replace default route"
 msgstr ""
 
 #. Let pppd replace the current default route to use the PPP interface after successful connect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:282
-msgid "network_interface_defaultroute_desc"
+msgid "Let pppd replace the current default route to use the PPP interface after successful connect"
 msgstr ""
 
 #. Use peer DNS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:283
 #, fuzzy
-msgid "network_interface_peerdns"
+msgid "Use peer DNS"
 msgstr "Перед. / Получ."
 
 #. Configure the local DNS server to use the name servers adverticed by the PPP peer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:284
 #, fuzzy
-msgid "network_interface_peerdns_desc"
+msgid "Configure the local DNS server to use the name servers adverticed by the PPP peer"
 msgstr "Перед. / Получ."
 
 #. Enable IPv6 on PPP link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:285
 #, fuzzy
-msgid "network_interface_ipv6"
+msgid "Enable IPv6 on PPP link"
 msgstr "Активен"
 
 #. Connect script
 #: i18n/english/luasrc/i18n/admin-core.en.lua:286
 #, fuzzy
-msgid "network_interface_connect"
+msgid "Connect script"
 msgstr "Ошибок"
 
 #. Let pppd run this script after establishing the PPP link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:287
 #, fuzzy
-msgid "network_interface_connect_desc"
+msgid "Let pppd run this script after establishing the PPP link"
 msgstr "Перед. / Получ."
 
 #. Disconnect script
 #: i18n/english/luasrc/i18n/admin-core.en.lua:288
 #, fuzzy
-msgid "network_interface_disconnect"
+msgid "Disconnect script"
 msgstr "Создать / Добавить Файрвол-зону"
 
 #. Let pppd run this script before tearing down the PPP link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:289
 #, fuzzy
-msgid "network_interface_disconnect_desc"
+msgid "Let pppd run this script before tearing down the PPP link"
 msgstr "Этот интерфейс не принадлежит ни к одной Файрвол-зоне."
 
 #. Additional pppd options
 #: i18n/english/luasrc/i18n/admin-core.en.lua:290
-msgid "network_interface_pppd_options"
+msgid "Additional pppd options"
 msgstr ""
 
 #. Specify additional command line arguments for pppd here
 #: i18n/english/luasrc/i18n/admin-core.en.lua:291
-msgid "network_interface_pppd_options_desc"
+msgid "Specify additional command line arguments for pppd here"
 msgstr ""
 
 #. Access point (APN)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:292
 #, fuzzy
-msgid "network_interface_apn"
+msgid "Access point (APN)"
 msgstr "Активен"
 
 #. PIN code
 #: i18n/english/luasrc/i18n/admin-core.en.lua:293
 #, fuzzy
-msgid "network_interface_pincode"
+msgid "PIN code"
 msgstr "PPPoA Encapsulation"
 
 #. Make sure that you provide the correct pin code here or you might lock your sim card!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:294
 #, fuzzy
-msgid "network_interface_pincode_desc"
+msgid "Make sure that you provide the correct pin code here or you might lock your sim card!"
 msgstr "Этот интерфейс не принадлежит ни к одной Файрвол-зоне."
 
 #. Service type
 #: i18n/english/luasrc/i18n/admin-core.en.lua:295
 #, fuzzy
-msgid "network_interface_service"
+msgid "Service type"
 msgstr ""
 "<abbr title=\"протокол передачи кадров PPP через Тоннель\">PPTP</abbr>-Сервер"
 
 #. Setup wait time
 #: i18n/english/luasrc/i18n/admin-core.en.lua:296
 #, fuzzy
-msgid "network_interface_maxwait"
+msgid "Setup wait time"
 msgstr "Трафик"
 
 #. Seconds to wait for the modem to become ready before attempting to connect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:297
 #, fuzzy
-msgid "network_interface_maxwait_desc"
+msgid "Seconds to wait for the modem to become ready before attempting to connect"
 msgstr "передано / получено"
 
 #. PPPoA Encapsulation
 #: i18n/english/luasrc/i18n/admin-core.en.lua:298
-msgid "network_interface_encaps"
+msgid "PPPoA Encapsulation"
 msgstr "PPPoA Encapsulation"
 
 #. Routes specify over which interface and gateway a certain host or network can be reached.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:299
-msgid "a_n_r_routes1"
+msgid "Routes specify over which interface and gateway a certain host or network can be reached."
 msgstr ""
 "Маршрутизация служит для определения через какой интерфейс и шлюз можно "
 "пройти к определённому хосту или сегменту сети."
 
 #. Static Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:300
-msgid "a_n_routes_static"
+msgid "Static Routes"
 msgstr "Статическая маршрутизация"
 
 #. Static IPv4 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:301
-msgid "a_n_routes_static4"
+msgid "Static IPv4 Routes"
 msgstr "Статическая маршрутизация IPv4"
 
 #. Static IPv6 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:302
-msgid "a_n_routes_static6"
+msgid "Static IPv6 Routes"
 msgstr "Статическая маршрутизация IPv6"
 
 #. Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:303
-msgid "a_n_routes_kernel4"
+msgid "Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes"
 msgstr ""
 "Включение <abbr title=\"Интернет протокол версии 4\">IPv4</abbr>-Маршрутизации"
 
 #. Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:304
-msgid "a_n_routes_kernel6"
+msgid "Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes"
 msgstr ""
 "Включение <abbr title=\"Интернет протокол версии 6\">IPv6</abbr>-Маршрутизации"
 
 #. Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:305
-msgid "a_n_r_target1"
+msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
 msgstr "Хост-<abbr title=\"Адрес интернет протокола\">IP</abbr> или сеть"
 
 #. <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network (CIDR)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:306
-msgid "a_n_r_target6"
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network (CIDR)"
 msgstr ""
 "Хост-<abbr title=\"Адрес интернет протокола версии 6\">IPv6</abbr> или сеть"
 
 #. if target is a network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:307
-msgid "a_n_r_netmask1"
+msgid "if target is a network"
 msgstr "если сеть"
 
 #. Internet Connection
 #: i18n/english/luasrc/i18n/admin-core.en.lua:308
-msgid "m_n_inet"
+msgid "Internet Connection"
 msgstr "Интернет соединение"
 
 #. Local Network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:309
-msgid "m_n_local"
+msgid "Local Network"
 msgstr "Локальная сеть"
 
 #. Route
 #: i18n/english/luasrc/i18n/admin-core.en.lua:310
-msgid "m_n_route"
+msgid "Route"
 msgstr "Маршрут"
 
 #. Bridge
 #: i18n/english/luasrc/i18n/admin-core.en.lua:311
-msgid "m_n_brdige"
+msgid "Bridge"
 msgstr "Мост"
 
 #. Provide (Access Point)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:312
-msgid "m_w_ap"
+msgid "Provide (Access Point)"
 msgstr "Обеспечивает (AP)"
 
 #. Independent (Ad-Hoc)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:313
-msgid "m_w_adhoc"
+msgid "Independent (Ad-Hoc)"
 msgstr "Незаыисимая (Ad-Hoc)"
 
 #. Join (Client)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:314
-msgid "m_w_client"
+msgid "Join (Client)"
 msgstr "Присоединиться (Client)"
 
 #. Distributed (<abbr title=\"Wireless Distribution System\">WDS</abbr>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:315
-msgid "m_w_wds"
+msgid "Distributed (<abbr title=\"Wireless Distribution System\">WDS</abbr>)"
 msgstr ""
 "Распределённая (<abbr title=\"Беспроводная распределённая сеть\">WDS</abbr>)"
 
 #. Clientmode
 #: i18n/english/luasrc/i18n/admin-core.en.lua:316
-msgid "m_w_clientmode"
+msgid "Clientmode"
 msgstr "Режим клиента"
 
 #. System log buffer size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:317
-msgid "system_system_logsize"
+msgid "System log buffer size"
 msgstr "Размер буфера системного журнала"
 
 #. External system log server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:318
-msgid "system_system_logip"
+msgid "External system log server"
 msgstr "Внешний сервер системного журналирования"
 
 #. Log output level
 #: i18n/english/luasrc/i18n/admin-core.en.lua:319
-msgid "system_system_conloglevel"
+msgid "Log output level"
 msgstr "Уровень системного логгирования"
 
 #. Level of log messages on the console
 #: i18n/english/luasrc/i18n/admin-core.en.lua:320
-msgid "system_system_conloglevel_desc"
+msgid "Level of log messages on the console"
 msgstr "Уровень системного логгирования консоли"
 
 #. Processor
 #: i18n/english/luasrc/i18n/admin-core.en.lua:321
-msgid "m_i_processor"
+msgid "Processor"
 msgstr "Процессор"
 
 #. Memory
 #: i18n/english/luasrc/i18n/admin-core.en.lua:322
-msgid "m_i_memory"
+msgid "Memory"
 msgstr "Память"
 
 #. Local Time
 #: i18n/english/luasrc/i18n/admin-core.en.lua:323
-msgid "m_i_systemtime"
+msgid "Local Time"
 msgstr "Локальное время"
 
 #. Uptime
 #: i18n/english/luasrc/i18n/admin-core.en.lua:324
-msgid "m_i_uptime"
+msgid "Uptime"
 msgstr "Время работы"
 
 #. First leased address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:325
-msgid "m_n_d_firstaddress"
+msgid "First leased address"
 msgstr "Первый арендованный адрес"
 
 #. Number of leased addresses
 #: i18n/english/luasrc/i18n/admin-core.en.lua:326
-msgid "m_n_d_numleases"
+msgid "Number of leased addresses"
 msgstr "Количество арендованных адресов"
 
 #. Routing table
 #: i18n/english/luasrc/i18n/admin-core.en.lua:327
-msgid "routingtable"
+msgid "Routing table"
 msgstr "Таблица маршрутизации"
 
 #. Wifi scan
 #: i18n/english/luasrc/i18n/admin-core.en.lua:328
-msgid "wlanscan"
+msgid "Wifi scan"
 msgstr "Поиск Wi-Fi сетей"
 
 #. Frequency
 #: i18n/english/luasrc/i18n/admin-core.en.lua:329
-msgid "frequency"
+msgid "Frequency"
 msgstr "Частота"
 
 #. Power
 #: i18n/english/luasrc/i18n/admin-core.en.lua:330
-msgid "power"
+msgid "Power"
 msgstr "Мощьность"
 
 #. Noise
 #: i18n/english/luasrc/i18n/admin-core.en.lua:331
-msgid "noise"
+msgid "Noise"
 msgstr "Шум"
 
 #. Signal
 #: i18n/english/luasrc/i18n/admin-core.en.lua:332
-msgid "signal"
+msgid "Signal"
 msgstr "Сигнал"
 
 #. Link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:333
-msgid "link"
+msgid "Link"
 msgstr "Связь"
 
 #. <abbr title=\"Fragmentation\">Frag.</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:334
-msgid "frag"
+msgid "<abbr title=\"Fragmentation\">Frag.</abbr>"
 msgstr "<abbr title=\"Фрагментация\">Frag.</abbr>"
 
 #. <abbr title=\"Request To Send\">RTS</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:335
-msgid "rts"
+msgid "<abbr title=\"Request To Send\">RTS</abbr>"
 msgstr "<abbr title=\"Запрос на отправку\">RTS</abbr>"
 
 #. Bitrate
 #: i18n/english/luasrc/i18n/admin-core.en.lua:336
-msgid "bitrate"
+msgid "Bitrate"
 msgstr "Битрейт"
 
 #. automatically reconnect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:337
-msgid "m_n_keepalive"
+msgid "automatically reconnect"
 msgstr "автоматически переподсоединятся"
 
 #. disconnect when idle for
 #: i18n/english/luasrc/i18n/admin-core.en.lua:338
-msgid "m_n_dialondemand"
+msgid "disconnect when idle for"
 msgstr "отсоединиться когда простой для"
 
 #. <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:339
-msgid "m_n_pptp_server"
+msgid "<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"
 msgstr ""
 "<abbr title=\"протокол передачи кадров PPP через Тоннель\">PPTP</abbr>-Сервер"
 
 #. <abbr title=\"Light Emitting Diode\">LED</abbr> Configuration
 #: i18n/english/luasrc/i18n/admin-core.en.lua:340
-msgid "leds"
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "Настройка <abbr title=\"Светодиод\">LED</abbr>"
 
 #. Customizes the behaviour of the device <abbr title=\"Light Emitting Diode\">LED</abbr>s if possible.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:341
-msgid "leds_desc"
+msgid "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode\">LED</abbr>s if possible."
 msgstr ""
 "Настройка поведения <abbr title=\"Светодиод\">LED</abbr>&#39;ов если это "
 "возможно."
 
 #. <abbr title=\"Light Emitting Diode\">LED</abbr> Name
 #: i18n/english/luasrc/i18n/admin-core.en.lua:342
-msgid "system_led_name"
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr "<abbr title=\"Светодиод\">LED</abbr> Имя"
 
 #. <abbr title=\"Light Emitting Diode\">LED</abbr> Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:343
-msgid "system_led_sysfs"
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Device"
 msgstr "<abbr title=\"Светодиод\">LED</abbr> Устройство"
 
 #. Default state
 #: i18n/english/luasrc/i18n/admin-core.en.lua:344
-msgid "system_led_default"
+msgid "Default state"
 msgstr "Состояние по умолчанию"
 
 #. ticked = on
 #: i18n/english/luasrc/i18n/admin-core.en.lua:345
-msgid "system_led_default_desc"
+msgid "ticked = on"
 msgstr "мигание = включено"
 
 #. Trigger
 #: i18n/english/luasrc/i18n/admin-core.en.lua:346
-msgid "system_led_trigger"
+msgid "Trigger"
 msgstr "Триггер"
 
 #. None
 #: i18n/english/luasrc/i18n/admin-core.en.lua:347
-msgid "system_led_trigger_none"
+msgid "None"
 msgstr "нет"
 
 #. Default On
 #: i18n/english/luasrc/i18n/admin-core.en.lua:348
-msgid "system_led_trigger_defaulton"
+msgid "Default On"
 msgstr "По умолчанию включено"
 
 #. Timer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:349
-msgid "system_led_trigger_timer"
+msgid "Timer"
 msgstr "Таймер"
 
 #. Heartbeat (Load Average)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:350
-msgid "system_led_trigger_heartbeat"
+msgid "Heartbeat (Load Average)"
 msgstr "Стук (Средняя загрузка)"
 
 #. Network Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:351
-msgid "system_led_trigger_netdev"
+msgid "Network Device"
 msgstr "Сетевое устройство"
 
 #. Off-State Delay
 #: i18n/english/luasrc/i18n/admin-core.en.lua:352
-msgid "system_led_delayoff"
+msgid "Off-State Delay"
 msgstr "Задержка выключена"
 
 #. Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is off
 #: i18n/english/luasrc/i18n/admin-core.en.lua:353
-msgid "system_led_delayoff_desc"
+msgid "Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is off"
 msgstr "время (в мс) <abbr title=\"Светодиод\">LED</abbr> выключен"
 
 #. On-State Delay
 #: i18n/english/luasrc/i18n/admin-core.en.lua:354
-msgid "system_led_delayon"
+msgid "On-State Delay"
 msgstr "Задержка включена"
 
 #. Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is on
 #: i18n/english/luasrc/i18n/admin-core.en.lua:355
-msgid "system_led_delayon_desc"
+msgid "Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is on"
 msgstr "время (в мс) <abbr title=\"Светодиод\">LED</abbr> включен"
 
 #. Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:356
-msgid "system_led_dev"
+msgid "Device"
 msgstr "Устройство"
 
 #. Trigger Mode
 #: i18n/english/luasrc/i18n/admin-core.en.lua:357
-msgid "system_led_mode"
+msgid "Trigger Mode"
 msgstr "Триггерный режим"
 
 #. Link On
 #: i18n/english/luasrc/i18n/admin-core.en.lua:358
-msgid "system_led_mode_link"
+msgid "Link On"
 msgstr "Связь включена"
 
 #. Transmit
 #: i18n/english/luasrc/i18n/admin-core.en.lua:359
-msgid "system_led_mode_tx"
+msgid "Transmit"
 msgstr "Передача"
 
 #. Receive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:360
-msgid "system_led_mode_rx"
+msgid "Receive"
 msgstr "Приём"
 
 #. Active
 #: i18n/english/luasrc/i18n/admin-core.en.lua:361
-msgid "network_interface_up"
+msgid "Active"
 msgstr "Активен"
 
 #. <abbr title=\"Media Access Control\">MAC</abbr>-Address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:362
-msgid "network_interface_hwaddr"
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr "<abbr title=\"Управление доступом к носителю\">MAC</abbr>-Адрес"
 
 #. Hardware Address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:363
-msgid "network_interface_hwaddr_desc"
+msgid "Hardware Address"
 msgstr "Адрес устройства"
 
 #. Traffic
 #: i18n/english/luasrc/i18n/admin-core.en.lua:364
-msgid "network_interface_txrx"
+msgid "Traffic"
 msgstr "Трафик"
 
 #. transmitted / received
 #: i18n/english/luasrc/i18n/admin-core.en.lua:365
-msgid "network_interface_txrx_desc"
+msgid "transmitted / received"
 msgstr "передано / получено"
 
 #. Errors
 #: i18n/english/luasrc/i18n/admin-core.en.lua:366
-msgid "network_interface_err"
+msgid "Errors"
 msgstr "Ошибок"
 
 #. TX / RX
 #: i18n/english/luasrc/i18n/admin-core.en.lua:367
-msgid "network_interface_err_desc"
+msgid "TX / RX"
 msgstr "Перед. / Получ."
 
 #. Create / Assign firewall-zone
 #: i18n/english/luasrc/i18n/admin-core.en.lua:368
-msgid "network_interface_fwzone"
+msgid "Create / Assign firewall-zone"
 msgstr "Создать / Добавить Файрвол-зону"
 
 #. This interface does not belong to any firewall zone yet.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:369
-msgid "network_interface_fwzone_desc"
+msgid "Choose the firewall zone you want to assign to this interface. Select <em>unspecified</em> to remove the interface from the associated zone or fill out the <em>create</em> field to define a new zone and attach the interface to it."
 msgstr "Этот интерфейс не принадлежит ни к одной Файрвол-зоне."
 
 #. Processes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:370
-msgid "process_head"
+msgid "Processes"
 msgstr ""
 
 #. This list gives an overview over currently running system processes and their status.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:371
-msgid "process_descr"
+msgid "This list gives an overview over currently running system processes and their status."
 msgstr ""
 
 #. PID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:372
-msgid "process_pid"
+msgid "PID"
 msgstr ""
 
 #. Owner
 #: i18n/english/luasrc/i18n/admin-core.en.lua:373
-msgid "process_owner"
+msgid "Owner"
 msgstr ""
 
 #. Command
 #: i18n/english/luasrc/i18n/admin-core.en.lua:374
-msgid "process_command"
+msgid "Command"
 msgstr ""
 
 #. CPU usage (%)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:375
-msgid "process_cpu"
+msgid "CPU usage (%)"
 msgstr ""
 
 #. Memory usage (%)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:376
-msgid "process_mem"
+msgid "Memory usage (%)"
 msgstr ""
 
 #. Hang Up
 #: i18n/english/luasrc/i18n/admin-core.en.lua:377
-msgid "process_hup"
+msgid "Hang Up"
 msgstr ""
 
 #. Terminate
 #: i18n/english/luasrc/i18n/admin-core.en.lua:378
-msgid "process_term"
+msgid "Terminate"
 msgstr ""
 
 #. Kill
 #: i18n/english/luasrc/i18n/admin-core.en.lua:379
-msgid "process_kill"
+msgid "Kill"
 msgstr ""
 
 #. cached
 #: i18n/english/luasrc/i18n/admin-core.en.lua:380
-msgid "mem_cached"
+msgid "cached"
 msgstr ""
 
 #. buffered
 #: i18n/english/luasrc/i18n/admin-core.en.lua:381
-msgid "mem_buffered"
+msgid "buffered"
 msgstr ""
 
 #. free
 #: i18n/english/luasrc/i18n/admin-core.en.lua:382
-msgid "mem_free"
+msgid "free"
 msgstr ""
 
 #. Scheduled Tasks
 #: i18n/english/luasrc/i18n/admin-core.en.lua:383
-msgid "a_s_crontab"
+msgid "Scheduled Tasks"
 msgstr ""
 
 #. This is the system crontab in which scheduled tasks can be defined.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:384
-msgid "a_s_crontab1"
+msgid "This is the system crontab in which scheduled tasks can be defined."
 msgstr ""
 
 #. NAS ID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:385
 #, fuzzy
-msgid "a_w_nasid"
+msgid "NAS ID"
 msgstr ""
 "Название сети (<abbr title=\"Расширенный идентификатор сети\">ESSID</abbr>)"
 
 #. Path to CA-Certificate
 #: i18n/english/luasrc/i18n/admin-core.en.lua:386
-msgid "a_w_cacert"
+msgid "Path to CA-Certificate"
 msgstr ""
 
 #. EAP-Method
 #: i18n/english/luasrc/i18n/admin-core.en.lua:387
-msgid "a_w_eaptype"
+msgid "EAP-Method"
 msgstr ""
 
 #. Path to Private Key
 #: i18n/english/luasrc/i18n/admin-core.en.lua:388
-msgid "a_w_tlsprivkey"
+msgid "Path to Private Key"
 msgstr ""
 
 #. Password of Private Key
 #: i18n/english/luasrc/i18n/admin-core.en.lua:389
-msgid "a_w_tlsprivkeypwd"
+msgid "Password of Private Key"
 msgstr ""
 
 #. Authentication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:390
-msgid "a_w_peapauth"
+msgid "Authentication"
 msgstr ""
 
 #. Identity
 #: i18n/english/luasrc/i18n/admin-core.en.lua:391
-msgid "a_w_peapidentity"
+msgid "Identity"
 msgstr ""
 
 #. Password
 #: i18n/english/luasrc/i18n/admin-core.en.lua:392
-msgid "a_w_peappassword"
+msgid "Password"
 msgstr ""
 
 #. Create Network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:393
-msgid "a_w_create"
+msgid "Create Network"
 msgstr ""
 
 #. Hostnames
 #: i18n/english/luasrc/i18n/admin-core.en.lua:394
-msgid "hostnames"
+msgid "Hostnames"
 msgstr ""
 
 #. Host entries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:395
-msgid "hostnames_entries"
+msgid "Host entries"
 msgstr ""
 
 #. Hostname
 #: i18n/english/luasrc/i18n/admin-core.en.lua:396
-msgid "hostnames_hostname"
+msgid "Hostname"
 msgstr ""
 
 #. IP address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:397
-msgid "hostnames_address"
+msgid "IP address"
 msgstr ""
 
 #. Clamp Segment Size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:398
-msgid "m_n_mssfix"
+msgid "Clamp Segment Size"
 msgstr "Clamp Segment Size"
 
 #. Fixes problems with unreachable websites, submitting forms or other unexpected behaviour for some ISPs.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:399
-msgid "m_n_mssfix_desc"
+msgid "Fixes problems with unreachable websites, submitting forms or other unexpected behaviour for some ISPs."
 msgstr ""
 "Fixes problems with unreachable websites, submitting forms or other "
 "unexpected behaviour for some ISPs."
 
 #. Flash Firmware
 #: i18n/english/luasrc/i18n/admin-core.en.lua:400
-msgid "admin_upgrade"
+msgid "Flash Firmware"
 msgstr "Flash Firmware"
 
 #. The uploaded image file does not contain a supported format. Make sure that you choose the generic image format for your platform.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:401
-msgid "admin_upgrade_badimage"
+msgid "The uploaded image file does not contain a supported format. Make sure that you choose the generic image format for your platform."
 msgstr ""
 "The uploaded image file does not contain a supported format. Make sure that "
 "you choose the generic image format for your platform."
 
 #. Checksum
 #: i18n/english/luasrc/i18n/admin-core.en.lua:402
-msgid "admin_upgrade_checksum"
+msgid "Checksum"
 msgstr "Checksum"
 
 #. Upload an OpenWrt image file to reflash the device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:403
-msgid "admin_upgrade_desc"
+msgid "Upload an OpenWrt image file to reflash the device."
 msgstr "Upload an OpenWrt image file to reflash the device."
 
 #. Size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:404
-msgid "admin_upgrade_filesize"
+msgid "Size"
 msgstr "Size"
 
 #. Firmware image
 #: i18n/english/luasrc/i18n/admin-core.en.lua:405
-msgid "admin_upgrade_fwimage"
+msgid "Firmware image"
 msgstr "Firmware image"
 
 #. Keep configuration files
 #: i18n/english/luasrc/i18n/admin-core.en.lua:406
-msgid "admin_upgrade_keepcfg"
+msgid "Keep configuration files"
 msgstr "Keep configuration files"
 
 #. Sorry. OpenWrt does not support a system upgrade on this platform.<br /> You need to manually flash your device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:407
-msgid "admin_upgrade_nosupport"
+msgid "Sorry. OpenWrt does not support a system upgrade on this platform.<br /> You need to manually flash your device."
 msgstr ""
 "Sorry. OpenWrt does not support a system upgrade on this platform.<br /> You "
 "need to manually flash your device."
 
 #. The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a few minutes until you try to reconnect. It might be necessary to renew the address of your computer to reach the device again, depending on your settings.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:408
-msgid "admin_upgrade_running"
+msgid "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a few minutes until you try to reconnect. It might be necessary to renew the address of your computer to reach the device again, depending on your settings."
 msgstr ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
 "few minutes until you try to reconnect. It might be necessary to renew the "
@@ -2264,19 +2264,19 @@ msgstr ""
 
 #.  (%s available)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:409
-msgid "admin_upgrade_spaceavail"
+msgid " (%s available)"
 msgstr " (%s available)"
 
 #. It appears that you try to flash an image that does not fit into the flash memory, please verify the image file!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:410
-msgid "admin_upgrade_toolarge"
+msgid "It appears that you try to flash an image that does not fit into the flash memory, please verify the image file!"
 msgstr ""
 "It appears that you try to flash an image that does not fit into the flash "
 "memory, please verify the image file!"
 
 #. Upload image
 #: i18n/english/luasrc/i18n/admin-core.en.lua:411
-msgid "admin_upgrade_upload"
+msgid "Upload image"
 msgstr "Upload image"
 
 #. The flash image was uploaded. Below is the checksum and file size listed, compare them with the original file to ensure data integrity.<br /> Click \"Proceed\" below to start the flash procedure.
diff --git a/po/ru/asterisk.po b/po/ru/asterisk.po
index 89aa53994..32d1202a4 100644
--- a/po/ru/asterisk.po
+++ b/po/ru/asterisk.po
@@ -14,1252 +14,1252 @@ msgstr ""
 
 #. Asterisk General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:1
-msgid "asterisk_asterisk"
+msgid "Asterisk General Options"
 msgstr ""
 
 #. AGI directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:2
-msgid "asterisk_asterisk_agidir"
+msgid "AGI directory"
 msgstr ""
 
 #. Cache recorded sound files during recording
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:3
-msgid "asterisk_asterisk_cacherecordfiles"
+msgid "Cache recorded sound files during recording"
 msgstr ""
 
 #. Debug Level
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:4
-msgid "asterisk_asterisk_debug"
+msgid "Debug Level"
 msgstr ""
 
 #. Disable some warnings
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:5
-msgid "asterisk_asterisk_dontwarn"
+msgid "Disable some warnings"
 msgstr ""
 
 #. Dump core on crash
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:6
-msgid "asterisk_asterisk_dumpcore"
+msgid "Dump core on crash"
 msgstr ""
 
 #. High Priority
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:7
-msgid "asterisk_asterisk_highpriority"
+msgid "High Priority"
 msgstr ""
 
 #. Initialise Crypto
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:8
-msgid "asterisk_asterisk_initcrypto"
+msgid "Initialise Crypto"
 msgstr ""
 
 #. Use Internal Timing
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:9
-msgid "asterisk_asterisk_internaltiming"
+msgid "Use Internal Timing"
 msgstr ""
 
 #. Log directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:10
-msgid "asterisk_asterisk_logdir"
+msgid "Log directory"
 msgstr ""
 
 #. Maximum number of calls allowed
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:11
-msgid "asterisk_asterisk_maxcalls"
+msgid "Maximum number of calls allowed"
 msgstr ""
 
 #. Maximum load to stop accepting new calls
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:12
-msgid "asterisk_asterisk_maxload"
+msgid "Maximum load to stop accepting new calls"
 msgstr ""
 
 #. Disable console colors
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:13
-msgid "asterisk_asterisk_nocolor"
+msgid "Disable console colors"
 msgstr ""
 
 #. Sound files Cache directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:14
-msgid "asterisk_asterisk_recordcachedir"
+msgid "Sound files Cache directory"
 msgstr ""
 
 #. The Group to run as
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:15
-msgid "asterisk_asterisk_rungroup"
+msgid "The Group to run as"
 msgstr ""
 
 #. The User to run as
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:16
-msgid "asterisk_asterisk_runuser"
+msgid "The User to run as"
 msgstr ""
 
 #. Voicemail Spool directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:17
-msgid "asterisk_asterisk_spooldir"
+msgid "Voicemail Spool directory"
 msgstr ""
 
 #. Prefix UniquID with system name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:18
-msgid "asterisk_asterisk_systemname"
+msgid "Prefix UniquID with system name"
 msgstr ""
 
 #. Build transcode paths via SLINEAR, not directly
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:19
-msgid "asterisk_asterisk_transcodeviasln"
+msgid "Build transcode paths via SLINEAR, not directly"
 msgstr ""
 
 #. Transmit SLINEAR silence while recording a channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:20
-msgid "asterisk_asterisk_transmitsilenceduringrecord"
+msgid "Transmit SLINEAR silence while recording a channel"
 msgstr ""
 
 #. Verbose Level
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:21
-msgid "asterisk_asterisk_verbose"
+msgid "Verbose Level"
 msgstr ""
 
 #. Time Zone
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:22
-msgid "asterisk_asterisk_zone"
+msgid "Time Zone"
 msgstr ""
 
 #. Section dialplan
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:23
-msgid "asterisk_dialplan"
+msgid "Section dialplan"
 msgstr ""
 
 #. include
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:24
-msgid "asterisk_dialplan_include"
+msgid "include"
 msgstr ""
 
 #. Dialplan Extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:25
-msgid "asterisk_dialplanexten"
+msgid "Dialplan Extension"
 msgstr ""
 
 #. Dialplan General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:26
-msgid "asterisk_dialplangeneral"
+msgid "Dialplan General Options"
 msgstr ""
 
 #. Allow transfer
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:27
-msgid "asterisk_dialplangeneral_allowtransfer"
+msgid "Allow transfer"
 msgstr ""
 
 #. Reinvite/redirect media connections
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:28
-msgid "asterisk_dialplangeneral_canreinvite"
+msgid "Reinvite/redirect media connections"
 msgstr ""
 
 #. Clear global vars
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:29
-msgid "asterisk_dialplangeneral_clearglobalvars"
+msgid "Clear global vars"
 msgstr ""
 
 #. Dialplan Goto
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:30
-msgid "asterisk_dialplangoto"
+msgid "Dialplan Goto"
 msgstr ""
 
 #. Dialplan Conference
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:31
-msgid "asterisk_dialplanmeetme"
+msgid "Dialplan Conference"
 msgstr ""
 
 #. Dialplan Time
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:32
-msgid "asterisk_dialplansaytime"
+msgid "Dialplan Time"
 msgstr ""
 
 #. Dialplan Voicemail
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:33
-msgid "asterisk_dialplanvoice"
+msgid "Dialplan Voicemail"
 msgstr ""
 
 #. Dial Zones for Dialplan
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:34
-msgid "asterisk_dialzone"
+msgid "Dial Zones for Dialplan"
 msgstr ""
 
 #. Prefix to add matching dialplans
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:35
-msgid "asterisk_dialzone_addprefix"
+msgid "Prefix to add matching dialplans"
 msgstr ""
 
 #. Match International prefix
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:36
-msgid "asterisk_dialzone_international"
+msgid "Match International prefix"
 msgstr ""
 
 #. Prefix (0) to add/remove to/from international numbers
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:37
-msgid "asterisk_dialzone_localprefix"
+msgid "Prefix (0) to add/remove to/from international numbers"
 msgstr ""
 
 #. localzone
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:38
-msgid "asterisk_dialzone_localzone"
+msgid "localzone"
 msgstr ""
 
 #. Match plan
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:39
-msgid "asterisk_dialzone_match"
+msgid "Match plan"
 msgstr ""
 
 #. Connection to use
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:40
-msgid "asterisk_dialzone_uses"
+msgid "Connection to use"
 msgstr ""
 
 #. Feature Key maps
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:41
-msgid "asterisk_featuremap"
+msgid "Feature Key maps"
 msgstr ""
 
 #. Attended transfer key
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:42
-msgid "asterisk_featuremap_atxfer"
+msgid "Attended transfer key"
 msgstr ""
 
 #. Blind transfer key
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:43
-msgid "asterisk_featuremap_blindxfer"
+msgid "Blind transfer key"
 msgstr ""
 
 #. Key to Disconnect call
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:44
-msgid "asterisk_featuremap_disconnect"
+msgid "Key to Disconnect call"
 msgstr ""
 
 #. Key to Park call
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:45
-msgid "asterisk_featuremap_parkcall"
+msgid "Key to Park call"
 msgstr ""
 
 #. Parking Feature
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:46
-msgid "asterisk_featurepark"
+msgid "Parking Feature"
 msgstr ""
 
 #. ADSI Park
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:47
-msgid "asterisk_featurepark_adsipark"
+msgid "ADSI Park"
 msgstr ""
 
 #. Attended transfer timeout (sec)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:48
-msgid "asterisk_featurepark_atxfernoanswertimeout"
+msgid "Attended transfer timeout (sec)"
 msgstr ""
 
 #. One touch record key
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:49
-msgid "asterisk_featurepark_automon"
+msgid "One touch record key"
 msgstr ""
 
 #. Name of call context for parking
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:50
-msgid "asterisk_featurepark_context"
+msgid "Name of call context for parking"
 msgstr ""
 
 #. Sound file to play to parked caller
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:51
-msgid "asterisk_featurepark_courtesytone"
+msgid "Sound file to play to parked caller"
 msgstr ""
 
 #. Max time (ms) between digits for feature activation
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:52
-msgid "asterisk_featurepark_featuredigittimeout"
+msgid "Max time (ms) between digits for feature activation"
 msgstr ""
 
 #. Method to Find Parking slot
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:53
-msgid "asterisk_featurepark_findslot"
+msgid "Method to Find Parking slot"
 msgstr ""
 
 #. parkedmusicclass
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:54
-msgid "asterisk_featurepark_parkedmusicclass"
+msgid "parkedmusicclass"
 msgstr ""
 
 #. Play courtesy tone to
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:55
-msgid "asterisk_featurepark_parkedplay"
+msgid "Play courtesy tone to"
 msgstr ""
 
 #. Enable Parking
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:56
-msgid "asterisk_featurepark_parkenabled"
+msgid "Enable Parking"
 msgstr ""
 
 #. Extension to dial to park
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:57
-msgid "asterisk_featurepark_parkext"
+msgid "Extension to dial to park"
 msgstr ""
 
 #. Parking time (secs)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:58
-msgid "asterisk_featurepark_parkingtime"
+msgid "Parking time (secs)"
 msgstr ""
 
 #. Range of extensions for call parking
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:59
-msgid "asterisk_featurepark_parkpos"
+msgid "Range of extensions for call parking"
 msgstr ""
 
 #. Pickup extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:60
-msgid "asterisk_featurepark_pickupexten"
+msgid "Pickup extension"
 msgstr ""
 
 #. Seconds to wait bewteen digits when transferring
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:61
-msgid "asterisk_featurepark_transferdigittimeout"
+msgid "Seconds to wait bewteen digits when transferring"
 msgstr ""
 
 #. sound when attended transfer is complete
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:62
-msgid "asterisk_featurepark_xferfailsound"
+msgid "sound when attended transfer is complete"
 msgstr ""
 
 #. Sound when attended transfer fails
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:63
-msgid "asterisk_featurepark_xfersound"
+msgid "Sound when attended transfer fails"
 msgstr ""
 
 #. Reload Hardware Config
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:64
-msgid "asterisk_hardwarereboot"
+msgid "Reload Hardware Config"
 msgstr ""
 
 #. Reboot Method
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:65
-msgid "asterisk_hardwarereboot_method"
+msgid "Reboot Method"
 msgstr ""
 
 #. Parameter
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:66
-msgid "asterisk_hardwarereboot_param"
+msgid "Parameter"
 msgstr ""
 
 #. SIP Connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:67
-msgid "asterisk_iax"
+msgid "SIP Connection"
 msgstr ""
 
 #. Always Dial International
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:68
-msgid "asterisk_iax_alwaysinternational"
+msgid "Always Dial International"
 msgstr ""
 
 #. context
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:69
-msgid "asterisk_iax_context"
+msgid "context"
 msgstr ""
 
 #. Country Code for connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:70
-msgid "asterisk_iax_countrycode"
+msgid "Country Code for connection"
 msgstr ""
 
 #. Add as Extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:71
-msgid "asterisk_iax_extension"
+msgid "Add as Extension"
 msgstr ""
 
 #. Host name (or blank)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:72
-msgid "asterisk_iax_host"
+msgid "Host name (or blank)"
 msgstr ""
 
 #. International Dial Prefix
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:73
-msgid "asterisk_iax_internationalprefix"
+msgid "International Dial Prefix"
 msgstr ""
 
 #. Dial Prefix (for external line)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:74
-msgid "asterisk_iax_prefix"
+msgid "Dial Prefix (for external line)"
 msgstr ""
 
 #. Secret
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:75
-msgid "asterisk_iax_secret"
+msgid "Secret"
 msgstr ""
 
 #. Dial Timeout (sec)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:76
-msgid "asterisk_iax_timeout"
+msgid "Dial Timeout (sec)"
 msgstr ""
 
 #. Option type
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:77
-msgid "asterisk_iax_type"
+msgid "Option type"
 msgstr ""
 
 #. User name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:78
-msgid "asterisk_iax_username"
+msgid "User name"
 msgstr ""
 
 #. IAX General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:79
-msgid "asterisk_iaxgeneral"
+msgid "IAX General Options"
 msgstr ""
 
 #. Allow Codecs
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:80
-msgid "asterisk_iaxgeneral_allow"
+msgid "Allow Codecs"
 msgstr ""
 
 #. Reinvite/redirect media connections
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:81
-msgid "asterisk_iaxgeneral_canreinvite"
+msgid "Reinvite/redirect media connections"
 msgstr ""
 
 #. Static
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:82
-msgid "asterisk_iaxgeneral_static"
+msgid "Static"
 msgstr ""
 
 #. Write Protect
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:83
-msgid "asterisk_iaxgeneral_writeprotect"
+msgid "Write Protect"
 msgstr ""
 
 #. Meetme Conference
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:84
-msgid "asterisk_meetme"
+msgid "Meetme Conference"
 msgstr ""
 
 #. Admin PIN
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:85
-msgid "asterisk_meetme_adminpin"
+msgid "Admin PIN"
 msgstr ""
 
 #. Meeting PIN
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:86
-msgid "asterisk_meetme_pin"
+msgid "Meeting PIN"
 msgstr ""
 
 #. Meetme Conference General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:87
-msgid "asterisk_meetmegeneral"
+msgid "Meetme Conference General Options"
 msgstr ""
 
 #. Number of 20ms audio buffers to be used
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:88
-msgid "asterisk_meetmegeneral_audiobuffers"
+msgid "Number of 20ms audio buffers to be used"
 msgstr ""
 
 #. Modules
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:89
-msgid "asterisk_module"
+msgid "Modules"
 msgstr ""
 
 #. Alarm Receiver Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:90
-msgid "asterisk_module_appalarmreceiver"
+msgid "Alarm Receiver Application"
 msgstr ""
 
 #. Authentication Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:91
-msgid "asterisk_module_appauthenticate"
+msgid "Authentication Application"
 msgstr ""
 
 #. Make sure asterisk doesnt save CDR
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:92
-msgid "asterisk_module_appcdr"
+msgid "Make sure asterisk doesnt save CDR"
 msgstr ""
 
 #. Check if channel is available
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:93
-msgid "asterisk_module_appchanisavail"
+msgid "Check if channel is available"
 msgstr ""
 
 #. Listen in on any channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:94
-msgid "asterisk_module_appchanspy"
+msgid "Listen in on any channel"
 msgstr ""
 
 #. Control Playback Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:95
-msgid "asterisk_module_appcontrolplayback"
+msgid "Control Playback Application"
 msgstr ""
 
 #. Cuts up variables
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:96
-msgid "asterisk_module_appcut"
+msgid "Cuts up variables"
 msgstr ""
 
 #. Database access functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:97
-msgid "asterisk_module_appdb"
+msgid "Database access functions"
 msgstr ""
 
 #. Dialing Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:98
-msgid "asterisk_module_appdial"
+msgid "Dialing Application"
 msgstr ""
 
 #. Virtual Dictation Machine Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:99
-msgid "asterisk_module_appdictate"
+msgid "Virtual Dictation Machine Application"
 msgstr ""
 
 #. Directed Call Pickup Support
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:100
-msgid "asterisk_module_appdirectedpickup"
+msgid "Directed Call Pickup Support"
 msgstr ""
 
 #. Extension Directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:101
-msgid "asterisk_module_appdirectory"
+msgid "Extension Directory"
 msgstr ""
 
 #. DISA (Direct Inward System Access) Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:102
-msgid "asterisk_module_appdisa"
+msgid "DISA (Direct Inward System Access) Application"
 msgstr ""
 
 #. Dump channel variables Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:103
-msgid "asterisk_module_appdumpchan"
+msgid "Dump channel variables Application"
 msgstr ""
 
 #. Simple Echo Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:104
-msgid "asterisk_module_appecho"
+msgid "Simple Echo Application"
 msgstr ""
 
 #. ENUM Lookup
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:105
-msgid "asterisk_module_appenumlookup"
+msgid "ENUM Lookup"
 msgstr ""
 
 #. Reevaluates strings
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:106
-msgid "asterisk_module_appeval"
+msgid "Reevaluates strings"
 msgstr ""
 
 #. Executes applications
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:107
-msgid "asterisk_module_appexec"
+msgid "Executes applications"
 msgstr ""
 
 #. External IVR application interface
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:108
-msgid "asterisk_module_appexternalivr"
+msgid "External IVR application interface"
 msgstr ""
 
 #. Fork The CDR into 2 seperate entities
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:109
-msgid "asterisk_module_appforkcdr"
+msgid "Fork The CDR into 2 seperate entities"
 msgstr ""
 
 #. Get ADSI CPE ID
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:110
-msgid "asterisk_module_appgetcpeid"
+msgid "Get ADSI CPE ID"
 msgstr ""
 
 #. Group Management Routines
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:111
-msgid "asterisk_module_appgroupcount"
+msgid "Group Management Routines"
 msgstr ""
 
 #. Encode and Stream via icecast and ices
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:112
-msgid "asterisk_module_appices"
+msgid "Encode and Stream via icecast and ices"
 msgstr ""
 
 #. Image Transmission Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:113
-msgid "asterisk_module_appimage"
+msgid "Image Transmission Application"
 msgstr ""
 
 #. Look up Caller*ID name/number from black
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:114
-msgid "asterisk_module_applookupblacklist"
+msgid "Look up Caller*ID name/number from black"
 msgstr ""
 
 #. Look up CallerID Name from local databas
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:115
-msgid "asterisk_module_applookupcidname"
+msgid "Look up CallerID Name from local databas"
 msgstr ""
 
 #. Extension Macros
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:116
-msgid "asterisk_module_appmacro"
+msgid "Extension Macros"
 msgstr ""
 
 #. A simple math Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:117
-msgid "asterisk_module_appmath"
+msgid "A simple math Application"
 msgstr ""
 
 #. MD5 checksum Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:118
-msgid "asterisk_module_appmd5"
+msgid "MD5 checksum Application"
 msgstr ""
 
 #. Digital Milliwatt (mu-law) Test Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:119
-msgid "asterisk_module_appmilliwatt"
+msgid "Digital Milliwatt (mu-law) Test Application"
 msgstr ""
 
 #. Record a call and mix the audio during the recording
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:120
-msgid "asterisk_module_appmixmonitor"
+msgid "Record a call and mix the audio during the recording"
 msgstr ""
 
 #. Call Parking and Announce Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:121
-msgid "asterisk_module_appparkandannounce"
+msgid "Call Parking and Announce Application"
 msgstr ""
 
 #. Trivial Playback Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:122
-msgid "asterisk_module_appplayback"
+msgid "Trivial Playback Application"
 msgstr ""
 
 #. Require phone number to be entered
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:123
-msgid "asterisk_module_appprivacy"
+msgid "Require phone number to be entered"
 msgstr ""
 
 #. True Call Queueing
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:124
-msgid "asterisk_module_appqueue"
+msgid "True Call Queueing"
 msgstr ""
 
 #. Random goto
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:125
-msgid "asterisk_module_apprandom"
+msgid "Random goto"
 msgstr ""
 
 #. Read Variable Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:126
-msgid "asterisk_module_appread"
+msgid "Read Variable Application"
 msgstr ""
 
 #. Read in a file
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:127
-msgid "asterisk_module_appreadfile"
+msgid "Read in a file"
 msgstr ""
 
 #. Realtime Data Lookup/Rewrite
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:128
-msgid "asterisk_module_apprealtime"
+msgid "Realtime Data Lookup/Rewrite"
 msgstr ""
 
 #. Trivial Record Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:129
-msgid "asterisk_module_apprecord"
+msgid "Trivial Record Application"
 msgstr ""
 
 #. Say time
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:130
-msgid "asterisk_module_appsayunixtime"
+msgid "Say time"
 msgstr ""
 
 #. Send DTMF digits Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:131
-msgid "asterisk_module_appsenddtmf"
+msgid "Send DTMF digits Application"
 msgstr ""
 
 #. Send Text Applications
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:132
-msgid "asterisk_module_appsendtext"
+msgid "Send Text Applications"
 msgstr ""
 
 #. Set CallerID Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:133
-msgid "asterisk_module_appsetcallerid"
+msgid "Set CallerID Application"
 msgstr ""
 
 #. CDR user field apps
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:134
-msgid "asterisk_module_appsetcdruserfield"
+msgid "CDR user field apps"
 msgstr ""
 
 #. load =&gt; .so ; Set CallerID Name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:135
-msgid "asterisk_module_appsetcidname"
+msgid "load => .so ; Set CallerID Name"
 msgstr ""
 
 #. load =&gt; .so ; Set CallerID Number
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:136
-msgid "asterisk_module_appsetcidnum"
+msgid "load => .so ; Set CallerID Number"
 msgstr ""
 
 #. Set RDNIS Number
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:137
-msgid "asterisk_module_appsetrdnis"
+msgid "Set RDNIS Number"
 msgstr ""
 
 #. Set ISDN Transfer Capability
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:138
-msgid "asterisk_module_appsettransfercapability"
+msgid "Set ISDN Transfer Capability"
 msgstr ""
 
 #. SMS/PSTN handler
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:139
-msgid "asterisk_module_appsms"
+msgid "SMS/PSTN handler"
 msgstr ""
 
 #. Hangs up the requested channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:140
-msgid "asterisk_module_appsofthangup"
+msgid "Hangs up the requested channel"
 msgstr ""
 
 #. Stack Routines
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:141
-msgid "asterisk_module_appstack"
+msgid "Stack Routines"
 msgstr ""
 
 #. Generic System() application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:142
-msgid "asterisk_module_appsystem"
+msgid "Generic System() application"
 msgstr ""
 
 #. Playback with Talk Detection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:143
-msgid "asterisk_module_apptalkdetect"
+msgid "Playback with Talk Detection"
 msgstr ""
 
 #. Interface Test Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:144
-msgid "asterisk_module_apptest"
+msgid "Interface Test Application"
 msgstr ""
 
 #. Transfer
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:145
-msgid "asterisk_module_apptransfer"
+msgid "Transfer"
 msgstr ""
 
 #. TXTCIDName
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:146
-msgid "asterisk_module_apptxtcidname"
+msgid "TXTCIDName"
 msgstr ""
 
 #. Send URL Applications
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:147
-msgid "asterisk_module_appurl"
+msgid "Send URL Applications"
 msgstr ""
 
 #. Custom User Event Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:148
-msgid "asterisk_module_appuserevent"
+msgid "Custom User Event Application"
 msgstr ""
 
 #. Send verbose output
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:149
-msgid "asterisk_module_appverbose"
+msgid "Send verbose output"
 msgstr ""
 
 #. Voicemail
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:150
-msgid "asterisk_module_appvoicemail"
+msgid "Voicemail"
 msgstr ""
 
 #. Waits until first ring after time
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:151
-msgid "asterisk_module_appwaitforring"
+msgid "Waits until first ring after time"
 msgstr ""
 
 #. Wait For Silence Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:152
-msgid "asterisk_module_appwaitforsilence"
+msgid "Wait For Silence Application"
 msgstr ""
 
 #. While Loops and Conditional Execution
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:153
-msgid "asterisk_module_appwhile"
+msgid "While Loops and Conditional Execution"
 msgstr ""
 
 #. Comma Separated Values CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:154
-msgid "asterisk_module_cdrcsv"
+msgid "Comma Separated Values CDR Backend"
 msgstr ""
 
 #. Customizable Comma Separated Values CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:155
-msgid "asterisk_module_cdrcustom"
+msgid "Customizable Comma Separated Values CDR Backend"
 msgstr ""
 
 #. Asterisk Call Manager CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:156
-msgid "asterisk_module_cdrmanager"
+msgid "Asterisk Call Manager CDR Backend"
 msgstr ""
 
 #. MySQL CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:157
-msgid "asterisk_module_cdrmysql"
+msgid "MySQL CDR Backend"
 msgstr ""
 
 #. PostgreSQL CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:158
-msgid "asterisk_module_cdrpgsql"
+msgid "PostgreSQL CDR Backend"
 msgstr ""
 
 #. SQLite CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:159
-msgid "asterisk_module_cdrsqlite"
+msgid "SQLite CDR Backend"
 msgstr ""
 
 #. Agent Proxy Channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:160
-msgid "asterisk_module_chanagent"
+msgid "Agent Proxy Channel"
 msgstr ""
 
 #. Channel driver for GTalk
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:161
-msgid "asterisk_module_chanalsa"
+msgid "Channel driver for GTalk"
 msgstr ""
 
 #. Channel driver for GTalk
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:162
-msgid "asterisk_module_changtalk"
+msgid "Channel driver for GTalk"
 msgstr ""
 
 #. Option chan_iax2
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:163
-msgid "asterisk_module_chaniax2"
+msgid "Option chan_iax2"
 msgstr ""
 
 #. Local Proxy Channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:164
-msgid "asterisk_module_chanlocal"
+msgid "Local Proxy Channel"
 msgstr ""
 
 #. Session Initiation Protocol (SIP)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:165
-msgid "asterisk_module_chansip"
+msgid "Session Initiation Protocol (SIP)"
 msgstr ""
 
 #. Adaptive Differential PCM Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:166
-msgid "asterisk_module_codecadpcm"
+msgid "Adaptive Differential PCM Coder/Decoder"
 msgstr ""
 
 #. A-law Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:167
-msgid "asterisk_module_codecalaw"
+msgid "A-law Coder/Decoder"
 msgstr ""
 
 #. A-law and Mulaw direct Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:168
-msgid "asterisk_module_codecamu"
+msgid "A-law and Mulaw direct Coder/Decoder"
 msgstr ""
 
 #. ITU G.726-32kbps G726 Transcoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:169
-msgid "asterisk_module_codecg726"
+msgid "ITU G.726-32kbps G726 Transcoder"
 msgstr ""
 
 #. GSM/PCM16 (signed linear) Codec Translation
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:170
-msgid "asterisk_module_codecgsm"
+msgid "GSM/PCM16 (signed linear) Codec Translation"
 msgstr ""
 
 #. Speex/PCM16 (signed linear) Codec Translator
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:171
-msgid "asterisk_module_codecspeex"
+msgid "Speex/PCM16 (signed linear) Codec Translator"
 msgstr ""
 
 #. Mu-law Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:172
-msgid "asterisk_module_codeculaw"
+msgid "Mu-law Coder/Decoder"
 msgstr ""
 
 #. Sun Microsystems AU format (signed linear)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:173
-msgid "asterisk_module_formatau"
+msgid "Sun Microsystems AU format (signed linear)"
 msgstr ""
 
 #. G.723.1 Simple Timestamp File Format
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:174
-msgid "asterisk_module_formatg723"
+msgid "G.723.1 Simple Timestamp File Format"
 msgstr ""
 
 #. Raw G.726 (16/24/32/40kbps) data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:175
-msgid "asterisk_module_formatg726"
+msgid "Raw G.726 (16/24/32/40kbps) data"
 msgstr ""
 
 #. Raw G729 data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:176
-msgid "asterisk_module_formatg729"
+msgid "Raw G729 data"
 msgstr ""
 
 #. Raw GSM data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:177
-msgid "asterisk_module_formatgsm"
+msgid "Raw GSM data"
 msgstr ""
 
 #. Raw h263 data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:178
-msgid "asterisk_module_formath263"
+msgid "Raw h263 data"
 msgstr ""
 
 #. JPEG (Joint Picture Experts Group) Image
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:179
-msgid "asterisk_module_formatjpeg"
+msgid "JPEG (Joint Picture Experts Group) Image"
 msgstr ""
 
 #. Raw uLaw 8khz Audio support (PCM)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:180
-msgid "asterisk_module_formatpcm"
+msgid "Raw uLaw 8khz Audio support (PCM)"
 msgstr ""
 
 #. load =&gt; .so ; Raw aLaw 8khz PCM Audio support
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:181
-msgid "asterisk_module_formatpcmalaw"
+msgid "load => .so ; Raw aLaw 8khz PCM Audio support"
 msgstr ""
 
 #. Raw Signed Linear Audio support (SLN)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:182
-msgid "asterisk_module_formatsln"
+msgid "Raw Signed Linear Audio support (SLN)"
 msgstr ""
 
 #. Dialogic VOX (ADPCM) File Format
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:183
-msgid "asterisk_module_formatvox"
+msgid "Dialogic VOX (ADPCM) File Format"
 msgstr ""
 
 #. Microsoft WAV format (8000hz Signed Line
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:184
-msgid "asterisk_module_formatwav"
+msgid "Microsoft WAV format (8000hz Signed Line"
 msgstr ""
 
 #. Microsoft WAV format (Proprietary GSM)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:185
-msgid "asterisk_module_formatwavgsm"
+msgid "Microsoft WAV format (Proprietary GSM)"
 msgstr ""
 
 #. Caller ID related dialplan functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:186
-msgid "asterisk_module_funccallerid"
+msgid "Caller ID related dialplan functions"
 msgstr ""
 
 #. ENUM Functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:187
-msgid "asterisk_module_funcenum"
+msgid "ENUM Functions"
 msgstr ""
 
 #. URI encoding / decoding functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:188
-msgid "asterisk_module_funcuri"
+msgid "URI encoding / decoding functions"
 msgstr ""
 
 #. Asterisk Extension Language Compiler
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:189
-msgid "asterisk_module_pbxael"
+msgid "Asterisk Extension Language Compiler"
 msgstr ""
 
 #. Text Extension Configuration
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:190
-msgid "asterisk_module_pbxconfig"
+msgid "Text Extension Configuration"
 msgstr ""
 
 #. load =&gt; .so ; Builtin dialplan functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:191
-msgid "asterisk_module_pbxfunctions"
+msgid "load => .so ; Builtin dialplan functions"
 msgstr ""
 
 #. Loopback Switch
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:192
-msgid "asterisk_module_pbxloopback"
+msgid "Loopback Switch"
 msgstr ""
 
 #. Realtime Switch
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:193
-msgid "asterisk_module_pbxrealtime"
+msgid "Realtime Switch"
 msgstr ""
 
 #. Outgoing Spool Support
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:194
-msgid "asterisk_module_pbxspool"
+msgid "Outgoing Spool Support"
 msgstr ""
 
 #. Wil Cal U (Auto Dialer)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:195
-msgid "asterisk_module_pbxwilcalu"
+msgid "Wil Cal U (Auto Dialer)"
 msgstr ""
 
 #. MySQL Config Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:196
-msgid "asterisk_module_resconfigmysql"
+msgid "MySQL Config Resource"
 msgstr ""
 
 #. ODBC Config Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:197
-msgid "asterisk_module_resconfigodbc"
+msgid "ODBC Config Resource"
 msgstr ""
 
 #. PGSQL Module
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:198
-msgid "asterisk_module_resconfigpgsql"
+msgid "PGSQL Module"
 msgstr ""
 
 #. Cryptographic Digital Signatures
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:199
-msgid "asterisk_module_rescrypto"
+msgid "Cryptographic Digital Signatures"
 msgstr ""
 
 #. Call Parking Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:200
-msgid "asterisk_module_resfeatures"
+msgid "Call Parking Resource"
 msgstr ""
 
 #. Indications Configuration
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:201
-msgid "asterisk_module_resindications"
+msgid "Indications Configuration"
 msgstr ""
 
 #. Call Monitoring Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:202
-msgid "asterisk_module_resmonitor"
+msgid "Call Monitoring Resource"
 msgstr ""
 
 #. Music On Hold Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:203
-msgid "asterisk_module_resmusiconhold"
+msgid "Music On Hold Resource"
 msgstr ""
 
 #. ODBC Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:204
-msgid "asterisk_module_resodbc"
+msgid "ODBC Resource"
 msgstr ""
 
 #. SMDI Module
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:205
-msgid "asterisk_module_ressmdi"
+msgid "SMDI Module"
 msgstr ""
 
 #. SNMP Module
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:206
-msgid "asterisk_module_ressnmp"
+msgid "SNMP Module"
 msgstr ""
 
 #. Music On Hold
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:207
-msgid "asterisk_moh"
+msgid "Music On Hold"
 msgstr ""
 
 #. Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:208
-msgid "asterisk_moh_application"
+msgid "Application"
 msgstr ""
 
 #. Directory of Music
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:209
-msgid "asterisk_moh_directory"
+msgid "Directory of Music"
 msgstr ""
 
 #. Option mode
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:210
-msgid "asterisk_moh_mode"
+msgid "Option mode"
 msgstr ""
 
 #. Random Play
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:211
-msgid "asterisk_moh_random"
+msgid "Random Play"
 msgstr ""
 
 #. SIP Connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:212
-msgid "asterisk_sip"
+msgid "SIP Connection"
 msgstr ""
 
 #. Always Dial International
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:213
-msgid "asterisk_sip_alwaysinternational"
+msgid "Always Dial International"
 msgstr ""
 
 #. Reinvite/redirect media connections
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:214
-msgid "asterisk_sip_canreinvite"
+msgid "Reinvite/redirect media connections"
 msgstr ""
 
 #. context
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:215
-msgid "asterisk_sip_context"
+msgid "context"
 msgstr ""
 
 #. Country Code for connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:216
-msgid "asterisk_sip_countrycode"
+msgid "Country Code for connection"
 msgstr ""
 
 #. DTMF mode
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:217
-msgid "asterisk_sip_dtmfmode"
+msgid "DTMF mode"
 msgstr ""
 
 #. Add as Extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:218
-msgid "asterisk_sip_extension"
+msgid "Add as Extension"
 msgstr ""
 
 #. Primary domain identity for From: headers
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:219
-msgid "asterisk_sip_fromdomain"
+msgid "Primary domain identity for From: headers"
 msgstr ""
 
 #. From user (required by many SIP providers)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:220
-msgid "asterisk_sip_fromuser"
+msgid "From user (required by many SIP providers)"
 msgstr ""
 
 #. Host name (or blank)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:221
-msgid "asterisk_sip_host"
+msgid "Host name (or blank)"
 msgstr ""
 
 #. Ring on incoming dialplan contexts
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:222
-msgid "asterisk_sip_incoming"
+msgid "Ring on incoming dialplan contexts"
 msgstr ""
 
 #. Allow Insecure for
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:223
-msgid "asterisk_sip_insecure"
+msgid "Allow Insecure for"
 msgstr ""
 
 #. International Dial Prefix
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:224
-msgid "asterisk_sip_internationalprefix"
+msgid "International Dial Prefix"
 msgstr ""
 
 #. Mailbox for MWI
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:225
-msgid "asterisk_sip_mailbox"
+msgid "Mailbox for MWI"
 msgstr ""
 
 #. NAT between phone and Asterisk
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:226
-msgid "asterisk_sip_nat"
+msgid "NAT between phone and Asterisk"
 msgstr ""
 
 #. Check tags in headers
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:227
-msgid "asterisk_sip_pedantic"
+msgid "Check tags in headers"
 msgstr ""
 
 #. SIP Port
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:228
-msgid "asterisk_sip_port"
+msgid "SIP Port"
 msgstr ""
 
 #. Dial Prefix (for external line)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:229
-msgid "asterisk_sip_prefix"
+msgid "Dial Prefix (for external line)"
 msgstr ""
 
 #. Reply Timeout (ms) for down connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:230
-msgid "asterisk_sip_qualify"
+msgid "Reply Timeout (ms) for down connection"
 msgstr ""
 
 #. Register connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:231
-msgid "asterisk_sip_register"
+msgid "Register connection"
 msgstr ""
 
 #. Secret
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:232
-msgid "asterisk_sip_secret"
+msgid "Secret"
 msgstr ""
 
 #. Dial own extension for mailbox
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:233
-msgid "asterisk_sip_selfmailbox"
+msgid "Dial own extension for mailbox"
 msgstr ""
 
 #. Dial Timeout (sec)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:234
-msgid "asterisk_sip_timeout"
+msgid "Dial Timeout (sec)"
 msgstr ""
 
 #. Client Type
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:235
-msgid "asterisk_sip_type"
+msgid "Client Type"
 msgstr ""
 
 #. Username
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:236
-msgid "asterisk_sip_username"
+msgid "Username"
 msgstr ""
 
 #. Section sipgeneral
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:237
-msgid "asterisk_sipgeneral"
+msgid "Section sipgeneral"
 msgstr ""
 
 #. Allow codecs
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:238
-msgid "asterisk_sipgeneral_allow"
+msgid "Allow codecs"
 msgstr ""
 
 #. SIP Port
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:239
-msgid "asterisk_sipgeneral_port"
+msgid "SIP Port"
 msgstr ""
 
 #. SIP realm
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:240
-msgid "asterisk_sipgeneral_realm"
+msgid "SIP realm"
 msgstr ""
 
 #. Voicemail general options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:241
-msgid "asterisk_voicegeneral"
+msgid "Voicemail general options"
 msgstr ""
 
 #. From Email address of server
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:242
-msgid "asterisk_voicegeneral_serveremail"
+msgid "From Email address of server"
 msgstr ""
 
 #. Voice Mail boxes
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:243
-msgid "asterisk_voicemail"
+msgid "Voice Mail boxes"
 msgstr ""
 
 #. Email contains attachment
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:244
-msgid "asterisk_voicemail_attach"
+msgid "Email contains attachment"
 msgstr ""
 
 #. Email
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:245
-msgid "asterisk_voicemail_email"
+msgid "Email"
 msgstr ""
 
 #. Display Name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:246
-msgid "asterisk_voicemail_name"
+msgid "Display Name"
 msgstr ""
 
 #. Password
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:247
-msgid "asterisk_voicemail_password"
+msgid "Password"
 msgstr ""
 
 #. zone
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:248
-msgid "asterisk_voicemail_zone"
+msgid "zone"
 msgstr ""
 
 #. Voice Zone settings
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:249
-msgid "asterisk_voicezone"
+msgid "Voice Zone settings"
 msgstr ""
 
 #. Message Format
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:250
-msgid "asterisk_voicezone_message"
+msgid "Message Format"
 msgstr ""
 
 #. Time Zone
diff --git a/po/ru/cbi.po b/po/ru/cbi.po
index 59894415f..30802cb30 100644
--- a/po/ru/cbi.po
+++ b/po/ru/cbi.po
@@ -14,82 +14,82 @@ msgstr ""
 
 #. Add entry
 #: i18n/english/luasrc/i18n/cbi.en.lua:1
-msgid "cbi_add"
+msgid "Add"
 msgstr "Добавить"
 
 #. Remove entry
 #: i18n/english/luasrc/i18n/cbi.en.lua:2
-msgid "cbi_del"
+msgid "Delete"
 msgstr "Удалить"
 
 #. Replace entry
 #: i18n/english/luasrc/i18n/cbi.en.lua:3
-msgid "cbi_replace"
+msgid "Replace entry"
 msgstr ""
 
 #. Invalid input value
 #: i18n/english/luasrc/i18n/cbi.en.lua:4
-msgid "cbi_invalid"
+msgid "Invalid"
 msgstr "<strong>Ошибка:</strong> Введёное значение не верно"
 
 #. <strong>Validation failed:</strong> Please check any input fields for mistakes.
 #: i18n/english/luasrc/i18n/cbi.en.lua:5
-msgid "cbi_invalid_section"
+msgid "<strong>Validation failed:</strong> Please check any input fields for mistakes."
 msgstr ""
 
 #. This field is mandatory
 #: i18n/english/luasrc/i18n/cbi.en.lua:6
-msgid "cbi_missing"
+msgid "This field is mandatory"
 msgstr "<strong>Ошибка:</strong> Это поле обязательно к заполнению"
 
 #. <strong>Validation failed:</strong> At least one mandatory field has no or an invalid value
 #: i18n/english/luasrc/i18n/cbi.en.lua:7
-msgid "cbi_deperror"
+msgid "<strong>Validation failed:</strong> At least one mandatory field has no or an invalid value"
 msgstr ""
 
 #. A requirement for this option was not met
 #: i18n/english/luasrc/i18n/cbi.en.lua:8
-msgid "cbi_reqerror"
+msgid "A requirement for this option was not met"
 msgstr ""
 
 #. -- Additional Field --
 #: i18n/english/luasrc/i18n/cbi.en.lua:9
-msgid "cbi_addopt"
+msgid "-- Additional Field --"
 msgstr "-- Дополнительная вкладка --"
 
 #.  (optional)
 #: i18n/english/luasrc/i18n/cbi.en.lua:10
-msgid "cbi_optional"
+msgid " (optional)"
 msgstr " (дополнительно)"
 
 #. This section contains no values yet
 #: i18n/english/luasrc/i18n/cbi.en.lua:11
-msgid "cbi_sectempty"
+msgid "This section contains no values yet"
 msgstr "Эта секция пока не содержит значений"
 
 #. -- custom --
 #: i18n/english/luasrc/i18n/cbi.en.lua:12
-msgid "cbi_manual"
+msgid "-- custom --"
 msgstr "-- выборочный --"
 
 #. -- Please choose --
 #: i18n/english/luasrc/i18n/cbi.en.lua:13
-msgid "cbi_select"
+msgid "-- Please choose --"
 msgstr "-- Пожалуйста выберете --"
 
 #. Go to relevant configuration page
 #: i18n/english/luasrc/i18n/cbi.en.lua:14
-msgid "cbi_gorel"
+msgid " "
 msgstr "Перейти к странице конфигурации"
 
 #. Applying changes
 #: i18n/english/luasrc/i18n/cbi.en.lua:15
-msgid "cbi_applying"
+msgid "Applying changes"
 msgstr ""
 
 #. Uploaded File
 #: i18n/english/luasrc/i18n/cbi.en.lua:16
-msgid "cbi_upload"
+msgid "Uploaded File"
 msgstr ""
 
 #. Search file...
diff --git a/po/ru/coovachilli.po b/po/ru/coovachilli.po
index f9e02ff30..dd6495d6f 100644
--- a/po/ru/coovachilli.po
+++ b/po/ru/coovachilli.po
@@ -14,882 +14,882 @@ msgstr ""
 
 #. CoovaChilli
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:1
-msgid "coovachilli"
+msgid "CoovaChilli"
 msgstr ""
 
 #. General configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:2
-msgid "coovachilli_general"
+msgid "General configuration"
 msgstr ""
 
 #. General CoovaChilli settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:3
-msgid "coovachilli_general_desc"
+msgid "General CoovaChilli settings"
 msgstr ""
 
 #. Command socket
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:4
-msgid "coovachilli_general_cmdsock"
+msgid "Command socket"
 msgstr ""
 
 #. UNIX socket used for communication with chilli_query
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:5
-msgid "coovachilli_general_cmdsock_desc"
+msgid "UNIX socket used for communication with chilli_query"
 msgstr ""
 
 #. Config refresh interval
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:6
-msgid "coovachilli_general_interval"
+msgid "Config refresh interval"
 msgstr ""
 
 #. Re-read configuration file and do DNS lookups every interval seconds. This has the same effect as sending the HUP signal. If interval is 0 (zero) this feature is disabled. 
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:7
-msgid "coovachilli_general_interval_desc"
+msgid "Re-read configuration file and do DNS lookups every interval seconds. This has the same effect as sending the HUP signal. If interval is 0 (zero) this feature is disabled. "
 msgstr ""
 
 #. Pid file
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:8
-msgid "coovachilli_general_pidfile"
+msgid "Pid file"
 msgstr ""
 
 #. Filename to put the process id
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:9
-msgid "coovachilli_general_pidfile_desc"
+msgid "Filename to put the process id"
 msgstr ""
 
 #. State directory
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:10
-msgid "coovachilli_general_statedir"
+msgid "State directory"
 msgstr ""
 
 #. Directory of non-volatile data
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:11
-msgid "coovachilli_general_statedir_desc"
+msgid "Directory of non-volatile data"
 msgstr ""
 
 #. TUN/TAP configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:12
-msgid "coovachilli_tun"
+msgid "TUN/TAP configuration"
 msgstr ""
 
 #. Network/Tun configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:13
-msgid "coovachilli_tun_desc"
+msgid "Network/Tun configuration"
 msgstr ""
 
 #. Network down script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:14
-msgid "coovachilli_tun_condown"
+msgid "Network down script"
 msgstr ""
 
 #. Script executed after a session has moved from authorized state to unauthorized
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:15
-msgid "coovachilli_tun_condown_desc"
+msgid "Script executed after a session has moved from authorized state to unauthorized"
 msgstr ""
 
 #. Network up script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:16
-msgid "coovachilli_tun_conup"
+msgid "Network up script"
 msgstr ""
 
 #. Script executed after the tun network interface has been brought up
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:17
-msgid "coovachilli_tun_conup_desc"
+msgid "Script executed after the tun network interface has been brought up"
 msgstr ""
 
 #. Primary DNS Server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:18
-msgid "coovachilli_tun_dns1"
+msgid "Primary DNS Server"
 msgstr ""
 
 #. Is used to inform the client about the DNS address to use for host name resolution
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:19
-msgid "coovachilli_tun_dns1_desc"
+msgid "Is used to inform the client about the DNS address to use for host name resolution"
 msgstr ""
 
 #. Secondary DNS Server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:20
-msgid "coovachilli_tun_dns2"
+msgid "Secondary DNS Server"
 msgstr ""
 
 #. Is used to inform the client about the DNS address to use for host name resolution
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:21
-msgid "coovachilli_tun_dns2_desc"
+msgid "Is used to inform the client about the DNS address to use for host name resolution"
 msgstr ""
 
 #. Domain name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:22
-msgid "coovachilli_tun_domain"
+msgid "Domain name"
 msgstr ""
 
 #. Is used to inform the client about the domain name to use for DNS lookups
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:23
-msgid "coovachilli_tun_domain_desc"
+msgid "Is used to inform the client about the domain name to use for DNS lookups"
 msgstr ""
 
 #. Dynamic IP address pool
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:24
-msgid "coovachilli_tun_dynip"
+msgid "Dynamic IP address pool"
 msgstr ""
 
 #. Specifies a pool of dynamic IP addresses
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:25
-msgid "coovachilli_tun_dynip_desc"
+msgid "Specifies a pool of dynamic IP addresses"
 msgstr ""
 
 #. IP down script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:26
-msgid "coovachilli_tun_ipdown"
+msgid "IP down script"
 msgstr ""
 
 #. Script executed after the tun network interface has been taken down
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:27
-msgid "coovachilli_tun_ipdown_desc"
+msgid "Script executed after the tun network interface has been taken down"
 msgstr ""
 
 #. IP up script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:28
-msgid "coovachilli_tun_ipup"
+msgid "IP up script"
 msgstr ""
 
 #. Script executed after the TUN/TAP network interface has been brought up
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:29
-msgid "coovachilli_tun_ipup_desc"
+msgid "Script executed after the TUN/TAP network interface has been brought up"
 msgstr ""
 
 #. Uplink subnet
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:30
-msgid "coovachilli_tun_net"
+msgid "Uplink subnet"
 msgstr ""
 
 #. Network address of the uplink interface (CIDR notation)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:31
-msgid "coovachilli_tun_net_desc"
+msgid "Network address of the uplink interface (CIDR notation)"
 msgstr ""
 
 #. Static IP address pool
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:32
-msgid "coovachilli_tun_statip"
+msgid "Static IP address pool"
 msgstr ""
 
 #. Specifies a pool of static IP addresses
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:33
-msgid "coovachilli_tun_statip_desc"
+msgid "Specifies a pool of static IP addresses"
 msgstr ""
 
 #. TUN/TAP device
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:34
-msgid "coovachilli_tun_tundev"
+msgid "TUN/TAP device"
 msgstr ""
 
 #. The specific device to use for the TUN/TAP interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:35
-msgid "coovachilli_tun_tundev_desc"
+msgid "The specific device to use for the TUN/TAP interface"
 msgstr ""
 
 #. TX queue length
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:36
-msgid "coovachilli_tun_txqlen"
+msgid "TX queue length"
 msgstr ""
 
 #. The TX queue length to set on the TUN/TAP interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:37
-msgid "coovachilli_tun_txqlen_desc"
+msgid "The TX queue length to set on the TUN/TAP interface"
 msgstr ""
 
 #. Use TAP device
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:38
-msgid "coovachilli_tun_usetap"
+msgid "Use TAP device"
 msgstr ""
 
 #. Use the TAP interface instead of TUN
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:39
-msgid "coovachilli_tun_usetap_desc"
+msgid "Use the TAP interface instead of TUN"
 msgstr ""
 
 #. DHCP configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:40
-msgid "coovachilli_dhcp"
+msgid "DHCP configuration"
 msgstr ""
 
 #. Set DHCP options for connecting clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:41
-msgid "coovachilli_dhcp_desc"
+msgid "Set DHCP options for connecting clients"
 msgstr ""
 
 #. DHCP end number
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:42
-msgid "coovachilli_dhcp_dhcpend"
+msgid "DHCP end number"
 msgstr ""
 
 #. Where to stop assigning IP addresses (default 254)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:43
-msgid "coovachilli_dhcp_dhcpend_desc"
+msgid "Where to stop assigning IP addresses (default 254)"
 msgstr ""
 
 #. DHCP interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:44
-msgid "coovachilli_dhcp_dhcpif"
+msgid "DHCP interface"
 msgstr ""
 
 #. Ethernet interface to listen to for the downlink interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:45
-msgid "coovachilli_dhcp_dhcpif_desc"
+msgid "Ethernet interface to listen to for the downlink interface"
 msgstr ""
 
 #. Listen MAC address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:46
-msgid "coovachilli_dhcp_dhcpmac"
+msgid "Listen MAC address"
 msgstr ""
 
 #. MAC address to listen to. If not specified the MAC address of the interface will be used
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:47
-msgid "coovachilli_dhcp_dhcpmac_desc"
+msgid "MAC address to listen to. If not specified the MAC address of the interface will be used"
 msgstr ""
 
 #. DHCP start number
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:48
-msgid "coovachilli_dhcp_dhcpstart"
+msgid "DHCP start number"
 msgstr ""
 
 #. Where to start assigning IP addresses (default 10)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:49
-msgid "coovachilli_dhcp_dhcpstart_desc"
+msgid "Where to start assigning IP addresses (default 10)"
 msgstr ""
 
 #. Enable IEEE 802.1x
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:50
-msgid "coovachilli_dhcp_eapolenable"
+msgid "Enable IEEE 802.1x"
 msgstr ""
 
 #. Enable IEEE 802.1x authentication and listen for EAP requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:51
-msgid "coovachilli_dhcp_eapolenable_desc"
+msgid "Enable IEEE 802.1x authentication and listen for EAP requests"
 msgstr ""
 
 #. Leasetime
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:52
-msgid "coovachilli_dhcp_lease"
+msgid "Leasetime"
 msgstr ""
 
 #. Use a DHCP lease of seconds (default 600)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:53
-msgid "coovachilli_dhcp_lease_desc"
+msgid "Use a DHCP lease of seconds (default 600)"
 msgstr ""
 
 #. RADIUS configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:54
-msgid "coovachilli_radius"
+msgid "RADIUS configuration"
 msgstr ""
 
 #. RADIUS configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:55
-msgid "coovachilli_radius_desc"
+msgid "RADIUS configuration"
 msgstr ""
 
 #. Allow session update through RADIUS
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:56
-msgid "coovachilli_radius_acctupdate"
+msgid "Allow session update through RADIUS"
 msgstr ""
 
 #. Allow updating of session parameters with RADIUS attributes sent in Accounting-Response
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:57
-msgid "coovachilli_radius_acctupdate_desc"
+msgid "Allow updating of session parameters with RADIUS attributes sent in Accounting-Response"
 msgstr ""
 
 #. Admin password
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:58
-msgid "coovachilli_radius_adminpasswd"
+msgid "Admin password"
 msgstr ""
 
 #. Password to use for Administrative-User authentication in order to pick up chilli configurations and establish a device &quot;system&quot; session
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:59
-msgid "coovachilli_radius_adminpasswd_desc"
+msgid "Password to use for Administrative-User authentication in order to pick up chilli configurations and establish a device \"system\" session"
 msgstr ""
 
 #. Admin user
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:60
-msgid "coovachilli_radius_adminuser"
+msgid "Admin user"
 msgstr ""
 
 #. User-name to use for Administrative-User authentication in order to pick up chilli configurations and establish a device &quot;system&quot; session
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:61
-msgid "coovachilli_radius_adminuser_desc"
+msgid "User-name to use for Administrative-User authentication in order to pick up chilli configurations and establish a device \"system\" session"
 msgstr ""
 
 #. Do not check disconnection requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:62
-msgid "coovachilli_radius_coanoipcheck"
+msgid "Do not check disconnection requests"
 msgstr ""
 
 #. Do not check the source IP address of radius disconnect requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:63
-msgid "coovachilli_radius_coanoipcheck_desc"
+msgid "Do not check the source IP address of radius disconnect requests"
 msgstr ""
 
 #. RADIUS disconnect port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:64
-msgid "coovachilli_radius_coaport"
+msgid "RADIUS disconnect port"
 msgstr ""
 
 #. UDP port to listen to for accepting radius disconnect requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:65
-msgid "coovachilli_radius_coaport_desc"
+msgid "UDP port to listen to for accepting radius disconnect requests"
 msgstr ""
 
 #. NAS IP
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:66
-msgid "coovachilli_radius_nasip"
+msgid "NAS IP"
 msgstr ""
 
 #. Value to use in RADIUS NAS-IP-Address attribute
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:67
-msgid "coovachilli_radius_nasip_desc"
+msgid "Value to use in RADIUS NAS-IP-Address attribute"
 msgstr ""
 
 #. NAS MAC
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:68
-msgid "coovachilli_radius_nasmac"
+msgid "NAS MAC"
 msgstr ""
 
 #. MAC address value to use in RADIUS Called-Station-ID attribute
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:69
-msgid "coovachilli_radius_nasmac_desc"
+msgid "MAC address value to use in RADIUS Called-Station-ID attribute"
 msgstr ""
 
 #. Allow OpenID authentication
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:70
-msgid "coovachilli_radius_openidauth"
+msgid "Allow OpenID authentication"
 msgstr ""
 
 #. Allows OpenID authentication by sending ChilliSpot-Config=allow-openidauth in RADIUS Access-Requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:71
-msgid "coovachilli_radius_openidauth_desc"
+msgid "Allows OpenID authentication by sending ChilliSpot-Config=allow-openidauth in RADIUS Access-Requests"
 msgstr ""
 
 #. RADIUS accounting port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:72
-msgid "coovachilli_radius_radiusacctport"
+msgid "RADIUS accounting port"
 msgstr ""
 
 #. The UDP port number to use for radius accounting requests (default 1813)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:73
-msgid "coovachilli_radius_radiusacctport_desc"
+msgid "The UDP port number to use for radius accounting requests (default 1813)"
 msgstr ""
 
 #. RADIUS authentication port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:74
-msgid "coovachilli_radius_radiusauthport"
+msgid "RADIUS authentication port"
 msgstr ""
 
 #. The UDP port number to use for radius authentication requests (default 1812)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:75
-msgid "coovachilli_radius_radiusauthport_desc"
+msgid "The UDP port number to use for radius authentication requests (default 1812)"
 msgstr ""
 
 #. Option radiuscalled
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:76
-msgid "coovachilli_radius_radiuscalled"
+msgid "Option radiuscalled"
 msgstr ""
 
 #. RADIUS listen address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:77
-msgid "coovachilli_radius_radiuslisten"
+msgid "RADIUS listen address"
 msgstr ""
 
 #. Local interface IP address to use for the radius interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:78
-msgid "coovachilli_radius_radiuslisten_desc"
+msgid "Local interface IP address to use for the radius interface"
 msgstr ""
 
 #. RADIUS location ID
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:79
-msgid "coovachilli_radius_radiuslocationid"
+msgid "RADIUS location ID"
 msgstr ""
 
 #. WISPr Location ID
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:80
-msgid "coovachilli_radius_radiuslocationid_desc"
+msgid "WISPr Location ID"
 msgstr ""
 
 #. RADIUS location name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:81
-msgid "coovachilli_radius_radiuslocationname"
+msgid "RADIUS location name"
 msgstr ""
 
 #. WISPr Location Name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:82
-msgid "coovachilli_radius_radiuslocationname_desc"
+msgid "WISPr Location Name"
 msgstr ""
 
 #. NAS ID
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:83
-msgid "coovachilli_radius_radiusnasid"
+msgid "NAS ID"
 msgstr ""
 
 #. Network access server identifier
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:84
-msgid "coovachilli_radius_radiusnasid_desc"
+msgid "Network access server identifier"
 msgstr ""
 
 #. Option radiusnasip
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:85
-msgid "coovachilli_radius_radiusnasip"
+msgid "Option radiusnasip"
 msgstr ""
 
 #. NAS port type
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:86
-msgid "coovachilli_radius_radiusnasporttype"
+msgid "NAS port type"
 msgstr ""
 
 #. Value of NAS-Port-Type attribute. Defaults to 19 (Wireless-IEEE-802.11)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:87
-msgid "coovachilli_radius_radiusnasporttype_desc"
+msgid "Value of NAS-Port-Type attribute. Defaults to 19 (Wireless-IEEE-802.11)"
 msgstr ""
 
 #. Send RADIUS VSA
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:88
-msgid "coovachilli_radius_radiusoriginalurl"
+msgid "Send RADIUS VSA"
 msgstr ""
 
 #. Send the ChilliSpot-OriginalURL RADIUS VSA in Access-Request
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:89
-msgid "coovachilli_radius_radiusoriginalurl_desc"
+msgid "Send the ChilliSpot-OriginalURL RADIUS VSA in Access-Request"
 msgstr ""
 
 #. RADIUS secret
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:90
-msgid "coovachilli_radius_radiussecret"
+msgid "RADIUS secret"
 msgstr ""
 
 #. Radius shared secret for both servers
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:91
-msgid "coovachilli_radius_radiussecret_desc"
+msgid "Radius shared secret for both servers"
 msgstr ""
 
 #. RADIUS server 1
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:92
-msgid "coovachilli_radius_radiusserver1"
+msgid "RADIUS server 1"
 msgstr ""
 
 #. The IP address of radius server 1
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:93
-msgid "coovachilli_radius_radiusserver1_desc"
+msgid "The IP address of radius server 1"
 msgstr ""
 
 #. RADIUS server 2
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:94
-msgid "coovachilli_radius_radiusserver2"
+msgid "RADIUS server 2"
 msgstr ""
 
 #. The IP address of radius server 2
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:95
-msgid "coovachilli_radius_radiusserver2_desc"
+msgid "The IP address of radius server 2"
 msgstr ""
 
 #. Swap octets
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:96
-msgid "coovachilli_radius_swapoctets"
+msgid "Swap octets"
 msgstr ""
 
 #. Swap the meaning of &quot;input octets&quot; and &quot;output octets&quot; as it related to RADIUS attribtues
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:97
-msgid "coovachilli_radius_swapoctets_desc"
+msgid "Swap the meaning of \"input octets\" and \"output octets\" as it related to RADIUS attribtues"
 msgstr ""
 
 #. Allow WPA guests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:98
-msgid "coovachilli_radius_wpaguests"
+msgid "Allow WPA guests"
 msgstr ""
 
 #. Allows WPA Guest authentication by sending ChilliSpot-Config=allow-wpa-guests in RADIUS Access-Requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:99
-msgid "coovachilli_radius_wpaguests_desc"
+msgid "Allows WPA Guest authentication by sending ChilliSpot-Config=allow-wpa-guests in RADIUS Access-Requests"
 msgstr ""
 
 #. RADIUS proxy settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:100
-msgid "coovachilli_proxy"
+msgid "RADIUS proxy settings"
 msgstr ""
 
 #. RADIUS proxy settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:101
-msgid "coovachilli_proxy_desc"
+msgid "RADIUS proxy settings"
 msgstr ""
 
 #. Proxy client
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:102
-msgid "coovachilli_proxy_proxyclient"
+msgid "Proxy client"
 msgstr ""
 
 #. IP address from which radius requests are accepted. If omitted the server will not accept radius requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:103
-msgid "coovachilli_proxy_proxyclient_desc"
+msgid "IP address from which radius requests are accepted. If omitted the server will not accept radius requests"
 msgstr ""
 
 #. Proxy listen address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:104
-msgid "coovachilli_proxy_proxylisten"
+msgid "Proxy listen address"
 msgstr ""
 
 #. Local interface IP address to use for accepting radius requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:105
-msgid "coovachilli_proxy_proxylisten_desc"
+msgid "Local interface IP address to use for accepting radius requests"
 msgstr ""
 
 #. Proxy port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:106
-msgid "coovachilli_proxy_proxyport"
+msgid "Proxy port"
 msgstr ""
 
 #. UDP Port to listen to for accepting radius requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:107
-msgid "coovachilli_proxy_proxyport_desc"
+msgid "UDP Port to listen to for accepting radius requests"
 msgstr ""
 
 #. Proxy secret
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:108
-msgid "coovachilli_proxy_proxysecret"
+msgid "Proxy secret"
 msgstr ""
 
 #. Radius shared secret for clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:109
-msgid "coovachilli_proxy_proxysecret_desc"
+msgid "Radius shared secret for clients"
 msgstr ""
 
 #. UAM configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:110
-msgid "coovachilli_uam"
+msgid "UAM configuration"
 msgstr ""
 
 #. Unified Configuration Method settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:111
-msgid "coovachilli_uam_desc"
+msgid "Unified Configuration Method settings"
 msgstr ""
 
 #. Use Chilli XML
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:112
-msgid "coovachilli_uam_chillixml"
+msgid "Use Chilli XML"
 msgstr ""
 
 #. Return the so-called Chilli XML along with WISPr XML
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:113
-msgid "coovachilli_uam_chillixml_desc"
+msgid "Return the so-called Chilli XML along with WISPr XML"
 msgstr ""
 
 #. Default idle timeout
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:114
-msgid "coovachilli_uam_defidletimeout"
+msgid "Default idle timeout"
 msgstr ""
 
 #. Default idle timeout unless otherwise set by RADIUS (defaults to 0)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:115
-msgid "coovachilli_uam_defidletimeout_desc"
+msgid "Default idle timeout unless otherwise set by RADIUS (defaults to 0)"
 msgstr ""
 
 #. Default interim interval
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:116
-msgid "coovachilli_uam_definteriminterval"
+msgid "Default interim interval"
 msgstr ""
 
 #. Default interim-interval for RADIUS accounting unless otherwise set by RADIUS (defaults to 0)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:117
-msgid "coovachilli_uam_definteriminterval_desc"
+msgid "Default interim-interval for RADIUS accounting unless otherwise set by RADIUS (defaults to 0)"
 msgstr ""
 
 #. Default session timeout
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:118
-msgid "coovachilli_uam_defsessiontimeout"
+msgid "Default session timeout"
 msgstr ""
 
 #. Default session timeout unless otherwise set by RADIUS (defaults to 0)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:119
-msgid "coovachilli_uam_defsessiontimeout_desc"
+msgid "Default session timeout unless otherwise set by RADIUS (defaults to 0)"
 msgstr ""
 
 #. Inspect DNS traffic
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:120
-msgid "coovachilli_uam_dnsparanoia"
+msgid "Inspect DNS traffic"
 msgstr ""
 
 #. Inspect DNS packets and drop responses with any non- A, CNAME, SOA, or MX records to prevent dns tunnels (experimental)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:121
-msgid "coovachilli_uam_dnsparanoia_desc"
+msgid "Inspect DNS packets and drop responses with any non- A, CNAME, SOA, or MX records to prevent dns tunnels (experimental)"
 msgstr ""
 
 #. Local users file
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:122
-msgid "coovachilli_uam_localusers"
+msgid "Local users file"
 msgstr ""
 
 #. A colon seperated file containing usernames and passwords of locally authenticated users
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:123
-msgid "coovachilli_uam_localusers_desc"
+msgid "A colon seperated file containing usernames and passwords of locally authenticated users"
 msgstr ""
 
 #. Location name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:124
-msgid "coovachilli_uam_locationname"
+msgid "Location name"
 msgstr ""
 
 #. Human readable location name used in JSON interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:125
-msgid "coovachilli_uam_locationname_desc"
+msgid "Human readable location name used in JSON interface"
 msgstr ""
 
 #. Do not redirect to UAM server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:126
-msgid "coovachilli_uam_nouamsuccess"
+msgid "Do not redirect to UAM server"
 msgstr ""
 
 #. Do not return to UAM server on login success, just redirect to original URL
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:127
-msgid "coovachilli_uam_nouamsuccess_desc"
+msgid "Do not return to UAM server on login success, just redirect to original URL"
 msgstr ""
 
 #. Do not do WISPr
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:128
-msgid "coovachilli_uam_nouamwispr"
+msgid "Do not do WISPr"
 msgstr ""
 
 #. Do not do any WISPr XML, assume the back-end is doing this instead
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:129
-msgid "coovachilli_uam_nouamwispr_desc"
+msgid "Do not do any WISPr XML, assume the back-end is doing this instead"
 msgstr ""
 
 #. Post auth proxy
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:130
-msgid "coovachilli_uam_postauthproxy"
+msgid "Post auth proxy"
 msgstr ""
 
 #. Used with postauthproxyport to define a post authentication HTTP proxy server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:131
-msgid "coovachilli_uam_postauthproxy_desc"
+msgid "Used with postauthproxyport to define a post authentication HTTP proxy server"
 msgstr ""
 
 #. Post auth proxy port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:132
-msgid "coovachilli_uam_postauthproxyport"
+msgid "Post auth proxy port"
 msgstr ""
 
 #. Used with postauthproxy to define a post authentication HTTP proxy server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:133
-msgid "coovachilli_uam_postauthproxyport_desc"
+msgid "Used with postauthproxy to define a post authentication HTTP proxy server"
 msgstr ""
 
 #. Allowed resources
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:134
-msgid "coovachilli_uam_uamallowed"
+msgid "Allowed resources"
 msgstr ""
 
 #. List of resources the client can access without first authenticating
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:135
-msgid "coovachilli_uam_uamallowed_desc"
+msgid "List of resources the client can access without first authenticating"
 msgstr ""
 
 #. Allow any DNS server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:136
-msgid "coovachilli_uam_uamanydns"
+msgid "Allow any DNS server"
 msgstr ""
 
 #. Allow any DNS server for unauthenticated clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:137
-msgid "coovachilli_uam_uamanydns_desc"
+msgid "Allow any DNS server for unauthenticated clients"
 msgstr ""
 
 #. Allow any IP address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:138
-msgid "coovachilli_uam_uamanyip"
+msgid "Allow any IP address"
 msgstr ""
 
 #. Allow clients to use any IP settings they wish by spoofing ARP (experimental)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:139
-msgid "coovachilli_uam_uamanyip_desc"
+msgid "Allow clients to use any IP settings they wish by spoofing ARP (experimental)"
 msgstr ""
 
 #. Allowed domains
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:140
-msgid "coovachilli_uam_uamdomain"
+msgid "Allowed domains"
 msgstr ""
 
 #. Defines a list of domain names to automatically add to the walled garden
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:141
-msgid "coovachilli_uam_uamdomain_desc"
+msgid "Defines a list of domain names to automatically add to the walled garden"
 msgstr ""
 
 #. UAM homepage
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:142
-msgid "coovachilli_uam_uamhomepage"
+msgid "UAM homepage"
 msgstr ""
 
 #. URL of homepage to redirect unauthenticated users to
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:143
-msgid "coovachilli_uam_uamhomepage_desc"
+msgid "URL of homepage to redirect unauthenticated users to"
 msgstr ""
 
 #. UAM static content port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:144
-msgid "coovachilli_uam_uamiport"
+msgid "UAM static content port"
 msgstr ""
 
 #. TCP port to bind to for only serving embedded content
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:145
-msgid "coovachilli_uam_uamiport_desc"
+msgid "TCP port to bind to for only serving embedded content"
 msgstr ""
 
 #. UAM listening address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:146
-msgid "coovachilli_uam_uamlisten"
+msgid "UAM listening address"
 msgstr ""
 
 #. IP address to listen to for authentication of clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:147
-msgid "coovachilli_uam_uamlisten_desc"
+msgid "IP address to listen to for authentication of clients"
 msgstr ""
 
 #. UAM logout IP
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:148
-msgid "coovachilli_uam_uamlogoutip"
+msgid "UAM logout IP"
 msgstr ""
 
 #. Use this IP address to instantly logout a client accessing it (defaults to 1.1.1.1)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:149
-msgid "coovachilli_uam_uamlogoutip_desc"
+msgid "Use this IP address to instantly logout a client accessing it (defaults to 1.1.1.1)"
 msgstr ""
 
 #. UAM listening port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:150
-msgid "coovachilli_uam_uamport"
+msgid "UAM listening port"
 msgstr ""
 
 #. TCP port to bind to for authenticating clients (default 3990)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:151
-msgid "coovachilli_uam_uamport_desc"
+msgid "TCP port to bind to for authenticating clients (default 3990)"
 msgstr ""
 
 #. UAM secret
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:152
-msgid "coovachilli_uam_uamsecret"
+msgid "UAM secret"
 msgstr ""
 
 #. Shared secret between uamserver and chilli
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:153
-msgid "coovachilli_uam_uamsecret_desc"
+msgid "Shared secret between uamserver and chilli"
 msgstr ""
 
 #. UAM server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:154
-msgid "coovachilli_uam_uamserver"
+msgid "UAM server"
 msgstr ""
 
 #. URL of web server to use for authenticating clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:155
-msgid "coovachilli_uam_uamserver_desc"
+msgid "URL of web server to use for authenticating clients"
 msgstr ""
 
 #. UAM user interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:156
-msgid "coovachilli_uam_uamui"
+msgid "UAM user interface"
 msgstr ""
 
 #. An init.d style program to handle local content on the uamuiport web server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:157
-msgid "coovachilli_uam_uamui_desc"
+msgid "An init.d style program to handle local content on the uamuiport web server"
 msgstr ""
 
 #. Use status file
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:158
-msgid "coovachilli_uam_usestatusfile"
+msgid "Use status file"
 msgstr ""
 
 #. Write the status of clients in a non-volatile state file (experimental)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:159
-msgid "coovachilli_uam_usestatusfile_desc"
+msgid "Write the status of clients in a non-volatile state file (experimental)"
 msgstr ""
 
 #. WISPr login url
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:160
-msgid "coovachilli_uam_wisprlogin"
+msgid "WISPr login url"
 msgstr ""
 
 #. Specific URL to be given in WISPr XML LoginURL
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:161
-msgid "coovachilli_uam_wisprlogin_desc"
+msgid "Specific URL to be given in WISPr XML LoginURL"
 msgstr ""
 
 #. CGI program
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:162
-msgid "coovachilli_uam_wwwbin"
+msgid "CGI program"
 msgstr ""
 
 #. Executable to run as a CGI type program (like haserl) for URLs with extention .chi
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:163
-msgid "coovachilli_uam_wwwbin_desc"
+msgid "Executable to run as a CGI type program (like haserl) for URLs with extention .chi"
 msgstr ""
 
 #. Web content directory
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:164
-msgid "coovachilli_uam_wwwdir"
+msgid "Web content directory"
 msgstr ""
 
 #. Directory where embedded local web content is placed
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:165
-msgid "coovachilli_uam_wwwdir_desc"
+msgid "Directory where embedded local web content is placed"
 msgstr ""
 
 #. MAC configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:166
-msgid "coovachilli_macauth"
+msgid "MAC configuration"
 msgstr ""
 
 #. Configure MAC authentication
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:167
-msgid "coovachilli_macauth_desc"
+msgid "Configure MAC authentication"
 msgstr ""
 
 #. Allowed MAC addresses
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:168
-msgid "coovachilli_macauth_macallowed"
+msgid "Allowed MAC addresses"
 msgstr ""
 
 #. List of MAC addresses for which MAC authentication will be performed
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:169
-msgid "coovachilli_macauth_macallowed_desc"
+msgid "List of MAC addresses for which MAC authentication will be performed"
 msgstr ""
 
 #. Authenticate locally allowed MACs
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:170
-msgid "coovachilli_macauth_macallowlocal"
+msgid "Authenticate locally allowed MACs"
 msgstr ""
 
 #. Authenticate allowed MAC addresses without the use of RADIUS
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:171
-msgid "coovachilli_macauth_macallowlocal_desc"
+msgid "Authenticate allowed MAC addresses without the use of RADIUS"
 msgstr ""
 
 #. Enable MAC authentification
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:172
-msgid "coovachilli_macauth_macauth"
+msgid "Enable MAC authentification"
 msgstr ""
 
 #. Try to authenticate all users based on their mac address alone
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:173
-msgid "coovachilli_macauth_macauth_desc"
+msgid "Try to authenticate all users based on their mac address alone"
 msgstr ""
 
 #. Password
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:174
-msgid "coovachilli_macauth_macpasswd"
+msgid "Password"
 msgstr ""
 
 #. Password used when performing MAC authentication
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:175
-msgid "coovachilli_macauth_macpasswd_desc"
+msgid "Password used when performing MAC authentication"
 msgstr ""
 
 #. Suffix
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:176
-msgid "coovachilli_macauth_macsuffix"
+msgid "Suffix"
 msgstr ""
 
 #. Suffix to add to the MAC address in order to form the User-Name, which is sent to the radius server
diff --git a/po/ru/ddns.po b/po/ru/ddns.po
index 0162fa695..e4ef3baf5 100644
--- a/po/ru/ddns.po
+++ b/po/ru/ddns.po
@@ -14,37 +14,37 @@ msgstr ""
 
 #. Dynamic DNS
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:1
-msgid "ddns"
+msgid "Dynamic DNS"
 msgstr ""
 
 #. Dynamic DNS allows that your router can be reached with a fixed hostname while having a dynamically changing IP-Address.
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:2
-msgid "ddns_desc"
+msgid "Dynamic DNS allows that your router can be reached with a fixed hostname while having a dynamically changing IP-Address."
 msgstr ""
 
 #. Source of IP-Address
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:3
-msgid "ddns_service_ipsource"
+msgid "Source of IP-Address"
 msgstr ""
 
 #. Check for changed IP every
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:4
-msgid "ddns_service_checkinterval"
+msgid "Check for changed IP every"
 msgstr ""
 
 #. Check-Time unit
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:5
-msgid "ddns_service_checkunit"
+msgid "Check-Time unit"
 msgstr ""
 
 #. Force update every
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:6
-msgid "ddns_service_forceinterval"
+msgid "Force update every"
 msgstr ""
 
 #. Force-Time unit
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:7
-msgid "ddns_service_forceunit"
+msgid "Force-Time unit"
 msgstr ""
 
 #. Custom Update-URL
diff --git a/po/ru/default.po b/po/ru/default.po
index 6f69f3d24..52f0df677 100644
--- a/po/ru/default.po
+++ b/po/ru/default.po
@@ -14,37 +14,37 @@ msgstr ""
 
 #. Skip to navigation
 #: i18n/english/luasrc/i18n/default.en.lua:1
-msgid "skiplink1"
+msgid "Skip to navigation"
 msgstr ""
 
 #. Skip to content
 #: i18n/english/luasrc/i18n/default.en.lua:2
-msgid "skiplink2"
+msgid "Skip to content"
 msgstr ""
 
 #. Navigation
 #: i18n/english/luasrc/i18n/default.en.lua:3
-msgid "navigation"
+msgid "Navigation"
 msgstr ""
 
 #. About
 #: i18n/english/luasrc/i18n/default.en.lua:4
-msgid "about"
+msgid "About"
 msgstr "О программе"
 
 #. Add
 #: i18n/english/luasrc/i18n/default.en.lua:5
-msgid "add"
+msgid "Add"
 msgstr "Добавить"
 
 #. Addresses
 #: i18n/english/luasrc/i18n/default.en.lua:6
-msgid "addresses"
+msgid "Addresses"
 msgstr "Адрес"
 
 #. Aliases
 #: i18n/english/luasrc/i18n/default.en.lua:7
-msgid "aliases"
+msgid "Aliases"
 msgstr "Ссылка"
 
 #. all
@@ -59,98 +59,98 @@ msgstr ""
 
 #. Administration
 #: i18n/english/luasrc/i18n/default.en.lua:10
-msgid "administration"
+msgid "Administration"
 msgstr "Управление"
 
 #. Essentials
 #: i18n/english/luasrc/i18n/default.en.lua:11
-msgid "essentials"
+msgid "Essentials"
 msgstr "Essentials"
 
 #. Apply
 #: i18n/english/luasrc/i18n/default.en.lua:12
-msgid "apply"
+msgid "Apply"
 msgstr "Принять"
 
 #. Basic Settings
 #: i18n/english/luasrc/i18n/default.en.lua:13
-msgid "basicsettings"
+msgid "Basic Settings"
 msgstr "Начальные Установки"
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast
 #: i18n/english/luasrc/i18n/default.en.lua:14
-msgid "broadcast"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"
 msgstr "<abbr title=\"Интернет протокол версии 4\">IPv4</abbr>-Широковещательный"
 
 #. Cancel
 #: i18n/english/luasrc/i18n/default.en.lua:15
-msgid "cancel"
+msgid "Cancel"
 msgstr "Cancel"
 
 #. Changes
 #: i18n/english/luasrc/i18n/default.en.lua:16
-msgid "changes"
+msgid "Changes"
 msgstr "Изменения"
 
 #. Channel
 #: i18n/english/luasrc/i18n/default.en.lua:17
-msgid "channel"
+msgid "Channel"
 msgstr "Канал"
 
 #. <abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/prefix
 #: i18n/english/luasrc/i18n/default.en.lua:18
-msgid "cidr6"
+msgid "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/prefix"
 msgstr ""
 "<abbr title=\"Беcклассовая адресация\">CIDR</abbr>-Обозначение: адрес/префикс"
 
 #. Code
 #: i18n/english/luasrc/i18n/default.en.lua:19
-msgid "code"
+msgid "Code"
 msgstr "Код"
 
 #. Configuration
 #: i18n/english/luasrc/i18n/default.en.lua:20
-msgid "config"
+msgid "Configuration"
 msgstr "Конфигурация"
 
 #. Configuration file
 #: i18n/english/luasrc/i18n/default.en.lua:21
-msgid "configfile"
+msgid "Configuration file"
 msgstr "Файл конфигурации"
 
 #. Confirmation
 #: i18n/english/luasrc/i18n/default.en.lua:22
-msgid "confirmation"
+msgid "Confirmation"
 msgstr "Подтверждение"
 
 #. Delete
 #: i18n/english/luasrc/i18n/default.en.lua:23
-msgid "delete"
+msgid "Delete"
 msgstr "Удалить"
 
 #. Description
 #: i18n/english/luasrc/i18n/default.en.lua:24
-msgid "descr"
+msgid "Description"
 msgstr "Описание"
 
 #. Design
 #: i18n/english/luasrc/i18n/default.en.lua:25
-msgid "design"
+msgid "Design"
 msgstr "Создание"
 
 #. Destination
 #: i18n/english/luasrc/i18n/default.en.lua:26
-msgid "destination"
+msgid "Destination"
 msgstr ""
 
 #. Device
 #: i18n/english/luasrc/i18n/default.en.lua:27
-msgid "device"
+msgid "Device"
 msgstr "Устройство"
 
 #. Devices
 #: i18n/english/luasrc/i18n/default.en.lua:28
-msgid "devices"
+msgid "Devices"
 msgstr "Устройства"
 
 #. disable
@@ -160,22 +160,22 @@ msgstr "выключено"
 
 #. Distance
 #: i18n/english/luasrc/i18n/default.en.lua:30
-msgid "distance"
+msgid "Distance"
 msgstr "Расстояние"
 
 #. Kernel Log
 #: i18n/english/luasrc/i18n/default.en.lua:31
-msgid "dmesg"
+msgid "Kernel Log"
 msgstr "Kernel log"
 
 #. <abbr title=\"Domain Name System\">DNS</abbr>-Server
 #: i18n/english/luasrc/i18n/default.en.lua:32
-msgid "dnsserver"
+msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Server"
 msgstr "<abbr title=\"Служба Доменных Имён\">DNS</abbr>-Сервер"
 
 #. Edit
 #: i18n/english/luasrc/i18n/default.en.lua:33
-msgid "edit"
+msgid "Edit"
 msgstr "Редактировать"
 
 #. enable
@@ -185,47 +185,47 @@ msgstr "включено"
 
 #. Encryption
 #: i18n/english/luasrc/i18n/default.en.lua:35
-msgid "encryption"
+msgid "Encryption"
 msgstr "Шифрование"
 
 #. Error
 #: i18n/english/luasrc/i18n/default.en.lua:36
-msgid "error"
+msgid "Error"
 msgstr "Ошибка"
 
 #. Filesystem
 #: i18n/english/luasrc/i18n/default.en.lua:37
-msgid "filesystem"
+msgid "Filesystem"
 msgstr "Файловая система"
 
 #. Filter
 #: i18n/english/luasrc/i18n/default.en.lua:38
-msgid "filter"
+msgid "Filter"
 msgstr "Фильтр"
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway
 #: i18n/english/luasrc/i18n/default.en.lua:39
-msgid "gateway"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
 msgstr "<abbr title=\"Интернет протокол версии 4\">IPv4</abbr>-Шлюз"
 
 #. <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway
 #: i18n/english/luasrc/i18n/default.en.lua:40
-msgid "gateway6"
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 msgstr "<abbr title=\"Интернет протокол версии 6\">IPv6</abbr>-Шлюз"
 
 #. General
 #: i18n/english/luasrc/i18n/default.en.lua:41
-msgid "general"
+msgid "General"
 msgstr "Основной"
 
 #. Hostname
 #: i18n/english/luasrc/i18n/default.en.lua:42
-msgid "hostname"
+msgid "Hostname"
 msgstr "Имя хоста"
 
 #. Install
 #: i18n/english/luasrc/i18n/default.en.lua:43
-msgid "install"
+msgid "Install"
 msgstr "Установка"
 
 #. installed
@@ -235,102 +235,102 @@ msgstr "установленные"
 
 #. Interface
 #: i18n/english/luasrc/i18n/default.en.lua:45
-msgid "interface"
+msgid "Interface"
 msgstr "Интерфейс"
 
 #. Interfaces
 #: i18n/english/luasrc/i18n/default.en.lua:46
-msgid "interfaces"
+msgid "Interfaces"
 msgstr "Интерфейсы"
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address
 #: i18n/english/luasrc/i18n/default.en.lua:47
-msgid "ipaddress"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
 msgstr "<abbr title=\"Интернет протокол версии 4\">IPv4</abbr>-Адрес"
 
 #. <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address
 #: i18n/english/luasrc/i18n/default.en.lua:48
-msgid "ip6address"
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address"
 msgstr "<abbr title=\"Интернет протокол версии 6\">IPv6</abbr>-Адрес"
 
 #. Legend
 #: i18n/english/luasrc/i18n/default.en.lua:49
-msgid "legend"
+msgid "Legend"
 msgstr "Надпись"
 
 #. Library
 #: i18n/english/luasrc/i18n/default.en.lua:50
-msgid "library"
+msgid "Library"
 msgstr "Библиотека"
 
 #. Logout
 #: i18n/english/luasrc/i18n/default.en.lua:51
-msgid "logout"
+msgid "Logout"
 msgstr "Выход"
 
 #. Key
 #: i18n/english/luasrc/i18n/default.en.lua:52
-msgid "key"
+msgid "Key"
 msgstr "Ключ"
 
 #. Language
 #: i18n/english/luasrc/i18n/default.en.lua:53
-msgid "language"
+msgid "Language"
 msgstr "Язык"
 
 #. Limit
 #: i18n/english/luasrc/i18n/default.en.lua:54
-msgid "limit"
+msgid "Limit"
 msgstr "Предел"
 
 #. Load
 #: i18n/english/luasrc/i18n/default.en.lua:55
-msgid "load"
+msgid "Load"
 msgstr "Загрузка"
 
 #. Login
 #: i18n/english/luasrc/i18n/default.en.lua:56
-msgid "login"
+msgid "Login"
 msgstr "Вход"
 
 #. <abbr title=\"Media Access Control\">MAC</abbr>-Address
 #: i18n/english/luasrc/i18n/default.en.lua:57
-msgid "macaddress"
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr "<abbr title=\"Управление доступом к носителю\">MAC</abbr>-Адрес"
 
 #. see &#39;%s&#39; manpage
 #: i18n/english/luasrc/i18n/default.en.lua:58
-msgid "manpage"
+msgid "see '%s' manpage"
 msgstr "смотрите &#39;%s&#39; руководство"
 
 #. Metric
 #: i18n/english/luasrc/i18n/default.en.lua:59
-msgid "metric"
+msgid "Metric"
 msgstr "Метрика"
 
 #. Mode
 #: i18n/english/luasrc/i18n/default.en.lua:60
-msgid "mode"
+msgid "Mode"
 msgstr "Режим"
 
 #. Name
 #: i18n/english/luasrc/i18n/default.en.lua:61
-msgid "name"
+msgid "Name"
 msgstr "Имя"
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask
 #: i18n/english/luasrc/i18n/default.en.lua:62
-msgid "netmask"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr "<abbr title=\"Интернет протокол версии 4\">IPv4</abbr>-Маска"
 
 #. Network
 #: i18n/english/luasrc/i18n/default.en.lua:63
-msgid "network"
+msgid "Network"
 msgstr "Сеть"
 
 #. Networks
 #: i18n/english/luasrc/i18n/default.en.lua:64
-msgid "networks"
+msgid "Networks"
 msgstr "Сети"
 
 #. none
@@ -340,117 +340,117 @@ msgstr "ничего"
 
 #. not installed
 #: i18n/english/luasrc/i18n/default.en.lua:66
-msgid "notinstalled"
+msgid "not installed"
 msgstr "не установленно"
 
 #. OK
 #: i18n/english/luasrc/i18n/default.en.lua:67
-msgid "ok"
+msgid "OK"
 msgstr "OK"
 
 #. Options
 #: i18n/english/luasrc/i18n/default.en.lua:68
-msgid "options"
+msgid "Options"
 msgstr "Опции"
 
 #. Overview
 #: i18n/english/luasrc/i18n/default.en.lua:69
-msgid "overview"
+msgid "Overview"
 msgstr "Обзор"
 
 #. Package Manager
 #: i18n/english/luasrc/i18n/default.en.lua:70
-msgid "packagemanager"
+msgid "Package Manager"
 msgstr "Менеджер пакетов"
 
 #. Password
 #: i18n/english/luasrc/i18n/default.en.lua:71
-msgid "password"
+msgid "Password"
 msgstr "Пароль"
 
 #. Path
 #: i18n/english/luasrc/i18n/default.en.lua:72
-msgid "path"
+msgid "Path"
 msgstr "Путь"
 
 #. Port
 #: i18n/english/luasrc/i18n/default.en.lua:73
-msgid "port"
+msgid "Port"
 msgstr "Порт"
 
 #. Ports
 #: i18n/english/luasrc/i18n/default.en.lua:74
-msgid "ports"
+msgid "Ports"
 msgstr "Порты"
 
 #. Proceed
 #: i18n/english/luasrc/i18n/default.en.lua:75
-msgid "proceed"
+msgid "Proceed"
 msgstr ""
 
 #. Protocol
 #: i18n/english/luasrc/i18n/default.en.lua:76
-msgid "protocol"
+msgid "Protocol"
 msgstr "Протокол"
 
 #. Reboot
 #: i18n/english/luasrc/i18n/default.en.lua:77
-msgid "reboot"
+msgid "Reboot"
 msgstr "Перезагрузка"
 
 #. Reset
 #: i18n/english/luasrc/i18n/default.en.lua:78
-msgid "reset"
+msgid "Reset"
 msgstr "Сброс"
 
 #. Revert
 #: i18n/english/luasrc/i18n/default.en.lua:79
-msgid "revert"
+msgid "Revert"
 msgstr "Вернуть"
 
 #. Save
 #: i18n/english/luasrc/i18n/default.en.lua:80
-msgid "save"
+msgid "Save"
 msgstr "Сохранить"
 
 #. Save &amp; Apply
 #: i18n/english/luasrc/i18n/default.en.lua:81
-msgid "saveapply"
+msgid "Save & Apply"
 msgstr "Сохранить &amp; Принять"
 
 #. Scan
 #: i18n/english/luasrc/i18n/default.en.lua:82
-msgid "scan"
+msgid "Scan"
 msgstr ""
 
 #. Service
 #: i18n/english/luasrc/i18n/default.en.lua:83
-msgid "service"
+msgid "Service"
 msgstr "Сервис"
 
 #. Services
 #: i18n/english/luasrc/i18n/default.en.lua:84
-msgid "services"
+msgid "Services"
 msgstr "Сервисы"
 
 #. Settings
 #: i18n/english/luasrc/i18n/default.en.lua:85
-msgid "settings"
+msgid "Settings"
 msgstr "Настройки"
 
 #. Size
 #: i18n/english/luasrc/i18n/default.en.lua:86
-msgid "size"
+msgid "Size"
 msgstr "Размер"
 
 #. Source
 #: i18n/english/luasrc/i18n/default.en.lua:87
-msgid "source"
+msgid "Source"
 msgstr ""
 
 #. Start
 #: i18n/english/luasrc/i18n/default.en.lua:88
-msgid "start"
+msgid "Start"
 msgstr "Старт"
 
 #. static
@@ -460,72 +460,72 @@ msgstr "статический"
 
 #. Status
 #: i18n/english/luasrc/i18n/default.en.lua:90
-msgid "status"
+msgid "Status"
 msgstr "Статус"
 
 #. Statistics
 #: i18n/english/luasrc/i18n/default.en.lua:91
-msgid "statistics"
+msgid "Statistics"
 msgstr "Статистика"
 
 #. Submit
 #: i18n/english/luasrc/i18n/default.en.lua:92
-msgid "submit"
+msgid "Submit"
 msgstr "Отправить"
 
 #. System Log
 #: i18n/english/luasrc/i18n/default.en.lua:93
-msgid "syslog"
+msgid "System Log"
 msgstr "Системный журнал"
 
 #. System
 #: i18n/english/luasrc/i18n/default.en.lua:94
-msgid "system"
+msgid "System"
 msgstr "Система"
 
 #. Target
 #: i18n/english/luasrc/i18n/default.en.lua:95
-msgid "target"
+msgid "Target"
 msgstr "Цель"
 
 #. Timezone
 #: i18n/english/luasrc/i18n/default.en.lua:96
-msgid "timezone"
+msgid "Timezone"
 msgstr "Временная зона"
 
 #. Type
 #: i18n/english/luasrc/i18n/default.en.lua:97
-msgid "type"
+msgid "Type"
 msgstr "Тип"
 
 #. Unknown Error
 #: i18n/english/luasrc/i18n/default.en.lua:98
-msgid "unknownerror"
+msgid "Unknown Error"
 msgstr "Неизвестная ошибка"
 
 #. Unsaved Changes
 #: i18n/english/luasrc/i18n/default.en.lua:99
-msgid "unsavedchanges"
+msgid "Unsaved Changes"
 msgstr "Непринятые изменения"
 
 #. Username
 #: i18n/english/luasrc/i18n/default.en.lua:100
-msgid "username"
+msgid "Username"
 msgstr "Имя пользователя"
 
 #. Version
 #: i18n/english/luasrc/i18n/default.en.lua:101
-msgid "version"
+msgid "Version"
 msgstr "Версия"
 
 #. Web <abbr title=\"User Interface\">UI</abbr>
 #: i18n/english/luasrc/i18n/default.en.lua:102
-msgid "webui"
+msgid "Web <abbr title=\"User Interface\">UI</abbr>"
 msgstr "Web <abbr title=\"Интерфейс пользователя\">UI</abbr>"
 
 #. Wifi
 #: i18n/english/luasrc/i18n/default.en.lua:103
-msgid "wifi"
+msgid "Wifi"
 msgstr "Wi-Fi"
 
 #. Zone
diff --git a/po/ru/freifunk.po b/po/ru/freifunk.po
index 970eddddd..26fce2f2a 100644
--- a/po/ru/freifunk.po
+++ b/po/ru/freifunk.po
@@ -14,105 +14,105 @@ msgstr ""
 
 #. Hello and welcome in the network of
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:1
-msgid "ff_hellonet"
+msgid "Hello and welcome in the network of"
 msgstr ""
 
 #. We are an initiative to establish a free, independent and open wireless mesh network.
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:2
-msgid "ff_public1"
+msgid "We are an initiative to establish a free, independent and open wireless mesh network."
 msgstr ""
 
 #. This is the access point
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:3
-msgid "ff_public2"
+msgid "This is the access point"
 msgstr ""
 
 #. It is operated by
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:4
-msgid "ff_public3"
+msgid "It is operated by"
 msgstr ""
 
 #. You can find further information about the global Freifunk initiative at
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:5
-msgid "ff_public4"
+msgid "You can find further information about the global Freifunk initiative at"
 msgstr ""
 
 #. If you are interested in our project then contact the local community
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:6
-msgid "ff_public5"
+msgid "If you are interested in our project then contact the local community"
 msgstr ""
 
 #. Internet access depends on technical and organisational conditions and may or may not work for you.
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:7
-msgid "ff_public6"
+msgid "Internet access depends on technical and organisational conditions and may or may not work for you."
 msgstr ""
 
 #. Location
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:8
-msgid "ff_location"
+msgid "Location"
 msgstr ""
 
 #. E-Mail
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:9
-msgid "ff_mail"
+msgid "E-Mail"
 msgstr ""
 
 #. You really should provide your address here!
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:10
-msgid "ff_mail1"
+msgid "You really should provide your address here!"
 msgstr ""
 
 #. Nickname
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:11
-msgid "ff_nickname"
+msgid "Nickname"
 msgstr ""
 
 #. Realname
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:12
-msgid "ff_name"
+msgid "Realname"
 msgstr ""
 
 #. Node
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:13
-msgid "ff_node"
+msgid "Node"
 msgstr ""
 
 #. Notice
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:14
-msgid "ff_note"
+msgid "Notice"
 msgstr ""
 
 #. Phone
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:15
-msgid "ff_phone"
+msgid "Phone"
 msgstr ""
 
 #. Memory
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:16
-msgid "ff_ram"
+msgid "Memory"
 msgstr ""
 
 #. Free
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:17
-msgid "ff_free"
+msgid "Free"
 msgstr ""
 
 #. Buffers
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:18
-msgid "ff_buffers"
+msgid "Buffers"
 msgstr ""
 
 #. Cached
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:19
-msgid "ff_cached"
+msgid "Cached"
 msgstr ""
 
 #. Total
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:20
-msgid "ff_total"
+msgid "Total"
 msgstr ""
 
 #. Coordinates
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:21
-msgid "ff_geocoord"
+msgid "Coordinates"
 msgstr ""
diff --git a/po/ru/hd_idle.po b/po/ru/hd_idle.po
index a758eb35b..c298a21e0 100644
--- a/po/ru/hd_idle.po
+++ b/po/ru/hd_idle.po
@@ -14,35 +14,35 @@ msgstr ""
 
 #. Disk
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:1
-msgid "disk"
+msgid "Disk"
 msgstr ""
 
 #. Enable debug
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:2
-msgid "enable_debug"
+msgid "Enable debug"
 msgstr ""
 
 #. hd-idle
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:3
-msgid "hd_idle"
+msgid "hd-idle"
 msgstr ""
 
 #. hd-idle is a utility program for spinning-down external disks after a period of idle time.
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:4
-msgid "hd_idle_desc"
+msgid "hd-idle is a utility program for spinning-down external disks after a period of idle time."
 msgstr ""
 
 #. Idle-Time
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:5
-msgid "idle_time_interval"
+msgid "Idle-Time"
 msgstr ""
 
 #. Idle-Time unit
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:6
-msgid "idle_time_unit"
+msgid "Idle-Time unit"
 msgstr ""
 
 #. Settings
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:7
-msgid "settings"
+msgid "Settings"
 msgstr ""
diff --git a/po/ru/initmgr.po b/po/ru/initmgr.po
index d8d3711cd..547802d9f 100644
--- a/po/ru/initmgr.po
+++ b/po/ru/initmgr.po
@@ -14,22 +14,22 @@ msgstr ""
 
 #. Initscripts
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:1
-msgid "initmgr"
+msgid "Initscripts"
 msgstr ""
 
 #. You can enable or disable installed init scripts here. Changes will applied after a device reboot.<br /><strong>Warning: If you disable essential init scripts like &quot;network&quot;, your device might become inaccesable!</strong>
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:2
-msgid "initmgr_desc"
+msgid "You can enable or disable installed init scripts here. Changes will applied after a device reboot.<br /><strong>Warning: If you disable essential init scripts like \"network\", your device might become inaccesable!</strong>"
 msgstr ""
 
 #. Start priority
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:3
-msgid "initmgr_index"
+msgid "Start priority"
 msgstr ""
 
 #. Initscript
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:4
-msgid "initmgr_name"
+msgid "Initscript"
 msgstr ""
 
 #. Enable/Disable
diff --git a/po/ru/livestats.po b/po/ru/livestats.po
index d14541ae1..5a1b08d37 100644
--- a/po/ru/livestats.po
+++ b/po/ru/livestats.po
@@ -14,32 +14,32 @@ msgstr ""
 
 #. incoming
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:1
-msgid "livestats_incoming"
+msgid "incoming"
 msgstr ""
 
 #. outgoing
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:2
-msgid "livestats_outgoing"
+msgid "outgoing"
 msgstr ""
 
 #. traffic on
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:3
-msgid "livestats_traffic"
+msgid "traffic on"
 msgstr ""
 
 #. signal-to-noise ratio for
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:4
-msgid "livestats_wifi"
+msgid "signal-to-noise ratio for"
 msgstr ""
 
 #. load average
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:5
-msgid "livestats_loadavg"
+msgid "load average"
 msgstr ""
 
 #. Realtime Wireless Status
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:6
-msgid "livestats_stat_wireless"
+msgid "Realtime Wireless Status"
 msgstr ""
 
 #. Realtime Network Traffic
diff --git a/po/ru/luci-fw.po b/po/ru/luci-fw.po
index 8a98514d6..a40effdc3 100644
--- a/po/ru/luci-fw.po
+++ b/po/ru/luci-fw.po
@@ -14,277 +14,277 @@ msgstr ""
 
 #. Port forwarding
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:1
-msgid "fw_portfw"
+msgid "Port forwarding"
 msgstr ""
 
 #. Traffic Redirection
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:2
-msgid "fw_redirect"
+msgid "Traffic Redirection"
 msgstr ""
 
 #. Traffic redirection allows you to change the destination address of forwarded packets.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:3
-msgid "fw_redirect_desc"
+msgid "Traffic redirection allows you to change the destination address of forwarded packets."
 msgstr ""
 
 #. Zone-to-Zone traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:4
-msgid "fw_forwarding"
+msgid "Zone-to-Zone traffic"
 msgstr ""
 
 #. Firewall
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:5
-msgid "fw_fw"
+msgid "Firewall"
 msgstr ""
 
 #. Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:6
-msgid "fw_zone"
+msgid "Zone"
 msgstr ""
 
 #. Zones
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:7
-msgid "fw_zones"
+msgid "Zones"
 msgstr ""
 
 #. Custom forwarding
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:8
-msgid "fw_custfwd"
+msgid "Custom forwarding"
 msgstr ""
 
 #. The firewall creates zones over your network interfaces to control network traffic flow.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:9
-msgid "fw_fw1"
+msgid "The firewall creates zones over your network interfaces to control network traffic flow."
 msgstr ""
 
 #. Advanced Rules
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:10
-msgid "firewall_rule"
+msgid "Advanced Rules"
 msgstr ""
 
 #. Advanced rules let you customize the firewall to your needs. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:11
-msgid "firewall_rule_desc"
+msgid "Advanced rules let you customize the firewall to your needs. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall."
 msgstr ""
 
 #. Input Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:12
-msgid "firewall_rule_src"
+msgid "Input Zone"
 msgstr ""
 
 #. Output Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:13
-msgid "firewall_rule_dest"
+msgid "Output Zone"
 msgstr ""
 
 #. Source address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:14
-msgid "firewall_rule_srcip"
+msgid "Source address"
 msgstr ""
 
 #. Destination address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:15
-msgid "firewall_rule_destip"
+msgid "Destination address"
 msgstr ""
 
 #. Source MAC-Address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:16
-msgid "firewall_rule_srcmac"
+msgid "Source MAC-Address"
 msgstr ""
 
 #. Source port
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:17
-msgid "firewall_rule_srcport"
+msgid "Source port"
 msgstr ""
 
 #. Destination port
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:18
-msgid "firewall_rule_destport"
+msgid "Destination port"
 msgstr ""
 
 #. Action
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:19
-msgid "firewall_rule_target"
+msgid "Action"
 msgstr ""
 
 #. accept
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:20
-msgid "fw_accept"
+msgid "accept"
 msgstr ""
 
 #. reject
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:21
-msgid "fw_reject"
+msgid "reject"
 msgstr ""
 
 #. drop
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:22
-msgid "fw_drop"
+msgid "drop"
 msgstr ""
 
 #. Source
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:23
-msgid "fw_src"
+msgid "Source"
 msgstr ""
 
 #. Destination
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:24
-msgid "fw_dest"
+msgid "Destination"
 msgstr ""
 
 #. Traffic Control
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:25
-msgid "fw_traffic"
+msgid "Traffic Control"
 msgstr ""
 
 #. MSS Clamping
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:26
-msgid "fw_mtufix"
+msgid "MSS Clamping"
 msgstr ""
 
 #. Drop invalid packets
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:27
-msgid "fw_dropinvalid"
+msgid "Drop invalid packets"
 msgstr ""
 
 #. Port forwarding allows to provide network services in the internal network to an external network.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:28
-msgid "fw_portfw1"
+msgid "Port forwarding allows to provide network services in the internal network to an external network."
 msgstr ""
 
 #. External Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:29
-msgid "firewall_redirect_src_desc"
+msgid "External Zone"
 msgstr ""
 
 #. External port
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:30
-msgid "firewall_redirect_srcdport"
+msgid "External port"
 msgstr ""
 
 #. port or range as first-last
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:31
-msgid "firewall_redirect_srcdport_desc"
+msgid "port or range as first-last"
 msgstr ""
 
 #. Source address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:32
-msgid "firewall_redirect_srcip"
+msgid "Source address"
 msgstr ""
 
 #. Source MAC
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:33
-msgid "firewall_redirect_srcmac"
+msgid "Source MAC"
 msgstr ""
 
 #. Internal address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:34
-msgid "firewall_redirect_destip"
+msgid "Internal address"
 msgstr ""
 
 #. IP-Address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:35
-msgid "firewall_redirect_destip_desc"
+msgid "IP-Address"
 msgstr ""
 
 #. Internal port (optional)
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:36
-msgid "firewall_redirect_destport"
+msgid "Internal port (optional)"
 msgstr ""
 
 #. port or range as first-last
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:37
-msgid "firewall_redirect_destport_desc"
+msgid "port or range as first-last"
 msgstr ""
 
 #. Here you can specify which network traffic is allowed to flow between network zones. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall. If you experience occasional connection problems try enabling MSS Clamping otherwise disable it for performance reasons.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:38
-msgid "fw_forwarding1"
+msgid "Here you can specify which network traffic is allowed to flow between network zones. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall. If you experience occasional connection problems try enabling MSS Clamping otherwise disable it for performance reasons."
 msgstr ""
 
 #. Input
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:39
-msgid "firewall_forwarding_src"
+msgid "Input"
 msgstr ""
 
 #. Output
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:40
-msgid "firewall_forwarding_dest"
+msgid "Output"
 msgstr ""
 
 #. Defaults
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:41
-msgid "firewall_defaults"
+msgid "Defaults"
 msgstr ""
 
 #. These are the default settings that are used if no other rules match.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:42
-msgid "firewall_defaults_desc"
+msgid "These are the default settings that are used if no other rules match."
 msgstr ""
 
 #. SYN-flood protection
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:43
-msgid "firewall_defaults_synflood"
+msgid "SYN-flood protection"
 msgstr ""
 
 #. Incoming Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:44
-msgid "firewall_defaults_input"
+msgid "Incoming Traffic"
 msgstr ""
 
 #. Outgoing Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:45
-msgid "firewall_defaults_output"
+msgid "Outgoing Traffic"
 msgstr ""
 
 #. Forwarded Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:46
-msgid "firewall_defaults_forward"
+msgid "Forwarded Traffic"
 msgstr ""
 
 #. Zones part the network interfaces into certain isolated areas to separate network traffic. One or more networks can belong to a zone. The MASQ-flag enables NAT masquerading for all outgoing traffic on this zone.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:47
-msgid "firewall_zone_desc"
+msgid "Zones part the network interfaces into certain isolated areas to separate network traffic. One or more networks can belong to a zone. The MASQ-flag enables NAT masquerading for all outgoing traffic on this zone."
 msgstr ""
 
 #. Incoming Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:48
-msgid "firewall_zone_input"
+msgid "Incoming Traffic"
 msgstr ""
 
 #. Default Policy
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:49
-msgid "firewall_zone_input_desc"
+msgid "Default Policy"
 msgstr ""
 
 #. Outgoing Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:50
-msgid "firewall_zone_output"
+msgid "Outgoing Traffic"
 msgstr ""
 
 #. Default Policy
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:51
-msgid "firewall_zone_output_desc"
+msgid "Default Policy"
 msgstr ""
 
 #. Forwarded Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:52
-msgid "firewall_zone_forward"
+msgid "Forwarded Traffic"
 msgstr ""
 
 #. Default Policy
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:53
-msgid "firewall_zone_forward_desc"
+msgid "Default Policy"
 msgstr ""
 
 #. MASQ
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:54
-msgid "firewall_zone_masq"
+msgid "MASQ"
 msgstr ""
 
 #. Networks
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:55
-msgid "firewall_zone_network"
+msgid "Networks"
 msgstr ""
 
 #. contained networks
diff --git a/po/ru/mmc_over_gpio.po b/po/ru/mmc_over_gpio.po
index a3f97bdab..62b202a9e 100644
--- a/po/ru/mmc_over_gpio.po
+++ b/po/ru/mmc_over_gpio.po
@@ -14,15 +14,15 @@ msgstr ""
 
 #. MMC/SD driver configuration
 #: applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua:1
-msgid "mmc_over_gpio"
+msgid "MMC/SD driver configuration"
 msgstr ""
 
 #. MMC/SD driver configuration
 #: applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua:2
-msgid "mmc_over_gpio_desc"
+msgid "MMC/SD driver configuration"
 msgstr ""
 
 #. Settings
 #: applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua:3
-msgid "settings"
+msgid "Settings"
 msgstr ""
diff --git a/po/ru/ntpc.po b/po/ru/ntpc.po
index d349e7ebc..b1e6417dc 100644
--- a/po/ru/ntpc.po
+++ b/po/ru/ntpc.po
@@ -14,42 +14,42 @@ msgstr ""
 
 #. Time Synchronisation
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:1
-msgid "ntpc"
+msgid "Time Synchronisation"
 msgstr ""
 
 #. Synchronizes the system time
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:2
-msgid "ntpc_desc"
+msgid "Synchronizes the system time"
 msgstr ""
 
 #. Time Server
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:3
-msgid "ntpc_timeserver"
+msgid "Time Server"
 msgstr ""
 
 #. Update Interval (in s)
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:4
-msgid "ntpc_interval"
+msgid "Update Interval (in s)"
 msgstr ""
 
 #. Count of Time Measurements
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:5
-msgid "ntpc_count"
+msgid "Count of Time Measurements"
 msgstr ""
 
 #. empty = infinite
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:6
-msgid "ntpc_count_desc"
+msgid "empty = infinite"
 msgstr ""
 
 #. Clock Adjustment
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:7
-msgid "ntpc_drift"
+msgid "Clock Adjustment"
 msgstr ""
 
 #. Offset Frequency
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:8
-msgid "ntpc_drift_freq"
+msgid "Offset Frequency"
 msgstr ""
 
 #. Current system time
diff --git a/po/ru/olsr.po b/po/ru/olsr.po
index 95dfeb8dd..c1fe81b99 100644
--- a/po/ru/olsr.po
+++ b/po/ru/olsr.po
@@ -14,637 +14,637 @@ msgstr ""
 
 #. OLSR Daemon
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:1
-msgid "olsrd"
+msgid "OLSR Daemon"
 msgstr ""
 
 #. Neighbour IP
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:2
-msgid "olsrd_neighbour_ip"
+msgid "Neighbour IP"
 msgstr ""
 
 #. Local interface IP
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:3
-msgid "olsrd_local_ip"
+msgid "Local interface IP"
 msgstr ""
 
 #. Announced network
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:4
-msgid "olsrd_network"
+msgid "Announced network"
 msgstr ""
 
 #. OLSR gateway
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:5
-msgid "olsrd_gateway"
+msgid "OLSR gateway"
 msgstr ""
 
 #. OLSR node
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:6
-msgid "olsrd_node"
+msgid "OLSR node"
 msgstr ""
 
 #. Unable to connect to the OLSR daemon!
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:7
-msgid "olsrd_error"
+msgid "Unable to connect to the OLSR daemon!"
 msgstr ""
 
 #. Make sure that OLSRd is running, the &quot;txtinfo&quot; plugin is loaded, configured on port 2006 and accepts connections from &quot;127.0.0.1&quot;.
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:8
-msgid "olsrd_error_desc"
+msgid "Make sure that OLSRd is running, the \"txtinfo\" plugin is loaded, configured on port 2006 and accepts connections from \"127.0.0.1\"."
 msgstr ""
 
 #. OLSR - HNA-Announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:9
-msgid "olsrd_hna"
+msgid "OLSR - HNA-Announcements"
 msgstr ""
 
 #. OLSR - Plugins
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:10
-msgid "olsrd_plugins"
+msgid "OLSR - Plugins"
 msgstr ""
 
 #. OLSR connections
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:11
-msgid "olsrd_links"
+msgid "OLSR connections"
 msgstr ""
 
 #. Overview of currently established OLSR connections
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:12
-msgid "olsrd_links_desc"
+msgid "Overview of currently established OLSR connections"
 msgstr ""
 
 #. Expected retransmission count
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:13
-msgid "olsrd_links_etx_desc"
+msgid "Expected retransmission count"
 msgstr ""
 
 #. Success rate of sent packages
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:14
-msgid "olsrd_links_lq_desc"
+msgid "Success rate of sent packages"
 msgstr ""
 
 #. Success rate of received packages
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:15
-msgid "olsrd_links_nlq_desc"
+msgid "Success rate of received packages"
 msgstr ""
 
 #. Known OLSR routes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:16
-msgid "olsrd_routes"
+msgid "Known OLSR routes"
 msgstr ""
 
 #. Overview of currently known routes to other OLSR nodes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:17
-msgid "olsrd_routes_desc"
+msgid "Overview of currently known routes to other OLSR nodes"
 msgstr ""
 
 #. Active OLSR nodes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:18
-msgid "olsrd_topology"
+msgid "Active OLSR nodes"
 msgstr ""
 
 #. Overview of currently known OLSR nodes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:19
-msgid "olsrd_topology_desc"
+msgid "Overview of currently known OLSR nodes"
 msgstr ""
 
 #. Last hop
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:20
-msgid "olsrd_topology_lasthop"
+msgid "Last hop"
 msgstr ""
 
 #. Active host net announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:21
-msgid "olsrd_hna2"
+msgid "Active host net announcements"
 msgstr ""
 
 #. Overview of currently active OLSR host net announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:22
-msgid "olsrd_hna_desc"
+msgid "Overview of currently active OLSR host net announcements"
 msgstr ""
 
 #. Active MID announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:23
-msgid "olsrd_mid"
+msgid "Active MID announcements"
 msgstr ""
 
 #. Overview of known multiple interface announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:24
-msgid "olsrd_mid_desc"
+msgid "Overview of known multiple interface announcements"
 msgstr ""
 
 #. Secondary OLSR interfaces
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:25
-msgid "olsrd_mid_aliases"
+msgid "Secondary OLSR interfaces"
 msgstr ""
 
 #. Freifunk
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:26
-msgid "olsrd_etx_ff"
+msgid "Freifunk"
 msgstr ""
 
 #. floating point
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:27
-msgid "olsrd_etx_float"
+msgid "floating point"
 msgstr ""
 
 #. fixed point math
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:28
-msgid "olsrd_etx_fpm"
+msgid "fixed point math"
 msgstr ""
 
 #. General settings
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:29
-msgid "olsrd_olsrd"
+msgid "General settings"
 msgstr ""
 
 #. Start without network
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:30
-msgid "olsrd_olsrd_allownoint"
+msgid "Start without network"
 msgstr ""
 
 #. Clear screen
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:31
-msgid "olsrd_olsrd_clearscreen"
+msgid "Clear screen"
 msgstr ""
 
 #. Debugmode
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:32
-msgid "olsrd_olsrd_debuglevel"
+msgid "Debugmode"
 msgstr ""
 
 #. FIB metric
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:33
-msgid "olsrd_olsrd_fibmetric"
+msgid "FIB metric"
 msgstr ""
 
 #. Internet protocol
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:34
-msgid "olsrd_olsrd_ipversion"
+msgid "Internet protocol"
 msgstr ""
 
 #. LQ aging
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:35
-msgid "olsrd_olsrd_linkqualityaging"
+msgid "LQ aging"
 msgstr ""
 
 #. LQ algorithm
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:36
-msgid "olsrd_olsrd_linkqualityalgorithm"
+msgid "LQ algorithm"
 msgstr ""
 
 #. LQ Dijkstra limit
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:37
-msgid "olsrd_olsrd_linkqualitydijkstralimit"
+msgid "LQ Dijkstra limit"
 msgstr ""
 
 #. LQ fisheye
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:38
-msgid "olsrd_olsrd_linkqualityfisheye"
+msgid "LQ fisheye"
 msgstr ""
 
 #. LQ level
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:39
-msgid "olsrd_olsrd_linkqualitylevel"
+msgid "LQ level"
 msgstr ""
 
 #. MPR selection
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:40
-msgid "olsrd_olsrd_linkqualitylevel_1"
+msgid "MPR selection"
 msgstr ""
 
 #. MPR selection and routing
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:41
-msgid "olsrd_olsrd_linkqualitylevel_2"
+msgid "MPR selection and routing"
 msgstr ""
 
 #. LQ window size
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:42
-msgid "olsrd_olsrd_linkqualitywinsize"
+msgid "LQ window size"
 msgstr ""
 
 #. MPR coverage
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:43
-msgid "olsrd_olsrd_mprcoverage"
+msgid "MPR coverage"
 msgstr ""
 
 #. Pollrate
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:44
-msgid "olsrd_olsrd_pollrate"
+msgid "Pollrate"
 msgstr ""
 
 #. TC redundancy
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:45
-msgid "olsrd_olsrd_tcredundancy"
+msgid "TC redundancy"
 msgstr ""
 
 #. MPR selectors
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:46
-msgid "olsrd_olsrd_tcredundancy_0"
+msgid "MPR selectors"
 msgstr ""
 
 #. MPR selectors and MPR
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:47
-msgid "olsrd_olsrd_tcredundancy_1"
+msgid "MPR selectors and MPR"
 msgstr ""
 
 #. all neighbours
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:48
-msgid "olsrd_olsrd_tcredundancy_2"
+msgid "all neighbours"
 msgstr ""
 
 #. Use hysteresis
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:49
-msgid "olsrd_olsrd_usehysteresis"
+msgid "Use hysteresis"
 msgstr ""
 
 #. Willingness
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:50
-msgid "olsrd_olsrd_willingness"
+msgid "Willingness"
 msgstr ""
 
 #. Hello interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:51
-msgid "olsrd_interface_hellointerval"
+msgid "Hello interval"
 msgstr ""
 
 #. Hello validity time
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:52
-msgid "olsrd_interface_hellovaliditytime"
+msgid "Hello validity time"
 msgstr ""
 
 #. HNA interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:53
-msgid "olsrd_interface_hnainterval"
+msgid "HNA interval"
 msgstr ""
 
 #. HNA validity time
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:54
-msgid "olsrd_interface_hnavaliditytime"
+msgid "HNA validity time"
 msgstr ""
 
 #. IPv4 broadcast
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:55
-msgid "olsrd_interface_ip4broadcast"
+msgid "IPv4 broadcast"
 msgstr ""
 
 #. MID interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:56
-msgid "olsrd_interface_midinterval"
+msgid "MID interval"
 msgstr ""
 
 #. MID validity time
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:57
-msgid "olsrd_interface_midvaliditytime"
+msgid "MID validity time"
 msgstr ""
 
 #. TC interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:58
-msgid "olsrd_interface_tcinterval"
+msgid "TC interval"
 msgstr ""
 
 #. TC validity time
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:59
-msgid "olsrd_interface_tcvaliditytime"
+msgid "TC validity time"
 msgstr ""
 
 #. IPv6 address type
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:60
-msgid "olsrd_interface_ip6addrtype"
+msgid "IPv6 address type"
 msgstr ""
 
 #. IPC settings
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:61
-msgid "olsrd_ipcconnect"
+msgid "IPC settings"
 msgstr ""
 
 #. IPC connections enable you to remote-control the local OLSRd instance using external programs
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:62
-msgid "olsrd_ipcconnect_desc"
+msgid "IPC connections enable you to remote-control the local OLSRd instance using external programs"
 msgstr ""
 
 #. Allowed host addresses
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:63
-msgid "olsrd_ipcconnect_host"
+msgid "Allowed host addresses"
 msgstr ""
 
 #. Multiple separated by spaces
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:64
-msgid "olsrd_ipcconnect_host_desc"
+msgid "Multiple separated by spaces"
 msgstr ""
 
 #. Maxmimum connection count
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:65
-msgid "olsrd_ipcconnect_maxconnections"
+msgid "Maxmimum connection count"
 msgstr ""
 
 #. Set to 0 to disable IPC
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:66
-msgid "olsrd_ipcconnect_maxconnections_desc"
+msgid "Set to 0 to disable IPC"
 msgstr ""
 
 #. Allowed subnets
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:67
-msgid "olsrd_ipcconnect_net"
+msgid "Allowed subnets"
 msgstr ""
 
 #. Address Mask; multiple separated by space
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:68
-msgid "olsrd_ipcconnect_net_desc"
+msgid "Address Mask; multiple separated by space"
 msgstr ""
 
 #. IPv4 HNA announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:69
-msgid "olsrd_hna4"
+msgid "IPv4 HNA announcements"
 msgstr ""
 
 #. Hna4 entries allow you to propagate local IPv4 host- and network-routes into the mesh network
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:70
-msgid "olsrd_hna4_desc"
+msgid "Hna4 entries allow you to propagate local IPv4 host- and network-routes into the mesh network"
 msgstr ""
 
 #. Network address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:71
-msgid "olsrd_hna4_netaddr"
+msgid "Network address"
 msgstr ""
 
 #. IPv4 address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:72
-msgid "olsrd_hna4_netaddr_desc"
+msgid "IPv4 address"
 msgstr ""
 
 #. Netmask
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:73
-msgid "olsrd_hna4_netmask"
+msgid "Netmask"
 msgstr ""
 
 #. IPv4 address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:74
-msgid "olsrd_hna4_netmask_desc"
+msgid "IPv4 address"
 msgstr ""
 
 #. IPv6 HNA announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:75
-msgid "olsrd_hna6"
+msgid "IPv6 HNA announcements"
 msgstr ""
 
 #. Hna6 entries allow you to propagate local IPv6 host- and network-routes into the mesh network
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:76
-msgid "olsrd_hna6_desc"
+msgid "Hna6 entries allow you to propagate local IPv6 host- and network-routes into the mesh network"
 msgstr ""
 
 #. Network address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:77
-msgid "olsrd_hna6_netaddr"
+msgid "Network address"
 msgstr ""
 
 #. IPv6 address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:78
-msgid "olsrd_hna6_netaddr_desc"
+msgid "IPv6 address"
 msgstr ""
 
 #. Prefix
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:79
-msgid "olsrd_hna6_prefix"
+msgid "Prefix"
 msgstr ""
 
 #. IPv6 prefix
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:80
-msgid "olsrd_hna6_prefix_desc"
+msgid "IPv6 prefix"
 msgstr ""
 
 #. Plugin configuration
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:81
-msgid "olsrd_loadplugin"
+msgid "Plugin configuration"
 msgstr ""
 
 #. Enable plugin
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:82
-msgid "olsrd_loadplugin_ignore"
+msgid "Enable plugin"
 msgstr ""
 
 #. Library
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:83
-msgid "olsrd_loadplugin_library"
+msgid "Library"
 msgstr ""
 
 #. Allow connections from this hosts
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:84
-msgid "olsrd_loadplugin_accept"
+msgid "Allow connections from this hosts"
 msgstr ""
 
 #. Ping test addresses
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:85
-msgid "olsrd_loadplugin_ping"
+msgid "Ping test addresses"
 msgstr ""
 
 #. Interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:86
-msgid "olsrd_loadplugin_interval"
+msgid "Refresh interval in seconds"
 msgstr ""
 
 #. HNA announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:87
-msgid "olsrd_loadplugin_hna"
+msgid "HNA announcements"
 msgstr ""
 
 #. Format: IP-Address Netmask / OLSR will announce this network once it is reachable
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:88
-msgid "olsrd_loadplugin_hna_desc"
+msgid "Format: IP-Address Netmask / OLSR will announce this network once it is reachable"
 msgstr ""
 
 #. Alternative \"hosts\" file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:89
-msgid "olsrd_loadplugin_addhosts"
+msgid "Alternative \"hosts\" file"
 msgstr ""
 
 #. The contents of this file will be appended to the autogenerated \"hosts\" file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:90
-msgid "olsrd_loadplugin_addhosts_desc"
+msgid "The contents of this file will be appended to the autogenerated \"hosts\" file"
 msgstr ""
 
 #. DNS server
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:91
-msgid "olsrd_loadplugin_dnsserver"
+msgid "DNS server"
 msgstr ""
 
 #. Alternative hostnames
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:92
-msgid "olsrd_loadplugin_hosts"
+msgid "Alternative hostnames"
 msgstr ""
 
 #. Format: Interface-IP Hostname
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:93
-msgid "olsrd_loadplugin_hosts_desc"
+msgid "Format: Interface-IP Hostname"
 msgstr ""
 
 #. Path to the \"hosts\" file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:94
-msgid "olsrd_loadplugin_hostsfile"
+msgid "Path to the \"hosts\" file"
 msgstr ""
 
 #. Latitude
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:95
-msgid "olsrd_loadplugin_lat"
+msgid "Latitude"
 msgstr ""
 
 #. Output file for coordinates
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:96
-msgid "olsrd_loadplugin_latlonfile"
+msgid "Output file for coordinates"
 msgstr ""
 
 #. OLSR will write received coordinates of other nodes to this file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:97
-msgid "olsrd_loadplugin_latlonfile_desc"
+msgid "OLSR will write received coordinates of other nodes to this file"
 msgstr ""
 
 #. Input file for coordinates
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:98
-msgid "olsrd_loadplugin_latloninfile"
+msgid "Input file for coordinates"
 msgstr ""
 
 #. OLSR periodically checks this file for new coordinates and propagates them
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:99
-msgid "olsrd_loadplugin_latloninfile_desc"
+msgid "OLSR periodically checks this file for new coordinates and propagates them"
 msgstr ""
 
 #. Longitude
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:100
-msgid "olsrd_loadplugin_lon"
+msgid "Longitude"
 msgstr ""
 
 #. Hostnames
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:101
-msgid "olsrd_loadplugin_name"
+msgid "Hostnames"
 msgstr ""
 
 #. Command for name changes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:102
-msgid "olsrd_loadplugin_namechangescript"
+msgid "Command for name changes"
 msgstr ""
 
 #. OLSR executes this command once entries in the \"hosts\" are changed
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:103
-msgid "olsrd_loadplugin_namechangescript_desc"
+msgid "OLSR executes this command once entries in the \"hosts\" are changed"
 msgstr ""
 
 #. Path to the \"resolv\" file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:104
-msgid "olsrd_loadplugin_resolvfile"
+msgid "Path to the \"resolv\" file"
 msgstr ""
 
 #. Command for service changes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:105
-msgid "olsrd_loadplugin_serviceschangescript"
+msgid "Command for service changes"
 msgstr ""
 
 #. OLSR excutes this command once new service announcements are received
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:106
-msgid "olsrd_loadplugin_serviceschangescript_desc"
+msgid "OLSR excutes this command once new service announcements are received"
 msgstr ""
 
 #. PID file for SIGHUP signals
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:107
-msgid "olsrd_loadplugin_sighuppidfile"
+msgid "PID file for SIGHUP signals"
 msgstr ""
 
 #. OLSR sends a HUP signal to this PID once the \"hosts\" oder \"resolv\" file is changed
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:108
-msgid "olsrd_loadplugin_sighuppidfile_desc"
+msgid "OLSR sends a HUP signal to this PID once the \"hosts\" oder \"resolv\" file is changed"
 msgstr ""
 
 #. Domain suffix
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:109
-msgid "olsrd_loadplugin_suffix"
+msgid "Domain suffix"
 msgstr ""
 
 #. Timeout
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:110
-msgid "olsrd_loadplugin_timeout"
+msgid "Timeout"
 msgstr ""
 
 #. Name of the BMF interface
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:111
-msgid "olsrd_loadplugin_bmfinterface"
+msgid "Name of the BMF interface"
 msgstr ""
 
 #. IP address of the BMF interface
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:112
-msgid "olsrd_loadplugin_bmfinterfaceid"
+msgid "IP address of the BMF interface"
 msgstr ""
 
 #. Redirect local broadcasts
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:113
-msgid "olsrd_loadplugin_dolocalbroadcast"
+msgid "Redirect local broadcasts"
 msgstr ""
 
 #. Also redirect broadcasts from OLSR interfaces
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:114
-msgid "olsrd_loadplugin_capturepacketsonolsrinterfaces"
+msgid "Also redirect broadcasts from OLSR interfaces"
 msgstr ""
 
 #. Propagation mechanism
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:115
-msgid "olsrd_loadplugin_bmfmechanism"
+msgid "Propagation mechanism"
 msgstr ""
 
 #. Number of retransmissions per package
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:116
-msgid "olsrd_loadplugin_broadcastretransmitcount"
+msgid "Number of retransmissions per package"
 msgstr ""
 
 #. Minimum number of neighbours for broadcast redirection
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:117
-msgid "olsrd_loadplugin_fanoutlimit"
+msgid "Minimum number of neighbours for broadcast redirection"
 msgstr ""
 
 #. Non-OLSR interfaces
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:118
-msgid "olsrd_loadplugin_nonolsrif"
+msgid "Non-OLSR interfaces"
 msgstr ""
 
 #. Used port
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:119
-msgid "olsrd_loadplugin_port"
+msgid "Used port"
 msgstr ""
 
 #. Allow connections from hosts
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:120
-msgid "olsrd_loadplugin_host"
+msgid "Allow connections from hosts"
 msgstr ""
 
 #. Allow connections from subnets
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:121
-msgid "olsrd_loadplugin_net"
+msgid "Allow connections from subnets"
 msgstr ""
 
 #. Format: IP-AddresseNetmask
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:122
-msgid "olsrd_loadplugin_net_desc"
+msgid "Format: IP-AddresseNetmask"
 msgstr ""
 
 #. Used protocols
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:123
-msgid "olsrd_loadplugin_redistribute"
+msgid "Used protocols"
 msgstr ""
 
 #. Only export routes to Quagga or to kernel too
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:124
-msgid "olsrd_loadplugin_exportroutes"
+msgid "Only export routes to Quagga or to kernel too"
 msgstr ""
 
 #. Always prefer local routes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:125
-msgid "olsrd_loadplugin_localpref"
+msgid "Always prefer local routes"
 msgstr ""
 
 #. Distance of exported routes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:126
-msgid "olsrd_loadplugin_distance"
+msgid "Distance of exported routes"
 msgstr ""
 
 #. Key file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:127
-msgid "olsrd_loadplugin_keyfile"
+msgid "Key file"
 msgstr ""
 
 #. Watchdog timestamp file
diff --git a/po/ru/openvpn.po b/po/ru/openvpn.po
index 418079656..3883ec08e 100644
--- a/po/ru/openvpn.po
+++ b/po/ru/openvpn.po
@@ -14,947 +14,947 @@ msgstr ""
 
 #. OpenVPN
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:1
-msgid "openvpn"
+msgid "OpenVPN"
 msgstr ""
 
 #. Switch to basic configuration
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:3
-msgid "openvpn_switch_basic"
+msgid "« Switch to basic configuration"
 msgstr ""
 
 #. Switch to advanced configuration
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:4
-msgid "openvpn_switch_advanced"
+msgid "Switch to advanced configuration »"
 msgstr ""
 
 #. Enabled
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:6
-msgid "openvpn_enable"
+msgid "Enabled"
 msgstr ""
 
 #. Started
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:7
-msgid "openvpn_active"
+msgid "Started"
 msgstr ""
 
 #. no
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:8
-msgid "openvpn_active_no"
+msgid "no"
 msgstr ""
 
 #. yes (%i)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:9
-msgid "openvpn_active_yes"
+msgid "yes (%i)"
 msgstr ""
 
 #. Port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:10
-msgid "openvpn_port"
+msgid "Port"
 msgstr ""
 
 #. Protocol
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:11
-msgid "openvpn_proto"
+msgid "Protocol"
 msgstr ""
 
 #. Instance \"%s\"
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:13
-msgid "openvpn_instance"
+msgid "Instance \"%s\""
 msgstr ""
 
 #. OpenVPN instances
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:15
-msgid "openvpn_overview"
+msgid "OpenVPN instances"
 msgstr ""
 
 #. Below is a list of configured OpenVPN instances and their current state
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:16
-msgid "openvpn_overview_desc"
+msgid "Below is a list of configured OpenVPN instances and their current state"
 msgstr ""
 
 #. Daemon configuration
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:18
-msgid "openvpn_service"
+msgid "Daemon configuration"
 msgstr ""
 
 #. Networking options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:19
-msgid "openvpn_networking"
+msgid "Networking options"
 msgstr ""
 
 #. VPN options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:20
-msgid "openvpn_vpn"
+msgid "VPN options"
 msgstr ""
 
 #. Cryptography settings
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:21
-msgid "openvpn_cryptography"
+msgid "Cryptography settings"
 msgstr ""
 
 #. Read configuration options from file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:23
-msgid "openvpn_param_config"
+msgid "Read configuration options from file"
 msgstr ""
 
 #. Local host name or ip address
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:24
-msgid "openvpn_param_local"
+msgid "Local host name or ip address"
 msgstr ""
 
 #. Remote host name or ip address
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:25
-msgid "openvpn_param_remote"
+msgid "Remote host name or ip address"
 msgstr ""
 
 #. Randomly choose remote server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:26
-msgid "openvpn_param_remote_random"
+msgid "Randomly choose remote server"
 msgstr ""
 
 #. Major mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:27
-msgid "openvpn_param_mode"
+msgid "Major mode"
 msgstr ""
 
 #. Use protocol
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:28
-msgid "openvpn_param_proto"
+msgid "Use protocol"
 msgstr ""
 
 #. Connection retry interval
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:29
-msgid "openvpn_param_connect_retry"
+msgid "Connection retry interval"
 msgstr ""
 
 #. Connection timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:30
-msgid "openvpn_param_connect_timeout"
+msgid "Connection timeout"
 msgstr ""
 
 #. Maximum connection attempt retries
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:31
-msgid "openvpn_param_connect_retry_max"
+msgid "Maximum connection attempt retries"
 msgstr ""
 
 #. Try to sense proxy settings automatically
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:32
-msgid "openvpn_param_auto_proxy"
+msgid "Try to sense proxy settings automatically"
 msgstr ""
 
 #. Connect to remote host
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:33
-msgid "openvpn_param_http_proxy"
+msgid "Connect to remote host"
 msgstr ""
 
 #. Retry indefinitely on HTTP proxy errors
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:34
-msgid "openvpn_param_http_proxy_retry"
+msgid "Retry indefinitely on HTTP proxy errors"
 msgstr ""
 
 #. Proxy timeout in seconds
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:35
-msgid "openvpn_param_http_proxy_timeout"
+msgid "Proxy timeout in seconds"
 msgstr ""
 
 #. Set extended HTTP proxy options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:36
-msgid "openvpn_param_http_proxy_option"
+msgid "Set extended HTTP proxy options"
 msgstr ""
 
 #. Connect through Socks5 proxy
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:37
-msgid "openvpn_param_socks_proxy"
+msgid "Connect through Socks5 proxy"
 msgstr ""
 
 #. Retry indefinitely on Socks proxy errors
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:38
-msgid "openvpn_param_socks_proxy_retry"
+msgid "Retry indefinitely on Socks proxy errors"
 msgstr ""
 
 #. If hostname resolve fails, retry
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:39
-msgid "openvpn_param_resolv_retry"
+msgid "If hostname resolve fails, retry"
 msgstr ""
 
 #. Allow remote to change its IP or port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:40
-msgid "openvpn_param_float"
+msgid "Allow remote to change its IP or port"
 msgstr ""
 
 #. Execute shell command on remote ip change
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:41
-msgid "openvpn_param_ipchange"
+msgid "Execute shell command on remote ip change"
 msgstr ""
 
 #. TCP/UDP port # for both local and remote
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:42
-msgid "openvpn_param_port"
+msgid "TCP/UDP port # for both local and remote"
 msgstr ""
 
 #. TCP/UDP port # for local (default=1194)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:43
-msgid "openvpn_param_lport"
+msgid "TCP/UDP port # for local (default=1194)"
 msgstr ""
 
 #. TCP/UDP port # for remote (default=1194)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:44
-msgid "openvpn_param_rport"
+msgid "TCP/UDP port # for remote (default=1194)"
 msgstr ""
 
 #. Bind to local address and port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:45
-msgid "openvpn_param_bind"
+msgid "Bind to local address and port"
 msgstr ""
 
 #. Do not bind to local address and port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:46
-msgid "openvpn_param_nobind"
+msgid "Do not bind to local address and port"
 msgstr ""
 
 #. tun/tap device
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:47
-msgid "openvpn_param_dev"
+msgid "tun/tap device"
 msgstr ""
 
 #. Type of used device
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:48
-msgid "openvpn_param_dev_type"
+msgid "Type of used device"
 msgstr ""
 
 #. Use tun/tap device node
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:49
-msgid "openvpn_param_dev_node"
+msgid "Use tun/tap device node"
 msgstr ""
 
 #. Set the link layer address of the tap device
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:50
-msgid "openvpn_param_lladdr"
+msgid "Set the link layer address of the tap device"
 msgstr ""
 
 #. 'net30', 'p2p', or 'subnet'
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:51
-msgid "openvpn_param_topology"
+msgid "'net30', 'p2p', or 'subnet'"
 msgstr ""
 
 #. Make tun device IPv6 capable
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:52
-msgid "openvpn_param_tun_ipv6"
+msgid "Make tun device IPv6 capable"
 msgstr ""
 
 #. Configure device to use IP address
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:53
-msgid "openvpn_param_ifconfig"
+msgid "Configure device to use IP address"
 msgstr ""
 
 #. Don't actually execute ifconfig
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:54
-msgid "openvpn_param_ifconfig_noexec"
+msgid "Don't actually execute ifconfig"
 msgstr ""
 
 #. Don't warn on ifconfig inconsistencies
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:55
-msgid "openvpn_param_ifconfig_nowarn"
+msgid "Don't warn on ifconfig inconsistencies"
 msgstr ""
 
 #. Add route after establishing connection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:56
-msgid "openvpn_param_route"
+msgid "Add route after establishing connection"
 msgstr ""
 
 #. Specify a default gateway for routes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:57
-msgid "openvpn_param_route_gateway"
+msgid "Specify a default gateway for routes"
 msgstr ""
 
 #. Specify a default metric for routes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:58
-msgid "openvpn_param_route_metric"
+msgid "Specify a default metric for routes"
 msgstr ""
 
 #. Delay n seconds after connection 
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:59
-msgid "openvpn_param_route_delay"
+msgid "Delay n seconds after connection "
 msgstr ""
 
 #. Execute shell cmd after routes are added
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:60
-msgid "openvpn_param_route_up"
+msgid "Execute shell cmd after routes are added"
 msgstr ""
 
 #. Don't add routes automatically
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:61
-msgid "openvpn_param_route_noexec"
+msgid "Don't add routes automatically"
 msgstr ""
 
 #. Don't pull options from server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:62
-msgid "openvpn_param_route_nopull"
+msgid "Don't pull options from server"
 msgstr ""
 
 #. Automatically redirect default route
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:63
-msgid "openvpn_param_redirect_gateway"
+msgid "Automatically redirect default route"
 msgstr ""
 
 #. Pass environment variables to script
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:64
-msgid "openvpn_param_setenv"
+msgid "Pass environment variables to script"
 msgstr ""
 
 #. Shaping for peer bandwidth
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:65
-msgid "openvpn_param_shaper"
+msgid "Shaping for peer bandwidth"
 msgstr ""
 
 #. Set timeouts in server mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:66
-msgid "openvpn_param_keepalive"
+msgid "Set timeouts in server mode"
 msgstr ""
 
 #. tun/tap inactivity timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:67
-msgid "openvpn_param_inactive"
+msgid "tun/tap inactivity timeout"
 msgstr ""
 
 #. Remote ping timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:68
-msgid "openvpn_param_ping_exit"
+msgid "Remote ping timeout"
 msgstr ""
 
 #. Restart after remote ping timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:69
-msgid "openvpn_param_ping_restart"
+msgid "Restart after remote ping timeout"
 msgstr ""
 
 #. Only process ping timeouts if routes exist
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:70
-msgid "openvpn_param_ping_timer_rem"
+msgid "Only process ping timeouts if routes exist"
 msgstr ""
 
 #. Ping remote every n seconds over TCP/UDP port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:71
-msgid "openvpn_param_ping"
+msgid "Ping remote every n seconds over TCP/UDP port"
 msgstr ""
 
 #. Configure a multi-homed UDP server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:72
-msgid "openvpn_param_multihome"
+msgid "Configure a multi-homed UDP server"
 msgstr ""
 
 #. Optimize TUN/TAP/UDP writes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:73
-msgid "openvpn_param_fast_io"
+msgid "Optimize TUN/TAP/UDP writes"
 msgstr ""
 
 #. Remap SIGUSR1 signals
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:74
-msgid "openvpn_param_remap_usr1"
+msgid "Remap SIGUSR1 signals"
 msgstr ""
 
 #. Keep tun/tap device open on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:75
-msgid "openvpn_param_persist_tun"
+msgid "Keep tun/tap device open on restart"
 msgstr ""
 
 #. Keep remote IP address on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:76
-msgid "openvpn_param_persist_remote_ip"
+msgid "Keep remote IP address on restart"
 msgstr ""
 
 #. Keep local IP address on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:77
-msgid "openvpn_param_persist_local_ip"
+msgid "Keep local IP address on restart"
 msgstr ""
 
 #. Don't re-read key on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:78
-msgid "openvpn_param_persist_key"
+msgid "Don't re-read key on restart"
 msgstr ""
 
 #. TOS passthrough (applies to IPv4 only)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:79
-msgid "openvpn_param_passtos"
+msgid "TOS passthrough (applies to IPv4 only)"
 msgstr ""
 
 #. Set tun/tap device MTU
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:80
-msgid "openvpn_param_tun_mtu"
+msgid "Set tun/tap device MTU"
 msgstr ""
 
 #. Set tun/tap device overhead
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:81
-msgid "openvpn_param_tun_mtu_extra"
+msgid "Set tun/tap device overhead"
 msgstr ""
 
 #. Set TCP/UDP MTU
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:82
-msgid "openvpn_param_link_mtu"
+msgid "Set TCP/UDP MTU"
 msgstr ""
 
 #. Enable Path MTU discovery
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:83
-msgid "openvpn_param_mtu_disc"
+msgid "Enable Path MTU discovery"
 msgstr ""
 
 #. Empirically measure MTU
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:84
-msgid "openvpn_param_mtu_test"
+msgid "Empirically measure MTU"
 msgstr ""
 
 #. Enable internal datagram fragmentation
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:85
-msgid "openvpn_param_fragment"
+msgid "Enable internal datagram fragmentation"
 msgstr ""
 
 #. Set upper bound on TCP MSS
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:86
-msgid "openvpn_param_mssfix"
+msgid "Set upper bound on TCP MSS"
 msgstr ""
 
 #. Set the TCP/UDP send buffer size
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:87
-msgid "openvpn_param_sndbuf"
+msgid "Set the TCP/UDP send buffer size"
 msgstr ""
 
 #. Set the TCP/UDP receive buffer size
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:88
-msgid "openvpn_param_rcvbuf"
+msgid "Set the TCP/UDP receive buffer size"
 msgstr ""
 
 #. Set tun/tap TX queue length
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:89
-msgid "openvpn_param_txqueuelen"
+msgid "Set tun/tap TX queue length"
 msgstr ""
 
 #. Disable Paging
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:90
-msgid "openvpn_param_mlock"
+msgid "Disable Paging"
 msgstr ""
 
 #. Shell cmd to execute after tun device open
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:91
-msgid "openvpn_param_up"
+msgid "Shell cmd to execute after tun device open"
 msgstr ""
 
 #. Delay tun/tap open and up script execution
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:92
-msgid "openvpn_param_up_delay"
+msgid "Delay tun/tap open and up script execution"
 msgstr ""
 
 #. Shell cmd to run after tun device close
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:93
-msgid "openvpn_param_down"
+msgid "Shell cmd to run after tun device close"
 msgstr ""
 
 #. Call down cmd/script before TUN/TAP close
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:94
-msgid "openvpn_param_down_pre"
+msgid "Call down cmd/script before TUN/TAP close"
 msgstr ""
 
 #. Run up/down scripts for all restarts
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:95
-msgid "openvpn_param_up_restart"
+msgid "Run up/down scripts for all restarts"
 msgstr ""
 
 #. Set UID to user
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:96
-msgid "openvpn_param_user"
+msgid "Set UID to user"
 msgstr ""
 
 #. Set GID to group
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:97
-msgid "openvpn_param_group"
+msgid "Set GID to group"
 msgstr ""
 
 #. Chroot to directory after initialization
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:98
-msgid "openvpn_param_chroot"
+msgid "Chroot to directory after initialization"
 msgstr ""
 
 #. Change to directory before initialization
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:99
-msgid "openvpn_param_cd"
+msgid "Change to directory before initialization"
 msgstr ""
 
 #. Daemonize after initialization
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:100
-msgid "openvpn_param_daemon"
+msgid "Daemonize after initialization"
 msgstr ""
 
 #. Output to syslog and do not daemonize
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:101
-msgid "openvpn_param_syslog"
+msgid "Output to syslog and do not daemonize"
 msgstr ""
 
 #. Run as an inetd or xinetd server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:102
-msgid "openvpn_param_inetd"
+msgid "Run as an inetd or xinetd server"
 msgstr ""
 
 #. Write log to file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:103
-msgid "openvpn_param_log"
+msgid "Write log to file"
 msgstr ""
 
 #. Append log to file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:104
-msgid "openvpn_param_log_append"
+msgid "Append log to file"
 msgstr ""
 
 #. Don't log timestamps
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:105
-msgid "openvpn_param_suppress_timestamps"
+msgid "Don't log timestamps"
 msgstr ""
 
 #. Write process ID to file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:106
-msgid "openvpn_param_writepid"
+msgid "Write process ID to file"
 msgstr ""
 
 #. Change process priority
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:107
-msgid "openvpn_param_nice"
+msgid "Change process priority"
 msgstr ""
 
 #. Echo parameters to log
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:108
-msgid "openvpn_param_echo"
+msgid "Echo parameters to log"
 msgstr ""
 
 #. Set output verbosity
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:109
-msgid "openvpn_param_verb"
+msgid "Set output verbosity"
 msgstr ""
 
 #. Limit repeated log messages
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:110
-msgid "openvpn_param_mute"
+msgid "Limit repeated log messages"
 msgstr ""
 
 #. Write status to file every n seconds
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:111
-msgid "openvpn_param_status"
+msgid "Write status to file every n seconds"
 msgstr ""
 
 #. Status file format version
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:112
-msgid "openvpn_param_status_version"
+msgid "Status file format version"
 msgstr ""
 
 #. Disable options consistency check
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:113
-msgid "openvpn_param_disable_occ"
+msgid "Disable options consistency check"
 msgstr ""
 
 #. Special stress testing mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:114
-msgid "openvpn_param_gremlin"
+msgid "Special stress testing mode"
 msgstr ""
 
 #. Use fast LZO compression
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:115
-msgid "openvpn_param_comp_lzo"
+msgid "Use fast LZO compression"
 msgstr ""
 
 #. Don't use adaptive lzo compression
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:116
-msgid "openvpn_param_comp_noadapt"
+msgid "Don't use adaptive lzo compression"
 msgstr ""
 
 #. Enable management interface on <em>IP</em> <em>port</em>
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:117
-msgid "openvpn_param_management"
+msgid "Enable management interface on <em>IP</em> <em>port</em>"
 msgstr ""
 
 #. Management interface will connect as a TCP client
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:118
-msgid "openvpn_param_management_client"
+msgid "Management interface will connect as a TCP client"
 msgstr ""
 
 #. Query management channel for private key
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:119
-msgid "openvpn_param_management_query_passwords"
+msgid "Query management channel for private key"
 msgstr ""
 
 #. Start OpenVPN in a hibernating state
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:120
-msgid "openvpn_param_management_hold"
+msgid "Start OpenVPN in a hibernating state"
 msgstr ""
 
 #. Issue SIGUSR1 on management disconnect
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:121
-msgid "openvpn_param_management_signal"
+msgid "Issue SIGUSR1 on management disconnect"
 msgstr ""
 
 #. Forget passwords on management disconnect
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:122
-msgid "openvpn_param_management_forget_disconnect"
+msgid "Forget passwords on management disconnect"
 msgstr ""
 
 #. Number of lines for log file history
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:123
-msgid "openvpn_param_management_log_cache"
+msgid "Number of lines for log file history"
 msgstr ""
 
 #. Load plug-in module
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:124
-msgid "openvpn_param_plugin"
+msgid "Load plug-in module"
 msgstr ""
 
 #. Configure server mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:125
-msgid "openvpn_param_server"
+msgid "Configure server mode"
 msgstr ""
 
 #. Configure server bridge
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:126
-msgid "openvpn_param_server_bridge"
+msgid "Configure server bridge"
 msgstr ""
 
 #. Push options to peer
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:127
-msgid "openvpn_param_push"
+msgid "Push options to peer"
 msgstr ""
 
 #. Don't inherit global push options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:128
-msgid "openvpn_param_push_reset"
+msgid "Don't inherit global push options"
 msgstr ""
 
 #. Set aside a pool of subnets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:129
-msgid "openvpn_param_ifconfig_pool"
+msgid "Set aside a pool of subnets"
 msgstr ""
 
 #. Use individual addresses rather than /30 subnets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:130
-msgid "openvpn_param_ifconfig_pool_linear"
+msgid "Use individual addresses rather than /30 subnets"
 msgstr ""
 
 #. Persist/unpersist ifconfig-pool
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:131
-msgid "openvpn_param_ifconfig_pool_persist"
+msgid "Persist/unpersist ifconfig-pool"
 msgstr ""
 
 #. Push an ifconfig option to remote
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:132
-msgid "openvpn_param_ifconfig_push"
+msgid "Push an ifconfig option to remote"
 msgstr ""
 
 #. Route subnet to client
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:133
-msgid "openvpn_param_iroute"
+msgid "Route subnet to client"
 msgstr ""
 
 #. Client is disabled
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:134
-msgid "openvpn_param_disable"
+msgid "Client is disabled"
 msgstr ""
 
 #. Don't require client certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:135
-msgid "openvpn_param_client_cert_not_required"
+msgid "Don't require client certificate"
 msgstr ""
 
 #. Use username as common name
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:136
-msgid "openvpn_param_username_as_common_name"
+msgid "Use username as common name"
 msgstr ""
 
 #. Script to verify interactive authentication
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:137
-msgid "openvpn_param_auth_user_pass_verify"
+msgid "Script to verify interactive authentication"
 msgstr ""
 
 #. Allow client-to-client traffic
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:138
-msgid "openvpn_param_client_to_client"
+msgid "Allow client-to-client traffic"
 msgstr ""
 
 #. Allow multiple clients with same certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:139
-msgid "openvpn_param_duplicate_cn"
+msgid "Allow multiple clients with same certificate"
 msgstr ""
 
 #. Run script cmd on client connection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:140
-msgid "openvpn_param_client_connect"
+msgid "Run script cmd on client connection"
 msgstr ""
 
 #. Run script cmd on client disconnection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:141
-msgid "openvpn_param_client_disconnect"
+msgid "Run script cmd on client disconnection"
 msgstr ""
 
 #. Directory for custom client config files
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:142
-msgid "openvpn_param_client_config_dir"
+msgid "Directory for custom client config files"
 msgstr ""
 
 #. Refuse connection if no custom client config
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:143
-msgid "openvpn_param_ccd_exclusive"
+msgid "Refuse connection if no custom client config"
 msgstr ""
 
 #. Temporary directory for client-connect return file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:144
-msgid "openvpn_param_tmp_dir"
+msgid "Temporary directory for client-connect return file"
 msgstr ""
 
 #. Set size of real and virtual address hash tables
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:145
-msgid "openvpn_param_hash_size"
+msgid "Set size of real and virtual address hash tables"
 msgstr ""
 
 #. Number of allocated broadcast buffers
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:146
-msgid "openvpn_param_bcast_buffers"
+msgid "Number of allocated broadcast buffers"
 msgstr ""
 
 #. Maximum number of queued TCP output packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:147
-msgid "openvpn_param_tcp_queue_limit"
+msgid "Maximum number of queued TCP output packets"
 msgstr ""
 
 #. Script to validate client virtual addresses
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:148
-msgid "openvpn_param_learn_address"
+msgid "Script to validate client virtual addresses"
 msgstr ""
 
 #. Allowed maximum of new connections
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:149
-msgid "openvpn_param_connect_freq"
+msgid "Allowed maximum of new connections"
 msgstr ""
 
 #. Allowed maximum of connected clients
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:150
-msgid "openvpn_param_max_clients"
+msgid "Allowed maximum of connected clients"
 msgstr ""
 
 #. Allowed maximum of internal
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:151
-msgid "openvpn_param_max_routes_per_client"
+msgid "Allowed maximum of internal"
 msgstr ""
 
 #. Proxy incoming HTTPS sessions
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:152
-msgid "openvpn_param_port_share"
+msgid "Proxy incoming HTTPS sessions"
 msgstr ""
 
 #. Configure client mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:153
-msgid "openvpn_param_client"
+msgid "Configure client mode"
 msgstr ""
 
 #. Authenticate using username/password
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:154
-msgid "openvpn_param_auth_user_pass"
+msgid "Authenticate using username/password"
 msgstr ""
 
 #. Accept options pushed from server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:155
-msgid "openvpn_param_pull"
+msgid "Accept options pushed from server"
 msgstr ""
 
 #. Handling of authentication failures
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:156
-msgid "openvpn_param_auth_retry"
+msgid "Handling of authentication failures"
 msgstr ""
 
 #. Send notification to peer on disconnect
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:157
-msgid "openvpn_param_explicit_exit_notify"
+msgid "Send notification to peer on disconnect"
 msgstr ""
 
 #. Enable Static Key encryption mode (non-TLS)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:158
-msgid "openvpn_param_secret"
+msgid "Enable Static Key encryption mode (non-TLS)"
 msgstr ""
 
 #. HMAC authentication for packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:159
-msgid "openvpn_param_auth"
+msgid "HMAC authentication for packets"
 msgstr ""
 
 #. Encryption cipher for packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:160
-msgid "openvpn_param_cipher"
+msgid "Encryption cipher for packets"
 msgstr ""
 
 #. Size of cipher key
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:161
-msgid "openvpn_param_keysize"
+msgid "Size of cipher key"
 msgstr ""
 
 #. Enable OpenSSL hardware crypto engines
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:162
-msgid "openvpn_param_engine"
+msgid "Enable OpenSSL hardware crypto engines"
 msgstr ""
 
 #. Disable replay protection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:163
-msgid "openvpn_param_no_replay"
+msgid "Disable replay protection"
 msgstr ""
 
 #. Silence the output of replay warnings
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:164
-msgid "openvpn_param_mute_replay_warnings"
+msgid "Silence the output of replay warnings"
 msgstr ""
 
 #. Replay protection sliding window size
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:165
-msgid "openvpn_param_replay_window"
+msgid "Replay protection sliding window size"
 msgstr ""
 
 #. Disable cipher initialisation vector
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:166
-msgid "openvpn_param_no_iv"
+msgid "Disable cipher initialisation vector"
 msgstr ""
 
 #. Persist replay-protection state
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:167
-msgid "openvpn_param_replay_persist"
+msgid "Persist replay-protection state"
 msgstr ""
 
 #. Run a self-test of crypto features
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:168
-msgid "openvpn_param_test_crypto"
+msgid "Run a self-test of crypto features"
 msgstr ""
 
 #. Enable TLS and assume server role
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:169
-msgid "openvpn_param_tls_server"
+msgid "Enable TLS and assume server role"
 msgstr ""
 
 #. Enable TLS and assume client role
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:170
-msgid "openvpn_param_tls_client"
+msgid "Enable TLS and assume client role"
 msgstr ""
 
 #. Data channel key exchange method
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:171
-msgid "openvpn_param_key_method"
+msgid "Data channel key exchange method"
 msgstr ""
 
 #. Certificate authority
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:172
-msgid "openvpn_param_ca"
+msgid "Certificate authority"
 msgstr ""
 
 #. Directory of trusted certificates (CAs and CRLs)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:173
-msgid "openvpn_param_capath"
+msgid "Directory of trusted certificates (CAs and CRLs)"
 msgstr ""
 
 #. Diffie Hellman parameters
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:174
-msgid "openvpn_param_dh"
+msgid "Diffie Hellman parameters"
 msgstr ""
 
 #. Local certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:175
-msgid "openvpn_param_cert"
+msgid "Local certificate"
 msgstr ""
 
 #. Local private key
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:176
-msgid "openvpn_param_key"
+msgid "Local private key"
 msgstr ""
 
 #. PKCS#12 file containing keys
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:177
-msgid "openvpn_param_pkcs12"
+msgid "PKCS#12 file containing keys"
 msgstr ""
 
 #. TLS cipher
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:178
-msgid "openvpn_param_tls_cipher"
+msgid "TLS cipher"
 msgstr ""
 
 #. Retransmit timeout on TLS control channel
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:179
-msgid "openvpn_param_tls_timeout"
+msgid "Retransmit timeout on TLS control channel"
 msgstr ""
 
 #. Renegotiate data chan. key after bytes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:180
-msgid "openvpn_param_reneg_bytes"
+msgid "Renegotiate data chan. key after bytes"
 msgstr ""
 
 #. Renegotiate data chan. key after packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:181
-msgid "openvpn_param_reneg_pkts"
+msgid "Renegotiate data chan. key after packets"
 msgstr ""
 
 #. Renegotiate data chan. key after seconds
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:182
-msgid "openvpn_param_reneg_sec"
+msgid "Renegotiate data chan. key after seconds"
 msgstr ""
 
 #. Timeframe for key exchange
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:183
-msgid "openvpn_param_hand_window"
+msgid "Timeframe for key exchange"
 msgstr ""
 
 #. Key transition window
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:184
-msgid "openvpn_param_tran_window"
+msgid "Key transition window"
 msgstr ""
 
 #. Allow only one session
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:185
-msgid "openvpn_param_single_session"
+msgid "Allow only one session"
 msgstr ""
 
 #. Exit on TLS negotiation failure
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:186
-msgid "openvpn_param_tls_exit"
+msgid "Exit on TLS negotiation failure"
 msgstr ""
 
 #. Additional authentication over TLS
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:187
-msgid "openvpn_param_tls_auth"
+msgid "Additional authentication over TLS"
 msgstr ""
 
 #. Get PEM password from controlling tty before we daemonize
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:188
-msgid "openvpn_param_askpass"
+msgid "Get PEM password from controlling tty before we daemonize"
 msgstr ""
 
 #. Don't cache --askpass or --auth-user-pass passwords
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:189
-msgid "openvpn_param_auth_nocache"
+msgid "Don't cache --askpass or --auth-user-pass passwords"
 msgstr ""
 
 #. Check peer certificate against a CRL
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:190
-msgid "openvpn_param_crl_verify"
+msgid "Check peer certificate against a CRL"
 msgstr ""
 
 #. Shell command to verify X509 name
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:191
-msgid "openvpn_param_tls_verify"
+msgid "Shell command to verify X509 name"
 msgstr ""
 
 #. Only accept connections from given X509 name
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:192
-msgid "openvpn_param_tls_remote"
+msgid "Only accept connections from given X509 name"
 msgstr ""
 
 #. Require explicit designation on certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:193
-msgid "openvpn_param_ns_cert_type"
+msgid "Require explicit designation on certificate"
 msgstr ""
 
 #. Require explicit key usage on certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:194
-msgid "openvpn_param_remote_cert_ku"
+msgid "Require explicit key usage on certificate"
 msgstr ""
 
 #. Require extended explicit key usage on certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:195
-msgid "openvpn_param_remote_cert_eku"
+msgid "Require extended explicit key usage on certificate"
 msgstr ""
 
 #. Require normal and extended key usage on certificate
diff --git a/po/ru/p910nd.po b/po/ru/p910nd.po
index a8b125c5f..9a5e7e0c0 100644
--- a/po/ru/p910nd.po
+++ b/po/ru/p910nd.po
@@ -14,17 +14,17 @@ msgstr ""
 
 #. p910nd - Printer server
 #: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:1
-msgid "p910nd"
+msgid "p910nd - Printer server"
 msgstr ""
 
 #. First you have to install the packages to get support for USB (kmod-usb-printer) or parallel port (kmod-lp).
 #: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:2
-msgid "p910nd_desc"
+msgid "First you have to install the packages to get support for USB (kmod-usb-printer) or parallel port (kmod-lp)."
 msgstr ""
 
 #. Bidirectional mode
 #: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:3
-msgid "bidirectional"
+msgid "Bidirectional mode"
 msgstr ""
 
 #. p910nd listens on port 910+N. E.g. 9100 for the first printer.
diff --git a/po/ru/polipo.po b/po/ru/polipo.po
index 82b0d7db3..d8f454a1c 100644
--- a/po/ru/polipo.po
+++ b/po/ru/polipo.po
@@ -14,212 +14,212 @@ msgstr ""
 
 #. Polipo
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:1
-msgid "polipo"
+msgid "Polipo"
 msgstr ""
 
 #. On-Disk Cache
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:2
-msgid "polipo_cache"
+msgid "On-Disk Cache"
 msgstr ""
 
 #. Shared cache
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:3
-msgid "polipo_cache_cacheisshared"
+msgid "Shared cache"
 msgstr ""
 
 #. Enable if cache (proxy) is shared by multiple users.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:4
-msgid "polipo_cache_cacheisshared_desc"
+msgid "Enable if cache (proxy) is shared by multiple users."
 msgstr ""
 
 #. To enable polipo on-disk cache cleaning (highly recommended), you should add a cron job in Scheduled Tasks services that will execute /usr/sbin/polipo_purge script. For example to perform disk cache cleanup every day at 6:00 in the morning you should add the following line in Scheduled Tasks &quot;0 6 * * *	/usr/sbin/polipo_purge&quot; (without quotes).
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:5
-msgid "polipo_cache_desc"
+msgid "To enable polipo on-disk cache cleaning (highly recommended), you should add a cron job in Scheduled Tasks services that will execute /usr/sbin/polipo_purge script. For example to perform disk cache cleanup every day at 6:00 in the morning you should add the following line in Scheduled Tasks \"0 6 * * *\\t/usr/sbin/polipo_purge\" (without quotes)."
 msgstr ""
 
 #. Disk cache location
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:6
-msgid "polipo_cache_diskcacheroot"
+msgid "Disk cache location"
 msgstr ""
 
 #. Location where polipo will cache files permanently. Use of external storage devices is recommended, because the cache can grow considerably. Leave it empty to disable on-disk cache.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:7
-msgid "polipo_cache_diskcacheroot_desc"
+msgid "Location where polipo will cache files permanently. Use of external storage devices is recommended, because the cache can grow considerably. Leave it empty to disable on-disk cache."
 msgstr ""
 
 #. Truncate cache files size (in bytes)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:8
-msgid "polipo_cache_diskcachetruncatesize"
+msgid "Truncate cache files size (in bytes)"
 msgstr ""
 
 #. Size to which cached files should be truncated. (default value: 1048576)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:9
-msgid "polipo_cache_diskcachetruncatesize_desc"
+msgid "Size to which cached files should be truncated. (default value: 1048576)"
 msgstr ""
 
 #. Truncate cache files time
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:10
-msgid "polipo_cache_diskcachetruncatetime"
+msgid "Truncate cache files time"
 msgstr ""
 
 #. Time after which cached files will be truncated. (default value: 4d12h)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:11
-msgid "polipo_cache_diskcachetruncatetime_desc"
+msgid "Time after which cached files will be truncated. (default value: 4d12h)"
 msgstr ""
 
 #. Delete cache files time
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:12
-msgid "polipo_cache_diskcacheunlinktime"
+msgid "Delete cache files time"
 msgstr ""
 
 #. Time after which cached files will be deleted. (default value: 32d)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:13
-msgid "polipo_cache_diskcacheunlinktime_desc"
+msgid "Time after which cached files will be deleted. (default value: 32d)"
 msgstr ""
 
 #. Polipo is a small and fast caching web proxy.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:14
-msgid "polipo_desc"
+msgid "Polipo is a small and fast caching web proxy."
 msgstr ""
 
 #. General
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:15
-msgid "polipo_general"
+msgid "General"
 msgstr ""
 
 #. Allowed clients
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:16
-msgid "polipo_general_allowedclients"
+msgid "Allowed clients"
 msgstr ""
 
 #. When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients that are allowed to connect. The format is IP address or network address (192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6)).
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:17
-msgid "polipo_general_allowedclients_desc"
+msgid "When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients that are allowed to connect. The format is IP address or network address (192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))."
 msgstr ""
 
 #. In RAM cache size (in bytes)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:18
-msgid "polipo_general_chunkhighmark"
+msgid "In RAM cache size (in bytes)"
 msgstr ""
 
 #. How much RAM should Polipo use for its cache.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:19
-msgid "polipo_general_chunkhighmark_desc"
+msgid "How much RAM should Polipo use for its cache."
 msgstr ""
 
 #. DNS server address
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:20
-msgid "polipo_general_dnsnameserver"
+msgid "DNS server address"
 msgstr ""
 
 #. Set the DNS server address to use, if you want Polipo to use different DNS server than the host system.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:21
-msgid "polipo_general_dnsnameserver_desc"
+msgid "Set the DNS server address to use, if you want Polipo to use different DNS server than the host system."
 msgstr ""
 
 #. Query DNS for IPv6
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:22
-msgid "polipo_general_dnsqueryipv6"
+msgid "Query DNS for IPv6"
 msgstr ""
 
 #. false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = Query both, prefer IPv6; true = Query only IPv6
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:23
-msgid "polipo_general_dnsqueryipv6_desc"
+msgid "false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = Query both, prefer IPv6; true = Query only IPv6"
 msgstr ""
 
 #. Query DNS by hostname
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:24
-msgid "polipo_general_dnsusegethostbyname"
+msgid "Query DNS by hostname"
 msgstr ""
 
 #. false = Never use system DNS resolver; reluctantly = Query DNS directly, if DNS server is unavailable fail to system DNS resolver; happily = Query DNS directly, if host could not be found fallback to system DNS resolver; true = Always use system DNS resolver
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:25
-msgid "polipo_general_dnsusegethostbyname_desc"
+msgid "false = Never use system DNS resolver; reluctantly = Query DNS directly, if DNS server is unavailable fail to system DNS resolver; happily = Query DNS directly, if host could not be found fallback to system DNS resolver; true = Always use system DNS resolver"
 msgstr ""
 
 #. Syslog facility
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:26
-msgid "polipo_general_logfacility"
+msgid "Syslog facility"
 msgstr ""
 
 #. Log file location
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:27
-msgid "polipo_general_logfile"
+msgid "Log file location"
 msgstr ""
 
 #. Use of external storage device is recommended, because the log file is written frequently and can grow considerably.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:28
-msgid "polipo_general_logfile_desc"
+msgid "Use of external storage device is recommended, because the log file is written frequently and can grow considerably."
 msgstr ""
 
 #. Log to syslog
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:29
-msgid "polipo_general_logsyslog"
+msgid "Log to syslog"
 msgstr ""
 
 #. Parent proxy authentication
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:30
-msgid "polipo_general_parentauthcredentials"
+msgid "Parent proxy authentication"
 msgstr ""
 
 #. Basic HTTP authentication supported. Provide username and password in username:password format.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:31
-msgid "polipo_general_parentauthcredentials_desc"
+msgid "Basic HTTP authentication supported. Provide username and password in username:password format."
 msgstr ""
 
 #. Parent proxy address
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:32
-msgid "polipo_general_parentproxy"
+msgid "Parent proxy address"
 msgstr ""
 
 #. Parent proxy address (in host:port format), to which Polipo will forward the requests.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:33
-msgid "polipo_general_parentproxy_desc"
+msgid "Parent proxy address (in host:port format), to which Polipo will forward the requests."
 msgstr ""
 
 #. Listen address
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:34
-msgid "polipo_general_proxyaddress"
+msgid "Listen address"
 msgstr ""
 
 #. The interface on which Polipo will listen. To listen on all interfaces use 0.0.0.0 or :: (IPv6).
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:35
-msgid "polipo_general_proxyaddress_desc"
+msgid "The interface on which Polipo will listen. To listen on all interfaces use 0.0.0.0 or :: (IPv6)."
 msgstr ""
 
 #. Listen port
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:36
-msgid "polipo_general_proxyport"
+msgid "Listen port"
 msgstr ""
 
 #. Port on which Polipo will listen. (default value: 8123)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:37
-msgid "polipo_general_proxyport_desc"
+msgid "Port on which Polipo will listen. (default value: 8123)"
 msgstr ""
 
 #. Poor Man&#39;s Multiplexing
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:38
-msgid "polipo_pmm"
+msgid "Poor Man's Multiplexing"
 msgstr ""
 
 #. Poor Man&#39;s Multiplexing (PMM) is a technique that simulates multiplexing by requesting an instance in multiple segments. It tries to lower the latency caused by the weakness of HTTP protocol. NOTE: some sites may not work with PMM enabled.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:39
-msgid "polipo_pmm_desc"
+msgid "Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by requesting an instance in multiple segments. It tries to lower the latency caused by the weakness of HTTP protocol. NOTE: some sites may not work with PMM enabled."
 msgstr ""
 
 #. First PMM segment size (in bytes)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:40
-msgid "polipo_pmm_pmmfirstsize"
+msgid "First PMM segment size (in bytes)"
 msgstr ""
 
 #. Size of the first PMM segment. If not defined, it defaults to twice the PMM segment size.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:41
-msgid "polipo_pmm_pmmfirstsize_desc"
+msgid "Size of the first PMM segment. If not defined, it defaults to twice the PMM segment size."
 msgstr ""
 
 #. PMM segments size (in bytes)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:42
-msgid "polipo_pmm_pmmsize"
+msgid "PMM segments size (in bytes)"
 msgstr ""
 
 #. To enable PMM, PMM segment size must be set to some positive value.
diff --git a/po/ru/qos.po b/po/ru/qos.po
index ae142a01c..72480aefa 100644
--- a/po/ru/qos.po
+++ b/po/ru/qos.po
@@ -14,87 +14,87 @@ msgstr ""
 
 #. Quality of Service
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:1
-msgid "qos"
+msgid "Quality of Service"
 msgstr ""
 
 #. With QoS you can priorize network traffic selected by adresses, ports or services.
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:2
-msgid "qos_desc"
+msgid "With QoS you can priorize network traffic selected by adresses, ports or services."
 msgstr ""
 
 #. Classification
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:3
-msgid "qos_interface_classgroup"
+msgid "Classification"
 msgstr ""
 
 #. Calculate Overhead
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:4
-msgid "qos_interface_overhead"
+msgid "Calculate Overhead"
 msgstr ""
 
 #. Downlink
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:5
-msgid "qos_interface_download"
+msgid "Downlink"
 msgstr ""
 
 #. Uplink
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:6
-msgid "qos_interface_upload"
+msgid "Uplink"
 msgstr ""
 
 #. Prioritization
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:7
-msgid "qos_classify"
+msgid "Prioritization"
 msgstr ""
 
 #. Priority
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:8
-msgid "qos_classify_target"
+msgid "Priority"
 msgstr ""
 
 #. Source address
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:9
-msgid "qos_classify_srchost"
+msgid "Source address"
 msgstr ""
 
 #. source network / source host
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:10
-msgid "qos_classify_srchost_dest"
+msgid "source network / source host"
 msgstr ""
 
 #. Target address
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:11
-msgid "qos_classify_dsthost"
+msgid "Target address"
 msgstr ""
 
 #. target network / target host
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:12
-msgid "qos_classify_dsthost_dest"
+msgid "target network / target host"
 msgstr ""
 
 #. portrange
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:13
-msgid "qos_classify_portrange"
+msgid "portrange"
 msgstr ""
 
 #. low
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:14
-msgid "qos_bulk"
+msgid "low"
 msgstr ""
 
 #. normal
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:15
-msgid "qos_normal"
+msgid "normal"
 msgstr ""
 
 #. express
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:16
-msgid "qos_express"
+msgid "express"
 msgstr ""
 
 #. priority
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:17
-msgid "qos_priority"
+msgid "priority"
 msgstr ""
 
 #. Bytes sent
diff --git a/po/ru/rrdtool.po b/po/ru/rrdtool.po
index 95545db6d..135d1b3f9 100644
--- a/po/ru/rrdtool.po
+++ b/po/ru/rrdtool.po
@@ -14,342 +14,342 @@ msgstr ""
 
 #. %H: Wireless - Signal Noise Ratio
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:1
-msgid "stat_dg_title_wireless__signal_noise"
+msgid "%H: Wireless - Signal Noise Ratio"
 msgstr ""
 
 #. dBm
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:2
-msgid "stat_dg_label_wireless__signal_noise"
+msgid "dBm"
 msgstr ""
 
 #. Noise Level
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:3
-msgid "stat_ds_signal_noise"
+msgid "Noise Level"
 msgstr ""
 
 #. Signal Strength
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:4
-msgid "stat_ds_signal_power"
+msgid "Signal Strength"
 msgstr ""
 
 #. %H: Wireless - Signal Quality
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:5
-msgid "stat_dg_title_wireless__signal_quality"
+msgid "%H: Wireless - Signal Quality"
 msgstr ""
 
 #. n
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:6
-msgid "stat_dg_label_wireless__signal_quality"
+msgid "n"
 msgstr ""
 
 #. Signal Quality
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:7
-msgid "stat_ds_signal_quality"
+msgid "Signal Quality"
 msgstr ""
 
 #. %H: ICMP Roundtrip Times
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:8
-msgid "stat_dg_title_ping"
+msgid "%H: ICMP Roundtrip Times"
 msgstr ""
 
 #. ms
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:9
-msgid "stat_dg_label_ping"
+msgid "ms"
 msgstr ""
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:10
-msgid "stat_ds_ping"
+msgid "%di"
 msgstr ""
 
 #. %H: Firewall - Processed Packets
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:11
-msgid "stat_dg_title_iptables__ipt_packets"
+msgid "%H: Firewall - Processed Packets"
 msgstr ""
 
 #. Packets/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:12
-msgid "stat_dg_label_iptables__ipt_packets"
+msgid "Packets/s"
 msgstr ""
 
 #. Chain \"%di\"
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:13
-msgid "stat_ds_ipt_packets"
+msgid "Chain \"%di\""
 msgstr ""
 
 #. %H: Netlink - Transfer on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:14
-msgid "stat_dg_title_netlink__if_octets"
+msgid "%H: Netlink - Transfer on %pi"
 msgstr ""
 
 #. Bytes/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:15
-msgid "stat_dg_label_netlink__if_octets"
+msgid "Bytes/s"
 msgstr ""
 
 #. Bytes (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:16
-msgid "stat_ds_if_octets"
+msgid "Bytes (%ds)"
 msgstr ""
 
 #. %H: Netlink - Packets on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:17
-msgid "stat_dg_title_netlink__if_packets"
+msgid "%H: Netlink - Packets on %pi"
 msgstr ""
 
 #. Packets/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:18
-msgid "stat_dg_label_netlink__if_packets"
+msgid "Packets/s"
 msgstr ""
 
 #. Processed (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:19
-msgid "stat_ds_if_packets"
+msgid "Processed (%ds)"
 msgstr ""
 
 #. Dropped   (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:20
-msgid "stat_ds_if_dropped"
+msgid "Dropped (%ds)"
 msgstr ""
 
 #. Errors    (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:21
-msgid "stat_ds_if_errors"
+msgid "Errors (%ds)"
 msgstr ""
 
 #. %H: Netlink - Multicast on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:22
-msgid "stat_dg_title_netlink__if_multicast"
+msgid "%H: Netlink - Multicast on %pi"
 msgstr ""
 
 #. Packets/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:23
-msgid "stat_dg_label_netlink__if_multicast"
+msgid "Packets/s"
 msgstr ""
 
 #. Packets
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:24
-msgid "stat_ds_if_multicast"
+msgid "Packets"
 msgstr ""
 
 #. %H: Netlink - Collisions on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:25
-msgid "stat_dg_title_netlink__if_collisions"
+msgid "%H: Netlink - Collisions on %pi"
 msgstr ""
 
 #. Collisions/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:26
-msgid "stat_dg_label_netlink__if_collisions"
+msgid "Collisions/s"
 msgstr ""
 
 #. Collisions
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:27
-msgid "stat_ds_if_collisions"
+msgid "Collisions"
 msgstr ""
 
 #. %H: Netlink - Errors on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:28
-msgid "stat_dg_title_netlink__if_tx_errors"
+msgid "%H: Netlink - Errors on %pi"
 msgstr ""
 
 #. Errors/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:29
-msgid "stat_dg_label_netlink__if_tx_errors"
+msgid "Errors/s"
 msgstr ""
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:30
-msgid "stat_ds_if_tx_errors"
+msgid "%di"
 msgstr ""
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:31
-msgid "stat_ds_if_rx_errors"
+msgid "%di"
 msgstr ""
 
 #. %H: Processes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:32
-msgid "stat_dg_title_processes"
+msgid "%H: Processes"
 msgstr ""
 
 #. Processes/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:33
-msgid "stat_dg_label_processes"
+msgid "Processes/s"
 msgstr ""
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:34
-msgid "stat_ds_ps_state"
+msgid "%di"
 msgstr ""
 
 #. %H: Process %pi - used cpu time
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:35
-msgid "stat_dg_title_processes__ps_cputime"
+msgid "%H: Process %pi - used cpu time"
 msgstr ""
 
 #. Jiffies
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:36
-msgid "stat_dg_label_processes__ps_cputime"
+msgid "Jiffies"
 msgstr ""
 
 #. system
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:37
-msgid "stat_ds_ps_cputime__syst"
+msgid "System"
 msgstr ""
 
 #. user
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:38
-msgid "stat_ds_ps_cputime__user"
+msgid "user"
 msgstr ""
 
 #. %H: Process %pi - threads and processes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:39
-msgid "stat_dg_title_processes__ps_count"
+msgid "%H: Process %pi - threads and processes"
 msgstr ""
 
 #. Count
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:40
-msgid "stat_dg_label_processes__ps_count"
+msgid "Count"
 msgstr ""
 
 #. %ds
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:41
-msgid "stat_ds_ps_count"
+msgid "%ds"
 msgstr ""
 
 #. %H: Process %pi - page faults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:42
-msgid "stat_dg_title_processes__ps_pagefaults"
+msgid "%H: Process %pi - page faults"
 msgstr ""
 
 #. Pagefaults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:43
-msgid "stat_dg_label_processes__ps_pagefaults"
+msgid "Pagefaults"
 msgstr ""
 
 #. page faults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:44
-msgid "stat_ds_ps_pagefaults"
+msgid "page faults"
 msgstr ""
 
 #. %H: Process %pi - virtual memory size
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:45
-msgid "stat_dg_title_processes__ps_rss"
+msgid "%H: Process %pi - virtual memory size"
 msgstr ""
 
 #. Bytes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:46
-msgid "stat_dg_label_processes__ps_rss"
+msgid "Bytes"
 msgstr ""
 
 #. virtual memory
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:47
-msgid "stat_ds_ps_rss"
+msgid "virtual memory"
 msgstr ""
 
 #. %H: Usage on Processor #%pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:48
-msgid "stat_dg_title_cpu"
+msgid "%H: Usage on Processor #%pi"
 msgstr ""
 
 #. %
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:49
-msgid "stat_dg_label_cpu"
+msgid "%"
 msgstr ""
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:50
-msgid "stat_ds_cpu"
+msgid "%di"
 msgstr ""
 
 #. %H: Transfer on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:51
-msgid "stat_dg_title_interface__if_octets"
+msgid "%H: Transfer on %di"
 msgstr ""
 
 #. Bytes/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:52
-msgid "stat_dg_label_interface__if_octets"
+msgid "Bytes/s"
 msgstr ""
 
 #. %H: Packets on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:53
-msgid "stat_dg_title_interface__if_packets"
+msgid "%H: Packets on %di"
 msgstr ""
 
 #. Packets/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:54
-msgid "stat_dg_label_interface__if_packets"
+msgid "Packets/s"
 msgstr ""
 
 #. %H: TCP-Connections to Port %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:55
-msgid "stat_dg_title_tcpconns"
+msgid "%H: TCP-Connections to Port %pi"
 msgstr ""
 
 #. Connections/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:56
-msgid "stat_dg_label_tcpconns"
+msgid "Connections/s"
 msgstr ""
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:57
-msgid "stat_ds_tcp_connections"
+msgid "%di"
 msgstr ""
 
 #. %H: Disk Space Usage on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:58
-msgid "stat_dg_title_df"
+msgid "%H: Disk Space Usage on %di"
 msgstr ""
 
 #. Bytes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:59
-msgid "stat_dg_label_df"
+msgid "Bytes"
 msgstr ""
 
 #. %ds
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:60
-msgid "stat_ds_df__free"
+msgid "%ds"
 msgstr ""
 
 #. %ds
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:61
-msgid "stat_ds_df__used"
+msgid "%ds"
 msgstr ""
 
 #. %H: Interrupts
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:62
-msgid "stat_dg_title_irq"
+msgid "%H: Interrupts"
 msgstr ""
 
 #. Issues/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:63
-msgid "stat_dg_label_irq"
+msgid "Issues/s"
 msgstr ""
 
 #. IRQ %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:64
-msgid "stat_ds_irq"
+msgid "IRQ %di"
 msgstr ""
 
 #. %H: System Load
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:65
-msgid "stat_dg_title_load"
+msgid "%H: System Load"
 msgstr ""
 
 #. Load
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:66
-msgid "stat_dg_label_load"
+msgid "Load"
 msgstr ""
 
 #. 1 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:67
-msgid "stat_ds_load__shortterm"
+msgid "1 min"
 msgstr ""
 
 #. 5 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:68
-msgid "stat_ds_load__midterm"
+msgid "5 min"
 msgstr ""
 
 #. 15 min
diff --git a/po/ru/samba.po b/po/ru/samba.po
index c53f03d59..b9d997ea1 100644
--- a/po/ru/samba.po
+++ b/po/ru/samba.po
@@ -14,82 +14,82 @@ msgstr ""
 
 #. Network Shares
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:1
-msgid "samba"
+msgid "Network Shares"
 msgstr ""
 
 #. Hostname
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:2
-msgid "samba_samba_name"
+msgid "Hostname"
 msgstr ""
 
 #. Description
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:3
-msgid "samba_samba_description"
+msgid "Description"
 msgstr ""
 
 #. Workgroup
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:4
-msgid "samba_samba_workgroup"
+msgid "Workgroup"
 msgstr ""
 
 #. Share home-directories
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:5
-msgid "samba_samba_homes"
+msgid "Share home-directories"
 msgstr ""
 
 #. System users can reach their home directories via network shares.
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:6
-msgid "samba_samba_homes_desc"
+msgid "System users can reach their home directories via network shares."
 msgstr ""
 
 #. Shared Directories
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:7
-msgid "samba_sambashare"
+msgid "Shared Directories"
 msgstr ""
 
 #. Shared Directory
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:8
-msgid "samba_sambashare_path"
+msgid "Shared Directory"
 msgstr ""
 
 #. Physical Path
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:9
-msgid "samba_sambashare_path_desc"
+msgid "Physical Path"
 msgstr ""
 
 #. Allowed Users
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:10
-msgid "samba_sambashare_users"
+msgid "Allowed Users"
 msgstr ""
 
 #. optional
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:11
-msgid "samba_sambashare_users_desc"
+msgid "optional"
 msgstr ""
 
 #. Read Only
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:12
-msgid "samba_sambashare_readonly"
+msgid "Read Only"
 msgstr ""
 
 #. Allow Guests
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:13
-msgid "samba_sambashare_guestok"
+msgid "Allow Guests"
 msgstr ""
 
 #. Create Mask
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:14
-msgid "samba_sambashare_createmask"
+msgid "Create Mask"
 msgstr ""
 
 #. Mask for new files
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:15
-msgid "samba_sambashare_createmask_desc"
+msgid "Mask for new files"
 msgstr ""
 
 #. Directory Mask
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:16
-msgid "samba_sambashare_dirmask"
+msgid "Directory Mask"
 msgstr ""
 
 #. Mask for new directories
diff --git a/po/ru/statistics.po b/po/ru/statistics.po
index 2bf759906..2d6a6e136 100644
--- a/po/ru/statistics.po
+++ b/po/ru/statistics.po
@@ -14,1057 +14,1057 @@ msgstr ""
 
 #. Statistics
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:1
-msgid "stat_statistics"
+msgid "Statistics"
 msgstr ""
 
 #. The statistics package is based on <a href=\"http://collectd.org/index.shtml\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD Tool</a> to render diagram images from collected data.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:2
-msgid "stat_desc"
+msgid "The statistics package is based on <a href=\"http://collectd.org/index.shtml\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD Tool</a> to render diagram images from collected data."
 msgstr ""
 
 #. System plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:3
-msgid "stat_systemplugins"
+msgid "System plugins"
 msgstr ""
 
 #. Network plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:4
-msgid "stat_networkplugins"
+msgid "Network plugins"
 msgstr ""
 
 #. Output plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:5
-msgid "stat_outputplugins"
+msgid "Output plugins"
 msgstr ""
 
 #. Display timespan
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:6
-msgid "stat_showtimespan"
+msgid "Display timespan »"
 msgstr ""
 
 #. Graphs
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:7
-msgid "stat_graphs"
+msgid "Graphs"
 msgstr ""
 
 #. Collectd
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:8
-msgid "stat_collectd"
+msgid "Collectd"
 msgstr ""
 
 #. Processor
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:9
-msgid "stat_cpu"
+msgid "Processor"
 msgstr ""
 
 #. Ping
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:10
-msgid "stat_ping"
+msgid "Ping"
 msgstr ""
 
 #. Firewall
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:11
-msgid "stat_iptables"
+msgid "Firewall"
 msgstr ""
 
 #. Netlink
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:12
-msgid "stat_netlink"
+msgid "Netlink"
 msgstr ""
 
 #. Processes
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:13
-msgid "stat_processes"
+msgid "Processes"
 msgstr ""
 
 #. Wireless
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:14
-msgid "stat_wireless"
+msgid "Wireless"
 msgstr ""
 
 #. TCP Connections
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:15
-msgid "stat_tcpconns"
+msgid "TCP Connections"
 msgstr ""
 
 #. Interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:16
-msgid "stat_interface"
+msgid "Interfaces"
 msgstr ""
 
 #. Disk Space Usage
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:17
-msgid "stat_df"
+msgid "Disk Space Usage"
 msgstr ""
 
 #. Interrupts
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:18
-msgid "stat_irq"
+msgid "Interrupts"
 msgstr ""
 
 #. Disk Usage
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:19
-msgid "stat_disk"
+msgid "Disk Usage"
 msgstr ""
 
 #. Exec
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:20
-msgid "stat_exec"
+msgid "Exec"
 msgstr ""
 
 #. RRDTool
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:21
-msgid "stat_rrdtool"
+msgid "RRDTool"
 msgstr ""
 
 #. Network
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:22
-msgid "stat_network"
+msgid "Network"
 msgstr ""
 
 #. CSV Output
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:23
-msgid "stat_csv"
+msgid "CSV Output"
 msgstr ""
 
 #. System Load
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:24
-msgid "stat_load"
+msgid "System Load"
 msgstr ""
 
 #. DNS
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:25
-msgid "stat_dns"
+msgid "DNS"
 msgstr ""
 
 #. Email
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:26
-msgid "stat_email"
+msgid "Email"
 msgstr ""
 
 #. UnixSock
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:27
-msgid "stat_unixsock"
+msgid "UnixSock"
 msgstr ""
 
 #. Statistics
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:28
-msgid "lucistatistics"
+msgid "Statistics"
 msgstr ""
 
 #. Collectd Settings
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:29
-msgid "lucistatistics_collectd"
+msgid "Collectd Settings"
 msgstr ""
 
 #. Collectd is a small daeomon for collecting data from various sources through different plugins. On this page you can change general settings for the collectd daemon.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:30
-msgid "lucistatistics_collectd_desc"
+msgid "Collectd is a small daeomon for collecting data from various sources through different plugins. On this page you can change general settings for the collectd daemon."
 msgstr ""
 
 #. Hostname
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:31
-msgid "lucistatistics_collectd_hostname"
+msgid "Hostname"
 msgstr ""
 
 #. Base Directory
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:32
-msgid "lucistatistics_collectd_basedir"
+msgid "Base Directory"
 msgstr ""
 
 #. Directory for sub-configurations
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:33
-msgid "lucistatistics_collectd_include"
+msgid "Directory for sub-configurations"
 msgstr ""
 
 #. Directory for collectd plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:34
-msgid "lucistatistics_collectd_plugindir"
+msgid "Directory for collectd plugins"
 msgstr ""
 
 #. Used PID file
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:35
-msgid "lucistatistics_collectd_pidfile"
+msgid "Used PID file"
 msgstr ""
 
 #. Datasets definition file
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:36
-msgid "lucistatistics_collectd_typesdb"
+msgid "Datasets definition file"
 msgstr ""
 
 #. Data collection interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:37
-msgid "lucistatistics_collectd_interval"
+msgid "Data collection interval"
 msgstr ""
 
 #. Seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:38
-msgid "lucistatistics_collectd_interval_desc"
+msgid "Seconds"
 msgstr ""
 
 #. Number of threads for data collection
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:39
-msgid "lucistatistics_collectd_readthreads"
+msgid "Number of threads for data collection"
 msgstr ""
 
 #. Try to lookup fully qualified hostname
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:40
-msgid "lucistatistics_collectd_fqdnlookup"
+msgid "Try to lookup fully qualified hostname"
 msgstr ""
 
 #. CPU Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:41
-msgid "lucistatistics_collectdcpu"
+msgid "CPU Plugin Configuration"
 msgstr ""
 
 #. The cpu plugin collects basic statistics about the processor usage.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:42
-msgid "lucistatistics_collectdcpu_desc"
+msgid "The cpu plugin collects basic statistics about the processor usage."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:43
-msgid "lucistatistics_collectdcpu_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. CSV Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:44
-msgid "lucistatistics_collectdcsv"
+msgid "CSV Plugin Configuration"
 msgstr ""
 
 #. The csv plugin stores collected data in csv file format for further processing by external programs.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:45
-msgid "lucistatistics_collectdcsv_desc"
+msgid "The csv plugin stores collected data in csv file format for further processing by external programs."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:46
-msgid "lucistatistics_collectdcsv_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Storage directory for the csv files
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:47
-msgid "lucistatistics_collectdcsv_datadir"
+msgid "Storage directory for the csv files"
 msgstr ""
 
 #. Store data values as rates instead of absolute values
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:48
-msgid "lucistatistics_collectdcsv_storerates"
+msgid "Store data values as rates instead of absolute values"
 msgstr ""
 
 #. DF Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:49
-msgid "lucistatistics_collectddf"
+msgid "DF Plugin Configuration"
 msgstr ""
 
 #. The df plugin collects statistics about the disk space usage on different devices, mount points or filesystem types.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:50
-msgid "lucistatistics_collectddf_desc"
+msgid "The df plugin collects statistics about the disk space usage on different devices, mount points or filesystem types."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:51
-msgid "lucistatistics_collectddf_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Monitor devices
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:52
-msgid "lucistatistics_collectddf_devices"
+msgid "Monitor devices"
 msgstr ""
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:53
-msgid "lucistatistics_collectddf_devices_desc"
+msgid "multiple separated by space"
 msgstr ""
 
 #. Monitor mount points
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:54
-msgid "lucistatistics_collectddf_mountpoints"
+msgid "Monitor mount points"
 msgstr ""
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:55
-msgid "lucistatistics_collectddf_mountpoints_desc"
+msgid "multiple separated by space"
 msgstr ""
 
 #. Monitor filesystem types
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:56
-msgid "lucistatistics_collectddf_fstypes"
+msgid "Monitor filesystem types"
 msgstr ""
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:57
-msgid "lucistatistics_collectddf_fstypes_desc"
+msgid "multiple separated by space"
 msgstr ""
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:58
-msgid "lucistatistics_collectddf_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr ""
 
 #. Disk Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:59
-msgid "lucistatistics_collectddisk"
+msgid "Disk Plugin Configuration"
 msgstr ""
 
 #. The disk plugin collects detailled usage statistics for selected partitions or whole disks.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:60
-msgid "lucistatistics_collectddisk_desc"
+msgid "The disk plugin collects detailled usage statistics for selected partitions or whole disks."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:61
-msgid "lucistatistics_collectddisk_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Monitor disks and partitions
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:62
-msgid "lucistatistics_collectddisk_disks"
+msgid "Monitor disks and partitions"
 msgstr ""
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:63
-msgid "lucistatistics_collectddisk_disks_desc"
+msgid "multiple separated by space"
 msgstr ""
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:64
-msgid "lucistatistics_collectddisk_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr ""
 
 #. DNS Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:65
-msgid "lucistatistics_collectddns"
+msgid "DNS Plugin Configuration"
 msgstr ""
 
 #. The dns plugin collects detailled statistics about dns related traffic on selected interfaces.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:66
-msgid "lucistatistics_collectddns_desc"
+msgid "The dns plugin collects detailled statistics about dns related traffic on selected interfaces."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:67
-msgid "lucistatistics_collectddns_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Monitor interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:68
-msgid "lucistatistics_collectddns_interfaces"
+msgid "Monitor interfaces"
 msgstr ""
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:69
-msgid "lucistatistics_collectddns_interfaces_desc"
+msgid "multiple separated by space"
 msgstr ""
 
 #. Ignore source addresses
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:70
-msgid "lucistatistics_collectddns_ignoresources"
+msgid "Ignore source addresses"
 msgstr ""
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:71
-msgid "lucistatistics_collectddns_ignoresources_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr ""
 
 #. E-Mail Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:72
-msgid "lucistatistics_collectdemail"
+msgid "E-Mail Plugin Configuration"
 msgstr ""
 
 #. The email plugin creates a unix socket which can be used to transmit email-statistics to a running collectd daemon. This plugin is primarily intended to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can be used in other ways as well.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:73
-msgid "lucistatistics_collectdemail_desc"
+msgid "The email plugin creates a unix socket which can be used to transmit email-statistics to a running collectd daemon. This plugin is primarily intended to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can be used in other ways as well."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:74
-msgid "lucistatistics_collectdemail_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Filepath of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:75
-msgid "lucistatistics_collectdemail_socketfile"
+msgid "Filepath of the unix socket"
 msgstr ""
 
 #. Group ownership of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:76
-msgid "lucistatistics_collectdemail_socketgroup"
+msgid "Group ownership of the unix socket"
 msgstr ""
 
 #. group name
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:77
-msgid "lucistatistics_collectdemail_socketgroup_desc"
+msgid "group name"
 msgstr ""
 
 #. File permissions of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:78
-msgid "lucistatistics_collectdemail_socketperms"
+msgid "File permissions of the unix socket"
 msgstr ""
 
 #. octal
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:79
-msgid "lucistatistics_collectdemail_socketperms_desc"
+msgid "octal"
 msgstr ""
 
 #. Maximum allowed connections
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:80
-msgid "lucistatistics_collectdemail_maxconns"
+msgid "Maximum allowed connections"
 msgstr ""
 
 #. Exec Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:81
-msgid "lucistatistics_collectdexec"
+msgid "Exec Plugin Configuration"
 msgstr ""
 
 #. The exec plugin starts external commands to read values from or to notify external processes when certain threshold values have been reached.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:82
-msgid "lucistatistics_collectdexec_desc"
+msgid "The exec plugin starts external commands to read values from or to notify external processes when certain threshold values have been reached."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:83
-msgid "lucistatistics_collectdexec_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Add command for reading values
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:84
-msgid "lucistatistics_collectdexecinput"
+msgid "Add command for reading values"
 msgstr ""
 
 #. Here you can define external commands which will be started by collectd in order to read certain values. The values will be read from stdout.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:85
-msgid "lucistatistics_collectdexecinput_desc"
+msgid "Here you can define external commands which will be started by collectd in order to read certain values. The values will be read from stdout."
 msgstr ""
 
 #. Commandline
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:86
-msgid "lucistatistics_collectdexecinput_cmdline"
+msgid "Commandline"
 msgstr ""
 
 #. Run as user
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:87
-msgid "lucistatistics_collectdexecinput_cmduser"
+msgid "Run as user"
 msgstr ""
 
 #. Run as group
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:88
-msgid "lucistatistics_collectdexecinput_cmdgroup"
+msgid "Run as group"
 msgstr ""
 
 #. Add notification command
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:89
-msgid "lucistatistics_collectdexecnotify"
+msgid "Add notification command"
 msgstr ""
 
 #. Here you can define external commands which will be started by collectd when certain threshold values have been reached. The values leading to invokation will be feeded to the the called programs stdin.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:90
-msgid "lucistatistics_collectdexecnotify_desc"
+msgid "Here you can define external commands which will be started by collectd when certain threshold values have been reached. The values leading to invokation will be feeded to the the called programs stdin."
 msgstr ""
 
 #. Commandline
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:91
-msgid "lucistatistics_collectdexecnotify_cmdline"
+msgid "Commandline"
 msgstr ""
 
 #. Run as user
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:92
-msgid "lucistatistics_collectdexecnotify_cmduser"
+msgid "Run as user"
 msgstr ""
 
 #. Run as group
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:93
-msgid "lucistatistics_collectdexecnotify_cmdgroup"
+msgid "Run as group"
 msgstr ""
 
 #. Interface Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:94
-msgid "lucistatistics_collectdinterface"
+msgid "Interface Plugin Configuration"
 msgstr ""
 
 #. The interface plugin collects traffic statistics on selected interfaces.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:95
-msgid "lucistatistics_collectdinterface_desc"
+msgid "The interface plugin collects traffic statistics on selected interfaces."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:96
-msgid "lucistatistics_collectdinterface_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Monitor interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:97
-msgid "lucistatistics_collectdinterface_interfaces"
+msgid "Monitor interfaces"
 msgstr ""
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:98
-msgid "lucistatistics_collectdinterface_interfaces_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr ""
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:99
-msgid "lucistatistics_collectdinterface_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr ""
 
 #. Iptables Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:100
-msgid "lucistatistics_collectdiptables"
+msgid "Iptables Plugin Configuration"
 msgstr ""
 
 #. The iptables plugin will monitor selected firewall rules and collect informations about processed bytes and packets per rule.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:101
-msgid "lucistatistics_collectdiptables_desc"
+msgid "The iptables plugin will monitor selected firewall rules and collect informations about processed bytes and packets per rule."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:102
-msgid "lucistatistics_collectdiptables_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Add matching rule
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:103
-msgid "lucistatistics_collectdiptablesmatch"
+msgid "Add matching rule"
 msgstr ""
 
 #. Here you can define various criteria by which the monitored iptables rules are selected.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:104
-msgid "lucistatistics_collectdiptablesmatch_desc"
+msgid "Here you can define various criteria by which the monitored iptables rules are selected."
 msgstr ""
 
 #. Name of the rule
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:105
-msgid "lucistatistics_collectdiptablesmatch_name"
+msgid "Name of the rule"
 msgstr ""
 
 #. max. 16 chars
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:106
-msgid "lucistatistics_collectdiptablesmatch_name_desc"
+msgid "max. 16 chars"
 msgstr ""
 
 #. Table
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:107
-msgid "lucistatistics_collectdiptablesmatch_table"
+msgid "Table"
 msgstr ""
 
 #. Chain
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:108
-msgid "lucistatistics_collectdiptablesmatch_chain"
+msgid "Chain"
 msgstr ""
 
 #. Action (target)
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:109
-msgid "lucistatistics_collectdiptablesmatch_target"
+msgid "Action (target)"
 msgstr ""
 
 #. Network protocol
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:110
-msgid "lucistatistics_collectdiptablesmatch_protocol"
+msgid "Network protocol"
 msgstr ""
 
 #. Source ip range
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:111
-msgid "lucistatistics_collectdiptablesmatch_source"
+msgid "Source ip range"
 msgstr ""
 
 #. CIDR notation
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:112
-msgid "lucistatistics_collectdiptablesmatch_source_desc"
+msgid "CIDR notation"
 msgstr ""
 
 #. Destination ip range
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:113
-msgid "lucistatistics_collectdiptablesmatch_destination"
+msgid "Destination ip range"
 msgstr ""
 
 #. CIDR notation
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:114
-msgid "lucistatistics_collectdiptablesmatch_destination_desc"
+msgid "CIDR notation"
 msgstr ""
 
 #. Incoming interface
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:115
-msgid "lucistatistics_collectdiptablesmatch_inputif"
+msgid "Incoming interface"
 msgstr ""
 
 #. e.g. br-lan
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:116
-msgid "lucistatistics_collectdiptablesmatch_inputif_desc"
+msgid "e.g. br-lan"
 msgstr ""
 
 #. Outgoing interface
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:117
-msgid "lucistatistics_collectdiptablesmatch_outputif"
+msgid "Outgoing interface"
 msgstr ""
 
 #. e.g. br-ff
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:118
-msgid "lucistatistics_collectdiptablesmatch_outputif_desc"
+msgid "e.g. br-ff"
 msgstr ""
 
 #. Options
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:119
-msgid "lucistatistics_collectdiptablesmatch_options"
+msgid "Options"
 msgstr ""
 
 #. e.g. reject-with tcp-reset
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:120
-msgid "lucistatistics_collectdiptablesmatch_options_desc"
+msgid "e.g. reject-with tcp-reset"
 msgstr ""
 
 #. IRQ Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:121
-msgid "lucistatistics_collectdirq"
+msgid "IRQ Plugin Configuration"
 msgstr ""
 
 #. The irq plugin will monitor the rate of issues per second for each selected interrupt. If no interrupt is selected then all interrupts are monitored.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:122
-msgid "lucistatistics_collectdirq_desc"
+msgid "The irq plugin will monitor the rate of issues per second for each selected interrupt. If no interrupt is selected then all interrupts are monitored."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:123
-msgid "lucistatistics_collectdirq_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Monitor interrupts
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:124
-msgid "lucistatistics_collectdirq_irqs"
+msgid "Monitor interrupts"
 msgstr ""
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:125
-msgid "lucistatistics_collectdirq_irqs_desc"
+msgid "multiple separated by space"
 msgstr ""
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:126
-msgid "lucistatistics_collectdirq_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr ""
 
 #. Load Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:127
-msgid "lucistatistics_collectdload"
+msgid "Load Plugin Configuration"
 msgstr ""
 
 #. The load plugin collects statistics about the general system load.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:128
-msgid "lucistatistics_collectdload_desc"
+msgid "The load plugin collects statistics about the general system load."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:129
-msgid "lucistatistics_collectdload_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Netlink Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:130
-msgid "lucistatistics_collectdnetlink"
+msgid "Netlink Plugin Configuration"
 msgstr ""
 
 #. The netlink plugin collects extended informations like qdisc-, class- and filter-statistics for selected interfaces.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:131
-msgid "lucistatistics_collectdnetlink_desc"
+msgid "The netlink plugin collects extended informations like qdisc-, class- and filter-statistics for selected interfaces."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:132
-msgid "lucistatistics_collectdnetlink_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Basic monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:133
-msgid "lucistatistics_collectdnetlink_interfaces"
+msgid "Basic monitoring"
 msgstr ""
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:134
-msgid "lucistatistics_collectdnetlink_interfaces_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr ""
 
 #. Verbose monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:135
-msgid "lucistatistics_collectdnetlink_verboseinterfaces"
+msgid "Verbose monitoring"
 msgstr ""
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:136
-msgid "lucistatistics_collectdnetlink_verboseinterfaces_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr ""
 
 #. Qdisc monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:137
-msgid "lucistatistics_collectdnetlink_qdiscs"
+msgid "Qdisc monitoring"
 msgstr ""
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:138
-msgid "lucistatistics_collectdnetlink_qdiscs_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr ""
 
 #. Shaping class monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:139
-msgid "lucistatistics_collectdnetlink_classes"
+msgid "Shaping class monitoring"
 msgstr ""
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:140
-msgid "lucistatistics_collectdnetlink_classes_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr ""
 
 #. Filter class monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:141
-msgid "lucistatistics_collectdnetlink_filters"
+msgid "Filter class monitoring"
 msgstr ""
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:142
-msgid "lucistatistics_collectdnetlink_filters_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr ""
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:143
-msgid "lucistatistics_collectdnetlink_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr ""
 
 #. Network Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:144
-msgid "lucistatistics_collectdnetwork"
+msgid "Network Plugin Configuration"
 msgstr ""
 
 #. The network plugin provides network based communication between different collectd instances. Collectd can operate both in client and server mode. In client mode locally collected date is transferred to a collectd server instance, in server mode the local instance receives data from other hosts.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:145
-msgid "lucistatistics_collectdnetwork_desc"
+msgid "The network plugin provides network based communication between different collectd instances. Collectd can operate both in client and server mode. In client mode locally collected date is transferred to a collectd server instance, in server mode the local instance receives data from other hosts."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:146
-msgid "lucistatistics_collectdnetwork_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Listener interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:147
-msgid "lucistatistics_collectdnetworklisten"
+msgid "Listener interfaces"
 msgstr ""
 
 #. This section defines on which interfaces collectd will wait for incoming connections.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:148
-msgid "lucistatistics_collectdnetworklisten_desc"
+msgid "This section defines on which interfaces collectd will wait for incoming connections."
 msgstr ""
 
 #. Listen host
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:149
-msgid "lucistatistics_collectdnetworklisten_host"
+msgid "Listen host"
 msgstr ""
 
 #. host-, ip- or ip6 address
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:150
-msgid "lucistatistics_collectdnetworklisten_host_desc"
+msgid "host-, ip- or ip6 address"
 msgstr ""
 
 #. Listen port
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:151
-msgid "lucistatistics_collectdnetworklisten_port"
+msgid "Listen port"
 msgstr ""
 
 #. 0 - 65535
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:152
-msgid "lucistatistics_collectdnetworklisten_port_desc"
+msgid "0 - 65535"
 msgstr ""
 
 #. server interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:153
-msgid "lucistatistics_collectdnetworkserver"
+msgid "server interfaces"
 msgstr ""
 
 #. This section defines to which servers the locally collected data is sent to.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:154
-msgid "lucistatistics_collectdnetworkserver_desc"
+msgid "This section defines to which servers the locally collected data is sent to."
 msgstr ""
 
 #. Server host
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:155
-msgid "lucistatistics_collectdnetworkserver_host"
+msgid "Server host"
 msgstr ""
 
 #. host-, ip- or ip6 address
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:156
-msgid "lucistatistics_collectdnetworkserver_host_desc"
+msgid "host-, ip- or ip6 address"
 msgstr ""
 
 #. Server port
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:157
-msgid "lucistatistics_collectdnetworkserver_port"
+msgid "Server port"
 msgstr ""
 
 #. 0 - 65535
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:158
-msgid "lucistatistics_collectdnetworkserver_port_desc"
+msgid "0 - 65535"
 msgstr ""
 
 #. TTL for network packets
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:159
-msgid "lucistatistics_collectdnetwork_timetolive"
+msgid "TTL for network packets"
 msgstr ""
 
 #. 0 - 255
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:160
-msgid "lucistatistics_collectdnetwork_timetolive_desc"
+msgid "0 - 255"
 msgstr ""
 
 #. Forwarding between listen and server addresses
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:161
-msgid "lucistatistics_collectdnetwork_forward"
+msgid "Forwarding between listen and server addresses"
 msgstr ""
 
 #. Cache flush interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:162
-msgid "lucistatistics_collectdnetwork_cacheflush"
+msgid "Cache flush interval"
 msgstr ""
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:163
-msgid "lucistatistics_collectdnetwork_cacheflush_desc"
+msgid "seconds"
 msgstr ""
 
 #. Ping Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:164
-msgid "lucistatistics_collectdping"
+msgid "Ping Plugin Configuration"
 msgstr ""
 
 #. The ping plugin will send icmp echo replies to selected hosts and measure the roundtrip time for each host.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:165
-msgid "lucistatistics_collectdping_desc"
+msgid "The ping plugin will send icmp echo replies to selected hosts and measure the roundtrip time for each host."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:166
-msgid "lucistatistics_collectdping_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Monitor hosts
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:167
-msgid "lucistatistics_collectdping_hosts"
+msgid "Monitor hosts"
 msgstr ""
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:168
-msgid "lucistatistics_collectdping_hosts_desc"
+msgid "multiple separated by space"
 msgstr ""
 
 #. TTL for ping packets
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:169
-msgid "lucistatistics_collectdping_ttl"
+msgid "TTL for ping packets"
 msgstr ""
 
 #. 0 - 255
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:170
-msgid "lucistatistics_collectdping_ttl_desc"
+msgid "0 - 255"
 msgstr ""
 
 #. Processes Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:171
-msgid "lucistatistics_collectdprocesses"
+msgid "Processes Plugin Configuration"
 msgstr ""
 
 #. The processes plugin collects informations like cpu time, page faults and memory usage of selected processes.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:172
-msgid "lucistatistics_collectdprocesses_desc"
+msgid "The processes plugin collects informations like cpu time, page faults and memory usage of selected processes."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:173
-msgid "lucistatistics_collectdprocesses_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Monitor processes
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:174
-msgid "lucistatistics_collectdprocesses_processes"
+msgid "Monitor processes"
 msgstr ""
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:175
-msgid "lucistatistics_collectdprocesses_processes_desc"
+msgid "multiple separated by space"
 msgstr ""
 
 #. RRDTool Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:176
-msgid "lucistatistics_collectdrrdtool"
+msgid "RRDTool Plugin Configuration"
 msgstr ""
 
 #. The rrdtool plugin stores the collected data in rrd database files, the foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong values will result in a very high memory consumption in the temporary directory. This can render the device unusable!</strong>
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:177
-msgid "lucistatistics_collectdrrdtool_desc"
+msgid "The rrdtool plugin stores the collected data in rrd database files, the foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong values will result in a very high memory consumption in the temporary directory. This can render the device unusable!</strong>"
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:178
-msgid "lucistatistics_collectdrrdtool_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Storage directory
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:179
-msgid "lucistatistics_collectdrrdtool_datadir"
+msgid "Storage directory"
 msgstr ""
 
 #. RRD step interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:180
-msgid "lucistatistics_collectdrrdtool_stepsize"
+msgid "RRD step interval"
 msgstr ""
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:181
-msgid "lucistatistics_collectdrrdtool_stepsize_desc"
+msgid "seconds"
 msgstr ""
 
 #. RRD heart beat interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:182
-msgid "lucistatistics_collectdrrdtool_heartbeat"
+msgid "RRD heart beat interval"
 msgstr ""
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:183
-msgid "lucistatistics_collectdrrdtool_heartbeat_desc"
+msgid "seconds"
 msgstr ""
 
 #. Only create average RRAs
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:184
-msgid "lucistatistics_collectdrrdtool_rrasingle"
+msgid "Only create average RRAs"
 msgstr ""
 
 #. reduces rrd size
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:185
-msgid "lucistatistics_collectdrrdtool_rrasingle_desc"
+msgid "reduces rrd size"
 msgstr ""
 
 #. Stored timespans
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:186
-msgid "lucistatistics_collectdrrdtool_rratimespans"
+msgid "Stored timespans"
 msgstr ""
 
 #. seconds; multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:187
-msgid "lucistatistics_collectdrrdtool_rratimespans_desc"
+msgid "seconds; multiple separated by space"
 msgstr ""
 
 #. Rows per RRA
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:188
-msgid "lucistatistics_collectdrrdtool_rrarows"
+msgid "Rows per RRA"
 msgstr ""
 
 #. RRD XFiles Factor
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:189
-msgid "lucistatistics_collectdrrdtool_xff"
+msgid "RRD XFiles Factor"
 msgstr ""
 
 #. Cache collected data for
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:190
-msgid "lucistatistics_collectdrrdtool_cachetimeout"
+msgid "Cache collected data for"
 msgstr ""
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:191
-msgid "lucistatistics_collectdrrdtool_cachetimeout_desc"
+msgid "seconds"
 msgstr ""
 
 #. Flush cache after
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:192
-msgid "lucistatistics_collectdrrdtool_cacheflush"
+msgid "Flush cache after"
 msgstr ""
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:193
-msgid "lucistatistics_collectdrrdtool_cacheflush_desc"
+msgid "seconds"
 msgstr ""
 
 #. TCPConns Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:194
-msgid "lucistatistics_collectdtcpconns"
+msgid "TCPConns Plugin Configuration"
 msgstr ""
 
 #. The tcpconns plugin collects informations about open tcp connections on selected ports.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:195
-msgid "lucistatistics_collectdtcpconns_desc"
+msgid "The tcpconns plugin collects informations about open tcp connections on selected ports."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:196
-msgid "lucistatistics_collectdtcpconns_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Monitor all local listen ports
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:197
-msgid "lucistatistics_collectdtcpconns_listeningports"
+msgid "Monitor all local listen ports"
 msgstr ""
 
 #. Monitor local ports
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:198
-msgid "lucistatistics_collectdtcpconns_localports"
+msgid "Monitor local ports"
 msgstr ""
 
 #. 0 - 65535; multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:199
-msgid "lucistatistics_collectdtcpconns_localports_desc"
+msgid "0 - 65535; multiple separated by space"
 msgstr ""
 
 #. Monitor remote ports
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:200
-msgid "lucistatistics_collectdtcpconns_remoteports"
+msgid "Monitor remote ports"
 msgstr ""
 
 #. 0 - 65535; multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:201
-msgid "lucistatistics_collectdtcpconns_remoteports_desc"
+msgid "0 - 65535; multiple separated by space"
 msgstr ""
 
 #. Unixsock Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:202
-msgid "lucistatistics_collectdunixsock"
+msgid "Unixsock Plugin Configuration"
 msgstr ""
 
 #. The unixsock plugin creates a unix socket which can be used to read collected data from a running collectd instance.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:203
-msgid "lucistatistics_collectdunixsock_desc"
+msgid "The unixsock plugin creates a unix socket which can be used to read collected data from a running collectd instance."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:204
-msgid "lucistatistics_collectdunixsock_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Filepath of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:205
-msgid "lucistatistics_collectdunixsock_socketfile"
+msgid "Filepath of the unix socket"
 msgstr ""
 
 #. Group ownership of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:206
-msgid "lucistatistics_collectdunixsock_socketgroup"
+msgid "Group ownership of the unix socket"
 msgstr ""
 
 #. group name
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:207
-msgid "lucistatistics_collectdunixsock_socketgroup_desc"
+msgid "group name"
 msgstr ""
 
 #. File permissions of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:208
-msgid "lucistatistics_collectdunixsock_socketperms"
+msgid "File permissions of the unix socket"
 msgstr ""
 
 #. octal
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:209
-msgid "lucistatistics_collectdunixsock_socketperms_desc"
+msgid "octal"
 msgstr ""
 
 #. Wireless Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:210
-msgid "lucistatistics_collectdwireless"
+msgid "Wireless Plugin Configuration"
 msgstr ""
 
 #. The wireless plugin collects statistics about wireless signal strength, noise and quality.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:211
-msgid "lucistatistics_collectdwireless_desc"
+msgid "The wireless plugin collects statistics about wireless signal strength, noise and quality."
 msgstr ""
 
 #. Enable this plugin
diff --git a/po/ru/sysauth.po b/po/ru/sysauth.po
index 01ff7bc07..4f570eaab 100644
--- a/po/ru/sysauth.po
+++ b/po/ru/sysauth.po
@@ -14,12 +14,12 @@ msgstr ""
 
 #. Authorization Required
 #: i18n/english/luasrc/i18n/sysauth.en.lua:1
-msgid "sysauth_head"
+msgid "Authorization Required"
 msgstr "Требуется авторизация"
 
 #. Please enter your username and password.
 #: i18n/english/luasrc/i18n/sysauth.en.lua:2
-msgid "sysauth_prompt"
+msgid "Please enter your username and password."
 msgstr "Пожалуйста, введите логин и пароль."
 
 #. Invalid username and/or password! Please try again.
diff --git a/po/ru/tinyproxy.po b/po/ru/tinyproxy.po
index 527e4ffba..df4b3498e 100644
--- a/po/ru/tinyproxy.po
+++ b/po/ru/tinyproxy.po
@@ -14,157 +14,157 @@ msgstr ""
 
 #. Tinyproxy
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:1
-msgid "tinyproxy"
+msgid "Tinyproxy"
 msgstr ""
 
 #. Tinyproxy is a small and fast non-caching HTTP(S)-Proxy
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:2
-msgid "tinyproxy_desc"
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
 msgstr ""
 
 #. Allow access from
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:3
-msgid "tinyproxy_tinyproxy_allow"
+msgid "Allow access from"
 msgstr ""
 
 #. Allowed headers for anonymous proxy
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:4
-msgid "tinyproxy_tinyproxy_anonymous"
+msgid "Allowed headers for anonymous proxy"
 msgstr ""
 
 #. Bind outgoing traffic to address
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:5
-msgid "tinyproxy_tinyproxy_bind"
+msgid "Bind outgoing traffic to address"
 msgstr ""
 
 #. Ports allowed for CONNECT method
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:6
-msgid "tinyproxy_tinyproxy_connectport"
+msgid "Ports allowed for CONNECT method"
 msgstr ""
 
 #. 0 = disabled, empty = all
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:7
-msgid "tinyproxy_tinyproxy_connectport_desc"
+msgid "0 = disabled, empty = all"
 msgstr ""
 
 #. Error document
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:8
-msgid "tinyproxy_tinyproxy_defaulterrorfile"
+msgid "Error document"
 msgstr ""
 
 #. Filter list
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:9
-msgid "tinyproxy_tinyproxy_filter"
+msgid "Filter list"
 msgstr ""
 
 #. Case sensitive filters
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:10
-msgid "tinyproxy_tinyproxy_filtercasesensitive"
+msgid "Case sensitive filters"
 msgstr ""
 
 #. Filter list is a whitelist
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:11
-msgid "tinyproxy_tinyproxy_filterdefaultdeny"
+msgid "Filter list is a whitelist"
 msgstr ""
 
 #. Extended regular expression filters
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:12
-msgid "tinyproxy_tinyproxy_filterextended"
+msgid "Extended regular expression filters"
 msgstr ""
 
 #. Filter URLs instead of domains
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:13
-msgid "tinyproxy_tinyproxy_filterurls"
+msgid "Filter URLs instead of domains"
 msgstr ""
 
 #. Listen on address
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:14
-msgid "tinyproxy_tinyproxy_listen"
+msgid "Listen on address"
 msgstr ""
 
 #. Logfile
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:15
-msgid "tinyproxy_tinyproxy_logfile"
+msgid "Logfile"
 msgstr ""
 
 #. Log level
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:16
-msgid "tinyproxy_tinyproxy_loglevel"
+msgid "Log level"
 msgstr ""
 
 #. Maximum number of clients
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:17
-msgid "tinyproxy_tinyproxy_maxclients"
+msgid "Maximum number of clients"
 msgstr ""
 
 #. Maximum requests per thread
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:18
-msgid "tinyproxy_tinyproxy_maxrequestsperchild"
+msgid "Maximum requests per thread"
 msgstr ""
 
 #. Max. spare servers
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:19
-msgid "tinyproxy_tinyproxy_maxspareservers"
+msgid "Max. spare servers"
 msgstr ""
 
 #. Min. spare servers
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:20
-msgid "tinyproxy_tinyproxy_minspareservers"
+msgid "Min. spare servers"
 msgstr ""
 
 #. Spare servers to start with
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:21
-msgid "tinyproxy_tinyproxy_startservers"
+msgid "Spare servers to start with"
 msgstr ""
 
 #. Statistic document
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:22
-msgid "tinyproxy_tinyproxy_statfile"
+msgid "Statistic document"
 msgstr ""
 
 #. Write to syslog
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:23
-msgid "tinyproxy_tinyproxy_syslog"
+msgid "Write to syslog"
 msgstr ""
 
 #. Connection Timeout
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:24
-msgid "tinyproxy_tinyproxy_timeout"
+msgid "Connection Timeout"
 msgstr ""
 
 #. Value of Via-Header
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:25
-msgid "tinyproxy_tinyproxy_viaproxyname"
+msgid "Value of Via-Header"
 msgstr ""
 
 #. Include client IP
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:26
-msgid "tinyproxy_tinyproxy_xtinyproxy"
+msgid "Include client IP"
 msgstr ""
 
 #. Via proxy
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:27
-msgid "tinyproxy_type_proxy"
+msgid "Via proxy"
 msgstr ""
 
 #. Reject access
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:28
-msgid "tinyproxy_type_reject"
+msgid "Reject access"
 msgstr ""
 
 #. Upstream Control
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:29
-msgid "tinyproxy_upstream"
+msgid "Upstream Control"
 msgstr ""
 
 #. Target host
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:30
-msgid "tinyproxy_upstream_target"
+msgid "Target host"
 msgstr ""
 
 #. Type
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:31
-msgid "tinyproxy_upstream_type"
+msgid "Type"
 msgstr ""
 
 #. Upstream Proxy
diff --git a/po/ru/upnp.po b/po/ru/upnp.po
index e4a9d22eb..e70302883 100644
--- a/po/ru/upnp.po
+++ b/po/ru/upnp.po
@@ -14,32 +14,32 @@ msgstr ""
 
 #. Universal Plug &amp; Play
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:1
-msgid "upnpd"
+msgid "Universal Plug & Play"
 msgstr ""
 
 #. UPNP allows clients in the local network to automatically configure the router.
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:2
-msgid "upnpd_desc"
+msgid "UPNP allows clients in the local network to automatically configure the router."
 msgstr ""
 
 #. UPNP should only be enabled if absolutely necessary as it can result in high security risks for your network.
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:3
-msgid "upnpd_config_desc"
+msgid "UPNP should only be enabled if absolutely necessary as it can result in high security risks for your network."
 msgstr ""
 
 #. Enable secure mode
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:4
-msgid "upnpd_config_securemode"
+msgid "Enable secure mode"
 msgstr ""
 
 #. Log output
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:5
-msgid "upnpd_config_logoutput"
+msgid "Log output"
 msgstr ""
 
 #. Downlink
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:6
-msgid "upnpd_config_download"
+msgid "Downlink"
 msgstr ""
 
 #. Uplink
diff --git a/po/ru/ushare.po b/po/ru/ushare.po
index f3acd43e5..c0ff09ca1 100644
--- a/po/ru/ushare.po
+++ b/po/ru/ushare.po
@@ -14,37 +14,37 @@ msgstr ""
 
 #. Content directories
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:1
-msgid "content_directories"
+msgid "Content directories"
 msgstr ""
 
 #. Disable telnet console
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:2
-msgid "disable_telnet"
+msgid "Disable telnet console"
 msgstr ""
 
 #. Disable webinterface
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:3
-msgid "disable_webif"
+msgid "Disable webinterface"
 msgstr ""
 
 #. Options
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:4
-msgid "options"
+msgid "Options"
 msgstr ""
 
 #. Servername
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:5
-msgid "servername"
+msgid "Servername"
 msgstr ""
 
 #. Settings
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:6
-msgid "settings"
+msgid "Settings"
 msgstr ""
 
 #. uShare
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:7
-msgid "ushare"
+msgid "uShare"
 msgstr ""
 
 #. uShare
diff --git a/po/ru/uvc_streamer.po b/po/ru/uvc_streamer.po
index db79cd8a8..0431eb192 100644
--- a/po/ru/uvc_streamer.po
+++ b/po/ru/uvc_streamer.po
@@ -14,22 +14,22 @@ msgstr ""
 
 #. Frames per second
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
-msgid "framespersecond"
+msgid "Frames per second"
 msgstr ""
 
 #. Resolution
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
-msgid "resolution"
+msgid "Resolution"
 msgstr ""
 
 #. Settings
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
-msgid "settings"
+msgid "Settings"
 msgstr ""
 
 #. Webcam streaming
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
-msgid "uvc_streamer"
+msgid "Webcam streaming"
 msgstr ""
 
 #. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
diff --git a/po/ru/uvl.po b/po/ru/uvl.po
index fac3aa150..e8fadab38 100644
--- a/po/ru/uvl.po
+++ b/po/ru/uvl.po
@@ -14,192 +14,192 @@ msgstr ""
 
 #. Unable to load config \"%p\": %1
 #: libs/uvl/luasrc/i18n/uvl.en.lua:1
-msgid "uvl_err_uciload"
+msgid "Unable to load config \"%p\": %1"
 msgstr ""
 
 #. Error in scheme \"%p\":\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:2
-msgid "uvl_err_scheme"
+msgid "Error in scheme \"%p\":\\n%c"
 msgstr ""
 
 #. Error in config \"%p\":\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:3
-msgid "uvl_err_config"
+msgid "Error in config \"%p\":\\n%c"
 msgstr ""
 
 #. Error in section \"%i\" (%I):\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:4
-msgid "uvl_err_section"
+msgid "Error in section \"%i\" (%I):\\n%c"
 msgstr ""
 
 #. Error in option \"%i\" (%I):\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:5
-msgid "uvl_err_option"
+msgid "Error in option \"%i\" (%I):\\n%c"
 msgstr ""
 
 #. Option \"%i\" has invalid reference specification %1:\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:6
-msgid "uvl_err_reference"
+msgid "Option \"%i\" has invalid reference specification %1:\\n%c"
 msgstr ""
 
 #. In dependency check for %t \"%i\":\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:7
-msgid "uvl_err_dependency"
+msgid "In dependency check for %t \"%i\":\\n%c"
 msgstr ""
 
 #. Can not find scheme \"%p\" in \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:8
-msgid "uvl_err_sme_find"
+msgid "Can not find scheme \"%p\" in \"%1\""
 msgstr ""
 
 #. Can not access file \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:9
-msgid "uvl_err_sme_read"
+msgid "Can not access file \"%1\""
 msgstr ""
 
 #. Missing required scheme field \"%1\" in \"%i\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:10
-msgid "uvl_err_sme_reqfld"
+msgid "Missing required scheme field \"%1\" in \"%i\""
 msgstr ""
 
 #. Illegal reference \"%1\" to an anonymous section
 #: libs/uvl/luasrc/i18n/uvl.en.lua:11
-msgid "uvl_err_sme_invref"
+msgid "Illegal reference \"%1\" to an anonymous section"
 msgstr ""
 
 #. Malformed reference in \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:12
-msgid "uvl_err_sme_badref"
+msgid "Malformed reference in \"%1\""
 msgstr ""
 
 #. Malformed dependency specification \"%1\" in \"%i\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:13
-msgid "uvl_err_sme_baddep"
+msgid "Malformed dependency specification \"%1\" in \"%i\""
 msgstr ""
 
 #. Malformed validator specification \"%1\" in \"%i\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:14
-msgid "uvl_err_sme_badval"
+msgid "Malformed validator specification \"%1\" in \"%i\""
 msgstr ""
 
 #. External validator \"%1\" failed: %2
 #: libs/uvl/luasrc/i18n/uvl.en.lua:15
-msgid "uvl_err_sme_errval"
+msgid "External validator \"%1\" failed: %2"
 msgstr ""
 
 #. Variable \"%o\" in scheme \"%p\" references unknown package \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:16
-msgid "uvl_err_sme_vbadpack"
+msgid "Variable \"%o\" in scheme \"%p\" references unknown package \"%1\""
 msgstr ""
 
 #. Variable \"%o\" in scheme \"%p\" references unknown section \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:17
-msgid "uvl_err_sme_vbadsect"
+msgid "Variable \"%o\" in scheme \"%p\" references unknown section \"%1\""
 msgstr ""
 
 #. Enum \"%v\" in scheme \"%p\" references unknown package \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:18
-msgid "uvl_err_sme_ebadpack"
+msgid "Enum \"%v\" in scheme \"%p\" references unknown package \"%1\""
 msgstr ""
 
 #. Enum \"%v\" in scheme \"%p\" references unknown section \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:19
-msgid "uvl_err_sme_ebadsect"
+msgid "Enum \"%v\" in scheme \"%p\" references unknown section \"%1\""
 msgstr ""
 
 #. Enum \"%v\" in scheme \"%p\" references unknown option \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:20
-msgid "uvl_err_sme_ebadopt"
+msgid "Enum \"%v\" in scheme \"%p\" references unknown option \"%1\""
 msgstr ""
 
 #. Enum \"%v\" in scheme \"%p\" references non-enum option \"%p.%s.%o\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:21
-msgid "uvl_err_sme_ebadtype"
+msgid "Enum \"%v\" in scheme \"%p\" references non-enum option \"%p.%s.%o\""
 msgstr ""
 
 #. Enum \"%v\" in scheme \"%p\" redeclares the default value of \"%p.%s.%o\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:22
-msgid "uvl_err_sme_ebaddef"
+msgid "Enum \"%v\" in scheme \"%p\" redeclares the default value of \"%p.%s.%o\""
 msgstr ""
 
 #. Section \"%i\" (%I) not found in scheme
 #: libs/uvl/luasrc/i18n/uvl.en.lua:23
-msgid "uvl_err_sect_unknown"
+msgid "Section \"%i\" (%I) not found in scheme"
 msgstr ""
 
 #. Required section \"%p.%s\" not found in config
 #: libs/uvl/luasrc/i18n/uvl.en.lua:24
-msgid "uvl_err_sect_required"
+msgid "Required section \"%p.%s\" not found in config"
 msgstr ""
 
 #. Unique section \"%p.%s\" occurs multiple times in config
 #: libs/uvl/luasrc/i18n/uvl.en.lua:25
-msgid "uvl_err_sect_unique"
+msgid "Unique section \"%p.%s\" occurs multiple times in config"
 msgstr ""
 
 #. The section of type \"%p.%s\" is stored anonymously in config but must be named
 #: libs/uvl/luasrc/i18n/uvl.en.lua:26
-msgid "uvl_err_sect_named"
+msgid "The section of type \"%p.%s\" is stored anonymously in config but must be named"
 msgstr ""
 
 #. Section \"%p.%s\" not found in config
 #: libs/uvl/luasrc/i18n/uvl.en.lua:27
-msgid "uvl_err_sect_notfound"
+msgid "Section \"%p.%s\" not found in config"
 msgstr ""
 
 #. Option \"%i\" (%I) not found in scheme
 #: libs/uvl/luasrc/i18n/uvl.en.lua:28
-msgid "uvl_err_opt_unknown"
+msgid "Option \"%i\" (%I) not found in scheme"
 msgstr ""
 
 #. Required option \"%i\" has no value
 #: libs/uvl/luasrc/i18n/uvl.en.lua:29
-msgid "uvl_err_opt_required"
+msgid "Required option \"%i\" has no value"
 msgstr ""
 
 #. Value \"%1\" of option \"%i\" is not defined in enum %2
 #: libs/uvl/luasrc/i18n/uvl.en.lua:30
-msgid "uvl_err_opt_badvalue"
+msgid "Value \"%1\" of option \"%i\" is not defined in enum %2"
 msgstr ""
 
 #. Value \"%1\" of option \"%i\" does not validate as datatype \"%2\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:31
-msgid "uvl_err_opt_invvalue"
+msgid "Value \"%1\" of option \"%i\" does not validate as datatype \"%2\""
 msgstr ""
 
 #. Option \"%i\" is defined as list but stored as plain value
 #: libs/uvl/luasrc/i18n/uvl.en.lua:32
-msgid "uvl_err_opt_notlist"
+msgid "Option \"%i\" is defined as list but stored as plain value"
 msgstr ""
 
 #. Option \"%i\" has unknown datatype \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:33
-msgid "uvl_err_opt_datatype"
+msgid "Option \"%i\" has unknown datatype \"%1\""
 msgstr ""
 
 #. Option \"%p.%s.%o\" not found in config
 #: libs/uvl/luasrc/i18n/uvl.en.lua:34
-msgid "uvl_err_opt_notfound"
+msgid "Option \"%p.%s.%o\" not found in config"
 msgstr ""
 
 #. Dependency (%1) failed:\noption \"%i\" is not eqal \"%2\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:35
-msgid "uvl_err_dep_notequal"
+msgid "Dependency (%1) failed:\\noption \"%i\" is not eqal \"%2\""
 msgstr ""
 
 #. Dependency (%1) failed:\noption \"%i\" has no value
 #: libs/uvl/luasrc/i18n/uvl.en.lua:36
-msgid "uvl_err_dep_novalue"
+msgid "Dependency (%1) failed:\\noption \"%i\" has no value"
 msgstr ""
 
 #. Dependency (%1) failed:\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:37
-msgid "uvl_err_dep_notvalid"
+msgid "Dependency (%1) failed:\\n%c"
 msgstr ""
 
 #. Recursive dependency for option \"%i\" detected
 #: libs/uvl/luasrc/i18n/uvl.en.lua:38
-msgid "uvl_err_dep_recursive"
+msgid "Recursive dependency for option \"%i\" detected"
 msgstr ""
 
 #. In dependency check for enum value \"%i\":\n%c
diff --git a/po/ru/wifi.po b/po/ru/wifi.po
index cb9169fab..cf5f8c9d4 100644
--- a/po/ru/wifi.po
+++ b/po/ru/wifi.po
@@ -14,192 +14,192 @@ msgstr ""
 
 #. auto
 #: i18n/english/luasrc/i18n/wifi.en.lua:1
-msgid "wifi_auto"
+msgid "auto"
 msgstr ""
 
 #. Frequency Hopping
 #: i18n/english/luasrc/i18n/wifi.en.lua:2
-msgid "wifi_fh"
+msgid "Frequency Hopping"
 msgstr ""
 
 #. Diversity
 #: i18n/english/luasrc/i18n/wifi.en.lua:3
-msgid "wifi_diversity"
+msgid "Diversity"
 msgstr ""
 
 #. Transmitter Antenna
 #: i18n/english/luasrc/i18n/wifi.en.lua:4
-msgid "wifi_txantenna"
+msgid "Transmitter Antenna"
 msgstr ""
 
 #. Receiver Antenna
 #: i18n/english/luasrc/i18n/wifi.en.lua:5
-msgid "wifi_rxantenna"
+msgid "Receiver Antenna"
 msgstr ""
 
 #. Distance Optimization
 #: i18n/english/luasrc/i18n/wifi.en.lua:6
-msgid "wifi_distance"
+msgid "Distance Optimization"
 msgstr ""
 
 #. Distance to farthest network member in meters.
 #: i18n/english/luasrc/i18n/wifi.en.lua:7
-msgid "wifi_distance_desc"
+msgid "Distance to farthest network member in meters."
 msgstr ""
 
 #. MAC-Address Filter
 #: i18n/english/luasrc/i18n/wifi.en.lua:8
-msgid "wifi_macpolicy"
+msgid "MAC-Address Filter"
 msgstr ""
 
 #. Allow listed only
 #: i18n/english/luasrc/i18n/wifi.en.lua:9
-msgid "wifi_whitelist"
+msgid "Allow listed only"
 msgstr ""
 
 #. Allow all except listed
 #: i18n/english/luasrc/i18n/wifi.en.lua:10
-msgid "wifi_blacklist"
+msgid "Allow all except listed"
 msgstr ""
 
 #. MAC-List
 #: i18n/english/luasrc/i18n/wifi.en.lua:11
-msgid "wifi_maclist"
+msgid "MAC-List"
 msgstr ""
 
 #. Frame Bursting
 #: i18n/english/luasrc/i18n/wifi.en.lua:12
-msgid "wifi_bursting"
+msgid "Frame Bursting"
 msgstr ""
 
 #. Regulatory Domain
 #: i18n/english/luasrc/i18n/wifi.en.lua:13
-msgid "wifi_regdomain"
+msgid "Regulatory Domain"
 msgstr ""
 
 #. Country Code
 #: i18n/english/luasrc/i18n/wifi.en.lua:14
-msgid "wifi_country"
+msgid "Country Code"
 msgstr ""
 
 #. Outdoor Channels
 #: i18n/english/luasrc/i18n/wifi.en.lua:15
-msgid "wifi_outdoor"
+msgid "Outdoor Channels"
 msgstr ""
 
 #. Connection Limit
 #: i18n/english/luasrc/i18n/wifi.en.lua:16
-msgid "wifi_maxassoc"
+msgid "Connection Limit"
 msgstr ""
 
 #. <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:17
-msgid "wifi_essid"
+msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 
 #. <abbr title=\"Basic Service Set Identifier\">BSSID</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:18
-msgid "wifi_bssid"
+msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr ""
 
 #. Fragmentation Threshold
 #: i18n/english/luasrc/i18n/wifi.en.lua:19
-msgid "wifi_frag"
+msgid "Fragmentation Threshold"
 msgstr ""
 
 #. RTS/CTS Threshold
 #: i18n/english/luasrc/i18n/wifi.en.lua:20
-msgid "wifi_rts"
+msgid "RTS/CTS Threshold"
 msgstr ""
 
 #. <abbr title=\"Wireless Distribution System\">WDS</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:21
-msgid "wifi_wds"
+msgid "<abbr title=\"Wireless Distribution System\">WDS</abbr>"
 msgstr ""
 
 #. Separate WDS
 #: i18n/english/luasrc/i18n/wifi.en.lua:22
-msgid "wifi_wdssep"
+msgid "Separate WDS"
 msgstr ""
 
 #. Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:23
-msgid "wifi_hidden"
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 
 #. Isolate Clients
 #: i18n/english/luasrc/i18n/wifi.en.lua:24
-msgid "wifi_isloate"
+msgid "Isolate Clients"
 msgstr ""
 
 #. Prevent Client to Client Communication
 #: i18n/english/luasrc/i18n/wifi.en.lua:25
-msgid "wifi_isloate_desc"
+msgid "Prevent Client to Client Communication"
 msgstr ""
 
 #. Background Scan
 #: i18n/english/luasrc/i18n/wifi.en.lua:26
-msgid "wifi_bgscan"
+msgid "Background Scan"
 msgstr ""
 
 #. Transmission Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:27
-msgid "wifi_rate"
+msgid "Transmission Rate"
 msgstr ""
 
 #. Multicast Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:28
-msgid "wifi_mcast_rate"
+msgid "Multicast Rate"
 msgstr ""
 
 #. Minimum Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:29
-msgid "wifi_minrate"
+msgid "Minimum Rate"
 msgstr ""
 
 #. Maximum Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:30
-msgid "wifi_maxrate"
+msgid "Maximum Rate"
 msgstr ""
 
 #. Compression
 #: i18n/english/luasrc/i18n/wifi.en.lua:31
-msgid "wifi_compression"
+msgid "Compression"
 msgstr ""
 
 #. Turbo Mode
 #: i18n/english/luasrc/i18n/wifi.en.lua:32
-msgid "wifi_turbo"
+msgid "Turbo Mode"
 msgstr ""
 
 #. Fast Frames
 #: i18n/english/luasrc/i18n/wifi.en.lua:33
-msgid "wifi_ff"
+msgid "Fast Frames"
 msgstr ""
 
 #. WMM Mode
 #: i18n/english/luasrc/i18n/wifi.en.lua:34
-msgid "wifi_wmm"
+msgid "WMM Mode"
 msgstr ""
 
 #. XR Support
 #: i18n/english/luasrc/i18n/wifi.en.lua:35
-msgid "wifi_xr"
+msgid "XR Support"
 msgstr ""
 
 #. AR Support
 #: i18n/english/luasrc/i18n/wifi.en.lua:36
-msgid "wifi_ar"
+msgid "AR Support"
 msgstr ""
 
 #. Disable HW-Beacon timer
 #: i18n/english/luasrc/i18n/wifi.en.lua:37
-msgid "wifi_nosbeacon"
+msgid "Disable HW-Beacon timer"
 msgstr ""
 
 #. Do not send probe responses
 #: i18n/english/luasrc/i18n/wifi.en.lua:38
-msgid "wifi_noprobereq"
+msgid "Do not send probe responses"
 msgstr ""
 
 #. WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP and ad-hoc mode) to be installed.
diff --git a/po/templates/admin-core.pot b/po/templates/admin-core.pot
index 862bc4c67..2fac9b2a1 100644
--- a/po/templates/admin-core.pot
+++ b/po/templates/admin-core.pot
@@ -5,2074 +5,2102 @@ msgstr "Content-Type: text/plain; charset=UTF-8"
 
 #. The following changes have been applied
 #: i18n/english/luasrc/i18n/admin-core.en.lua:1
-msgid "uci_applied"
+msgid "The following changes have been applied"
 msgstr ""
 
 #. The following changes have been reverted
 #: i18n/english/luasrc/i18n/admin-core.en.lua:2
-msgid "uci_reverted"
+msgid "The following changes have been reverted"
 msgstr ""
 
 #. User Interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:3
-msgid "a_i_ui"
+msgid "User Interface"
 msgstr ""
 
 #. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a collection of free Lua software including an <abbr title=\"Model-View-Controller\">MVC</abbr>-Webframework and webinterface for embedded devices. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is licensed under the Apache-License.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:4
-msgid "c_lucidesc"
+msgid ""
+"<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a collection of "
+"free Lua software including an <abbr title=\"Model-View-Controller\">MVC</"
+"abbr>-Webframework and webinterface for embedded devices. <abbr title=\"Lua "
+"Configuration Interface\">LuCI</abbr> is licensed under the Apache-License."
 msgstr ""
 
 #. Project Homepage
 #: i18n/english/luasrc/i18n/admin-core.en.lua:5
-msgid "c_projecthome"
+msgid "Project Homepage"
 msgstr ""
 
 #. Lead Development
 #: i18n/english/luasrc/i18n/admin-core.en.lua:6
-msgid "c_leaddev"
+msgid "Lead Development"
 msgstr ""
 
 #. Contributing Developers
 #: i18n/english/luasrc/i18n/admin-core.en.lua:7
-msgid "c_contributors"
+msgid "Contributing Developers"
 msgstr ""
 
 #. Thanks To
 #: i18n/english/luasrc/i18n/admin-core.en.lua:8
-msgid "c_thanksto"
+msgid "Thanks To"
 msgstr ""
 
 #. Hello!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:9
-msgid "a_i_i_hello"
+msgid "Hello!"
 msgstr ""
 
 #. This is the administration area of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:10
-msgid "a_i_i_admin1"
+msgid ""
+"This is the administration area of <abbr title=\"Lua Configuration Interface"
+"\">LuCI</abbr>."
 msgstr ""
 
 #. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a free, flexible, and user friendly graphical interface for configuring OpenWrt Kamikaze.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:11
-msgid "a_i_i_admin2"
+msgid ""
+"<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a free, flexible, "
+"and user friendly graphical interface for configuring OpenWrt Kamikaze."
 msgstr ""
 
 #. On the following pages you can adjust all important settings of your router.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:12
-msgid "a_i_i_admin3"
+msgid ""
+"On the following pages you can adjust all important settings of your router."
 msgstr ""
 
 #. Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> changes have to be confirmed by clicking Changes - Save &amp; Apply before being applied.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:13
-msgid "a_i_i_admin4"
+msgid ""
+"Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> changes "
+"have to be confirmed by clicking Changes - Save & Apply before being applied."
 msgstr ""
 
 #. As we always want to improve this interface we are looking forward to your feedback and suggestions.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:14
-msgid "a_i_i_admin5"
+msgid ""
+"As we always want to improve this interface we are looking forward to your "
+"feedback and suggestions."
 msgstr ""
 
 #. And now have fun with your router!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:15
-msgid "a_i_i_admin6"
+msgid "And now have fun with your router!"
 msgstr ""
 
 #. The <abbr title=\"Lua Configuration Interface\">LuCI</abbr> Team
 #: i18n/english/luasrc/i18n/admin-core.en.lua:16
-msgid "a_i_i_team"
+msgid "The <abbr title=\"Lua Configuration Interface\">LuCI</abbr> Team"
 msgstr ""
 
 #. Here you can customize the settings and the functionality of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:17
-msgid "a_i_luci1"
+msgid ""
+"Here you can customize the settings and the functionality of <abbr title="
+"\"Lua Configuration Interface\">LuCI</abbr>."
 msgstr ""
 
 #. Post-commit actions
 #: i18n/english/luasrc/i18n/admin-core.en.lua:18
-msgid "a_i_ucicommit"
+msgid "Post-commit actions"
 msgstr ""
 
 #. These commands will be executed automatically when a given <abbr title=\"Unified Configuration Interface\">UCI</abbr> configuration is committed allowing changes to be applied instantly.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:19
-msgid "a_i_ucicommit1"
+msgid ""
+"These commands will be executed automatically when a given <abbr title="
+"\"Unified Configuration Interface\">UCI</abbr> configuration is committed "
+"allowing changes to be applied instantly."
 msgstr ""
 
 #. Files to be kept when flashing a new firmware
 #: i18n/english/luasrc/i18n/admin-core.en.lua:20
-msgid "a_i_keepflash"
+msgid "Files to be kept when flashing a new firmware"
 msgstr ""
 
 #. When flashing a new firmware with <abbr title=\"Lua Configuration Interface\">LuCI</abbr> these files will be added to the new firmware installation.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:21
-msgid "a_i_keepflash1"
+msgid ""
+"When flashing a new firmware with <abbr title=\"Lua Configuration Interface"
+"\">LuCI</abbr> these files will be added to the new firmware installation."
 msgstr ""
 
 #. Here you can find information about the current system status like <abbr title=\"Central Processing Unit\">CPU</abbr> clock frequency, memory usage or network interface data.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:22
-msgid "a_st_i_status1"
+msgid ""
+"Here you can find information about the current system status like <abbr "
+"title=\"Central Processing Unit\">CPU</abbr> clock frequency, memory usage "
+"or network interface data."
 msgstr ""
 
 #. Also kernel or service logfiles can be viewed here to get an overview over their current state.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:23
-msgid "a_st_i_status2"
+msgid ""
+"Also kernel or service logfiles can be viewed here to get an overview over "
+"their current state."
 msgstr ""
 
 #. <abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan
 #: i18n/english/luasrc/i18n/admin-core.en.lua:24
-msgid "iwscan"
+msgid "<abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan"
 msgstr ""
 
 #. Wifi networks in your local environment
 #: i18n/english/luasrc/i18n/admin-core.en.lua:25
-msgid "iwscan1"
+msgid "Wifi networks in your local environment"
 msgstr ""
 
 #. <abbr title=\"Encrypted\">Encr.</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:26
-msgid "iwscan_encr"
-msgstr ""
-
-#. Link
-#: i18n/english/luasrc/i18n/admin-core.en.lua:27
-msgid "iwscan_link"
-msgstr ""
-
-#. Signal
-#: i18n/english/luasrc/i18n/admin-core.en.lua:28
-msgid "iwscan_signal"
-msgstr ""
-
-#. Noise
-#: i18n/english/luasrc/i18n/admin-core.en.lua:29
-msgid "iwscan_noise"
-msgstr ""
-
-#. Routes
-#: i18n/english/luasrc/i18n/admin-core.en.lua:30
-msgid "routes"
+msgid "<abbr title=\"Encrypted\">Encr.</abbr>"
 msgstr ""
 
 #. Netmask
 #: i18n/english/luasrc/i18n/admin-core.en.lua:31
-msgid "routes_netmask"
+msgid "Netmask"
 msgstr ""
 
 #. Gateway
 #: i18n/english/luasrc/i18n/admin-core.en.lua:32
-msgid "routes_gateway"
+msgid "Gateway"
 msgstr ""
 
 #. Metric
 #: i18n/english/luasrc/i18n/admin-core.en.lua:33
-msgid "routes_metric"
+msgid "Metric"
 msgstr ""
 
 #. Here you can configure the basic aspects of your device like its hostname or the timezone.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:34
-msgid "a_s_desc"
+msgid ""
+"Here you can configure the basic aspects of your device like its hostname or "
+"the timezone."
 msgstr ""
 
 #. Software
 #: i18n/english/luasrc/i18n/admin-core.en.lua:35
-msgid "a_s_packages"
+msgid "Software"
 msgstr ""
 
 #. Admin Password
 #: i18n/english/luasrc/i18n/admin-core.en.lua:36
-msgid "a_s_changepw"
+msgid "Admin Password"
 msgstr ""
 
 #. OPKG-Configuration
 #: i18n/english/luasrc/i18n/admin-core.en.lua:37
-msgid "a_s_p_ipkg"
+msgid "OPKG-Configuration"
 msgstr ""
 
 #. <abbr title=\"Secure Shell\">SSH</abbr>-Keys
 #: i18n/english/luasrc/i18n/admin-core.en.lua:38
-msgid "a_s_sshkeys"
-msgstr ""
-
-#. Mount Points
-#: i18n/english/luasrc/i18n/admin-core.en.lua:39
-msgid "a_s_fstab"
+msgid "<abbr title=\"Secure Shell\">SSH</abbr>-Keys"
 msgstr ""
 
 #. Change settings related to the system itself, its identification, installed hard- and software, authentication or mount points.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:40
-msgid "a_s_i_system1"
+msgid ""
+"Change settings related to the system itself, its identification, installed "
+"hard- and software, authentication or mount points."
 msgstr ""
 
 #. These settings define the base of your system.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:41
-msgid "a_s_i_system2"
+msgid "These settings define the base of your system."
 msgstr ""
 
 #. Pay attention as any misconfiguration here may prevent your device from booting or may lock yourself out of it.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:42
-msgid "a_s_i_system3"
+msgid ""
+"Pay attention as any misconfiguration here may prevent your device from "
+"booting or may lock yourself out of it."
 msgstr ""
 
 #. Interfaces
 #: i18n/english/luasrc/i18n/admin-core.en.lua:43
-msgid "a_s_if"
-msgstr ""
-
-#. Bridge
-#: i18n/english/luasrc/i18n/admin-core.en.lua:44
-msgid "a_s_if_bridge"
+msgid "Interfaces"
 msgstr ""
 
 #. ID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:45
-msgid "a_s_if_bridge_id"
+msgid "ID"
 msgstr ""
 
 #. Bridge Port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:46
-msgid "a_s_if_bridge_port"
+msgid "Bridge Port"
 msgstr ""
 
 #. STP
 #: i18n/english/luasrc/i18n/admin-core.en.lua:47
-msgid "a_s_if_bridge_stp"
-msgstr ""
-
-#. Device
-#: i18n/english/luasrc/i18n/admin-core.en.lua:48
-msgid "a_s_if_device"
+msgid "STP"
 msgstr ""
 
 #. Ethernet Bridge
 #: i18n/english/luasrc/i18n/admin-core.en.lua:49
-msgid "a_s_if_ethbridge"
+msgid "Ethernet Bridge"
 msgstr ""
 
 #. Ethernet Adapter
 #: i18n/english/luasrc/i18n/admin-core.en.lua:50
-msgid "a_s_if_ethdev"
+msgid "Ethernet Adapter"
 msgstr ""
 
 #. Ethernet Switch
 #: i18n/english/luasrc/i18n/admin-core.en.lua:51
-msgid "a_s_if_ethswitch"
+msgid "Ethernet Switch"
 msgstr ""
 
 #. Interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:52
-msgid "a_s_if_interface"
+msgid "Interface"
 msgstr ""
 
 #. IP Configuration
 #: i18n/english/luasrc/i18n/admin-core.en.lua:53
-msgid "a_s_if_ipconfig"
+msgid "IP Configuration"
 msgstr ""
 
 #. Alias
 #: i18n/english/luasrc/i18n/admin-core.en.lua:54
-msgid "a_s_if_ipconfig_alias"
+msgid "Alias"
 msgstr ""
 
 #. DHCP assigned
 #: i18n/english/luasrc/i18n/admin-core.en.lua:55
-msgid "a_s_if_ipconfig_dhcp"
+msgid "DHCP assigned"
 msgstr ""
 
 #. IPv6
 #: i18n/english/luasrc/i18n/admin-core.en.lua:56
-msgid "a_s_if_ipconfig_ipv6"
+msgid "IPv6"
 msgstr ""
 
 #. Not configured
 #: i18n/english/luasrc/i18n/admin-core.en.lua:57
-msgid "a_s_if_ipconfig_none"
+msgid "Not configured"
 msgstr ""
 
 #. Primary
 #: i18n/english/luasrc/i18n/admin-core.en.lua:58
-msgid "a_s_if_ipconfig_primary"
-msgstr ""
-
-#. Channel
-#: i18n/english/luasrc/i18n/admin-core.en.lua:59
-msgid "a_s_if_iwchannel"
+msgid "Primary"
 msgstr ""
 
 #. Mode
 #: i18n/english/luasrc/i18n/admin-core.en.lua:60
-msgid "a_s_if_iwmode"
-msgstr ""
-
-#. Ad-Hoc
-#: i18n/english/luasrc/i18n/admin-core.en.lua:61
-msgid "a_s_if_iwmode_adhoc"
+msgid "Mode"
 msgstr ""
 
 #. Pseudo Ad-Hoc
 #: i18n/english/luasrc/i18n/admin-core.en.lua:62
-msgid "a_s_if_iwmode_ahdemo"
+msgid "Pseudo Ad-Hoc"
 msgstr ""
 
 #. Master
 #: i18n/english/luasrc/i18n/admin-core.en.lua:63
-msgid "a_s_if_iwmode_ap"
+msgid "Master"
 msgstr ""
 
 #. Master + WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:64
-msgid "a_s_if_iwmode_apwds"
-msgstr ""
-
-#. Client
-#: i18n/english/luasrc/i18n/admin-core.en.lua:65
-msgid "a_s_if_iwmode_sta"
+msgid "Master + WDS"
 msgstr ""
 
 #. Client + WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:66
-msgid "a_s_if_iwmode_stawds"
-msgstr ""
-
-#. WDS
-#: i18n/english/luasrc/i18n/admin-core.en.lua:67
-msgid "a_s_if_iwmode_wds"
+msgid "Client + WDS"
 msgstr ""
 
 #. SSID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:68
-msgid "a_s_if_iwssid"
+msgid "SSID"
 msgstr ""
 
 #. MAC
 #: i18n/english/luasrc/i18n/admin-core.en.lua:69
-msgid "a_s_if_mac"
-msgstr ""
-
-#. Pkts.
-#: i18n/english/luasrc/i18n/admin-core.en.lua:70
-msgid "a_s_if_pkts"
+msgid "MAC"
 msgstr ""
 
 #. Interface Status
 #: i18n/english/luasrc/i18n/admin-core.en.lua:71
-msgid "a_s_if_status"
+msgid "Interface Status"
 msgstr ""
 
 #. Transfer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:72
-msgid "a_s_if_transfer"
+msgid "Transfer"
 msgstr ""
 
 #. RX
 #: i18n/english/luasrc/i18n/admin-core.en.lua:73
-msgid "a_s_if_transfer_rx"
+msgid "RX"
 msgstr ""
 
 #. TX
 #: i18n/english/luasrc/i18n/admin-core.en.lua:74
-msgid "a_s_if_transfer_tx"
+msgid "TX"
 msgstr ""
 
 #. Type
 #: i18n/english/luasrc/i18n/admin-core.en.lua:75
-msgid "a_s_if_type"
+msgid "Type"
 msgstr ""
 
 #. VLAN
 #: i18n/english/luasrc/i18n/admin-core.en.lua:76
-msgid "a_s_if_vlan"
+msgid "VLAN"
 msgstr ""
 
 #. Ports
 #: i18n/english/luasrc/i18n/admin-core.en.lua:77
-msgid "a_s_if_vlanports"
+msgid "Ports"
 msgstr ""
 
 #. Wireless Adapter
 #: i18n/english/luasrc/i18n/admin-core.en.lua:78
-msgid "a_s_if_wifidev"
+msgid "Wireless Adapter"
 msgstr ""
 
 #. Firewall
 #: i18n/english/luasrc/i18n/admin-core.en.lua:79
-msgid "a_s_ipt"
+msgid "Firewall"
 msgstr ""
 
 #. Actions
 #: i18n/english/luasrc/i18n/admin-core.en.lua:80
-msgid "a_s_ipt_actions"
-msgstr ""
-
-#. Traffic
-#: i18n/english/luasrc/i18n/admin-core.en.lua:81
-msgid "a_s_ipt_bytes"
+msgid "Actions"
 msgstr ""
 
 #. Chain
 #: i18n/english/luasrc/i18n/admin-core.en.lua:82
-msgid "a_s_ipt_chain"
+msgid "Chain"
 msgstr ""
 
 #. Destination
 #: i18n/english/luasrc/i18n/admin-core.en.lua:83
-msgid "a_s_ipt_destination"
+msgid "Destination"
 msgstr ""
 
 #. Flags
 #: i18n/english/luasrc/i18n/admin-core.en.lua:84
-msgid "a_s_ipt_flags"
+msgid "Flags"
 msgstr ""
 
 #. In
 #: i18n/english/luasrc/i18n/admin-core.en.lua:85
-msgid "a_s_ipt_inputif"
+msgid "In"
 msgstr ""
 
 #. No chains in this table
 #: i18n/english/luasrc/i18n/admin-core.en.lua:86
-msgid "a_s_ipt_nochains"
+msgid "No chains in this table"
 msgstr ""
 
 #. No Rules in this chain
 #: i18n/english/luasrc/i18n/admin-core.en.lua:87
-msgid "a_s_ipt_norules"
+msgid "No Rules in this chain"
 msgstr ""
 
 #. Options
 #: i18n/english/luasrc/i18n/admin-core.en.lua:88
-msgid "a_s_ipt_options"
+msgid "Options"
 msgstr ""
 
 #. Out
 #: i18n/english/luasrc/i18n/admin-core.en.lua:89
-msgid "a_s_ipt_outputif"
+msgid "Out"
 msgstr ""
 
 #. Packets
 #: i18n/english/luasrc/i18n/admin-core.en.lua:90
-msgid "a_s_ipt_packets"
-msgstr ""
-
-#. Pkts.
-#: i18n/english/luasrc/i18n/admin-core.en.lua:91
-msgid "a_s_ipt_pkts"
+msgid "Packets"
 msgstr ""
 
 #. Policy
 #: i18n/english/luasrc/i18n/admin-core.en.lua:92
-msgid "a_s_ipt_policy"
+msgid "Policy"
 msgstr ""
 
 #. Prot.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:93
-msgid "a_s_ipt_prot"
+msgid "Prot."
 msgstr ""
 
 #. References
 #: i18n/english/luasrc/i18n/admin-core.en.lua:94
-msgid "a_s_ipt_references"
+msgid "References"
 msgstr ""
 
 #. Reset Counters
 #: i18n/english/luasrc/i18n/admin-core.en.lua:95
-msgid "a_s_ipt_reset"
+msgid "Reset Counters"
 msgstr ""
 
 #. Restart Firewall
 #: i18n/english/luasrc/i18n/admin-core.en.lua:96
-msgid "a_s_ipt_restart"
+msgid "Restart Firewall"
 msgstr ""
 
 #. #
 #: i18n/english/luasrc/i18n/admin-core.en.lua:97
-msgid "a_s_ipt_rulenum"
+msgid "#"
 msgstr ""
 
 #. Source
 #: i18n/english/luasrc/i18n/admin-core.en.lua:98
-msgid "a_s_ipt_source"
+msgid "Source"
 msgstr ""
 
 #. Firewall Status
 #: i18n/english/luasrc/i18n/admin-core.en.lua:99
-msgid "a_s_ipt_status"
+msgid "Firewall Status"
 msgstr ""
 
 #. Table
 #: i18n/english/luasrc/i18n/admin-core.en.lua:100
-msgid "a_s_ipt_table"
+msgid "Table"
 msgstr ""
 
 #. Target
 #: i18n/english/luasrc/i18n/admin-core.en.lua:101
-msgid "a_s_ipt_target"
+msgid "Target"
 msgstr ""
 
 #. (no interfaces attached)
 #: libs/cbi/luasrc/view/cbi/firewall_zonelist.htm
-msgid "a_s_ipt_zone_empty"
+msgid "(no interfaces attached)"
 msgstr ""
 
 #. unspecified -or- create:
 #: libs/cbi/luasrc/view/cbi/firewall_zonelist.htm
-msgid "a_s_ipt_zone_unspec_create"
+msgid "unspecified -or- create:"
 msgstr ""
 
 #. Perform Actions
 #: i18n/english/luasrc/i18n/admin-core.en.lua:102
-msgid "a_s_packages_do"
+msgid "Perform Actions"
 msgstr ""
 
 #. Install
 #: i18n/english/luasrc/i18n/admin-core.en.lua:103
-msgid "a_s_packages_install"
+msgid "Install"
 msgstr ""
 
 #. Download and install package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:104
-msgid "a_s_packages_installurl"
+msgid "Download and install package"
 msgstr ""
 
 #. Edit package lists and installation targets
 #: i18n/english/luasrc/i18n/admin-core.en.lua:105
-msgid "a_s_packages_ipkg"
+msgid "Edit package lists and installation targets"
 msgstr ""
 
 #. Package name
 #: i18n/english/luasrc/i18n/admin-core.en.lua:106
-msgid "a_s_packages_name"
+msgid "Package name"
 msgstr ""
 
 #. Remove
 #: i18n/english/luasrc/i18n/admin-core.en.lua:107
-msgid "a_s_packages_remove"
+msgid "Remove"
 msgstr ""
 
 #. Find package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:108
-msgid "a_s_packages_search"
+msgid "Find package"
 msgstr ""
 
 #. Package lists updated
 #: i18n/english/luasrc/i18n/admin-core.en.lua:109
-msgid "a_s_packages_update"
+msgid "Package lists updated"
 msgstr ""
 
 #. Update package lists
 #: i18n/english/luasrc/i18n/admin-core.en.lua:110
-msgid "a_s_packages_updatelist"
+msgid "Update package lists"
 msgstr ""
 
 #. Upgrade installed packages
 #: i18n/english/luasrc/i18n/admin-core.en.lua:111
-msgid "a_s_packages_upgrade"
+msgid "Upgrade installed packages"
 msgstr ""
 
 #. Could not set default destination
 #: i18n/english/luasrc/i18n/admin-core.en.lua:112
-msgid "a_s_packages_code1"
+msgid "Could not set default destination"
 msgstr ""
 
 #. Error parsing config file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:113
-msgid "a_s_packages_code2"
+msgid "Error parsing config file"
 msgstr ""
 
 #. Could not create temporary directory (ran out of space?)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:114
-msgid "a_s_packages_code3"
+msgid "Could not create temporary directory (ran out of space?)"
 msgstr ""
 
 #. Could not get adminstrative lock (ran out of space?)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:115
-msgid "a_s_packages_code4"
+msgid "Could not get adminstrative lock (ran out of space?)"
 msgstr ""
 
 #. Unsatisfied Dependencies
 #: i18n/english/luasrc/i18n/admin-core.en.lua:116
-msgid "a_s_packages_code5"
+msgid "Unsatisfied Dependencies"
 msgstr ""
 
 #. Refused to remove essential package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:117
-msgid "a_s_packages_code6"
+msgid "Refused to remove essential package"
 msgstr ""
 
 #. Package has dependents
 #: i18n/english/luasrc/i18n/admin-core.en.lua:118
-msgid "a_s_packages_code7"
+msgid "Package has dependents"
 msgstr ""
 
 #. Package has no installation candidate (wrong name?)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:119
-msgid "a_s_packages_code8"
+msgid "Package has no installation candidate (wrong name?)"
 msgstr ""
 
 #. Package has no available architecture 
 #: i18n/english/luasrc/i18n/admin-core.en.lua:120
-msgid "a_s_packages_code9"
+msgid "Package has no available architecture "
 msgstr ""
 
 #. Package is not trusted
 #: i18n/english/luasrc/i18n/admin-core.en.lua:121
-msgid "a_s_packages_code10"
+msgid "Package is not trusted"
 msgstr ""
 
 #. Error while downloading
 #: i18n/english/luasrc/i18n/admin-core.en.lua:122
-msgid "a_s_packages_code11"
+msgid "Error while downloading"
 msgstr ""
 
 #. Conflicts with other packages
 #: i18n/english/luasrc/i18n/admin-core.en.lua:123
-msgid "a_s_packages_code12"
+msgid "Conflicts with other packages"
 msgstr ""
 
 #. Package is already installed
 #: i18n/english/luasrc/i18n/admin-core.en.lua:124
-msgid "a_s_packages_code13"
+msgid "Package is already installed"
 msgstr ""
 
 #. Package has unresolved dependencies
 #: i18n/english/luasrc/i18n/admin-core.en.lua:125
-msgid "a_s_packages_code14"
+msgid "Package has unresolved dependencies"
 msgstr ""
 
 #. Refused to downgrade package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:126
-msgid "a_s_packages_code15"
+msgid "Refused to downgrade package"
 msgstr ""
 
 #. Package manager ran out of space
 #: i18n/english/luasrc/i18n/admin-core.en.lua:127
-msgid "a_s_packages_code16"
+msgid "Package manager ran out of space"
 msgstr ""
 
 #. Bad signature while verifiying package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:128
-msgid "a_s_packages_code17"
+msgid "Bad signature while verifiying package"
 msgstr ""
 
 #. MD5 error while verifiying package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:129
-msgid "a_s_packages_code18"
+msgid "MD5 error while verifiying package"
 msgstr ""
 
 #. Internal error occured
 #: i18n/english/luasrc/i18n/admin-core.en.lua:130
-msgid "a_s_packages_code19"
+msgid "Internal error occured"
 msgstr ""
 
 #. Package lists
 #: i18n/english/luasrc/i18n/admin-core.en.lua:131
-msgid "a_s_p_ipkg_pkglists"
+msgid "Package lists"
 msgstr ""
 
 #. Installation targets
 #: i18n/english/luasrc/i18n/admin-core.en.lua:132
-msgid "a_s_p_ipkg_targets"
+msgid "Installation targets"
 msgstr ""
 
 #. Change the password of the system administrator (User <code>root</code>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:133
-msgid "a_s_changepw1"
+msgid ""
+"Change the password of the system administrator (User <code>root</code>)"
 msgstr ""
 
 #. Password successfully changed
 #: i18n/english/luasrc/i18n/admin-core.en.lua:134
-msgid "a_s_changepw_changed"
+msgid "Password successfully changed"
 msgstr ""
 
 #. Error: Passwords do not match
 #: i18n/english/luasrc/i18n/admin-core.en.lua:135
-msgid "a_s_changepw_nomatch"
+msgid "Error: Passwords do not match"
 msgstr ""
 
 #. Here you can paste public <abbr title=\"Secure Shell\">SSH</abbr>-Keys (one per line) for <abbr title=\"Secure Shell\">SSH</abbr> public-key authentication.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:136
-msgid "a_s_sshkeys1"
-msgstr ""
-
-#. Mount Points
-#: i18n/english/luasrc/i18n/admin-core.en.lua:137
-msgid "a_s_fstab_mountpoints"
+msgid ""
+"Here you can paste public <abbr title=\"Secure Shell\">SSH</abbr>-Keys (one "
+"per line) for <abbr title=\"Secure Shell\">SSH</abbr> public-key "
+"authentication."
 msgstr ""
 
 #. Mount Points define at which point a memory device will be attached to the filesystem
 #: i18n/english/luasrc/i18n/admin-core.en.lua:138
-msgid "a_s_fstab_mountpoints1"
+msgid ""
+"Mount Points define at which point a memory device will be attached to the "
+"filesystem"
 msgstr ""
 
 #. Mounted file systems
 #: i18n/english/luasrc/i18n/admin-core.en.lua:139
-msgid "a_s_fstab_active"
+msgid "Mounted file systems"
 msgstr ""
 
 #. Used
 #: i18n/english/luasrc/i18n/admin-core.en.lua:140
-msgid "a_s_fstab_used"
+msgid "Used"
 msgstr ""
 
 #. Available
 #: i18n/english/luasrc/i18n/admin-core.en.lua:141
-msgid "a_s_fstab_avail"
+msgid "Available"
 msgstr ""
 
 #. Mount Point
 #: i18n/english/luasrc/i18n/admin-core.en.lua:142
-msgid "a_s_fstab_mountpoint"
+msgid "Mount Point"
 msgstr ""
 
 #. The device file of the memory or partition (<abbr title=\"for example\">e.g.</abbr> <code>/dev/sda1</code>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:143
-msgid "a_s_fstab_device1"
+msgid ""
+"The device file of the memory or partition (<abbr title=\"for example\">e.g."
+"</abbr> <code>/dev/sda1</code>)"
 msgstr ""
 
 #. The filesystem that was used to format the memory (<abbr title=\"for example\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></samp>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:144
-msgid "a_s_fstab_fs1"
+msgid ""
+"The filesystem that was used to format the memory (<abbr title=\"for example"
+"\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></"
+"samp>)"
 msgstr ""
 
 #. If your physical memory is insufficient unused data can be temporarily swapped to a swap-device resulting in a higher amount of usable <abbr title=\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very slow process as the swap-device cannot be accessed with the high datarates of the <abbr title=\"Random Access Memory\">RAM</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:145
-msgid "a_s_fstab_swap1"
+msgid ""
+"If your physical memory is insufficient unused data can be temporarily "
+"swapped to a swap-device resulting in a higher amount of usable <abbr title="
+"\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very "
+"slow process as the swap-device cannot be accessed with the high datarates "
+"of the <abbr title=\"Random Access Memory\">RAM</abbr>."
 msgstr ""
 
 #. Reboots the operating system of your device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:146
-msgid "a_s_reboot1"
+msgid "Reboots the operating system of your device"
 msgstr ""
 
 #. Perform reboot
 #: i18n/english/luasrc/i18n/admin-core.en.lua:147
-msgid "a_s_reboot_do"
+msgid "Perform reboot"
 msgstr ""
 
 #. Please wait: Device rebooting...
 #: i18n/english/luasrc/i18n/admin-core.en.lua:148
-msgid "a_s_reboot_running"
+msgid "Please wait: Device rebooting..."
 msgstr ""
 
 #. Warning: There are unsaved changes that will be lost while rebooting!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:149
-msgid "a_s_reboot_u"
+msgid "Warning: There are unsaved changes that will be lost while rebooting!"
 msgstr ""
 
 #. Changes applied.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:150
-msgid "a_s_applyreboot1"
+msgid "Changes applied."
 msgstr ""
 
 #. Backup / Restore
 #: i18n/english/luasrc/i18n/admin-core.en.lua:151
-msgid "a_s_backup"
+msgid "Backup / Restore"
 msgstr ""
 
 #. Create backup
 #: i18n/english/luasrc/i18n/admin-core.en.lua:152
-msgid "a_s_backup_backup"
+msgid "Create backup"
 msgstr ""
 
 #. Backup Archive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:153
-msgid "a_s_backup_archive"
+msgid "Backup Archive"
 msgstr ""
 
 #. Reset router to defaults
 #: i18n/english/luasrc/i18n/admin-core.en.lua:154
-msgid "a_s_backup_reset"
+msgid "Reset router to defaults"
 msgstr ""
 
 #. Proceed reverting all settings and resetting to firmware defaults?
 #: i18n/english/luasrc/i18n/admin-core.en.lua:155
-msgid "a_s_backup_reset1"
+msgid "Proceed reverting all settings and resetting to firmware defaults?"
 msgstr ""
 
 #. Restore backup
 #: i18n/english/luasrc/i18n/admin-core.en.lua:156
-msgid "a_s_backup_restore"
+msgid "Restore backup"
 msgstr ""
 
 #. Here you can backup and restore your router configuration and - if possible - reset the router to the default settings.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:157
-msgid "a_s_backup1"
+msgid ""
+"Here you can backup and restore your router configuration and - if possible "
+"- reset the router to the default settings."
 msgstr ""
 
 #. <abbr title=\"Hypertext Transfer Protocol\">HTTP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:158
-msgid "a_srv_http"
+msgid "<abbr title=\"Hypertext Transfer Protocol\">HTTP</abbr>-Server"
 msgstr ""
 
 #. <abbr title=\"Secure Shell\">SSH</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:159
-msgid "a_srv_ssh"
+msgid "<abbr title=\"Secure Shell\">SSH</abbr>-Server"
 msgstr ""
 
 #. Services and daemons perform certain tasks on your device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:160
-msgid "a_srv_services1"
+msgid "Services and daemons perform certain tasks on your device."
 msgstr ""
 
 #. Most of them are network servers, that offer a certain service for your device or network like shell access, serving webpages like <abbr title=\"Lua Configuration Interface\">LuCI</abbr>, doing mesh routing, sending e-mails, ...
 #: i18n/english/luasrc/i18n/admin-core.en.lua:161
-msgid "a_srv_services2"
+msgid ""
+"Most of them are network servers, that offer a certain service for your "
+"device or network like shell access, serving webpages like <abbr title=\"Lua "
+"Configuration Interface\">LuCI</abbr>, doing mesh routing, sending e-"
+"mails, ..."
 msgstr ""
 
 #. A small webserver which can be used to serve <abbr title=\"Lua Configuration Interface\">LuCI</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:162
-msgid "a_srv_http1"
+msgid ""
+"A small webserver which can be used to serve <abbr title=\"Lua Configuration "
+"Interface\">LuCI</abbr>."
 msgstr ""
 
 #. Authentication Realm
 #: i18n/english/luasrc/i18n/admin-core.en.lua:163
-msgid "a_srv_http_authrealm"
+msgid "Authentication Realm"
 msgstr ""
 
 #. The realm which will be displayed at the authentication prompt for protected pages.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:164
-msgid "a_srv_http_authrealm1"
+msgid ""
+"The realm which will be displayed at the authentication prompt for protected "
+"pages."
 msgstr ""
 
 #. defaults to <code>/etc/httpd.conf</code>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:165
-msgid "a_srv_http_config1"
+msgid "defaults to <code>/etc/httpd.conf</code>"
 msgstr ""
 
 #. Document root
 #: i18n/english/luasrc/i18n/admin-core.en.lua:166
-msgid "a_srv_http_root"
+msgid "Document root"
 msgstr ""
 
 #. Enable Keep-Alive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:167
-msgid "a_srv_http_keepalive"
+msgid "Enable Keep-Alive"
 msgstr ""
 
 #. Connection timeout
 #: i18n/english/luasrc/i18n/admin-core.en.lua:168
-msgid "a_srv_http_timeout"
+msgid "Connection timeout"
 msgstr ""
 
 #. Plugin path
 #: i18n/english/luasrc/i18n/admin-core.en.lua:169
-msgid "a_srv_http_path"
+msgid "Plugin path"
 msgstr ""
 
 #. A lightweight HTTP/1.1 webserver written in C and Lua designed to serve LuCI
 #: i18n/english/luasrc/i18n/admin-core.en.lua:170
-msgid "a_srv_lucittpd"
+msgid ""
+"A lightweight HTTP/1.1 webserver written in C and Lua designed to serve LuCI"
 msgstr ""
 
 #. Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:171
-msgid "a_srv_dropbear1"
+msgid ""
+"Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access "
+"and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
 msgstr ""
 
 #. Password authentication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:172
-msgid "a_srv_d_pwauth"
+msgid "Password authentication"
 msgstr ""
 
 #. Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:173
-msgid "a_srv_d_pwauth1"
-msgstr ""
-
-#. Channel
-#: i18n/english/luasrc/i18n/admin-core.en.lua:174
-msgid "a_w_channel"
+msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
 msgstr ""
 
 #. On this pages you can find configuration options for <abbr title=\"Wireless Local Area Network\">WLAN</abbr> based wireless networks.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:175
-msgid "a_w_wifi1"
+msgid ""
+"On this pages you can find configuration options for <abbr title=\"Wireless "
+"Local Area Network\">WLAN</abbr> based wireless networks."
 msgstr ""
 
 #. You can easily integrate your 802.11a/b/g/n-devices into your physical network and use the virtual adapter support to build wireless repeaters or offer several networks with one device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:176
-msgid "a_w_wifi2"
+msgid ""
+"You can easily integrate your 802.11a/b/g/n-devices into your physical "
+"network and use the virtual adapter support to build wireless repeaters or "
+"offer several networks with one device."
 msgstr ""
 
 #. There is support for Managed, Client, Ad-Hoc and <abbr title=\"Wireless Distribution System\">WDS</abbr> operating modes as well as <abbr title=\"Wi-Fi Protected Access\">WPA</abbr> and <abbr title=\"Wi-Fi Protected Access 2\">WPA2</abbr> encryption for secure communnication.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:177
-msgid "a_w_wifi3"
+msgid ""
+"There is support for Managed, Client, Ad-Hoc and <abbr title=\"Wireless "
+"Distribution System\">WDS</abbr> operating modes as well as <abbr title=\"Wi-"
+"Fi Protected Access\">WPA</abbr> and <abbr title=\"Wi-Fi Protected Access 2"
+"\">WPA2</abbr> encryption for secure communnication."
 msgstr ""
 
 #. Here you can configure installed wifi devices.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:178
-msgid "a_w_devices1"
+msgid "Here you can configure installed wifi devices."
 msgstr ""
 
 #. Transmit Antenna
 #: i18n/english/luasrc/i18n/admin-core.en.lua:179
-msgid "a_w_txantenna"
+msgid "Transmit Antenna"
 msgstr ""
 
 #. Receive Antenna
 #: i18n/english/luasrc/i18n/admin-core.en.lua:180
-msgid "a_w_rxantenna"
+msgid "Receive Antenna"
 msgstr ""
 
 #. Distance to furthest station (in meter)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:181
-msgid "a_w_distance1"
+msgid "Distance to furthest station (in meter)"
 msgstr ""
 
 #. Diversity
 #: i18n/english/luasrc/i18n/admin-core.en.lua:182
-msgid "a_w_diversity"
+msgid "Diversity"
 msgstr ""
 
 #. Country Code
 #: i18n/english/luasrc/i18n/admin-core.en.lua:183
-msgid "a_w_countrycode"
+msgid "Country Code"
 msgstr ""
 
 #. Connection Limit
 #: i18n/english/luasrc/i18n/admin-core.en.lua:184
-msgid "a_w_connlimit"
+msgid "Connection Limit"
 msgstr ""
 
 #. You can run several wifi networks with one device. Be aware that there are certain hardware and driverspecific restrictions. Normally you can operate 1 Ad-Hoc or up to 3 Master-Mode and 1 Client-Mode network simultaneously.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:185
-msgid "a_w_networks1"
+msgid ""
+"You can run several wifi networks with one device. Be aware that there are "
+"certain hardware and driverspecific restrictions. Normally you can operate 1 "
+"Ad-Hoc or up to 3 Master-Mode and 1 Client-Mode network simultaneously."
 msgstr ""
 
 #. Network Name (<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:186
-msgid "a_w_netid"
+msgid ""
+"Network Name (<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>)"
 msgstr ""
 
 #. Add the Wifi network to physical network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:187
-msgid "a_w_network1"
+msgid "Add the Wifi network to physical network"
 msgstr ""
 
 #.  - Create new Network - 
 #: i18n/english/luasrc/i18n/admin-core.en.lua:188
-msgid "a_w_netmanual"
+msgid " - Create new Network - "
 msgstr ""
 
 #. Transmit Power
 #: i18n/english/luasrc/i18n/admin-core.en.lua:189
-msgid "a_w_txpwr"
+msgid "Transmit Power"
 msgstr ""
 
 #. Broadcom Frameburst
 #: i18n/english/luasrc/i18n/admin-core.en.lua:190
-msgid "a_w_brcmburst"
+msgid "Broadcom Frameburst"
 msgstr ""
 
 #. Atheros Frameburst
 #: i18n/english/luasrc/i18n/admin-core.en.lua:191
-msgid "a_w_athburst"
+msgid "Atheros Frameburst"
 msgstr ""
 
 #. RadiusServer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:192
-msgid "a_w_radiussrv"
+msgid "RadiusServer"
 msgstr ""
 
 #. Radius-Port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:193
-msgid "a_w_radiusport"
+msgid "Radius-Port"
 msgstr ""
 
 #. AP-Isolation
 #: i18n/english/luasrc/i18n/admin-core.en.lua:194
-msgid "a_w_apisolation"
+msgid "AP-Isolation"
 msgstr ""
 
 #. Prevents Client to Client communication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:195
-msgid "a_w_apisolation1"
+msgid "Prevents Client to Client communication"
 msgstr ""
 
 #. Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:196
-msgid "a_w_hideessid"
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 
 #. Access Point
 #: i18n/english/luasrc/i18n/admin-core.en.lua:197
-msgid "a_w_ap"
-msgstr ""
-
-#. Ad-Hoc
-#: i18n/english/luasrc/i18n/admin-core.en.lua:198
-msgid "a_w_adhoc"
+msgid "Access Point"
 msgstr ""
 
 #. Pseudo Ad-Hoc (ahdemo)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:199
-msgid "a_w_ahdemo"
-msgstr ""
-
-#. Client
-#: i18n/english/luasrc/i18n/admin-core.en.lua:200
-msgid "a_w_client"
-msgstr ""
-
-#. WDS
-#: i18n/english/luasrc/i18n/admin-core.en.lua:201
-msgid "a_w_wds"
+msgid "Pseudo Ad-Hoc (ahdemo)"
 msgstr ""
 
 #. Monitor
 #: i18n/english/luasrc/i18n/admin-core.en.lua:202
-msgid "a_w_monitor"
+msgid "Monitor"
 msgstr ""
 
 #. Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> firewalls
 #: i18n/english/luasrc/i18n/admin-core.en.lua:203
-msgid "dhcp_dnsmasq_desc"
+msgid ""
+"Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol"
+"\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-"
+"Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> "
+"firewalls"
 msgstr ""
 
 #. Domain required
 #: i18n/english/luasrc/i18n/admin-core.en.lua:204
-msgid "dhcp_dnsmasq_domainneeded"
+msgid "Domain required"
 msgstr ""
 
 #. Don&#39;t forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without <abbr title=\"Domain Name System\">DNS</abbr>-Name
 #: i18n/english/luasrc/i18n/admin-core.en.lua:205
-msgid "dhcp_dnsmasq_domainneeded_desc"
+msgid ""
+"Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without "
+"<abbr title=\"Domain Name System\">DNS</abbr>-Name"
 msgstr ""
 
 #. Authoritative
 #: i18n/english/luasrc/i18n/admin-core.en.lua:206
-msgid "dhcp_dnsmasq_authoritative"
+msgid "Authoritative"
 msgstr ""
 
 #. This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> in the local network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:207
-msgid "dhcp_dnsmasq_authoritative_desc"
+msgid ""
+"This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr> in the local network"
 msgstr ""
 
 #. Filter private
 #: i18n/english/luasrc/i18n/admin-core.en.lua:208
-msgid "dhcp_dnsmasq_boguspriv"
+msgid "Filter private"
 msgstr ""
 
 #. Don&#39;t forward reverse lookups for local networks
 #: i18n/english/luasrc/i18n/admin-core.en.lua:209
-msgid "dhcp_dnsmasq_boguspriv_desc"
+msgid "Don't forward reverse lookups for local networks"
 msgstr ""
 
 #. Filter useless
 #: i18n/english/luasrc/i18n/admin-core.en.lua:210
-msgid "dhcp_dnsmasq_filterwin2k"
+msgid "Filter useless"
 msgstr ""
 
 #. filter useless <abbr title=\"Domain Name System\">DNS</abbr>-queries of Windows-systems
 #: i18n/english/luasrc/i18n/admin-core.en.lua:211
-msgid "dhcp_dnsmasq_filterwin2k_desc"
+msgid ""
+"filter useless <abbr title=\"Domain Name System\">DNS</abbr>-queries of "
+"Windows-systems"
 msgstr ""
 
 #. Localise queries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:212
-msgid "dhcp_dnsmasq_localisequeries"
+msgid "Localise queries"
 msgstr ""
 
 #. localises the hostname depending on its subnet
 #: i18n/english/luasrc/i18n/admin-core.en.lua:213
-msgid "dhcp_dnsmasq_localisequeries_desc"
+msgid "localises the hostname depending on its subnet"
 msgstr ""
 
 #. Local Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:214
-msgid "dhcp_dnsmasq_local"
+msgid "Local Server"
 msgstr ""
 
 #. Local Domain
 #: i18n/english/luasrc/i18n/admin-core.en.lua:215
-msgid "dhcp_dnsmasq_domain"
+msgid "Local Domain"
 msgstr ""
 
 #. Expand Hosts
 #: i18n/english/luasrc/i18n/admin-core.en.lua:216
-msgid "dhcp_dnsmasq_expandhosts"
+msgid "Expand Hosts"
 msgstr ""
 
 #. adds domain names to hostentries in the resolv file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:217
-msgid "dhcp_dnsmasq_expandhosts_desc"
+msgid "adds domain names to hostentries in the resolv file"
 msgstr ""
 
 #. don&#39;t cache unknown
 #: i18n/english/luasrc/i18n/admin-core.en.lua:218
-msgid "dhcp_dnsmasq_nonegcache"
+msgid "don't cache unknown"
 msgstr ""
 
 #. prevents caching of negative <abbr title=\"Domain Name System\">DNS</abbr>-replies
 #: i18n/english/luasrc/i18n/admin-core.en.lua:219
-msgid "dhcp_dnsmasq_nonegcache_desc"
+msgid ""
+"prevents caching of negative <abbr title=\"Domain Name System\">DNS</abbr>-"
+"replies"
 msgstr ""
 
 #. Use <code>/etc/ethers</code>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:220
-msgid "dhcp_dnsmasq_readethers"
+msgid "Use <code>/etc/ethers</code>"
 msgstr ""
 
 #. Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:221
-msgid "dhcp_dnsmasq_readethers_desc"
+msgid ""
+"Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host "
+"Configuration Protocol\">DHCP</abbr>-Server"
 msgstr ""
 
 #. Leasefile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:222
-msgid "dhcp_dnsmasq_leasefile"
+msgid "Leasefile"
 msgstr ""
 
 #. file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-leases will be stored
 #: i18n/english/luasrc/i18n/admin-core.en.lua:223
-msgid "dhcp_dnsmasq_leasefile_desc"
+msgid ""
+"file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr>-leases will be stored"
 msgstr ""
 
 #. Resolvfile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:224
-msgid "dhcp_dnsmasq_resolvfile"
+msgid "Resolvfile"
 msgstr ""
 
 #. local <abbr title=\"Domain Name System\">DNS</abbr> file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:225
-msgid "dhcp_dnsmasq_resolvfile_desc"
+msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr ""
 
 #. Ignore <code>/etc/hosts</code>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:226
-msgid "dhcp_dnsmasq_nohosts"
+msgid "Ignore <code>/etc/hosts</code>"
 msgstr ""
 
 #. Strict order
 #: i18n/english/luasrc/i18n/admin-core.en.lua:227
-msgid "dhcp_dnsmasq_strictorder"
+msgid "Strict order"
 msgstr ""
 
 #. <abbr title=\"Domain Name System\">DNS</abbr>-Server will be queried in the order of the resolvfile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:228
-msgid "dhcp_dnsmasq_strictorder_desc"
+msgid ""
+"<abbr title=\"Domain Name System\">DNS</abbr>-Server will be queried in the "
+"order of the resolvfile"
 msgstr ""
 
 #. Log queries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:229
-msgid "dhcp_dnsmasq_logqueries"
+msgid "Log queries"
 msgstr ""
 
 #. Ignore resolve file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:230
-msgid "dhcp_dnsmasq_noresolv"
+msgid "Ignore resolve file"
 msgstr ""
 
 #. concurrent queries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:231
-msgid "dhcp_dnsmasq_dnsforwardmax"
+msgid "concurrent queries"
 msgstr ""
 
 #. <abbr title=\"Domain Name System\">DNS</abbr>-Port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:232
-msgid "dhcp_dnsmasq_port"
+msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Port"
 msgstr ""
 
 #. <abbr title=\"maximal\">max.</abbr> <abbr title=\"Extension Mechanisms for Domain Name System\">EDNS0</abbr> paket size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:233
-msgid "dhcp_dnsmasq_ednspacket_max"
+msgid ""
+"<abbr title=\"maximal\">max.</abbr> <abbr title=\"Extension Mechanisms for "
+"Domain Name System\">EDNS0</abbr> paket size"
 msgstr ""
 
 #. <abbr title=\"maximal\">max.</abbr> <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:234
-msgid "dhcp_dnsmasq_dhcpleasemax"
+msgid ""
+"<abbr title=\"maximal\">max.</abbr> <abbr title=\"Dynamic Host Configuration "
+"Protocol\">DHCP</abbr>-Leases"
 msgstr ""
 
 #. additional hostfile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:235
-msgid "dhcp_dnsmasq_addnhosts"
+msgid "additional hostfile"
 msgstr ""
 
 #. query port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:236
-msgid "dhcp_dnsmasq_queryport"
+msgid "query port"
 msgstr ""
 
 #. Enable TFTP-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:237
-msgid "dhcp_dnsmasq_enabletftp"
+msgid "Enable TFTP-Server"
 msgstr ""
 
 #. TFTP-Server Root
 #: i18n/english/luasrc/i18n/admin-core.en.lua:238
-msgid "dhcp_dnsmasq_tftproot"
+msgid "TFTP-Server Root"
 msgstr ""
 
 #. Network Boot Image
 #: i18n/english/luasrc/i18n/admin-core.en.lua:239
-msgid "dhcp_dnsmasq_dhcpboot"
+msgid "Network Boot Image"
 msgstr ""
 
 #. Switch
 #: i18n/english/luasrc/i18n/admin-core.en.lua:240
-msgid "a_n_switch"
+msgid "Switch"
 msgstr ""
 
 #. Active Connections
 #: i18n/english/luasrc/i18n/admin-core.en.lua:241
-msgid "a_n_conntrack"
+msgid "Active Connections"
 msgstr ""
 
 #. This page gives an overview over currently active network connections.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:242
-msgid "a_n_conntrack_desc"
-msgstr ""
-
-#. Routes
-#: i18n/english/luasrc/i18n/admin-core.en.lua:243
-msgid "a_n_routes"
+msgid "This page gives an overview over currently active network connections."
 msgstr ""
 
 #. IPv4 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:244
-msgid "a_n_routes4"
+msgid "IPv4 Routes"
 msgstr ""
 
 #. IPv6 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:245
-msgid "a_n_routes6"
+msgid "IPv6 Routes"
 msgstr ""
 
 #. In this area you find all network-related settings.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:246
-msgid "a_network1"
+msgid "In this area you find all network-related settings."
 msgstr ""
 
 #. On most routers the network switch can be freely configured and splitted up into several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:247
-msgid "a_network2"
+msgid ""
+"On most routers the network switch can be freely configured and splitted up "
+"into several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s."
 msgstr ""
 
 #. Interfaces and <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> / <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Settings allow a custom organisation of the network and connections to other networks like the internet.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:248
-msgid "a_network3"
+msgid ""
+"Interfaces and <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</"
+"abbr> / <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-"
+"Settings allow a custom organisation of the network and connections to other "
+"networks like the internet."
 msgstr ""
 
 #. With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> devices in your local network can be automatically configured for network communication.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:249
-msgid "a_network4"
+msgid ""
+"With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> devices "
+"in your local network can be automatically configured for network "
+"communication."
 msgstr ""
 
 #. Firewall and portforwarding can be used to secure your network while providing services to external networks.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:250
-msgid "a_network5"
+msgid ""
+"Firewall and portforwarding can be used to secure your network while "
+"providing services to external networks."
 msgstr ""
 
 #. The network ports on your router can be combined to several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s in which computers can communicate directly with each other. <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s are often used to separate different network segments. Often there is by default one Uplink port for a connection to the next greater network like the internet and other ports for a local network.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:251
-msgid "a_n_switch1"
+msgid ""
+"The network ports on your router can be combined to several <abbr title="
+"\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
+"communicate directly with each other. <abbr title=\"Virtual Local Area "
+"Network\">VLAN</abbr>s are often used to separate different network "
+"segments. Often there is by default one Uplink port for a connection to the "
+"next greater network like the internet and other ports for a local network."
 msgstr ""
 
 #. Ports belonging to a <abbr title=\"Virtual Local Area Network\">VLAN</abbr> are separated with spaces. The port with the highest number (usually 5) is oftern the connection to the internal network interface of the router. On devices with 5 ports often the one with the lowest number (0) is the predefined Uplink port.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:252
-msgid "network_switch_desc"
+msgid ""
+"Ports belonging to a <abbr title=\"Virtual Local Area Network\">VLAN</abbr> "
+"are separated with spaces. The port with the highest number (usually 5) is "
+"oftern the connection to the internal network interface of the router. On "
+"devices with 5 ports often the one with the lowest number (0) is the "
+"predefined Uplink port."
 msgstr ""
 
 #. On this page you can configure the network interfaces. You can bridge several interfaces by ticking the &quot;bridge interfaces&quot; field and enter the names of several network interfaces separated by spaces. You can also use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation <samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: <samp>eth0.1</samp>).
 #: i18n/english/luasrc/i18n/admin-core.en.lua:253
-msgid "a_n_ifaces1"
+msgid ""
+"On this page you can configure the network interfaces. You can bridge "
+"several interfaces by ticking the \"bridge interfaces\" field and enter the "
+"names of several network interfaces separated by spaces. You can also use "
+"<abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation "
+"<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
+"<samp>eth0.1</samp>)."
 msgstr ""
 
 #. Bridge interfaces
 #: i18n/english/luasrc/i18n/admin-core.en.lua:254
-msgid "a_n_i_bridge"
+msgid "Bridge interfaces"
 msgstr ""
 
 #. creates a bridge over specified interface(s)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:255
-msgid "a_n_i_bridge1"
+msgid "creates a bridge over specified interface(s)"
 msgstr ""
 
 #. Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>
-msgid "a_n_i_stp"
+msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 msgstr ""
 
 #. Enables the Spanning Tree Protocol on this bridge
-msgid "a_n_i_stp1"
+msgid "Enables the Spanning Tree Protocol on this bridge"
 msgstr ""
 
 #. With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> network members can automatically receive their network settings (<abbr title=\"Internet Protocol\">IP</abbr>-address, netmask, <abbr title=\"Domain Name System\">DNS</abbr>-server, ...).
 #: i18n/english/luasrc/i18n/admin-core.en.lua:256
-msgid "dhcp_desc"
+msgid ""
+"With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> network "
+"members can automatically receive their network settings (<abbr title="
+"\"Internet Protocol\">IP</abbr>-address, netmask, <abbr title=\"Domain Name "
+"System\">DNS</abbr>-server, ...)."
 msgstr ""
 
 #. Leasetime
 #: i18n/english/luasrc/i18n/admin-core.en.lua:257
-msgid "dhcp_dhcp_leasetime"
+msgid "Leasetime"
 msgstr ""
 
 #. Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:258
-msgid "dhcp_dhcp_dynamicdhcp"
+msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 msgstr ""
 
 #. Ignore interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:259
-msgid "dhcp_dhcp_ignore"
+msgid "Ignore interface"
 msgstr ""
 
 #. disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for this interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:260
-msgid "dhcp_dhcp_ignore_desc"
+msgid ""
+"disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
+"this interface"
 msgstr ""
 
 #. Force
 #: i18n/english/luasrc/i18n/admin-core.en.lua:261
-msgid "dhcp_dhcp_force"
+msgid "Force"
 msgstr ""
 
 #. first address (last octet)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:262
-msgid "dhcp_dhcp_start_desc"
+msgid "first address (last octet)"
 msgstr ""
 
 #. number of leased addresses -1
 #: i18n/english/luasrc/i18n/admin-core.en.lua:263
-msgid "dhcp_dhcp_limit_desc"
+msgid "number of leased addresses -1"
 msgstr ""
 
 #. DHCP-Options
 #: i18n/english/luasrc/i18n/admin-core.en.lua:264
-msgid "dhcp_dhcp_dhcpoption"
+msgid "DHCP-Options"
 msgstr ""
 
 #. See &quot;dnsmasq --help dhcp&quot; for a list of available options.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:265
-msgid "dhcp_dhcp_dhcpoption_desc"
+msgid "See \"dnsmasq --help dhcp\" for a list of available options."
 msgstr ""
 
 #. Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:266
-msgid "dhcp_leases"
+msgid "Leases"
 msgstr ""
 
 #. Static Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:267
-msgid "luci_ethers"
+msgid "Static Leases"
 msgstr ""
 
 #. Leasetime remaining
 #: i18n/english/luasrc/i18n/admin-core.en.lua:268
-msgid "dhcp_timeremain"
+msgid "Leasetime remaining"
 msgstr ""
 
 #. Active Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:269
-msgid "dhcp_leases_active"
+msgid "Active Leases"
 msgstr ""
 
 #. Point-to-Point Connections
 #: i18n/english/luasrc/i18n/admin-core.en.lua:270
-msgid "a_n_ptp"
+msgid "Point-to-Point Connections"
 msgstr ""
 
 #. Point-to-Point connections with <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> or <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr> are often used to connect a device over <abbr title=\"Digital Subscriber Line\">DSL</abbr> or similar technologies to an internet access point.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:271
-msgid "a_n_ptp1"
+msgid ""
+"Point-to-Point connections with <abbr title=\"Point-to-Point Protocol over "
+"Ethernet\">PPPoE</abbr> or <abbr title=\"Point-to-Point Tunneling Protocol"
+"\">PPTP</abbr> are often used to connect a device over <abbr title=\"Digital "
+"Subscriber Line\">DSL</abbr> or similar technologies to an internet access "
+"point."
 msgstr ""
 
 #. You need to install &quot;comgt&quot; for UMTS/GPRS, &quot;ppp-mod-pppoe&quot; for PPPoE, &quot;ppp-mod-pppoa&quot; for PPPoA or &quot;pptp&quot; for PPtP support
 #: i18n/english/luasrc/i18n/admin-core.en.lua:272
-msgid "network_interface_prereq"
+msgid ""
+"You need to install \"comgt\" for UMTS/GPRS, \"ppp-mod-pppoe\" for PPPoE, "
+"\"ppp-mod-pppoa\" for PPPoA or \"pptp\" for PPtP support"
 msgstr ""
 
 #. You need to install &quot;ppp-mod-pppoe&quot; for PPPoE or &quot;pptp&quot; for PPtP support
 #: i18n/english/luasrc/i18n/admin-core.en.lua:273
-msgid "network_interface_prereq_mini"
-msgstr ""
-
-#. <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server
-#: i18n/english/luasrc/i18n/admin-core.en.lua:274
-msgid "network_interface_server"
+msgid ""
+"You need to install \"ppp-mod-pppoe\" for PPPoE or \"pptp\" for PPtP support"
 msgstr ""
 
 #. Automatic Disconnect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:275
-msgid "network_interface_demand"
+msgid "Automatic Disconnect"
 msgstr ""
 
 #. Time (in seconds) after which an unused connection will be closed
 #: i18n/english/luasrc/i18n/admin-core.en.lua:276
-msgid "network_interface_demand_desc"
+msgid "Time (in seconds) after which an unused connection will be closed"
 msgstr ""
 
 #. Keep-Alive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:277
-msgid "network_interface_keepalive"
+msgid "Keep-Alive"
 msgstr ""
 
 #. Number of failed connection tests to initiate automatic reconnect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:278
-msgid "network_interface_keepalive_desc"
+msgid "Number of failed connection tests to initiate automatic reconnect"
 msgstr ""
 
 #. Modem device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:279
-msgid "network_interface_device"
+msgid "Modem device"
 msgstr ""
 
 #. The device node of your modem, e.g. /dev/ttyUSB0
 #: i18n/english/luasrc/i18n/admin-core.en.lua:280
-msgid "network_interface_device_desc"
+msgid "The device node of your modem, e.g. /dev/ttyUSB0"
 msgstr ""
 
 #. Replace default route
 #: i18n/english/luasrc/i18n/admin-core.en.lua:281
-msgid "network_interface_defaultroute"
+msgid "Replace default route"
 msgstr ""
 
 #. Let pppd replace the current default route to use the PPP interface after successful connect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:282
-msgid "network_interface_defaultroute_desc"
+msgid ""
+"Let pppd replace the current default route to use the PPP interface after "
+"successful connect"
 msgstr ""
 
 #. Use peer DNS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:283
-msgid "network_interface_peerdns"
+msgid "Use peer DNS"
 msgstr ""
 
 #. Configure the local DNS server to use the name servers adverticed by the PPP peer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:284
-msgid "network_interface_peerdns_desc"
+msgid ""
+"Configure the local DNS server to use the name servers adverticed by the PPP "
+"peer"
 msgstr ""
 
 #. Enable IPv6 on PPP link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:285
-msgid "network_interface_ipv6"
+msgid "Enable IPv6 on PPP link"
 msgstr ""
 
 #. Connect script
 #: i18n/english/luasrc/i18n/admin-core.en.lua:286
-msgid "network_interface_connect"
+msgid "Connect script"
 msgstr ""
 
 #. Let pppd run this script after establishing the PPP link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:287
-msgid "network_interface_connect_desc"
+msgid "Let pppd run this script after establishing the PPP link"
 msgstr ""
 
 #. Disconnect script
 #: i18n/english/luasrc/i18n/admin-core.en.lua:288
-msgid "network_interface_disconnect"
+msgid "Disconnect script"
 msgstr ""
 
 #. Let pppd run this script before tearing down the PPP link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:289
-msgid "network_interface_disconnect_desc"
+msgid "Let pppd run this script before tearing down the PPP link"
 msgstr ""
 
 #. Additional pppd options
 #: i18n/english/luasrc/i18n/admin-core.en.lua:290
-msgid "network_interface_pppd_options"
+msgid "Additional pppd options"
 msgstr ""
 
 #. Specify additional command line arguments for pppd here
 #: i18n/english/luasrc/i18n/admin-core.en.lua:291
-msgid "network_interface_pppd_options_desc"
+msgid "Specify additional command line arguments for pppd here"
 msgstr ""
 
 #. Access point (APN)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:292
-msgid "network_interface_apn"
+msgid "Access point (APN)"
 msgstr ""
 
 #. PIN code
 #: i18n/english/luasrc/i18n/admin-core.en.lua:293
-msgid "network_interface_pincode"
+msgid "PIN code"
 msgstr ""
 
 #. Make sure that you provide the correct pin code here or you might lock your sim card!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:294
-msgid "network_interface_pincode_desc"
+msgid ""
+"Make sure that you provide the correct pin code here or you might lock your "
+"sim card!"
 msgstr ""
 
 #. Service type
 #: i18n/english/luasrc/i18n/admin-core.en.lua:295
-msgid "network_interface_service"
+msgid "Service type"
 msgstr ""
 
 #. Setup wait time
 #: i18n/english/luasrc/i18n/admin-core.en.lua:296
-msgid "network_interface_maxwait"
+msgid "Setup wait time"
 msgstr ""
 
 #. Seconds to wait for the modem to become ready before attempting to connect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:297
-msgid "network_interface_maxwait_desc"
+msgid ""
+"Seconds to wait for the modem to become ready before attempting to connect"
 msgstr ""
 
 #. PPPoA Encapsulation
 #: i18n/english/luasrc/i18n/admin-core.en.lua:298
-msgid "network_interface_encaps"
+msgid "PPPoA Encapsulation"
 msgstr ""
 
 #. Routes specify over which interface and gateway a certain host or network can be reached.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:299
-msgid "a_n_r_routes1"
+msgid ""
+"Routes specify over which interface and gateway a certain host or network "
+"can be reached."
 msgstr ""
 
 #. Static Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:300
-msgid "a_n_routes_static"
+msgid "Static Routes"
 msgstr ""
 
 #. Static IPv4 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:301
-msgid "a_n_routes_static4"
+msgid "Static IPv4 Routes"
 msgstr ""
 
 #. Static IPv6 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:302
-msgid "a_n_routes_static6"
+msgid "Static IPv6 Routes"
 msgstr ""
 
 #. Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:303
-msgid "a_n_routes_kernel4"
+msgid "Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes"
 msgstr ""
 
 #. Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:304
-msgid "a_n_routes_kernel6"
+msgid "Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes"
 msgstr ""
 
 #. Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:305
-msgid "a_n_r_target1"
+msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
 msgstr ""
 
 #. <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network (CIDR)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:306
-msgid "a_n_r_target6"
+msgid ""
+"<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network "
+"(CIDR)"
 msgstr ""
 
 #. if target is a network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:307
-msgid "a_n_r_netmask1"
+msgid "if target is a network"
 msgstr ""
 
 #. Internet Connection
 #: i18n/english/luasrc/i18n/admin-core.en.lua:308
-msgid "m_n_inet"
+msgid "Internet Connection"
 msgstr ""
 
 #. Local Network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:309
-msgid "m_n_local"
+msgid "Local Network"
 msgstr ""
 
 #. Route
 #: i18n/english/luasrc/i18n/admin-core.en.lua:310
-msgid "m_n_route"
-msgstr ""
-
-#. Bridge
-#: i18n/english/luasrc/i18n/admin-core.en.lua:311
-msgid "m_n_brdige"
+msgid "Route"
 msgstr ""
 
 #. Provide (Access Point)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:312
-msgid "m_w_ap"
+msgid "Provide (Access Point)"
 msgstr ""
 
 #. Independent (Ad-Hoc)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:313
-msgid "m_w_adhoc"
+msgid "Independent (Ad-Hoc)"
 msgstr ""
 
 #. Join (Client)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:314
-msgid "m_w_client"
+msgid "Join (Client)"
 msgstr ""
 
 #. Distributed (<abbr title=\"Wireless Distribution System\">WDS</abbr>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:315
-msgid "m_w_wds"
+msgid "Distributed (<abbr title=\"Wireless Distribution System\">WDS</abbr>)"
 msgstr ""
 
 #. Clientmode
 #: i18n/english/luasrc/i18n/admin-core.en.lua:316
-msgid "m_w_clientmode"
+msgid "Clientmode"
 msgstr ""
 
 #. System log buffer size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:317
-msgid "system_system_logsize"
+msgid "System log buffer size"
 msgstr ""
 
 #. External system log server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:318
-msgid "system_system_logip"
+msgid "External system log server"
 msgstr ""
 
 #. Log output level
 #: i18n/english/luasrc/i18n/admin-core.en.lua:319
-msgid "system_system_conloglevel"
+msgid "Log output level"
 msgstr ""
 
 #. Level of log messages on the console
 #: i18n/english/luasrc/i18n/admin-core.en.lua:320
-msgid "system_system_conloglevel_desc"
+msgid "Level of log messages on the console"
 msgstr ""
 
 #. Processor
 #: i18n/english/luasrc/i18n/admin-core.en.lua:321
-msgid "m_i_processor"
+msgid "Processor"
 msgstr ""
 
 #. Memory
 #: i18n/english/luasrc/i18n/admin-core.en.lua:322
-msgid "m_i_memory"
+msgid "Memory"
 msgstr ""
 
 #. Local Time
 #: i18n/english/luasrc/i18n/admin-core.en.lua:323
-msgid "m_i_systemtime"
+msgid "Local Time"
 msgstr ""
 
 #. Uptime
 #: i18n/english/luasrc/i18n/admin-core.en.lua:324
-msgid "m_i_uptime"
+msgid "Uptime"
 msgstr ""
 
 #. First leased address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:325
-msgid "m_n_d_firstaddress"
+msgid "First leased address"
 msgstr ""
 
 #. Number of leased addresses
 #: i18n/english/luasrc/i18n/admin-core.en.lua:326
-msgid "m_n_d_numleases"
+msgid "Number of leased addresses"
 msgstr ""
 
 #. Routing table
 #: i18n/english/luasrc/i18n/admin-core.en.lua:327
-msgid "routingtable"
+msgid "Routing table"
 msgstr ""
 
 #. Wifi scan
 #: i18n/english/luasrc/i18n/admin-core.en.lua:328
-msgid "wlanscan"
+msgid "Wifi scan"
 msgstr ""
 
 #. Frequency
 #: i18n/english/luasrc/i18n/admin-core.en.lua:329
-msgid "frequency"
+msgid "Frequency"
 msgstr ""
 
 #. Power
 #: i18n/english/luasrc/i18n/admin-core.en.lua:330
-msgid "power"
-msgstr ""
-
-#. Noise
-#: i18n/english/luasrc/i18n/admin-core.en.lua:331
-msgid "noise"
-msgstr ""
-
-#. Signal
-#: i18n/english/luasrc/i18n/admin-core.en.lua:332
-msgid "signal"
-msgstr ""
-
-#. Link
-#: i18n/english/luasrc/i18n/admin-core.en.lua:333
-msgid "link"
+msgid "Power"
 msgstr ""
 
 #. <abbr title=\"Fragmentation\">Frag.</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:334
-msgid "frag"
+msgid "<abbr title=\"Fragmentation\">Frag.</abbr>"
 msgstr ""
 
 #. <abbr title=\"Request To Send\">RTS</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:335
-msgid "rts"
+msgid "<abbr title=\"Request To Send\">RTS</abbr>"
 msgstr ""
 
 #. Bitrate
 #: i18n/english/luasrc/i18n/admin-core.en.lua:336
-msgid "bitrate"
+msgid "Bitrate"
 msgstr ""
 
 #. automatically reconnect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:337
-msgid "m_n_keepalive"
+msgid "automatically reconnect"
 msgstr ""
 
 #. disconnect when idle for
 #: i18n/english/luasrc/i18n/admin-core.en.lua:338
-msgid "m_n_dialondemand"
-msgstr ""
-
-#. <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server
-#: i18n/english/luasrc/i18n/admin-core.en.lua:339
-msgid "m_n_pptp_server"
+msgid "disconnect when idle for"
 msgstr ""
 
 #. <abbr title=\"Light Emitting Diode\">LED</abbr> Configuration
 #: i18n/english/luasrc/i18n/admin-core.en.lua:340
-msgid "leds"
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr ""
 
 #. Customizes the behaviour of the device <abbr title=\"Light Emitting Diode\">LED</abbr>s if possible.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:341
-msgid "leds_desc"
+msgid ""
+"Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
+"\">LED</abbr>s if possible."
 msgstr ""
 
 #. <abbr title=\"Light Emitting Diode\">LED</abbr> Name
 #: i18n/english/luasrc/i18n/admin-core.en.lua:342
-msgid "system_led_name"
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr ""
 
 #. <abbr title=\"Light Emitting Diode\">LED</abbr> Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:343
-msgid "system_led_sysfs"
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Device"
 msgstr ""
 
 #. Default state
 #: i18n/english/luasrc/i18n/admin-core.en.lua:344
-msgid "system_led_default"
+msgid "Default state"
 msgstr ""
 
 #. ticked = on
 #: i18n/english/luasrc/i18n/admin-core.en.lua:345
-msgid "system_led_default_desc"
+msgid "ticked = on"
 msgstr ""
 
 #. Trigger
 #: i18n/english/luasrc/i18n/admin-core.en.lua:346
-msgid "system_led_trigger"
+msgid "Trigger"
 msgstr ""
 
 #. None
 #: i18n/english/luasrc/i18n/admin-core.en.lua:347
-msgid "system_led_trigger_none"
+msgid "None"
 msgstr ""
 
 #. Default On
 #: i18n/english/luasrc/i18n/admin-core.en.lua:348
-msgid "system_led_trigger_defaulton"
+msgid "Default On"
 msgstr ""
 
 #. Timer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:349
-msgid "system_led_trigger_timer"
+msgid "Timer"
 msgstr ""
 
 #. Heartbeat (Load Average)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:350
-msgid "system_led_trigger_heartbeat"
+msgid "Heartbeat (Load Average)"
 msgstr ""
 
 #. Network Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:351
-msgid "system_led_trigger_netdev"
+msgid "Network Device"
 msgstr ""
 
 #. Off-State Delay
 #: i18n/english/luasrc/i18n/admin-core.en.lua:352
-msgid "system_led_delayoff"
+msgid "Off-State Delay"
 msgstr ""
 
 #. Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is off
 #: i18n/english/luasrc/i18n/admin-core.en.lua:353
-msgid "system_led_delayoff_desc"
+msgid "Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is off"
 msgstr ""
 
 #. On-State Delay
 #: i18n/english/luasrc/i18n/admin-core.en.lua:354
-msgid "system_led_delayon"
+msgid "On-State Delay"
 msgstr ""
 
 #. Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is on
 #: i18n/english/luasrc/i18n/admin-core.en.lua:355
-msgid "system_led_delayon_desc"
-msgstr ""
-
-#. Device
-#: i18n/english/luasrc/i18n/admin-core.en.lua:356
-msgid "system_led_dev"
+msgid "Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is on"
 msgstr ""
 
 #. Trigger Mode
 #: i18n/english/luasrc/i18n/admin-core.en.lua:357
-msgid "system_led_mode"
+msgid "Trigger Mode"
 msgstr ""
 
 #. Link On
 #: i18n/english/luasrc/i18n/admin-core.en.lua:358
-msgid "system_led_mode_link"
+msgid "Link On"
 msgstr ""
 
 #. Transmit
 #: i18n/english/luasrc/i18n/admin-core.en.lua:359
-msgid "system_led_mode_tx"
+msgid "Transmit"
 msgstr ""
 
 #. Receive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:360
-msgid "system_led_mode_rx"
+msgid "Receive"
 msgstr ""
 
 #. Active
 #: i18n/english/luasrc/i18n/admin-core.en.lua:361
-msgid "network_interface_up"
+msgid "Active"
 msgstr ""
 
 #. <abbr title=\"Media Access Control\">MAC</abbr>-Address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:362
-msgid "network_interface_hwaddr"
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr ""
 
 #. Hardware Address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:363
-msgid "network_interface_hwaddr_desc"
-msgstr ""
-
-#. Traffic
-#: i18n/english/luasrc/i18n/admin-core.en.lua:364
-msgid "network_interface_txrx"
+msgid "Hardware Address"
 msgstr ""
 
 #. transmitted / received
 #: i18n/english/luasrc/i18n/admin-core.en.lua:365
-msgid "network_interface_txrx_desc"
+msgid "transmitted / received"
 msgstr ""
 
 #. Errors
 #: i18n/english/luasrc/i18n/admin-core.en.lua:366
-msgid "network_interface_err"
+msgid "Errors"
 msgstr ""
 
 #. TX / RX
 #: i18n/english/luasrc/i18n/admin-core.en.lua:367
-msgid "network_interface_err_desc"
+msgid "TX / RX"
 msgstr ""
 
 #. Create / Assign firewall-zone
 #: i18n/english/luasrc/i18n/admin-core.en.lua:368
-msgid "network_interface_fwzone"
+msgid "Create / Assign firewall-zone"
 msgstr ""
 
 #. Choose the firewall zone you want to assign to this interface. Select <em>unspecified</em> to remove the interface from the associated zone or fill out the <em>create</em> field to define a new zone and attach the interface to it.
-msgid "network_interface_fwzone_desc"
+msgid ""
+"Choose the firewall zone you want to assign to this interface. Select "
+"<em>unspecified</em> to remove the interface from the associated zone or "
+"fill out the <em>create</em> field to define a new zone and attach the "
+"interface to it."
 msgstr ""
 
 #. Processes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:370
-msgid "process_head"
+msgid "Processes"
 msgstr ""
 
 #. This list gives an overview over currently running system processes and their status.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:371
-msgid "process_descr"
+msgid ""
+"This list gives an overview over currently running system processes and "
+"their status."
 msgstr ""
 
 #. PID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:372
-msgid "process_pid"
+msgid "PID"
 msgstr ""
 
 #. Owner
 #: i18n/english/luasrc/i18n/admin-core.en.lua:373
-msgid "process_owner"
+msgid "Owner"
 msgstr ""
 
 #. Command
 #: i18n/english/luasrc/i18n/admin-core.en.lua:374
-msgid "process_command"
+msgid "Command"
 msgstr ""
 
 #. CPU usage (%)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:375
-msgid "process_cpu"
+msgid "CPU usage (%)"
 msgstr ""
 
 #. Memory usage (%)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:376
-msgid "process_mem"
+msgid "Memory usage (%)"
 msgstr ""
 
 #. Hang Up
 #: i18n/english/luasrc/i18n/admin-core.en.lua:377
-msgid "process_hup"
+msgid "Hang Up"
 msgstr ""
 
 #. Terminate
 #: i18n/english/luasrc/i18n/admin-core.en.lua:378
-msgid "process_term"
+msgid "Terminate"
 msgstr ""
 
 #. Kill
 #: i18n/english/luasrc/i18n/admin-core.en.lua:379
-msgid "process_kill"
+msgid "Kill"
 msgstr ""
 
 #. cached
 #: i18n/english/luasrc/i18n/admin-core.en.lua:380
-msgid "mem_cached"
+msgid "cached"
 msgstr ""
 
 #. buffered
 #: i18n/english/luasrc/i18n/admin-core.en.lua:381
-msgid "mem_buffered"
+msgid "buffered"
 msgstr ""
 
 #. free
 #: i18n/english/luasrc/i18n/admin-core.en.lua:382
-msgid "mem_free"
+msgid "free"
 msgstr ""
 
 #. Scheduled Tasks
 #: i18n/english/luasrc/i18n/admin-core.en.lua:383
-msgid "a_s_crontab"
+msgid "Scheduled Tasks"
 msgstr ""
 
 #. This is the system crontab in which scheduled tasks can be defined.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:384
-msgid "a_s_crontab1"
+msgid "This is the system crontab in which scheduled tasks can be defined."
 msgstr ""
 
 #. NAS ID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:385
-msgid "a_w_nasid"
+msgid "NAS ID"
 msgstr ""
 
 #. Path to CA-Certificate
 #: i18n/english/luasrc/i18n/admin-core.en.lua:386
-msgid "a_w_cacert"
+msgid "Path to CA-Certificate"
 msgstr ""
 
 #. EAP-Method
 #: i18n/english/luasrc/i18n/admin-core.en.lua:387
-msgid "a_w_eaptype"
+msgid "EAP-Method"
 msgstr ""
 
 #. Path to Private Key
 #: i18n/english/luasrc/i18n/admin-core.en.lua:388
-msgid "a_w_tlsprivkey"
+msgid "Path to Private Key"
 msgstr ""
 
 #. Password of Private Key
 #: i18n/english/luasrc/i18n/admin-core.en.lua:389
-msgid "a_w_tlsprivkeypwd"
+msgid "Password of Private Key"
 msgstr ""
 
 #. Authentication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:390
-msgid "a_w_peapauth"
+msgid "Authentication"
 msgstr ""
 
 #. Identity
 #: i18n/english/luasrc/i18n/admin-core.en.lua:391
-msgid "a_w_peapidentity"
+msgid "Identity"
 msgstr ""
 
 #. Password
 #: i18n/english/luasrc/i18n/admin-core.en.lua:392
-msgid "a_w_peappassword"
+msgid "Password"
 msgstr ""
 
 #. Create Network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:393
-msgid "a_w_create"
+msgid "Create Network"
 msgstr ""
 
 #. Hostnames
 #: i18n/english/luasrc/i18n/admin-core.en.lua:394
-msgid "hostnames"
+msgid "Hostnames"
 msgstr ""
 
 #. Host entries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:395
-msgid "hostnames_entries"
+msgid "Host entries"
 msgstr ""
 
 #. Hostname
 #: i18n/english/luasrc/i18n/admin-core.en.lua:396
-msgid "hostnames_hostname"
+msgid "Hostname"
 msgstr ""
 
 #. IP address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:397
-msgid "hostnames_address"
+msgid "IP address"
 msgstr ""
 
 #. Clamp Segment Size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:398
-msgid "m_n_mssfix"
+msgid "Clamp Segment Size"
 msgstr ""
 
 #. Fixes problems with unreachable websites, submitting forms or other unexpected behaviour for some ISPs.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:399
-msgid "m_n_mssfix_desc"
+msgid ""
+"Fixes problems with unreachable websites, submitting forms or other "
+"unexpected behaviour for some ISPs."
 msgstr ""
 
 #. Flash Firmware
 #: i18n/english/luasrc/i18n/admin-core.en.lua:400
-msgid "admin_upgrade"
+msgid "Flash Firmware"
 msgstr ""
 
 #. The uploaded image file does not contain a supported format. Make sure that you choose the generic image format for your platform.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:401
-msgid "admin_upgrade_badimage"
+msgid ""
+"The uploaded image file does not contain a supported format. Make sure that "
+"you choose the generic image format for your platform."
 msgstr ""
 
 #. Checksum
 #: i18n/english/luasrc/i18n/admin-core.en.lua:402
-msgid "admin_upgrade_checksum"
+msgid "Checksum"
 msgstr ""
 
 #. Upload an OpenWrt image file to reflash the device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:403
-msgid "admin_upgrade_desc"
+msgid "Upload an OpenWrt image file to reflash the device."
 msgstr ""
 
 #. Size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:404
-msgid "admin_upgrade_filesize"
+msgid "Size"
 msgstr ""
 
 #. Firmware image
 #: i18n/english/luasrc/i18n/admin-core.en.lua:405
-msgid "admin_upgrade_fwimage"
+msgid "Firmware image"
 msgstr ""
 
 #. Keep configuration files
 #: i18n/english/luasrc/i18n/admin-core.en.lua:406
-msgid "admin_upgrade_keepcfg"
+msgid "Keep configuration files"
 msgstr ""
 
 #. Sorry. OpenWrt does not support a system upgrade on this platform.<br /> You need to manually flash your device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:407
-msgid "admin_upgrade_nosupport"
+msgid ""
+"Sorry. OpenWrt does not support a system upgrade on this platform.<br /> You "
+"need to manually flash your device."
 msgstr ""
 
 #. The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a few minutes until you try to reconnect. It might be necessary to renew the address of your computer to reach the device again, depending on your settings.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:408
-msgid "admin_upgrade_running"
+msgid ""
+"The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
+"few minutes until you try to reconnect. It might be necessary to renew the "
+"address of your computer to reach the device again, depending on your "
+"settings."
 msgstr ""
 
 #.  (%s available)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:409
-msgid "admin_upgrade_spaceavail"
+msgid " (%s available)"
 msgstr ""
 
 #. It appears that you try to flash an image that does not fit into the flash memory, please verify the image file!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:410
-msgid "admin_upgrade_toolarge"
+msgid ""
+"It appears that you try to flash an image that does not fit into the flash "
+"memory, please verify the image file!"
 msgstr ""
 
 #. Upload image
 #: i18n/english/luasrc/i18n/admin-core.en.lua:411
-msgid "admin_upgrade_upload"
+msgid "Upload image"
 msgstr ""
 
 #. The flash image was uploaded. Below is the checksum and file size listed, compare them with the original file to ensure data integrity.<br /> Click \"Proceed\" below to start the flash procedure.
diff --git a/po/templates/asterisk.pot b/po/templates/asterisk.pot
index 3d5b96cd8..3f9a857c6 100644
--- a/po/templates/asterisk.pot
+++ b/po/templates/asterisk.pot
@@ -5,1252 +5,1117 @@ msgstr "Content-Type: text/plain; charset=UTF-8"
 
 #. Asterisk General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:1
-msgid "asterisk_asterisk"
+msgid "Asterisk General Options"
 msgstr ""
 
 #. AGI directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:2
-msgid "asterisk_asterisk_agidir"
+msgid "AGI directory"
 msgstr ""
 
 #. Cache recorded sound files during recording
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:3
-msgid "asterisk_asterisk_cacherecordfiles"
+msgid "Cache recorded sound files during recording"
 msgstr ""
 
 #. Debug Level
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:4
-msgid "asterisk_asterisk_debug"
+msgid "Debug Level"
 msgstr ""
 
 #. Disable some warnings
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:5
-msgid "asterisk_asterisk_dontwarn"
+msgid "Disable some warnings"
 msgstr ""
 
 #. Dump core on crash
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:6
-msgid "asterisk_asterisk_dumpcore"
+msgid "Dump core on crash"
 msgstr ""
 
 #. High Priority
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:7
-msgid "asterisk_asterisk_highpriority"
+msgid "High Priority"
 msgstr ""
 
 #. Initialise Crypto
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:8
-msgid "asterisk_asterisk_initcrypto"
+msgid "Initialise Crypto"
 msgstr ""
 
 #. Use Internal Timing
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:9
-msgid "asterisk_asterisk_internaltiming"
+msgid "Use Internal Timing"
 msgstr ""
 
 #. Log directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:10
-msgid "asterisk_asterisk_logdir"
+msgid "Log directory"
 msgstr ""
 
 #. Maximum number of calls allowed
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:11
-msgid "asterisk_asterisk_maxcalls"
+msgid "Maximum number of calls allowed"
 msgstr ""
 
 #. Maximum load to stop accepting new calls
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:12
-msgid "asterisk_asterisk_maxload"
+msgid "Maximum load to stop accepting new calls"
 msgstr ""
 
 #. Disable console colors
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:13
-msgid "asterisk_asterisk_nocolor"
+msgid "Disable console colors"
 msgstr ""
 
 #. Sound files Cache directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:14
-msgid "asterisk_asterisk_recordcachedir"
+msgid "Sound files Cache directory"
 msgstr ""
 
 #. The Group to run as
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:15
-msgid "asterisk_asterisk_rungroup"
+msgid "The Group to run as"
 msgstr ""
 
 #. The User to run as
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:16
-msgid "asterisk_asterisk_runuser"
+msgid "The User to run as"
 msgstr ""
 
 #. Voicemail Spool directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:17
-msgid "asterisk_asterisk_spooldir"
+msgid "Voicemail Spool directory"
 msgstr ""
 
 #. Prefix UniquID with system name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:18
-msgid "asterisk_asterisk_systemname"
+msgid "Prefix UniquID with system name"
 msgstr ""
 
 #. Build transcode paths via SLINEAR, not directly
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:19
-msgid "asterisk_asterisk_transcodeviasln"
+msgid "Build transcode paths via SLINEAR, not directly"
 msgstr ""
 
 #. Transmit SLINEAR silence while recording a channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:20
-msgid "asterisk_asterisk_transmitsilenceduringrecord"
+msgid "Transmit SLINEAR silence while recording a channel"
 msgstr ""
 
 #. Verbose Level
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:21
-msgid "asterisk_asterisk_verbose"
+msgid "Verbose Level"
 msgstr ""
 
 #. Time Zone
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:22
-msgid "asterisk_asterisk_zone"
+msgid "Time Zone"
 msgstr ""
 
 #. Section dialplan
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:23
-msgid "asterisk_dialplan"
+msgid "Section dialplan"
 msgstr ""
 
 #. include
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:24
-msgid "asterisk_dialplan_include"
+msgid "include"
 msgstr ""
 
 #. Dialplan Extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:25
-msgid "asterisk_dialplanexten"
+msgid "Dialplan Extension"
 msgstr ""
 
 #. Dialplan General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:26
-msgid "asterisk_dialplangeneral"
+msgid "Dialplan General Options"
 msgstr ""
 
 #. Allow transfer
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:27
-msgid "asterisk_dialplangeneral_allowtransfer"
-msgstr ""
-
-#. Reinvite/redirect media connections
-#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:28
-msgid "asterisk_dialplangeneral_canreinvite"
+msgid "Allow transfer"
 msgstr ""
 
 #. Clear global vars
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:29
-msgid "asterisk_dialplangeneral_clearglobalvars"
+msgid "Clear global vars"
 msgstr ""
 
 #. Dialplan Goto
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:30
-msgid "asterisk_dialplangoto"
+msgid "Dialplan Goto"
 msgstr ""
 
 #. Dialplan Conference
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:31
-msgid "asterisk_dialplanmeetme"
+msgid "Dialplan Conference"
 msgstr ""
 
 #. Dialplan Time
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:32
-msgid "asterisk_dialplansaytime"
+msgid "Dialplan Time"
 msgstr ""
 
 #. Dialplan Voicemail
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:33
-msgid "asterisk_dialplanvoice"
+msgid "Dialplan Voicemail"
 msgstr ""
 
 #. Dial Zones for Dialplan
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:34
-msgid "asterisk_dialzone"
+msgid "Dial Zones for Dialplan"
 msgstr ""
 
 #. Prefix to add matching dialplans
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:35
-msgid "asterisk_dialzone_addprefix"
+msgid "Prefix to add matching dialplans"
 msgstr ""
 
 #. Match International prefix
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:36
-msgid "asterisk_dialzone_international"
+msgid "Match International prefix"
 msgstr ""
 
 #. Prefix (0) to add/remove to/from international numbers
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:37
-msgid "asterisk_dialzone_localprefix"
+msgid "Prefix (0) to add/remove to/from international numbers"
 msgstr ""
 
 #. localzone
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:38
-msgid "asterisk_dialzone_localzone"
+msgid "localzone"
 msgstr ""
 
 #. Match plan
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:39
-msgid "asterisk_dialzone_match"
+msgid "Match plan"
 msgstr ""
 
 #. Connection to use
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:40
-msgid "asterisk_dialzone_uses"
+msgid "Connection to use"
 msgstr ""
 
 #. Feature Key maps
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:41
-msgid "asterisk_featuremap"
+msgid "Feature Key maps"
 msgstr ""
 
 #. Attended transfer key
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:42
-msgid "asterisk_featuremap_atxfer"
+msgid "Attended transfer key"
 msgstr ""
 
 #. Blind transfer key
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:43
-msgid "asterisk_featuremap_blindxfer"
+msgid "Blind transfer key"
 msgstr ""
 
 #. Key to Disconnect call
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:44
-msgid "asterisk_featuremap_disconnect"
+msgid "Key to Disconnect call"
 msgstr ""
 
 #. Key to Park call
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:45
-msgid "asterisk_featuremap_parkcall"
+msgid "Key to Park call"
 msgstr ""
 
 #. Parking Feature
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:46
-msgid "asterisk_featurepark"
+msgid "Parking Feature"
 msgstr ""
 
 #. ADSI Park
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:47
-msgid "asterisk_featurepark_adsipark"
+msgid "ADSI Park"
 msgstr ""
 
 #. Attended transfer timeout (sec)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:48
-msgid "asterisk_featurepark_atxfernoanswertimeout"
+msgid "Attended transfer timeout (sec)"
 msgstr ""
 
 #. One touch record key
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:49
-msgid "asterisk_featurepark_automon"
+msgid "One touch record key"
 msgstr ""
 
 #. Name of call context for parking
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:50
-msgid "asterisk_featurepark_context"
+msgid "Name of call context for parking"
 msgstr ""
 
 #. Sound file to play to parked caller
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:51
-msgid "asterisk_featurepark_courtesytone"
+msgid "Sound file to play to parked caller"
 msgstr ""
 
 #. Max time (ms) between digits for feature activation
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:52
-msgid "asterisk_featurepark_featuredigittimeout"
+msgid "Max time (ms) between digits for feature activation"
 msgstr ""
 
 #. Method to Find Parking slot
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:53
-msgid "asterisk_featurepark_findslot"
+msgid "Method to Find Parking slot"
 msgstr ""
 
 #. parkedmusicclass
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:54
-msgid "asterisk_featurepark_parkedmusicclass"
+msgid "parkedmusicclass"
 msgstr ""
 
 #. Play courtesy tone to
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:55
-msgid "asterisk_featurepark_parkedplay"
+msgid "Play courtesy tone to"
 msgstr ""
 
 #. Enable Parking
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:56
-msgid "asterisk_featurepark_parkenabled"
+msgid "Enable Parking"
 msgstr ""
 
 #. Extension to dial to park
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:57
-msgid "asterisk_featurepark_parkext"
+msgid "Extension to dial to park"
 msgstr ""
 
 #. Parking time (secs)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:58
-msgid "asterisk_featurepark_parkingtime"
+msgid "Parking time (secs)"
 msgstr ""
 
 #. Range of extensions for call parking
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:59
-msgid "asterisk_featurepark_parkpos"
+msgid "Range of extensions for call parking"
 msgstr ""
 
 #. Pickup extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:60
-msgid "asterisk_featurepark_pickupexten"
+msgid "Pickup extension"
 msgstr ""
 
 #. Seconds to wait bewteen digits when transferring
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:61
-msgid "asterisk_featurepark_transferdigittimeout"
+msgid "Seconds to wait bewteen digits when transferring"
 msgstr ""
 
 #. sound when attended transfer is complete
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:62
-msgid "asterisk_featurepark_xferfailsound"
+msgid "sound when attended transfer is complete"
 msgstr ""
 
 #. Sound when attended transfer fails
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:63
-msgid "asterisk_featurepark_xfersound"
+msgid "Sound when attended transfer fails"
 msgstr ""
 
 #. Reload Hardware Config
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:64
-msgid "asterisk_hardwarereboot"
+msgid "Reload Hardware Config"
 msgstr ""
 
 #. Reboot Method
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:65
-msgid "asterisk_hardwarereboot_method"
+msgid "Reboot Method"
 msgstr ""
 
 #. Parameter
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:66
-msgid "asterisk_hardwarereboot_param"
-msgstr ""
-
-#. SIP Connection
-#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:67
-msgid "asterisk_iax"
-msgstr ""
-
-#. Always Dial International
-#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:68
-msgid "asterisk_iax_alwaysinternational"
-msgstr ""
-
-#. context
-#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:69
-msgid "asterisk_iax_context"
-msgstr ""
-
-#. Country Code for connection
-#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:70
-msgid "asterisk_iax_countrycode"
-msgstr ""
-
-#. Add as Extension
-#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:71
-msgid "asterisk_iax_extension"
-msgstr ""
-
-#. Host name (or blank)
-#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:72
-msgid "asterisk_iax_host"
-msgstr ""
-
-#. International Dial Prefix
-#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:73
-msgid "asterisk_iax_internationalprefix"
-msgstr ""
-
-#. Dial Prefix (for external line)
-#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:74
-msgid "asterisk_iax_prefix"
-msgstr ""
-
-#. Secret
-#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:75
-msgid "asterisk_iax_secret"
-msgstr ""
-
-#. Dial Timeout (sec)
-#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:76
-msgid "asterisk_iax_timeout"
+msgid "Parameter"
 msgstr ""
 
 #. Option type
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:77
-msgid "asterisk_iax_type"
+msgid "Option type"
 msgstr ""
 
 #. User name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:78
-msgid "asterisk_iax_username"
+msgid "User name"
 msgstr ""
 
 #. IAX General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:79
-msgid "asterisk_iaxgeneral"
+msgid "IAX General Options"
 msgstr ""
 
 #. Allow Codecs
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:80
-msgid "asterisk_iaxgeneral_allow"
-msgstr ""
-
-#. Reinvite/redirect media connections
-#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:81
-msgid "asterisk_iaxgeneral_canreinvite"
+msgid "Allow Codecs"
 msgstr ""
 
 #. Static
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:82
-msgid "asterisk_iaxgeneral_static"
+msgid "Static"
 msgstr ""
 
 #. Write Protect
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:83
-msgid "asterisk_iaxgeneral_writeprotect"
+msgid "Write Protect"
 msgstr ""
 
 #. Meetme Conference
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:84
-msgid "asterisk_meetme"
+msgid "Meetme Conference"
 msgstr ""
 
 #. Admin PIN
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:85
-msgid "asterisk_meetme_adminpin"
+msgid "Admin PIN"
 msgstr ""
 
 #. Meeting PIN
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:86
-msgid "asterisk_meetme_pin"
+msgid "Meeting PIN"
 msgstr ""
 
 #. Meetme Conference General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:87
-msgid "asterisk_meetmegeneral"
+msgid "Meetme Conference General Options"
 msgstr ""
 
 #. Number of 20ms audio buffers to be used
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:88
-msgid "asterisk_meetmegeneral_audiobuffers"
+msgid "Number of 20ms audio buffers to be used"
 msgstr ""
 
 #. Modules
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:89
-msgid "asterisk_module"
+msgid "Modules"
 msgstr ""
 
 #. Alarm Receiver Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:90
-msgid "asterisk_module_appalarmreceiver"
+msgid "Alarm Receiver Application"
 msgstr ""
 
 #. Authentication Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:91
-msgid "asterisk_module_appauthenticate"
+msgid "Authentication Application"
 msgstr ""
 
 #. Make sure asterisk doesnt save CDR
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:92
-msgid "asterisk_module_appcdr"
+msgid "Make sure asterisk doesnt save CDR"
 msgstr ""
 
 #. Check if channel is available
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:93
-msgid "asterisk_module_appchanisavail"
+msgid "Check if channel is available"
 msgstr ""
 
 #. Listen in on any channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:94
-msgid "asterisk_module_appchanspy"
+msgid "Listen in on any channel"
 msgstr ""
 
 #. Control Playback Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:95
-msgid "asterisk_module_appcontrolplayback"
+msgid "Control Playback Application"
 msgstr ""
 
 #. Cuts up variables
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:96
-msgid "asterisk_module_appcut"
+msgid "Cuts up variables"
 msgstr ""
 
 #. Database access functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:97
-msgid "asterisk_module_appdb"
+msgid "Database access functions"
 msgstr ""
 
 #. Dialing Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:98
-msgid "asterisk_module_appdial"
+msgid "Dialing Application"
 msgstr ""
 
 #. Virtual Dictation Machine Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:99
-msgid "asterisk_module_appdictate"
+msgid "Virtual Dictation Machine Application"
 msgstr ""
 
 #. Directed Call Pickup Support
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:100
-msgid "asterisk_module_appdirectedpickup"
+msgid "Directed Call Pickup Support"
 msgstr ""
 
 #. Extension Directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:101
-msgid "asterisk_module_appdirectory"
+msgid "Extension Directory"
 msgstr ""
 
 #. DISA (Direct Inward System Access) Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:102
-msgid "asterisk_module_appdisa"
+msgid "DISA (Direct Inward System Access) Application"
 msgstr ""
 
 #. Dump channel variables Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:103
-msgid "asterisk_module_appdumpchan"
+msgid "Dump channel variables Application"
 msgstr ""
 
 #. Simple Echo Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:104
-msgid "asterisk_module_appecho"
+msgid "Simple Echo Application"
 msgstr ""
 
 #. ENUM Lookup
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:105
-msgid "asterisk_module_appenumlookup"
+msgid "ENUM Lookup"
 msgstr ""
 
 #. Reevaluates strings
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:106
-msgid "asterisk_module_appeval"
+msgid "Reevaluates strings"
 msgstr ""
 
 #. Executes applications
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:107
-msgid "asterisk_module_appexec"
+msgid "Executes applications"
 msgstr ""
 
 #. External IVR application interface
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:108
-msgid "asterisk_module_appexternalivr"
+msgid "External IVR application interface"
 msgstr ""
 
 #. Fork The CDR into 2 seperate entities
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:109
-msgid "asterisk_module_appforkcdr"
+msgid "Fork The CDR into 2 seperate entities"
 msgstr ""
 
 #. Get ADSI CPE ID
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:110
-msgid "asterisk_module_appgetcpeid"
+msgid "Get ADSI CPE ID"
 msgstr ""
 
 #. Group Management Routines
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:111
-msgid "asterisk_module_appgroupcount"
+msgid "Group Management Routines"
 msgstr ""
 
 #. Encode and Stream via icecast and ices
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:112
-msgid "asterisk_module_appices"
+msgid "Encode and Stream via icecast and ices"
 msgstr ""
 
 #. Image Transmission Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:113
-msgid "asterisk_module_appimage"
+msgid "Image Transmission Application"
 msgstr ""
 
 #. Look up Caller*ID name/number from black
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:114
-msgid "asterisk_module_applookupblacklist"
+msgid "Look up Caller*ID name/number from black"
 msgstr ""
 
 #. Look up CallerID Name from local databas
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:115
-msgid "asterisk_module_applookupcidname"
+msgid "Look up CallerID Name from local databas"
 msgstr ""
 
 #. Extension Macros
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:116
-msgid "asterisk_module_appmacro"
+msgid "Extension Macros"
 msgstr ""
 
 #. A simple math Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:117
-msgid "asterisk_module_appmath"
+msgid "A simple math Application"
 msgstr ""
 
 #. MD5 checksum Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:118
-msgid "asterisk_module_appmd5"
+msgid "MD5 checksum Application"
 msgstr ""
 
 #. Digital Milliwatt (mu-law) Test Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:119
-msgid "asterisk_module_appmilliwatt"
+msgid "Digital Milliwatt (mu-law) Test Application"
 msgstr ""
 
 #. Record a call and mix the audio during the recording
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:120
-msgid "asterisk_module_appmixmonitor"
+msgid "Record a call and mix the audio during the recording"
 msgstr ""
 
 #. Call Parking and Announce Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:121
-msgid "asterisk_module_appparkandannounce"
+msgid "Call Parking and Announce Application"
 msgstr ""
 
 #. Trivial Playback Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:122
-msgid "asterisk_module_appplayback"
+msgid "Trivial Playback Application"
 msgstr ""
 
 #. Require phone number to be entered
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:123
-msgid "asterisk_module_appprivacy"
+msgid "Require phone number to be entered"
 msgstr ""
 
 #. True Call Queueing
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:124
-msgid "asterisk_module_appqueue"
+msgid "True Call Queueing"
 msgstr ""
 
 #. Random goto
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:125
-msgid "asterisk_module_apprandom"
+msgid "Random goto"
 msgstr ""
 
 #. Read Variable Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:126
-msgid "asterisk_module_appread"
+msgid "Read Variable Application"
 msgstr ""
 
 #. Read in a file
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:127
-msgid "asterisk_module_appreadfile"
+msgid "Read in a file"
 msgstr ""
 
 #. Realtime Data Lookup/Rewrite
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:128
-msgid "asterisk_module_apprealtime"
+msgid "Realtime Data Lookup/Rewrite"
 msgstr ""
 
 #. Trivial Record Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:129
-msgid "asterisk_module_apprecord"
+msgid "Trivial Record Application"
 msgstr ""
 
 #. Say time
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:130
-msgid "asterisk_module_appsayunixtime"
+msgid "Say time"
 msgstr ""
 
 #. Send DTMF digits Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:131
-msgid "asterisk_module_appsenddtmf"
+msgid "Send DTMF digits Application"
 msgstr ""
 
 #. Send Text Applications
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:132
-msgid "asterisk_module_appsendtext"
+msgid "Send Text Applications"
 msgstr ""
 
 #. Set CallerID Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:133
-msgid "asterisk_module_appsetcallerid"
+msgid "Set CallerID Application"
 msgstr ""
 
 #. CDR user field apps
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:134
-msgid "asterisk_module_appsetcdruserfield"
+msgid "CDR user field apps"
 msgstr ""
 
 #. load =&gt; .so ; Set CallerID Name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:135
-msgid "asterisk_module_appsetcidname"
+msgid "load => .so ; Set CallerID Name"
 msgstr ""
 
 #. load =&gt; .so ; Set CallerID Number
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:136
-msgid "asterisk_module_appsetcidnum"
+msgid "load => .so ; Set CallerID Number"
 msgstr ""
 
 #. Set RDNIS Number
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:137
-msgid "asterisk_module_appsetrdnis"
+msgid "Set RDNIS Number"
 msgstr ""
 
 #. Set ISDN Transfer Capability
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:138
-msgid "asterisk_module_appsettransfercapability"
+msgid "Set ISDN Transfer Capability"
 msgstr ""
 
 #. SMS/PSTN handler
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:139
-msgid "asterisk_module_appsms"
+msgid "SMS/PSTN handler"
 msgstr ""
 
 #. Hangs up the requested channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:140
-msgid "asterisk_module_appsofthangup"
+msgid "Hangs up the requested channel"
 msgstr ""
 
 #. Stack Routines
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:141
-msgid "asterisk_module_appstack"
+msgid "Stack Routines"
 msgstr ""
 
 #. Generic System() application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:142
-msgid "asterisk_module_appsystem"
+msgid "Generic System() application"
 msgstr ""
 
 #. Playback with Talk Detection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:143
-msgid "asterisk_module_apptalkdetect"
+msgid "Playback with Talk Detection"
 msgstr ""
 
 #. Interface Test Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:144
-msgid "asterisk_module_apptest"
+msgid "Interface Test Application"
 msgstr ""
 
 #. Transfer
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:145
-msgid "asterisk_module_apptransfer"
+msgid "Transfer"
 msgstr ""
 
 #. TXTCIDName
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:146
-msgid "asterisk_module_apptxtcidname"
+msgid "TXTCIDName"
 msgstr ""
 
 #. Send URL Applications
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:147
-msgid "asterisk_module_appurl"
+msgid "Send URL Applications"
 msgstr ""
 
 #. Custom User Event Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:148
-msgid "asterisk_module_appuserevent"
+msgid "Custom User Event Application"
 msgstr ""
 
 #. Send verbose output
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:149
-msgid "asterisk_module_appverbose"
+msgid "Send verbose output"
 msgstr ""
 
 #. Voicemail
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:150
-msgid "asterisk_module_appvoicemail"
+msgid "Voicemail"
 msgstr ""
 
 #. Waits until first ring after time
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:151
-msgid "asterisk_module_appwaitforring"
+msgid "Waits until first ring after time"
 msgstr ""
 
 #. Wait For Silence Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:152
-msgid "asterisk_module_appwaitforsilence"
+msgid "Wait For Silence Application"
 msgstr ""
 
 #. While Loops and Conditional Execution
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:153
-msgid "asterisk_module_appwhile"
+msgid "While Loops and Conditional Execution"
 msgstr ""
 
 #. Comma Separated Values CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:154
-msgid "asterisk_module_cdrcsv"
+msgid "Comma Separated Values CDR Backend"
 msgstr ""
 
 #. Customizable Comma Separated Values CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:155
-msgid "asterisk_module_cdrcustom"
+msgid "Customizable Comma Separated Values CDR Backend"
 msgstr ""
 
 #. Asterisk Call Manager CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:156
-msgid "asterisk_module_cdrmanager"
+msgid "Asterisk Call Manager CDR Backend"
 msgstr ""
 
 #. MySQL CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:157
-msgid "asterisk_module_cdrmysql"
+msgid "MySQL CDR Backend"
 msgstr ""
 
 #. PostgreSQL CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:158
-msgid "asterisk_module_cdrpgsql"
+msgid "PostgreSQL CDR Backend"
 msgstr ""
 
 #. SQLite CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:159
-msgid "asterisk_module_cdrsqlite"
+msgid "SQLite CDR Backend"
 msgstr ""
 
 #. Agent Proxy Channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:160
-msgid "asterisk_module_chanagent"
-msgstr ""
-
-#. Channel driver for GTalk
-#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:161
-msgid "asterisk_module_chanalsa"
-msgstr ""
-
-#. Channel driver for GTalk
-#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:162
-msgid "asterisk_module_changtalk"
+msgid "Agent Proxy Channel"
 msgstr ""
 
 #. Option chan_iax2
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:163
-msgid "asterisk_module_chaniax2"
+msgid "Option chan_iax2"
 msgstr ""
 
 #. Local Proxy Channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:164
-msgid "asterisk_module_chanlocal"
+msgid "Local Proxy Channel"
 msgstr ""
 
 #. Session Initiation Protocol (SIP)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:165
-msgid "asterisk_module_chansip"
+msgid "Session Initiation Protocol (SIP)"
 msgstr ""
 
 #. Adaptive Differential PCM Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:166
-msgid "asterisk_module_codecadpcm"
+msgid "Adaptive Differential PCM Coder/Decoder"
 msgstr ""
 
 #. A-law Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:167
-msgid "asterisk_module_codecalaw"
+msgid "A-law Coder/Decoder"
 msgstr ""
 
 #. A-law and Mulaw direct Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:168
-msgid "asterisk_module_codecamu"
+msgid "A-law and Mulaw direct Coder/Decoder"
 msgstr ""
 
 #. ITU G.726-32kbps G726 Transcoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:169
-msgid "asterisk_module_codecg726"
+msgid "ITU G.726-32kbps G726 Transcoder"
 msgstr ""
 
 #. GSM/PCM16 (signed linear) Codec Translation
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:170
-msgid "asterisk_module_codecgsm"
+msgid "GSM/PCM16 (signed linear) Codec Translation"
 msgstr ""
 
 #. Speex/PCM16 (signed linear) Codec Translator
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:171
-msgid "asterisk_module_codecspeex"
+msgid "Speex/PCM16 (signed linear) Codec Translator"
 msgstr ""
 
 #. Mu-law Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:172
-msgid "asterisk_module_codeculaw"
+msgid "Mu-law Coder/Decoder"
 msgstr ""
 
 #. Sun Microsystems AU format (signed linear)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:173
-msgid "asterisk_module_formatau"
+msgid "Sun Microsystems AU format (signed linear)"
 msgstr ""
 
 #. G.723.1 Simple Timestamp File Format
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:174
-msgid "asterisk_module_formatg723"
+msgid "G.723.1 Simple Timestamp File Format"
 msgstr ""
 
 #. Raw G.726 (16/24/32/40kbps) data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:175
-msgid "asterisk_module_formatg726"
+msgid "Raw G.726 (16/24/32/40kbps) data"
 msgstr ""
 
 #. Raw G729 data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:176
-msgid "asterisk_module_formatg729"
+msgid "Raw G729 data"
 msgstr ""
 
 #. Raw GSM data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:177
-msgid "asterisk_module_formatgsm"
+msgid "Raw GSM data"
 msgstr ""
 
 #. Raw h263 data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:178
-msgid "asterisk_module_formath263"
+msgid "Raw h263 data"
 msgstr ""
 
 #. JPEG (Joint Picture Experts Group) Image
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:179
-msgid "asterisk_module_formatjpeg"
+msgid "JPEG (Joint Picture Experts Group) Image"
 msgstr ""
 
 #. Raw uLaw 8khz Audio support (PCM)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:180
-msgid "asterisk_module_formatpcm"
+msgid "Raw uLaw 8khz Audio support (PCM)"
 msgstr ""
 
 #. load =&gt; .so ; Raw aLaw 8khz PCM Audio support
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:181
-msgid "asterisk_module_formatpcmalaw"
+msgid "load => .so ; Raw aLaw 8khz PCM Audio support"
 msgstr ""
 
 #. Raw Signed Linear Audio support (SLN)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:182
-msgid "asterisk_module_formatsln"
+msgid "Raw Signed Linear Audio support (SLN)"
 msgstr ""
 
 #. Dialogic VOX (ADPCM) File Format
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:183
-msgid "asterisk_module_formatvox"
+msgid "Dialogic VOX (ADPCM) File Format"
 msgstr ""
 
 #. Microsoft WAV format (8000hz Signed Line
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:184
-msgid "asterisk_module_formatwav"
+msgid "Microsoft WAV format (8000hz Signed Line"
 msgstr ""
 
 #. Microsoft WAV format (Proprietary GSM)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:185
-msgid "asterisk_module_formatwavgsm"
+msgid "Microsoft WAV format (Proprietary GSM)"
 msgstr ""
 
 #. Caller ID related dialplan functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:186
-msgid "asterisk_module_funccallerid"
+msgid "Caller ID related dialplan functions"
 msgstr ""
 
 #. ENUM Functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:187
-msgid "asterisk_module_funcenum"
+msgid "ENUM Functions"
 msgstr ""
 
 #. URI encoding / decoding functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:188
-msgid "asterisk_module_funcuri"
+msgid "URI encoding / decoding functions"
 msgstr ""
 
 #. Asterisk Extension Language Compiler
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:189
-msgid "asterisk_module_pbxael"
+msgid "Asterisk Extension Language Compiler"
 msgstr ""
 
 #. Text Extension Configuration
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:190
-msgid "asterisk_module_pbxconfig"
+msgid "Text Extension Configuration"
 msgstr ""
 
 #. load =&gt; .so ; Builtin dialplan functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:191
-msgid "asterisk_module_pbxfunctions"
+msgid "load => .so ; Builtin dialplan functions"
 msgstr ""
 
 #. Loopback Switch
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:192
-msgid "asterisk_module_pbxloopback"
+msgid "Loopback Switch"
 msgstr ""
 
 #. Realtime Switch
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:193
-msgid "asterisk_module_pbxrealtime"
+msgid "Realtime Switch"
 msgstr ""
 
 #. Outgoing Spool Support
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:194
-msgid "asterisk_module_pbxspool"
+msgid "Outgoing Spool Support"
 msgstr ""
 
 #. Wil Cal U (Auto Dialer)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:195
-msgid "asterisk_module_pbxwilcalu"
+msgid "Wil Cal U (Auto Dialer)"
 msgstr ""
 
 #. MySQL Config Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:196
-msgid "asterisk_module_resconfigmysql"
+msgid "MySQL Config Resource"
 msgstr ""
 
 #. ODBC Config Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:197
-msgid "asterisk_module_resconfigodbc"
+msgid "ODBC Config Resource"
 msgstr ""
 
 #. PGSQL Module
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:198
-msgid "asterisk_module_resconfigpgsql"
+msgid "PGSQL Module"
 msgstr ""
 
 #. Cryptographic Digital Signatures
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:199
-msgid "asterisk_module_rescrypto"
+msgid "Cryptographic Digital Signatures"
 msgstr ""
 
 #. Call Parking Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:200
-msgid "asterisk_module_resfeatures"
+msgid "Call Parking Resource"
 msgstr ""
 
 #. Indications Configuration
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:201
-msgid "asterisk_module_resindications"
+msgid "Indications Configuration"
 msgstr ""
 
 #. Call Monitoring Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:202
-msgid "asterisk_module_resmonitor"
+msgid "Call Monitoring Resource"
 msgstr ""
 
 #. Music On Hold Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:203
-msgid "asterisk_module_resmusiconhold"
+msgid "Music On Hold Resource"
 msgstr ""
 
 #. ODBC Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:204
-msgid "asterisk_module_resodbc"
+msgid "ODBC Resource"
 msgstr ""
 
 #. SMDI Module
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:205
-msgid "asterisk_module_ressmdi"
+msgid "SMDI Module"
 msgstr ""
 
 #. SNMP Module
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:206
-msgid "asterisk_module_ressnmp"
+msgid "SNMP Module"
 msgstr ""
 
 #. Music On Hold
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:207
-msgid "asterisk_moh"
+msgid "Music On Hold"
 msgstr ""
 
 #. Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:208
-msgid "asterisk_moh_application"
+msgid "Application"
 msgstr ""
 
 #. Directory of Music
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:209
-msgid "asterisk_moh_directory"
+msgid "Directory of Music"
 msgstr ""
 
 #. Option mode
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:210
-msgid "asterisk_moh_mode"
+msgid "Option mode"
 msgstr ""
 
 #. Random Play
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:211
-msgid "asterisk_moh_random"
-msgstr ""
-
-#. SIP Connection
-#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:212
-msgid "asterisk_sip"
-msgstr ""
-
-#. Always Dial International
-#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:213
-msgid "asterisk_sip_alwaysinternational"
-msgstr ""
-
-#. Reinvite/redirect media connections
-#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:214
-msgid "asterisk_sip_canreinvite"
-msgstr ""
-
-#. context
-#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:215
-msgid "asterisk_sip_context"
-msgstr ""
-
-#. Country Code for connection
-#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:216
-msgid "asterisk_sip_countrycode"
+msgid "Random Play"
 msgstr ""
 
 #. DTMF mode
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:217
-msgid "asterisk_sip_dtmfmode"
-msgstr ""
-
-#. Add as Extension
-#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:218
-msgid "asterisk_sip_extension"
+msgid "DTMF mode"
 msgstr ""
 
 #. Primary domain identity for From: headers
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:219
-msgid "asterisk_sip_fromdomain"
+msgid "Primary domain identity for From: headers"
 msgstr ""
 
 #. From user (required by many SIP providers)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:220
-msgid "asterisk_sip_fromuser"
-msgstr ""
-
-#. Host name (or blank)
-#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:221
-msgid "asterisk_sip_host"
+msgid "From user (required by many SIP providers)"
 msgstr ""
 
 #. Ring on incoming dialplan contexts
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:222
-msgid "asterisk_sip_incoming"
+msgid "Ring on incoming dialplan contexts"
 msgstr ""
 
 #. Allow Insecure for
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:223
-msgid "asterisk_sip_insecure"
-msgstr ""
-
-#. International Dial Prefix
-#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:224
-msgid "asterisk_sip_internationalprefix"
+msgid "Allow Insecure for"
 msgstr ""
 
 #. Mailbox for MWI
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:225
-msgid "asterisk_sip_mailbox"
+msgid "Mailbox for MWI"
 msgstr ""
 
 #. NAT between phone and Asterisk
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:226
-msgid "asterisk_sip_nat"
+msgid "NAT between phone and Asterisk"
 msgstr ""
 
 #. Check tags in headers
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:227
-msgid "asterisk_sip_pedantic"
-msgstr ""
-
-#. SIP Port
-#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:228
-msgid "asterisk_sip_port"
-msgstr ""
-
-#. Dial Prefix (for external line)
-#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:229
-msgid "asterisk_sip_prefix"
+msgid "Check tags in headers"
 msgstr ""
 
 #. Reply Timeout (ms) for down connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:230
-msgid "asterisk_sip_qualify"
+msgid "Reply Timeout (ms) for down connection"
 msgstr ""
 
 #. Register connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:231
-msgid "asterisk_sip_register"
-msgstr ""
-
-#. Secret
-#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:232
-msgid "asterisk_sip_secret"
+msgid "Register connection"
 msgstr ""
 
 #. Dial own extension for mailbox
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:233
-msgid "asterisk_sip_selfmailbox"
-msgstr ""
-
-#. Dial Timeout (sec)
-#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:234
-msgid "asterisk_sip_timeout"
+msgid "Dial own extension for mailbox"
 msgstr ""
 
 #. Client Type
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:235
-msgid "asterisk_sip_type"
+msgid "Client Type"
 msgstr ""
 
 #. Username
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:236
-msgid "asterisk_sip_username"
+msgid "Username"
 msgstr ""
 
 #. Section sipgeneral
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:237
-msgid "asterisk_sipgeneral"
+msgid "Section sipgeneral"
 msgstr ""
 
 #. Allow codecs
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:238
-msgid "asterisk_sipgeneral_allow"
-msgstr ""
-
-#. SIP Port
-#: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:239
-msgid "asterisk_sipgeneral_port"
+msgid "Allow codecs"
 msgstr ""
 
 #. SIP realm
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:240
-msgid "asterisk_sipgeneral_realm"
+msgid "SIP realm"
 msgstr ""
 
 #. Voicemail general options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:241
-msgid "asterisk_voicegeneral"
+msgid "Voicemail general options"
 msgstr ""
 
 #. From Email address of server
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:242
-msgid "asterisk_voicegeneral_serveremail"
+msgid "From Email address of server"
 msgstr ""
 
 #. Voice Mail boxes
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:243
-msgid "asterisk_voicemail"
+msgid "Voice Mail boxes"
 msgstr ""
 
 #. Email contains attachment
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:244
-msgid "asterisk_voicemail_attach"
+msgid "Email contains attachment"
 msgstr ""
 
 #. Email
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:245
-msgid "asterisk_voicemail_email"
+msgid "Email"
 msgstr ""
 
 #. Display Name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:246
-msgid "asterisk_voicemail_name"
+msgid "Display Name"
 msgstr ""
 
 #. Password
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:247
-msgid "asterisk_voicemail_password"
+msgid "Password"
 msgstr ""
 
 #. zone
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:248
-msgid "asterisk_voicemail_zone"
+msgid "zone"
 msgstr ""
 
 #. Voice Zone settings
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:249
-msgid "asterisk_voicezone"
+msgid "Voice Zone settings"
 msgstr ""
 
 #. Message Format
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:250
-msgid "asterisk_voicezone_message"
+msgid "Message Format"
 msgstr ""
 
 #. Time Zone
diff --git a/po/templates/cbi.pot b/po/templates/cbi.pot
index e3fc5bd8a..8500e8ceb 100644
--- a/po/templates/cbi.pot
+++ b/po/templates/cbi.pot
@@ -5,82 +5,86 @@ msgstr "Content-Type: text/plain; charset=UTF-8"
 
 #. Add entry
 #: i18n/english/luasrc/i18n/cbi.en.lua:1
-msgid "cbi_add"
+msgid "Add"
 msgstr ""
 
 #. Remove entry
 #: i18n/english/luasrc/i18n/cbi.en.lua:2
-msgid "cbi_del"
+msgid "Delete"
 msgstr ""
 
 #. Replace entry
 #: i18n/english/luasrc/i18n/cbi.en.lua:3
-msgid "cbi_replace"
+msgid "Replace entry"
 msgstr ""
 
 #. Invalid input value
 #: i18n/english/luasrc/i18n/cbi.en.lua:4
-msgid "cbi_invalid"
+msgid "Invalid"
 msgstr ""
 
 #. <strong>Validation failed:</strong> Please check any input fields for mistakes.
 #: i18n/english/luasrc/i18n/cbi.en.lua:5
-msgid "cbi_invalid_section"
+msgid ""
+"<strong>Validation failed:</strong> Please check any input fields for "
+"mistakes."
 msgstr ""
 
 #. This field is mandatory
 #: i18n/english/luasrc/i18n/cbi.en.lua:6
-msgid "cbi_missing"
+msgid "This field is mandatory"
 msgstr ""
 
 #. <strong>Validation failed:</strong> At least one mandatory field has no or an invalid value
 #: i18n/english/luasrc/i18n/cbi.en.lua:7
-msgid "cbi_deperror"
+msgid ""
+"<strong>Validation failed:</strong> At least one mandatory field has no or "
+"an invalid value"
 msgstr ""
 
 #. A requirement for this option was not met
 #: i18n/english/luasrc/i18n/cbi.en.lua:8
-msgid "cbi_reqerror"
+msgid "A requirement for this option was not met"
 msgstr ""
 
 #. -- Additional Field --
 #: i18n/english/luasrc/i18n/cbi.en.lua:9
-msgid "cbi_addopt"
+msgid "-- Additional Field --"
 msgstr ""
 
 #.  (optional)
 #: i18n/english/luasrc/i18n/cbi.en.lua:10
-msgid "cbi_optional"
+msgid " (optional)"
 msgstr ""
 
 #. This section contains no values yet
 #: i18n/english/luasrc/i18n/cbi.en.lua:11
-msgid "cbi_sectempty"
+msgid "This section contains no values yet"
 msgstr ""
 
 #. -- custom --
 #: i18n/english/luasrc/i18n/cbi.en.lua:12
-msgid "cbi_manual"
+msgid "-- custom --"
 msgstr ""
 
 #. -- Please choose --
 #: i18n/english/luasrc/i18n/cbi.en.lua:13
-msgid "cbi_select"
+msgid "-- Please choose --"
 msgstr ""
 
 #. Go to relevant configuration page
 #: i18n/english/luasrc/i18n/cbi.en.lua:14
-msgid "cbi_gorel"
+msgid " "
 msgstr ""
 
 #. Applying changes
 #: i18n/english/luasrc/i18n/cbi.en.lua:15
-msgid "cbi_applying"
+msgid "Applying changes"
 msgstr ""
 
 #. Uploaded File
 #: i18n/english/luasrc/i18n/cbi.en.lua:16
-msgid "cbi_upload"
+msgid "Uploaded File"
 msgstr ""
 
 #. Search file...
diff --git a/po/templates/coovachilli.pot b/po/templates/coovachilli.pot
index 79856e2d7..925fed377 100644
--- a/po/templates/coovachilli.pot
+++ b/po/templates/coovachilli.pot
@@ -5,882 +5,892 @@ msgstr "Content-Type: text/plain; charset=UTF-8"
 
 #. CoovaChilli
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:1
-msgid "coovachilli"
+msgid "CoovaChilli"
 msgstr ""
 
 #. General configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:2
-msgid "coovachilli_general"
+msgid "General configuration"
 msgstr ""
 
 #. General CoovaChilli settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:3
-msgid "coovachilli_general_desc"
+msgid "General CoovaChilli settings"
 msgstr ""
 
 #. Command socket
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:4
-msgid "coovachilli_general_cmdsock"
+msgid "Command socket"
 msgstr ""
 
 #. UNIX socket used for communication with chilli_query
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:5
-msgid "coovachilli_general_cmdsock_desc"
+msgid "UNIX socket used for communication with chilli_query"
 msgstr ""
 
 #. Config refresh interval
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:6
-msgid "coovachilli_general_interval"
+msgid "Config refresh interval"
 msgstr ""
 
 #. Re-read configuration file and do DNS lookups every interval seconds. This has the same effect as sending the HUP signal. If interval is 0 (zero) this feature is disabled. 
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:7
-msgid "coovachilli_general_interval_desc"
+msgid ""
+"Re-read configuration file and do DNS lookups every interval seconds. This "
+"has the same effect as sending the HUP signal. If interval is 0 (zero) this "
+"feature is disabled. "
 msgstr ""
 
 #. Pid file
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:8
-msgid "coovachilli_general_pidfile"
+msgid "Pid file"
 msgstr ""
 
 #. Filename to put the process id
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:9
-msgid "coovachilli_general_pidfile_desc"
+msgid "Filename to put the process id"
 msgstr ""
 
 #. State directory
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:10
-msgid "coovachilli_general_statedir"
+msgid "State directory"
 msgstr ""
 
 #. Directory of non-volatile data
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:11
-msgid "coovachilli_general_statedir_desc"
+msgid "Directory of non-volatile data"
 msgstr ""
 
 #. TUN/TAP configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:12
-msgid "coovachilli_tun"
+msgid "TUN/TAP configuration"
 msgstr ""
 
 #. Network/Tun configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:13
-msgid "coovachilli_tun_desc"
+msgid "Network/Tun configuration"
 msgstr ""
 
 #. Network down script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:14
-msgid "coovachilli_tun_condown"
+msgid "Network down script"
 msgstr ""
 
 #. Script executed after a session has moved from authorized state to unauthorized
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:15
-msgid "coovachilli_tun_condown_desc"
+msgid ""
+"Script executed after a session has moved from authorized state to "
+"unauthorized"
 msgstr ""
 
 #. Network up script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:16
-msgid "coovachilli_tun_conup"
+msgid "Network up script"
 msgstr ""
 
 #. Script executed after the tun network interface has been brought up
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:17
-msgid "coovachilli_tun_conup_desc"
+msgid "Script executed after the tun network interface has been brought up"
 msgstr ""
 
 #. Primary DNS Server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:18
-msgid "coovachilli_tun_dns1"
-msgstr ""
-
-#. Is used to inform the client about the DNS address to use for host name resolution
-#: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:19
-msgid "coovachilli_tun_dns1_desc"
+msgid "Primary DNS Server"
 msgstr ""
 
 #. Secondary DNS Server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:20
-msgid "coovachilli_tun_dns2"
-msgstr ""
-
-#. Is used to inform the client about the DNS address to use for host name resolution
-#: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:21
-msgid "coovachilli_tun_dns2_desc"
+msgid "Secondary DNS Server"
 msgstr ""
 
 #. Domain name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:22
-msgid "coovachilli_tun_domain"
+msgid "Domain name"
 msgstr ""
 
 #. Is used to inform the client about the domain name to use for DNS lookups
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:23
-msgid "coovachilli_tun_domain_desc"
+msgid ""
+"Is used to inform the client about the domain name to use for DNS lookups"
 msgstr ""
 
 #. Dynamic IP address pool
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:24
-msgid "coovachilli_tun_dynip"
+msgid "Dynamic IP address pool"
 msgstr ""
 
 #. Specifies a pool of dynamic IP addresses
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:25
-msgid "coovachilli_tun_dynip_desc"
+msgid "Specifies a pool of dynamic IP addresses"
 msgstr ""
 
 #. IP down script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:26
-msgid "coovachilli_tun_ipdown"
+msgid "IP down script"
 msgstr ""
 
 #. Script executed after the tun network interface has been taken down
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:27
-msgid "coovachilli_tun_ipdown_desc"
+msgid "Script executed after the tun network interface has been taken down"
 msgstr ""
 
 #. IP up script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:28
-msgid "coovachilli_tun_ipup"
+msgid "IP up script"
 msgstr ""
 
 #. Script executed after the TUN/TAP network interface has been brought up
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:29
-msgid "coovachilli_tun_ipup_desc"
+msgid "Script executed after the TUN/TAP network interface has been brought up"
 msgstr ""
 
 #. Uplink subnet
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:30
-msgid "coovachilli_tun_net"
+msgid "Uplink subnet"
 msgstr ""
 
 #. Network address of the uplink interface (CIDR notation)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:31
-msgid "coovachilli_tun_net_desc"
+msgid "Network address of the uplink interface (CIDR notation)"
 msgstr ""
 
 #. Static IP address pool
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:32
-msgid "coovachilli_tun_statip"
+msgid "Static IP address pool"
 msgstr ""
 
 #. Specifies a pool of static IP addresses
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:33
-msgid "coovachilli_tun_statip_desc"
+msgid "Specifies a pool of static IP addresses"
 msgstr ""
 
 #. TUN/TAP device
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:34
-msgid "coovachilli_tun_tundev"
+msgid "TUN/TAP device"
 msgstr ""
 
 #. The specific device to use for the TUN/TAP interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:35
-msgid "coovachilli_tun_tundev_desc"
+msgid "The specific device to use for the TUN/TAP interface"
 msgstr ""
 
 #. TX queue length
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:36
-msgid "coovachilli_tun_txqlen"
+msgid "TX queue length"
 msgstr ""
 
 #. The TX queue length to set on the TUN/TAP interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:37
-msgid "coovachilli_tun_txqlen_desc"
+msgid "The TX queue length to set on the TUN/TAP interface"
 msgstr ""
 
 #. Use TAP device
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:38
-msgid "coovachilli_tun_usetap"
+msgid "Use TAP device"
 msgstr ""
 
 #. Use the TAP interface instead of TUN
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:39
-msgid "coovachilli_tun_usetap_desc"
+msgid "Use the TAP interface instead of TUN"
 msgstr ""
 
 #. DHCP configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:40
-msgid "coovachilli_dhcp"
+msgid "DHCP configuration"
 msgstr ""
 
 #. Set DHCP options for connecting clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:41
-msgid "coovachilli_dhcp_desc"
+msgid "Set DHCP options for connecting clients"
 msgstr ""
 
 #. DHCP end number
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:42
-msgid "coovachilli_dhcp_dhcpend"
+msgid "DHCP end number"
 msgstr ""
 
 #. Where to stop assigning IP addresses (default 254)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:43
-msgid "coovachilli_dhcp_dhcpend_desc"
+msgid "Where to stop assigning IP addresses (default 254)"
 msgstr ""
 
 #. DHCP interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:44
-msgid "coovachilli_dhcp_dhcpif"
+msgid "DHCP interface"
 msgstr ""
 
 #. Ethernet interface to listen to for the downlink interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:45
-msgid "coovachilli_dhcp_dhcpif_desc"
+msgid "Ethernet interface to listen to for the downlink interface"
 msgstr ""
 
 #. Listen MAC address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:46
-msgid "coovachilli_dhcp_dhcpmac"
+msgid "Listen MAC address"
 msgstr ""
 
 #. MAC address to listen to. If not specified the MAC address of the interface will be used
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:47
-msgid "coovachilli_dhcp_dhcpmac_desc"
+msgid ""
+"MAC address to listen to. If not specified the MAC address of the interface "
+"will be used"
 msgstr ""
 
 #. DHCP start number
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:48
-msgid "coovachilli_dhcp_dhcpstart"
+msgid "DHCP start number"
 msgstr ""
 
 #. Where to start assigning IP addresses (default 10)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:49
-msgid "coovachilli_dhcp_dhcpstart_desc"
+msgid "Where to start assigning IP addresses (default 10)"
 msgstr ""
 
 #. Enable IEEE 802.1x
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:50
-msgid "coovachilli_dhcp_eapolenable"
+msgid "Enable IEEE 802.1x"
 msgstr ""
 
 #. Enable IEEE 802.1x authentication and listen for EAP requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:51
-msgid "coovachilli_dhcp_eapolenable_desc"
+msgid "Enable IEEE 802.1x authentication and listen for EAP requests"
 msgstr ""
 
 #. Leasetime
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:52
-msgid "coovachilli_dhcp_lease"
+msgid "Leasetime"
 msgstr ""
 
 #. Use a DHCP lease of seconds (default 600)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:53
-msgid "coovachilli_dhcp_lease_desc"
-msgstr ""
-
-#. RADIUS configuration
-#: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:54
-msgid "coovachilli_radius"
-msgstr ""
-
-#. RADIUS configuration
-#: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:55
-msgid "coovachilli_radius_desc"
+msgid "Use a DHCP lease of seconds (default 600)"
 msgstr ""
 
 #. Allow session update through RADIUS
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:56
-msgid "coovachilli_radius_acctupdate"
+msgid "Allow session update through RADIUS"
 msgstr ""
 
 #. Allow updating of session parameters with RADIUS attributes sent in Accounting-Response
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:57
-msgid "coovachilli_radius_acctupdate_desc"
+msgid ""
+"Allow updating of session parameters with RADIUS attributes sent in "
+"Accounting-Response"
 msgstr ""
 
 #. Admin password
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:58
-msgid "coovachilli_radius_adminpasswd"
+msgid "Admin password"
 msgstr ""
 
 #. Password to use for Administrative-User authentication in order to pick up chilli configurations and establish a device &quot;system&quot; session
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:59
-msgid "coovachilli_radius_adminpasswd_desc"
+msgid ""
+"Password to use for Administrative-User authentication in order to pick up "
+"chilli configurations and establish a device \"system\" session"
 msgstr ""
 
 #. Admin user
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:60
-msgid "coovachilli_radius_adminuser"
+msgid "Admin user"
 msgstr ""
 
 #. User-name to use for Administrative-User authentication in order to pick up chilli configurations and establish a device &quot;system&quot; session
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:61
-msgid "coovachilli_radius_adminuser_desc"
+msgid ""
+"User-name to use for Administrative-User authentication in order to pick up "
+"chilli configurations and establish a device \"system\" session"
 msgstr ""
 
 #. Do not check disconnection requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:62
-msgid "coovachilli_radius_coanoipcheck"
+msgid "Do not check disconnection requests"
 msgstr ""
 
 #. Do not check the source IP address of radius disconnect requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:63
-msgid "coovachilli_radius_coanoipcheck_desc"
+msgid "Do not check the source IP address of radius disconnect requests"
 msgstr ""
 
 #. RADIUS disconnect port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:64
-msgid "coovachilli_radius_coaport"
+msgid "RADIUS disconnect port"
 msgstr ""
 
 #. UDP port to listen to for accepting radius disconnect requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:65
-msgid "coovachilli_radius_coaport_desc"
+msgid "UDP port to listen to for accepting radius disconnect requests"
 msgstr ""
 
 #. NAS IP
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:66
-msgid "coovachilli_radius_nasip"
+msgid "NAS IP"
 msgstr ""
 
 #. Value to use in RADIUS NAS-IP-Address attribute
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:67
-msgid "coovachilli_radius_nasip_desc"
+msgid "Value to use in RADIUS NAS-IP-Address attribute"
 msgstr ""
 
 #. NAS MAC
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:68
-msgid "coovachilli_radius_nasmac"
+msgid "NAS MAC"
 msgstr ""
 
 #. MAC address value to use in RADIUS Called-Station-ID attribute
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:69
-msgid "coovachilli_radius_nasmac_desc"
+msgid "MAC address value to use in RADIUS Called-Station-ID attribute"
 msgstr ""
 
 #. Allow OpenID authentication
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:70
-msgid "coovachilli_radius_openidauth"
+msgid "Allow OpenID authentication"
 msgstr ""
 
 #. Allows OpenID authentication by sending ChilliSpot-Config=allow-openidauth in RADIUS Access-Requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:71
-msgid "coovachilli_radius_openidauth_desc"
+msgid ""
+"Allows OpenID authentication by sending ChilliSpot-Config=allow-openidauth "
+"in RADIUS Access-Requests"
 msgstr ""
 
 #. RADIUS accounting port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:72
-msgid "coovachilli_radius_radiusacctport"
+msgid "RADIUS accounting port"
 msgstr ""
 
 #. The UDP port number to use for radius accounting requests (default 1813)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:73
-msgid "coovachilli_radius_radiusacctport_desc"
+msgid ""
+"The UDP port number to use for radius accounting requests (default 1813)"
 msgstr ""
 
 #. RADIUS authentication port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:74
-msgid "coovachilli_radius_radiusauthport"
+msgid "RADIUS authentication port"
 msgstr ""
 
 #. The UDP port number to use for radius authentication requests (default 1812)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:75
-msgid "coovachilli_radius_radiusauthport_desc"
+msgid ""
+"The UDP port number to use for radius authentication requests (default 1812)"
 msgstr ""
 
 #. Option radiuscalled
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:76
-msgid "coovachilli_radius_radiuscalled"
+msgid "Option radiuscalled"
 msgstr ""
 
 #. RADIUS listen address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:77
-msgid "coovachilli_radius_radiuslisten"
+msgid "RADIUS listen address"
 msgstr ""
 
 #. Local interface IP address to use for the radius interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:78
-msgid "coovachilli_radius_radiuslisten_desc"
+msgid "Local interface IP address to use for the radius interface"
 msgstr ""
 
 #. RADIUS location ID
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:79
-msgid "coovachilli_radius_radiuslocationid"
+msgid "RADIUS location ID"
 msgstr ""
 
 #. WISPr Location ID
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:80
-msgid "coovachilli_radius_radiuslocationid_desc"
+msgid "WISPr Location ID"
 msgstr ""
 
 #. RADIUS location name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:81
-msgid "coovachilli_radius_radiuslocationname"
+msgid "RADIUS location name"
 msgstr ""
 
 #. WISPr Location Name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:82
-msgid "coovachilli_radius_radiuslocationname_desc"
+msgid "WISPr Location Name"
 msgstr ""
 
 #. NAS ID
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:83
-msgid "coovachilli_radius_radiusnasid"
+msgid "NAS ID"
 msgstr ""
 
 #. Network access server identifier
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:84
-msgid "coovachilli_radius_radiusnasid_desc"
+msgid "Network access server identifier"
 msgstr ""
 
 #. Option radiusnasip
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:85
-msgid "coovachilli_radius_radiusnasip"
+msgid "Option radiusnasip"
 msgstr ""
 
 #. NAS port type
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:86
-msgid "coovachilli_radius_radiusnasporttype"
+msgid "NAS port type"
 msgstr ""
 
 #. Value of NAS-Port-Type attribute. Defaults to 19 (Wireless-IEEE-802.11)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:87
-msgid "coovachilli_radius_radiusnasporttype_desc"
+msgid "Value of NAS-Port-Type attribute. Defaults to 19 (Wireless-IEEE-802.11)"
 msgstr ""
 
 #. Send RADIUS VSA
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:88
-msgid "coovachilli_radius_radiusoriginalurl"
+msgid "Send RADIUS VSA"
 msgstr ""
 
 #. Send the ChilliSpot-OriginalURL RADIUS VSA in Access-Request
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:89
-msgid "coovachilli_radius_radiusoriginalurl_desc"
+msgid "Send the ChilliSpot-OriginalURL RADIUS VSA in Access-Request"
 msgstr ""
 
 #. RADIUS secret
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:90
-msgid "coovachilli_radius_radiussecret"
+msgid "RADIUS secret"
 msgstr ""
 
 #. Radius shared secret for both servers
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:91
-msgid "coovachilli_radius_radiussecret_desc"
+msgid "Radius shared secret for both servers"
 msgstr ""
 
 #. RADIUS server 1
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:92
-msgid "coovachilli_radius_radiusserver1"
+msgid "RADIUS server 1"
 msgstr ""
 
 #. The IP address of radius server 1
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:93
-msgid "coovachilli_radius_radiusserver1_desc"
+msgid "The IP address of radius server 1"
 msgstr ""
 
 #. RADIUS server 2
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:94
-msgid "coovachilli_radius_radiusserver2"
+msgid "RADIUS server 2"
 msgstr ""
 
 #. The IP address of radius server 2
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:95
-msgid "coovachilli_radius_radiusserver2_desc"
+msgid "The IP address of radius server 2"
 msgstr ""
 
 #. Swap octets
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:96
-msgid "coovachilli_radius_swapoctets"
+msgid "Swap octets"
 msgstr ""
 
 #. Swap the meaning of &quot;input octets&quot; and &quot;output octets&quot; as it related to RADIUS attribtues
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:97
-msgid "coovachilli_radius_swapoctets_desc"
+msgid ""
+"Swap the meaning of \"input octets\" and \"output octets\" as it related to "
+"RADIUS attribtues"
 msgstr ""
 
 #. Allow WPA guests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:98
-msgid "coovachilli_radius_wpaguests"
+msgid "Allow WPA guests"
 msgstr ""
 
 #. Allows WPA Guest authentication by sending ChilliSpot-Config=allow-wpa-guests in RADIUS Access-Requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:99
-msgid "coovachilli_radius_wpaguests_desc"
-msgstr ""
-
-#. RADIUS proxy settings
-#: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:100
-msgid "coovachilli_proxy"
-msgstr ""
-
-#. RADIUS proxy settings
-#: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:101
-msgid "coovachilli_proxy_desc"
+msgid ""
+"Allows WPA Guest authentication by sending ChilliSpot-Config=allow-wpa-"
+"guests in RADIUS Access-Requests"
 msgstr ""
 
 #. Proxy client
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:102
-msgid "coovachilli_proxy_proxyclient"
+msgid "Proxy client"
 msgstr ""
 
 #. IP address from which radius requests are accepted. If omitted the server will not accept radius requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:103
-msgid "coovachilli_proxy_proxyclient_desc"
+msgid ""
+"IP address from which radius requests are accepted. If omitted the server "
+"will not accept radius requests"
 msgstr ""
 
 #. Proxy listen address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:104
-msgid "coovachilli_proxy_proxylisten"
+msgid "Proxy listen address"
 msgstr ""
 
 #. Local interface IP address to use for accepting radius requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:105
-msgid "coovachilli_proxy_proxylisten_desc"
+msgid "Local interface IP address to use for accepting radius requests"
 msgstr ""
 
 #. Proxy port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:106
-msgid "coovachilli_proxy_proxyport"
+msgid "Proxy port"
 msgstr ""
 
 #. UDP Port to listen to for accepting radius requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:107
-msgid "coovachilli_proxy_proxyport_desc"
+msgid "UDP Port to listen to for accepting radius requests"
 msgstr ""
 
 #. Proxy secret
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:108
-msgid "coovachilli_proxy_proxysecret"
+msgid "Proxy secret"
 msgstr ""
 
 #. Radius shared secret for clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:109
-msgid "coovachilli_proxy_proxysecret_desc"
+msgid "Radius shared secret for clients"
 msgstr ""
 
 #. UAM configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:110
-msgid "coovachilli_uam"
+msgid "UAM configuration"
 msgstr ""
 
 #. Unified Configuration Method settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:111
-msgid "coovachilli_uam_desc"
+msgid "Unified Configuration Method settings"
 msgstr ""
 
 #. Use Chilli XML
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:112
-msgid "coovachilli_uam_chillixml"
+msgid "Use Chilli XML"
 msgstr ""
 
 #. Return the so-called Chilli XML along with WISPr XML
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:113
-msgid "coovachilli_uam_chillixml_desc"
+msgid "Return the so-called Chilli XML along with WISPr XML"
 msgstr ""
 
 #. Default idle timeout
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:114
-msgid "coovachilli_uam_defidletimeout"
+msgid "Default idle timeout"
 msgstr ""
 
 #. Default idle timeout unless otherwise set by RADIUS (defaults to 0)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:115
-msgid "coovachilli_uam_defidletimeout_desc"
+msgid "Default idle timeout unless otherwise set by RADIUS (defaults to 0)"
 msgstr ""
 
 #. Default interim interval
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:116
-msgid "coovachilli_uam_definteriminterval"
+msgid "Default interim interval"
 msgstr ""
 
 #. Default interim-interval for RADIUS accounting unless otherwise set by RADIUS (defaults to 0)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:117
-msgid "coovachilli_uam_definteriminterval_desc"
+msgid ""
+"Default interim-interval for RADIUS accounting unless otherwise set by "
+"RADIUS (defaults to 0)"
 msgstr ""
 
 #. Default session timeout
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:118
-msgid "coovachilli_uam_defsessiontimeout"
+msgid "Default session timeout"
 msgstr ""
 
 #. Default session timeout unless otherwise set by RADIUS (defaults to 0)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:119
-msgid "coovachilli_uam_defsessiontimeout_desc"
+msgid "Default session timeout unless otherwise set by RADIUS (defaults to 0)"
 msgstr ""
 
 #. Inspect DNS traffic
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:120
-msgid "coovachilli_uam_dnsparanoia"
+msgid "Inspect DNS traffic"
 msgstr ""
 
 #. Inspect DNS packets and drop responses with any non- A, CNAME, SOA, or MX records to prevent dns tunnels (experimental)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:121
-msgid "coovachilli_uam_dnsparanoia_desc"
+msgid ""
+"Inspect DNS packets and drop responses with any non- A, CNAME, SOA, or MX "
+"records to prevent dns tunnels (experimental)"
 msgstr ""
 
 #. Local users file
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:122
-msgid "coovachilli_uam_localusers"
+msgid "Local users file"
 msgstr ""
 
 #. A colon seperated file containing usernames and passwords of locally authenticated users
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:123
-msgid "coovachilli_uam_localusers_desc"
+msgid ""
+"A colon seperated file containing usernames and passwords of locally "
+"authenticated users"
 msgstr ""
 
 #. Location name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:124
-msgid "coovachilli_uam_locationname"
+msgid "Location name"
 msgstr ""
 
 #. Human readable location name used in JSON interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:125
-msgid "coovachilli_uam_locationname_desc"
+msgid "Human readable location name used in JSON interface"
 msgstr ""
 
 #. Do not redirect to UAM server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:126
-msgid "coovachilli_uam_nouamsuccess"
+msgid "Do not redirect to UAM server"
 msgstr ""
 
 #. Do not return to UAM server on login success, just redirect to original URL
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:127
-msgid "coovachilli_uam_nouamsuccess_desc"
+msgid ""
+"Do not return to UAM server on login success, just redirect to original URL"
 msgstr ""
 
 #. Do not do WISPr
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:128
-msgid "coovachilli_uam_nouamwispr"
+msgid "Do not do WISPr"
 msgstr ""
 
 #. Do not do any WISPr XML, assume the back-end is doing this instead
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:129
-msgid "coovachilli_uam_nouamwispr_desc"
+msgid "Do not do any WISPr XML, assume the back-end is doing this instead"
 msgstr ""
 
 #. Post auth proxy
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:130
-msgid "coovachilli_uam_postauthproxy"
+msgid "Post auth proxy"
 msgstr ""
 
 #. Used with postauthproxyport to define a post authentication HTTP proxy server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:131
-msgid "coovachilli_uam_postauthproxy_desc"
+msgid ""
+"Used with postauthproxyport to define a post authentication HTTP proxy server"
 msgstr ""
 
 #. Post auth proxy port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:132
-msgid "coovachilli_uam_postauthproxyport"
+msgid "Post auth proxy port"
 msgstr ""
 
 #. Used with postauthproxy to define a post authentication HTTP proxy server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:133
-msgid "coovachilli_uam_postauthproxyport_desc"
+msgid ""
+"Used with postauthproxy to define a post authentication HTTP proxy server"
 msgstr ""
 
 #. Allowed resources
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:134
-msgid "coovachilli_uam_uamallowed"
+msgid "Allowed resources"
 msgstr ""
 
 #. List of resources the client can access without first authenticating
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:135
-msgid "coovachilli_uam_uamallowed_desc"
+msgid "List of resources the client can access without first authenticating"
 msgstr ""
 
 #. Allow any DNS server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:136
-msgid "coovachilli_uam_uamanydns"
+msgid "Allow any DNS server"
 msgstr ""
 
 #. Allow any DNS server for unauthenticated clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:137
-msgid "coovachilli_uam_uamanydns_desc"
+msgid "Allow any DNS server for unauthenticated clients"
 msgstr ""
 
 #. Allow any IP address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:138
-msgid "coovachilli_uam_uamanyip"
+msgid "Allow any IP address"
 msgstr ""
 
 #. Allow clients to use any IP settings they wish by spoofing ARP (experimental)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:139
-msgid "coovachilli_uam_uamanyip_desc"
+msgid ""
+"Allow clients to use any IP settings they wish by spoofing ARP (experimental)"
 msgstr ""
 
 #. Allowed domains
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:140
-msgid "coovachilli_uam_uamdomain"
+msgid "Allowed domains"
 msgstr ""
 
 #. Defines a list of domain names to automatically add to the walled garden
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:141
-msgid "coovachilli_uam_uamdomain_desc"
+msgid ""
+"Defines a list of domain names to automatically add to the walled garden"
 msgstr ""
 
 #. UAM homepage
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:142
-msgid "coovachilli_uam_uamhomepage"
+msgid "UAM homepage"
 msgstr ""
 
 #. URL of homepage to redirect unauthenticated users to
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:143
-msgid "coovachilli_uam_uamhomepage_desc"
+msgid "URL of homepage to redirect unauthenticated users to"
 msgstr ""
 
 #. UAM static content port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:144
-msgid "coovachilli_uam_uamiport"
+msgid "UAM static content port"
 msgstr ""
 
 #. TCP port to bind to for only serving embedded content
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:145
-msgid "coovachilli_uam_uamiport_desc"
+msgid "TCP port to bind to for only serving embedded content"
 msgstr ""
 
 #. UAM listening address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:146
-msgid "coovachilli_uam_uamlisten"
+msgid "UAM listening address"
 msgstr ""
 
 #. IP address to listen to for authentication of clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:147
-msgid "coovachilli_uam_uamlisten_desc"
+msgid "IP address to listen to for authentication of clients"
 msgstr ""
 
 #. UAM logout IP
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:148
-msgid "coovachilli_uam_uamlogoutip"
+msgid "UAM logout IP"
 msgstr ""
 
 #. Use this IP address to instantly logout a client accessing it (defaults to 1.1.1.1)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:149
-msgid "coovachilli_uam_uamlogoutip_desc"
+msgid ""
+"Use this IP address to instantly logout a client accessing it (defaults to "
+"1.1.1.1)"
 msgstr ""
 
 #. UAM listening port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:150
-msgid "coovachilli_uam_uamport"
+msgid "UAM listening port"
 msgstr ""
 
 #. TCP port to bind to for authenticating clients (default 3990)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:151
-msgid "coovachilli_uam_uamport_desc"
+msgid "TCP port to bind to for authenticating clients (default 3990)"
 msgstr ""
 
 #. UAM secret
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:152
-msgid "coovachilli_uam_uamsecret"
+msgid "UAM secret"
 msgstr ""
 
 #. Shared secret between uamserver and chilli
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:153
-msgid "coovachilli_uam_uamsecret_desc"
+msgid "Shared secret between uamserver and chilli"
 msgstr ""
 
 #. UAM server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:154
-msgid "coovachilli_uam_uamserver"
+msgid "UAM server"
 msgstr ""
 
 #. URL of web server to use for authenticating clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:155
-msgid "coovachilli_uam_uamserver_desc"
+msgid "URL of web server to use for authenticating clients"
 msgstr ""
 
 #. UAM user interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:156
-msgid "coovachilli_uam_uamui"
+msgid "UAM user interface"
 msgstr ""
 
 #. An init.d style program to handle local content on the uamuiport web server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:157
-msgid "coovachilli_uam_uamui_desc"
+msgid ""
+"An init.d style program to handle local content on the uamuiport web server"
 msgstr ""
 
 #. Use status file
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:158
-msgid "coovachilli_uam_usestatusfile"
+msgid "Use status file"
 msgstr ""
 
 #. Write the status of clients in a non-volatile state file (experimental)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:159
-msgid "coovachilli_uam_usestatusfile_desc"
+msgid "Write the status of clients in a non-volatile state file (experimental)"
 msgstr ""
 
 #. WISPr login url
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:160
-msgid "coovachilli_uam_wisprlogin"
+msgid "WISPr login url"
 msgstr ""
 
 #. Specific URL to be given in WISPr XML LoginURL
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:161
-msgid "coovachilli_uam_wisprlogin_desc"
+msgid "Specific URL to be given in WISPr XML LoginURL"
 msgstr ""
 
 #. CGI program
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:162
-msgid "coovachilli_uam_wwwbin"
+msgid "CGI program"
 msgstr ""
 
 #. Executable to run as a CGI type program (like haserl) for URLs with extention .chi
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:163
-msgid "coovachilli_uam_wwwbin_desc"
+msgid ""
+"Executable to run as a CGI type program (like haserl) for URLs with "
+"extention .chi"
 msgstr ""
 
 #. Web content directory
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:164
-msgid "coovachilli_uam_wwwdir"
+msgid "Web content directory"
 msgstr ""
 
 #. Directory where embedded local web content is placed
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:165
-msgid "coovachilli_uam_wwwdir_desc"
+msgid "Directory where embedded local web content is placed"
 msgstr ""
 
 #. MAC configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:166
-msgid "coovachilli_macauth"
+msgid "MAC configuration"
 msgstr ""
 
 #. Configure MAC authentication
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:167
-msgid "coovachilli_macauth_desc"
+msgid "Configure MAC authentication"
 msgstr ""
 
 #. Allowed MAC addresses
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:168
-msgid "coovachilli_macauth_macallowed"
+msgid "Allowed MAC addresses"
 msgstr ""
 
 #. List of MAC addresses for which MAC authentication will be performed
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:169
-msgid "coovachilli_macauth_macallowed_desc"
+msgid "List of MAC addresses for which MAC authentication will be performed"
 msgstr ""
 
 #. Authenticate locally allowed MACs
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:170
-msgid "coovachilli_macauth_macallowlocal"
+msgid "Authenticate locally allowed MACs"
 msgstr ""
 
 #. Authenticate allowed MAC addresses without the use of RADIUS
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:171
-msgid "coovachilli_macauth_macallowlocal_desc"
+msgid "Authenticate allowed MAC addresses without the use of RADIUS"
 msgstr ""
 
 #. Enable MAC authentification
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:172
-msgid "coovachilli_macauth_macauth"
+msgid "Enable MAC authentification"
 msgstr ""
 
 #. Try to authenticate all users based on their mac address alone
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:173
-msgid "coovachilli_macauth_macauth_desc"
+msgid "Try to authenticate all users based on their mac address alone"
 msgstr ""
 
 #. Password
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:174
-msgid "coovachilli_macauth_macpasswd"
+msgid "Password"
 msgstr ""
 
 #. Password used when performing MAC authentication
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:175
-msgid "coovachilli_macauth_macpasswd_desc"
+msgid "Password used when performing MAC authentication"
 msgstr ""
 
 #. Suffix
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:176
-msgid "coovachilli_macauth_macsuffix"
+msgid "Suffix"
 msgstr ""
 
 #. Suffix to add to the MAC address in order to form the User-Name, which is sent to the radius server
diff --git a/po/templates/ddns.pot b/po/templates/ddns.pot
index 7e9a8a1b9..6c5d1d444 100644
--- a/po/templates/ddns.pot
+++ b/po/templates/ddns.pot
@@ -5,37 +5,39 @@ msgstr "Content-Type: text/plain; charset=UTF-8"
 
 #. Dynamic DNS
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:1
-msgid "ddns"
+msgid "Dynamic DNS"
 msgstr ""
 
 #. Dynamic DNS allows that your router can be reached with a fixed hostname while having a dynamically changing IP-Address.
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:2
-msgid "ddns_desc"
+msgid ""
+"Dynamic DNS allows that your router can be reached with a fixed hostname "
+"while having a dynamically changing IP-Address."
 msgstr ""
 
 #. Source of IP-Address
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:3
-msgid "ddns_service_ipsource"
+msgid "Source of IP-Address"
 msgstr ""
 
 #. Check for changed IP every
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:4
-msgid "ddns_service_checkinterval"
+msgid "Check for changed IP every"
 msgstr ""
 
 #. Check-Time unit
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:5
-msgid "ddns_service_checkunit"
+msgid "Check-Time unit"
 msgstr ""
 
 #. Force update every
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:6
-msgid "ddns_service_forceinterval"
+msgid "Force update every"
 msgstr ""
 
 #. Force-Time unit
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:7
-msgid "ddns_service_forceunit"
+msgid "Force-Time unit"
 msgstr ""
 
 #. Custom Update-URL
diff --git a/po/templates/default.pot b/po/templates/default.pot
index 754945ff8..ad82372b2 100644
--- a/po/templates/default.pot
+++ b/po/templates/default.pot
@@ -5,37 +5,37 @@ msgstr "Content-Type: text/plain; charset=UTF-8"
 
 #. Skip to navigation
 #: i18n/english/luasrc/i18n/default.en.lua:1
-msgid "skiplink1"
+msgid "Skip to navigation"
 msgstr ""
 
 #. Skip to content
 #: i18n/english/luasrc/i18n/default.en.lua:2
-msgid "skiplink2"
+msgid "Skip to content"
 msgstr ""
 
 #. Navigation
 #: i18n/english/luasrc/i18n/default.en.lua:3
-msgid "navigation"
+msgid "Navigation"
 msgstr ""
 
 #. About
 #: i18n/english/luasrc/i18n/default.en.lua:4
-msgid "about"
+msgid "About"
 msgstr ""
 
 #. Add
 #: i18n/english/luasrc/i18n/default.en.lua:5
-msgid "add"
+msgid "Add"
 msgstr ""
 
 #. Addresses
 #: i18n/english/luasrc/i18n/default.en.lua:6
-msgid "addresses"
+msgid "Addresses"
 msgstr ""
 
 #. Aliases
 #: i18n/english/luasrc/i18n/default.en.lua:7
-msgid "aliases"
+msgid "Aliases"
 msgstr ""
 
 #. all
@@ -50,97 +50,99 @@ msgstr ""
 
 #. Administration
 #: i18n/english/luasrc/i18n/default.en.lua:10
-msgid "administration"
+msgid "Administration"
 msgstr ""
 
 #. Essentials
 #: i18n/english/luasrc/i18n/default.en.lua:11
-msgid "essentials"
+msgid "Essentials"
 msgstr ""
 
 #. Apply
 #: i18n/english/luasrc/i18n/default.en.lua:12
-msgid "apply"
+msgid "Apply"
 msgstr ""
 
 #. Basic Settings
 #: i18n/english/luasrc/i18n/default.en.lua:13
-msgid "basicsettings"
+msgid "Basic Settings"
 msgstr ""
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast
 #: i18n/english/luasrc/i18n/default.en.lua:14
-msgid "broadcast"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"
 msgstr ""
 
 #. Cancel
 #: i18n/english/luasrc/i18n/default.en.lua:15
-msgid "cancel"
+msgid "Cancel"
 msgstr ""
 
 #. Changes
 #: i18n/english/luasrc/i18n/default.en.lua:16
-msgid "changes"
+msgid "Changes"
 msgstr ""
 
 #. Channel
 #: i18n/english/luasrc/i18n/default.en.lua:17
-msgid "channel"
+msgid "Channel"
 msgstr ""
 
 #. <abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/prefix
 #: i18n/english/luasrc/i18n/default.en.lua:18
-msgid "cidr6"
+msgid ""
+"<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
+"prefix"
 msgstr ""
 
 #. Code
 #: i18n/english/luasrc/i18n/default.en.lua:19
-msgid "code"
+msgid "Code"
 msgstr ""
 
 #. Configuration
 #: i18n/english/luasrc/i18n/default.en.lua:20
-msgid "config"
+msgid "Configuration"
 msgstr ""
 
 #. Configuration file
 #: i18n/english/luasrc/i18n/default.en.lua:21
-msgid "configfile"
+msgid "Configuration file"
 msgstr ""
 
 #. Confirmation
 #: i18n/english/luasrc/i18n/default.en.lua:22
-msgid "confirmation"
+msgid "Confirmation"
 msgstr ""
 
 #. Delete
 #: i18n/english/luasrc/i18n/default.en.lua:23
-msgid "delete"
+msgid "Delete"
 msgstr ""
 
 #. Description
 #: i18n/english/luasrc/i18n/default.en.lua:24
-msgid "descr"
+msgid "Description"
 msgstr ""
 
 #. Design
 #: i18n/english/luasrc/i18n/default.en.lua:25
-msgid "design"
+msgid "Design"
 msgstr ""
 
 #. Destination
 #: i18n/english/luasrc/i18n/default.en.lua:26
-msgid "destination"
+msgid "Destination"
 msgstr ""
 
 #. Device
 #: i18n/english/luasrc/i18n/default.en.lua:27
-msgid "device"
+msgid "Device"
 msgstr ""
 
 #. Devices
 #: i18n/english/luasrc/i18n/default.en.lua:28
-msgid "devices"
+msgid "Devices"
 msgstr ""
 
 #. disable
@@ -150,22 +152,22 @@ msgstr ""
 
 #. Distance
 #: i18n/english/luasrc/i18n/default.en.lua:30
-msgid "distance"
+msgid "Distance"
 msgstr ""
 
 #. Kernel Log
 #: i18n/english/luasrc/i18n/default.en.lua:31
-msgid "dmesg"
+msgid "Kernel Log"
 msgstr ""
 
 #. <abbr title=\"Domain Name System\">DNS</abbr>-Server
 #: i18n/english/luasrc/i18n/default.en.lua:32
-msgid "dnsserver"
+msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Server"
 msgstr ""
 
 #. Edit
 #: i18n/english/luasrc/i18n/default.en.lua:33
-msgid "edit"
+msgid "Edit"
 msgstr ""
 
 #. enable
@@ -175,47 +177,47 @@ msgstr ""
 
 #. Encryption
 #: i18n/english/luasrc/i18n/default.en.lua:35
-msgid "encryption"
+msgid "Encryption"
 msgstr ""
 
 #. Error
 #: i18n/english/luasrc/i18n/default.en.lua:36
-msgid "error"
+msgid "Error"
 msgstr ""
 
 #. Filesystem
 #: i18n/english/luasrc/i18n/default.en.lua:37
-msgid "filesystem"
+msgid "Filesystem"
 msgstr ""
 
 #. Filter
 #: i18n/english/luasrc/i18n/default.en.lua:38
-msgid "filter"
+msgid "Filter"
 msgstr ""
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway
 #: i18n/english/luasrc/i18n/default.en.lua:39
-msgid "gateway"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
 msgstr ""
 
 #. <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway
 #: i18n/english/luasrc/i18n/default.en.lua:40
-msgid "gateway6"
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 msgstr ""
 
 #. General
 #: i18n/english/luasrc/i18n/default.en.lua:41
-msgid "general"
+msgid "General"
 msgstr ""
 
 #. Hostname
 #: i18n/english/luasrc/i18n/default.en.lua:42
-msgid "hostname"
+msgid "Hostname"
 msgstr ""
 
 #. Install
 #: i18n/english/luasrc/i18n/default.en.lua:43
-msgid "install"
+msgid "Install"
 msgstr ""
 
 #. installed
@@ -225,102 +227,102 @@ msgstr ""
 
 #. Interface
 #: i18n/english/luasrc/i18n/default.en.lua:45
-msgid "interface"
+msgid "Interface"
 msgstr ""
 
 #. Interfaces
 #: i18n/english/luasrc/i18n/default.en.lua:46
-msgid "interfaces"
+msgid "Interfaces"
 msgstr ""
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address
 #: i18n/english/luasrc/i18n/default.en.lua:47
-msgid "ipaddress"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
 msgstr ""
 
 #. <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address
 #: i18n/english/luasrc/i18n/default.en.lua:48
-msgid "ip6address"
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address"
 msgstr ""
 
 #. Legend
 #: i18n/english/luasrc/i18n/default.en.lua:49
-msgid "legend"
+msgid "Legend"
 msgstr ""
 
 #. Library
 #: i18n/english/luasrc/i18n/default.en.lua:50
-msgid "library"
+msgid "Library"
 msgstr ""
 
 #. Logout
 #: i18n/english/luasrc/i18n/default.en.lua:51
-msgid "logout"
+msgid "Logout"
 msgstr ""
 
 #. Key
 #: i18n/english/luasrc/i18n/default.en.lua:52
-msgid "key"
+msgid "Key"
 msgstr ""
 
 #. Language
 #: i18n/english/luasrc/i18n/default.en.lua:53
-msgid "language"
+msgid "Language"
 msgstr ""
 
 #. Limit
 #: i18n/english/luasrc/i18n/default.en.lua:54
-msgid "limit"
+msgid "Limit"
 msgstr ""
 
 #. Load
 #: i18n/english/luasrc/i18n/default.en.lua:55
-msgid "load"
+msgid "Load"
 msgstr ""
 
 #. Login
 #: i18n/english/luasrc/i18n/default.en.lua:56
-msgid "login"
+msgid "Login"
 msgstr ""
 
 #. <abbr title=\"Media Access Control\">MAC</abbr>-Address
 #: i18n/english/luasrc/i18n/default.en.lua:57
-msgid "macaddress"
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr ""
 
 #. see &#39;%s&#39; manpage
 #: i18n/english/luasrc/i18n/default.en.lua:58
-msgid "manpage"
+msgid "see '%s' manpage"
 msgstr ""
 
 #. Metric
 #: i18n/english/luasrc/i18n/default.en.lua:59
-msgid "metric"
+msgid "Metric"
 msgstr ""
 
 #. Mode
 #: i18n/english/luasrc/i18n/default.en.lua:60
-msgid "mode"
+msgid "Mode"
 msgstr ""
 
 #. Name
 #: i18n/english/luasrc/i18n/default.en.lua:61
-msgid "name"
+msgid "Name"
 msgstr ""
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask
 #: i18n/english/luasrc/i18n/default.en.lua:62
-msgid "netmask"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr ""
 
 #. Network
 #: i18n/english/luasrc/i18n/default.en.lua:63
-msgid "network"
+msgid "Network"
 msgstr ""
 
 #. Networks
 #: i18n/english/luasrc/i18n/default.en.lua:64
-msgid "networks"
+msgid "Networks"
 msgstr ""
 
 #. none
@@ -330,117 +332,117 @@ msgstr ""
 
 #. not installed
 #: i18n/english/luasrc/i18n/default.en.lua:66
-msgid "notinstalled"
+msgid "not installed"
 msgstr ""
 
 #. OK
 #: i18n/english/luasrc/i18n/default.en.lua:67
-msgid "ok"
+msgid "OK"
 msgstr ""
 
 #. Options
 #: i18n/english/luasrc/i18n/default.en.lua:68
-msgid "options"
+msgid "Options"
 msgstr ""
 
 #. Overview
 #: i18n/english/luasrc/i18n/default.en.lua:69
-msgid "overview"
+msgid "Overview"
 msgstr ""
 
 #. Package Manager
 #: i18n/english/luasrc/i18n/default.en.lua:70
-msgid "packagemanager"
+msgid "Package Manager"
 msgstr ""
 
 #. Password
 #: i18n/english/luasrc/i18n/default.en.lua:71
-msgid "password"
+msgid "Password"
 msgstr ""
 
 #. Path
 #: i18n/english/luasrc/i18n/default.en.lua:72
-msgid "path"
+msgid "Path"
 msgstr ""
 
 #. Port
 #: i18n/english/luasrc/i18n/default.en.lua:73
-msgid "port"
+msgid "Port"
 msgstr ""
 
 #. Ports
 #: i18n/english/luasrc/i18n/default.en.lua:74
-msgid "ports"
+msgid "Ports"
 msgstr ""
 
 #. Proceed
 #: i18n/english/luasrc/i18n/default.en.lua:75
-msgid "proceed"
+msgid "Proceed"
 msgstr ""
 
 #. Protocol
 #: i18n/english/luasrc/i18n/default.en.lua:76
-msgid "protocol"
+msgid "Protocol"
 msgstr ""
 
 #. Reboot
 #: i18n/english/luasrc/i18n/default.en.lua:77
-msgid "reboot"
+msgid "Reboot"
 msgstr ""
 
 #. Reset
 #: i18n/english/luasrc/i18n/default.en.lua:78
-msgid "reset"
+msgid "Reset"
 msgstr ""
 
 #. Revert
 #: i18n/english/luasrc/i18n/default.en.lua:79
-msgid "revert"
+msgid "Revert"
 msgstr ""
 
 #. Save
 #: i18n/english/luasrc/i18n/default.en.lua:80
-msgid "save"
+msgid "Save"
 msgstr ""
 
 #. Save &amp; Apply
 #: i18n/english/luasrc/i18n/default.en.lua:81
-msgid "saveapply"
+msgid "Save & Apply"
 msgstr ""
 
 #. Scan
 #: i18n/english/luasrc/i18n/default.en.lua:82
-msgid "scan"
+msgid "Scan"
 msgstr ""
 
 #. Service
 #: i18n/english/luasrc/i18n/default.en.lua:83
-msgid "service"
+msgid "Service"
 msgstr ""
 
 #. Services
 #: i18n/english/luasrc/i18n/default.en.lua:84
-msgid "services"
+msgid "Services"
 msgstr ""
 
 #. Settings
 #: i18n/english/luasrc/i18n/default.en.lua:85
-msgid "settings"
+msgid "Settings"
 msgstr ""
 
 #. Size
 #: i18n/english/luasrc/i18n/default.en.lua:86
-msgid "size"
+msgid "Size"
 msgstr ""
 
 #. Source
 #: i18n/english/luasrc/i18n/default.en.lua:87
-msgid "source"
+msgid "Source"
 msgstr ""
 
 #. Start
 #: i18n/english/luasrc/i18n/default.en.lua:88
-msgid "start"
+msgid "Start"
 msgstr ""
 
 #. static
@@ -450,72 +452,72 @@ msgstr ""
 
 #. Status
 #: i18n/english/luasrc/i18n/default.en.lua:90
-msgid "status"
+msgid "Status"
 msgstr ""
 
 #. Statistics
 #: i18n/english/luasrc/i18n/default.en.lua:91
-msgid "statistics"
+msgid "Statistics"
 msgstr ""
 
 #. Submit
 #: i18n/english/luasrc/i18n/default.en.lua:92
-msgid "submit"
+msgid "Submit"
 msgstr ""
 
 #. System Log
 #: i18n/english/luasrc/i18n/default.en.lua:93
-msgid "syslog"
+msgid "System Log"
 msgstr ""
 
 #. System
 #: i18n/english/luasrc/i18n/default.en.lua:94
-msgid "system"
+msgid "System"
 msgstr ""
 
 #. Target
 #: i18n/english/luasrc/i18n/default.en.lua:95
-msgid "target"
+msgid "Target"
 msgstr ""
 
 #. Timezone
 #: i18n/english/luasrc/i18n/default.en.lua:96
-msgid "timezone"
+msgid "Timezone"
 msgstr ""
 
 #. Type
 #: i18n/english/luasrc/i18n/default.en.lua:97
-msgid "type"
+msgid "Type"
 msgstr ""
 
 #. Unknown Error
 #: i18n/english/luasrc/i18n/default.en.lua:98
-msgid "unknownerror"
+msgid "Unknown Error"
 msgstr ""
 
 #. Unsaved Changes
 #: i18n/english/luasrc/i18n/default.en.lua:99
-msgid "unsavedchanges"
+msgid "Unsaved Changes"
 msgstr ""
 
 #. Username
 #: i18n/english/luasrc/i18n/default.en.lua:100
-msgid "username"
+msgid "Username"
 msgstr ""
 
 #. Version
 #: i18n/english/luasrc/i18n/default.en.lua:101
-msgid "version"
+msgid "Version"
 msgstr ""
 
 #. Web <abbr title=\"User Interface\">UI</abbr>
 #: i18n/english/luasrc/i18n/default.en.lua:102
-msgid "webui"
+msgid "Web <abbr title=\"User Interface\">UI</abbr>"
 msgstr ""
 
 #. Wifi
 #: i18n/english/luasrc/i18n/default.en.lua:103
-msgid "wifi"
+msgid "Wifi"
 msgstr ""
 
 #. Zone
diff --git a/po/templates/diag_core.pot b/po/templates/diag_core.pot
index 520afecfe..c7f848a7e 100644
--- a/po/templates/diag_core.pot
+++ b/po/templates/diag_core.pot
@@ -1,24 +1,15 @@
-msgid "l_d_c_nci_diag"
+msgid ""
+"With this menu you can configure network diagnostics, such as network device "
+"scans and ping tests."
 msgstr ""
 
-msgid "l_d_c_nci_diag1"
+msgid ""
+"The entries in the menu allow you to perform diagnostic tests on your system "
+"to aid in troubleshooting."
 msgstr ""
 
-msgid "l_d_c_nci_diag2"
-msgstr ""
-
-msgid "l_d_c_i_diag"
-msgstr ""
-
-msgid "l_d_c_i_diag1"
-msgstr ""
-
-msgid "l_d_c_i_diag2"
-msgstr ""
-
-msgid "l_d_diag_config"
+msgid "Configure Diagnostics"
 msgstr ""
 
 msgid "l_d_diag"
 msgstr ""
-
diff --git a/po/templates/diag_devinfo.pot b/po/templates/diag_devinfo.pot
index 387486908..1de52d8a6 100644
--- a/po/templates/diag_devinfo.pot
+++ b/po/templates/diag_devinfo.pot
@@ -1,274 +1,128 @@
-msgid "cbi_gorel"
+msgid "Edit"
 msgstr ""
 
-msgid "edit"
+msgid "Delete"
 msgstr ""
 
-msgid "cbi_del"
+msgid "Add"
 msgstr ""
 
-msgid "sectempty"
+msgid "Invalid"
 msgstr ""
 
-msgid "cbi_add"
+msgid "No SIP devices"
 msgstr ""
 
-msgid "cbi_invalid"
+msgid "No devices detected"
 msgstr ""
 
-msgid "l_d_d_dc_nosipdev"
-msgstr ""
-
-msgid "l_d_d_dc_nodev"
-msgstr ""
-
-msgid "l_d_d_dc_checkothernet"
-msgstr ""
-
-msgid "l_d_d_dc_sipdev_found_mini"
-msgstr ""
-
-msgid "l_d_d_dc_sipdev_found_admin"
-msgstr ""
-
-msgid "l_dd_dc_netdev_found_mini"
+msgid "check other networks"
 msgstr ""
 
 #. Devices discovered for
-msgid "l_d_d_dc_netdev_found_admin"
+msgid "Devices discovered for"
 msgstr "Devices discovered for"
 
-msgid "l_d_d_dc_mac_ip"
-msgstr ""
-
-msgid "l_d_d_dc_mac_address"
-msgstr ""
-
-msgid "l_d_d_dc_mac_vendor"
-msgstr ""
-
-msgid "l_d_d_dc_mac_device_type"
-msgstr ""
-
-msgid "l_d_d_dc_mac_model"
-msgstr ""
-
-msgid "l_d_d_dc_config_page"
-msgstr ""
-
-msgid "l_d_d_dc_raw"
-msgstr ""
-
-msgid "l_d_d_dc_enable"
-msgstr ""
-
-msgid "l_d_d_dc_interface"
-msgstr ""
-
-msgid "l_d_d_dc_subnet"
-msgstr ""
-
-msgid "l_d_d_dc_timeout"
-msgstr ""
-
-msgid "l_d_d_dc_timeout_descr"
-msgstr ""
-
-msgid "l_d_d_dc_repeat_count"
-msgstr ""
-
-msgid "l_d_d_dc_repeat_count_descr"
-msgstr ""
-
-msgid "l_d_d_dc_sleep"
-msgstr ""
-
-msgid "l_d_d_dc_sleep_desc"
-msgstr ""
-
-msgid "l_d_d_nc_netdiscover_actions"
-msgstr ""
-
-msgid "l_d_d_nc_config_scan"
-msgstr ""
-
-msgid "l_d_d_nc_redo_scans"
-msgstr ""
-
-msgid "l_d_d_ldd_diag_smap_devinfo"
-msgstr ""
-
-msgid "l_d_d_ldd_config"
+msgid "IP Address"
 msgstr ""
 
-msgid "l_d_d_ldd_smap_devinfo_config"
+msgid "MAC Address"
 msgstr ""
 
-msgid "l_d_d_ldd_netdiscover_devinfo_scan"
+msgid "Link to Device"
 msgstr ""
 
-msgid "l_d_d_ldd_smap_devinfo_scan_config"
+msgid "Raw"
 msgstr ""
 
-msgid "l_d_d_ldd_netdiscover_devinfo"
+msgid "Enable"
 msgstr ""
 
-msgid "l_d_d_ldd_mac_to_devinfo_overrides"
+msgid "Interface"
 msgstr ""
 
-msgid "l_d_d_ldd_diag_smap_devinfo_scan_mini"
+msgid "Subnet"
 msgstr ""
 
-msgid "l_d_d_ldd_smap_devinfo_config_scan_miini"
+msgid "Timeout"
 msgstr ""
 
-msgid "l_d_d_ldd_diag_netdiscover_devinfo_scan_mini"
+msgid "Time to wait for responses in seconds (default 10)"
 msgstr ""
 
-msgid "l_d_d_ldd_netdiscover_devinfo_scan_config_mini"
+msgid "Repeat Count"
 msgstr ""
 
-msgid "l_d_d_sc_smap_actions"
+msgid "Number of times to send requests (default 1)"
 msgstr ""
 
-msgid "l_d_d_sc_config_scan"
+msgid "Sleep Between Requests"
 msgstr ""
 
-msgid "l_d_d_sc_redo_scans"
+msgid "Milliseconds to sleep between requests (default 100)"
 msgstr ""
 
-msgid "l_d_d_ndc_netdiscover_to_devinfo_config"
+msgid "Phones"
 msgstr ""
 
-msgid "l_d_d_ndc_netdiscover_to_devinfo_config_descr"
+msgid "Configure"
 msgstr ""
 
-msgid "l_d_d_ndc_use_config"
+msgid "SIP Devices on Network"
 msgstr ""
 
-msgid "l_d_d_ndc_do_scans"
+msgid "SIP Device Scan"
 msgstr ""
 
-msgid "l_d_d_ndc_netdiscover_scannet"
+msgid "Devices on Network"
 msgstr ""
 
-msgid "l_d_d_ndc_netdiscover_scannet_descr"
+msgid "Phone Scan"
 msgstr ""
 
-msgid "l_d_d_sdc_smap_to_devinfo_config"
+msgid "Config Phone Scan"
 msgstr ""
 
-msgid "l_d_d_sdc_smap_to_devinfo_config_descr"
+msgid "Device Scan Config"
 msgstr ""
 
-msgid "l_d_d_sdc_use_config"
+msgid "SIP Device Scanning Configuration"
 msgstr ""
 
-msgid "l_d_d_sdc_do_scans"
+msgid "SIP Device Information"
 msgstr ""
 
-msgid "l_d_d_sdc_smap_scannet"
+msgid "Phone Information"
 msgstr ""
 
-msgid "smap_scannet_descr"
+msgid ""
+"Override the information returned by the MAC to Device Info Script (mac-to-"
+"devinfo) for a specified range of MAC Addresses"
 msgstr ""
 
-msgid "l_d_d_sdc_ports"
+msgid "MAC Device Override"
 msgstr ""
 
-msgid "l_d_d_ndc_netdiscover_to_devinfo_config_mini"
+msgid "MAC range and information used to override system and IEEE databases"
 msgstr ""
 
-msgid "l_d_d_ndc_mini_netdiscover_to_devinfo_config_descr"
+msgid "Name"
 msgstr ""
 
-msgid "l_d_d_ndc_mini_use_config"
+msgid "Beginning of MAC address range"
 msgstr ""
 
-msgid "l_d_d_ndc_mini_do_scans"
+msgid "End of MAC address range"
 msgstr ""
 
-msgid "l_d_d_ndc_mini_netdiscover_scannet"
+msgid "OUI Owner"
 msgstr ""
 
-msgid "l_d_d_ndc_mini_netdiscover_scannet_descr"
+msgid "Scan for devices on specified networks."
 msgstr ""
 
-msgid "l_d_d_sd_smap_to_devinfo"
-msgstr ""
-
-msgid "l_d_d_sd_smap_to_devinfo_descr"
-msgstr ""
-
-msgid "l_d_d_sd_mini_smap_to_devinfo"
-msgstr ""
-
-msgid "l_d_d_sd_mini_smap_to_devinfo_descr"
-msgstr ""
-
-msgid "l_d_d_m_mac_to_devinfo_override"
-msgstr ""
-
-msgid "l_d_d_m_mac_to_devinfo_override_descr"
-msgstr ""
-
-msgid "l_d_d_m_mac_to_devinfo_section"
-msgstr ""
-
-msgid "l_d_d_m_mac_to_devinfo_section_descr"
-msgstr ""
-
-msgid "l_d_d_m_name"
-msgstr ""
-
-msgid "l_d_d_m_maclow"
-msgstr ""
-
-msgid "l_d_d_m_machigh"
-msgstr ""
-
-msgid "l_d_d_m_vendor"
-msgstr ""
-
-msgid "l_d_d_m_mactodevinfo_devtype"
-msgstr ""
-
-msgid "l_d_d_m_model"
-msgstr ""
-
-msgid "l_d_d_m_ouiowneroverride"
-msgstr ""
-
-msgid "l_d_d_nd_mini_netdiscover_to_devinfo"
-msgstr ""
-
-msgid "l_d_d_nd_mini_netdiscover_to_devinfo_descr"
-msgstr ""
-
-msgid "l_d_d_sdc_mini_smap_to_devinfo_config"
-msgstr ""
-
-msgid "l_d_d_sdc_mini_smap_to_devinfo_config_descr"
-msgstr ""
-
-msgid "l_d_d_sdc_mini_use_config"
-msgstr ""
-
-msgid "l_d_d_sdc_mini_do_scans"
-msgstr ""
-
-msgid "l_d_d_sdc_mini_smap_scannet"
-msgstr ""
-
-msgid "l_d_d_sdc_mini_smap_scannet_descr"
-msgstr ""
-
-msgid "l_d_d_sdc_mini_ports"
-msgstr ""
-
-msgid "l_d_d_nd_netdiscover_to_devinfo"
+msgid "Phone Scanning Configuration"
 msgstr ""
 
 msgid "l_d_d_nd_netdiscover_to_devinfo_descr"
 msgstr ""
-
diff --git a/po/templates/freifunk.pot b/po/templates/freifunk.pot
index b31321d9a..57d5da86d 100644
--- a/po/templates/freifunk.pot
+++ b/po/templates/freifunk.pot
@@ -5,235 +5,242 @@ msgstr "Content-Type: text/plain; charset=UTF-8"
 
 #. Hello and welcome in the network of
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:1
-msgid "ff_hellonet"
+msgid "Hello and welcome in the network of"
 msgstr ""
 
 #. We are an initiative to establish a free, independent and open wireless mesh network.
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:2
-msgid "ff_public1"
+msgid ""
+"We are an initiative to establish a free, independent and open wireless mesh "
+"network."
 msgstr ""
 
 #. This is the access point
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:3
-msgid "ff_public2"
+msgid "This is the access point"
 msgstr ""
 
 #. It is operated by
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:4
-msgid "ff_public3"
+msgid "It is operated by"
 msgstr ""
 
 #. You can find further information about the global Freifunk initiative at
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:5
-msgid "ff_public4"
+msgid ""
+"You can find further information about the global Freifunk initiative at"
 msgstr ""
 
 #. If you are interested in our project then contact the local community
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:6
-msgid "ff_public5"
+msgid "If you are interested in our project then contact the local community"
 msgstr ""
 
 #. Internet access depends on technical and organisational conditions and may or may not work for you.
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:7
-msgid "ff_public6"
+msgid ""
+"Internet access depends on technical and organisational conditions and may "
+"or may not work for you."
 msgstr ""
 
 #. Location
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:8
-msgid "ff_location"
+msgid "Location"
 msgstr ""
 
 #. E-Mail
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:9
-msgid "ff_mail"
+msgid "E-Mail"
 msgstr ""
 
 #. You really should provide your address here!
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:10
-msgid "ff_mail1"
+msgid "You really should provide your address here!"
 msgstr ""
 
 #. Nickname
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:11
-msgid "ff_nickname"
+msgid "Nickname"
 msgstr ""
 
 #. Realname
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:12
-msgid "ff_name"
+msgid "Realname"
 msgstr ""
 
 #. Node
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:13
-msgid "ff_node"
+msgid "Node"
 msgstr ""
 
 #. Notice
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:14
-msgid "ff_note"
+msgid "Notice"
 msgstr ""
 
 #. Phone
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:15
-msgid "ff_phone"
+msgid "Phone"
 msgstr ""
 
 #. Memory
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:16
-msgid "ff_ram"
+msgid "Memory"
 msgstr ""
 
 #. Free
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:17
-msgid "ff_free"
+msgid "Free"
 msgstr ""
 
 #. Buffers
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:18
-msgid "ff_buffers"
+msgid "Buffers"
 msgstr ""
 
 #. Cached
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:19
-msgid "ff_cached"
+msgid "Cached"
 msgstr ""
 
 #. Total
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:20
-msgid "ff_total"
+msgid "Total"
 msgstr ""
 
 #. Coordinates
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:21
-msgid "ff_geocoord"
+msgid "Coordinates"
 msgstr ""
 
 #. Client-Splash
-msgid "ff_splash"
+msgid "Client-Splash"
 msgstr ""
 
 #. Active Clients
-msgid "ff_splash_clients"
+msgid "Active Clients"
 msgstr ""
 
 #. Hostname
-msgid "ff_splash_hostname"
+msgid "Hostname"
 msgstr ""
 
 #. IP Address
-msgid "ff_splash_ip"
+msgid "IP Address"
 msgstr ""
 
 #. MAC Address
-msgid "ff_splash_mac"
+msgid "MAC Address"
 msgstr ""
 
 #. Time remaining
-msgid "ff_splash_timeleft"
+msgid "Time remaining"
 msgstr ""
 
 #. Traffic (in/out)
-msgid "ff_splash_traffic"
+msgid "Traffic (down/up)"
 msgstr ""
 
 #. Policy
-msgid "ff_splash_policy"
+msgid "Policy"
 msgstr ""
 
 #. unknown
-msgid "ff_splash_unknown"
+msgid "unknown"
 msgstr ""
 
 #. expired
-msgid "ff_splash_expired"
+msgid "expired"
 msgstr ""
 
 #. whitelisted
-msgid "ff_splash_whitelisted"
+msgid "whitelisted"
 msgstr ""
 
 #. splashed
-msgid "ff_splash_splashed"
+msgid "splashed"
 msgstr ""
 
 #. blacklisted
-msgid "ff_splash_blacklisted"
+msgid "blacklisted"
 msgstr ""
 
 #. temporarily blocked
-msgid "ff_splash_tempblock"
+msgid "temporarily blocked"
 msgstr ""
 
 #. No clients connected
-msgid "ff_splash_noclients"
+msgid "No clients connected"
 msgstr ""
 
 #. P2P-Block
-msgid "ff_p2pblock"
+msgid "P2P-Block"
 msgstr ""
 
 #. P2P-Block is a greylisting mechanism to block various peer-to-peer protocols for non-whitelisted clients.
-msgid "ff_p2pblock_desc"
+msgid ""
+"P2P-Block is a greylisting mechanism to block various peer-to-peer protocols "
+"for non-whitelisted clients."
 msgstr ""
 
 #. Enable P2P-Block
-msgid "ff_p2pblock_enabled"
+msgid "Enable P2P-Block"
 msgstr ""
 
 #. Portrange
-msgid "ff_p2pblock_portrange"
+msgid "Portrange"
 msgstr ""
 
 #. Block Time
-msgid "ff_p2pblock_blocktime"
+msgid "Block Time"
 msgstr ""
 
 #. seconds
-msgid "ff_p2pblock_blocktime_desc"
+msgid "seconds"
 msgstr ""
 
 #. Whitelisted IPs
-msgid "ff_p2pblock_whitelist"
+msgid "Whitelisted IPs"
 msgstr ""
 
 #. Layer7-Protokolle
-msgid "ff_p2pblock_layer7"
+msgid "Layer7-Protocols"
 msgstr ""
 
 #. IP-P2P
-msgid "ff_p2pblock_ipp2p"
+msgid "IP-P2P"
 msgstr ""
 
 #. Freifunk Remote Update
-msgid "ff_remote_update"
+msgid "Freifunk Remote Update"
 msgstr ""
 
 #. Check for new firmware versions and perform automatic updates.
-msgid "ff_remote_update_desc"
+msgid "Check for new firmware versions and perform automatic updates."
 msgstr ""
 
 #. Update available!
-msgid "ff_remote_update_available"
+msgid "Update available!"
 msgstr ""
 
 #. The installed firmware is the most recent version.
-msgid "ff_remote_update_uptodate"
+msgid "The installed firmware is the most recent version."
 msgstr ""
 
 #. Start Upgrade
-msgid "ff_remote_update_install"
+msgid "Start Upgrade"
 msgstr ""
 
 #. Update Settings
-msgid "ff_remote_update_settings"
+msgid "Update Settings"
 msgstr ""
 
 #. Keep configuration
-msgid "ff_remote_update_keepcfg"
+msgid "Keep configuration"
 msgstr ""
 
 #. Verify downloaded images
-msgid "ff_remote_update_verify"
+msgid "Verify downloaded images"
 msgstr ""
 
 #. Confirm Upgrade
diff --git a/po/templates/hd_idle.pot b/po/templates/hd_idle.pot
index 84f1d4827..ceb436796 100644
--- a/po/templates/hd_idle.pot
+++ b/po/templates/hd_idle.pot
@@ -5,35 +5,37 @@ msgstr "Content-Type: text/plain; charset=UTF-8"
 
 #. Disk
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:1
-msgid "disk"
+msgid "Disk"
 msgstr ""
 
 #. Enable debug
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:2
-msgid "enable_debug"
+msgid "Enable debug"
 msgstr ""
 
 #. hd-idle
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:3
-msgid "hd_idle"
+msgid "hd-idle"
 msgstr ""
 
 #. hd-idle is a utility program for spinning-down external disks after a period of idle time.
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:4
-msgid "hd_idle_desc"
+msgid ""
+"hd-idle is a utility program for spinning-down external disks after a period "
+"of idle time."
 msgstr ""
 
 #. Idle-Time
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:5
-msgid "idle_time_interval"
+msgid "Idle-Time"
 msgstr ""
 
 #. Idle-Time unit
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:6
-msgid "idle_time_unit"
+msgid "Idle-Time unit"
 msgstr ""
 
 #. Settings
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:7
-msgid "settings"
+msgid "Settings"
 msgstr ""
diff --git a/po/templates/initmgr.pot b/po/templates/initmgr.pot
index 5ab5717fa..ff776b746 100644
--- a/po/templates/initmgr.pot
+++ b/po/templates/initmgr.pot
@@ -5,22 +5,25 @@ msgstr "Content-Type: text/plain; charset=UTF-8"
 
 #. Initscripts
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:1
-msgid "initmgr"
+msgid "Initscripts"
 msgstr ""
 
 #. You can enable or disable installed init scripts here. Changes will applied after a device reboot.<br /><strong>Warning: If you disable essential init scripts like &quot;network&quot;, your device might become inaccesable!</strong>
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:2
-msgid "initmgr_desc"
+msgid ""
+"You can enable or disable installed init scripts here. Changes will applied "
+"after a device reboot.<br /><strong>Warning: If you disable essential init "
+"scripts like \"network\", your device might become inaccesable!</strong>"
 msgstr ""
 
 #. Start priority
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:3
-msgid "initmgr_index"
+msgid "Start priority"
 msgstr ""
 
 #. Initscript
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:4
-msgid "initmgr_name"
+msgid "Initscript"
 msgstr ""
 
 #. Enable/Disable
diff --git a/po/templates/livestats.pot b/po/templates/livestats.pot
index 475513e3a..cf420da18 100644
--- a/po/templates/livestats.pot
+++ b/po/templates/livestats.pot
@@ -5,32 +5,32 @@ msgstr "Content-Type: text/plain; charset=UTF-8"
 
 #. incoming
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:1
-msgid "livestats_incoming"
+msgid "incoming"
 msgstr ""
 
 #. outgoing
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:2
-msgid "livestats_outgoing"
+msgid "outgoing"
 msgstr ""
 
 #. traffic on
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:3
-msgid "livestats_traffic"
+msgid "traffic on"
 msgstr ""
 
 #. signal-to-noise ratio for
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:4
-msgid "livestats_wifi"
+msgid "signal-to-noise ratio for"
 msgstr ""
 
 #. load average
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:5
-msgid "livestats_loadavg"
+msgid "load average"
 msgstr ""
 
 #. Realtime Wireless Status
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:6
-msgid "livestats_stat_wireless"
+msgid "Realtime Wireless Status"
 msgstr ""
 
 #. Realtime Network Traffic
diff --git a/po/templates/luci-fw.pot b/po/templates/luci-fw.pot
index 1ec1c7904..5e6a37a1f 100644
--- a/po/templates/luci-fw.pot
+++ b/po/templates/luci-fw.pot
@@ -5,277 +5,229 @@ msgstr "Content-Type: text/plain; charset=UTF-8"
 
 #. Port forwarding
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:1
-msgid "fw_portfw"
+msgid "Port forwarding"
 msgstr ""
 
 #. Traffic Redirection
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:2
-msgid "fw_redirect"
+msgid "Traffic Redirection"
 msgstr ""
 
 #. Traffic redirection allows you to change the destination address of forwarded packets.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:3
-msgid "fw_redirect_desc"
+msgid ""
+"Traffic redirection allows you to change the destination address of "
+"forwarded packets."
 msgstr ""
 
 #. Zone-to-Zone traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:4
-msgid "fw_forwarding"
+msgid "Zone-to-Zone traffic"
 msgstr ""
 
 #. Firewall
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:5
-msgid "fw_fw"
+msgid "Firewall"
 msgstr ""
 
 #. Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:6
-msgid "fw_zone"
+msgid "Zone"
 msgstr ""
 
 #. Zones
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:7
-msgid "fw_zones"
+msgid "Zones"
 msgstr ""
 
 #. Custom forwarding
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:8
-msgid "fw_custfwd"
+msgid "Custom forwarding"
 msgstr ""
 
 #. The firewall creates zones over your network interfaces to control network traffic flow.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:9
-msgid "fw_fw1"
+msgid ""
+"The firewall creates zones over your network interfaces to control network "
+"traffic flow."
 msgstr ""
 
 #. Advanced Rules
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:10
-msgid "firewall_rule"
+msgid "Advanced Rules"
 msgstr ""
 
 #. Advanced rules let you customize the firewall to your needs. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:11
-msgid "firewall_rule_desc"
+msgid ""
+"Advanced rules let you customize the firewall to your needs. Only new "
+"connections will be matched. Packets belonging to already open connections "
+"are automatically allowed to pass the firewall."
 msgstr ""
 
 #. Input Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:12
-msgid "firewall_rule_src"
+msgid "Input Zone"
 msgstr ""
 
 #. Output Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:13
-msgid "firewall_rule_dest"
-msgstr ""
-
-#. Source address
-#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:14
-msgid "firewall_rule_srcip"
+msgid "Output Zone"
 msgstr ""
 
 #. Destination address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:15
-msgid "firewall_rule_destip"
+msgid "Destination address"
 msgstr ""
 
 #. Source MAC-Address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:16
-msgid "firewall_rule_srcmac"
+msgid "Source MAC-Address"
 msgstr ""
 
 #. Source port
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:17
-msgid "firewall_rule_srcport"
+msgid "Source port"
 msgstr ""
 
 #. Destination port
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:18
-msgid "firewall_rule_destport"
+msgid "Destination port"
 msgstr ""
 
 #. Action
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:19
-msgid "firewall_rule_target"
+msgid "Action"
 msgstr ""
 
 #. accept
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:20
-msgid "fw_accept"
+msgid "accept"
 msgstr ""
 
 #. reject
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:21
-msgid "fw_reject"
+msgid "reject"
 msgstr ""
 
 #. drop
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:22
-msgid "fw_drop"
+msgid "drop"
 msgstr ""
 
 #. Source
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:23
-msgid "fw_src"
+msgid "Source"
 msgstr ""
 
 #. Destination
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:24
-msgid "fw_dest"
+msgid "Destination"
 msgstr ""
 
 #. Traffic Control
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:25
-msgid "fw_traffic"
+msgid "Traffic Control"
 msgstr ""
 
 #. MSS Clamping
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:26
-msgid "fw_mtufix"
+msgid "MSS Clamping"
 msgstr ""
 
 #. Drop invalid packets
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:27
-msgid "fw_dropinvalid"
+msgid "Drop invalid packets"
 msgstr ""
 
 #. Port forwarding allows to provide network services in the internal network to an external network.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:28
-msgid "fw_portfw1"
+msgid ""
+"Port forwarding allows to provide network services in the internal network "
+"to an external network."
 msgstr ""
 
 #. External Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:29
-msgid "firewall_redirect_src_desc"
+msgid "External Zone"
 msgstr ""
 
 #. External port
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:30
-msgid "firewall_redirect_srcdport"
-msgstr ""
-
-#. port or range as first-last
-#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:31
-msgid "firewall_redirect_srcdport_desc"
-msgstr ""
-
-#. Source address
-#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:32
-msgid "firewall_redirect_srcip"
+msgid "External port"
 msgstr ""
 
 #. Source MAC
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:33
-msgid "firewall_redirect_srcmac"
+msgid "Source MAC"
 msgstr ""
 
 #. Internal address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:34
-msgid "firewall_redirect_destip"
+msgid "Internal address"
 msgstr ""
 
 #. IP-Address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:35
-msgid "firewall_redirect_destip_desc"
+msgid "IP-Address"
 msgstr ""
 
 #. Internal port (optional)
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:36
-msgid "firewall_redirect_destport"
-msgstr ""
-
-#. port or range as first-last
-#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:37
-msgid "firewall_redirect_destport_desc"
+msgid "Internal port (optional)"
 msgstr ""
 
 #. Here you can specify which network traffic is allowed to flow between network zones. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall. If you experience occasional connection problems try enabling MSS Clamping otherwise disable it for performance reasons.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:38
-msgid "fw_forwarding1"
+msgid ""
+"Here you can specify which network traffic is allowed to flow between "
+"network zones. Only new connections will be matched. Packets belonging to "
+"already open connections are automatically allowed to pass the firewall. If "
+"you experience occasional connection problems try enabling MSS Clamping "
+"otherwise disable it for performance reasons."
 msgstr ""
 
 #. Input
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:39
-msgid "firewall_forwarding_src"
+msgid "Input"
 msgstr ""
 
 #. Output
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:40
-msgid "firewall_forwarding_dest"
+msgid "Output"
 msgstr ""
 
 #. Defaults
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:41
-msgid "firewall_defaults"
+msgid "Defaults"
 msgstr ""
 
 #. These are the default settings that are used if no other rules match.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:42
-msgid "firewall_defaults_desc"
+msgid "These are the default settings that are used if no other rules match."
 msgstr ""
 
 #. SYN-flood protection
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:43
-msgid "firewall_defaults_synflood"
-msgstr ""
-
-#. Incoming Traffic
-#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:44
-msgid "firewall_defaults_input"
-msgstr ""
-
-#. Outgoing Traffic
-#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:45
-msgid "firewall_defaults_output"
-msgstr ""
-
-#. Forwarded Traffic
-#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:46
-msgid "firewall_defaults_forward"
+msgid "SYN-flood protection"
 msgstr ""
 
 #. Zones part the network interfaces into certain isolated areas to separate network traffic. One or more networks can belong to a zone. The MASQ-flag enables NAT masquerading for all outgoing traffic on this zone.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:47
-msgid "firewall_zone_desc"
-msgstr ""
-
-#. Incoming Traffic
-#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:48
-msgid "firewall_zone_input"
-msgstr ""
-
-#. Default Policy
-#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:49
-msgid "firewall_zone_input_desc"
-msgstr ""
-
-#. Outgoing Traffic
-#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:50
-msgid "firewall_zone_output"
-msgstr ""
-
-#. Default Policy
-#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:51
-msgid "firewall_zone_output_desc"
-msgstr ""
-
-#. Forwarded Traffic
-#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:52
-msgid "firewall_zone_forward"
-msgstr ""
-
-#. Default Policy
-#: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:53
-msgid "firewall_zone_forward_desc"
+msgid ""
+"Zones part the network interfaces into certain isolated areas to separate "
+"network traffic. One or more networks can belong to a zone. The MASQ-flag "
+"enables NAT masquerading for all outgoing traffic on this zone."
 msgstr ""
 
 #. MASQ
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:54
-msgid "firewall_zone_masq"
+msgid "MASQ"
 msgstr ""
 
 #. Networks
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:55
-msgid "firewall_zone_network"
+msgid "Networks"
 msgstr ""
 
 #. contained networks
diff --git a/po/templates/mmc_over_gpio.pot b/po/templates/mmc_over_gpio.pot
index 260c539c9..af9549ba4 100644
--- a/po/templates/mmc_over_gpio.pot
+++ b/po/templates/mmc_over_gpio.pot
@@ -3,17 +3,7 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=UTF-8"
 
-#. MMC/SD driver configuration
-#: applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua:1
-msgid "mmc_over_gpio"
-msgstr ""
-
-#. MMC/SD driver configuration
-#: applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua:2
-msgid "mmc_over_gpio_desc"
-msgstr ""
-
 #. Settings
 #: applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua:3
-msgid "settings"
+msgid "Settings"
 msgstr ""
diff --git a/po/templates/ntpc.pot b/po/templates/ntpc.pot
index 93f5eddf7..d9883be72 100644
--- a/po/templates/ntpc.pot
+++ b/po/templates/ntpc.pot
@@ -5,42 +5,42 @@ msgstr "Content-Type: text/plain; charset=UTF-8"
 
 #. Time Synchronisation
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:1
-msgid "ntpc"
+msgid "Time Synchronisation"
 msgstr ""
 
 #. Synchronizes the system time
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:2
-msgid "ntpc_desc"
+msgid "Synchronizes the system time"
 msgstr ""
 
 #. Time Server
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:3
-msgid "ntpc_timeserver"
+msgid "Time Server"
 msgstr ""
 
 #. Update Interval (in s)
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:4
-msgid "ntpc_interval"
+msgid "Update Interval (in s)"
 msgstr ""
 
 #. Count of Time Measurements
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:5
-msgid "ntpc_count"
+msgid "Count of Time Measurements"
 msgstr ""
 
 #. empty = infinite
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:6
-msgid "ntpc_count_desc"
+msgid "empty = infinite"
 msgstr ""
 
 #. Clock Adjustment
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:7
-msgid "ntpc_drift"
+msgid "Clock Adjustment"
 msgstr ""
 
 #. Offset Frequency
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:8
-msgid "ntpc_drift_freq"
+msgid "Offset Frequency"
 msgstr ""
 
 #. Current system time
diff --git a/po/templates/olsr.pot b/po/templates/olsr.pot
index 15fbdfdaa..2514cfbf1 100644
--- a/po/templates/olsr.pot
+++ b/po/templates/olsr.pot
@@ -5,637 +5,632 @@ msgstr "Content-Type: text/plain; charset=UTF-8"
 
 #. OLSR Daemon
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:1
-msgid "olsrd"
+msgid "OLSR Daemon"
 msgstr ""
 
 #. Neighbour IP
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:2
-msgid "olsrd_neighbour_ip"
+msgid "Neighbour IP"
 msgstr ""
 
 #. Local interface IP
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:3
-msgid "olsrd_local_ip"
+msgid "Local interface IP"
 msgstr ""
 
 #. Announced network
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:4
-msgid "olsrd_network"
+msgid "Announced network"
 msgstr ""
 
 #. OLSR gateway
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:5
-msgid "olsrd_gateway"
+msgid "OLSR gateway"
 msgstr ""
 
 #. OLSR node
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:6
-msgid "olsrd_node"
+msgid "OLSR node"
 msgstr ""
 
 #. Unable to connect to the OLSR daemon!
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:7
-msgid "olsrd_error"
+msgid "Unable to connect to the OLSR daemon!"
 msgstr ""
 
 #. Make sure that OLSRd is running, the &quot;txtinfo&quot; plugin is loaded, configured on port 2006 and accepts connections from &quot;127.0.0.1&quot;.
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:8
-msgid "olsrd_error_desc"
+msgid ""
+"Make sure that OLSRd is running, the \"txtinfo\" plugin is loaded, "
+"configured on port 2006 and accepts connections from \"127.0.0.1\"."
 msgstr ""
 
 #. OLSR - HNA-Announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:9
-msgid "olsrd_hna"
+msgid "OLSR - HNA-Announcements"
 msgstr ""
 
 #. OLSR - Plugins
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:10
-msgid "olsrd_plugins"
+msgid "OLSR - Plugins"
 msgstr ""
 
 #. OLSR connections
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:11
-msgid "olsrd_links"
+msgid "OLSR connections"
 msgstr ""
 
 #. Overview of currently established OLSR connections
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:12
-msgid "olsrd_links_desc"
+msgid "Overview of currently established OLSR connections"
 msgstr ""
 
 #. Expected retransmission count
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:13
-msgid "olsrd_links_etx_desc"
+msgid "Expected retransmission count"
 msgstr ""
 
 #. Success rate of sent packages
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:14
-msgid "olsrd_links_lq_desc"
+msgid "Success rate of sent packages"
 msgstr ""
 
 #. Success rate of received packages
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:15
-msgid "olsrd_links_nlq_desc"
+msgid "Success rate of received packages"
 msgstr ""
 
 #. Known OLSR routes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:16
-msgid "olsrd_routes"
+msgid "Known OLSR routes"
 msgstr ""
 
 #. Overview of currently known routes to other OLSR nodes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:17
-msgid "olsrd_routes_desc"
+msgid "Overview of currently known routes to other OLSR nodes"
 msgstr ""
 
 #. Active OLSR nodes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:18
-msgid "olsrd_topology"
+msgid "Active OLSR nodes"
 msgstr ""
 
 #. Overview of currently known OLSR nodes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:19
-msgid "olsrd_topology_desc"
+msgid "Overview of currently known OLSR nodes"
 msgstr ""
 
 #. Last hop
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:20
-msgid "olsrd_topology_lasthop"
+msgid "Last hop"
 msgstr ""
 
 #. Active host net announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:21
-msgid "olsrd_hna2"
+msgid "Active host net announcements"
 msgstr ""
 
 #. Overview of currently active OLSR host net announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:22
-msgid "olsrd_hna_desc"
+msgid "Overview of currently active OLSR host net announcements"
 msgstr ""
 
 #. Active MID announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:23
-msgid "olsrd_mid"
+msgid "Active MID announcements"
 msgstr ""
 
 #. Overview of known multiple interface announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:24
-msgid "olsrd_mid_desc"
+msgid "Overview of known multiple interface announcements"
 msgstr ""
 
 #. Secondary OLSR interfaces
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:25
-msgid "olsrd_mid_aliases"
+msgid "Secondary OLSR interfaces"
 msgstr ""
 
 #. Freifunk
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:26
-msgid "olsrd_etx_ff"
+msgid "Freifunk"
 msgstr ""
 
 #. floating point
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:27
-msgid "olsrd_etx_float"
+msgid "floating point"
 msgstr ""
 
 #. fixed point math
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:28
-msgid "olsrd_etx_fpm"
+msgid "fixed point math"
 msgstr ""
 
 #. General settings
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:29
-msgid "olsrd_olsrd"
+msgid "General settings"
 msgstr ""
 
 #. Start without network
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:30
-msgid "olsrd_olsrd_allownoint"
+msgid "Start without network"
 msgstr ""
 
 #. Clear screen
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:31
-msgid "olsrd_olsrd_clearscreen"
+msgid "Clear screen"
 msgstr ""
 
 #. Debugmode
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:32
-msgid "olsrd_olsrd_debuglevel"
+msgid "Debugmode"
 msgstr ""
 
 #. FIB metric
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:33
-msgid "olsrd_olsrd_fibmetric"
+msgid "FIB metric"
 msgstr ""
 
 #. Internet protocol
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:34
-msgid "olsrd_olsrd_ipversion"
+msgid "Internet protocol"
 msgstr ""
 
 #. LQ aging
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:35
-msgid "olsrd_olsrd_linkqualityaging"
+msgid "LQ aging"
 msgstr ""
 
 #. LQ algorithm
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:36
-msgid "olsrd_olsrd_linkqualityalgorithm"
+msgid "LQ algorithm"
 msgstr ""
 
 #. LQ Dijkstra limit
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:37
-msgid "olsrd_olsrd_linkqualitydijkstralimit"
+msgid "LQ Dijkstra limit"
 msgstr ""
 
 #. LQ fisheye
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:38
-msgid "olsrd_olsrd_linkqualityfisheye"
+msgid "LQ fisheye"
 msgstr ""
 
 #. LQ level
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:39
-msgid "olsrd_olsrd_linkqualitylevel"
+msgid "LQ level"
 msgstr ""
 
 #. MPR selection
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:40
-msgid "olsrd_olsrd_linkqualitylevel_1"
+msgid "MPR selection"
 msgstr ""
 
 #. MPR selection and routing
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:41
-msgid "olsrd_olsrd_linkqualitylevel_2"
+msgid "MPR selection and routing"
 msgstr ""
 
 #. LQ window size
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:42
-msgid "olsrd_olsrd_linkqualitywinsize"
+msgid "LQ window size"
 msgstr ""
 
 #. MPR coverage
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:43
-msgid "olsrd_olsrd_mprcoverage"
+msgid "MPR coverage"
 msgstr ""
 
 #. Pollrate
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:44
-msgid "olsrd_olsrd_pollrate"
+msgid "Pollrate"
 msgstr ""
 
 #. TC redundancy
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:45
-msgid "olsrd_olsrd_tcredundancy"
+msgid "TC redundancy"
 msgstr ""
 
 #. MPR selectors
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:46
-msgid "olsrd_olsrd_tcredundancy_0"
+msgid "MPR selectors"
 msgstr ""
 
 #. MPR selectors and MPR
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:47
-msgid "olsrd_olsrd_tcredundancy_1"
+msgid "MPR selectors and MPR"
 msgstr ""
 
 #. all neighbours
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:48
-msgid "olsrd_olsrd_tcredundancy_2"
+msgid "all neighbours"
 msgstr ""
 
 #. Use hysteresis
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:49
-msgid "olsrd_olsrd_usehysteresis"
+msgid "Use hysteresis"
 msgstr ""
 
 #. Willingness
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:50
-msgid "olsrd_olsrd_willingness"
+msgid "Willingness"
 msgstr ""
 
 #. Hello interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:51
-msgid "olsrd_interface_hellointerval"
+msgid "Hello interval"
 msgstr ""
 
 #. Hello validity time
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:52
-msgid "olsrd_interface_hellovaliditytime"
+msgid "Hello validity time"
 msgstr ""
 
 #. HNA interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:53
-msgid "olsrd_interface_hnainterval"
+msgid "HNA interval"
 msgstr ""
 
 #. HNA validity time
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:54
-msgid "olsrd_interface_hnavaliditytime"
+msgid "HNA validity time"
 msgstr ""
 
 #. IPv4 broadcast
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:55
-msgid "olsrd_interface_ip4broadcast"
+msgid "IPv4 broadcast"
 msgstr ""
 
 #. MID interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:56
-msgid "olsrd_interface_midinterval"
+msgid "MID interval"
 msgstr ""
 
 #. MID validity time
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:57
-msgid "olsrd_interface_midvaliditytime"
+msgid "MID validity time"
 msgstr ""
 
 #. TC interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:58
-msgid "olsrd_interface_tcinterval"
+msgid "TC interval"
 msgstr ""
 
 #. TC validity time
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:59
-msgid "olsrd_interface_tcvaliditytime"
+msgid "TC validity time"
 msgstr ""
 
 #. IPv6 address type
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:60
-msgid "olsrd_interface_ip6addrtype"
+msgid "IPv6 address type"
 msgstr ""
 
 #. IPC settings
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:61
-msgid "olsrd_ipcconnect"
+msgid "IPC settings"
 msgstr ""
 
 #. IPC connections enable you to remote-control the local OLSRd instance using external programs
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:62
-msgid "olsrd_ipcconnect_desc"
+msgid ""
+"IPC connections enable you to remote-control the local OLSRd instance using "
+"external programs"
 msgstr ""
 
 #. Allowed host addresses
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:63
-msgid "olsrd_ipcconnect_host"
+msgid "Allowed host addresses"
 msgstr ""
 
 #. Multiple separated by spaces
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:64
-msgid "olsrd_ipcconnect_host_desc"
+msgid "Multiple separated by spaces"
 msgstr ""
 
 #. Maxmimum connection count
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:65
-msgid "olsrd_ipcconnect_maxconnections"
+msgid "Maxmimum connection count"
 msgstr ""
 
 #. Set to 0 to disable IPC
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:66
-msgid "olsrd_ipcconnect_maxconnections_desc"
+msgid "Set to 0 to disable IPC"
 msgstr ""
 
 #. Allowed subnets
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:67
-msgid "olsrd_ipcconnect_net"
+msgid "Allowed subnets"
 msgstr ""
 
 #. Address Mask; multiple separated by space
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:68
-msgid "olsrd_ipcconnect_net_desc"
+msgid "Address Mask; multiple separated by space"
 msgstr ""
 
 #. IPv4 HNA announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:69
-msgid "olsrd_hna4"
+msgid "IPv4 HNA announcements"
 msgstr ""
 
 #. Hna4 entries allow you to propagate local IPv4 host- and network-routes into the mesh network
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:70
-msgid "olsrd_hna4_desc"
-msgstr ""
-
-#. Network address
-#: applications/luci-olsr/luasrc/i18n/olsr.en.lua:71
-msgid "olsrd_hna4_netaddr"
-msgstr ""
-
-#. IPv4 address
-#: applications/luci-olsr/luasrc/i18n/olsr.en.lua:72
-msgid "olsrd_hna4_netaddr_desc"
+msgid ""
+"Hna4 entries allow you to propagate local IPv4 host- and network-routes into "
+"the mesh network"
 msgstr ""
 
 #. Netmask
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:73
-msgid "olsrd_hna4_netmask"
-msgstr ""
-
-#. IPv4 address
-#: applications/luci-olsr/luasrc/i18n/olsr.en.lua:74
-msgid "olsrd_hna4_netmask_desc"
+msgid "Netmask"
 msgstr ""
 
 #. IPv6 HNA announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:75
-msgid "olsrd_hna6"
+msgid "IPv6 HNA announcements"
 msgstr ""
 
 #. Hna6 entries allow you to propagate local IPv6 host- and network-routes into the mesh network
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:76
-msgid "olsrd_hna6_desc"
-msgstr ""
-
-#. Network address
-#: applications/luci-olsr/luasrc/i18n/olsr.en.lua:77
-msgid "olsrd_hna6_netaddr"
+msgid ""
+"Hna6 entries allow you to propagate local IPv6 host- and network-routes into "
+"the mesh network"
 msgstr ""
 
 #. IPv6 address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:78
-msgid "olsrd_hna6_netaddr_desc"
+msgid "IPv6 address"
 msgstr ""
 
 #. Prefix
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:79
-msgid "olsrd_hna6_prefix"
+msgid "Prefix"
 msgstr ""
 
 #. IPv6 prefix
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:80
-msgid "olsrd_hna6_prefix_desc"
+msgid "IPv6 prefix"
 msgstr ""
 
 #. Plugin configuration
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:81
-msgid "olsrd_loadplugin"
+msgid "Plugin configuration"
 msgstr ""
 
 #. Enable plugin
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:82
-msgid "olsrd_loadplugin_ignore"
+msgid "Enable plugin"
 msgstr ""
 
 #. Library
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:83
-msgid "olsrd_loadplugin_library"
+msgid "Library"
 msgstr ""
 
 #. Allow connections from this hosts
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:84
-msgid "olsrd_loadplugin_accept"
+msgid "Allow connections from this hosts"
 msgstr ""
 
 #. Ping test addresses
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:85
-msgid "olsrd_loadplugin_ping"
+msgid "Ping test addresses"
 msgstr ""
 
 #. Interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:86
-msgid "olsrd_loadplugin_interval"
+msgid "Refresh interval in seconds"
 msgstr ""
 
 #. HNA announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:87
-msgid "olsrd_loadplugin_hna"
+msgid "HNA announcements"
 msgstr ""
 
 #. Format: IP-Address Netmask / OLSR will announce this network once it is reachable
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:88
-msgid "olsrd_loadplugin_hna_desc"
+msgid ""
+"Format: IP-Address Netmask / OLSR will announce this network once it is "
+"reachable"
 msgstr ""
 
 #. Alternative \"hosts\" file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:89
-msgid "olsrd_loadplugin_addhosts"
+msgid "Alternative \"hosts\" file"
 msgstr ""
 
 #. The contents of this file will be appended to the autogenerated \"hosts\" file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:90
-msgid "olsrd_loadplugin_addhosts_desc"
+msgid ""
+"The contents of this file will be appended to the autogenerated \"hosts\" "
+"file"
 msgstr ""
 
 #. DNS server
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:91
-msgid "olsrd_loadplugin_dnsserver"
+msgid "DNS server"
 msgstr ""
 
 #. Alternative hostnames
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:92
-msgid "olsrd_loadplugin_hosts"
+msgid "Alternative hostnames"
 msgstr ""
 
 #. Format: Interface-IP Hostname
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:93
-msgid "olsrd_loadplugin_hosts_desc"
+msgid "Format: Interface-IP Hostname"
 msgstr ""
 
 #. Path to the \"hosts\" file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:94
-msgid "olsrd_loadplugin_hostsfile"
+msgid "Path to the \"hosts\" file"
 msgstr ""
 
 #. Latitude
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:95
-msgid "olsrd_loadplugin_lat"
+msgid "Latitude"
 msgstr ""
 
 #. Output file for coordinates
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:96
-msgid "olsrd_loadplugin_latlonfile"
+msgid "Output file for coordinates"
 msgstr ""
 
 #. OLSR will write received coordinates of other nodes to this file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:97
-msgid "olsrd_loadplugin_latlonfile_desc"
+msgid "OLSR will write received coordinates of other nodes to this file"
 msgstr ""
 
 #. Input file for coordinates
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:98
-msgid "olsrd_loadplugin_latloninfile"
+msgid "Input file for coordinates"
 msgstr ""
 
 #. OLSR periodically checks this file for new coordinates and propagates them
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:99
-msgid "olsrd_loadplugin_latloninfile_desc"
+msgid ""
+"OLSR periodically checks this file for new coordinates and propagates them"
 msgstr ""
 
 #. Longitude
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:100
-msgid "olsrd_loadplugin_lon"
+msgid "Longitude"
 msgstr ""
 
 #. Hostnames
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:101
-msgid "olsrd_loadplugin_name"
+msgid "Hostnames"
 msgstr ""
 
 #. Command for name changes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:102
-msgid "olsrd_loadplugin_namechangescript"
+msgid "Command for name changes"
 msgstr ""
 
 #. OLSR executes this command once entries in the \"hosts\" are changed
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:103
-msgid "olsrd_loadplugin_namechangescript_desc"
+msgid "OLSR executes this command once entries in the \"hosts\" are changed"
 msgstr ""
 
 #. Path to the \"resolv\" file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:104
-msgid "olsrd_loadplugin_resolvfile"
+msgid "Path to the \"resolv\" file"
 msgstr ""
 
 #. Command for service changes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:105
-msgid "olsrd_loadplugin_serviceschangescript"
+msgid "Command for service changes"
 msgstr ""
 
 #. OLSR excutes this command once new service announcements are received
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:106
-msgid "olsrd_loadplugin_serviceschangescript_desc"
+msgid "OLSR excutes this command once new service announcements are received"
 msgstr ""
 
 #. PID file for SIGHUP signals
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:107
-msgid "olsrd_loadplugin_sighuppidfile"
+msgid "PID file for SIGHUP signals"
 msgstr ""
 
 #. OLSR sends a HUP signal to this PID once the \"hosts\" oder \"resolv\" file is changed
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:108
-msgid "olsrd_loadplugin_sighuppidfile_desc"
+msgid ""
+"OLSR sends a HUP signal to this PID once the \"hosts\" oder \"resolv\" file "
+"is changed"
 msgstr ""
 
 #. Domain suffix
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:109
-msgid "olsrd_loadplugin_suffix"
+msgid "Domain suffix"
 msgstr ""
 
 #. Timeout
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:110
-msgid "olsrd_loadplugin_timeout"
+msgid "Timeout"
 msgstr ""
 
 #. Name of the BMF interface
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:111
-msgid "olsrd_loadplugin_bmfinterface"
+msgid "Name of the BMF interface"
 msgstr ""
 
 #. IP address of the BMF interface
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:112
-msgid "olsrd_loadplugin_bmfinterfaceid"
+msgid "IP address of the BMF interface"
 msgstr ""
 
 #. Redirect local broadcasts
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:113
-msgid "olsrd_loadplugin_dolocalbroadcast"
+msgid "Redirect local broadcasts"
 msgstr ""
 
 #. Also redirect broadcasts from OLSR interfaces
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:114
-msgid "olsrd_loadplugin_capturepacketsonolsrinterfaces"
+msgid "Also redirect broadcasts from OLSR interfaces"
 msgstr ""
 
 #. Propagation mechanism
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:115
-msgid "olsrd_loadplugin_bmfmechanism"
+msgid "Propagation mechanism"
 msgstr ""
 
 #. Number of retransmissions per package
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:116
-msgid "olsrd_loadplugin_broadcastretransmitcount"
+msgid "Number of retransmissions per package"
 msgstr ""
 
 #. Minimum number of neighbours for broadcast redirection
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:117
-msgid "olsrd_loadplugin_fanoutlimit"
+msgid "Minimum number of neighbours for broadcast redirection"
 msgstr ""
 
 #. Non-OLSR interfaces
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:118
-msgid "olsrd_loadplugin_nonolsrif"
+msgid "Non-OLSR interfaces"
 msgstr ""
 
 #. Used port
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:119
-msgid "olsrd_loadplugin_port"
+msgid "Used port"
 msgstr ""
 
 #. Allow connections from hosts
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:120
-msgid "olsrd_loadplugin_host"
+msgid "Allow connections from hosts"
 msgstr ""
 
 #. Allow connections from subnets
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:121
-msgid "olsrd_loadplugin_net"
+msgid "Allow connections from subnets"
 msgstr ""
 
 #. Format: IP-AddresseNetmask
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:122
-msgid "olsrd_loadplugin_net_desc"
+msgid "Format: IP-AddresseNetmask"
 msgstr ""
 
 #. Used protocols
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:123
-msgid "olsrd_loadplugin_redistribute"
+msgid "Used protocols"
 msgstr ""
 
 #. Only export routes to Quagga or to kernel too
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:124
-msgid "olsrd_loadplugin_exportroutes"
+msgid "Only export routes to Quagga or to kernel too"
 msgstr ""
 
 #. Always prefer local routes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:125
-msgid "olsrd_loadplugin_localpref"
+msgid "Always prefer local routes"
 msgstr ""
 
 #. Distance of exported routes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:126
-msgid "olsrd_loadplugin_distance"
+msgid "Distance of exported routes"
 msgstr ""
 
 #. Key file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:127
-msgid "olsrd_loadplugin_keyfile"
+msgid "Key file"
 msgstr ""
 
 #. Watchdog timestamp file
diff --git a/po/templates/openvpn.pot b/po/templates/openvpn.pot
index 217a62c33..26b819efd 100644
--- a/po/templates/openvpn.pot
+++ b/po/templates/openvpn.pot
@@ -5,947 +5,947 @@ msgstr "Content-Type: text/plain; charset=UTF-8"
 
 #. OpenVPN
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:1
-msgid "openvpn"
+msgid "OpenVPN"
 msgstr ""
 
 #. Switch to basic configuration
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:3
-msgid "openvpn_switch_basic"
+msgid "« Switch to basic configuration"
 msgstr ""
 
 #. Switch to advanced configuration
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:4
-msgid "openvpn_switch_advanced"
+msgid "Switch to advanced configuration »"
 msgstr ""
 
 #. Enabled
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:6
-msgid "openvpn_enable"
+msgid "Enabled"
 msgstr ""
 
 #. Started
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:7
-msgid "openvpn_active"
+msgid "Started"
 msgstr ""
 
 #. no
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:8
-msgid "openvpn_active_no"
+msgid "no"
 msgstr ""
 
 #. yes (%i)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:9
-msgid "openvpn_active_yes"
+msgid "yes (%i)"
 msgstr ""
 
 #. Port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:10
-msgid "openvpn_port"
+msgid "Port"
 msgstr ""
 
 #. Protocol
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:11
-msgid "openvpn_proto"
+msgid "Protocol"
 msgstr ""
 
 #. Instance \"%s\"
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:13
-msgid "openvpn_instance"
+msgid "Instance \"%s\""
 msgstr ""
 
 #. OpenVPN instances
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:15
-msgid "openvpn_overview"
+msgid "OpenVPN instances"
 msgstr ""
 
 #. Below is a list of configured OpenVPN instances and their current state
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:16
-msgid "openvpn_overview_desc"
+msgid "Below is a list of configured OpenVPN instances and their current state"
 msgstr ""
 
 #. Daemon configuration
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:18
-msgid "openvpn_service"
+msgid "Daemon configuration"
 msgstr ""
 
 #. Networking options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:19
-msgid "openvpn_networking"
+msgid "Networking options"
 msgstr ""
 
 #. VPN options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:20
-msgid "openvpn_vpn"
+msgid "VPN options"
 msgstr ""
 
 #. Cryptography settings
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:21
-msgid "openvpn_cryptography"
+msgid "Cryptography settings"
 msgstr ""
 
 #. Read configuration options from file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:23
-msgid "openvpn_param_config"
+msgid "Read configuration options from file"
 msgstr ""
 
 #. Local host name or ip address
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:24
-msgid "openvpn_param_local"
+msgid "Local host name or ip address"
 msgstr ""
 
 #. Remote host name or ip address
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:25
-msgid "openvpn_param_remote"
+msgid "Remote host name or ip address"
 msgstr ""
 
 #. Randomly choose remote server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:26
-msgid "openvpn_param_remote_random"
+msgid "Randomly choose remote server"
 msgstr ""
 
 #. Major mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:27
-msgid "openvpn_param_mode"
+msgid "Major mode"
 msgstr ""
 
 #. Use protocol
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:28
-msgid "openvpn_param_proto"
+msgid "Use protocol"
 msgstr ""
 
 #. Connection retry interval
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:29
-msgid "openvpn_param_connect_retry"
+msgid "Connection retry interval"
 msgstr ""
 
 #. Connection timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:30
-msgid "openvpn_param_connect_timeout"
+msgid "Connection timeout"
 msgstr ""
 
 #. Maximum connection attempt retries
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:31
-msgid "openvpn_param_connect_retry_max"
+msgid "Maximum connection attempt retries"
 msgstr ""
 
 #. Try to sense proxy settings automatically
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:32
-msgid "openvpn_param_auto_proxy"
+msgid "Try to sense proxy settings automatically"
 msgstr ""
 
 #. Connect to remote host
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:33
-msgid "openvpn_param_http_proxy"
+msgid "Connect to remote host"
 msgstr ""
 
 #. Retry indefinitely on HTTP proxy errors
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:34
-msgid "openvpn_param_http_proxy_retry"
+msgid "Retry indefinitely on HTTP proxy errors"
 msgstr ""
 
 #. Proxy timeout in seconds
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:35
-msgid "openvpn_param_http_proxy_timeout"
+msgid "Proxy timeout in seconds"
 msgstr ""
 
 #. Set extended HTTP proxy options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:36
-msgid "openvpn_param_http_proxy_option"
+msgid "Set extended HTTP proxy options"
 msgstr ""
 
 #. Connect through Socks5 proxy
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:37
-msgid "openvpn_param_socks_proxy"
+msgid "Connect through Socks5 proxy"
 msgstr ""
 
 #. Retry indefinitely on Socks proxy errors
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:38
-msgid "openvpn_param_socks_proxy_retry"
+msgid "Retry indefinitely on Socks proxy errors"
 msgstr ""
 
 #. If hostname resolve fails, retry
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:39
-msgid "openvpn_param_resolv_retry"
+msgid "If hostname resolve fails, retry"
 msgstr ""
 
 #. Allow remote to change its IP or port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:40
-msgid "openvpn_param_float"
+msgid "Allow remote to change its IP or port"
 msgstr ""
 
 #. Execute shell command on remote ip change
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:41
-msgid "openvpn_param_ipchange"
+msgid "Execute shell command on remote ip change"
 msgstr ""
 
 #. TCP/UDP port # for both local and remote
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:42
-msgid "openvpn_param_port"
+msgid "TCP/UDP port # for both local and remote"
 msgstr ""
 
 #. TCP/UDP port # for local (default=1194)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:43
-msgid "openvpn_param_lport"
+msgid "TCP/UDP port # for local (default=1194)"
 msgstr ""
 
 #. TCP/UDP port # for remote (default=1194)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:44
-msgid "openvpn_param_rport"
+msgid "TCP/UDP port # for remote (default=1194)"
 msgstr ""
 
 #. Bind to local address and port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:45
-msgid "openvpn_param_bind"
+msgid "Bind to local address and port"
 msgstr ""
 
 #. Do not bind to local address and port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:46
-msgid "openvpn_param_nobind"
+msgid "Do not bind to local address and port"
 msgstr ""
 
 #. tun/tap device
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:47
-msgid "openvpn_param_dev"
+msgid "tun/tap device"
 msgstr ""
 
 #. Type of used device
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:48
-msgid "openvpn_param_dev_type"
+msgid "Type of used device"
 msgstr ""
 
 #. Use tun/tap device node
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:49
-msgid "openvpn_param_dev_node"
+msgid "Use tun/tap device node"
 msgstr ""
 
 #. Set the link layer address of the tap device
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:50
-msgid "openvpn_param_lladdr"
+msgid "Set the link layer address of the tap device"
 msgstr ""
 
 #. 'net30', 'p2p', or 'subnet'
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:51
-msgid "openvpn_param_topology"
+msgid "'net30', 'p2p', or 'subnet'"
 msgstr ""
 
 #. Make tun device IPv6 capable
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:52
-msgid "openvpn_param_tun_ipv6"
+msgid "Make tun device IPv6 capable"
 msgstr ""
 
 #. Configure device to use IP address
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:53
-msgid "openvpn_param_ifconfig"
+msgid "Configure device to use IP address"
 msgstr ""
 
 #. Don't actually execute ifconfig
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:54
-msgid "openvpn_param_ifconfig_noexec"
+msgid "Don't actually execute ifconfig"
 msgstr ""
 
 #. Don't warn on ifconfig inconsistencies
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:55
-msgid "openvpn_param_ifconfig_nowarn"
+msgid "Don't warn on ifconfig inconsistencies"
 msgstr ""
 
 #. Add route after establishing connection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:56
-msgid "openvpn_param_route"
+msgid "Add route after establishing connection"
 msgstr ""
 
 #. Specify a default gateway for routes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:57
-msgid "openvpn_param_route_gateway"
+msgid "Specify a default gateway for routes"
 msgstr ""
 
 #. Specify a default metric for routes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:58
-msgid "openvpn_param_route_metric"
+msgid "Specify a default metric for routes"
 msgstr ""
 
 #. Delay n seconds after connection 
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:59
-msgid "openvpn_param_route_delay"
+msgid "Delay n seconds after connection "
 msgstr ""
 
 #. Execute shell cmd after routes are added
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:60
-msgid "openvpn_param_route_up"
+msgid "Execute shell cmd after routes are added"
 msgstr ""
 
 #. Don't add routes automatically
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:61
-msgid "openvpn_param_route_noexec"
+msgid "Don't add routes automatically"
 msgstr ""
 
 #. Don't pull options from server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:62
-msgid "openvpn_param_route_nopull"
+msgid "Don't pull options from server"
 msgstr ""
 
 #. Automatically redirect default route
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:63
-msgid "openvpn_param_redirect_gateway"
+msgid "Automatically redirect default route"
 msgstr ""
 
 #. Pass environment variables to script
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:64
-msgid "openvpn_param_setenv"
+msgid "Pass environment variables to script"
 msgstr ""
 
 #. Shaping for peer bandwidth
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:65
-msgid "openvpn_param_shaper"
+msgid "Shaping for peer bandwidth"
 msgstr ""
 
 #. Set timeouts in server mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:66
-msgid "openvpn_param_keepalive"
+msgid "Set timeouts in server mode"
 msgstr ""
 
 #. tun/tap inactivity timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:67
-msgid "openvpn_param_inactive"
+msgid "tun/tap inactivity timeout"
 msgstr ""
 
 #. Remote ping timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:68
-msgid "openvpn_param_ping_exit"
+msgid "Remote ping timeout"
 msgstr ""
 
 #. Restart after remote ping timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:69
-msgid "openvpn_param_ping_restart"
+msgid "Restart after remote ping timeout"
 msgstr ""
 
 #. Only process ping timeouts if routes exist
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:70
-msgid "openvpn_param_ping_timer_rem"
+msgid "Only process ping timeouts if routes exist"
 msgstr ""
 
 #. Ping remote every n seconds over TCP/UDP port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:71
-msgid "openvpn_param_ping"
+msgid "Ping remote every n seconds over TCP/UDP port"
 msgstr ""
 
 #. Configure a multi-homed UDP server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:72
-msgid "openvpn_param_multihome"
+msgid "Configure a multi-homed UDP server"
 msgstr ""
 
 #. Optimize TUN/TAP/UDP writes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:73
-msgid "openvpn_param_fast_io"
+msgid "Optimize TUN/TAP/UDP writes"
 msgstr ""
 
 #. Remap SIGUSR1 signals
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:74
-msgid "openvpn_param_remap_usr1"
+msgid "Remap SIGUSR1 signals"
 msgstr ""
 
 #. Keep tun/tap device open on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:75
-msgid "openvpn_param_persist_tun"
+msgid "Keep tun/tap device open on restart"
 msgstr ""
 
 #. Keep remote IP address on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:76
-msgid "openvpn_param_persist_remote_ip"
+msgid "Keep remote IP address on restart"
 msgstr ""
 
 #. Keep local IP address on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:77
-msgid "openvpn_param_persist_local_ip"
+msgid "Keep local IP address on restart"
 msgstr ""
 
 #. Don't re-read key on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:78
-msgid "openvpn_param_persist_key"
+msgid "Don't re-read key on restart"
 msgstr ""
 
 #. TOS passthrough (applies to IPv4 only)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:79
-msgid "openvpn_param_passtos"
+msgid "TOS passthrough (applies to IPv4 only)"
 msgstr ""
 
 #. Set tun/tap device MTU
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:80
-msgid "openvpn_param_tun_mtu"
+msgid "Set tun/tap device MTU"
 msgstr ""
 
 #. Set tun/tap device overhead
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:81
-msgid "openvpn_param_tun_mtu_extra"
+msgid "Set tun/tap device overhead"
 msgstr ""
 
 #. Set TCP/UDP MTU
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:82
-msgid "openvpn_param_link_mtu"
+msgid "Set TCP/UDP MTU"
 msgstr ""
 
 #. Enable Path MTU discovery
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:83
-msgid "openvpn_param_mtu_disc"
+msgid "Enable Path MTU discovery"
 msgstr ""
 
 #. Empirically measure MTU
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:84
-msgid "openvpn_param_mtu_test"
+msgid "Empirically measure MTU"
 msgstr ""
 
 #. Enable internal datagram fragmentation
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:85
-msgid "openvpn_param_fragment"
+msgid "Enable internal datagram fragmentation"
 msgstr ""
 
 #. Set upper bound on TCP MSS
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:86
-msgid "openvpn_param_mssfix"
+msgid "Set upper bound on TCP MSS"
 msgstr ""
 
 #. Set the TCP/UDP send buffer size
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:87
-msgid "openvpn_param_sndbuf"
+msgid "Set the TCP/UDP send buffer size"
 msgstr ""
 
 #. Set the TCP/UDP receive buffer size
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:88
-msgid "openvpn_param_rcvbuf"
+msgid "Set the TCP/UDP receive buffer size"
 msgstr ""
 
 #. Set tun/tap TX queue length
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:89
-msgid "openvpn_param_txqueuelen"
+msgid "Set tun/tap TX queue length"
 msgstr ""
 
 #. Disable Paging
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:90
-msgid "openvpn_param_mlock"
+msgid "Disable Paging"
 msgstr ""
 
 #. Shell cmd to execute after tun device open
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:91
-msgid "openvpn_param_up"
+msgid "Shell cmd to execute after tun device open"
 msgstr ""
 
 #. Delay tun/tap open and up script execution
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:92
-msgid "openvpn_param_up_delay"
+msgid "Delay tun/tap open and up script execution"
 msgstr ""
 
 #. Shell cmd to run after tun device close
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:93
-msgid "openvpn_param_down"
+msgid "Shell cmd to run after tun device close"
 msgstr ""
 
 #. Call down cmd/script before TUN/TAP close
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:94
-msgid "openvpn_param_down_pre"
+msgid "Call down cmd/script before TUN/TAP close"
 msgstr ""
 
 #. Run up/down scripts for all restarts
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:95
-msgid "openvpn_param_up_restart"
+msgid "Run up/down scripts for all restarts"
 msgstr ""
 
 #. Set UID to user
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:96
-msgid "openvpn_param_user"
+msgid "Set UID to user"
 msgstr ""
 
 #. Set GID to group
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:97
-msgid "openvpn_param_group"
+msgid "Set GID to group"
 msgstr ""
 
 #. Chroot to directory after initialization
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:98
-msgid "openvpn_param_chroot"
+msgid "Chroot to directory after initialization"
 msgstr ""
 
 #. Change to directory before initialization
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:99
-msgid "openvpn_param_cd"
+msgid "Change to directory before initialization"
 msgstr ""
 
 #. Daemonize after initialization
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:100
-msgid "openvpn_param_daemon"
+msgid "Daemonize after initialization"
 msgstr ""
 
 #. Output to syslog and do not daemonize
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:101
-msgid "openvpn_param_syslog"
+msgid "Output to syslog and do not daemonize"
 msgstr ""
 
 #. Run as an inetd or xinetd server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:102
-msgid "openvpn_param_inetd"
+msgid "Run as an inetd or xinetd server"
 msgstr ""
 
 #. Write log to file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:103
-msgid "openvpn_param_log"
+msgid "Write log to file"
 msgstr ""
 
 #. Append log to file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:104
-msgid "openvpn_param_log_append"
+msgid "Append log to file"
 msgstr ""
 
 #. Don't log timestamps
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:105
-msgid "openvpn_param_suppress_timestamps"
+msgid "Don't log timestamps"
 msgstr ""
 
 #. Write process ID to file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:106
-msgid "openvpn_param_writepid"
+msgid "Write process ID to file"
 msgstr ""
 
 #. Change process priority
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:107
-msgid "openvpn_param_nice"
+msgid "Change process priority"
 msgstr ""
 
 #. Echo parameters to log
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:108
-msgid "openvpn_param_echo"
+msgid "Echo parameters to log"
 msgstr ""
 
 #. Set output verbosity
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:109
-msgid "openvpn_param_verb"
+msgid "Set output verbosity"
 msgstr ""
 
 #. Limit repeated log messages
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:110
-msgid "openvpn_param_mute"
+msgid "Limit repeated log messages"
 msgstr ""
 
 #. Write status to file every n seconds
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:111
-msgid "openvpn_param_status"
+msgid "Write status to file every n seconds"
 msgstr ""
 
 #. Status file format version
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:112
-msgid "openvpn_param_status_version"
+msgid "Status file format version"
 msgstr ""
 
 #. Disable options consistency check
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:113
-msgid "openvpn_param_disable_occ"
+msgid "Disable options consistency check"
 msgstr ""
 
 #. Special stress testing mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:114
-msgid "openvpn_param_gremlin"
+msgid "Special stress testing mode"
 msgstr ""
 
 #. Use fast LZO compression
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:115
-msgid "openvpn_param_comp_lzo"
+msgid "Use fast LZO compression"
 msgstr ""
 
 #. Don't use adaptive lzo compression
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:116
-msgid "openvpn_param_comp_noadapt"
+msgid "Don't use adaptive lzo compression"
 msgstr ""
 
 #. Enable management interface on <em>IP</em> <em>port</em>
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:117
-msgid "openvpn_param_management"
+msgid "Enable management interface on <em>IP</em> <em>port</em>"
 msgstr ""
 
 #. Management interface will connect as a TCP client
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:118
-msgid "openvpn_param_management_client"
+msgid "Management interface will connect as a TCP client"
 msgstr ""
 
 #. Query management channel for private key
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:119
-msgid "openvpn_param_management_query_passwords"
+msgid "Query management channel for private key"
 msgstr ""
 
 #. Start OpenVPN in a hibernating state
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:120
-msgid "openvpn_param_management_hold"
+msgid "Start OpenVPN in a hibernating state"
 msgstr ""
 
 #. Issue SIGUSR1 on management disconnect
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:121
-msgid "openvpn_param_management_signal"
+msgid "Issue SIGUSR1 on management disconnect"
 msgstr ""
 
 #. Forget passwords on management disconnect
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:122
-msgid "openvpn_param_management_forget_disconnect"
+msgid "Forget passwords on management disconnect"
 msgstr ""
 
 #. Number of lines for log file history
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:123
-msgid "openvpn_param_management_log_cache"
+msgid "Number of lines for log file history"
 msgstr ""
 
 #. Load plug-in module
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:124
-msgid "openvpn_param_plugin"
+msgid "Load plug-in module"
 msgstr ""
 
 #. Configure server mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:125
-msgid "openvpn_param_server"
+msgid "Configure server mode"
 msgstr ""
 
 #. Configure server bridge
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:126
-msgid "openvpn_param_server_bridge"
+msgid "Configure server bridge"
 msgstr ""
 
 #. Push options to peer
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:127
-msgid "openvpn_param_push"
+msgid "Push options to peer"
 msgstr ""
 
 #. Don't inherit global push options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:128
-msgid "openvpn_param_push_reset"
+msgid "Don't inherit global push options"
 msgstr ""
 
 #. Set aside a pool of subnets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:129
-msgid "openvpn_param_ifconfig_pool"
+msgid "Set aside a pool of subnets"
 msgstr ""
 
 #. Use individual addresses rather than /30 subnets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:130
-msgid "openvpn_param_ifconfig_pool_linear"
+msgid "Use individual addresses rather than /30 subnets"
 msgstr ""
 
 #. Persist/unpersist ifconfig-pool
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:131
-msgid "openvpn_param_ifconfig_pool_persist"
+msgid "Persist/unpersist ifconfig-pool"
 msgstr ""
 
 #. Push an ifconfig option to remote
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:132
-msgid "openvpn_param_ifconfig_push"
+msgid "Push an ifconfig option to remote"
 msgstr ""
 
 #. Route subnet to client
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:133
-msgid "openvpn_param_iroute"
+msgid "Route subnet to client"
 msgstr ""
 
 #. Client is disabled
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:134
-msgid "openvpn_param_disable"
+msgid "Client is disabled"
 msgstr ""
 
 #. Don't require client certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:135
-msgid "openvpn_param_client_cert_not_required"
+msgid "Don't require client certificate"
 msgstr ""
 
 #. Use username as common name
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:136
-msgid "openvpn_param_username_as_common_name"
+msgid "Use username as common name"
 msgstr ""
 
 #. Script to verify interactive authentication
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:137
-msgid "openvpn_param_auth_user_pass_verify"
+msgid "Script to verify interactive authentication"
 msgstr ""
 
 #. Allow client-to-client traffic
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:138
-msgid "openvpn_param_client_to_client"
+msgid "Allow client-to-client traffic"
 msgstr ""
 
 #. Allow multiple clients with same certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:139
-msgid "openvpn_param_duplicate_cn"
+msgid "Allow multiple clients with same certificate"
 msgstr ""
 
 #. Run script cmd on client connection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:140
-msgid "openvpn_param_client_connect"
+msgid "Run script cmd on client connection"
 msgstr ""
 
 #. Run script cmd on client disconnection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:141
-msgid "openvpn_param_client_disconnect"
+msgid "Run script cmd on client disconnection"
 msgstr ""
 
 #. Directory for custom client config files
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:142
-msgid "openvpn_param_client_config_dir"
+msgid "Directory for custom client config files"
 msgstr ""
 
 #. Refuse connection if no custom client config
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:143
-msgid "openvpn_param_ccd_exclusive"
+msgid "Refuse connection if no custom client config"
 msgstr ""
 
 #. Temporary directory for client-connect return file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:144
-msgid "openvpn_param_tmp_dir"
+msgid "Temporary directory for client-connect return file"
 msgstr ""
 
 #. Set size of real and virtual address hash tables
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:145
-msgid "openvpn_param_hash_size"
+msgid "Set size of real and virtual address hash tables"
 msgstr ""
 
 #. Number of allocated broadcast buffers
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:146
-msgid "openvpn_param_bcast_buffers"
+msgid "Number of allocated broadcast buffers"
 msgstr ""
 
 #. Maximum number of queued TCP output packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:147
-msgid "openvpn_param_tcp_queue_limit"
+msgid "Maximum number of queued TCP output packets"
 msgstr ""
 
 #. Script to validate client virtual addresses
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:148
-msgid "openvpn_param_learn_address"
+msgid "Script to validate client virtual addresses"
 msgstr ""
 
 #. Allowed maximum of new connections
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:149
-msgid "openvpn_param_connect_freq"
+msgid "Allowed maximum of new connections"
 msgstr ""
 
 #. Allowed maximum of connected clients
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:150
-msgid "openvpn_param_max_clients"
+msgid "Allowed maximum of connected clients"
 msgstr ""
 
 #. Allowed maximum of internal
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:151
-msgid "openvpn_param_max_routes_per_client"
+msgid "Allowed maximum of internal"
 msgstr ""
 
 #. Proxy incoming HTTPS sessions
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:152
-msgid "openvpn_param_port_share"
+msgid "Proxy incoming HTTPS sessions"
 msgstr ""
 
 #. Configure client mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:153
-msgid "openvpn_param_client"
+msgid "Configure client mode"
 msgstr ""
 
 #. Authenticate using username/password
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:154
-msgid "openvpn_param_auth_user_pass"
+msgid "Authenticate using username/password"
 msgstr ""
 
 #. Accept options pushed from server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:155
-msgid "openvpn_param_pull"
+msgid "Accept options pushed from server"
 msgstr ""
 
 #. Handling of authentication failures
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:156
-msgid "openvpn_param_auth_retry"
+msgid "Handling of authentication failures"
 msgstr ""
 
 #. Send notification to peer on disconnect
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:157
-msgid "openvpn_param_explicit_exit_notify"
+msgid "Send notification to peer on disconnect"
 msgstr ""
 
 #. Enable Static Key encryption mode (non-TLS)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:158
-msgid "openvpn_param_secret"
+msgid "Enable Static Key encryption mode (non-TLS)"
 msgstr ""
 
 #. HMAC authentication for packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:159
-msgid "openvpn_param_auth"
+msgid "HMAC authentication for packets"
 msgstr ""
 
 #. Encryption cipher for packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:160
-msgid "openvpn_param_cipher"
+msgid "Encryption cipher for packets"
 msgstr ""
 
 #. Size of cipher key
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:161
-msgid "openvpn_param_keysize"
+msgid "Size of cipher key"
 msgstr ""
 
 #. Enable OpenSSL hardware crypto engines
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:162
-msgid "openvpn_param_engine"
+msgid "Enable OpenSSL hardware crypto engines"
 msgstr ""
 
 #. Disable replay protection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:163
-msgid "openvpn_param_no_replay"
+msgid "Disable replay protection"
 msgstr ""
 
 #. Silence the output of replay warnings
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:164
-msgid "openvpn_param_mute_replay_warnings"
+msgid "Silence the output of replay warnings"
 msgstr ""
 
 #. Replay protection sliding window size
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:165
-msgid "openvpn_param_replay_window"
+msgid "Replay protection sliding window size"
 msgstr ""
 
 #. Disable cipher initialisation vector
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:166
-msgid "openvpn_param_no_iv"
+msgid "Disable cipher initialisation vector"
 msgstr ""
 
 #. Persist replay-protection state
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:167
-msgid "openvpn_param_replay_persist"
+msgid "Persist replay-protection state"
 msgstr ""
 
 #. Run a self-test of crypto features
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:168
-msgid "openvpn_param_test_crypto"
+msgid "Run a self-test of crypto features"
 msgstr ""
 
 #. Enable TLS and assume server role
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:169
-msgid "openvpn_param_tls_server"
+msgid "Enable TLS and assume server role"
 msgstr ""
 
 #. Enable TLS and assume client role
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:170
-msgid "openvpn_param_tls_client"
+msgid "Enable TLS and assume client role"
 msgstr ""
 
 #. Data channel key exchange method
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:171
-msgid "openvpn_param_key_method"
+msgid "Data channel key exchange method"
 msgstr ""
 
 #. Certificate authority
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:172
-msgid "openvpn_param_ca"
+msgid "Certificate authority"
 msgstr ""
 
 #. Directory of trusted certificates (CAs and CRLs)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:173
-msgid "openvpn_param_capath"
+msgid "Directory of trusted certificates (CAs and CRLs)"
 msgstr ""
 
 #. Diffie Hellman parameters
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:174
-msgid "openvpn_param_dh"
+msgid "Diffie Hellman parameters"
 msgstr ""
 
 #. Local certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:175
-msgid "openvpn_param_cert"
+msgid "Local certificate"
 msgstr ""
 
 #. Local private key
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:176
-msgid "openvpn_param_key"
+msgid "Local private key"
 msgstr ""
 
 #. PKCS#12 file containing keys
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:177
-msgid "openvpn_param_pkcs12"
+msgid "PKCS#12 file containing keys"
 msgstr ""
 
 #. TLS cipher
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:178
-msgid "openvpn_param_tls_cipher"
+msgid "TLS cipher"
 msgstr ""
 
 #. Retransmit timeout on TLS control channel
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:179
-msgid "openvpn_param_tls_timeout"
+msgid "Retransmit timeout on TLS control channel"
 msgstr ""
 
 #. Renegotiate data chan. key after bytes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:180
-msgid "openvpn_param_reneg_bytes"
+msgid "Renegotiate data chan. key after bytes"
 msgstr ""
 
 #. Renegotiate data chan. key after packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:181
-msgid "openvpn_param_reneg_pkts"
+msgid "Renegotiate data chan. key after packets"
 msgstr ""
 
 #. Renegotiate data chan. key after seconds
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:182
-msgid "openvpn_param_reneg_sec"
+msgid "Renegotiate data chan. key after seconds"
 msgstr ""
 
 #. Timeframe for key exchange
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:183
-msgid "openvpn_param_hand_window"
+msgid "Timeframe for key exchange"
 msgstr ""
 
 #. Key transition window
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:184
-msgid "openvpn_param_tran_window"
+msgid "Key transition window"
 msgstr ""
 
 #. Allow only one session
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:185
-msgid "openvpn_param_single_session"
+msgid "Allow only one session"
 msgstr ""
 
 #. Exit on TLS negotiation failure
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:186
-msgid "openvpn_param_tls_exit"
+msgid "Exit on TLS negotiation failure"
 msgstr ""
 
 #. Additional authentication over TLS
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:187
-msgid "openvpn_param_tls_auth"
+msgid "Additional authentication over TLS"
 msgstr ""
 
 #. Get PEM password from controlling tty before we daemonize
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:188
-msgid "openvpn_param_askpass"
+msgid "Get PEM password from controlling tty before we daemonize"
 msgstr ""
 
 #. Don't cache --askpass or --auth-user-pass passwords
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:189
-msgid "openvpn_param_auth_nocache"
+msgid "Don't cache --askpass or --auth-user-pass passwords"
 msgstr ""
 
 #. Check peer certificate against a CRL
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:190
-msgid "openvpn_param_crl_verify"
+msgid "Check peer certificate against a CRL"
 msgstr ""
 
 #. Shell command to verify X509 name
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:191
-msgid "openvpn_param_tls_verify"
+msgid "Shell command to verify X509 name"
 msgstr ""
 
 #. Only accept connections from given X509 name
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:192
-msgid "openvpn_param_tls_remote"
+msgid "Only accept connections from given X509 name"
 msgstr ""
 
 #. Require explicit designation on certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:193
-msgid "openvpn_param_ns_cert_type"
+msgid "Require explicit designation on certificate"
 msgstr ""
 
 #. Require explicit key usage on certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:194
-msgid "openvpn_param_remote_cert_ku"
+msgid "Require explicit key usage on certificate"
 msgstr ""
 
 #. Require extended explicit key usage on certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:195
-msgid "openvpn_param_remote_cert_eku"
+msgid "Require extended explicit key usage on certificate"
 msgstr ""
 
 #. Require normal and extended key usage on certificate
diff --git a/po/templates/p910nd.pot b/po/templates/p910nd.pot
index f95f68c62..6996010c4 100644
--- a/po/templates/p910nd.pot
+++ b/po/templates/p910nd.pot
@@ -5,17 +5,19 @@ msgstr "Content-Type: text/plain; charset=UTF-8"
 
 #. p910nd - Printer server
 #: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:1
-msgid "p910nd"
+msgid "p910nd - Printer server"
 msgstr ""
 
 #. First you have to install the packages to get support for USB (kmod-usb-printer) or parallel port (kmod-lp).
 #: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:2
-msgid "p910nd_desc"
+msgid ""
+"First you have to install the packages to get support for USB (kmod-usb-"
+"printer) or parallel port (kmod-lp)."
 msgstr ""
 
 #. Bidirectional mode
 #: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:3
-msgid "bidirectional"
+msgid "Bidirectional mode"
 msgstr ""
 
 #. p910nd listens on port 910+N. E.g. 9100 for the first printer.
diff --git a/po/templates/polipo.pot b/po/templates/polipo.pot
index 867199f0d..4c582ab32 100644
--- a/po/templates/polipo.pot
+++ b/po/templates/polipo.pot
@@ -5,212 +5,246 @@ msgstr "Content-Type: text/plain; charset=UTF-8"
 
 #. Polipo
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:1
-msgid "polipo"
+msgid "Polipo"
 msgstr ""
 
 #. On-Disk Cache
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:2
-msgid "polipo_cache"
+msgid "On-Disk Cache"
 msgstr ""
 
 #. Shared cache
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:3
-msgid "polipo_cache_cacheisshared"
+msgid "Shared cache"
 msgstr ""
 
 #. Enable if cache (proxy) is shared by multiple users.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:4
-msgid "polipo_cache_cacheisshared_desc"
+msgid "Enable if cache (proxy) is shared by multiple users."
 msgstr ""
 
 #. To enable polipo on-disk cache cleaning (highly recommended), you should add a cron job in Scheduled Tasks services that will execute /usr/sbin/polipo_purge script. For example to perform disk cache cleanup every day at 6:00 in the morning you should add the following line in Scheduled Tasks &quot;0 6 * * *	/usr/sbin/polipo_purge&quot; (without quotes).
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:5
-msgid "polipo_cache_desc"
+msgid ""
+"To enable polipo on-disk cache cleaning (highly recommended), you should add "
+"a cron job in Scheduled Tasks services that will execute /usr/sbin/"
+"polipo_purge script. For example to perform disk cache cleanup every day at "
+"6:00 in the morning you should add the following line in Scheduled Tasks \"0 "
+"6 * * *\\t/usr/sbin/polipo_purge\" (without quotes)."
 msgstr ""
 
 #. Disk cache location
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:6
-msgid "polipo_cache_diskcacheroot"
+msgid "Disk cache location"
 msgstr ""
 
 #. Location where polipo will cache files permanently. Use of external storage devices is recommended, because the cache can grow considerably. Leave it empty to disable on-disk cache.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:7
-msgid "polipo_cache_diskcacheroot_desc"
+msgid ""
+"Location where polipo will cache files permanently. Use of external storage "
+"devices is recommended, because the cache can grow considerably. Leave it "
+"empty to disable on-disk cache."
 msgstr ""
 
 #. Truncate cache files size (in bytes)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:8
-msgid "polipo_cache_diskcachetruncatesize"
+msgid "Truncate cache files size (in bytes)"
 msgstr ""
 
 #. Size to which cached files should be truncated. (default value: 1048576)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:9
-msgid "polipo_cache_diskcachetruncatesize_desc"
+msgid ""
+"Size to which cached files should be truncated. (default value: 1048576)"
 msgstr ""
 
 #. Truncate cache files time
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:10
-msgid "polipo_cache_diskcachetruncatetime"
+msgid "Truncate cache files time"
 msgstr ""
 
 #. Time after which cached files will be truncated. (default value: 4d12h)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:11
-msgid "polipo_cache_diskcachetruncatetime_desc"
+msgid "Time after which cached files will be truncated. (default value: 4d12h)"
 msgstr ""
 
 #. Delete cache files time
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:12
-msgid "polipo_cache_diskcacheunlinktime"
+msgid "Delete cache files time"
 msgstr ""
 
 #. Time after which cached files will be deleted. (default value: 32d)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:13
-msgid "polipo_cache_diskcacheunlinktime_desc"
+msgid "Time after which cached files will be deleted. (default value: 32d)"
 msgstr ""
 
 #. Polipo is a small and fast caching web proxy.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:14
-msgid "polipo_desc"
+msgid "Polipo is a small and fast caching web proxy."
 msgstr ""
 
 #. General
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:15
-msgid "polipo_general"
+msgid "General"
 msgstr ""
 
 #. Allowed clients
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:16
-msgid "polipo_general_allowedclients"
+msgid "Allowed clients"
 msgstr ""
 
 #. When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients that are allowed to connect. The format is IP address or network address (192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6)).
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:17
-msgid "polipo_general_allowedclients_desc"
+msgid ""
+"When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients "
+"that are allowed to connect. The format is IP address or network address "
+"(192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))."
 msgstr ""
 
 #. In RAM cache size (in bytes)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:18
-msgid "polipo_general_chunkhighmark"
+msgid "In RAM cache size (in bytes)"
 msgstr ""
 
 #. How much RAM should Polipo use for its cache.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:19
-msgid "polipo_general_chunkhighmark_desc"
+msgid "How much RAM should Polipo use for its cache."
 msgstr ""
 
 #. DNS server address
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:20
-msgid "polipo_general_dnsnameserver"
+msgid "DNS server address"
 msgstr ""
 
 #. Set the DNS server address to use, if you want Polipo to use different DNS server than the host system.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:21
-msgid "polipo_general_dnsnameserver_desc"
+msgid ""
+"Set the DNS server address to use, if you want Polipo to use different DNS "
+"server than the host system."
 msgstr ""
 
 #. Query DNS for IPv6
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:22
-msgid "polipo_general_dnsqueryipv6"
+msgid "Query DNS for IPv6"
 msgstr ""
 
 #. false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = Query both, prefer IPv6; true = Query only IPv6
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:23
-msgid "polipo_general_dnsqueryipv6_desc"
+msgid ""
+"false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = "
+"Query both, prefer IPv6; true = Query only IPv6"
 msgstr ""
 
 #. Query DNS by hostname
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:24
-msgid "polipo_general_dnsusegethostbyname"
+msgid "Query DNS by hostname"
 msgstr ""
 
 #. false = Never use system DNS resolver; reluctantly = Query DNS directly, if DNS server is unavailable fail to system DNS resolver; happily = Query DNS directly, if host could not be found fallback to system DNS resolver; true = Always use system DNS resolver
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:25
-msgid "polipo_general_dnsusegethostbyname_desc"
+msgid ""
+"false = Never use system DNS resolver; reluctantly = Query DNS directly, if "
+"DNS server is unavailable fail to system DNS resolver; happily = Query DNS "
+"directly, if host could not be found fallback to system DNS resolver; true = "
+"Always use system DNS resolver"
 msgstr ""
 
 #. Syslog facility
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:26
-msgid "polipo_general_logfacility"
+msgid "Syslog facility"
 msgstr ""
 
 #. Log file location
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:27
-msgid "polipo_general_logfile"
+msgid "Log file location"
 msgstr ""
 
 #. Use of external storage device is recommended, because the log file is written frequently and can grow considerably.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:28
-msgid "polipo_general_logfile_desc"
+msgid ""
+"Use of external storage device is recommended, because the log file is "
+"written frequently and can grow considerably."
 msgstr ""
 
 #. Log to syslog
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:29
-msgid "polipo_general_logsyslog"
+msgid "Log to syslog"
 msgstr ""
 
 #. Parent proxy authentication
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:30
-msgid "polipo_general_parentauthcredentials"
+msgid "Parent proxy authentication"
 msgstr ""
 
 #. Basic HTTP authentication supported. Provide username and password in username:password format.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:31
-msgid "polipo_general_parentauthcredentials_desc"
+msgid ""
+"Basic HTTP authentication supported. Provide username and password in "
+"username:password format."
 msgstr ""
 
 #. Parent proxy address
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:32
-msgid "polipo_general_parentproxy"
+msgid "Parent proxy address"
 msgstr ""
 
 #. Parent proxy address (in host:port format), to which Polipo will forward the requests.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:33
-msgid "polipo_general_parentproxy_desc"
+msgid ""
+"Parent proxy address (in host:port format), to which Polipo will forward the "
+"requests."
 msgstr ""
 
 #. Listen address
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:34
-msgid "polipo_general_proxyaddress"
+msgid "Listen address"
 msgstr ""
 
 #. The interface on which Polipo will listen. To listen on all interfaces use 0.0.0.0 or :: (IPv6).
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:35
-msgid "polipo_general_proxyaddress_desc"
+msgid ""
+"The interface on which Polipo will listen. To listen on all interfaces use "
+"0.0.0.0 or :: (IPv6)."
 msgstr ""
 
 #. Listen port
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:36
-msgid "polipo_general_proxyport"
+msgid "Listen port"
 msgstr ""
 
 #. Port on which Polipo will listen. (default value: 8123)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:37
-msgid "polipo_general_proxyport_desc"
+msgid "Port on which Polipo will listen. (default value: 8123)"
 msgstr ""
 
 #. Poor Man&#39;s Multiplexing
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:38
-msgid "polipo_pmm"
+msgid "Poor Man's Multiplexing"
 msgstr ""
 
 #. Poor Man&#39;s Multiplexing (PMM) is a technique that simulates multiplexing by requesting an instance in multiple segments. It tries to lower the latency caused by the weakness of HTTP protocol. NOTE: some sites may not work with PMM enabled.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:39
-msgid "polipo_pmm_desc"
+msgid ""
+"Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by "
+"requesting an instance in multiple segments. It tries to lower the latency "
+"caused by the weakness of HTTP protocol. NOTE: some sites may not work with "
+"PMM enabled."
 msgstr ""
 
 #. First PMM segment size (in bytes)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:40
-msgid "polipo_pmm_pmmfirstsize"
+msgid "First PMM segment size (in bytes)"
 msgstr ""
 
 #. Size of the first PMM segment. If not defined, it defaults to twice the PMM segment size.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:41
-msgid "polipo_pmm_pmmfirstsize_desc"
+msgid ""
+"Size of the first PMM segment. If not defined, it defaults to twice the PMM "
+"segment size."
 msgstr ""
 
 #. PMM segments size (in bytes)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:42
-msgid "polipo_pmm_pmmsize"
+msgid "PMM segments size (in bytes)"
 msgstr ""
 
 #. To enable PMM, PMM segment size must be set to some positive value.
diff --git a/po/templates/qos.pot b/po/templates/qos.pot
index 673210392..1fbb709cc 100644
--- a/po/templates/qos.pot
+++ b/po/templates/qos.pot
@@ -5,91 +5,93 @@ msgstr "Content-Type: text/plain; charset=UTF-8"
 
 #. Quality of Service
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:1
-msgid "qos"
+msgid "Quality of Service"
 msgstr ""
 
 #. With QoS you can priorize network traffic selected by adresses, ports or services.
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:2
-msgid "qos_desc"
+msgid ""
+"With QoS you can priorize network traffic selected by adresses, ports or "
+"services."
 msgstr ""
 
 #. Classification
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:3
-msgid "qos_interface_classgroup"
+msgid "Classification"
 msgstr ""
 
 #. Calculate Overhead
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:4
-msgid "qos_interface_overhead"
+msgid "Calculate Overhead"
 msgstr ""
 
 #. Half-Duplex
-msgid "qos_interface_halfduplex"
+msgid "Half-Duplex"
 msgstr ""
 
 #. Downlink
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:5
-msgid "qos_interface_download"
+msgid "Downlink"
 msgstr ""
 
 #. Uplink
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:6
-msgid "qos_interface_upload"
+msgid "Uplink"
 msgstr ""
 
 #. Prioritization
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:7
-msgid "qos_classify"
+msgid "Prioritization"
 msgstr ""
 
 #. Priority
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:8
-msgid "qos_classify_target"
+msgid "Priority"
 msgstr ""
 
 #. Source address
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:9
-msgid "qos_classify_srchost"
+msgid "Source address"
 msgstr ""
 
 #. source network / source host
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:10
-msgid "qos_classify_srchost_dest"
+msgid "source network / source host"
 msgstr ""
 
 #. Target address
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:11
-msgid "qos_classify_dsthost"
+msgid "Target address"
 msgstr ""
 
 #. target network / target host
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:12
-msgid "qos_classify_dsthost_dest"
+msgid "target network / target host"
 msgstr ""
 
 #. portrange
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:13
-msgid "qos_classify_portrange"
+msgid "portrange"
 msgstr ""
 
 #. low
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:14
-msgid "qos_bulk"
+msgid "low"
 msgstr ""
 
 #. normal
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:15
-msgid "qos_normal"
+msgid "normal"
 msgstr ""
 
 #. express
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:16
-msgid "qos_express"
+msgid "express"
 msgstr ""
 
 #. priority
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:17
-msgid "qos_priority"
+msgid "priority"
 msgstr ""
 
 #. Bytes sent
diff --git a/po/templates/rrdtool.pot b/po/templates/rrdtool.pot
index 9fa8a8ca8..bedcbbb61 100644
--- a/po/templates/rrdtool.pot
+++ b/po/templates/rrdtool.pot
@@ -5,342 +5,257 @@ msgstr "Content-Type: text/plain; charset=UTF-8"
 
 #. %H: Wireless - Signal Noise Ratio
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:1
-msgid "stat_dg_title_wireless__signal_noise"
+msgid "%H: Wireless - Signal Noise Ratio"
 msgstr ""
 
 #. dBm
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:2
-msgid "stat_dg_label_wireless__signal_noise"
+msgid "dBm"
 msgstr ""
 
 #. Noise Level
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:3
-msgid "stat_ds_signal_noise"
+msgid "Noise Level"
 msgstr ""
 
 #. Signal Strength
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:4
-msgid "stat_ds_signal_power"
+msgid "Signal Strength"
 msgstr ""
 
 #. %H: Wireless - Signal Quality
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:5
-msgid "stat_dg_title_wireless__signal_quality"
+msgid "%H: Wireless - Signal Quality"
 msgstr ""
 
 #. n
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:6
-msgid "stat_dg_label_wireless__signal_quality"
+msgid "n"
 msgstr ""
 
 #. Signal Quality
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:7
-msgid "stat_ds_signal_quality"
+msgid "Signal Quality"
 msgstr ""
 
 #. %H: ICMP Roundtrip Times
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:8
-msgid "stat_dg_title_ping"
+msgid "%H: ICMP Roundtrip Times"
 msgstr ""
 
 #. ms
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:9
-msgid "stat_dg_label_ping"
-msgstr ""
-
-#. %di
-#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:10
-msgid "stat_ds_ping"
+msgid "ms"
 msgstr ""
 
 #. %H: Firewall - Processed Packets
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:11
-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"
+msgid "%H: Firewall - Processed Packets"
 msgstr ""
 
 #. Chain \"%di\"
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:13
-msgid "stat_ds_ipt_packets"
+msgid "Chain \"%di\""
 msgstr ""
 
 #. %H: Netlink - Transfer on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:14
-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"
+msgid "%H: Netlink - Transfer on %pi"
 msgstr ""
 
 #. Bytes (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:16
-msgid "stat_ds_if_octets"
+msgid "Bytes (%ds)"
 msgstr ""
 
 #. %H: Netlink - Packets on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:17
-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"
+msgid "%H: Netlink - Packets on %pi"
 msgstr ""
 
 #. Processed (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:19
-msgid "stat_ds_if_packets"
+msgid "Processed (%ds)"
 msgstr ""
 
 #. Dropped   (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:20
-msgid "stat_ds_if_dropped"
+msgid "Dropped (%ds)"
 msgstr ""
 
 #. Errors    (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:21
-msgid "stat_ds_if_errors"
+msgid "Errors (%ds)"
 msgstr ""
 
 #. %H: Netlink - Multicast on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:22
-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"
+msgid "%H: Netlink - Multicast on %pi"
 msgstr ""
 
 #. Packets
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:24
-msgid "stat_ds_if_multicast"
+msgid "Packets"
 msgstr ""
 
 #. %H: Netlink - Collisions on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:25
-msgid "stat_dg_title_netlink__if_collisions"
+msgid "%H: Netlink - Collisions on %pi"
 msgstr ""
 
 #. Collisions/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:26
-msgid "stat_dg_label_netlink__if_collisions"
+msgid "Collisions/s"
 msgstr ""
 
 #. Collisions
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:27
-msgid "stat_ds_if_collisions"
+msgid "Collisions"
 msgstr ""
 
 #. %H: Netlink - Errors on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:28
-msgid "stat_dg_title_netlink__if_tx_errors"
+msgid "%H: Netlink - Errors on %pi"
 msgstr ""
 
 #. Errors/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:29
-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"
+msgid "Errors/s"
 msgstr ""
 
 #. %H: Processes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:32
-msgid "stat_dg_title_processes"
+msgid "%H: Processes"
 msgstr ""
 
 #. Processes/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:33
-msgid "stat_dg_label_processes"
-msgstr ""
-
-#. %di
-#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:34
-msgid "stat_ds_ps_state"
+msgid "Processes/s"
 msgstr ""
 
 #. %H: Process %pi - used cpu time
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:35
-msgid "stat_dg_title_processes__ps_cputime"
+msgid "%H: Process %pi - used cpu time"
 msgstr ""
 
 #. Jiffies
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:36
-msgid "stat_dg_label_processes__ps_cputime"
+msgid "Jiffies"
 msgstr ""
 
 #. system
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:37
-msgid "stat_ds_ps_cputime__syst"
+msgid "System"
 msgstr ""
 
 #. user
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:38
-msgid "stat_ds_ps_cputime__user"
+msgid "user"
 msgstr ""
 
 #. %H: Process %pi - threads and processes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:39
-msgid "stat_dg_title_processes__ps_count"
+msgid "%H: Process %pi - threads and processes"
 msgstr ""
 
 #. Count
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:40
-msgid "stat_dg_label_processes__ps_count"
-msgstr ""
-
-#. %ds
-#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:41
-msgid "stat_ds_ps_count"
+msgid "Count"
 msgstr ""
 
 #. %H: Process %pi - page faults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:42
-msgid "stat_dg_title_processes__ps_pagefaults"
+msgid "%H: Process %pi - page faults"
 msgstr ""
 
 #. Pagefaults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:43
-msgid "stat_dg_label_processes__ps_pagefaults"
+msgid "Pagefaults"
 msgstr ""
 
 #. page faults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:44
-msgid "stat_ds_ps_pagefaults"
+msgid "page faults"
 msgstr ""
 
 #. %H: Process %pi - virtual memory size
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:45
-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"
+msgid "%H: Process %pi - virtual memory size"
 msgstr ""
 
 #. virtual memory
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:47
-msgid "stat_ds_ps_rss"
+msgid "virtual memory"
 msgstr ""
 
 #. %H: Usage on Processor #%pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:48
-msgid "stat_dg_title_cpu"
+msgid "%H: Usage on Processor #%pi"
 msgstr ""
 
 #. %
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:49
-msgid "stat_dg_label_cpu"
-msgstr ""
-
-#. %di
-#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:50
-msgid "stat_ds_cpu"
+msgid "%"
 msgstr ""
 
 #. %H: Transfer on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:51
-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"
+msgid "%H: Transfer on %di"
 msgstr ""
 
 #. %H: Packets on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:53
-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"
+msgid "%H: Packets on %di"
 msgstr ""
 
 #. %H: TCP-Connections to Port %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:55
-msgid "stat_dg_title_tcpconns"
+msgid "%H: TCP-Connections to Port %pi"
 msgstr ""
 
 #. Connections/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:56
-msgid "stat_dg_label_tcpconns"
-msgstr ""
-
-#. %di
-#: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:57
-msgid "stat_ds_tcp_connections"
+msgid "Connections/s"
 msgstr ""
 
 #. %H: Disk Space Usage on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:58
-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"
+msgid "%H: Disk Space Usage on %di"
 msgstr ""
 
 #. %H: Interrupts
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:62
-msgid "stat_dg_title_irq"
+msgid "%H: Interrupts"
 msgstr ""
 
 #. Issues/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:63
-msgid "stat_dg_label_irq"
+msgid "Issues/s"
 msgstr ""
 
 #. IRQ %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:64
-msgid "stat_ds_irq"
+msgid "IRQ %di"
 msgstr ""
 
 #. %H: System Load
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:65
-msgid "stat_dg_title_load"
+msgid "%H: System Load"
 msgstr ""
 
 #. Load
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:66
-msgid "stat_dg_label_load"
+msgid "Load"
 msgstr ""
 
 #. 1 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:67
-msgid "stat_ds_load__shortterm"
+msgid "1 min"
 msgstr ""
 
 #. 5 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:68
-msgid "stat_ds_load__midterm"
+msgid "5 min"
 msgstr ""
 
 #. 15 min
diff --git a/po/templates/samba.pot b/po/templates/samba.pot
index b6e8228df..2cd5c132d 100644
--- a/po/templates/samba.pot
+++ b/po/templates/samba.pot
@@ -5,82 +5,82 @@ msgstr "Content-Type: text/plain; charset=UTF-8"
 
 #. Network Shares
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:1
-msgid "samba"
+msgid "Network Shares"
 msgstr ""
 
 #. Hostname
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:2
-msgid "samba_samba_name"
+msgid "Hostname"
 msgstr ""
 
 #. Description
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:3
-msgid "samba_samba_description"
+msgid "Description"
 msgstr ""
 
 #. Workgroup
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:4
-msgid "samba_samba_workgroup"
+msgid "Workgroup"
 msgstr ""
 
 #. Share home-directories
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:5
-msgid "samba_samba_homes"
+msgid "Share home-directories"
 msgstr ""
 
 #. System users can reach their home directories via network shares.
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:6
-msgid "samba_samba_homes_desc"
+msgid "System users can reach their home directories via network shares."
 msgstr ""
 
 #. Shared Directories
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:7
-msgid "samba_sambashare"
+msgid "Shared Directories"
 msgstr ""
 
 #. Shared Directory
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:8
-msgid "samba_sambashare_path"
+msgid "Shared Directory"
 msgstr ""
 
 #. Physical Path
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:9
-msgid "samba_sambashare_path_desc"
+msgid "Physical Path"
 msgstr ""
 
 #. Allowed Users
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:10
-msgid "samba_sambashare_users"
+msgid "Allowed Users"
 msgstr ""
 
 #. optional
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:11
-msgid "samba_sambashare_users_desc"
+msgid "optional"
 msgstr ""
 
 #. Read Only
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:12
-msgid "samba_sambashare_readonly"
+msgid "Read Only"
 msgstr ""
 
 #. Allow Guests
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:13
-msgid "samba_sambashare_guestok"
+msgid "Allow Guests"
 msgstr ""
 
 #. Create Mask
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:14
-msgid "samba_sambashare_createmask"
+msgid "Create Mask"
 msgstr ""
 
 #. Mask for new files
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:15
-msgid "samba_sambashare_createmask_desc"
+msgid "Mask for new files"
 msgstr ""
 
 #. Directory Mask
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:16
-msgid "samba_sambashare_dirmask"
+msgid "Directory Mask"
 msgstr ""
 
 #. Mask for new directories
diff --git a/po/templates/statistics.pot b/po/templates/statistics.pot
index db020c006..4b1435dd2 100644
--- a/po/templates/statistics.pot
+++ b/po/templates/statistics.pot
@@ -3,1059 +3,749 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=UTF-8"
 
-#. Statistics
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:1
-msgid "stat_statistics"
-msgstr ""
-
 #. The statistics package is based on <a href=\"http://collectd.org/index.shtml\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD Tool</a> to render diagram images from collected data.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:2
-msgid "stat_desc"
+msgid ""
+"The statistics package is based on <a href=\"http://collectd.org/index.shtml"
+"\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD "
+"Tool</a> to render diagram images from collected data."
 msgstr ""
 
 #. System plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:3
-msgid "stat_systemplugins"
+msgid "System plugins"
 msgstr ""
 
 #. Network plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:4
-msgid "stat_networkplugins"
+msgid "Network plugins"
 msgstr ""
 
 #. Output plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:5
-msgid "stat_outputplugins"
+msgid "Output plugins"
 msgstr ""
 
 #. Display timespan
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:6
-msgid "stat_showtimespan"
+msgid "Display timespan »"
 msgstr ""
 
 #. Graphs
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:7
-msgid "stat_graphs"
+msgid "Graphs"
 msgstr ""
 
 #. Collectd
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:8
-msgid "stat_collectd"
+msgid "Collectd"
 msgstr ""
 
 #. Processor
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:9
-msgid "stat_cpu"
+msgid "Processor"
 msgstr ""
 
 #. Ping
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:10
-msgid "stat_ping"
+msgid "Ping"
 msgstr ""
 
 #. Firewall
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:11
-msgid "stat_iptables"
+msgid "Firewall"
 msgstr ""
 
 #. Netlink
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:12
-msgid "stat_netlink"
+msgid "Netlink"
 msgstr ""
 
 #. Processes
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:13
-msgid "stat_processes"
+msgid "Processes"
 msgstr ""
 
 #. Wireless
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:14
-msgid "stat_wireless"
+msgid "Wireless"
 msgstr ""
 
 #. TCP Connections
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:15
-msgid "stat_tcpconns"
+msgid "TCP Connections"
 msgstr ""
 
 #. Interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:16
-msgid "stat_interface"
+msgid "Interfaces"
 msgstr ""
 
 #. Disk Space Usage
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:17
-msgid "stat_df"
+msgid "Disk Space Usage"
 msgstr ""
 
 #. Interrupts
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:18
-msgid "stat_irq"
+msgid "Interrupts"
 msgstr ""
 
 #. Disk Usage
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:19
-msgid "stat_disk"
+msgid "Disk Usage"
 msgstr ""
 
 #. Exec
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:20
-msgid "stat_exec"
+msgid "Exec"
 msgstr ""
 
 #. RRDTool
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:21
-msgid "stat_rrdtool"
+msgid "RRDTool"
 msgstr ""
 
 #. Network
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:22
-msgid "stat_network"
+msgid "Network"
 msgstr ""
 
 #. CSV Output
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:23
-msgid "stat_csv"
+msgid "CSV Output"
 msgstr ""
 
 #. System Load
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:24
-msgid "stat_load"
+msgid "System Load"
 msgstr ""
 
 #. DNS
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:25
-msgid "stat_dns"
+msgid "DNS"
 msgstr ""
 
 #. Email
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:26
-msgid "stat_email"
+msgid "Email"
 msgstr ""
 
 #. UnixSock
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:27
-msgid "stat_unixsock"
-msgstr ""
-
-#. Statistics
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:28
-msgid "lucistatistics"
+msgid "UnixSock"
 msgstr ""
 
 #. Collectd Settings
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:29
-msgid "lucistatistics_collectd"
+msgid "Collectd Settings"
 msgstr ""
 
 #. Collectd is a small daeomon for collecting data from various sources through different plugins. On this page you can change general settings for the collectd daemon.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:30
-msgid "lucistatistics_collectd_desc"
+msgid ""
+"Collectd is a small daeomon for collecting data from various sources through "
+"different plugins. On this page you can change general settings for the "
+"collectd daemon."
 msgstr ""
 
 #. Hostname
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:31
-msgid "lucistatistics_collectd_hostname"
+msgid "Hostname"
 msgstr ""
 
 #. Base Directory
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:32
-msgid "lucistatistics_collectd_basedir"
+msgid "Base Directory"
 msgstr ""
 
 #. Directory for sub-configurations
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:33
-msgid "lucistatistics_collectd_include"
+msgid "Directory for sub-configurations"
 msgstr ""
 
 #. Directory for collectd plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:34
-msgid "lucistatistics_collectd_plugindir"
+msgid "Directory for collectd plugins"
 msgstr ""
 
 #. Used PID file
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:35
-msgid "lucistatistics_collectd_pidfile"
+msgid "Used PID file"
 msgstr ""
 
 #. Datasets definition file
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:36
-msgid "lucistatistics_collectd_typesdb"
+msgid "Datasets definition file"
 msgstr ""
 
 #. Data collection interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:37
-msgid "lucistatistics_collectd_interval"
+msgid "Data collection interval"
 msgstr ""
 
 #. Seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:38
-msgid "lucistatistics_collectd_interval_desc"
+msgid "Seconds"
 msgstr ""
 
 #. Number of threads for data collection
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:39
-msgid "lucistatistics_collectd_readthreads"
+msgid "Number of threads for data collection"
 msgstr ""
 
 #. Try to lookup fully qualified hostname
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:40
-msgid "lucistatistics_collectd_fqdnlookup"
+msgid "Try to lookup fully qualified hostname"
 msgstr ""
 
 #. CPU Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:41
-msgid "lucistatistics_collectdcpu"
+msgid "CPU Plugin Configuration"
 msgstr ""
 
 #. The cpu plugin collects basic statistics about the processor usage.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:42
-msgid "lucistatistics_collectdcpu_desc"
-msgstr ""
-
-#. Enable this plugin
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:43
-msgid "lucistatistics_collectdcpu_enable"
+msgid "The cpu plugin collects basic statistics about the processor usage."
 msgstr ""
 
 #. CSV Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:44
-msgid "lucistatistics_collectdcsv"
+msgid "CSV Plugin Configuration"
 msgstr ""
 
 #. The csv plugin stores collected data in csv file format for further processing by external programs.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:45
-msgid "lucistatistics_collectdcsv_desc"
-msgstr ""
-
-#. Enable this plugin
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:46
-msgid "lucistatistics_collectdcsv_enable"
+msgid ""
+"The csv plugin stores collected data in csv file format for further "
+"processing by external programs."
 msgstr ""
 
 #. Storage directory for the csv files
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:47
-msgid "lucistatistics_collectdcsv_datadir"
+msgid "Storage directory for the csv files"
 msgstr ""
 
 #. Store data values as rates instead of absolute values
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:48
-msgid "lucistatistics_collectdcsv_storerates"
+msgid "Store data values as rates instead of absolute values"
 msgstr ""
 
 #. DF Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:49
-msgid "lucistatistics_collectddf"
+msgid "DF Plugin Configuration"
 msgstr ""
 
 #. The df plugin collects statistics about the disk space usage on different devices, mount points or filesystem types.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:50
-msgid "lucistatistics_collectddf_desc"
-msgstr ""
-
-#. Enable this plugin
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:51
-msgid "lucistatistics_collectddf_enable"
+msgid ""
+"The df plugin collects statistics about the disk space usage on different "
+"devices, mount points or filesystem types."
 msgstr ""
 
 #. Monitor devices
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:52
-msgid "lucistatistics_collectddf_devices"
-msgstr ""
-
-#. multiple separated by space
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:53
-msgid "lucistatistics_collectddf_devices_desc"
+msgid "Monitor devices"
 msgstr ""
 
 #. Monitor mount points
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:54
-msgid "lucistatistics_collectddf_mountpoints"
-msgstr ""
-
-#. multiple separated by space
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:55
-msgid "lucistatistics_collectddf_mountpoints_desc"
+msgid "Monitor mount points"
 msgstr ""
 
 #. Monitor filesystem types
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:56
-msgid "lucistatistics_collectddf_fstypes"
-msgstr ""
-
-#. multiple separated by space
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:57
-msgid "lucistatistics_collectddf_fstypes_desc"
-msgstr ""
-
-#. Monitor all except selected ones
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:58
-msgid "lucistatistics_collectddf_ignoreselected"
+msgid "Monitor filesystem types"
 msgstr ""
 
 #. Disk Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:59
-msgid "lucistatistics_collectddisk"
+msgid "Disk Plugin Configuration"
 msgstr ""
 
 #. The disk plugin collects detailled usage statistics for selected partitions or whole disks.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:60
-msgid "lucistatistics_collectddisk_desc"
-msgstr ""
-
-#. Enable this plugin
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:61
-msgid "lucistatistics_collectddisk_enable"
+msgid ""
+"The disk plugin collects detailled usage statistics for selected partitions "
+"or whole disks."
 msgstr ""
 
 #. Monitor disks and partitions
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:62
-msgid "lucistatistics_collectddisk_disks"
-msgstr ""
-
-#. multiple separated by space
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:63
-msgid "lucistatistics_collectddisk_disks_desc"
-msgstr ""
-
-#. Monitor all except selected ones
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:64
-msgid "lucistatistics_collectddisk_ignoreselected"
+msgid "Monitor disks and partitions"
 msgstr ""
 
 #. DNS Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:65
-msgid "lucistatistics_collectddns"
+msgid "DNS Plugin Configuration"
 msgstr ""
 
 #. The dns plugin collects detailled statistics about dns related traffic on selected interfaces.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:66
-msgid "lucistatistics_collectddns_desc"
-msgstr ""
-
-#. Enable this plugin
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:67
-msgid "lucistatistics_collectddns_enable"
-msgstr ""
-
-#. Monitor interfaces
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:68
-msgid "lucistatistics_collectddns_interfaces"
-msgstr ""
-
-#. multiple separated by space
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:69
-msgid "lucistatistics_collectddns_interfaces_desc"
+msgid ""
+"The dns plugin collects detailled statistics about dns related traffic on "
+"selected interfaces."
 msgstr ""
 
 #. Ignore source addresses
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:70
-msgid "lucistatistics_collectddns_ignoresources"
-msgstr ""
-
-#. hold Ctrl while clicking to select multiple interfaces
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:71
-msgid "lucistatistics_collectddns_ignoresources_desc"
+msgid "Ignore source addresses"
 msgstr ""
 
 #. E-Mail Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:72
-msgid "lucistatistics_collectdemail"
+msgid "E-Mail Plugin Configuration"
 msgstr ""
 
 #. The email plugin creates a unix socket which can be used to transmit email-statistics to a running collectd daemon. This plugin is primarily intended to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can be used in other ways as well.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:73
-msgid "lucistatistics_collectdemail_desc"
-msgstr ""
-
-#. Enable this plugin
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:74
-msgid "lucistatistics_collectdemail_enable"
-msgstr ""
-
-#. Filepath of the unix socket
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:75
-msgid "lucistatistics_collectdemail_socketfile"
-msgstr ""
-
-#. Group ownership of the unix socket
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:76
-msgid "lucistatistics_collectdemail_socketgroup"
-msgstr ""
-
-#. group name
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:77
-msgid "lucistatistics_collectdemail_socketgroup_desc"
-msgstr ""
-
-#. File permissions of the unix socket
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:78
-msgid "lucistatistics_collectdemail_socketperms"
-msgstr ""
-
-#. octal
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:79
-msgid "lucistatistics_collectdemail_socketperms_desc"
+msgid ""
+"The email plugin creates a unix socket which can be used to transmit email-"
+"statistics to a running collectd daemon. This plugin is primarily intended "
+"to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can "
+"be used in other ways as well."
 msgstr ""
 
 #. Maximum allowed connections
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:80
-msgid "lucistatistics_collectdemail_maxconns"
+msgid "Maximum allowed connections"
 msgstr ""
 
 #. Exec Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:81
-msgid "lucistatistics_collectdexec"
+msgid "Exec Plugin Configuration"
 msgstr ""
 
 #. The exec plugin starts external commands to read values from or to notify external processes when certain threshold values have been reached.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:82
-msgid "lucistatistics_collectdexec_desc"
-msgstr ""
-
-#. Enable this plugin
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:83
-msgid "lucistatistics_collectdexec_enable"
+msgid ""
+"The exec plugin starts external commands to read values from or to notify "
+"external processes when certain threshold values have been reached."
 msgstr ""
 
 #. Add command for reading values
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:84
-msgid "lucistatistics_collectdexecinput"
+msgid "Add command for reading values"
 msgstr ""
 
 #. Here you can define external commands which will be started by collectd in order to read certain values. The values will be read from stdout.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:85
-msgid "lucistatistics_collectdexecinput_desc"
-msgstr ""
-
-#. Commandline
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:86
-msgid "lucistatistics_collectdexecinput_cmdline"
-msgstr ""
-
-#. Run as user
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:87
-msgid "lucistatistics_collectdexecinput_cmduser"
-msgstr ""
-
-#. Run as group
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:88
-msgid "lucistatistics_collectdexecinput_cmdgroup"
+msgid ""
+"Here you can define external commands which will be started by collectd in "
+"order to read certain values. The values will be read from stdout."
 msgstr ""
 
 #. Add notification command
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:89
-msgid "lucistatistics_collectdexecnotify"
+msgid "Add notification command"
 msgstr ""
 
 #. Here you can define external commands which will be started by collectd when certain threshold values have been reached. The values leading to invokation will be feeded to the the called programs stdin.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:90
-msgid "lucistatistics_collectdexecnotify_desc"
-msgstr ""
-
-#. Commandline
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:91
-msgid "lucistatistics_collectdexecnotify_cmdline"
-msgstr ""
-
-#. Run as user
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:92
-msgid "lucistatistics_collectdexecnotify_cmduser"
-msgstr ""
-
-#. Run as group
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:93
-msgid "lucistatistics_collectdexecnotify_cmdgroup"
+msgid ""
+"Here you can define external commands which will be started by collectd when "
+"certain threshold values have been reached. The values leading to invokation "
+"will be feeded to the the called programs stdin."
 msgstr ""
 
 #. Interface Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:94
-msgid "lucistatistics_collectdinterface"
+msgid "Interface Plugin Configuration"
 msgstr ""
 
 #. The interface plugin collects traffic statistics on selected interfaces.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:95
-msgid "lucistatistics_collectdinterface_desc"
-msgstr ""
-
-#. Enable this plugin
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:96
-msgid "lucistatistics_collectdinterface_enable"
-msgstr ""
-
-#. Monitor interfaces
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:97
-msgid "lucistatistics_collectdinterface_interfaces"
-msgstr ""
-
-#. hold Ctrl while clicking to select multiple interfaces
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:98
-msgid "lucistatistics_collectdinterface_interfaces_desc"
-msgstr ""
-
-#. Monitor all except selected ones
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:99
-msgid "lucistatistics_collectdinterface_ignoreselected"
+msgid ""
+"The interface plugin collects traffic statistics on selected interfaces."
 msgstr ""
 
 #. Iptables Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:100
-msgid "lucistatistics_collectdiptables"
+msgid "Iptables Plugin Configuration"
 msgstr ""
 
 #. The iptables plugin will monitor selected firewall rules and collect informations about processed bytes and packets per rule.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:101
-msgid "lucistatistics_collectdiptables_desc"
-msgstr ""
-
-#. Enable this plugin
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:102
-msgid "lucistatistics_collectdiptables_enable"
+msgid ""
+"The iptables plugin will monitor selected firewall rules and collect "
+"informations about processed bytes and packets per rule."
 msgstr ""
 
 #. Add matching rule
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:103
-msgid "lucistatistics_collectdiptablesmatch"
+msgid "Add matching rule"
 msgstr ""
 
 #. Here you can define various criteria by which the monitored iptables rules are selected.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:104
-msgid "lucistatistics_collectdiptablesmatch_desc"
+msgid ""
+"Here you can define various criteria by which the monitored iptables rules "
+"are selected."
 msgstr ""
 
 #. Name of the rule
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:105
-msgid "lucistatistics_collectdiptablesmatch_name"
+msgid "Name of the rule"
 msgstr ""
 
 #. max. 16 chars
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:106
-msgid "lucistatistics_collectdiptablesmatch_name_desc"
+msgid "max. 16 chars"
 msgstr ""
 
 #. Table
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:107
-msgid "lucistatistics_collectdiptablesmatch_table"
+msgid "Table"
 msgstr ""
 
 #. Chain
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:108
-msgid "lucistatistics_collectdiptablesmatch_chain"
+msgid "Chain"
 msgstr ""
 
 #. Action (target)
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:109
-msgid "lucistatistics_collectdiptablesmatch_target"
+msgid "Action (target)"
 msgstr ""
 
 #. Network protocol
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:110
-msgid "lucistatistics_collectdiptablesmatch_protocol"
+msgid "Network protocol"
 msgstr ""
 
 #. Source ip range
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:111
-msgid "lucistatistics_collectdiptablesmatch_source"
-msgstr ""
-
-#. CIDR notation
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:112
-msgid "lucistatistics_collectdiptablesmatch_source_desc"
+msgid "Source ip range"
 msgstr ""
 
 #. Destination ip range
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:113
-msgid "lucistatistics_collectdiptablesmatch_destination"
-msgstr ""
-
-#. CIDR notation
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:114
-msgid "lucistatistics_collectdiptablesmatch_destination_desc"
+msgid "Destination ip range"
 msgstr ""
 
 #. Incoming interface
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:115
-msgid "lucistatistics_collectdiptablesmatch_inputif"
+msgid "Incoming interface"
 msgstr ""
 
 #. e.g. br-lan
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:116
-msgid "lucistatistics_collectdiptablesmatch_inputif_desc"
+msgid "e.g. br-lan"
 msgstr ""
 
 #. Outgoing interface
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:117
-msgid "lucistatistics_collectdiptablesmatch_outputif"
+msgid "Outgoing interface"
 msgstr ""
 
 #. e.g. br-ff
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:118
-msgid "lucistatistics_collectdiptablesmatch_outputif_desc"
+msgid "e.g. br-ff"
 msgstr ""
 
 #. Options
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:119
-msgid "lucistatistics_collectdiptablesmatch_options"
+msgid "Options"
 msgstr ""
 
 #. e.g. reject-with tcp-reset
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:120
-msgid "lucistatistics_collectdiptablesmatch_options_desc"
+msgid "e.g. reject-with tcp-reset"
 msgstr ""
 
 #. IRQ Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:121
-msgid "lucistatistics_collectdirq"
+msgid "IRQ Plugin Configuration"
 msgstr ""
 
 #. The irq plugin will monitor the rate of issues per second for each selected interrupt. If no interrupt is selected then all interrupts are monitored.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:122
-msgid "lucistatistics_collectdirq_desc"
-msgstr ""
-
-#. Enable this plugin
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:123
-msgid "lucistatistics_collectdirq_enable"
+msgid ""
+"The irq plugin will monitor the rate of issues per second for each selected "
+"interrupt. If no interrupt is selected then all interrupts are monitored."
 msgstr ""
 
 #. Monitor interrupts
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:124
-msgid "lucistatistics_collectdirq_irqs"
-msgstr ""
-
-#. multiple separated by space
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:125
-msgid "lucistatistics_collectdirq_irqs_desc"
-msgstr ""
-
-#. Monitor all except selected ones
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:126
-msgid "lucistatistics_collectdirq_ignoreselected"
+msgid "Monitor interrupts"
 msgstr ""
 
 #. Load Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:127
-msgid "lucistatistics_collectdload"
+msgid "Load Plugin Configuration"
 msgstr ""
 
 #. The load plugin collects statistics about the general system load.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:128
-msgid "lucistatistics_collectdload_desc"
-msgstr ""
-
-#. Enable this plugin
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:129
-msgid "lucistatistics_collectdload_enable"
+msgid "The load plugin collects statistics about the general system load."
 msgstr ""
 
 #. Netlink Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:130
-msgid "lucistatistics_collectdnetlink"
+msgid "Netlink Plugin Configuration"
 msgstr ""
 
 #. The netlink plugin collects extended informations like qdisc-, class- and filter-statistics for selected interfaces.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:131
-msgid "lucistatistics_collectdnetlink_desc"
-msgstr ""
-
-#. Enable this plugin
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:132
-msgid "lucistatistics_collectdnetlink_enable"
+msgid ""
+"The netlink plugin collects extended informations like qdisc-, class- and "
+"filter-statistics for selected interfaces."
 msgstr ""
 
 #. Basic monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:133
-msgid "lucistatistics_collectdnetlink_interfaces"
-msgstr ""
-
-#. hold Ctrl while clicking to select multiple interfaces
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:134
-msgid "lucistatistics_collectdnetlink_interfaces_desc"
+msgid "Basic monitoring"
 msgstr ""
 
 #. Verbose monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:135
-msgid "lucistatistics_collectdnetlink_verboseinterfaces"
-msgstr ""
-
-#. hold Ctrl while clicking to select multiple interfaces
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:136
-msgid "lucistatistics_collectdnetlink_verboseinterfaces_desc"
+msgid "Verbose monitoring"
 msgstr ""
 
 #. Qdisc monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:137
-msgid "lucistatistics_collectdnetlink_qdiscs"
-msgstr ""
-
-#. hold Ctrl while clicking to select multiple interfaces
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:138
-msgid "lucistatistics_collectdnetlink_qdiscs_desc"
+msgid "Qdisc monitoring"
 msgstr ""
 
 #. Shaping class monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:139
-msgid "lucistatistics_collectdnetlink_classes"
-msgstr ""
-
-#. hold Ctrl while clicking to select multiple interfaces
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:140
-msgid "lucistatistics_collectdnetlink_classes_desc"
+msgid "Shaping class monitoring"
 msgstr ""
 
 #. Filter class monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:141
-msgid "lucistatistics_collectdnetlink_filters"
-msgstr ""
-
-#. hold Ctrl while clicking to select multiple interfaces
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:142
-msgid "lucistatistics_collectdnetlink_filters_desc"
-msgstr ""
-
-#. Monitor all except selected ones
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:143
-msgid "lucistatistics_collectdnetlink_ignoreselected"
+msgid "Filter class monitoring"
 msgstr ""
 
 #. Network Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:144
-msgid "lucistatistics_collectdnetwork"
+msgid "Network Plugin Configuration"
 msgstr ""
 
 #. The network plugin provides network based communication between different collectd instances. Collectd can operate both in client and server mode. In client mode locally collected date is transferred to a collectd server instance, in server mode the local instance receives data from other hosts.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:145
-msgid "lucistatistics_collectdnetwork_desc"
-msgstr ""
-
-#. Enable this plugin
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:146
-msgid "lucistatistics_collectdnetwork_enable"
+msgid ""
+"The network plugin provides network based communication between different "
+"collectd instances. Collectd can operate both in client and server mode. In "
+"client mode locally collected date is transferred to a collectd server "
+"instance, in server mode the local instance receives data from other hosts."
 msgstr ""
 
 #. Listener interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:147
-msgid "lucistatistics_collectdnetworklisten"
+msgid "Listener interfaces"
 msgstr ""
 
 #. This section defines on which interfaces collectd will wait for incoming connections.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:148
-msgid "lucistatistics_collectdnetworklisten_desc"
+msgid ""
+"This section defines on which interfaces collectd will wait for incoming "
+"connections."
 msgstr ""
 
 #. Listen host
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:149
-msgid "lucistatistics_collectdnetworklisten_host"
-msgstr ""
-
-#. host-, ip- or ip6 address
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:150
-msgid "lucistatistics_collectdnetworklisten_host_desc"
+msgid "Listen host"
 msgstr ""
 
 #. Listen port
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:151
-msgid "lucistatistics_collectdnetworklisten_port"
-msgstr ""
-
-#. 0 - 65535
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:152
-msgid "lucistatistics_collectdnetworklisten_port_desc"
+msgid "Listen port"
 msgstr ""
 
 #. server interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:153
-msgid "lucistatistics_collectdnetworkserver"
+msgid "server interfaces"
 msgstr ""
 
 #. This section defines to which servers the locally collected data is sent to.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:154
-msgid "lucistatistics_collectdnetworkserver_desc"
+msgid ""
+"This section defines to which servers the locally collected data is sent to."
 msgstr ""
 
 #. Server host
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:155
-msgid "lucistatistics_collectdnetworkserver_host"
-msgstr ""
-
-#. host-, ip- or ip6 address
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:156
-msgid "lucistatistics_collectdnetworkserver_host_desc"
+msgid "Server host"
 msgstr ""
 
 #. Server port
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:157
-msgid "lucistatistics_collectdnetworkserver_port"
-msgstr ""
-
-#. 0 - 65535
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:158
-msgid "lucistatistics_collectdnetworkserver_port_desc"
+msgid "Server port"
 msgstr ""
 
 #. TTL for network packets
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:159
-msgid "lucistatistics_collectdnetwork_timetolive"
-msgstr ""
-
-#. 0 - 255
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:160
-msgid "lucistatistics_collectdnetwork_timetolive_desc"
+msgid "TTL for network packets"
 msgstr ""
 
 #. Forwarding between listen and server addresses
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:161
-msgid "lucistatistics_collectdnetwork_forward"
+msgid "Forwarding between listen and server addresses"
 msgstr ""
 
 #. Cache flush interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:162
-msgid "lucistatistics_collectdnetwork_cacheflush"
-msgstr ""
-
-#. seconds
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:163
-msgid "lucistatistics_collectdnetwork_cacheflush_desc"
+msgid "Cache flush interval"
 msgstr ""
 
 #. Ping Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:164
-msgid "lucistatistics_collectdping"
+msgid "Ping Plugin Configuration"
 msgstr ""
 
 #. The ping plugin will send icmp echo replies to selected hosts and measure the roundtrip time for each host.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:165
-msgid "lucistatistics_collectdping_desc"
-msgstr ""
-
-#. Enable this plugin
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:166
-msgid "lucistatistics_collectdping_enable"
+msgid ""
+"The ping plugin will send icmp echo replies to selected hosts and measure "
+"the roundtrip time for each host."
 msgstr ""
 
 #. Monitor hosts
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:167
-msgid "lucistatistics_collectdping_hosts"
-msgstr ""
-
-#. multiple separated by space
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:168
-msgid "lucistatistics_collectdping_hosts_desc"
+msgid "Monitor hosts"
 msgstr ""
 
 #. TTL for ping packets
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:169
-msgid "lucistatistics_collectdping_ttl"
-msgstr ""
-
-#. 0 - 255
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:170
-msgid "lucistatistics_collectdping_ttl_desc"
+msgid "TTL for ping packets"
 msgstr ""
 
 #. Processes Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:171
-msgid "lucistatistics_collectdprocesses"
+msgid "Processes Plugin Configuration"
 msgstr ""
 
 #. The processes plugin collects informations like cpu time, page faults and memory usage of selected processes.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:172
-msgid "lucistatistics_collectdprocesses_desc"
-msgstr ""
-
-#. Enable this plugin
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:173
-msgid "lucistatistics_collectdprocesses_enable"
+msgid ""
+"The processes plugin collects informations like cpu time, page faults and "
+"memory usage of selected processes."
 msgstr ""
 
 #. Monitor processes
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:174
-msgid "lucistatistics_collectdprocesses_processes"
-msgstr ""
-
-#. multiple separated by space
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:175
-msgid "lucistatistics_collectdprocesses_processes_desc"
+msgid "Monitor processes"
 msgstr ""
 
 #. RRDTool Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:176
-msgid "lucistatistics_collectdrrdtool"
+msgid "RRDTool Plugin Configuration"
 msgstr ""
 
 #. The rrdtool plugin stores the collected data in rrd database files, the foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong values will result in a very high memory consumption in the temporary directory. This can render the device unusable!</strong>
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:177
-msgid "lucistatistics_collectdrrdtool_desc"
-msgstr ""
-
-#. Enable this plugin
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:178
-msgid "lucistatistics_collectdrrdtool_enable"
+msgid ""
+"The rrdtool plugin stores the collected data in rrd database files, the "
+"foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong "
+"values will result in a very high memory consumption in the temporary "
+"directory. This can render the device unusable!</strong>"
 msgstr ""
 
 #. Storage directory
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:179
-msgid "lucistatistics_collectdrrdtool_datadir"
+msgid "Storage directory"
 msgstr ""
 
 #. RRD step interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:180
-msgid "lucistatistics_collectdrrdtool_stepsize"
-msgstr ""
-
-#. seconds
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:181
-msgid "lucistatistics_collectdrrdtool_stepsize_desc"
+msgid "RRD step interval"
 msgstr ""
 
 #. RRD heart beat interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:182
-msgid "lucistatistics_collectdrrdtool_heartbeat"
-msgstr ""
-
-#. seconds
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:183
-msgid "lucistatistics_collectdrrdtool_heartbeat_desc"
+msgid "RRD heart beat interval"
 msgstr ""
 
 #. Only create average RRAs
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:184
-msgid "lucistatistics_collectdrrdtool_rrasingle"
+msgid "Only create average RRAs"
 msgstr ""
 
 #. reduces rrd size
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:185
-msgid "lucistatistics_collectdrrdtool_rrasingle_desc"
+msgid "reduces rrd size"
 msgstr ""
 
 #. Stored timespans
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:186
-msgid "lucistatistics_collectdrrdtool_rratimespans"
+msgid "Stored timespans"
 msgstr ""
 
 #. seconds; multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:187
-msgid "lucistatistics_collectdrrdtool_rratimespans_desc"
+msgid "seconds; multiple separated by space"
 msgstr ""
 
 #. Rows per RRA
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:188
-msgid "lucistatistics_collectdrrdtool_rrarows"
+msgid "Rows per RRA"
 msgstr ""
 
 #. RRD XFiles Factor
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:189
-msgid "lucistatistics_collectdrrdtool_xff"
+msgid "RRD XFiles Factor"
 msgstr ""
 
 #. Cache collected data for
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:190
-msgid "lucistatistics_collectdrrdtool_cachetimeout"
-msgstr ""
-
-#. seconds
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:191
-msgid "lucistatistics_collectdrrdtool_cachetimeout_desc"
+msgid "Cache collected data for"
 msgstr ""
 
 #. Flush cache after
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:192
-msgid "lucistatistics_collectdrrdtool_cacheflush"
-msgstr ""
-
-#. seconds
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:193
-msgid "lucistatistics_collectdrrdtool_cacheflush_desc"
+msgid "Flush cache after"
 msgstr ""
 
 #. TCPConns Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:194
-msgid "lucistatistics_collectdtcpconns"
+msgid "TCPConns Plugin Configuration"
 msgstr ""
 
 #. The tcpconns plugin collects informations about open tcp connections on selected ports.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:195
-msgid "lucistatistics_collectdtcpconns_desc"
-msgstr ""
-
-#. Enable this plugin
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:196
-msgid "lucistatistics_collectdtcpconns_enable"
+msgid ""
+"The tcpconns plugin collects informations about open tcp connections on "
+"selected ports."
 msgstr ""
 
 #. Monitor all local listen ports
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:197
-msgid "lucistatistics_collectdtcpconns_listeningports"
+msgid "Monitor all local listen ports"
 msgstr ""
 
 #. Monitor local ports
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:198
-msgid "lucistatistics_collectdtcpconns_localports"
-msgstr ""
-
-#. 0 - 65535; multiple separated by space
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:199
-msgid "lucistatistics_collectdtcpconns_localports_desc"
+msgid "Monitor local ports"
 msgstr ""
 
 #. Monitor remote ports
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:200
-msgid "lucistatistics_collectdtcpconns_remoteports"
-msgstr ""
-
-#. 0 - 65535; multiple separated by space
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:201
-msgid "lucistatistics_collectdtcpconns_remoteports_desc"
+msgid "Monitor remote ports"
 msgstr ""
 
 #. Unixsock Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:202
-msgid "lucistatistics_collectdunixsock"
+msgid "Unixsock Plugin Configuration"
 msgstr ""
 
 #. The unixsock plugin creates a unix socket which can be used to read collected data from a running collectd instance.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:203
-msgid "lucistatistics_collectdunixsock_desc"
-msgstr ""
-
-#. Enable this plugin
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:204
-msgid "lucistatistics_collectdunixsock_enable"
-msgstr ""
-
-#. Filepath of the unix socket
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:205
-msgid "lucistatistics_collectdunixsock_socketfile"
-msgstr ""
-
-#. Group ownership of the unix socket
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:206
-msgid "lucistatistics_collectdunixsock_socketgroup"
-msgstr ""
-
-#. group name
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:207
-msgid "lucistatistics_collectdunixsock_socketgroup_desc"
-msgstr ""
-
-#. File permissions of the unix socket
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:208
-msgid "lucistatistics_collectdunixsock_socketperms"
-msgstr ""
-
-#. octal
-#: applications/luci-statistics/luasrc/i18n/statistics.en.lua:209
-msgid "lucistatistics_collectdunixsock_socketperms_desc"
+msgid ""
+"The unixsock plugin creates a unix socket which can be used to read "
+"collected data from a running collectd instance."
 msgstr ""
 
 #. Wireless Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:210
-msgid "lucistatistics_collectdwireless"
+msgid "Wireless Plugin Configuration"
 msgstr ""
 
 #. The wireless plugin collects statistics about wireless signal strength, noise and quality.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:211
-msgid "lucistatistics_collectdwireless_desc"
+msgid ""
+"The wireless plugin collects statistics about wireless signal strength, "
+"noise and quality."
 msgstr ""
 
 #. Enable this plugin
diff --git a/po/templates/sysauth.pot b/po/templates/sysauth.pot
index 6e5b0eb6b..245f041b2 100644
--- a/po/templates/sysauth.pot
+++ b/po/templates/sysauth.pot
@@ -5,12 +5,12 @@ msgstr "Content-Type: text/plain; charset=UTF-8"
 
 #. Authorization Required
 #: i18n/english/luasrc/i18n/sysauth.en.lua:1
-msgid "sysauth_head"
+msgid "Authorization Required"
 msgstr ""
 
 #. Please enter your username and password.
 #: i18n/english/luasrc/i18n/sysauth.en.lua:2
-msgid "sysauth_prompt"
+msgid "Please enter your username and password."
 msgstr ""
 
 #. Invalid username and/or password! Please try again.
diff --git a/po/templates/tinyproxy.pot b/po/templates/tinyproxy.pot
index 1bc58fffc..e155a980e 100644
--- a/po/templates/tinyproxy.pot
+++ b/po/templates/tinyproxy.pot
@@ -5,157 +5,157 @@ msgstr "Content-Type: text/plain; charset=UTF-8"
 
 #. Tinyproxy
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:1
-msgid "tinyproxy"
+msgid "Tinyproxy"
 msgstr ""
 
 #. Tinyproxy is a small and fast non-caching HTTP(S)-Proxy
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:2
-msgid "tinyproxy_desc"
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
 msgstr ""
 
 #. Allow access from
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:3
-msgid "tinyproxy_tinyproxy_allow"
+msgid "Allow access from"
 msgstr ""
 
 #. Allowed headers for anonymous proxy
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:4
-msgid "tinyproxy_tinyproxy_anonymous"
+msgid "Allowed headers for anonymous proxy"
 msgstr ""
 
 #. Bind outgoing traffic to address
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:5
-msgid "tinyproxy_tinyproxy_bind"
+msgid "Bind outgoing traffic to address"
 msgstr ""
 
 #. Ports allowed for CONNECT method
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:6
-msgid "tinyproxy_tinyproxy_connectport"
+msgid "Ports allowed for CONNECT method"
 msgstr ""
 
 #. 0 = disabled, empty = all
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:7
-msgid "tinyproxy_tinyproxy_connectport_desc"
+msgid "0 = disabled, empty = all"
 msgstr ""
 
 #. Error document
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:8
-msgid "tinyproxy_tinyproxy_defaulterrorfile"
+msgid "Error document"
 msgstr ""
 
 #. Filter list
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:9
-msgid "tinyproxy_tinyproxy_filter"
+msgid "Filter list"
 msgstr ""
 
 #. Case sensitive filters
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:10
-msgid "tinyproxy_tinyproxy_filtercasesensitive"
+msgid "Case sensitive filters"
 msgstr ""
 
 #. Filter list is a whitelist
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:11
-msgid "tinyproxy_tinyproxy_filterdefaultdeny"
+msgid "Filter list is a whitelist"
 msgstr ""
 
 #. Extended regular expression filters
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:12
-msgid "tinyproxy_tinyproxy_filterextended"
+msgid "Extended regular expression filters"
 msgstr ""
 
 #. Filter URLs instead of domains
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:13
-msgid "tinyproxy_tinyproxy_filterurls"
+msgid "Filter URLs instead of domains"
 msgstr ""
 
 #. Listen on address
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:14
-msgid "tinyproxy_tinyproxy_listen"
+msgid "Listen on address"
 msgstr ""
 
 #. Logfile
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:15
-msgid "tinyproxy_tinyproxy_logfile"
+msgid "Logfile"
 msgstr ""
 
 #. Log level
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:16
-msgid "tinyproxy_tinyproxy_loglevel"
+msgid "Log level"
 msgstr ""
 
 #. Maximum number of clients
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:17
-msgid "tinyproxy_tinyproxy_maxclients"
+msgid "Maximum number of clients"
 msgstr ""
 
 #. Maximum requests per thread
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:18
-msgid "tinyproxy_tinyproxy_maxrequestsperchild"
+msgid "Maximum requests per thread"
 msgstr ""
 
 #. Max. spare servers
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:19
-msgid "tinyproxy_tinyproxy_maxspareservers"
+msgid "Max. spare servers"
 msgstr ""
 
 #. Min. spare servers
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:20
-msgid "tinyproxy_tinyproxy_minspareservers"
+msgid "Min. spare servers"
 msgstr ""
 
 #. Spare servers to start with
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:21
-msgid "tinyproxy_tinyproxy_startservers"
+msgid "Spare servers to start with"
 msgstr ""
 
 #. Statistic document
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:22
-msgid "tinyproxy_tinyproxy_statfile"
+msgid "Statistic document"
 msgstr ""
 
 #. Write to syslog
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:23
-msgid "tinyproxy_tinyproxy_syslog"
+msgid "Write to syslog"
 msgstr ""
 
 #. Connection Timeout
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:24
-msgid "tinyproxy_tinyproxy_timeout"
+msgid "Connection Timeout"
 msgstr ""
 
 #. Value of Via-Header
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:25
-msgid "tinyproxy_tinyproxy_viaproxyname"
+msgid "Value of Via-Header"
 msgstr ""
 
 #. Include client IP
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:26
-msgid "tinyproxy_tinyproxy_xtinyproxy"
+msgid "Include client IP"
 msgstr ""
 
 #. Via proxy
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:27
-msgid "tinyproxy_type_proxy"
+msgid "Via proxy"
 msgstr ""
 
 #. Reject access
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:28
-msgid "tinyproxy_type_reject"
+msgid "Reject access"
 msgstr ""
 
 #. Upstream Control
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:29
-msgid "tinyproxy_upstream"
+msgid "Upstream Control"
 msgstr ""
 
 #. Target host
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:30
-msgid "tinyproxy_upstream_target"
+msgid "Target host"
 msgstr ""
 
 #. Type
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:31
-msgid "tinyproxy_upstream_type"
+msgid "Type"
 msgstr ""
 
 #. Upstream Proxy
diff --git a/po/templates/upnp.pot b/po/templates/upnp.pot
index 390c0951b..ae4b44a41 100644
--- a/po/templates/upnp.pot
+++ b/po/templates/upnp.pot
@@ -5,32 +5,36 @@ msgstr "Content-Type: text/plain; charset=UTF-8"
 
 #. Universal Plug &amp; Play
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:1
-msgid "upnpd"
+msgid "Universal Plug & Play"
 msgstr ""
 
 #. UPNP allows clients in the local network to automatically configure the router.
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:2
-msgid "upnpd_desc"
+msgid ""
+"UPNP allows clients in the local network to automatically configure the "
+"router."
 msgstr ""
 
 #. UPNP should only be enabled if absolutely necessary as it can result in high security risks for your network.
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:3
-msgid "upnpd_config_desc"
+msgid ""
+"UPNP should only be enabled if absolutely necessary as it can result in high "
+"security risks for your network."
 msgstr ""
 
 #. Enable secure mode
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:4
-msgid "upnpd_config_securemode"
+msgid "Enable secure mode"
 msgstr ""
 
 #. Log output
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:5
-msgid "upnpd_config_logoutput"
+msgid "Log output"
 msgstr ""
 
 #. Downlink
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:6
-msgid "upnpd_config_download"
+msgid "Downlink"
 msgstr ""
 
 #. Uplink
diff --git a/po/templates/ushare.pot b/po/templates/ushare.pot
index f6bd8adbd..4a10b0c1b 100644
--- a/po/templates/ushare.pot
+++ b/po/templates/ushare.pot
@@ -5,37 +5,37 @@ msgstr "Content-Type: text/plain; charset=UTF-8"
 
 #. Content directories
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:1
-msgid "content_directories"
+msgid "Content directories"
 msgstr ""
 
 #. Disable telnet console
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:2
-msgid "disable_telnet"
+msgid "Disable telnet console"
 msgstr ""
 
 #. Disable webinterface
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:3
-msgid "disable_webif"
+msgid "Disable webinterface"
 msgstr ""
 
 #. Options
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:4
-msgid "options"
+msgid "Options"
 msgstr ""
 
 #. Servername
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:5
-msgid "servername"
+msgid "Servername"
 msgstr ""
 
 #. Settings
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:6
-msgid "settings"
+msgid "Settings"
 msgstr ""
 
 #. uShare
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:7
-msgid "ushare"
+msgid "uShare"
 msgstr ""
 
 #. uShare
diff --git a/po/templates/uvc_streamer.pot b/po/templates/uvc_streamer.pot
index 32042ca33..54910153e 100644
--- a/po/templates/uvc_streamer.pot
+++ b/po/templates/uvc_streamer.pot
@@ -5,22 +5,22 @@ msgstr "Content-Type: text/plain; charset=UTF-8"
 
 #. Frames per second
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
-msgid "framespersecond"
+msgid "Frames per second"
 msgstr ""
 
 #. Resolution
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
-msgid "resolution"
+msgid "Resolution"
 msgstr ""
 
 #. Settings
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
-msgid "settings"
+msgid "Settings"
 msgstr ""
 
 #. Webcam streaming
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
-msgid "uvc_streamer"
+msgid "Webcam streaming"
 msgstr ""
 
 #. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
diff --git a/po/templates/uvl.pot b/po/templates/uvl.pot
index 2530ec576..a5a3ee8d5 100644
--- a/po/templates/uvl.pot
+++ b/po/templates/uvl.pot
@@ -5,192 +5,195 @@ msgstr "Content-Type: text/plain; charset=UTF-8"
 
 #. Unable to load config \"%p\": %1
 #: libs/uvl/luasrc/i18n/uvl.en.lua:1
-msgid "uvl_err_uciload"
+msgid "Unable to load config \"%p\": %1"
 msgstr ""
 
 #. Error in scheme \"%p\":\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:2
-msgid "uvl_err_scheme"
+msgid "Error in scheme \"%p\":\\n%c"
 msgstr ""
 
 #. Error in config \"%p\":\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:3
-msgid "uvl_err_config"
+msgid "Error in config \"%p\":\\n%c"
 msgstr ""
 
 #. Error in section \"%i\" (%I):\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:4
-msgid "uvl_err_section"
+msgid "Error in section \"%i\" (%I):\\n%c"
 msgstr ""
 
 #. Error in option \"%i\" (%I):\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:5
-msgid "uvl_err_option"
+msgid "Error in option \"%i\" (%I):\\n%c"
 msgstr ""
 
 #. Option \"%i\" has invalid reference specification %1:\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:6
-msgid "uvl_err_reference"
+msgid "Option \"%i\" has invalid reference specification %1:\\n%c"
 msgstr ""
 
 #. In dependency check for %t \"%i\":\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:7
-msgid "uvl_err_dependency"
+msgid "In dependency check for %t \"%i\":\\n%c"
 msgstr ""
 
 #. Can not find scheme \"%p\" in \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:8
-msgid "uvl_err_sme_find"
+msgid "Can not find scheme \"%p\" in \"%1\""
 msgstr ""
 
 #. Can not access file \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:9
-msgid "uvl_err_sme_read"
+msgid "Can not access file \"%1\""
 msgstr ""
 
 #. Missing required scheme field \"%1\" in \"%i\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:10
-msgid "uvl_err_sme_reqfld"
+msgid "Missing required scheme field \"%1\" in \"%i\""
 msgstr ""
 
 #. Illegal reference \"%1\" to an anonymous section
 #: libs/uvl/luasrc/i18n/uvl.en.lua:11
-msgid "uvl_err_sme_invref"
+msgid "Illegal reference \"%1\" to an anonymous section"
 msgstr ""
 
 #. Malformed reference in \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:12
-msgid "uvl_err_sme_badref"
+msgid "Malformed reference in \"%1\""
 msgstr ""
 
 #. Malformed dependency specification \"%1\" in \"%i\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:13
-msgid "uvl_err_sme_baddep"
+msgid "Malformed dependency specification \"%1\" in \"%i\""
 msgstr ""
 
 #. Malformed validator specification \"%1\" in \"%i\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:14
-msgid "uvl_err_sme_badval"
+msgid "Malformed validator specification \"%1\" in \"%i\""
 msgstr ""
 
 #. External validator \"%1\" failed: %2
 #: libs/uvl/luasrc/i18n/uvl.en.lua:15
-msgid "uvl_err_sme_errval"
+msgid "External validator \"%1\" failed: %2"
 msgstr ""
 
 #. Variable \"%o\" in scheme \"%p\" references unknown package \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:16
-msgid "uvl_err_sme_vbadpack"
+msgid "Variable \"%o\" in scheme \"%p\" references unknown package \"%1\""
 msgstr ""
 
 #. Variable \"%o\" in scheme \"%p\" references unknown section \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:17
-msgid "uvl_err_sme_vbadsect"
+msgid "Variable \"%o\" in scheme \"%p\" references unknown section \"%1\""
 msgstr ""
 
 #. Enum \"%v\" in scheme \"%p\" references unknown package \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:18
-msgid "uvl_err_sme_ebadpack"
+msgid "Enum \"%v\" in scheme \"%p\" references unknown package \"%1\""
 msgstr ""
 
 #. Enum \"%v\" in scheme \"%p\" references unknown section \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:19
-msgid "uvl_err_sme_ebadsect"
+msgid "Enum \"%v\" in scheme \"%p\" references unknown section \"%1\""
 msgstr ""
 
 #. Enum \"%v\" in scheme \"%p\" references unknown option \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:20
-msgid "uvl_err_sme_ebadopt"
+msgid "Enum \"%v\" in scheme \"%p\" references unknown option \"%1\""
 msgstr ""
 
 #. Enum \"%v\" in scheme \"%p\" references non-enum option \"%p.%s.%o\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:21
-msgid "uvl_err_sme_ebadtype"
+msgid "Enum \"%v\" in scheme \"%p\" references non-enum option \"%p.%s.%o\""
 msgstr ""
 
 #. Enum \"%v\" in scheme \"%p\" redeclares the default value of \"%p.%s.%o\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:22
-msgid "uvl_err_sme_ebaddef"
+msgid ""
+"Enum \"%v\" in scheme \"%p\" redeclares the default value of \"%p.%s.%o\""
 msgstr ""
 
 #. Section \"%i\" (%I) not found in scheme
 #: libs/uvl/luasrc/i18n/uvl.en.lua:23
-msgid "uvl_err_sect_unknown"
+msgid "Section \"%i\" (%I) not found in scheme"
 msgstr ""
 
 #. Required section \"%p.%s\" not found in config
 #: libs/uvl/luasrc/i18n/uvl.en.lua:24
-msgid "uvl_err_sect_required"
+msgid "Required section \"%p.%s\" not found in config"
 msgstr ""
 
 #. Unique section \"%p.%s\" occurs multiple times in config
 #: libs/uvl/luasrc/i18n/uvl.en.lua:25
-msgid "uvl_err_sect_unique"
+msgid "Unique section \"%p.%s\" occurs multiple times in config"
 msgstr ""
 
 #. The section of type \"%p.%s\" is stored anonymously in config but must be named
 #: libs/uvl/luasrc/i18n/uvl.en.lua:26
-msgid "uvl_err_sect_named"
+msgid ""
+"The section of type \"%p.%s\" is stored anonymously in config but must be "
+"named"
 msgstr ""
 
 #. Section \"%p.%s\" not found in config
 #: libs/uvl/luasrc/i18n/uvl.en.lua:27
-msgid "uvl_err_sect_notfound"
+msgid "Section \"%p.%s\" not found in config"
 msgstr ""
 
 #. Option \"%i\" (%I) not found in scheme
 #: libs/uvl/luasrc/i18n/uvl.en.lua:28
-msgid "uvl_err_opt_unknown"
+msgid "Option \"%i\" (%I) not found in scheme"
 msgstr ""
 
 #. Required option \"%i\" has no value
 #: libs/uvl/luasrc/i18n/uvl.en.lua:29
-msgid "uvl_err_opt_required"
+msgid "Required option \"%i\" has no value"
 msgstr ""
 
 #. Value \"%1\" of option \"%i\" is not defined in enum %2
 #: libs/uvl/luasrc/i18n/uvl.en.lua:30
-msgid "uvl_err_opt_badvalue"
+msgid "Value \"%1\" of option \"%i\" is not defined in enum %2"
 msgstr ""
 
 #. Value \"%1\" of option \"%i\" does not validate as datatype \"%2\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:31
-msgid "uvl_err_opt_invvalue"
+msgid "Value \"%1\" of option \"%i\" does not validate as datatype \"%2\""
 msgstr ""
 
 #. Option \"%i\" is defined as list but stored as plain value
 #: libs/uvl/luasrc/i18n/uvl.en.lua:32
-msgid "uvl_err_opt_notlist"
+msgid "Option \"%i\" is defined as list but stored as plain value"
 msgstr ""
 
 #. Option \"%i\" has unknown datatype \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:33
-msgid "uvl_err_opt_datatype"
+msgid "Option \"%i\" has unknown datatype \"%1\""
 msgstr ""
 
 #. Option \"%p.%s.%o\" not found in config
 #: libs/uvl/luasrc/i18n/uvl.en.lua:34
-msgid "uvl_err_opt_notfound"
+msgid "Option \"%p.%s.%o\" not found in config"
 msgstr ""
 
 #. Dependency (%1) failed:\noption \"%i\" is not eqal \"%2\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:35
-msgid "uvl_err_dep_notequal"
+msgid "Dependency (%1) failed:\\noption \"%i\" is not eqal \"%2\""
 msgstr ""
 
 #. Dependency (%1) failed:\noption \"%i\" has no value
 #: libs/uvl/luasrc/i18n/uvl.en.lua:36
-msgid "uvl_err_dep_novalue"
+msgid "Dependency (%1) failed:\\noption \"%i\" has no value"
 msgstr ""
 
 #. Dependency (%1) failed:\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:37
-msgid "uvl_err_dep_notvalid"
+msgid "Dependency (%1) failed:\\n%c"
 msgstr ""
 
 #. Recursive dependency for option \"%i\" detected
 #: libs/uvl/luasrc/i18n/uvl.en.lua:38
-msgid "uvl_err_dep_recursive"
+msgid "Recursive dependency for option \"%i\" detected"
 msgstr ""
 
 #. In dependency check for enum value \"%i\":\n%c
diff --git a/po/templates/voice_core.pot b/po/templates/voice_core.pot
index 639762468..25d456756 100644
--- a/po/templates/voice_core.pot
+++ b/po/templates/voice_core.pot
@@ -1,14 +1,5 @@
-#. Voice
-msgid "l_v_adminvoice"
-msgstr "Voice"
-
-#. Voice
-msgid "l_v_minivoice"
-msgstr "Voice"
-
-msgid "l_v_miniphones"
+msgid "Phones"
 msgstr ""
 
 msgid "l_v_adminphones"
 msgstr ""
-
diff --git a/po/templates/voice_diag.pot b/po/templates/voice_diag.pot
index 243a4d6e7..e0d328a68 100644
--- a/po/templates/voice_diag.pot
+++ b/po/templates/voice_diag.pot
@@ -1,12 +1,15 @@
-msgid "l_v_d_di_voicediag"
+msgid "Diagnostics"
 msgstr ""
 
-msgid "l_v_d_di_voicediag1"
+msgid ""
+"Under this menu are options that allow you to configure and perform tests on "
+"the voice operations of your system. These are known as diagnostics."
 msgstr ""
 
-msgid "l_v_d_di_voicediag2"
+msgid ""
+"The diagnostics available on your device depend on the modules that you have "
+"installed."
 msgstr ""
 
 msgid "l_v_d_admindiag"
 msgstr ""
-
diff --git a/po/templates/wifi.pot b/po/templates/wifi.pot
index b6425b3fc..2159b1a84 100644
--- a/po/templates/wifi.pot
+++ b/po/templates/wifi.pot
@@ -5,192 +5,192 @@ msgstr "Content-Type: text/plain; charset=UTF-8"
 
 #. auto
 #: i18n/english/luasrc/i18n/wifi.en.lua:1
-msgid "wifi_auto"
+msgid "auto"
 msgstr ""
 
 #. Frequency Hopping
 #: i18n/english/luasrc/i18n/wifi.en.lua:2
-msgid "wifi_fh"
+msgid "Frequency Hopping"
 msgstr ""
 
 #. Diversity
 #: i18n/english/luasrc/i18n/wifi.en.lua:3
-msgid "wifi_diversity"
+msgid "Diversity"
 msgstr ""
 
 #. Transmitter Antenna
 #: i18n/english/luasrc/i18n/wifi.en.lua:4
-msgid "wifi_txantenna"
+msgid "Transmitter Antenna"
 msgstr ""
 
 #. Receiver Antenna
 #: i18n/english/luasrc/i18n/wifi.en.lua:5
-msgid "wifi_rxantenna"
+msgid "Receiver Antenna"
 msgstr ""
 
 #. Distance Optimization
 #: i18n/english/luasrc/i18n/wifi.en.lua:6
-msgid "wifi_distance"
+msgid "Distance Optimization"
 msgstr ""
 
 #. Distance to farthest network member in meters.
 #: i18n/english/luasrc/i18n/wifi.en.lua:7
-msgid "wifi_distance_desc"
+msgid "Distance to farthest network member in meters."
 msgstr ""
 
 #. MAC-Address Filter
 #: i18n/english/luasrc/i18n/wifi.en.lua:8
-msgid "wifi_macpolicy"
+msgid "MAC-Address Filter"
 msgstr ""
 
 #. Allow listed only
 #: i18n/english/luasrc/i18n/wifi.en.lua:9
-msgid "wifi_whitelist"
+msgid "Allow listed only"
 msgstr ""
 
 #. Allow all except listed
 #: i18n/english/luasrc/i18n/wifi.en.lua:10
-msgid "wifi_blacklist"
+msgid "Allow all except listed"
 msgstr ""
 
 #. MAC-List
 #: i18n/english/luasrc/i18n/wifi.en.lua:11
-msgid "wifi_maclist"
+msgid "MAC-List"
 msgstr ""
 
 #. Frame Bursting
 #: i18n/english/luasrc/i18n/wifi.en.lua:12
-msgid "wifi_bursting"
+msgid "Frame Bursting"
 msgstr ""
 
 #. Regulatory Domain
 #: i18n/english/luasrc/i18n/wifi.en.lua:13
-msgid "wifi_regdomain"
+msgid "Regulatory Domain"
 msgstr ""
 
 #. Country Code
 #: i18n/english/luasrc/i18n/wifi.en.lua:14
-msgid "wifi_country"
+msgid "Country Code"
 msgstr ""
 
 #. Outdoor Channels
 #: i18n/english/luasrc/i18n/wifi.en.lua:15
-msgid "wifi_outdoor"
+msgid "Outdoor Channels"
 msgstr ""
 
 #. Connection Limit
 #: i18n/english/luasrc/i18n/wifi.en.lua:16
-msgid "wifi_maxassoc"
+msgid "Connection Limit"
 msgstr ""
 
 #. <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:17
-msgid "wifi_essid"
+msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 
 #. <abbr title=\"Basic Service Set Identifier\">BSSID</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:18
-msgid "wifi_bssid"
+msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr ""
 
 #. Fragmentation Threshold
 #: i18n/english/luasrc/i18n/wifi.en.lua:19
-msgid "wifi_frag"
+msgid "Fragmentation Threshold"
 msgstr ""
 
 #. RTS/CTS Threshold
 #: i18n/english/luasrc/i18n/wifi.en.lua:20
-msgid "wifi_rts"
+msgid "RTS/CTS Threshold"
 msgstr ""
 
 #. <abbr title=\"Wireless Distribution System\">WDS</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:21
-msgid "wifi_wds"
+msgid "<abbr title=\"Wireless Distribution System\">WDS</abbr>"
 msgstr ""
 
 #. Separate WDS
 #: i18n/english/luasrc/i18n/wifi.en.lua:22
-msgid "wifi_wdssep"
+msgid "Separate WDS"
 msgstr ""
 
 #. Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:23
-msgid "wifi_hidden"
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 
 #. Isolate Clients
 #: i18n/english/luasrc/i18n/wifi.en.lua:24
-msgid "wifi_isloate"
+msgid "Isolate Clients"
 msgstr ""
 
 #. Prevent Client to Client Communication
 #: i18n/english/luasrc/i18n/wifi.en.lua:25
-msgid "wifi_isloate_desc"
+msgid "Prevent Client to Client Communication"
 msgstr ""
 
 #. Background Scan
 #: i18n/english/luasrc/i18n/wifi.en.lua:26
-msgid "wifi_bgscan"
+msgid "Background Scan"
 msgstr ""
 
 #. Transmission Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:27
-msgid "wifi_rate"
+msgid "Transmission Rate"
 msgstr ""
 
 #. Multicast Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:28
-msgid "wifi_mcast_rate"
+msgid "Multicast Rate"
 msgstr ""
 
 #. Minimum Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:29
-msgid "wifi_minrate"
+msgid "Minimum Rate"
 msgstr ""
 
 #. Maximum Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:30
-msgid "wifi_maxrate"
+msgid "Maximum Rate"
 msgstr ""
 
 #. Compression
 #: i18n/english/luasrc/i18n/wifi.en.lua:31
-msgid "wifi_compression"
+msgid "Compression"
 msgstr ""
 
 #. Turbo Mode
 #: i18n/english/luasrc/i18n/wifi.en.lua:32
-msgid "wifi_turbo"
+msgid "Turbo Mode"
 msgstr ""
 
 #. Fast Frames
 #: i18n/english/luasrc/i18n/wifi.en.lua:33
-msgid "wifi_ff"
+msgid "Fast Frames"
 msgstr ""
 
 #. WMM Mode
 #: i18n/english/luasrc/i18n/wifi.en.lua:34
-msgid "wifi_wmm"
+msgid "WMM Mode"
 msgstr ""
 
 #. XR Support
 #: i18n/english/luasrc/i18n/wifi.en.lua:35
-msgid "wifi_xr"
+msgid "XR Support"
 msgstr ""
 
 #. AR Support
 #: i18n/english/luasrc/i18n/wifi.en.lua:36
-msgid "wifi_ar"
+msgid "AR Support"
 msgstr ""
 
 #. Disable HW-Beacon timer
 #: i18n/english/luasrc/i18n/wifi.en.lua:37
-msgid "wifi_nosbeacon"
+msgid "Disable HW-Beacon timer"
 msgstr ""
 
 #. Do not send probe responses
 #: i18n/english/luasrc/i18n/wifi.en.lua:38
-msgid "wifi_noprobereq"
+msgid "Do not send probe responses"
 msgstr ""
 
 #. WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP and ad-hoc mode) to be installed.
diff --git a/po/vi/admin-core.po b/po/vi/admin-core.po
index 8712cc680..426d02249 100644
--- a/po/vi/admin-core.po
+++ b/po/vi/admin-core.po
@@ -15,22 +15,22 @@ msgstr ""
 
 #. The following changes have been applied
 #: i18n/english/luasrc/i18n/admin-core.en.lua:1
-msgid "uci_applied"
+msgid "The following changes have been applied"
 msgstr "Những thay đổi sau đây đã được tiến hành"
 
 #. The following changes have been reverted
 #: i18n/english/luasrc/i18n/admin-core.en.lua:2
-msgid "uci_reverted"
+msgid "The following changes have been reverted"
 msgstr "Những thay đối sau đây đã được để trở về tình trạng cũ. "
 
 #. User Interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:3
-msgid "a_i_ui"
+msgid "User Interface"
 msgstr "Giao diện người sử dụng"
 
 #. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a collection of free Lua software including an <abbr title=\"Model-View-Controller\">MVC</abbr>-Webframework and webinterface for embedded devices. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is licensed under the Apache-License.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:4
-msgid "c_lucidesc"
+msgid "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a collection of free Lua software including an <abbr title=\"Model-View-Controller\">MVC</abbr>-Webframework and webinterface for embedded devices. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is licensed under the Apache-License."
 msgstr ""
 "<abbr title=\"Cấu hình giao diện Lua \">LuCI</abbr> là một tập hợp của phần "
 "mềm Lua bao gồm <abbr title=\"Model-View-Controller\">MVC</abbr>-Công cụ Web "
@@ -39,52 +39,52 @@ msgstr ""
 
 #. Project Homepage
 #: i18n/english/luasrc/i18n/admin-core.en.lua:5
-msgid "c_projecthome"
+msgid "Project Homepage"
 msgstr "Trang chủ dự án"
 
 #. Lead Development
 #: i18n/english/luasrc/i18n/admin-core.en.lua:6
-msgid "c_leaddev"
+msgid "Lead Development"
 msgstr "Dẫn đầu phát triển"
 
 #. Contributing Developers
 #: i18n/english/luasrc/i18n/admin-core.en.lua:7
-msgid "c_contributors"
+msgid "Contributing Developers"
 msgstr "Phát triển viên"
 
 #. Thanks To
 #: i18n/english/luasrc/i18n/admin-core.en.lua:8
-msgid "c_thanksto"
+msgid "Thanks To"
 msgstr "Cám ơn"
 
 #. Hello!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:9
-msgid "a_i_i_hello"
+msgid "Hello!"
 msgstr "Xin chào"
 
 #. This is the administration area of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:10
-msgid "a_i_i_admin1"
+msgid "This is the administration area of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>."
 msgstr ""
 "Đây là vùng quản trị của <abbr title=\"Cấu hình giao diện Lua\">LuCI</abbr>."
 
 #. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a free, flexible, and user friendly graphical interface for configuring OpenWrt Kamikaze.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:11
-msgid "a_i_i_admin2"
+msgid "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a free, flexible, and user friendly graphical interface for configuring OpenWrt Kamikaze."
 msgstr ""
 "<abbr title=\"Cấu hình giao diện Lua \">LuCI</abbr> thì miễn phí, đa dạng , và "
 "đồ họa thân thiện với sử dụng cho các cấu hình OpenWrt Kamikaze."
 
 #. On the following pages you can adjust all important settings of your router.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:12
-msgid "a_i_i_admin3"
+msgid "On the following pages you can adjust all important settings of your router."
 msgstr ""
 "Ở những trang kế tiếp, bạn có thể thay đổi những cài đặt quan trong của bộ "
 "định tuyến."
 
 #. Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> changes have to be confirmed by clicking Changes - Save &amp; Apply before being applied.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:13
-msgid "a_i_i_admin4"
+msgid "Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> changes have to be confirmed by clicking Changes - Save & Apply before being applied."
 msgstr ""
 "Ghi chú: Trong <abbr title=\"Cấu hình giao diện Lua \">LuCI</abbr> những thay "
 "đổi phải được xác nhận bằng cách nhấn vào Changes - Save &amp;amp; Áp dụng "
@@ -92,36 +92,36 @@ msgstr ""
 
 #. As we always want to improve this interface we are looking forward to your feedback and suggestions.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:14
-msgid "a_i_i_admin5"
+msgid "As we always want to improve this interface we are looking forward to your feedback and suggestions."
 msgstr ""
 "Vì chúng tôi luôn muốn cải thiện giao diện này, chúng tôi hy vọng  nhận được "
 "đóng góp và ý kiến của các bạn. "
 
 #. And now have fun with your router!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:15
-msgid "a_i_i_admin6"
+msgid "And now have fun with your router!"
 msgstr "Và bây giờ hãy bắt đầu chơi với bộ định tuyến của bạn!"
 
 #. The <abbr title=\"Lua Configuration Interface\">LuCI</abbr> Team
 #: i18n/english/luasrc/i18n/admin-core.en.lua:16
-msgid "a_i_i_team"
+msgid "The <abbr title=\"Lua Configuration Interface\">LuCI</abbr> Team"
 msgstr "Nhóm <abbr title=\"Cấu hình giao diện Lua\">LuCI</abbr> "
 
 #. Here you can customize the settings and the functionality of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:17
-msgid "a_i_luci1"
+msgid "Here you can customize the settings and the functionality of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>."
 msgstr ""
 "Ở đây bạn có thể tùy chỉnh các cài đặt và các chức năng của <abbr title=\"Cấu "
 "hình giao diện Lua\">LuCI</abbr>."
 
 #. Post-commit actions
 #: i18n/english/luasrc/i18n/admin-core.en.lua:18
-msgid "a_i_ucicommit"
+msgid "Post-commit actions"
 msgstr "Đăng _ cam kết hành động"
 
 #. These commands will be executed automatically when a given <abbr title=\"Unified Configuration Interface\">UCI</abbr> configuration is committed allowing changes to be applied instantly.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:19
-msgid "a_i_ucicommit1"
+msgid "These commands will be executed automatically when a given <abbr title=\"Unified Configuration Interface\">UCI</abbr> configuration is committed allowing changes to be applied instantly."
 msgstr ""
 "Những lệnh này sẽ được thực hiện tự động khi một <abbr title=\"Cấu hình giao "
 "diện thống nhất \">UCI</abbr> được cam kết cho phép các thay đổi được áp dụng "
@@ -129,19 +129,19 @@ msgstr ""
 
 #. Files to be kept when flashing a new firmware
 #: i18n/english/luasrc/i18n/admin-core.en.lua:20
-msgid "a_i_keepflash"
+msgid "Files to be kept when flashing a new firmware"
 msgstr "Tập tin được lưu giữ khi truyền tới một phần cứng mới"
 
 #. When flashing a new firmware with <abbr title=\"Lua Configuration Interface\">LuCI</abbr> these files will be added to the new firmware installation.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:21
-msgid "a_i_keepflash1"
+msgid "When flashing a new firmware with <abbr title=\"Lua Configuration Interface\">LuCI</abbr> these files will be added to the new firmware installation."
 msgstr ""
 "Khi truyền đến phần cứng với  <abbr title=\"Cấu hình giao diện Lua "
 "\">LuCI</abbr> Những tập tin này sẽ được bổ sung vào cài đặt phần cứng mới."
 
 #. Here you can find information about the current system status like <abbr title=\"Central Processing Unit\">CPU</abbr> clock frequency, memory usage or network interface data.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:22
-msgid "a_st_i_status1"
+msgid "Here you can find information about the current system status like <abbr title=\"Central Processing Unit\">CPU</abbr> clock frequency, memory usage or network interface data."
 msgstr ""
 "Ở đây bạn có thể tìm thấy thông tin về tình trạng của hệ thống hiện hành  "
 "như là <abbr title=\"Bộ điều khiển trung tâm\">CPU</abbr> đồng hồ tần số, bộ "
@@ -149,580 +149,580 @@ msgstr ""
 
 #. Also kernel or service logfiles can be viewed here to get an overview over their current state.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:23
-msgid "a_st_i_status2"
+msgid "Also kernel or service logfiles can be viewed here to get an overview over their current state."
 msgstr ""
 "Kernel hoặc service logfiles cũng có thể được view ở đây để lấy tầm nhìn "
 "tổng quát của hình trạng hiện tại. "
 
 #. <abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan
 #: i18n/english/luasrc/i18n/admin-core.en.lua:24
-msgid "iwscan"
+msgid "<abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan"
 msgstr "<abbr title=\"Mạng lưới không dây địa phương\">WLAN</abbr>-Scan"
 
 #. Wifi networks in your local environment
 #: i18n/english/luasrc/i18n/admin-core.en.lua:25
-msgid "iwscan1"
+msgid "Wifi networks in your local environment"
 msgstr "Mạng lưới wifi ở môi trường xung quanh bạn"
 
 #. <abbr title=\"Encrypted\">Encr.</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:26
-msgid "iwscan_encr"
+msgid "<abbr title=\"Encrypted\">Encr.</abbr>"
 msgstr "<abbr title=\"Mã hóa\">Encr.</abbr>"
 
 #. Link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:27
-msgid "iwscan_link"
+msgid "Link"
 msgstr "Đường dẫn"
 
 #. Signal
 #: i18n/english/luasrc/i18n/admin-core.en.lua:28
-msgid "iwscan_signal"
+msgid "Signal"
 msgstr "Tín hiệu "
 
 #. Noise
 #: i18n/english/luasrc/i18n/admin-core.en.lua:29
-msgid "iwscan_noise"
+msgid "Noise"
 msgstr "Tiếng ồn"
 
 #. Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:30
-msgid "routes"
+msgid "Routes"
 msgstr "Tuyến đường"
 
 #. Netmask
 #: i18n/english/luasrc/i18n/admin-core.en.lua:31
-msgid "routes_netmask"
+msgid "Netmask"
 msgstr "Netmask"
 
 #. Gateway
 #: i18n/english/luasrc/i18n/admin-core.en.lua:32
-msgid "routes_gateway"
+msgid "Gateway"
 msgstr "Cổng ra"
 
 #. Metric
 #: i18n/english/luasrc/i18n/admin-core.en.lua:33
-msgid "routes_metric"
+msgid "Metric"
 msgstr "Metric"
 
 #. Here you can configure the basic aspects of your device like its hostname or the timezone.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:34
-msgid "a_s_desc"
+msgid "Here you can configure the basic aspects of your device like its hostname or the timezone."
 msgstr ""
 "Ở đây bạn có thể cấu hình những đặc tính cơ bản của thiết bị như tên máy chủ "
 "hoặc múi giờ."
 
 #. Software
 #: i18n/english/luasrc/i18n/admin-core.en.lua:35
-msgid "a_s_packages"
+msgid "Software"
 msgstr "Phần mềm"
 
 #. Admin Password
 #: i18n/english/luasrc/i18n/admin-core.en.lua:36
-msgid "a_s_changepw"
+msgid "Admin Password"
 msgstr "Mật khẩu quản lí"
 
 #. OPKG-Configuration
 #: i18n/english/luasrc/i18n/admin-core.en.lua:37
-msgid "a_s_p_ipkg"
+msgid "OPKG-Configuration"
 msgstr "Cấu hình OPKG-"
 
 #. <abbr title=\"Secure Shell\">SSH</abbr>-Keys
 #: i18n/english/luasrc/i18n/admin-core.en.lua:38
-msgid "a_s_sshkeys"
+msgid "<abbr title=\"Secure Shell\">SSH</abbr>-Keys"
 msgstr "<abbr title=\"Vỏ bảo mậtl\">SSH</abbr>-Phím"
 
 #. Mount Points
 #: i18n/english/luasrc/i18n/admin-core.en.lua:39
-msgid "a_s_fstab"
+msgid "Mount Points"
 msgstr "Gắn kết điểm "
 
 #. Change settings related to the system itself, its identification, installed hard- and software, authentication or mount points.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:40
-msgid "a_s_i_system1"
+msgid "Change settings related to the system itself, its identification, installed hard- and software, authentication or mount points."
 msgstr ""
 "Thay đổi cài đặt liên quan đến bản thân hệ thống, sự xác nhận,cài đặt phần "
 "cứng- và phần mềm, chứng thực hay gắn kết điểm"
 
 #. These settings define the base of your system.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:41
-msgid "a_s_i_system2"
+msgid "These settings define the base of your system."
 msgstr "Những cài đặt này xác định các cơ sở của hệ thống."
 
 #. Pay attention as any misconfiguration here may prevent your device from booting or may lock yourself out of it.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:42
-msgid "a_s_i_system3"
+msgid "Pay attention as any misconfiguration here may prevent your device from booting or may lock yourself out of it."
 msgstr ""
 "Chú ý là bất kỳ định dạng sai ở đây có thể làm công cụ của bạn không khởi "
 "động được hoặc có thể tự khóa ra khỏi hệ thống."
 
 #. Interfaces
 #: i18n/english/luasrc/i18n/admin-core.en.lua:43
-msgid "a_s_if"
+msgid "Interfaces"
 msgstr "Giao diện"
 
 #. Bridge
 #: i18n/english/luasrc/i18n/admin-core.en.lua:44
-msgid "a_s_if_bridge"
+msgid "Bridge"
 msgstr "Cầu nối"
 
 #. ID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:45
-msgid "a_s_if_bridge_id"
+msgid "ID"
 msgstr "ID"
 
 #. Bridge Port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:46
-msgid "a_s_if_bridge_port"
+msgid "Bridge Port"
 msgstr "Cổng cầu nối"
 
 #. STP
 #: i18n/english/luasrc/i18n/admin-core.en.lua:47
-msgid "a_s_if_bridge_stp"
+msgid "STP"
 msgstr "STP"
 
 #. Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:48
-msgid "a_s_if_device"
+msgid "Device"
 msgstr "Công cụ"
 
 #. Ethernet Bridge
 #: i18n/english/luasrc/i18n/admin-core.en.lua:49
-msgid "a_s_if_ethbridge"
+msgid "Ethernet Bridge"
 msgstr "Cầu nối ethernet"
 
 #. Ethernet Adapter
 #: i18n/english/luasrc/i18n/admin-core.en.lua:50
-msgid "a_s_if_ethdev"
+msgid "Ethernet Adapter"
 msgstr "Bộ tương hợp ethernet"
 
 #. Ethernet Switch
 #: i18n/english/luasrc/i18n/admin-core.en.lua:51
-msgid "a_s_if_ethswitch"
+msgid "Ethernet Switch"
 msgstr "Bộ chuyển đảo ethernet"
 
 #. Interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:52
-msgid "a_s_if_interface"
+msgid "Interface"
 msgstr "Giao diện"
 
 #. IP Configuration
 #: i18n/english/luasrc/i18n/admin-core.en.lua:53
-msgid "a_s_if_ipconfig"
+msgid "IP Configuration"
 msgstr "Cấu hình IP"
 
 #. Alias
 #: i18n/english/luasrc/i18n/admin-core.en.lua:54
-msgid "a_s_if_ipconfig_alias"
+msgid "Alias"
 msgstr "Bí danh"
 
 #. DHCP assigned
 #: i18n/english/luasrc/i18n/admin-core.en.lua:55
-msgid "a_s_if_ipconfig_dhcp"
+msgid "DHCP assigned"
 msgstr "Gán DHCP"
 
 #. IPv6
 #: i18n/english/luasrc/i18n/admin-core.en.lua:56
-msgid "a_s_if_ipconfig_ipv6"
+msgid "IPv6"
 msgstr "IPv6"
 
 #. Not configured
 #: i18n/english/luasrc/i18n/admin-core.en.lua:57
-msgid "a_s_if_ipconfig_none"
+msgid "Not configured"
 msgstr "Không định cấu hình"
 
 #. Primary
 #: i18n/english/luasrc/i18n/admin-core.en.lua:58
-msgid "a_s_if_ipconfig_primary"
+msgid "Primary"
 msgstr "Chính"
 
 #. Channel
 #: i18n/english/luasrc/i18n/admin-core.en.lua:59
-msgid "a_s_if_iwchannel"
+msgid "Channel"
 msgstr "Kênh"
 
 #. Mode
 #: i18n/english/luasrc/i18n/admin-core.en.lua:60
-msgid "a_s_if_iwmode"
+msgid "Mode"
 msgstr "Mode"
 
 #. Ad-Hoc
 #: i18n/english/luasrc/i18n/admin-core.en.lua:61
-msgid "a_s_if_iwmode_adhoc"
+msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
 #. Pseudo Ad-Hoc
 #: i18n/english/luasrc/i18n/admin-core.en.lua:62
-msgid "a_s_if_iwmode_ahdemo"
+msgid "Pseudo Ad-Hoc"
 msgstr "Pseudo Ad-Hoc"
 
 #. Master
 #: i18n/english/luasrc/i18n/admin-core.en.lua:63
-msgid "a_s_if_iwmode_ap"
+msgid "Master"
 msgstr "Chủ"
 
 #. Master + WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:64
-msgid "a_s_if_iwmode_apwds"
+msgid "Master + WDS"
 msgstr "Chủ + WDS"
 
 #. Client
 #: i18n/english/luasrc/i18n/admin-core.en.lua:65
-msgid "a_s_if_iwmode_sta"
+msgid "Client"
 msgstr "Đối tượng"
 
 #. Client + WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:66
-msgid "a_s_if_iwmode_stawds"
+msgid "Client + WDS"
 msgstr "Đối tượng + WDS"
 
 #. WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:67
-msgid "a_s_if_iwmode_wds"
+msgid "WDS"
 msgstr "WDS"
 
 #. SSID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:68
-msgid "a_s_if_iwssid"
+msgid "SSID"
 msgstr "SSID"
 
 #. MAC
 #: i18n/english/luasrc/i18n/admin-core.en.lua:69
-msgid "a_s_if_mac"
+msgid "MAC"
 msgstr "MAC"
 
 #. Pkts.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:70
-msgid "a_s_if_pkts"
+msgid "Pkts."
 msgstr "Pkts."
 
 #. Interface Status
 #: i18n/english/luasrc/i18n/admin-core.en.lua:71
-msgid "a_s_if_status"
+msgid "Interface Status"
 msgstr "Tình trạng giao diện"
 
 #. Transfer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:72
-msgid "a_s_if_transfer"
+msgid "Transfer"
 msgstr "Chuyển giao"
 
 #. RX
 #: i18n/english/luasrc/i18n/admin-core.en.lua:73
-msgid "a_s_if_transfer_rx"
+msgid "RX"
 msgstr "RX"
 
 #. TX
 #: i18n/english/luasrc/i18n/admin-core.en.lua:74
-msgid "a_s_if_transfer_tx"
+msgid "TX"
 msgstr "TX"
 
 #. Type
 #: i18n/english/luasrc/i18n/admin-core.en.lua:75
-msgid "a_s_if_type"
+msgid "Type"
 msgstr "Loại"
 
 #. VLAN
 #: i18n/english/luasrc/i18n/admin-core.en.lua:76
-msgid "a_s_if_vlan"
+msgid "VLAN"
 msgstr "VLAN"
 
 #. Ports
 #: i18n/english/luasrc/i18n/admin-core.en.lua:77
-msgid "a_s_if_vlanports"
+msgid "Ports"
 msgstr "Cổng"
 
 #. Wireless Adapter
 #: i18n/english/luasrc/i18n/admin-core.en.lua:78
-msgid "a_s_if_wifidev"
+msgid "Wireless Adapter"
 msgstr "Bộ tương hợp không dây"
 
 #. Firewall
 #: i18n/english/luasrc/i18n/admin-core.en.lua:79
-msgid "a_s_ipt"
+msgid "Firewall"
 msgstr "Firewall"
 
 #. Actions
 #: i18n/english/luasrc/i18n/admin-core.en.lua:80
-msgid "a_s_ipt_actions"
+msgid "Actions"
 msgstr "Hành động"
 
 #. Traffic
 #: i18n/english/luasrc/i18n/admin-core.en.lua:81
-msgid "a_s_ipt_bytes"
+msgid "Traffic"
 msgstr "Lưu thông"
 
 #. Chain
 #: i18n/english/luasrc/i18n/admin-core.en.lua:82
-msgid "a_s_ipt_chain"
+msgid "Chain"
 msgstr "chuỗi"
 
 #. Destination
 #: i18n/english/luasrc/i18n/admin-core.en.lua:83
-msgid "a_s_ipt_destination"
+msgid "Destination"
 msgstr "Điểm đến"
 
 #. Flags
 #: i18n/english/luasrc/i18n/admin-core.en.lua:84
-msgid "a_s_ipt_flags"
+msgid "Flags"
 msgstr "Cờ"
 
 #. In
 #: i18n/english/luasrc/i18n/admin-core.en.lua:85
-msgid "a_s_ipt_inputif"
+msgid "In"
 msgstr "Trong"
 
 #. No chains in this table
 #: i18n/english/luasrc/i18n/admin-core.en.lua:86
-msgid "a_s_ipt_nochains"
+msgid "No chains in this table"
 msgstr "Không có chuỗi trong bảng này"
 
 #. No Rules in this chain
 #: i18n/english/luasrc/i18n/admin-core.en.lua:87
-msgid "a_s_ipt_norules"
+msgid "No Rules in this chain"
 msgstr "Không có quy luật trong chuỗi này"
 
 #. Options
 #: i18n/english/luasrc/i18n/admin-core.en.lua:88
-msgid "a_s_ipt_options"
+msgid "Options"
 msgstr "Lựa chọn"
 
 #. Out
 #: i18n/english/luasrc/i18n/admin-core.en.lua:89
-msgid "a_s_ipt_outputif"
+msgid "Out"
 msgstr "Ra khỏi"
 
 #. Packets
 #: i18n/english/luasrc/i18n/admin-core.en.lua:90
-msgid "a_s_ipt_packets"
+msgid "Packets"
 msgstr "Gói tin"
 
 #. Pkts.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:91
-msgid "a_s_ipt_pkts"
+msgid "Pkts."
 msgstr "Pkts."
 
 #. Policy
 #: i18n/english/luasrc/i18n/admin-core.en.lua:92
-msgid "a_s_ipt_policy"
+msgid "Policy"
 msgstr "Chính sách"
 
 #. Prot.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:93
-msgid "a_s_ipt_prot"
+msgid "Prot."
 msgstr "Prot."
 
 #. References
 #: i18n/english/luasrc/i18n/admin-core.en.lua:94
-msgid "a_s_ipt_references"
+msgid "References"
 msgstr "Tham chiếu"
 
 #. Reset Counters
 #: i18n/english/luasrc/i18n/admin-core.en.lua:95
-msgid "a_s_ipt_reset"
+msgid "Reset Counters"
 msgstr "Reset bộ đếm"
 
 #. Restart Firewall
 #: i18n/english/luasrc/i18n/admin-core.en.lua:96
-msgid "a_s_ipt_restart"
+msgid "Restart Firewall"
 msgstr "Khởi động lại Firewall"
 
 #. #
 #: i18n/english/luasrc/i18n/admin-core.en.lua:97
-msgid "a_s_ipt_rulenum"
+msgid "#"
 msgstr "#"
 
 #. Source
 #: i18n/english/luasrc/i18n/admin-core.en.lua:98
-msgid "a_s_ipt_source"
+msgid "Source"
 msgstr "Nguồn"
 
 #. Firewall Status
 #: i18n/english/luasrc/i18n/admin-core.en.lua:99
-msgid "a_s_ipt_status"
+msgid "Firewall Status"
 msgstr "Tình trạng Firewall"
 
 #. Table
 #: i18n/english/luasrc/i18n/admin-core.en.lua:100
-msgid "a_s_ipt_table"
+msgid "Table"
 msgstr "Bảng"
 
 #. Target
 #: i18n/english/luasrc/i18n/admin-core.en.lua:101
-msgid "a_s_ipt_target"
+msgid "Target"
 msgstr "Đích"
 
 #. Perform Actions
 #: i18n/english/luasrc/i18n/admin-core.en.lua:102
-msgid "a_s_packages_do"
+msgid "Perform Actions"
 msgstr "Trình bày hành động"
 
 #. Install
 #: i18n/english/luasrc/i18n/admin-core.en.lua:103
-msgid "a_s_packages_install"
+msgid "Install"
 msgstr "Cài đặt"
 
 #. Download and install package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:104
-msgid "a_s_packages_installurl"
+msgid "Download and install package"
 msgstr "Tải và cài đặt gói"
 
 #. Edit package lists and installation targets
 #: i18n/english/luasrc/i18n/admin-core.en.lua:105
-msgid "a_s_packages_ipkg"
+msgid "Edit package lists and installation targets"
 msgstr "Chỉnh sửa danh sách gói và mục tiêu cài đặt"
 
 #. Package name
 #: i18n/english/luasrc/i18n/admin-core.en.lua:106
-msgid "a_s_packages_name"
+msgid "Package name"
 msgstr "Tên gói"
 
 #. Remove
 #: i18n/english/luasrc/i18n/admin-core.en.lua:107
-msgid "a_s_packages_remove"
+msgid "Remove"
 msgstr "Loại bỏ"
 
 #. Find package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:108
-msgid "a_s_packages_search"
+msgid "Find package"
 msgstr "Tìm gói"
 
 #. Package lists updated
 #: i18n/english/luasrc/i18n/admin-core.en.lua:109
-msgid "a_s_packages_update"
+msgid "Package lists updated"
 msgstr "Danh sách gói đã được cập nhật"
 
 #. Update package lists
 #: i18n/english/luasrc/i18n/admin-core.en.lua:110
-msgid "a_s_packages_updatelist"
+msgid "Update package lists"
 msgstr "Cập nhật danh sách gói"
 
 #. Upgrade installed packages
 #: i18n/english/luasrc/i18n/admin-core.en.lua:111
-msgid "a_s_packages_upgrade"
+msgid "Upgrade installed packages"
 msgstr "nâng cấp gói cài đặt"
 
 #. Could not set default destination
 #: i18n/english/luasrc/i18n/admin-core.en.lua:112
-msgid "a_s_packages_code1"
+msgid "Could not set default destination"
 msgstr "Không kể đặt điểm đến mặc định"
 
 #. Error parsing config file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:113
-msgid "a_s_packages_code2"
+msgid "Error parsing config file"
 msgstr "Lỗi phân cách tập tin config"
 
 #. Could not create temporary directory (ran out of space?)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:114
-msgid "a_s_packages_code3"
+msgid "Could not create temporary directory (ran out of space?)"
 msgstr "Không thể tạo danh bạ tạm thời (không còn khoảng trống)"
 
 #. Could not get adminstrative lock (ran out of space?)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:115
-msgid "a_s_packages_code4"
+msgid "Could not get adminstrative lock (ran out of space?)"
 msgstr "Không thể lấy khóa hành chính (không còn khoảng trống)"
 
 #. Unsatisfied Dependencies
 #: i18n/english/luasrc/i18n/admin-core.en.lua:116
-msgid "a_s_packages_code5"
+msgid "Unsatisfied Dependencies"
 msgstr "Phụ thuộc không thỏa mãn"
 
 #. Refused to remove essential package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:117
-msgid "a_s_packages_code6"
+msgid "Refused to remove essential package"
 msgstr "Từ chối loại bỏ gói thiết yếu"
 
 #. Package has dependents
 #: i18n/english/luasrc/i18n/admin-core.en.lua:118
-msgid "a_s_packages_code7"
+msgid "Package has dependents"
 msgstr "Gói có những phụ thuộc"
 
 #. Package has no installation candidate (wrong name?)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:119
-msgid "a_s_packages_code8"
+msgid "Package has no installation candidate (wrong name?)"
 msgstr "Gói không có đối tượng cài đặt (sai tên)"
 
 #. Package has no available architecture 
 #: i18n/english/luasrc/i18n/admin-core.en.lua:120
-msgid "a_s_packages_code9"
+msgid "Package has no available architecture "
 msgstr "Gói không có sẵn cấu trúc <span class=\"khoảng trống chuyển đổi\"> </span>\n"
 
 #. Package is not trusted
 #: i18n/english/luasrc/i18n/admin-core.en.lua:121
-msgid "a_s_packages_code10"
+msgid "Package is not trusted"
 msgstr "Gói không đáng tin"
 
 #. Error while downloading
 #: i18n/english/luasrc/i18n/admin-core.en.lua:122
-msgid "a_s_packages_code11"
+msgid "Error while downloading"
 msgstr "Lỗi khi tải về "
 
 #. Conflicts with other packages
 #: i18n/english/luasrc/i18n/admin-core.en.lua:123
-msgid "a_s_packages_code12"
+msgid "Conflicts with other packages"
 msgstr "Xung đột với những gói khác"
 
 #. Package is already installed
 #: i18n/english/luasrc/i18n/admin-core.en.lua:124
-msgid "a_s_packages_code13"
+msgid "Package is already installed"
 msgstr "Gói đã được cài đặt"
 
 #. Package has unresolved dependencies
 #: i18n/english/luasrc/i18n/admin-core.en.lua:125
-msgid "a_s_packages_code14"
+msgid "Package has unresolved dependencies"
 msgstr "Đóng gói không xử lý được các thành phần phụ thuộc"
 
 #. Refused to downgrade package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:126
-msgid "a_s_packages_code15"
+msgid "Refused to downgrade package"
 msgstr "Từ chối hạ cấp gói"
 
 #. Package manager ran out of space
 #: i18n/english/luasrc/i18n/admin-core.en.lua:127
-msgid "a_s_packages_code16"
+msgid "Package manager ran out of space"
 msgstr "Quản lí gói đã hết khoảng trống"
 
 #. Bad signature while verifiying package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:128
-msgid "a_s_packages_code17"
+msgid "Bad signature while verifiying package"
 msgstr "Chữ ký không tốt khi đang xác minh gói"
 
 #. MD5 error while verifiying package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:129
-msgid "a_s_packages_code18"
+msgid "MD5 error while verifiying package"
 msgstr "Lỗi MD5 khi đang xác minh gói"
 
 #. Internal error occured
 #: i18n/english/luasrc/i18n/admin-core.en.lua:130
-msgid "a_s_packages_code19"
+msgid "Internal error occured"
 msgstr "Xảy ra lỗi bên trong"
 
 #. Package lists
 #: i18n/english/luasrc/i18n/admin-core.en.lua:131
-msgid "a_s_p_ipkg_pkglists"
+msgid "Package lists"
 msgstr "Danh sách đóng gói"
 
 #. Installation targets
 #: i18n/english/luasrc/i18n/admin-core.en.lua:132
-msgid "a_s_p_ipkg_targets"
+msgid "Installation targets"
 msgstr "Mục tiêu cài đặt"
 
 #. Change the password of the system administrator (User <code>root</code>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:133
-msgid "a_s_changepw1"
+msgid "Change the password of the system administrator (User <code>root</code>)"
 msgstr "Thay đổi mật mã của quản lí hệ thống (User <code>root</code>)"
 
 #. Password successfully changed
 #: i18n/english/luasrc/i18n/admin-core.en.lua:134
-msgid "a_s_changepw_changed"
+msgid "Password successfully changed"
 msgstr "Mật mã đã thay đổi thành công"
 
 #. Error: Passwords do not match
 #: i18n/english/luasrc/i18n/admin-core.en.lua:135
-msgid "a_s_changepw_nomatch"
+msgid "Error: Passwords do not match"
 msgstr "Lỗi: Mật mã không trùng khớp"
 
 #. Here you can paste public <abbr title=\"Secure Shell\">SSH</abbr>-Keys (one per line) for <abbr title=\"Secure Shell\">SSH</abbr> public-key authentication.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:136
-msgid "a_s_sshkeys1"
+msgid "Here you can paste public <abbr title=\"Secure Shell\">SSH</abbr>-Keys (one per line) for <abbr title=\"Secure Shell\">SSH</abbr> public-key authentication."
 msgstr ""
 "ở đây bạn có thể dán công khai <abbr title=\"Secure Shell\"> SSH</abbr>-Keys "
 "(mỗi cái một dòng) for <abbr title=\"Secure Shell\">SSH</abbr> xác thực khóa "
@@ -730,46 +730,46 @@ msgstr ""
 
 #. Mount Points
 #: i18n/english/luasrc/i18n/admin-core.en.lua:137
-msgid "a_s_fstab_mountpoints"
+msgid "Mount Points"
 msgstr "Lắp điểm"
 
 #. Mount Points define at which point a memory device will be attached to the filesystem
 #: i18n/english/luasrc/i18n/admin-core.en.lua:138
-msgid "a_s_fstab_mountpoints1"
+msgid "Mount Points define at which point a memory device will be attached to the filesystem"
 msgstr ""
 "Số điểm lắp xác định tại một điểm mà ở đó bộ nhớ sẽ được gắn vào hệ thống "
 "tập tin"
 
 #. Mounted file systems
 #: i18n/english/luasrc/i18n/admin-core.en.lua:139
-msgid "a_s_fstab_active"
+msgid "Mounted file systems"
 msgstr "Lắp tập tin hệ thống"
 
 #. Used
 #: i18n/english/luasrc/i18n/admin-core.en.lua:140
-msgid "a_s_fstab_used"
+msgid "Used"
 msgstr "Đã sử dụng"
 
 #. Available
 #: i18n/english/luasrc/i18n/admin-core.en.lua:141
-msgid "a_s_fstab_avail"
+msgid "Available"
 msgstr "Sẵn có"
 
 #. Mount Point
 #: i18n/english/luasrc/i18n/admin-core.en.lua:142
-msgid "a_s_fstab_mountpoint"
+msgid "Mount Point"
 msgstr "Lắp điểm"
 
 #. The device file of the memory or partition (<abbr title=\"for example\">e.g.</abbr> <code>/dev/sda1</code>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:143
-msgid "a_s_fstab_device1"
+msgid "The device file of the memory or partition (<abbr title=\"for example\">e.g.</abbr> <code>/dev/sda1</code>)"
 msgstr ""
 "Tập tin công cụ của bộ nhớ hoặc phân vùng (<abbr title=\"Ví dụ\">e.g.</abbr> "
 "<code>/dev/sda1</code>)"
 
 #. The filesystem that was used to format the memory (<abbr title=\"for example\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></samp>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:144
-msgid "a_s_fstab_fs1"
+msgid "The filesystem that was used to format the memory (<abbr title=\"for example\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></samp>)"
 msgstr ""
 "Filesystem mà được dùng để format memory (<abbr title=\"for "
 "example\">e.g.</abbr> <samp><abbr title=\"Third Extended "
@@ -777,7 +777,7 @@ msgstr ""
 
 #. If your physical memory is insufficient unused data can be temporarily swapped to a swap-device resulting in a higher amount of usable <abbr title=\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very slow process as the swap-device cannot be accessed with the high datarates of the <abbr title=\"Random Access Memory\">RAM</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:145
-msgid "a_s_fstab_swap1"
+msgid "If your physical memory is insufficient unused data can be temporarily swapped to a swap-device resulting in a higher amount of usable <abbr title=\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very slow process as the swap-device cannot be accessed with the high datarates of the <abbr title=\"Random Access Memory\">RAM</abbr>."
 msgstr ""
 "Nếu bộ nhớ vật lý không đủ dữ liệu không dùng có thể được swap tạm thời đến "
 "một thiết bị swap để tạo ra nhiều khoảng trống hơn trong <abbr title=\"Random "
@@ -787,85 +787,85 @@ msgstr ""
 
 #. Reboots the operating system of your device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:146
-msgid "a_s_reboot1"
+msgid "Reboots the operating system of your device"
 msgstr "Reboots hệ điều hành của công cụ"
 
 #. Perform reboot
 #: i18n/english/luasrc/i18n/admin-core.en.lua:147
-msgid "a_s_reboot_do"
+msgid "Perform reboot"
 msgstr "Tiến hành reboot"
 
 #. Please wait: Device rebooting...
 #: i18n/english/luasrc/i18n/admin-core.en.lua:148
-msgid "a_s_reboot_running"
+msgid "Please wait: Device rebooting..."
 msgstr "Xin chờ: Công cụ đang reboot"
 
 #. Warning: There are unsaved changes that will be lost while rebooting!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:149
-msgid "a_s_reboot_u"
+msgid "Warning: There are unsaved changes that will be lost while rebooting!"
 msgstr "Cảnh báo: Các thay đổi chưa lưu sẽ bị mất trong khi khởi động lại!"
 
 #. Changes applied.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:150
-msgid "a_s_applyreboot1"
+msgid "Changes applied."
 msgstr "Thay đổi đã áp dụng"
 
 #. Backup / Restore
 #: i18n/english/luasrc/i18n/admin-core.en.lua:151
-msgid "a_s_backup"
+msgid "Backup / Restore"
 msgstr "Backup/ Restore"
 
 #. Create backup
 #: i18n/english/luasrc/i18n/admin-core.en.lua:152
-msgid "a_s_backup_backup"
+msgid "Create backup"
 msgstr "Tạo backup"
 
 #. Backup Archive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:153
-msgid "a_s_backup_archive"
+msgid "Backup Archive"
 msgstr "Backup Archive"
 
 #. Reset router to defaults
 #: i18n/english/luasrc/i18n/admin-core.en.lua:154
-msgid "a_s_backup_reset"
+msgid "Reset router to defaults"
 msgstr "Đặt lại bộ định tuyến ở chế độ mặc định"
 
 #. Proceed reverting all settings and resetting to firmware defaults?
 #: i18n/english/luasrc/i18n/admin-core.en.lua:155
-msgid "a_s_backup_reset1"
+msgid "Proceed reverting all settings and resetting to firmware defaults?"
 msgstr "Tiến trình này sẽ chuyển mọi thiết lập về firmware mặc định"
 
 #. Restore backup
 #: i18n/english/luasrc/i18n/admin-core.en.lua:156
-msgid "a_s_backup_restore"
+msgid "Restore backup"
 msgstr "Phục hồi backup"
 
 #. Here you can backup and restore your router configuration and - if possible - reset the router to the default settings.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:157
-msgid "a_s_backup1"
+msgid "Here you can backup and restore your router configuration and - if possible - reset the router to the default settings."
 msgstr ""
 "Ở đây bạn có thể backup và khôi phục lại cấu hình bộ định tuyến và- nếu có "
 "thể - reset bộ định tuyến ở cài đặt mặc định."
 
 #. <abbr title=\"Hypertext Transfer Protocol\">HTTP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:158
-msgid "a_srv_http"
+msgid "<abbr title=\"Hypertext Transfer Protocol\">HTTP</abbr>-Server"
 msgstr "<abbr title=\"Hypertext Transfer Protocol\">HTTP</abbr>-Server"
 
 #. <abbr title=\"Secure Shell\">SSH</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:159
-msgid "a_srv_ssh"
+msgid "<abbr title=\"Secure Shell\">SSH</abbr>-Server"
 msgstr "<abbr title=\"Secure Shell\">SSH</abbr>-Server"
 
 #. Services and daemons perform certain tasks on your device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:160
-msgid "a_srv_services1"
+msgid "Services and daemons perform certain tasks on your device."
 msgstr ""
 "Services và daemons tiến hành nhưng công đoạn nhất định trên công cụ của bạn"
 
 #. Most of them are network servers, that offer a certain service for your device or network like shell access, serving webpages like <abbr title=\"Lua Configuration Interface\">LuCI</abbr>, doing mesh routing, sending e-mails, ...
 #: i18n/english/luasrc/i18n/admin-core.en.lua:161
-msgid "a_srv_services2"
+msgid "Most of them are network servers, that offer a certain service for your device or network like shell access, serving webpages like <abbr title=\"Lua Configuration Interface\">LuCI</abbr>, doing mesh routing, sending e-mails, ..."
 msgstr ""
 "Đa số các mạng server mà cung cấp một service nhất định cho công cụ của bạn "
 "hoặc mạng như shell access, phục vụ các trang web như <abbr title=\"Giao diện "
@@ -873,87 +873,87 @@ msgstr ""
 
 #. A small webserver which can be used to serve <abbr title=\"Lua Configuration Interface\">LuCI</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:162
-msgid "a_srv_http1"
+msgid "A small webserver which can be used to serve <abbr title=\"Lua Configuration Interface\">LuCI</abbr>."
 msgstr ""
 "Một webserver nhỏ  có thể dùng để phục vụ <abbr title=\"Giao diện cấu hình "
 "Lua\">LuCI</abbr>."
 
 #. Authentication Realm
 #: i18n/english/luasrc/i18n/admin-core.en.lua:163
-msgid "a_srv_http_authrealm"
+msgid "Authentication Realm"
 msgstr "Realm xác định"
 
 #. The realm which will be displayed at the authentication prompt for protected pages.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:164
-msgid "a_srv_http_authrealm1"
+msgid "The realm which will be displayed at the authentication prompt for protected pages."
 msgstr ""
 "Realm đó sẽ được hiển thị tại dấu nhắc xác thực cho các trang web được bảo "
 "vệ."
 
 #. defaults to <code>/etc/httpd.conf</code>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:165
-msgid "a_srv_http_config1"
+msgid "defaults to <code>/etc/httpd.conf</code>"
 msgstr "Mặc định tới <code>/etc/httpd.conf</code>"
 
 #. Document root
 #: i18n/english/luasrc/i18n/admin-core.en.lua:166
-msgid "a_srv_http_root"
+msgid "Document root"
 msgstr "Gốc tài liệu "
 
 #. Enable Keep-Alive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:167
-msgid "a_srv_http_keepalive"
+msgid "Enable Keep-Alive"
 msgstr "Kích hoạt Keep-Alive"
 
 #. Connection timeout
 #: i18n/english/luasrc/i18n/admin-core.en.lua:168
-msgid "a_srv_http_timeout"
+msgid "Connection timeout"
 msgstr "Kết nối dừng"
 
 #. Plugin path
 #: i18n/english/luasrc/i18n/admin-core.en.lua:169
-msgid "a_srv_http_path"
+msgid "Plugin path"
 msgstr "Đường dẫn Plugin"
 
 #. A lightweight HTTP/1.1 webserver written in C and Lua designed to serve LuCI
 #: i18n/english/luasrc/i18n/admin-core.en.lua:170
-msgid "a_srv_lucittpd"
+msgid "A lightweight HTTP/1.1 webserver written in C and Lua designed to serve LuCI"
 msgstr ""
 "Một lightưeight HTTP/1.1 webserver viết bằng C và Lúa được thiết kế để phục "
 "vụ LuCI"
 
 #. Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:171
-msgid "a_srv_dropbear1"
+msgid "Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
 msgstr ""
 "Dropbear cung cấp <abbr title=\"Secure Shell\">SSH</abbr> mạng lưới shell truy "
 "cập và một <abbr title=\"Secure Copy\">SCP</abbr> server tích hợp"
 
 #. Password authentication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:172
-msgid "a_srv_d_pwauth"
+msgid "Password authentication"
 msgstr "Xác thực mật mã"
 
 #. Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:173
-msgid "a_srv_d_pwauth1"
+msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
 msgstr "Cho phép <abbr title=\"Secure Shell\">SSH</abbr> xác thực mật mã"
 
 #. Channel
 #: i18n/english/luasrc/i18n/admin-core.en.lua:174
-msgid "a_w_channel"
+msgid "Channel"
 msgstr "Kênh"
 
 #. On this pages you can find configuration options for <abbr title=\"Wireless Local Area Network\">WLAN</abbr> based wireless networks.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:175
-msgid "a_w_wifi1"
+msgid "On this pages you can find configuration options for <abbr title=\"Wireless Local Area Network\">WLAN</abbr> based wireless networks."
 msgstr ""
 "Trên những trang này bạn có thể tìm thấy những lựa chọn cấu hình cho <abbr "
 "title=\"Mạng không dây địa phương\">WLAN</abbr> dựa trên mạng không dây."
 
 #. You can easily integrate your 802.11a/b/g/n-devices into your physical network and use the virtual adapter support to build wireless repeaters or offer several networks with one device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:176
-msgid "a_w_wifi2"
+msgid "You can easily integrate your 802.11a/b/g/n-devices into your physical network and use the virtual adapter support to build wireless repeaters or offer several networks with one device."
 msgstr ""
 "Bạn có thể dễ dàng tích hợp cộng cụ 802.11a/b/g/n- vào mạng lưới vật lý và "
 "sử dụng bộ chuyển đổi ảo để hỗ trợ xây dựng bộ lặp không dây hoặc cung cấp "
@@ -961,7 +961,7 @@ msgstr ""
 
 #. There is support for Managed, Client, Ad-Hoc and <abbr title=\"Wireless Distribution System\">WDS</abbr> operating modes as well as <abbr title=\"Wi-Fi Protected Access\">WPA</abbr> and <abbr title=\"Wi-Fi Protected Access 2\">WPA2</abbr> encryption for secure communnication.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:177
-msgid "a_w_wifi3"
+msgid "There is support for Managed, Client, Ad-Hoc and <abbr title=\"Wireless Distribution System\">WDS</abbr> operating modes as well as <abbr title=\"Wi-Fi Protected Access\">WPA</abbr> and <abbr title=\"Wi-Fi Protected Access 2\">WPA2</abbr> encryption for secure communnication."
 msgstr ""
 "Có hỗ trợ cho quản lí, đối tượng, Ad-Hoc và <abbr title=\"Hệ thống phân phối "
 "không dây\">WDS</abbr> chế độ hoạt động cũng như <abbr title=\"Wi-Fi Bảo Vệ "
@@ -970,42 +970,42 @@ msgstr ""
 
 #. Here you can configure installed wifi devices.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:178
-msgid "a_w_devices1"
+msgid "Here you can configure installed wifi devices."
 msgstr "Ở đây bạn có thể định cấu hình của công cụ wifi được cài đặt."
 
 #. Transmit Antenna
 #: i18n/english/luasrc/i18n/admin-core.en.lua:179
-msgid "a_w_txantenna"
+msgid "Transmit Antenna"
 msgstr "Truyền tải Antenna"
 
 #. Receive Antenna
 #: i18n/english/luasrc/i18n/admin-core.en.lua:180
-msgid "a_w_rxantenna"
+msgid "Receive Antenna"
 msgstr "Nhận Antenna"
 
 #. Distance to furthest station (in meter)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:181
-msgid "a_w_distance1"
+msgid "Distance to furthest station (in meter)"
 msgstr "Khoảng cách đến trạm xa nhất (in meter)"
 
 #. Diversity
 #: i18n/english/luasrc/i18n/admin-core.en.lua:182
-msgid "a_w_diversity"
+msgid "Diversity"
 msgstr "Tính đa dạng"
 
 #. Country Code
 #: i18n/english/luasrc/i18n/admin-core.en.lua:183
-msgid "a_w_countrycode"
+msgid "Country Code"
 msgstr "Mã quốc gia"
 
 #. Connection Limit
 #: i18n/english/luasrc/i18n/admin-core.en.lua:184
-msgid "a_w_connlimit"
+msgid "Connection Limit"
 msgstr "Giới hạn kết nối"
 
 #. You can run several wifi networks with one device. Be aware that there are certain hardware and driverspecific restrictions. Normally you can operate 1 Ad-Hoc or up to 3 Master-Mode and 1 Client-Mode network simultaneously.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:185
-msgid "a_w_networks1"
+msgid "You can run several wifi networks with one device. Be aware that there are certain hardware and driverspecific restrictions. Normally you can operate 1 Ad-Hoc or up to 3 Master-Mode and 1 Client-Mode network simultaneously."
 msgstr ""
 "Bạn có thể chạy nhiều mạng wifi với một công cụ. Hãy chú ý rằng một số phần "
 "cứng và driverspecific bị hạn chế. Thông thường, bạn có thể vận hành 1 Ad-"
@@ -1013,94 +1013,94 @@ msgstr ""
 
 #. Network Name (<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:186
-msgid "a_w_netid"
+msgid "Network Name (<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>)"
 msgstr "Tên mạng (<abbr title=\"Mở rộng dịch vụ đặt Identifier\">ESSID</abbr>)"
 
 #. Add the Wifi network to physical network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:187
-msgid "a_w_network1"
+msgid "Add the Wifi network to physical network"
 msgstr "Thêm mạng Wifi vào màng vật lý"
 
 #.  - Create new Network - 
 #: i18n/english/luasrc/i18n/admin-core.en.lua:188
-msgid "a_w_netmanual"
+msgid " - Create new Network - "
 msgstr ""
 "<span class=\"translation-space\"> </span>\n"
 "- Tạo mạng mới -<span class=\"translation-space\"> </span>\n"
 
 #. Transmit Power
 #: i18n/english/luasrc/i18n/admin-core.en.lua:189
-msgid "a_w_txpwr"
+msgid "Transmit Power"
 msgstr "Truyền tải năng lượng"
 
 #. Broadcom Frameburst
 #: i18n/english/luasrc/i18n/admin-core.en.lua:190
-msgid "a_w_brcmburst"
+msgid "Broadcom Frameburst"
 msgstr "Broadcom Frameburst"
 
 #. Atheros Frameburst
 #: i18n/english/luasrc/i18n/admin-core.en.lua:191
-msgid "a_w_athburst"
+msgid "Atheros Frameburst"
 msgstr "Atheros Frameburst"
 
 #. RadiusServer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:192
-msgid "a_w_radiussrv"
+msgid "RadiusServer"
 msgstr "RadiusServer"
 
 #. Radius-Port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:193
-msgid "a_w_radiusport"
+msgid "Radius-Port"
 msgstr "Radius-Port"
 
 #. AP-Isolation
 #: i18n/english/luasrc/i18n/admin-core.en.lua:194
-msgid "a_w_apisolation"
+msgid "AP-Isolation"
 msgstr "AP-Isolation"
 
 #. Prevents Client to Client communication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:195
-msgid "a_w_apisolation1"
+msgid "Prevents Client to Client communication"
 msgstr "Ngăn chặn giao tiếp giữa client-và-client"
 
 #. Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:196
-msgid "a_w_hideessid"
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "Giấu <abbr title=\"Chế độ mở rộng đặt Identifier\">ESSID</abbr>"
 
 #. Access Point
 #: i18n/english/luasrc/i18n/admin-core.en.lua:197
-msgid "a_w_ap"
+msgid "Access Point"
 msgstr "Điểm truy cập"
 
 #. Ad-Hoc
 #: i18n/english/luasrc/i18n/admin-core.en.lua:198
-msgid "a_w_adhoc"
+msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
 #. Pseudo Ad-Hoc (ahdemo)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:199
-msgid "a_w_ahdemo"
+msgid "Pseudo Ad-Hoc (ahdemo)"
 msgstr "Pseudo Ad-Hoc (ahdemo)"
 
 #. Client
 #: i18n/english/luasrc/i18n/admin-core.en.lua:200
-msgid "a_w_client"
+msgid "Client"
 msgstr "Khách hàng"
 
 #. WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:201
-msgid "a_w_wds"
+msgid "WDS"
 msgstr "WDS"
 
 #. Monitor
 #: i18n/english/luasrc/i18n/admin-core.en.lua:202
-msgid "a_w_monitor"
+msgid "Monitor"
 msgstr "Monitor"
 
 #. Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> firewalls
 #: i18n/english/luasrc/i18n/admin-core.en.lua:203
-msgid "dhcp_dnsmasq_desc"
+msgid "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> firewalls"
 msgstr ""
 "Dnsmasq là một phối hợp  <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr>-Server and <abbr title=\"Domain Name "
@@ -1109,248 +1109,248 @@ msgstr ""
 
 #. Domain required
 #: i18n/english/luasrc/i18n/admin-core.en.lua:204
-msgid "dhcp_dnsmasq_domainneeded"
+msgid "Domain required"
 msgstr "Domain yêu cầu"
 
 #. Don&#39;t forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without <abbr title=\"Domain Name System\">DNS</abbr>-Name
 #: i18n/english/luasrc/i18n/admin-core.en.lua:205
-msgid "dhcp_dnsmasq_domainneeded_desc"
+msgid "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without <abbr title=\"Domain Name System\">DNS</abbr>-Name"
 msgstr ""
 "Don&amp;#39;t chuyển tiếp <abbr title=\"Hệ thống tên miền\">DNS</abbr>-Yêu cầu "
 "không cần <abbr title=\"Hệ thống tên miền\">DNS</abbr>-Tên"
 
 #. Authoritative
 #: i18n/english/luasrc/i18n/admin-core.en.lua:206
-msgid "dhcp_dnsmasq_authoritative"
+msgid "Authoritative"
 msgstr "Authoritative"
 
 #. This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> in the local network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:207
-msgid "dhcp_dnsmasq_authoritative_desc"
+msgid "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> in the local network"
 msgstr ""
 "Đây là <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> duy "
 "nhất trong mạng địa phương. "
 
 #. Filter private
 #: i18n/english/luasrc/i18n/admin-core.en.lua:208
-msgid "dhcp_dnsmasq_boguspriv"
+msgid "Filter private"
 msgstr "Filter private"
 
 #. Don&#39;t forward reverse lookups for local networks
 #: i18n/english/luasrc/i18n/admin-core.en.lua:209
-msgid "dhcp_dnsmasq_boguspriv_desc"
+msgid "Don't forward reverse lookups for local networks"
 msgstr "Don&amp;#39;t chuyển tiếp lookups đảo ngược cho các mạng địa phương"
 
 #. Filter useless
 #: i18n/english/luasrc/i18n/admin-core.en.lua:210
-msgid "dhcp_dnsmasq_filterwin2k"
+msgid "Filter useless"
 msgstr "Lọc không hữu dụng"
 
 #. filter useless <abbr title=\"Domain Name System\">DNS</abbr>-queries of Windows-systems
 #: i18n/english/luasrc/i18n/admin-core.en.lua:211
-msgid "dhcp_dnsmasq_filterwin2k_desc"
+msgid "filter useless <abbr title=\"Domain Name System\">DNS</abbr>-queries of Windows-systems"
 msgstr ""
 "lọc không hữu dụng <abbr title=\"Hệ thống tên miền\">DNS</abbr>-các tra vấn "
 "của hệ thống Windows"
 
 #. Localise queries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:212
-msgid "dhcp_dnsmasq_localisequeries"
+msgid "Localise queries"
 msgstr "Tra vấn địa phương"
 
 #. localises the hostname depending on its subnet
 #: i18n/english/luasrc/i18n/admin-core.en.lua:213
-msgid "dhcp_dnsmasq_localisequeries_desc"
+msgid "localises the hostname depending on its subnet"
 msgstr "Địa phương hóa các hostname phụ thuộc vào subnet"
 
 #. Local Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:214
-msgid "dhcp_dnsmasq_local"
+msgid "Local Server"
 msgstr "Server địa phương"
 
 #. Local Domain
 #: i18n/english/luasrc/i18n/admin-core.en.lua:215
-msgid "dhcp_dnsmasq_domain"
+msgid "Local Domain"
 msgstr "Domain địa phương"
 
 #. Expand Hosts
 #: i18n/english/luasrc/i18n/admin-core.en.lua:216
-msgid "dhcp_dnsmasq_expandhosts"
+msgid "Expand Hosts"
 msgstr "Mở rộng Hosts"
 
 #. adds domain names to hostentries in the resolv file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:217
-msgid "dhcp_dnsmasq_expandhosts_desc"
+msgid "adds domain names to hostentries in the resolv file"
 msgstr "Thêm tên miền vào hostentries trong tập tin resolv "
 
 #. don&#39;t cache unknown
 #: i18n/english/luasrc/i18n/admin-core.en.lua:218
-msgid "dhcp_dnsmasq_nonegcache"
+msgid "don't cache unknown"
 msgstr "don&amp;#39;t cache unknown"
 
 #. prevents caching of negative <abbr title=\"Domain Name System\">DNS</abbr>-replies
 #: i18n/english/luasrc/i18n/admin-core.en.lua:219
-msgid "dhcp_dnsmasq_nonegcache_desc"
+msgid "prevents caching of negative <abbr title=\"Domain Name System\">DNS</abbr>-replies"
 msgstr ""
 "Ngăn ngừa tiêu cực trong bộ nhớ đệm <abbr title=\"Hệ thống tên "
 "miền\">DNS</abbr>-trả lời"
 
 #. Use <code>/etc/ethers</code>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:220
-msgid "dhcp_dnsmasq_readethers"
+msgid "Use <code>/etc/ethers</code>"
 msgstr "Dùng <code>/etc/ethers</code>"
 
 #. Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:221
-msgid "dhcp_dnsmasq_readethers_desc"
+msgid "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server"
 msgstr ""
 "Đọc <code>/etc/ethers</code> để định cấu hình <abbr title=\"Dynamic Host "
 "Configuration Protocol\">DHCP</abbr>-Server"
 
 #. Leasefile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:222
-msgid "dhcp_dnsmasq_leasefile"
+msgid "Leasefile"
 msgstr "Leasefile"
 
 #. file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-leases will be stored
 #: i18n/english/luasrc/i18n/admin-core.en.lua:223
-msgid "dhcp_dnsmasq_leasefile_desc"
+msgid "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-leases will be stored"
 msgstr ""
 "Tập tin được cho <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr>-leases sẽ được lưu trữ"
 
 #. Resolvfile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:224
-msgid "dhcp_dnsmasq_resolvfile"
+msgid "Resolvfile"
 msgstr "Tập tin Resolv"
 
 #. local <abbr title=\"Domain Name System\">DNS</abbr> file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:225
-msgid "dhcp_dnsmasq_resolvfile_desc"
+msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "Tập tin <abbr title=\"Domain Name System\">DNS</abbr> địa phương"
 
 #. Ignore <code>/etc/hosts</code>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:226
-msgid "dhcp_dnsmasq_nohosts"
+msgid "Ignore <code>/etc/hosts</code>"
 msgstr "Lờ đi <code>/etc/hosts</code>"
 
 #. Strict order
 #: i18n/english/luasrc/i18n/admin-core.en.lua:227
-msgid "dhcp_dnsmasq_strictorder"
+msgid "Strict order"
 msgstr "Yêu cầu nghiêm ngặt"
 
 #. <abbr title=\"Domain Name System\">DNS</abbr>-Server will be queried in the order of the resolvfile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:228
-msgid "dhcp_dnsmasq_strictorder_desc"
+msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Server will be queried in the order of the resolvfile"
 msgstr ""
 "<abbr title=\"Domain Name System\">DNS</abbr>-Server sẽ bị tra vấn theo thứ tự "
 "của tập tin resolv. "
 
 #. Log queries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:229
-msgid "dhcp_dnsmasq_logqueries"
+msgid "Log queries"
 msgstr "Bản ghi tra vấn"
 
 #. Ignore resolve file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:230
-msgid "dhcp_dnsmasq_noresolv"
+msgid "Ignore resolve file"
 msgstr "Lờ đi tập tin resolve"
 
 #. concurrent queries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:231
-msgid "dhcp_dnsmasq_dnsforwardmax"
+msgid "concurrent queries"
 msgstr "Đồng truy vấn"
 
 #. <abbr title=\"Domain Name System\">DNS</abbr>-Port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:232
-msgid "dhcp_dnsmasq_port"
+msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Port"
 msgstr "<abbr title=\"Domain Name System\">DNS</abbr>-Cổng"
 
 #. <abbr title=\"maximal\">max.</abbr> <abbr title=\"Extension Mechanisms for Domain Name System\">EDNS0</abbr> paket size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:233
-msgid "dhcp_dnsmasq_ednspacket_max"
+msgid "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Extension Mechanisms for Domain Name System\">EDNS0</abbr> paket size"
 msgstr ""
 "<abbr title=\"tối đal\">max.</abbr> <abbr title=\"Mở rộng cơ chế cho hệ thống "
 "tên miền\">EDNS0</abbr> dung lượng gói tin"
 
 #. <abbr title=\"maximal\">max.</abbr> <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:234
-msgid "dhcp_dnsmasq_dhcpleasemax"
+msgid "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Leases"
 msgstr ""
 "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr>-Leases"
 
 #. additional hostfile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:235
-msgid "dhcp_dnsmasq_addnhosts"
+msgid "additional hostfile"
 msgstr "Tập tin host bổ sung"
 
 #. query port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:236
-msgid "dhcp_dnsmasq_queryport"
+msgid "query port"
 msgstr "cổng truy vấn"
 
 #. Enable TFTP-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:237
-msgid "dhcp_dnsmasq_enabletftp"
+msgid "Enable TFTP-Server"
 msgstr "Kích hoạt TFTP-Server"
 
 #. TFTP-Server Root
 #: i18n/english/luasrc/i18n/admin-core.en.lua:238
-msgid "dhcp_dnsmasq_tftproot"
+msgid "TFTP-Server Root"
 msgstr "Gốc TFTP-Server "
 
 #. Network Boot Image
 #: i18n/english/luasrc/i18n/admin-core.en.lua:239
-msgid "dhcp_dnsmasq_dhcpboot"
+msgid "Network Boot Image"
 msgstr "Hình ảnh khởi động mạng lưới"
 
 #. Switch
 #: i18n/english/luasrc/i18n/admin-core.en.lua:240
-msgid "a_n_switch"
+msgid "Switch"
 msgstr "chuyển đổi"
 
 #. Active Connections
 #: i18n/english/luasrc/i18n/admin-core.en.lua:241
-msgid "a_n_conntrack"
+msgid "Active Connections"
 msgstr "kết nối đang hoạt động"
 
 #. This page gives an overview over currently active network connections.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:242
-msgid "a_n_conntrack_desc"
+msgid "This page gives an overview over currently active network connections."
 msgstr ""
 "Trang này cung cấp một tổng quan về đang hoạt động kết nối mạng hiện tại."
 
 #. Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:243
-msgid "a_n_routes"
+msgid "Routes"
 msgstr "Tuyến"
 
 #. IPv4 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:244
-msgid "a_n_routes4"
+msgid "IPv4 Routes"
 msgstr "Tuyến IPv4"
 
 #. IPv6 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:245
-msgid "a_n_routes6"
+msgid "IPv6 Routes"
 msgstr "Tuyến IPv6"
 
 #. In this area you find all network-related settings.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:246
-msgid "a_network1"
+msgid "In this area you find all network-related settings."
 msgstr "Trong vùng này bạn tìm thấy tât cả cài đặt liên quan mạng"
 
 #. On most routers the network switch can be freely configured and splitted up into several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:247
-msgid "a_network2"
+msgid "On most routers the network switch can be freely configured and splitted up into several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s."
 msgstr ""
 "Trên đa số bộ định tuyến bộ chuyển đổi mạng có thể tùy ý định cấu hình và "
 "tách ra thành nhiều <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s."
 
 #. Interfaces and <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> / <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Settings allow a custom organisation of the network and connections to other networks like the internet.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:248
-msgid "a_network3"
+msgid "Interfaces and <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> / <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Settings allow a custom organisation of the network and connections to other networks like the internet."
 msgstr ""
 "Giao diện và <abbr title=\"Point-to-Point Protocol over "
 "Ethernet\">PPPoE</abbr> / <abbr title=\"Point-to-Point Tunneling "
@@ -1359,21 +1359,21 @@ msgstr ""
 
 #. With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> devices in your local network can be automatically configured for network communication.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:249
-msgid "a_network4"
+msgid "With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> devices in your local network can be automatically configured for network communication."
 msgstr ""
 "Với <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> cộng cụ "
 "trong network địa phương có thể tự định cấu hình cho giao tiếp network. "
 
 #. Firewall and portforwarding can be used to secure your network while providing services to external networks.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:250
-msgid "a_network5"
+msgid "Firewall and portforwarding can be used to secure your network while providing services to external networks."
 msgstr ""
 "Firewall và portforwarding có thể được dùng để bảo vệ network của bạn trong "
 "khi cung cấp dịch vụ tới những network bên ngoài. "
 
 #. The network ports on your router can be combined to several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s in which computers can communicate directly with each other. <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s are often used to separate different network segments. Often there is by default one Uplink port for a connection to the next greater network like the internet and other ports for a local network.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:251
-msgid "a_n_switch1"
+msgid "The network ports on your router can be combined to several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s in which computers can communicate directly with each other. <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s are often used to separate different network segments. Often there is by default one Uplink port for a connection to the next greater network like the internet and other ports for a local network."
 msgstr ""
 "Cổng network trên bộ định tuyến có thể phối hợp với nhiều <abbr "
 "title=\"Virtual Local Area Network\">VLAN</abbr>s làm máy tính tự giao tiếp "
@@ -1384,7 +1384,7 @@ msgstr ""
 
 #. Ports belonging to a <abbr title=\"Virtual Local Area Network\">VLAN</abbr> are separated with spaces. The port with the highest number (usually 5) is oftern the connection to the internal network interface of the router. On devices with 5 ports often the one with the lowest number (0) is the predefined Uplink port.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:252
-msgid "network_switch_desc"
+msgid "Ports belonging to a <abbr title=\"Virtual Local Area Network\">VLAN</abbr> are separated with spaces. The port with the highest number (usually 5) is oftern the connection to the internal network interface of the router. On devices with 5 ports often the one with the lowest number (0) is the predefined Uplink port."
 msgstr ""
 "Cổng thuộc về một <abbr title=\"Virtual Local Area Network\">VLAN</abbr> được "
 "phân tách với những khoảng trống. Cổng với số lớn nhất (thường là 5) kết nối "
@@ -1393,7 +1393,7 @@ msgstr ""
 
 #. On this page you can configure the network interfaces. You can bridge several interfaces by ticking the &quot;bridge interfaces&quot; field and enter the names of several network interfaces separated by spaces. You can also use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation <samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: <samp>eth0.1</samp>).
 #: i18n/english/luasrc/i18n/admin-core.en.lua:253
-msgid "a_n_ifaces1"
+msgid "On this page you can configure the network interfaces. You can bridge several interfaces by ticking the \"bridge interfaces\" field and enter the names of several network interfaces separated by spaces. You can also use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation <samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: <samp>eth0.1</samp>)."
 msgstr ""
 "Trên trang này bạn có thể định cấu hình giao diện network. Bạn có thể bắt "
 "cầu nhiều giao diện bằng cách đánh dấu &amp;quot;bridge interfaces&amp;quot; "
@@ -1404,25 +1404,25 @@ msgstr ""
 
 #. Bridge interfaces
 #: i18n/english/luasrc/i18n/admin-core.en.lua:254
-msgid "a_n_i_bridge"
+msgid "Bridge interfaces"
 msgstr "Giao diện cầu nối"
 
 #. creates a bridge over specified interface(s)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:255
-msgid "a_n_i_bridge1"
+msgid "creates a bridge over specified interface(s)"
 msgstr "tạo một cầu nối trên một giao diện được chỉ định"
 
 #. Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>
-msgid "a_n_i_stp"
+msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 msgstr "Kích hoạt <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 
 #. Enables the Spanning Tree Protocol on this bridge
-msgid "a_n_i_stp1"
+msgid "Enables the Spanning Tree Protocol on this bridge"
 msgstr "Kích hoạt Spanning Tree Protocol trên cầu nối này"
 
 #. With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> network members can automatically receive their network settings (<abbr title=\"Internet Protocol\">IP</abbr>-address, netmask, <abbr title=\"Domain Name System\">DNS</abbr>-server, ...).
 #: i18n/english/luasrc/i18n/admin-core.en.lua:256
-msgid "dhcp_desc"
+msgid "With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> network members can automatically receive their network settings (<abbr title=\"Internet Protocol\">IP</abbr>-address, netmask, <abbr title=\"Domain Name System\">DNS</abbr>-server, ...)."
 msgstr ""
 "Với <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> thành viên "
 "network có thể tự động nhận cài đặt mạng (<abbr title=\"Internet "
@@ -1431,80 +1431,80 @@ msgstr ""
 
 #. Leasetime
 #: i18n/english/luasrc/i18n/admin-core.en.lua:257
-msgid "dhcp_dhcp_leasetime"
+msgid "Leasetime"
 msgstr "Leasetime"
 
 #. Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:258
-msgid "dhcp_dhcp_dynamicdhcp"
+msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 msgstr "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 
 #. Ignore interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:259
-msgid "dhcp_dhcp_ignore"
+msgid "Ignore interface"
 msgstr "Lờ đi giao diện"
 
 #. disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for this interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:260
-msgid "dhcp_dhcp_ignore_desc"
+msgid "disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for this interface"
 msgstr ""
 "Vô hiệu hóa <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
 "cho giao diện này"
 
 #. Force
 #: i18n/english/luasrc/i18n/admin-core.en.lua:261
-msgid "dhcp_dhcp_force"
+msgid "Force"
 msgstr "Force"
 
 #. first address (last octet)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:262
-msgid "dhcp_dhcp_start_desc"
+msgid "first address (last octet)"
 msgstr "Địa chỉ đầu tiên (last oclet)"
 
 #. number of leased addresses -1
 #: i18n/english/luasrc/i18n/admin-core.en.lua:263
-msgid "dhcp_dhcp_limit_desc"
+msgid "number of leased addresses -1"
 msgstr "Số của leased addresses -1"
 
 #. DHCP-Options
 #: i18n/english/luasrc/i18n/admin-core.en.lua:264
-msgid "dhcp_dhcp_dhcpoption"
+msgid "DHCP-Options"
 msgstr "Tùy chọn DHCP"
 
 #. See &quot;dnsmasq --help dhcp&quot; for a list of available options.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:265
-msgid "dhcp_dhcp_dhcpoption_desc"
+msgid "See \"dnsmasq --help dhcp\" for a list of available options."
 msgstr ""
 "See &amp;quot;dnsmasq --help dhcp&amp;quot; cho một list của những tùy chọn"
 
 #. Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:266
-msgid "dhcp_leases"
+msgid "Leases"
 msgstr "Leases"
 
 #. Static Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:267
-msgid "luci_ethers"
+msgid "Static Leases"
 msgstr "Thống kê leases"
 
 #. Leasetime remaining
 #: i18n/english/luasrc/i18n/admin-core.en.lua:268
-msgid "dhcp_timeremain"
+msgid "Leasetime remaining"
 msgstr "Leasetime còn lại"
 
 #. Active Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:269
-msgid "dhcp_leases_active"
+msgid "Active Leases"
 msgstr "Leases hoạt động"
 
 #. Point-to-Point Connections
 #: i18n/english/luasrc/i18n/admin-core.en.lua:270
-msgid "a_n_ptp"
+msgid "Point-to-Point Connections"
 msgstr "Point-to-Point kết nối"
 
 #. Point-to-Point connections with <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> or <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr> are often used to connect a device over <abbr title=\"Digital Subscriber Line\">DSL</abbr> or similar technologies to an internet access point.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:271
-msgid "a_n_ptp1"
+msgid "Point-to-Point connections with <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> or <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr> are often used to connect a device over <abbr title=\"Digital Subscriber Line\">DSL</abbr> or similar technologies to an internet access point."
 msgstr ""
 "Point-to-Point kết nối với <abbr title=\"Point-to-Point Protocol over "
 "Ethernet\">PPPoE</abbr> or <abbr title=\"Point-to-Point Tunneling "
@@ -1514,7 +1514,7 @@ msgstr ""
 
 #. You need to install &quot;comgt&quot; for UMTS/GPRS, &quot;ppp-mod-pppoe&quot; for PPPoE, &quot;ppp-mod-pppoa&quot; for PPPoA or &quot;pptp&quot; for PPtP support
 #: i18n/english/luasrc/i18n/admin-core.en.lua:272
-msgid "network_interface_prereq"
+msgid "You need to install \"comgt\" for UMTS/GPRS, \"ppp-mod-pppoe\" for PPPoE, \"ppp-mod-pppoa\" for PPPoA or \"pptp\" for PPtP support"
 msgstr ""
 "Bạn cần cài đặt &amp;quot;comgt&amp;quot; for UMTS/GPRS, &amp;quot;ppp-mod-"
 "pppoe&amp;quot; for PPPoE, &amp;quot;ppp-mod-pppoa&amp;quot; for PPPoA or "
@@ -1522,706 +1522,706 @@ msgstr ""
 
 #. You need to install &quot;ppp-mod-pppoe&quot; for PPPoE or &quot;pptp&quot; for PPtP support
 #: i18n/english/luasrc/i18n/admin-core.en.lua:273
-msgid "network_interface_prereq_mini"
+msgid "You need to install \"ppp-mod-pppoe\" for PPPoE or \"pptp\" for PPtP support"
 msgstr ""
 "Bạn cần cài đặt &amp;quot;ppp-mod-pppoe&amp;quot; for PPPoE or "
 "&amp;quot;pptp&amp;quot; cho hỗ trợ PPtP "
 
 #. <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:274
-msgid "network_interface_server"
+msgid "<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"
 msgstr "<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"
 
 #. Automatic Disconnect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:275
-msgid "network_interface_demand"
+msgid "Automatic Disconnect"
 msgstr "Tự động ngừng kết nối"
 
 #. Time (in seconds) after which an unused connection will be closed
 #: i18n/english/luasrc/i18n/admin-core.en.lua:276
-msgid "network_interface_demand_desc"
+msgid "Time (in seconds) after which an unused connection will be closed"
 msgstr "Thời gian (giây) sau khi một kết nối không sử dụng sẽ bị đóng"
 
 #. Keep-Alive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:277
-msgid "network_interface_keepalive"
+msgid "Keep-Alive"
 msgstr "Giữ-alive"
 
 #. Number of failed connection tests to initiate automatic reconnect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:278
-msgid "network_interface_keepalive_desc"
+msgid "Number of failed connection tests to initiate automatic reconnect"
 msgstr "Kiểm tra số lượng kết nối không thành công để tự động kết nối lại. "
 
 #. Modem device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:279
-msgid "network_interface_device"
+msgid "Modem device"
 msgstr "Thiết bị modem"
 
 #. The device node of your modem, e.g. /dev/ttyUSB0
 #: i18n/english/luasrc/i18n/admin-core.en.lua:280
-msgid "network_interface_device_desc"
+msgid "The device node of your modem, e.g. /dev/ttyUSB0"
 msgstr "Thiết bị node của modem, e.g. /dev/ttyUSB0"
 
 #. Replace default route
 #: i18n/english/luasrc/i18n/admin-core.en.lua:281
-msgid "network_interface_defaultroute"
+msgid "Replace default route"
 msgstr "Thay thế route mặc định"
 
 #. Let pppd replace the current default route to use the PPP interface after successful connect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:282
-msgid "network_interface_defaultroute_desc"
+msgid "Let pppd replace the current default route to use the PPP interface after successful connect"
 msgstr ""
 "Để pppd thay thế route mặc định hiện tại để dùng giao diện PPP sau khi kết "
 "nối thành công"
 
 #. Use peer DNS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:283
-msgid "network_interface_peerdns"
+msgid "Use peer DNS"
 msgstr "Dùng peer DNS"
 
 #. Configure the local DNS server to use the name servers adverticed by the PPP peer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:284
-msgid "network_interface_peerdns_desc"
+msgid "Configure the local DNS server to use the name servers adverticed by the PPP peer"
 msgstr ""
 "Định cấu hình DNS server địa phương để dùng tên servers adverticed bởi PPP "
 "peer"
 
 #. Enable IPv6 on PPP link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:285
-msgid "network_interface_ipv6"
+msgid "Enable IPv6 on PPP link"
 msgstr "Kích hoạt IPv6 on PPP link"
 
 #. Connect script
 #: i18n/english/luasrc/i18n/admin-core.en.lua:286
-msgid "network_interface_connect"
+msgid "Connect script"
 msgstr "Kết nối script"
 
 #. Let pppd run this script after establishing the PPP link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:287
-msgid "network_interface_connect_desc"
+msgid "Let pppd run this script after establishing the PPP link"
 msgstr "Để pppd chạy script này sau khi thành lập PPP link"
 
 #. Disconnect script
 #: i18n/english/luasrc/i18n/admin-core.en.lua:288
-msgid "network_interface_disconnect"
+msgid "Disconnect script"
 msgstr "Ngừng script"
 
 #. Let pppd run this script before tearing down the PPP link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:289
-msgid "network_interface_disconnect_desc"
+msgid "Let pppd run this script before tearing down the PPP link"
 msgstr "Để pppd chạy trên script trước khi phá vỡ PPP link"
 
 #. Additional pppd options
 #: i18n/english/luasrc/i18n/admin-core.en.lua:290
-msgid "network_interface_pppd_options"
+msgid "Additional pppd options"
 msgstr "Tùy chọn pppd bổ sung"
 
 #. Specify additional command line arguments for pppd here
 #: i18n/english/luasrc/i18n/admin-core.en.lua:291
-msgid "network_interface_pppd_options_desc"
+msgid "Specify additional command line arguments for pppd here"
 msgstr "Chỉ định những dòng lệnh tranh cãi cho pppd ở đây"
 
 #. Access point (APN)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:292
-msgid "network_interface_apn"
+msgid "Access point (APN)"
 msgstr "Điểm truy cập (APN)"
 
 #. PIN code
 #: i18n/english/luasrc/i18n/admin-core.en.lua:293
-msgid "network_interface_pincode"
+msgid "PIN code"
 msgstr "PIN code"
 
 #. Make sure that you provide the correct pin code here or you might lock your sim card!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:294
-msgid "network_interface_pincode_desc"
+msgid "Make sure that you provide the correct pin code here or you might lock your sim card!"
 msgstr ""
 "Bảo đảm rằng bạn cung cấp pin code chính xác ở đây hoặc sim card của bạn sẽ "
 "bị khóa"
 
 #. Service type
 #: i18n/english/luasrc/i18n/admin-core.en.lua:295
-msgid "network_interface_service"
+msgid "Service type"
 msgstr "Service type"
 
 #. Setup wait time
 #: i18n/english/luasrc/i18n/admin-core.en.lua:296
-msgid "network_interface_maxwait"
+msgid "Setup wait time"
 msgstr "Cài đặt thời gian chờ"
 
 #. Seconds to wait for the modem to become ready before attempting to connect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:297
-msgid "network_interface_maxwait_desc"
+msgid "Seconds to wait for the modem to become ready before attempting to connect"
 msgstr "Giây để chờ cho modem trở nên sẵn sàng trước khi kết nối"
 
 #. PPPoA Encapsulation
 #: i18n/english/luasrc/i18n/admin-core.en.lua:298
-msgid "network_interface_encaps"
+msgid "PPPoA Encapsulation"
 msgstr "PPPoA Encapsulation"
 
 #. Routes specify over which interface and gateway a certain host or network can be reached.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:299
-msgid "a_n_r_routes1"
+msgid "Routes specify over which interface and gateway a certain host or network can be reached."
 msgstr ""
 "Routes chỉ định trên giao diện và cổng một host nhất định hay network được "
 "tiếp cận."
 
 #. Static Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:300
-msgid "a_n_routes_static"
+msgid "Static Routes"
 msgstr "Static Routes"
 
 #. Static IPv4 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:301
-msgid "a_n_routes_static4"
+msgid "Static IPv4 Routes"
 msgstr "Static IPv4 Routes"
 
 #. Static IPv6 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:302
-msgid "a_n_routes_static6"
+msgid "Static IPv6 Routes"
 msgstr "Static IPv6 Routes"
 
 #. Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:303
-msgid "a_n_routes_kernel4"
+msgid "Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes"
 msgstr "Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes"
 
 #. Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:304
-msgid "a_n_routes_kernel6"
+msgid "Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes"
 msgstr "Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes"
 
 #. Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:305
-msgid "a_n_r_target1"
+msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
 msgstr "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
 
 #. <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network (CIDR)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:306
-msgid "a_n_r_target6"
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network (CIDR)"
 msgstr ""
 "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network "
 "(CIDR)"
 
 #. if target is a network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:307
-msgid "a_n_r_netmask1"
+msgid "if target is a network"
 msgstr "Nếu mục tiêu là một network"
 
 #. Internet Connection
 #: i18n/english/luasrc/i18n/admin-core.en.lua:308
-msgid "m_n_inet"
+msgid "Internet Connection"
 msgstr "Kết nối Internet"
 
 #. Local Network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:309
-msgid "m_n_local"
+msgid "Local Network"
 msgstr "Network địa phương"
 
 #. Route
 #: i18n/english/luasrc/i18n/admin-core.en.lua:310
-msgid "m_n_route"
+msgid "Route"
 msgstr "Route"
 
 #. Bridge
 #: i18n/english/luasrc/i18n/admin-core.en.lua:311
-msgid "m_n_brdige"
+msgid "Bridge"
 msgstr "Cấu nối"
 
 #. Provide (Access Point)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:312
-msgid "m_w_ap"
+msgid "Provide (Access Point)"
 msgstr "Cung cấp (Điểm truy cập)"
 
 #. Independent (Ad-Hoc)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:313
-msgid "m_w_adhoc"
+msgid "Independent (Ad-Hoc)"
 msgstr "Độc lập (Ad-Hoc)"
 
 #. Join (Client)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:314
-msgid "m_w_client"
+msgid "Join (Client)"
 msgstr "Tham gia (client)"
 
 #. Distributed (<abbr title=\"Wireless Distribution System\">WDS</abbr>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:315
-msgid "m_w_wds"
+msgid "Distributed (<abbr title=\"Wireless Distribution System\">WDS</abbr>)"
 msgstr "Phân phối (<abbr title=\"Wireless Distribution System\">WDS</abbr>)"
 
 #. Clientmode
 #: i18n/english/luasrc/i18n/admin-core.en.lua:316
-msgid "m_w_clientmode"
+msgid "Clientmode"
 msgstr "Clientmode"
 
 #. System log buffer size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:317
-msgid "system_system_logsize"
+msgid "System log buffer size"
 msgstr "System log buffer size"
 
 #. External system log server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:318
-msgid "system_system_logip"
+msgid "External system log server"
 msgstr "External system log server"
 
 #. Log output level
 #: i18n/english/luasrc/i18n/admin-core.en.lua:319
-msgid "system_system_conloglevel"
+msgid "Log output level"
 msgstr "Log output level"
 
 #. Level of log messages on the console
 #: i18n/english/luasrc/i18n/admin-core.en.lua:320
-msgid "system_system_conloglevel_desc"
+msgid "Level of log messages on the console"
 msgstr "Level của log messages trên console"
 
 #. Processor
 #: i18n/english/luasrc/i18n/admin-core.en.lua:321
-msgid "m_i_processor"
+msgid "Processor"
 msgstr "Bộ xử lý"
 
 #. Memory
 #: i18n/english/luasrc/i18n/admin-core.en.lua:322
-msgid "m_i_memory"
+msgid "Memory"
 msgstr "Bộ nhớ"
 
 #. Local Time
 #: i18n/english/luasrc/i18n/admin-core.en.lua:323
-msgid "m_i_systemtime"
+msgid "Local Time"
 msgstr "Giờ địa phương"
 
 #. Uptime
 #: i18n/english/luasrc/i18n/admin-core.en.lua:324
-msgid "m_i_uptime"
+msgid "Uptime"
 msgstr "Uptime"
 
 #. First leased address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:325
-msgid "m_n_d_firstaddress"
+msgid "First leased address"
 msgstr "Địa chỉ lease đầu tiên"
 
 #. Number of leased addresses
 #: i18n/english/luasrc/i18n/admin-core.en.lua:326
-msgid "m_n_d_numleases"
+msgid "Number of leased addresses"
 msgstr "Số của địa chỉ lease"
 
 #. Routing table
 #: i18n/english/luasrc/i18n/admin-core.en.lua:327
-msgid "routingtable"
+msgid "Routing table"
 msgstr "Routing table"
 
 #. Wifi scan
 #: i18n/english/luasrc/i18n/admin-core.en.lua:328
-msgid "wlanscan"
+msgid "Wifi scan"
 msgstr "Wifi scan"
 
 #. Frequency
 #: i18n/english/luasrc/i18n/admin-core.en.lua:329
-msgid "frequency"
+msgid "Frequency"
 msgstr "Tần số"
 
 #. Power
 #: i18n/english/luasrc/i18n/admin-core.en.lua:330
-msgid "power"
+msgid "Power"
 msgstr "Power"
 
 #. Noise
 #: i18n/english/luasrc/i18n/admin-core.en.lua:331
-msgid "noise"
+msgid "Noise"
 msgstr "Noise"
 
 #. Signal
 #: i18n/english/luasrc/i18n/admin-core.en.lua:332
-msgid "signal"
+msgid "Signal"
 msgstr "Signal"
 
 #. Link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:333
-msgid "link"
+msgid "Link"
 msgstr "Link"
 
 #. <abbr title=\"Fragmentation\">Frag.</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:334
-msgid "frag"
+msgid "<abbr title=\"Fragmentation\">Frag.</abbr>"
 msgstr "<abbr title=\"Fragmentation\">Frag.</abbr>"
 
 #. <abbr title=\"Request To Send\">RTS</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:335
-msgid "rts"
+msgid "<abbr title=\"Request To Send\">RTS</abbr>"
 msgstr "<abbr title=\"Request To Send\">RTS</abbr>"
 
 #. Bitrate
 #: i18n/english/luasrc/i18n/admin-core.en.lua:336
-msgid "bitrate"
+msgid "Bitrate"
 msgstr "Bitrate"
 
 #. automatically reconnect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:337
-msgid "m_n_keepalive"
+msgid "automatically reconnect"
 msgstr "Tự động kết nối lại"
 
 #. disconnect when idle for
 #: i18n/english/luasrc/i18n/admin-core.en.lua:338
-msgid "m_n_dialondemand"
+msgid "disconnect when idle for"
 msgstr "Ngừng kết nối khi idle cho"
 
 #. <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:339
-msgid "m_n_pptp_server"
+msgid "<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"
 msgstr "<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"
 
 #. <abbr title=\"Light Emitting Diode\">LED</abbr> Configuration
 #: i18n/english/luasrc/i18n/admin-core.en.lua:340
-msgid "leds"
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 
 #. Customizes the behaviour of the device <abbr title=\"Light Emitting Diode\">LED</abbr>s if possible.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:341
-msgid "leds_desc"
+msgid "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode\">LED</abbr>s if possible."
 msgstr ""
 "Tùy chỉnh chế độ của thiết bị <abbr title=\"Light Emitting Diode\">LED</abbr>s "
 "nếu có thể."
 
 #. <abbr title=\"Light Emitting Diode\">LED</abbr> Name
 #: i18n/english/luasrc/i18n/admin-core.en.lua:342
-msgid "system_led_name"
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 
 #. <abbr title=\"Light Emitting Diode\">LED</abbr> Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:343
-msgid "system_led_sysfs"
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Device"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> Device"
 
 #. Default state
 #: i18n/english/luasrc/i18n/admin-core.en.lua:344
-msgid "system_led_default"
+msgid "Default state"
 msgstr "Tình trạng mặc định"
 
 #. ticked = on
 #: i18n/english/luasrc/i18n/admin-core.en.lua:345
-msgid "system_led_default_desc"
+msgid "ticked = on"
 msgstr "ticked = on"
 
 #. Trigger
 #: i18n/english/luasrc/i18n/admin-core.en.lua:346
-msgid "system_led_trigger"
+msgid "Trigger"
 msgstr "Trigger"
 
 #. None
 #: i18n/english/luasrc/i18n/admin-core.en.lua:347
-msgid "system_led_trigger_none"
+msgid "None"
 msgstr "None"
 
 #. Default On
 #: i18n/english/luasrc/i18n/admin-core.en.lua:348
-msgid "system_led_trigger_defaulton"
+msgid "Default On"
 msgstr "Mặc định trên"
 
 #. Timer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:349
-msgid "system_led_trigger_timer"
+msgid "Timer"
 msgstr "Timer"
 
 #. Heartbeat (Load Average)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:350
-msgid "system_led_trigger_heartbeat"
+msgid "Heartbeat (Load Average)"
 msgstr "Heartbeat (Load Average)"
 
 #. Network Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:351
-msgid "system_led_trigger_netdev"
+msgid "Network Device"
 msgstr "Network Device"
 
 #. Off-State Delay
 #: i18n/english/luasrc/i18n/admin-core.en.lua:352
-msgid "system_led_delayoff"
+msgid "Off-State Delay"
 msgstr "Off-State Delay"
 
 #. Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is off
 #: i18n/english/luasrc/i18n/admin-core.en.lua:353
-msgid "system_led_delayoff_desc"
+msgid "Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is off"
 msgstr ""
 "Thời gian (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> thì off"
 
 #. On-State Delay
 #: i18n/english/luasrc/i18n/admin-core.en.lua:354
-msgid "system_led_delayon"
+msgid "On-State Delay"
 msgstr "On-State Delay"
 
 #. Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is on
 #: i18n/english/luasrc/i18n/admin-core.en.lua:355
-msgid "system_led_delayon_desc"
+msgid "Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is on"
 msgstr ""
 "Thời gian (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> thì on"
 
 #. Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:356
-msgid "system_led_dev"
+msgid "Device"
 msgstr "Thiết bị"
 
 #. Trigger Mode
 #: i18n/english/luasrc/i18n/admin-core.en.lua:357
-msgid "system_led_mode"
+msgid "Trigger Mode"
 msgstr "Chế độ trigger"
 
 #. Link On
 #: i18n/english/luasrc/i18n/admin-core.en.lua:358
-msgid "system_led_mode_link"
+msgid "Link On"
 msgstr "Link On"
 
 #. Transmit
 #: i18n/english/luasrc/i18n/admin-core.en.lua:359
-msgid "system_led_mode_tx"
+msgid "Transmit"
 msgstr "Transmit"
 
 #. Receive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:360
-msgid "system_led_mode_rx"
+msgid "Receive"
 msgstr "Receive"
 
 #. Active
 #: i18n/english/luasrc/i18n/admin-core.en.lua:361
-msgid "network_interface_up"
+msgid "Active"
 msgstr "Active"
 
 #. <abbr title=\"Media Access Control\">MAC</abbr>-Address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:362
-msgid "network_interface_hwaddr"
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 
 #. Hardware Address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:363
-msgid "network_interface_hwaddr_desc"
+msgid "Hardware Address"
 msgstr "Địa chỉ phần cứng"
 
 #. Traffic
 #: i18n/english/luasrc/i18n/admin-core.en.lua:364
-msgid "network_interface_txrx"
+msgid "Traffic"
 msgstr "Lưu thông"
 
 #. transmitted / received
 #: i18n/english/luasrc/i18n/admin-core.en.lua:365
-msgid "network_interface_txrx_desc"
+msgid "transmitted / received"
 msgstr "Đã truyền/ đã nhận"
 
 #. Errors
 #: i18n/english/luasrc/i18n/admin-core.en.lua:366
-msgid "network_interface_err"
+msgid "Errors"
 msgstr "Lỗi"
 
 #. TX / RX
 #: i18n/english/luasrc/i18n/admin-core.en.lua:367
-msgid "network_interface_err_desc"
+msgid "TX / RX"
 msgstr "TX / RX"
 
 #. Create / Assign firewall-zone
 #: i18n/english/luasrc/i18n/admin-core.en.lua:368
-msgid "network_interface_fwzone"
+msgid "Create / Assign firewall-zone"
 msgstr "Tạo/ gán firewall-zone"
 
 #. This interface does not belong to any firewall zone yet.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:369
-msgid "network_interface_fwzone_desc"
+msgid "Choose the firewall zone you want to assign to this interface. Select <em>unspecified</em> to remove the interface from the associated zone or fill out the <em>create</em> field to define a new zone and attach the interface to it."
 msgstr "Giao diện này chưa thuộc về bất kỳ firewall zone nào."
 
 #. Processes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:370
-msgid "process_head"
+msgid "Processes"
 msgstr "Processes"
 
 #. This list gives an overview over currently running system processes and their status.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:371
-msgid "process_descr"
+msgid "This list gives an overview over currently running system processes and their status."
 msgstr ""
 "List này đưa ra một tầm nhìn tổng quát về xử lý hệ thống đang chạy và tình "
 "trạng của chúng."
 
 #. PID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:372
-msgid "process_pid"
+msgid "PID"
 msgstr "PID"
 
 #. Owner
 #: i18n/english/luasrc/i18n/admin-core.en.lua:373
-msgid "process_owner"
+msgid "Owner"
 msgstr "Owner"
 
 #. Command
 #: i18n/english/luasrc/i18n/admin-core.en.lua:374
-msgid "process_command"
+msgid "Command"
 msgstr "Lệnh"
 
 #. CPU usage (%)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:375
-msgid "process_cpu"
+msgid "CPU usage (%)"
 msgstr "CPU usage (%)"
 
 #. Memory usage (%)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:376
-msgid "process_mem"
+msgid "Memory usage (%)"
 msgstr "Memory usage (%)"
 
 #. Hang Up
 #: i18n/english/luasrc/i18n/admin-core.en.lua:377
-msgid "process_hup"
+msgid "Hang Up"
 msgstr "Hang Up"
 
 #. Terminate
 #: i18n/english/luasrc/i18n/admin-core.en.lua:378
-msgid "process_term"
+msgid "Terminate"
 msgstr "Terminate"
 
 #. Kill
 #: i18n/english/luasrc/i18n/admin-core.en.lua:379
-msgid "process_kill"
+msgid "Kill"
 msgstr "Kill"
 
 #. cached
 #: i18n/english/luasrc/i18n/admin-core.en.lua:380
-msgid "mem_cached"
+msgid "cached"
 msgstr "cached"
 
 #. buffered
 #: i18n/english/luasrc/i18n/admin-core.en.lua:381
-msgid "mem_buffered"
+msgid "buffered"
 msgstr "buffered"
 
 #. free
 #: i18n/english/luasrc/i18n/admin-core.en.lua:382
-msgid "mem_free"
+msgid "free"
 msgstr "free"
 
 #. Scheduled Tasks
 #: i18n/english/luasrc/i18n/admin-core.en.lua:383
-msgid "a_s_crontab"
+msgid "Scheduled Tasks"
 msgstr "Scheduled Tasks"
 
 #. This is the system crontab in which scheduled tasks can be defined.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:384
-msgid "a_s_crontab1"
+msgid "This is the system crontab in which scheduled tasks can be defined."
 msgstr "Đây là system crontab mà scheduled tasks có thể bị định nghĩa."
 
 #. NAS ID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:385
-msgid "a_w_nasid"
+msgid "NAS ID"
 msgstr "NAS ID"
 
 #. Path to CA-Certificate
 #: i18n/english/luasrc/i18n/admin-core.en.lua:386
-msgid "a_w_cacert"
+msgid "Path to CA-Certificate"
 msgstr "Đường dẫn tới CA-Certificate"
 
 #. EAP-Method
 #: i18n/english/luasrc/i18n/admin-core.en.lua:387
-msgid "a_w_eaptype"
+msgid "EAP-Method"
 msgstr "EAP-Method"
 
 #. Path to Private Key
 #: i18n/english/luasrc/i18n/admin-core.en.lua:388
-msgid "a_w_tlsprivkey"
+msgid "Path to Private Key"
 msgstr "Đường dẫn tới private key"
 
 #. Password of Private Key
 #: i18n/english/luasrc/i18n/admin-core.en.lua:389
-msgid "a_w_tlsprivkeypwd"
+msgid "Password of Private Key"
 msgstr "Mật mã của private key"
 
 #. Authentication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:390
-msgid "a_w_peapauth"
+msgid "Authentication"
 msgstr "Xác thực"
 
 #. Identity
 #: i18n/english/luasrc/i18n/admin-core.en.lua:391
-msgid "a_w_peapidentity"
+msgid "Identity"
 msgstr "Nhận dạng"
 
 #. Password
 #: i18n/english/luasrc/i18n/admin-core.en.lua:392
-msgid "a_w_peappassword"
+msgid "Password"
 msgstr "Mật mã"
 
 #. Create Network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:393
-msgid "a_w_create"
+msgid "Create Network"
 msgstr "Tạo network"
 
 #. Hostnames
 #: i18n/english/luasrc/i18n/admin-core.en.lua:394
-msgid "hostnames"
+msgid "Hostnames"
 msgstr "Tên host"
 
 #. Host entries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:395
-msgid "hostnames_entries"
+msgid "Host entries"
 msgstr "Host entries"
 
 #. Hostname
 #: i18n/english/luasrc/i18n/admin-core.en.lua:396
-msgid "hostnames_hostname"
+msgid "Hostname"
 msgstr "Tên host"
 
 #. IP address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:397
-msgid "hostnames_address"
+msgid "IP address"
 msgstr "Địa chỉ IP"
 
 #. Clamp Segment Size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:398
-msgid "m_n_mssfix"
+msgid "Clamp Segment Size"
 msgstr "Clamp Segment Size"
 
 #. Fixes problems with unreachable websites, submitting forms or other unexpected behaviour for some ISPs.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:399
-msgid "m_n_mssfix_desc"
+msgid "Fixes problems with unreachable websites, submitting forms or other unexpected behaviour for some ISPs."
 msgstr ""
 "Chỉnh sửa vấn đề với những website không tiếp cận được, trình form hoặc "
 "những hình thức bất ngờ cho một vài ISP."
 
 #. Flash Firmware
 #: i18n/english/luasrc/i18n/admin-core.en.lua:400
-msgid "admin_upgrade"
+msgid "Flash Firmware"
 msgstr "Phần cứng flash"
 
 #. The uploaded image file does not contain a supported format. Make sure that you choose the generic image format for your platform.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:401
-msgid "admin_upgrade_badimage"
+msgid "The uploaded image file does not contain a supported format. Make sure that you choose the generic image format for your platform."
 msgstr ""
 "Tập tin đang tải hình ảnh không bao gồm một hổ trợ format. Bảo đảm rằng bạn "
 "chọn một image format tổng quát cho platform."
 
 #. Checksum
 #: i18n/english/luasrc/i18n/admin-core.en.lua:402
-msgid "admin_upgrade_checksum"
+msgid "Checksum"
 msgstr "Checksum"
 
 #. Upload an OpenWrt image file to reflash the device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:403
-msgid "admin_upgrade_desc"
+msgid "Upload an OpenWrt image file to reflash the device."
 msgstr "Tải một tập tin hình ảnh OpenWrt để reflash thiết bị."
 
 #. Size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:404
-msgid "admin_upgrade_filesize"
+msgid "Size"
 msgstr "Size"
 
 #. Firmware image
 #: i18n/english/luasrc/i18n/admin-core.en.lua:405
-msgid "admin_upgrade_fwimage"
+msgid "Firmware image"
 msgstr "HÌnh ảnh firmware"
 
 #. Keep configuration files
 #: i18n/english/luasrc/i18n/admin-core.en.lua:406
-msgid "admin_upgrade_keepcfg"
+msgid "Keep configuration files"
 msgstr "Giữ tập tin cấu hình"
 
 #. Sorry. OpenWrt does not support a system upgrade on this platform.<br /> You need to manually flash your device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:407
-msgid "admin_upgrade_nosupport"
+msgid "Sorry. OpenWrt does not support a system upgrade on this platform.<br /> You need to manually flash your device."
 msgstr ""
 "Xin lỗi. OpenWrt không hỗ trợ nâng cấp hệ thống trên platform này. <br /> "
 "Bạn cần tự flash thiết bị của bạn. "
 
 #. The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a few minutes until you try to reconnect. It might be necessary to renew the address of your computer to reach the device again, depending on your settings.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:408
-msgid "admin_upgrade_running"
+msgid "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a few minutes until you try to reconnect. It might be necessary to renew the address of your computer to reach the device again, depending on your settings."
 msgstr ""
 "Hệ thống bây giờ đang flashing.<br /> DO NOT POWER OFF THE DEVICE!<br /> Chờ "
 "một vài phút cho tới khi kết nối lại. Có thể cần phải làm mới địa chỉ của "
@@ -2229,21 +2229,21 @@ msgstr ""
 
 #.  (%s available)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:409
-msgid "admin_upgrade_spaceavail"
+msgid " (%s available)"
 msgstr ""
 "<span class=\"translation-space\"> </span>\n"
 "(%s available)"
 
 #. It appears that you try to flash an image that does not fit into the flash memory, please verify the image file!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:410
-msgid "admin_upgrade_toolarge"
+msgid "It appears that you try to flash an image that does not fit into the flash memory, please verify the image file!"
 msgstr ""
 "Dường như bạn cố gắng flash một hình ảnh không phù hợp với bộ nhớ flash, xin "
 "vui lòng xác minh các tập tin hình ảnh!"
 
 #. Upload image
 #: i18n/english/luasrc/i18n/admin-core.en.lua:411
-msgid "admin_upgrade_upload"
+msgid "Upload image"
 msgstr "Tải hình ảnh"
 
 #. The flash image was uploaded. Below is the checksum and file size listed, compare them with the original file to ensure data integrity.<br /> Click \"Proceed\" below to start the flash procedure.
diff --git a/po/vi/asterisk.po b/po/vi/asterisk.po
index 0c67f4135..2687d03bf 100644
--- a/po/vi/asterisk.po
+++ b/po/vi/asterisk.po
@@ -15,1252 +15,1252 @@ msgstr ""
 
 #. Asterisk General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:1
-msgid "asterisk_asterisk"
+msgid "Asterisk General Options"
 msgstr "Asterisk những tùy chọn căn bản"
 
 #. AGI directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:2
-msgid "asterisk_asterisk_agidir"
+msgid "AGI directory"
 msgstr "Thư mục AGI"
 
 #. Cache recorded sound files during recording
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:3
-msgid "asterisk_asterisk_cacherecordfiles"
+msgid "Cache recorded sound files during recording"
 msgstr "Cache ghi lại tập tin âm thanh trong suốt qua trình recording"
 
 #. Debug Level
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:4
-msgid "asterisk_asterisk_debug"
+msgid "Debug Level"
 msgstr "Debug Level"
 
 #. Disable some warnings
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:5
-msgid "asterisk_asterisk_dontwarn"
+msgid "Disable some warnings"
 msgstr "Vô hiệu hóa một số cảnh báo"
 
 #. Dump core on crash
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:6
-msgid "asterisk_asterisk_dumpcore"
+msgid "Dump core on crash"
 msgstr "Dump core on crash"
 
 #. High Priority
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:7
-msgid "asterisk_asterisk_highpriority"
+msgid "High Priority"
 msgstr "High Priority"
 
 #. Initialise Crypto
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:8
-msgid "asterisk_asterisk_initcrypto"
+msgid "Initialise Crypto"
 msgstr "Initialise Crypto"
 
 #. Use Internal Timing
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:9
-msgid "asterisk_asterisk_internaltiming"
+msgid "Use Internal Timing"
 msgstr "Sử dụng thời gian nội bộ"
 
 #. Log directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:10
-msgid "asterisk_asterisk_logdir"
+msgid "Log directory"
 msgstr "Thư mục log"
 
 #. Maximum number of calls allowed
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:11
-msgid "asterisk_asterisk_maxcalls"
+msgid "Maximum number of calls allowed"
 msgstr "Số lượng cuộc gọi tối đa cho phép"
 
 #. Maximum load to stop accepting new calls
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:12
-msgid "asterisk_asterisk_maxload"
+msgid "Maximum load to stop accepting new calls"
 msgstr "Mức độ tải tối đa để ngừng thu nhận cuộc gọi mới"
 
 #. Disable console colors
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:13
-msgid "asterisk_asterisk_nocolor"
+msgid "Disable console colors"
 msgstr "Vô hiệu hóa bản điều khiển màu sắc"
 
 #. Sound files Cache directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:14
-msgid "asterisk_asterisk_recordcachedir"
+msgid "Sound files Cache directory"
 msgstr "Thư mục sound files cache"
 
 #. The Group to run as
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:15
-msgid "asterisk_asterisk_rungroup"
+msgid "The Group to run as"
 msgstr "Nhóm vận hành như"
 
 #. The User to run as
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:16
-msgid "asterisk_asterisk_runuser"
+msgid "The User to run as"
 msgstr "Người sử dụng vận hành như"
 
 #. Voicemail Spool directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:17
-msgid "asterisk_asterisk_spooldir"
+msgid "Voicemail Spool directory"
 msgstr "Thư mục Voicemail Spool "
 
 #. Prefix UniquID with system name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:18
-msgid "asterisk_asterisk_systemname"
+msgid "Prefix UniquID with system name"
 msgstr "Tiền tố UniquID với tên hệ thống"
 
 #. Build transcode paths via SLINEAR, not directly
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:19
-msgid "asterisk_asterisk_transcodeviasln"
+msgid "Build transcode paths via SLINEAR, not directly"
 msgstr "Xây dựng đừng dẫn transcode via SLINEAR, không trực tiếp"
 
 #. Transmit SLINEAR silence while recording a channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:20
-msgid "asterisk_asterisk_transmitsilenceduringrecord"
+msgid "Transmit SLINEAR silence while recording a channel"
 msgstr "Truyền SLINEAR silence trong khi recording một channel"
 
 #. Verbose Level
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:21
-msgid "asterisk_asterisk_verbose"
+msgid "Verbose Level"
 msgstr "Verbose Level"
 
 #. Time Zone
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:22
-msgid "asterisk_asterisk_zone"
+msgid "Time Zone"
 msgstr "Múi giờ"
 
 #. Section dialplan
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:23
-msgid "asterisk_dialplan"
+msgid "Section dialplan"
 msgstr "Section dialplan"
 
 #. include
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:24
-msgid "asterisk_dialplan_include"
+msgid "include"
 msgstr "bao gồm"
 
 #. Dialplan Extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:25
-msgid "asterisk_dialplanexten"
+msgid "Dialplan Extension"
 msgstr "Dialplan Extension"
 
 #. Dialplan General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:26
-msgid "asterisk_dialplangeneral"
+msgid "Dialplan General Options"
 msgstr "Dialplan tùy chọn tổng quát"
 
 #. Allow transfer
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:27
-msgid "asterisk_dialplangeneral_allowtransfer"
+msgid "Allow transfer"
 msgstr "Cho phép chuyển đổi"
 
 #. Reinvite/redirect media connections
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:28
-msgid "asterisk_dialplangeneral_canreinvite"
+msgid "Reinvite/redirect media connections"
 msgstr "Mời lại/ chuyển hướng phương tiện kết nối"
 
 #. Clear global vars
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:29
-msgid "asterisk_dialplangeneral_clearglobalvars"
+msgid "Clear global vars"
 msgstr "Xóa global vars"
 
 #. Dialplan Goto
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:30
-msgid "asterisk_dialplangoto"
+msgid "Dialplan Goto"
 msgstr "Dialplan Goto"
 
 #. Dialplan Conference
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:31
-msgid "asterisk_dialplanmeetme"
+msgid "Dialplan Conference"
 msgstr "Dialplan Conference"
 
 #. Dialplan Time
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:32
-msgid "asterisk_dialplansaytime"
+msgid "Dialplan Time"
 msgstr "Dialplan Time"
 
 #. Dialplan Voicemail
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:33
-msgid "asterisk_dialplanvoice"
+msgid "Dialplan Voicemail"
 msgstr "Dialplan Voicemail"
 
 #. Dial Zones for Dialplan
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:34
-msgid "asterisk_dialzone"
+msgid "Dial Zones for Dialplan"
 msgstr "Dial Zones cho Dialplan"
 
 #. Prefix to add matching dialplans
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:35
-msgid "asterisk_dialzone_addprefix"
+msgid "Prefix to add matching dialplans"
 msgstr "Tiền tố để thêm vào matching dialplans"
 
 #. Match International prefix
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:36
-msgid "asterisk_dialzone_international"
+msgid "Match International prefix"
 msgstr "Match tiền tố quốc tê"
 
 #. Prefix (0) to add/remove to/from international numbers
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:37
-msgid "asterisk_dialzone_localprefix"
+msgid "Prefix (0) to add/remove to/from international numbers"
 msgstr "Tiền tố để thêm vào/ bỏ ra/ từ số gọi quốc tế"
 
 #. localzone
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:38
-msgid "asterisk_dialzone_localzone"
+msgid "localzone"
 msgstr "vùng địa phương"
 
 #. Match plan
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:39
-msgid "asterisk_dialzone_match"
+msgid "Match plan"
 msgstr "Match plan"
 
 #. Connection to use
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:40
-msgid "asterisk_dialzone_uses"
+msgid "Connection to use"
 msgstr "Kết nối sử dụng"
 
 #. Feature Key maps
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:41
-msgid "asterisk_featuremap"
+msgid "Feature Key maps"
 msgstr "Bản đồ phím tính năng"
 
 #. Attended transfer key
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:42
-msgid "asterisk_featuremap_atxfer"
+msgid "Attended transfer key"
 msgstr "Attended transfer key"
 
 #. Blind transfer key
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:43
-msgid "asterisk_featuremap_blindxfer"
+msgid "Blind transfer key"
 msgstr "phím chuyển đổi ẩn"
 
 #. Key to Disconnect call
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:44
-msgid "asterisk_featuremap_disconnect"
+msgid "Key to Disconnect call"
 msgstr "phím để vô hiệu hóa cuộc gọi"
 
 #. Key to Park call
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:45
-msgid "asterisk_featuremap_parkcall"
+msgid "Key to Park call"
 msgstr "phím để định vị cuộc gọi"
 
 #. Parking Feature
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:46
-msgid "asterisk_featurepark"
+msgid "Parking Feature"
 msgstr "Tính năng định vị"
 
 #. ADSI Park
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:47
-msgid "asterisk_featurepark_adsipark"
+msgid "ADSI Park"
 msgstr "định vị ADSI"
 
 #. Attended transfer timeout (sec)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:48
-msgid "asterisk_featurepark_atxfernoanswertimeout"
+msgid "Attended transfer timeout (sec)"
 msgstr "Attended transfer timeout (sec)"
 
 #. One touch record key
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:49
-msgid "asterisk_featurepark_automon"
+msgid "One touch record key"
 msgstr "Phím thu chạm một lần"
 
 #. Name of call context for parking
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:50
-msgid "asterisk_featurepark_context"
+msgid "Name of call context for parking"
 msgstr "Tên của call context cho parking"
 
 #. Sound file to play to parked caller
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:51
-msgid "asterisk_featurepark_courtesytone"
+msgid "Sound file to play to parked caller"
 msgstr "Tập tin âm thanh để play to parked caller"
 
 #. Max time (ms) between digits for feature activation
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:52
-msgid "asterisk_featurepark_featuredigittimeout"
+msgid "Max time (ms) between digits for feature activation"
 msgstr "Thời gian tối đa (ms) giữa các digits cho feature activation"
 
 #. Method to Find Parking slot
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:53
-msgid "asterisk_featurepark_findslot"
+msgid "Method to Find Parking slot"
 msgstr "Phương pháp tìm điểm định vị"
 
 #. parkedmusicclass
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:54
-msgid "asterisk_featurepark_parkedmusicclass"
+msgid "parkedmusicclass"
 msgstr "parkedmusicclass"
 
 #. Play courtesy tone to
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:55
-msgid "asterisk_featurepark_parkedplay"
+msgid "Play courtesy tone to"
 msgstr "Play courtesy tone để"
 
 #. Enable Parking
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:56
-msgid "asterisk_featurepark_parkenabled"
+msgid "Enable Parking"
 msgstr "cho phép định vị"
 
 #. Extension to dial to park
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:57
-msgid "asterisk_featurepark_parkext"
+msgid "Extension to dial to park"
 msgstr "nhanh số để gọi để định vị"
 
 #. Parking time (secs)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:58
-msgid "asterisk_featurepark_parkingtime"
+msgid "Parking time (secs)"
 msgstr "Thời gian định vị"
 
 #. Range of extensions for call parking
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:59
-msgid "asterisk_featurepark_parkpos"
+msgid "Range of extensions for call parking"
 msgstr "Vùng của đuôi mở rộng cho call parking"
 
 #. Pickup extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:60
-msgid "asterisk_featurepark_pickupexten"
+msgid "Pickup extension"
 msgstr "Pickup extension"
 
 #. Seconds to wait bewteen digits when transferring
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:61
-msgid "asterisk_featurepark_transferdigittimeout"
+msgid "Seconds to wait bewteen digits when transferring"
 msgstr "Thời gian chờ giữa những chữ số khi chuyển đổi"
 
 #. sound when attended transfer is complete
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:62
-msgid "asterisk_featurepark_xferfailsound"
+msgid "sound when attended transfer is complete"
 msgstr "âm thanh khi chuyển đổi hoàn tất"
 
 #. Sound when attended transfer fails
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:63
-msgid "asterisk_featurepark_xfersound"
+msgid "Sound when attended transfer fails"
 msgstr "âm thanh khi chuyển đổi không thành công"
 
 #. Reload Hardware Config
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:64
-msgid "asterisk_hardwarereboot"
+msgid "Reload Hardware Config"
 msgstr "Tải lại cấu hình phần cứng"
 
 #. Reboot Method
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:65
-msgid "asterisk_hardwarereboot_method"
+msgid "Reboot Method"
 msgstr "phương pháp khởi động lại"
 
 #. Parameter
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:66
-msgid "asterisk_hardwarereboot_param"
+msgid "Parameter"
 msgstr "Tham số"
 
 #. SIP Connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:67
-msgid "asterisk_iax"
+msgid "SIP Connection"
 msgstr "Kết nối SIP"
 
 #. Always Dial International
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:68
-msgid "asterisk_iax_alwaysinternational"
+msgid "Always Dial International"
 msgstr "Luôn gọi quốc tế"
 
 #. context
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:69
-msgid "asterisk_iax_context"
+msgid "context"
 msgstr "bối cảnh"
 
 #. Country Code for connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:70
-msgid "asterisk_iax_countrycode"
+msgid "Country Code for connection"
 msgstr "Mã quốc gia để kết nối"
 
 #. Add as Extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:71
-msgid "asterisk_iax_extension"
+msgid "Add as Extension"
 msgstr "bổ sung như nhánh số"
 
 #. Host name (or blank)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:72
-msgid "asterisk_iax_host"
+msgid "Host name (or blank)"
 msgstr "Tên máy chủ"
 
 #. International Dial Prefix
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:73
-msgid "asterisk_iax_internationalprefix"
+msgid "International Dial Prefix"
 msgstr "Tiền tố số gọi quốc tế"
 
 #. Dial Prefix (for external line)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:74
-msgid "asterisk_iax_prefix"
+msgid "Dial Prefix (for external line)"
 msgstr "Tiền tố số gọi (cho nhanh số)"
 
 #. Secret
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:75
-msgid "asterisk_iax_secret"
+msgid "Secret"
 msgstr "Bí mật"
 
 #. Dial Timeout (sec)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:76
-msgid "asterisk_iax_timeout"
+msgid "Dial Timeout (sec)"
 msgstr "Dừng quay số (giây)"
 
 #. Option type
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:77
-msgid "asterisk_iax_type"
+msgid "Option type"
 msgstr "Lựa chọn"
 
 #. User name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:78
-msgid "asterisk_iax_username"
+msgid "User name"
 msgstr "Tên người dùng"
 
 #. IAX General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:79
-msgid "asterisk_iaxgeneral"
+msgid "IAX General Options"
 msgstr "Những lựa chọn tổng quát IAX"
 
 #. Allow Codecs
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:80
-msgid "asterisk_iaxgeneral_allow"
+msgid "Allow Codecs"
 msgstr "Cho phép Codecs"
 
 #. Reinvite/redirect media connections
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:81
-msgid "asterisk_iaxgeneral_canreinvite"
+msgid "Reinvite/redirect media connections"
 msgstr "Mời lại/ chuyển hướng công cụ kết nối"
 
 #. Static
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:82
-msgid "asterisk_iaxgeneral_static"
+msgid "Static"
 msgstr "TÄ©nh"
 
 #. Write Protect
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:83
-msgid "asterisk_iaxgeneral_writeprotect"
+msgid "Write Protect"
 msgstr "Viết bảo vệ"
 
 #. Meetme Conference
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:84
-msgid "asterisk_meetme"
+msgid "Meetme Conference"
 msgstr "Gặp mặt thảo luận"
 
 #. Admin PIN
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:85
-msgid "asterisk_meetme_adminpin"
+msgid "Admin PIN"
 msgstr "PIN quản trị"
 
 #. Meeting PIN
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:86
-msgid "asterisk_meetme_pin"
+msgid "Meeting PIN"
 msgstr "PIN cuộc gặp"
 
 #. Meetme Conference General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:87
-msgid "asterisk_meetmegeneral"
+msgid "Meetme Conference General Options"
 msgstr "Lựu chọn chung về thảo luận trực tiếp"
 
 #. Number of 20ms audio buffers to be used
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:88
-msgid "asterisk_meetmegeneral_audiobuffers"
+msgid "Number of 20ms audio buffers to be used"
 msgstr "Số của 20ms audio buffers để được dùng"
 
 #. Modules
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:89
-msgid "asterisk_module"
+msgid "Modules"
 msgstr "Modules"
 
 #. Alarm Receiver Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:90
-msgid "asterisk_module_appalarmreceiver"
+msgid "Alarm Receiver Application"
 msgstr "Ứng dụng nhận báo thức"
 
 #. Authentication Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:91
-msgid "asterisk_module_appauthenticate"
+msgid "Authentication Application"
 msgstr "Ứng dụng xác thực"
 
 #. Make sure asterisk doesnt save CDR
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:92
-msgid "asterisk_module_appcdr"
+msgid "Make sure asterisk doesnt save CDR"
 msgstr "Bảo đảm asterisk không lưu CDR"
 
 #. Check if channel is available
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:93
-msgid "asterisk_module_appchanisavail"
+msgid "Check if channel is available"
 msgstr "Kiểm tra xem nếu kênh đã có sẵn"
 
 #. Listen in on any channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:94
-msgid "asterisk_module_appchanspy"
+msgid "Listen in on any channel"
 msgstr "Nghe trên bất kỳ kênh nào"
 
 #. Control Playback Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:95
-msgid "asterisk_module_appcontrolplayback"
+msgid "Control Playback Application"
 msgstr "Điều khiển ứng dụng phát lại"
 
 #. Cuts up variables
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:96
-msgid "asterisk_module_appcut"
+msgid "Cuts up variables"
 msgstr "Cuts up variables"
 
 #. Database access functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:97
-msgid "asterisk_module_appdb"
+msgid "Database access functions"
 msgstr "Chức năng truy cập cơ sở dữ liệu"
 
 #. Dialing Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:98
-msgid "asterisk_module_appdial"
+msgid "Dialing Application"
 msgstr "Ứng dụng quay số"
 
 #. Virtual Dictation Machine Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:99
-msgid "asterisk_module_appdictate"
+msgid "Virtual Dictation Machine Application"
 msgstr "Ứng dụng virtual Dictation Machine "
 
 #. Directed Call Pickup Support
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:100
-msgid "asterisk_module_appdirectedpickup"
+msgid "Directed Call Pickup Support"
 msgstr "Directed hỗ trợ call pickup"
 
 #. Extension Directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:101
-msgid "asterisk_module_appdirectory"
+msgid "Extension Directory"
 msgstr "Danh bạ nhánh số"
 
 #. DISA (Direct Inward System Access) Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:102
-msgid "asterisk_module_appdisa"
+msgid "DISA (Direct Inward System Access) Application"
 msgstr "Ứng dụng DISA (Direct Inward System Access) "
 
 #. Dump channel variables Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:103
-msgid "asterisk_module_appdumpchan"
+msgid "Dump channel variables Application"
 msgstr "Dump channel variables Application"
 
 #. Simple Echo Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:104
-msgid "asterisk_module_appecho"
+msgid "Simple Echo Application"
 msgstr "Ứng dụng Echo đơn giản"
 
 #. ENUM Lookup
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:105
-msgid "asterisk_module_appenumlookup"
+msgid "ENUM Lookup"
 msgstr "ENUM tra cứu"
 
 #. Reevaluates strings
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:106
-msgid "asterisk_module_appeval"
+msgid "Reevaluates strings"
 msgstr "Đánh giá lại strings"
 
 #. Executes applications
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:107
-msgid "asterisk_module_appexec"
+msgid "Executes applications"
 msgstr "thực thi ứng dụng"
 
 #. External IVR application interface
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:108
-msgid "asterisk_module_appexternalivr"
+msgid "External IVR application interface"
 msgstr "Ứng dụng giao diện bên ngoài IVR"
 
 #. Fork The CDR into 2 seperate entities
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:109
-msgid "asterisk_module_appforkcdr"
+msgid "Fork The CDR into 2 seperate entities"
 msgstr "Fork The CDR into 2 nhân riêng biệt"
 
 #. Get ADSI CPE ID
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:110
-msgid "asterisk_module_appgetcpeid"
+msgid "Get ADSI CPE ID"
 msgstr "Lấy ADSI CPE ID"
 
 #. Group Management Routines
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:111
-msgid "asterisk_module_appgroupcount"
+msgid "Group Management Routines"
 msgstr "Group Management Routines"
 
 #. Encode and Stream via icecast and ices
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:112
-msgid "asterisk_module_appices"
+msgid "Encode and Stream via icecast and ices"
 msgstr "Encode và Stream via icecast và ices"
 
 #. Image Transmission Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:113
-msgid "asterisk_module_appimage"
+msgid "Image Transmission Application"
 msgstr "Ứng dụng truyền hình ảnh"
 
 #. Look up Caller*ID name/number from black
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:114
-msgid "asterisk_module_applookupblacklist"
+msgid "Look up Caller*ID name/number from black"
 msgstr "Tra cứu tên/số của người gọi"
 
 #. Look up CallerID Name from local databas
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:115
-msgid "asterisk_module_applookupcidname"
+msgid "Look up CallerID Name from local databas"
 msgstr "Tra cứu tên người gọi từ cơ sở dữ liệu địa phương"
 
 #. Extension Macros
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:116
-msgid "asterisk_module_appmacro"
+msgid "Extension Macros"
 msgstr "Nhánh số Macro"
 
 #. A simple math Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:117
-msgid "asterisk_module_appmath"
+msgid "A simple math Application"
 msgstr "Ứng dụng tính toán đơn giản"
 
 #. MD5 checksum Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:118
-msgid "asterisk_module_appmd5"
+msgid "MD5 checksum Application"
 msgstr "Ứng dụng MD5 checksum "
 
 #. Digital Milliwatt (mu-law) Test Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:119
-msgid "asterisk_module_appmilliwatt"
+msgid "Digital Milliwatt (mu-law) Test Application"
 msgstr "Ứng dụng kiểm tra Digital Milliwatt (mu-law) "
 
 #. Record a call and mix the audio during the recording
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:120
-msgid "asterisk_module_appmixmonitor"
+msgid "Record a call and mix the audio during the recording"
 msgstr "Thu âm cuộc gọi và phối âm trong khi thu"
 
 #. Call Parking and Announce Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:121
-msgid "asterisk_module_appparkandannounce"
+msgid "Call Parking and Announce Application"
 msgstr "Định vị cuộc gọi và ứng dụng thông báo"
 
 #. Trivial Playback Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:122
-msgid "asterisk_module_appplayback"
+msgid "Trivial Playback Application"
 msgstr "Ứng dụng trivial Playback "
 
 #. Require phone number to be entered
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:123
-msgid "asterisk_module_appprivacy"
+msgid "Require phone number to be entered"
 msgstr "Yêu cầu nhập số điện thoại"
 
 #. True Call Queueing
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:124
-msgid "asterisk_module_appqueue"
+msgid "True Call Queueing"
 msgstr "True Call Queueing"
 
 #. Random goto
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:125
-msgid "asterisk_module_apprandom"
+msgid "Random goto"
 msgstr "Random goto"
 
 #. Read Variable Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:126
-msgid "asterisk_module_appread"
+msgid "Read Variable Application"
 msgstr "Ứng dụng đọc variable "
 
 #. Read in a file
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:127
-msgid "asterisk_module_appreadfile"
+msgid "Read in a file"
 msgstr "Đọc trong một tập tin"
 
 #. Realtime Data Lookup/Rewrite
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:128
-msgid "asterisk_module_apprealtime"
+msgid "Realtime Data Lookup/Rewrite"
 msgstr "Tra cứu dữ liệu đúng lúc/ Viết lại"
 
 #. Trivial Record Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:129
-msgid "asterisk_module_apprecord"
+msgid "Trivial Record Application"
 msgstr "Ứng dụng trivial record"
 
 #. Say time
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:130
-msgid "asterisk_module_appsayunixtime"
+msgid "Say time"
 msgstr "Nói thời gian"
 
 #. Send DTMF digits Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:131
-msgid "asterisk_module_appsenddtmf"
+msgid "Send DTMF digits Application"
 msgstr "Ứng dụng gửi những chữ số DTMF"
 
 #. Send Text Applications
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:132
-msgid "asterisk_module_appsendtext"
+msgid "Send Text Applications"
 msgstr "Gửi ứng dụng tin nhắn"
 
 #. Set CallerID Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:133
-msgid "asterisk_module_appsetcallerid"
+msgid "Set CallerID Application"
 msgstr "Ứng dụng cài đặt định dạng cuộc gọi"
 
 #. CDR user field apps
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:134
-msgid "asterisk_module_appsetcdruserfield"
+msgid "CDR user field apps"
 msgstr "CDR user field apps"
 
 #. load =&gt; .so ; Set CallerID Name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:135
-msgid "asterisk_module_appsetcidname"
+msgid "load => .so ; Set CallerID Name"
 msgstr "load =&amp;gt; .so ; Đặt tên CallerID "
 
 #. load =&gt; .so ; Set CallerID Number
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:136
-msgid "asterisk_module_appsetcidnum"
+msgid "load => .so ; Set CallerID Number"
 msgstr "load =&amp;gt; .so ; Đặt số CallerID "
 
 #. Set RDNIS Number
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:137
-msgid "asterisk_module_appsetrdnis"
+msgid "Set RDNIS Number"
 msgstr "Cài đặt số RDNIS"
 
 #. Set ISDN Transfer Capability
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:138
-msgid "asterisk_module_appsettransfercapability"
+msgid "Set ISDN Transfer Capability"
 msgstr "Cài đặt công suất truyền tải ISDN"
 
 #. SMS/PSTN handler
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:139
-msgid "asterisk_module_appsms"
+msgid "SMS/PSTN handler"
 msgstr "SMS/PSTN handler"
 
 #. Hangs up the requested channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:140
-msgid "asterisk_module_appsofthangup"
+msgid "Hangs up the requested channel"
 msgstr "Bãi bỏ kênh yêu cầu"
 
 #. Stack Routines
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:141
-msgid "asterisk_module_appstack"
+msgid "Stack Routines"
 msgstr "Ngăn xếp Routines"
 
 #. Generic System() application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:142
-msgid "asterisk_module_appsystem"
+msgid "Generic System() application"
 msgstr "Ứng dụng Genetic System"
 
 #. Playback with Talk Detection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:143
-msgid "asterisk_module_apptalkdetect"
+msgid "Playback with Talk Detection"
 msgstr "Playback với bộ phát hiện tiếng nói"
 
 #. Interface Test Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:144
-msgid "asterisk_module_apptest"
+msgid "Interface Test Application"
 msgstr "Ứng dụng kiểm tra giao diện"
 
 #. Transfer
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:145
-msgid "asterisk_module_apptransfer"
+msgid "Transfer"
 msgstr "truyền tải"
 
 #. TXTCIDName
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:146
-msgid "asterisk_module_apptxtcidname"
+msgid "TXTCIDName"
 msgstr "TXTCIDName"
 
 #. Send URL Applications
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:147
-msgid "asterisk_module_appurl"
+msgid "Send URL Applications"
 msgstr "Gửi những ứng dụng URL"
 
 #. Custom User Event Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:148
-msgid "asterisk_module_appuserevent"
+msgid "Custom User Event Application"
 msgstr "Ứng dụng Custom User Event "
 
 #. Send verbose output
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:149
-msgid "asterisk_module_appverbose"
+msgid "Send verbose output"
 msgstr "Gá»­i verbose output"
 
 #. Voicemail
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:150
-msgid "asterisk_module_appvoicemail"
+msgid "Voicemail"
 msgstr "Thư thoại"
 
 #. Waits until first ring after time
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:151
-msgid "asterisk_module_appwaitforring"
+msgid "Waits until first ring after time"
 msgstr "Đợi tới tiếng ring đầu tiên sau khi"
 
 #. Wait For Silence Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:152
-msgid "asterisk_module_appwaitforsilence"
+msgid "Wait For Silence Application"
 msgstr "Đợi ứng dụng im lặng"
 
 #. While Loops and Conditional Execution
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:153
-msgid "asterisk_module_appwhile"
+msgid "While Loops and Conditional Execution"
 msgstr "Trong khi Loops và Conditional Execution"
 
 #. Comma Separated Values CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:154
-msgid "asterisk_module_cdrcsv"
+msgid "Comma Separated Values CDR Backend"
 msgstr "Comma Separated Values CDR Backend"
 
 #. Customizable Comma Separated Values CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:155
-msgid "asterisk_module_cdrcustom"
+msgid "Customizable Comma Separated Values CDR Backend"
 msgstr "Tùy chỉnh Comma Separated Values CDR Backend"
 
 #. Asterisk Call Manager CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:156
-msgid "asterisk_module_cdrmanager"
+msgid "Asterisk Call Manager CDR Backend"
 msgstr "Asterisk Call Manager CDR Backend"
 
 #. MySQL CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:157
-msgid "asterisk_module_cdrmysql"
+msgid "MySQL CDR Backend"
 msgstr "MySQL CDR Backend"
 
 #. PostgreSQL CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:158
-msgid "asterisk_module_cdrpgsql"
+msgid "PostgreSQL CDR Backend"
 msgstr "PostgreSQL CDR Backend"
 
 #. SQLite CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:159
-msgid "asterisk_module_cdrsqlite"
+msgid "SQLite CDR Backend"
 msgstr "SQLite CDR Backend"
 
 #. Agent Proxy Channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:160
-msgid "asterisk_module_chanagent"
+msgid "Agent Proxy Channel"
 msgstr "Agent Proxy Channel"
 
 #. Channel driver for GTalk
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:161
-msgid "asterisk_module_chanalsa"
+msgid "Channel driver for GTalk"
 msgstr "Channel driver cho GTalk"
 
 #. Channel driver for GTalk
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:162
-msgid "asterisk_module_changtalk"
+msgid "Channel driver for GTalk"
 msgstr "Channel driver cho GTalk"
 
 #. Option chan_iax2
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:163
-msgid "asterisk_module_chaniax2"
+msgid "Option chan_iax2"
 msgstr "Tùy chọn chan_iax2"
 
 #. Local Proxy Channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:164
-msgid "asterisk_module_chanlocal"
+msgid "Local Proxy Channel"
 msgstr "Local Proxy Channel"
 
 #. Session Initiation Protocol (SIP)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:165
-msgid "asterisk_module_chansip"
+msgid "Session Initiation Protocol (SIP)"
 msgstr "Session Initiation Protocol (SIP)"
 
 #. Adaptive Differential PCM Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:166
-msgid "asterisk_module_codecadpcm"
+msgid "Adaptive Differential PCM Coder/Decoder"
 msgstr "Adaptive Differential PCM Coder/Decoder"
 
 #. A-law Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:167
-msgid "asterisk_module_codecalaw"
+msgid "A-law Coder/Decoder"
 msgstr "A-law Coder/Decoder"
 
 #. A-law and Mulaw direct Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:168
-msgid "asterisk_module_codecamu"
+msgid "A-law and Mulaw direct Coder/Decoder"
 msgstr "A-law and Mulaw direct Coder/Decoder"
 
 #. ITU G.726-32kbps G726 Transcoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:169
-msgid "asterisk_module_codecg726"
+msgid "ITU G.726-32kbps G726 Transcoder"
 msgstr "ITU G.726-32kbps G726 Transcoder"
 
 #. GSM/PCM16 (signed linear) Codec Translation
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:170
-msgid "asterisk_module_codecgsm"
+msgid "GSM/PCM16 (signed linear) Codec Translation"
 msgstr "GSM/PCM16 (signed linear) Codec Translation"
 
 #. Speex/PCM16 (signed linear) Codec Translator
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:171
-msgid "asterisk_module_codecspeex"
+msgid "Speex/PCM16 (signed linear) Codec Translator"
 msgstr "Speex/PCM16 (signed linear) Codec Translator"
 
 #. Mu-law Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:172
-msgid "asterisk_module_codeculaw"
+msgid "Mu-law Coder/Decoder"
 msgstr "Mu-law Coder/Decoder"
 
 #. Sun Microsystems AU format (signed linear)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:173
-msgid "asterisk_module_formatau"
+msgid "Sun Microsystems AU format (signed linear)"
 msgstr "Sun Microsystems AU format (signed linear)"
 
 #. G.723.1 Simple Timestamp File Format
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:174
-msgid "asterisk_module_formatg723"
+msgid "G.723.1 Simple Timestamp File Format"
 msgstr "G.723.1 Simple Timestamp File Format"
 
 #. Raw G.726 (16/24/32/40kbps) data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:175
-msgid "asterisk_module_formatg726"
+msgid "Raw G.726 (16/24/32/40kbps) data"
 msgstr "Raw G.726 (16/24/32/40kbps) data"
 
 #. Raw G729 data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:176
-msgid "asterisk_module_formatg729"
+msgid "Raw G729 data"
 msgstr "Raw G729 data"
 
 #. Raw GSM data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:177
-msgid "asterisk_module_formatgsm"
+msgid "Raw GSM data"
 msgstr "Raw GSM data"
 
 #. Raw h263 data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:178
-msgid "asterisk_module_formath263"
+msgid "Raw h263 data"
 msgstr "Raw h263 data"
 
 #. JPEG (Joint Picture Experts Group) Image
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:179
-msgid "asterisk_module_formatjpeg"
+msgid "JPEG (Joint Picture Experts Group) Image"
 msgstr "JPEG (Joint Picture Experts Group) Image"
 
 #. Raw uLaw 8khz Audio support (PCM)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:180
-msgid "asterisk_module_formatpcm"
+msgid "Raw uLaw 8khz Audio support (PCM)"
 msgstr "Raw uLaw 8khz Audio support (PCM)"
 
 #. load =&gt; .so ; Raw aLaw 8khz PCM Audio support
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:181
-msgid "asterisk_module_formatpcmalaw"
+msgid "load => .so ; Raw aLaw 8khz PCM Audio support"
 msgstr "load =&amp;gt; .so ; Raw aLaw 8khz PCM Audio support"
 
 #. Raw Signed Linear Audio support (SLN)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:182
-msgid "asterisk_module_formatsln"
+msgid "Raw Signed Linear Audio support (SLN)"
 msgstr "Raw Signed Linear Audio support (SLN)"
 
 #. Dialogic VOX (ADPCM) File Format
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:183
-msgid "asterisk_module_formatvox"
+msgid "Dialogic VOX (ADPCM) File Format"
 msgstr "Dialogic VOX (ADPCM) File Format"
 
 #. Microsoft WAV format (8000hz Signed Line
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:184
-msgid "asterisk_module_formatwav"
+msgid "Microsoft WAV format (8000hz Signed Line"
 msgstr "Microsoft WAV format (8000hz Signed Line"
 
 #. Microsoft WAV format (Proprietary GSM)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:185
-msgid "asterisk_module_formatwavgsm"
+msgid "Microsoft WAV format (Proprietary GSM)"
 msgstr "Microsoft WAV format (Proprietary GSM)"
 
 #. Caller ID related dialplan functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:186
-msgid "asterisk_module_funccallerid"
+msgid "Caller ID related dialplan functions"
 msgstr "Caller ID liên quan đến chức năng dialplan "
 
 #. ENUM Functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:187
-msgid "asterisk_module_funcenum"
+msgid "ENUM Functions"
 msgstr "chức năng ENUM"
 
 #. URI encoding / decoding functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:188
-msgid "asterisk_module_funcuri"
+msgid "URI encoding / decoding functions"
 msgstr "Chức năng URI encoding / decoding "
 
 #. Asterisk Extension Language Compiler
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:189
-msgid "asterisk_module_pbxael"
+msgid "Asterisk Extension Language Compiler"
 msgstr "Asterisk Extension Language Compiler"
 
 #. Text Extension Configuration
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:190
-msgid "asterisk_module_pbxconfig"
+msgid "Text Extension Configuration"
 msgstr "Cấu hình Text Extension "
 
 #. load =&gt; .so ; Builtin dialplan functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:191
-msgid "asterisk_module_pbxfunctions"
+msgid "load => .so ; Builtin dialplan functions"
 msgstr "load =&amp;gt; .so ; chức năng Builtin dialplan "
 
 #. Loopback Switch
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:192
-msgid "asterisk_module_pbxloopback"
+msgid "Loopback Switch"
 msgstr "Loopback Switch"
 
 #. Realtime Switch
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:193
-msgid "asterisk_module_pbxrealtime"
+msgid "Realtime Switch"
 msgstr "Realtime Switch"
 
 #. Outgoing Spool Support
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:194
-msgid "asterisk_module_pbxspool"
+msgid "Outgoing Spool Support"
 msgstr "Hỗ trợ outgoing spool"
 
 #. Wil Cal U (Auto Dialer)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:195
-msgid "asterisk_module_pbxwilcalu"
+msgid "Wil Cal U (Auto Dialer)"
 msgstr "Wil Cal U (Auto Dialer)"
 
 #. MySQL Config Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:196
-msgid "asterisk_module_resconfigmysql"
+msgid "MySQL Config Resource"
 msgstr "MySQL Config Resource"
 
 #. ODBC Config Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:197
-msgid "asterisk_module_resconfigodbc"
+msgid "ODBC Config Resource"
 msgstr "ODBC Config Resource"
 
 #. PGSQL Module
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:198
-msgid "asterisk_module_resconfigpgsql"
+msgid "PGSQL Module"
 msgstr "PGSQL Module"
 
 #. Cryptographic Digital Signatures
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:199
-msgid "asterisk_module_rescrypto"
+msgid "Cryptographic Digital Signatures"
 msgstr "Cryptographic Digital Signatures"
 
 #. Call Parking Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:200
-msgid "asterisk_module_resfeatures"
+msgid "Call Parking Resource"
 msgstr "Call Parking Resource"
 
 #. Indications Configuration
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:201
-msgid "asterisk_module_resindications"
+msgid "Indications Configuration"
 msgstr "Cấu hình indications"
 
 #. Call Monitoring Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:202
-msgid "asterisk_module_resmonitor"
+msgid "Call Monitoring Resource"
 msgstr "Call Monitoring Resource"
 
 #. Music On Hold Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:203
-msgid "asterisk_module_resmusiconhold"
+msgid "Music On Hold Resource"
 msgstr "Music On Hold Resource"
 
 #. ODBC Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:204
-msgid "asterisk_module_resodbc"
+msgid "ODBC Resource"
 msgstr "ODBC Resource"
 
 #. SMDI Module
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:205
-msgid "asterisk_module_ressmdi"
+msgid "SMDI Module"
 msgstr "SMDI Module"
 
 #. SNMP Module
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:206
-msgid "asterisk_module_ressnmp"
+msgid "SNMP Module"
 msgstr "SNMP Module"
 
 #. Music On Hold
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:207
-msgid "asterisk_moh"
+msgid "Music On Hold"
 msgstr "Music On Hold"
 
 #. Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:208
-msgid "asterisk_moh_application"
+msgid "Application"
 msgstr "Ứng dụng"
 
 #. Directory of Music
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:209
-msgid "asterisk_moh_directory"
+msgid "Directory of Music"
 msgstr "Thư mục music"
 
 #. Option mode
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:210
-msgid "asterisk_moh_mode"
+msgid "Option mode"
 msgstr "Chế độ tùy chọn"
 
 #. Random Play
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:211
-msgid "asterisk_moh_random"
+msgid "Random Play"
 msgstr "Random Play"
 
 #. SIP Connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:212
-msgid "asterisk_sip"
+msgid "SIP Connection"
 msgstr "Kết nối SIP"
 
 #. Always Dial International
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:213
-msgid "asterisk_sip_alwaysinternational"
+msgid "Always Dial International"
 msgstr "Luôn gọi quốc tế"
 
 #. Reinvite/redirect media connections
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:214
-msgid "asterisk_sip_canreinvite"
+msgid "Reinvite/redirect media connections"
 msgstr "Mời lại/chuyển hướng kết nối media"
 
 #. context
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:215
-msgid "asterisk_sip_context"
+msgid "context"
 msgstr "context"
 
 #. Country Code for connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:216
-msgid "asterisk_sip_countrycode"
+msgid "Country Code for connection"
 msgstr "Mã quốc gia để kết nối"
 
 #. DTMF mode
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:217
-msgid "asterisk_sip_dtmfmode"
+msgid "DTMF mode"
 msgstr "chế độ DTMF"
 
 #. Add as Extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:218
-msgid "asterisk_sip_extension"
+msgid "Add as Extension"
 msgstr "Thêm vào như extension"
 
 #. Primary domain identity for From: headers
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:219
-msgid "asterisk_sip_fromdomain"
+msgid "Primary domain identity for From: headers"
 msgstr "Nhận dạng primary domain cho From: headers"
 
 #. From user (required by many SIP providers)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:220
-msgid "asterisk_sip_fromuser"
+msgid "From user (required by many SIP providers)"
 msgstr "Từ user (yêu cầu bởi nhiều nhà cung cấp SIP)"
 
 #. Host name (or blank)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:221
-msgid "asterisk_sip_host"
+msgid "Host name (or blank)"
 msgstr "Tên host (hoặc bỏ trống)"
 
 #. Ring on incoming dialplan contexts
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:222
-msgid "asterisk_sip_incoming"
+msgid "Ring on incoming dialplan contexts"
 msgstr "Ring on incoming dialplan contexts"
 
 #. Allow Insecure for
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:223
-msgid "asterisk_sip_insecure"
+msgid "Allow Insecure for"
 msgstr "Cho phép không an toàn cho"
 
 #. International Dial Prefix
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:224
-msgid "asterisk_sip_internationalprefix"
+msgid "International Dial Prefix"
 msgstr "Tiền tố số gọi quốc tế"
 
 #. Mailbox for MWI
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:225
-msgid "asterisk_sip_mailbox"
+msgid "Mailbox for MWI"
 msgstr "Hộp thư cho MWI"
 
 #. NAT between phone and Asterisk
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:226
-msgid "asterisk_sip_nat"
+msgid "NAT between phone and Asterisk"
 msgstr "NAT giữa điện thoại và Asterisk"
 
 #. Check tags in headers
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:227
-msgid "asterisk_sip_pedantic"
+msgid "Check tags in headers"
 msgstr "Kiểm tra tags trong headers"
 
 #. SIP Port
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:228
-msgid "asterisk_sip_port"
+msgid "SIP Port"
 msgstr "Cổng SIP"
 
 #. Dial Prefix (for external line)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:229
-msgid "asterisk_sip_prefix"
+msgid "Dial Prefix (for external line)"
 msgstr "Tiền tố số gọi (cho nhanh số)"
 
 #. Reply Timeout (ms) for down connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:230
-msgid "asterisk_sip_qualify"
+msgid "Reply Timeout (ms) for down connection"
 msgstr "Trả lời Timeout (ms) cho down kết nối"
 
 #. Register connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:231
-msgid "asterisk_sip_register"
+msgid "Register connection"
 msgstr "Đăng ký kết nối"
 
 #. Secret
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:232
-msgid "asterisk_sip_secret"
+msgid "Secret"
 msgstr "Bí mật"
 
 #. Dial own extension for mailbox
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:233
-msgid "asterisk_sip_selfmailbox"
+msgid "Dial own extension for mailbox"
 msgstr "Gọi nhánh số cho hộp thư"
 
 #. Dial Timeout (sec)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:234
-msgid "asterisk_sip_timeout"
+msgid "Dial Timeout (sec)"
 msgstr "Dial Timeout (giây)"
 
 #. Client Type
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:235
-msgid "asterisk_sip_type"
+msgid "Client Type"
 msgstr "Loại Client"
 
 #. Username
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:236
-msgid "asterisk_sip_username"
+msgid "Username"
 msgstr "Username"
 
 #. Section sipgeneral
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:237
-msgid "asterisk_sipgeneral"
+msgid "Section sipgeneral"
 msgstr "Section sipgeneral"
 
 #. Allow codecs
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:238
-msgid "asterisk_sipgeneral_allow"
+msgid "Allow codecs"
 msgstr "Cho phép Codecs"
 
 #. SIP Port
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:239
-msgid "asterisk_sipgeneral_port"
+msgid "SIP Port"
 msgstr "Cổng SIP"
 
 #. SIP realm
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:240
-msgid "asterisk_sipgeneral_realm"
+msgid "SIP realm"
 msgstr "SIP realm"
 
 #. Voicemail general options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:241
-msgid "asterisk_voicegeneral"
+msgid "Voicemail general options"
 msgstr "Thư thoại tùy chọn tổng quát"
 
 #. From Email address of server
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:242
-msgid "asterisk_voicegeneral_serveremail"
+msgid "From Email address of server"
 msgstr "Từ địa chỉ email của server"
 
 #. Voice Mail boxes
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:243
-msgid "asterisk_voicemail"
+msgid "Voice Mail boxes"
 msgstr "Hộp thư thoại"
 
 #. Email contains attachment
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:244
-msgid "asterisk_voicemail_attach"
+msgid "Email contains attachment"
 msgstr "Email bao gồm attachment"
 
 #. Email
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:245
-msgid "asterisk_voicemail_email"
+msgid "Email"
 msgstr "Email"
 
 #. Display Name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:246
-msgid "asterisk_voicemail_name"
+msgid "Display Name"
 msgstr "Tên display"
 
 #. Password
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:247
-msgid "asterisk_voicemail_password"
+msgid "Password"
 msgstr "Mật khẩu"
 
 #. zone
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:248
-msgid "asterisk_voicemail_zone"
+msgid "zone"
 msgstr "zone"
 
 #. Voice Zone settings
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:249
-msgid "asterisk_voicezone"
+msgid "Voice Zone settings"
 msgstr "Cài đặt voice zone"
 
 #. Message Format
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:250
-msgid "asterisk_voicezone_message"
+msgid "Message Format"
 msgstr "Message Format"
 
 #. Time Zone
diff --git a/po/vi/cbi.po b/po/vi/cbi.po
index b1b83b283..c28e310c2 100644
--- a/po/vi/cbi.po
+++ b/po/vi/cbi.po
@@ -15,88 +15,88 @@ msgstr ""
 
 #. Add entry
 #: i18n/english/luasrc/i18n/cbi.en.lua:1
-msgid "cbi_add"
+msgid "Add"
 msgstr "Thêm nội dung"
 
 #. Remove entry
 #: i18n/english/luasrc/i18n/cbi.en.lua:2
-msgid "cbi_del"
+msgid "Delete"
 msgstr "Loại bỏ nội dung"
 
 #. Replace entry
 #: i18n/english/luasrc/i18n/cbi.en.lua:3
-msgid "cbi_replace"
+msgid "Replace entry"
 msgstr "thay đổi nội dung"
 
 #. Invalid input value
 #: i18n/english/luasrc/i18n/cbi.en.lua:4
-msgid "cbi_invalid"
+msgid "Invalid"
 msgstr "Giá trị nhập vào không hợp lí"
 
 #. <strong>Validation failed:</strong> Please check any input fields for mistakes.
 #: i18n/english/luasrc/i18n/cbi.en.lua:5
-msgid "cbi_invalid_section"
+msgid "<strong>Validation failed:</strong> Please check any input fields for mistakes."
 msgstr ""
 "<strong>Xác nhận không thành công:</strong> Xin kiểm tra lại nội dung nhập "
 "vào."
 
 #. This field is mandatory
 #: i18n/english/luasrc/i18n/cbi.en.lua:6
-msgid "cbi_missing"
+msgid "This field is mandatory"
 msgstr "Đây là mục bắt buộc"
 
 #. <strong>Validation failed:</strong> At least one mandatory field has no or an invalid value
 #: i18n/english/luasrc/i18n/cbi.en.lua:7
-msgid "cbi_deperror"
+msgid "<strong>Validation failed:</strong> At least one mandatory field has no or an invalid value"
 msgstr ""
 "<strong>Xác nhận không thành công:</strong>  Ít nhất một mục bắt buộc không "
 "có giá trị hoặc giá trị không đúng. "
 
 #. A requirement for this option was not met
 #: i18n/english/luasrc/i18n/cbi.en.lua:8
-msgid "cbi_reqerror"
+msgid "A requirement for this option was not met"
 msgstr "Yêu cầu cho lựa chọn này không được đáp ứng"
 
 #. -- Additional Field --
 #: i18n/english/luasrc/i18n/cbi.en.lua:9
-msgid "cbi_addopt"
+msgid "-- Additional Field --"
 msgstr "---Mục bổ sung---"
 
 #.  (optional)
 #: i18n/english/luasrc/i18n/cbi.en.lua:10
-msgid "cbi_optional"
+msgid " (optional)"
 msgstr ""
 "<span class=\"translation-space\"> </span>\n"
 "(tùy ý)"
 
 #. This section contains no values yet
 #: i18n/english/luasrc/i18n/cbi.en.lua:11
-msgid "cbi_sectempty"
+msgid "This section contains no values yet"
 msgstr "Phần này chưa có giá trị nào"
 
 #. -- custom --
 #: i18n/english/luasrc/i18n/cbi.en.lua:12
-msgid "cbi_manual"
+msgid "-- custom --"
 msgstr "--tùy chỉnh--"
 
 #. -- Please choose --
 #: i18n/english/luasrc/i18n/cbi.en.lua:13
-msgid "cbi_select"
+msgid "-- Please choose --"
 msgstr "--Hãy chọn--"
 
 #. Go to relevant configuration page
 #: i18n/english/luasrc/i18n/cbi.en.lua:14
-msgid "cbi_gorel"
+msgid " "
 msgstr "Đi tới trang cấu hình thích hợp"
 
 #. Applying changes
 #: i18n/english/luasrc/i18n/cbi.en.lua:15
-msgid "cbi_applying"
+msgid "Applying changes"
 msgstr "Tiến hành thay đổi"
 
 #. Uploaded File
 #: i18n/english/luasrc/i18n/cbi.en.lua:16
-msgid "cbi_upload"
+msgid "Uploaded File"
 msgstr "Tập tin đã tải lên"
 
 #. Search file...
diff --git a/po/vi/coovachilli.po b/po/vi/coovachilli.po
index 49cb3a471..f89a1747a 100644
--- a/po/vi/coovachilli.po
+++ b/po/vi/coovachilli.po
@@ -15,37 +15,37 @@ msgstr ""
 
 #. CoovaChilli
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:1
-msgid "coovachilli"
+msgid "CoovaChilli"
 msgstr "CoovaChilli"
 
 #. General configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:2
-msgid "coovachilli_general"
+msgid "General configuration"
 msgstr "Cấu hình tổng quát"
 
 #. General CoovaChilli settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:3
-msgid "coovachilli_general_desc"
+msgid "General CoovaChilli settings"
 msgstr "Các cài đặt CoovaChilli tổng quát"
 
 #. Command socket
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:4
-msgid "coovachilli_general_cmdsock"
+msgid "Command socket"
 msgstr "Command socket"
 
 #. UNIX socket used for communication with chilli_query
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:5
-msgid "coovachilli_general_cmdsock_desc"
+msgid "UNIX socket used for communication with chilli_query"
 msgstr "UNIX socket dùng để giao tiếp với chilli_query"
 
 #. Config refresh interval
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:6
-msgid "coovachilli_general_interval"
+msgid "Config refresh interval"
 msgstr "Config refresh interval"
 
 #. Re-read configuration file and do DNS lookups every interval seconds. This has the same effect as sending the HUP signal. If interval is 0 (zero) this feature is disabled. 
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:7
-msgid "coovachilli_general_interval_desc"
+msgid "Re-read configuration file and do DNS lookups every interval seconds. This has the same effect as sending the HUP signal. If interval is 0 (zero) this feature is disabled. "
 msgstr ""
 "Đọc lại tập tin cấu hình và tra cưứ DNS mỗi giây. Cái này có ảnh hưởng giống "
 "như đang gửi một tín hiệu HUP. Nếu  interval là 0, tính năng này sẽ bị vô "
@@ -53,711 +53,711 @@ msgstr ""
 
 #. Pid file
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:8
-msgid "coovachilli_general_pidfile"
+msgid "Pid file"
 msgstr "Tập tin Pid"
 
 #. Filename to put the process id
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:9
-msgid "coovachilli_general_pidfile_desc"
+msgid "Filename to put the process id"
 msgstr "Tên tập tin để đặt làm ID xử lý"
 
 #. State directory
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:10
-msgid "coovachilli_general_statedir"
+msgid "State directory"
 msgstr "Dạnh bạ vùng"
 
 #. Directory of non-volatile data
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:11
-msgid "coovachilli_general_statedir_desc"
+msgid "Directory of non-volatile data"
 msgstr "Thư mục của những dữ liệu cố định"
 
 #. TUN/TAP configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:12
-msgid "coovachilli_tun"
+msgid "TUN/TAP configuration"
 msgstr "Cấu hình TUN/TAP"
 
 #. Network/Tun configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:13
-msgid "coovachilli_tun_desc"
+msgid "Network/Tun configuration"
 msgstr "Mạng lưới/ Cấu hình TUN"
 
 #. Network down script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:14
-msgid "coovachilli_tun_condown"
+msgid "Network down script"
 msgstr "Network down script"
 
 #. Script executed after a session has moved from authorized state to unauthorized
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:15
-msgid "coovachilli_tun_condown_desc"
+msgid "Script executed after a session has moved from authorized state to unauthorized"
 msgstr ""
 "Script đã thực hiện sau khi một section đã di chuyển từ nơi có thẩm quyền "
 "đến nơi không"
 
 #. Network up script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:16
-msgid "coovachilli_tun_conup"
+msgid "Network up script"
 msgstr "Network up script"
 
 #. Script executed after the tun network interface has been brought up
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:17
-msgid "coovachilli_tun_conup_desc"
+msgid "Script executed after the tun network interface has been brought up"
 msgstr "Script thi hành sau khi giao diện mạng tun được đưa lên"
 
 #. Primary DNS Server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:18
-msgid "coovachilli_tun_dns1"
+msgid "Primary DNS Server"
 msgstr "Primary DNS Server"
 
 #. Is used to inform the client about the DNS address to use for host name resolution
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:19
-msgid "coovachilli_tun_dns1_desc"
+msgid "Is used to inform the client about the DNS address to use for host name resolution"
 msgstr ""
 "Được sử dụng để thông báo cho khách hàng về các địa chỉ DNS để sử dụng cho "
 "sự phân giải tên host"
 
 #. Secondary DNS Server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:20
-msgid "coovachilli_tun_dns2"
+msgid "Secondary DNS Server"
 msgstr "Secondary DNS Server"
 
 #. Is used to inform the client about the DNS address to use for host name resolution
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:21
-msgid "coovachilli_tun_dns2_desc"
+msgid "Is used to inform the client about the DNS address to use for host name resolution"
 msgstr ""
 "Được sử dụng để thông báo cho khách hàng về các địa chỉ DNS để sử dụng cho "
 "sự phân giải tên host"
 
 #. Domain name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:22
-msgid "coovachilli_tun_domain"
+msgid "Domain name"
 msgstr "Tên miền"
 
 #. Is used to inform the client about the domain name to use for DNS lookups
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:23
-msgid "coovachilli_tun_domain_desc"
+msgid "Is used to inform the client about the domain name to use for DNS lookups"
 msgstr ""
 "Được sử dụng để thông báo cho khách hàng về tên miền để dùng cho các tra cứu "
 "DNS"
 
 #. Dynamic IP address pool
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:24
-msgid "coovachilli_tun_dynip"
+msgid "Dynamic IP address pool"
 msgstr "Dynamic IP address pool"
 
 #. Specifies a pool of dynamic IP addresses
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:25
-msgid "coovachilli_tun_dynip_desc"
+msgid "Specifies a pool of dynamic IP addresses"
 msgstr "Chỉ định một pool of dynamic IP addresses"
 
 #. IP down script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:26
-msgid "coovachilli_tun_ipdown"
+msgid "IP down script"
 msgstr "IP down script"
 
 #. Script executed after the tun network interface has been taken down
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:27
-msgid "coovachilli_tun_ipdown_desc"
+msgid "Script executed after the tun network interface has been taken down"
 msgstr "Script thực hiện sau khi giao diện mạng tun bị lấy xuống"
 
 #. IP up script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:28
-msgid "coovachilli_tun_ipup"
+msgid "IP up script"
 msgstr "IP up script"
 
 #. Script executed after the TUN/TAP network interface has been brought up
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:29
-msgid "coovachilli_tun_ipup_desc"
+msgid "Script executed after the TUN/TAP network interface has been brought up"
 msgstr "Script thực hiện sau khi giao diện mạng TUN/TAP đã được đưa lên"
 
 #. Uplink subnet
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:30
-msgid "coovachilli_tun_net"
+msgid "Uplink subnet"
 msgstr "Uplink subnet"
 
 #. Network address of the uplink interface (CIDR notation)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:31
-msgid "coovachilli_tun_net_desc"
+msgid "Network address of the uplink interface (CIDR notation)"
 msgstr "Địa chỉ mạng của giao diện uplink (CIDR chú thích)"
 
 #. Static IP address pool
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:32
-msgid "coovachilli_tun_statip"
+msgid "Static IP address pool"
 msgstr "Static IP address pool"
 
 #. Specifies a pool of static IP addresses
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:33
-msgid "coovachilli_tun_statip_desc"
+msgid "Specifies a pool of static IP addresses"
 msgstr "Chỉ định một pool of static IP addresses"
 
 #. TUN/TAP device
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:34
-msgid "coovachilli_tun_tundev"
+msgid "TUN/TAP device"
 msgstr "TUN/TAP device"
 
 #. The specific device to use for the TUN/TAP interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:35
-msgid "coovachilli_tun_tundev_desc"
+msgid "The specific device to use for the TUN/TAP interface"
 msgstr "Thiết bị cụ thể để dùng cho giao diện TUN/TAP"
 
 #. TX queue length
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:36
-msgid "coovachilli_tun_txqlen"
+msgid "TX queue length"
 msgstr "Độ dài của TX queue"
 
 #. The TX queue length to set on the TUN/TAP interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:37
-msgid "coovachilli_tun_txqlen_desc"
+msgid "The TX queue length to set on the TUN/TAP interface"
 msgstr "Độ dài TX queue để đặt trên giao diện TUN/TAP "
 
 #. Use TAP device
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:38
-msgid "coovachilli_tun_usetap"
+msgid "Use TAP device"
 msgstr "Dùng dụng cụ TAP"
 
 #. Use the TAP interface instead of TUN
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:39
-msgid "coovachilli_tun_usetap_desc"
+msgid "Use the TAP interface instead of TUN"
 msgstr "Dùng giao diện TAP thay cho TUN"
 
 #. DHCP configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:40
-msgid "coovachilli_dhcp"
+msgid "DHCP configuration"
 msgstr "Cấu hình DHCP"
 
 #. Set DHCP options for connecting clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:41
-msgid "coovachilli_dhcp_desc"
+msgid "Set DHCP options for connecting clients"
 msgstr "Đặt lựa chọn DHCP cho đối tượng kết nối"
 
 #. DHCP end number
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:42
-msgid "coovachilli_dhcp_dhcpend"
+msgid "DHCP end number"
 msgstr "Số cuối DHCP"
 
 #. Where to stop assigning IP addresses (default 254)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:43
-msgid "coovachilli_dhcp_dhcpend_desc"
+msgid "Where to stop assigning IP addresses (default 254)"
 msgstr "Chỗ để stop những gán IP (mặc định 254)"
 
 #. DHCP interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:44
-msgid "coovachilli_dhcp_dhcpif"
+msgid "DHCP interface"
 msgstr "Giao diện DHCP"
 
 #. Ethernet interface to listen to for the downlink interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:45
-msgid "coovachilli_dhcp_dhcpif_desc"
+msgid "Ethernet interface to listen to for the downlink interface"
 msgstr "Giao diện Ethernet để listen cho những giao diện downlink "
 
 #. Listen MAC address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:46
-msgid "coovachilli_dhcp_dhcpmac"
+msgid "Listen MAC address"
 msgstr "Nghe địa chỉ MAC"
 
 #. MAC address to listen to. If not specified the MAC address of the interface will be used
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:47
-msgid "coovachilli_dhcp_dhcpmac_desc"
+msgid "MAC address to listen to. If not specified the MAC address of the interface will be used"
 msgstr ""
 "Địa chỉ MAC để  nghe. Nếu địa chỉ MAC chỉ định của giao diện sẽ được sử dụng "
 ""
 
 #. DHCP start number
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:48
-msgid "coovachilli_dhcp_dhcpstart"
+msgid "DHCP start number"
 msgstr "Số DHCP bắt đầu "
 
 #. Where to start assigning IP addresses (default 10)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:49
-msgid "coovachilli_dhcp_dhcpstart_desc"
+msgid "Where to start assigning IP addresses (default 10)"
 msgstr "Chỗ để bắt đầu gán địa chỉ IP (mặc định 10)"
 
 #. Enable IEEE 802.1x
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:50
-msgid "coovachilli_dhcp_eapolenable"
+msgid "Enable IEEE 802.1x"
 msgstr "Kích hoạt IEEE 802.1x"
 
 #. Enable IEEE 802.1x authentication and listen for EAP requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:51
-msgid "coovachilli_dhcp_eapolenable_desc"
+msgid "Enable IEEE 802.1x authentication and listen for EAP requests"
 msgstr "Kích hoạt quá trình xác thực IEEE 802.1x và lắng nghe yêu cầu EAP"
 
 #. Leasetime
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:52
-msgid "coovachilli_dhcp_lease"
+msgid "Leasetime"
 msgstr "Leasetime"
 
 #. Use a DHCP lease of seconds (default 600)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:53
-msgid "coovachilli_dhcp_lease_desc"
+msgid "Use a DHCP lease of seconds (default 600)"
 msgstr "Dùng một DHCP lease ở giây (600)"
 
 #. RADIUS configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:54
-msgid "coovachilli_radius"
+msgid "RADIUS configuration"
 msgstr "Cấu hình RADIUS"
 
 #. RADIUS configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:55
-msgid "coovachilli_radius_desc"
+msgid "RADIUS configuration"
 msgstr "Cấu hình RADIUS"
 
 #. Allow session update through RADIUS
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:56
-msgid "coovachilli_radius_acctupdate"
+msgid "Allow session update through RADIUS"
 msgstr "Cho phép phiên cập nhật thông qua RADIUS"
 
 #. Allow updating of session parameters with RADIUS attributes sent in Accounting-Response
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:57
-msgid "coovachilli_radius_acctupdate_desc"
+msgid "Allow updating of session parameters with RADIUS attributes sent in Accounting-Response"
 msgstr ""
 "Cho phép phiên cập nhật tham số phiên với RADIUS được gửi trong Accounting-"
 "Response"
 
 #. Admin password
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:58
-msgid "coovachilli_radius_adminpasswd"
+msgid "Admin password"
 msgstr "Mật mã quản trị "
 
 #. Password to use for Administrative-User authentication in order to pick up chilli configurations and establish a device &quot;system&quot; session
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:59
-msgid "coovachilli_radius_adminpasswd_desc"
+msgid "Password to use for Administrative-User authentication in order to pick up chilli configurations and establish a device \"system\" session"
 msgstr ""
 "Mật mã dùng để xác thực chế độ quản trị để pick up cấu hình chilli và thành "
 "lập một công cụ &amp;quot;system&amp;quot; session"
 
 #. Admin user
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:60
-msgid "coovachilli_radius_adminuser"
+msgid "Admin user"
 msgstr "Người quản trị "
 
 #. User-name to use for Administrative-User authentication in order to pick up chilli configurations and establish a device &quot;system&quot; session
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:61
-msgid "coovachilli_radius_adminuser_desc"
+msgid "User-name to use for Administrative-User authentication in order to pick up chilli configurations and establish a device \"system\" session"
 msgstr ""
 "User name dùng để xác thực chế độ quản trị để pick up cấu hình chilli và "
 "thành lập một công cụ &amp;quot;system&amp;quot; session"
 
 #. Do not check disconnection requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:62
-msgid "coovachilli_radius_coanoipcheck"
+msgid "Do not check disconnection requests"
 msgstr "Không kiểm tra yêu cầu ngừng kết nối"
 
 #. Do not check the source IP address of radius disconnect requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:63
-msgid "coovachilli_radius_coanoipcheck_desc"
+msgid "Do not check the source IP address of radius disconnect requests"
 msgstr ""
 "Không tên kiểm tra nguồn địa chỉ IP trong bán kính yêu cầu ngừng kết nối"
 
 #. RADIUS disconnect port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:64
-msgid "coovachilli_radius_coaport"
+msgid "RADIUS disconnect port"
 msgstr "Cửa ngừng kết nối RADIUS"
 
 #. UDP port to listen to for accepting radius disconnect requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:65
-msgid "coovachilli_radius_coaport_desc"
+msgid "UDP port to listen to for accepting radius disconnect requests"
 msgstr "Cửa UDP để nghe khi chấp nhận một yêu cầu ngừng kết nối"
 
 #. NAS IP
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:66
-msgid "coovachilli_radius_nasip"
+msgid "NAS IP"
 msgstr "NAS IP "
 
 #. Value to use in RADIUS NAS-IP-Address attribute
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:67
-msgid "coovachilli_radius_nasip_desc"
+msgid "Value to use in RADIUS NAS-IP-Address attribute"
 msgstr "Giá trị để dùng trong RADIUS NAS-IP-Address attribute"
 
 #. NAS MAC
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:68
-msgid "coovachilli_radius_nasmac"
+msgid "NAS MAC"
 msgstr "NAS MAC"
 
 #. MAC address value to use in RADIUS Called-Station-ID attribute
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:69
-msgid "coovachilli_radius_nasmac_desc"
+msgid "MAC address value to use in RADIUS Called-Station-ID attribute"
 msgstr "Giá trị địa chỉ MAC để dùng trong RADIUS Called-Station-ID attribute"
 
 #. Allow OpenID authentication
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:70
-msgid "coovachilli_radius_openidauth"
+msgid "Allow OpenID authentication"
 msgstr "Cho phép xác thực OpenID "
 
 #. Allows OpenID authentication by sending ChilliSpot-Config=allow-openidauth in RADIUS Access-Requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:71
-msgid "coovachilli_radius_openidauth_desc"
+msgid "Allows OpenID authentication by sending ChilliSpot-Config=allow-openidauth in RADIUS Access-Requests"
 msgstr ""
 "Cho phép xác thực OpenID bằng cách gửi ChilliSpot-Config=allow-openidauth in "
 "RADIUS Access-Requests"
 
 #. RADIUS accounting port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:72
-msgid "coovachilli_radius_radiusacctport"
+msgid "RADIUS accounting port"
 msgstr "Cổng RADIUS accounting"
 
 #. The UDP port number to use for radius accounting requests (default 1813)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:73
-msgid "coovachilli_radius_radiusacctport_desc"
+msgid "The UDP port number to use for radius accounting requests (default 1813)"
 msgstr "Số của cổng UDP dùng cho yêu cầu radius accounting (mặcđịnh 1813)"
 
 #. RADIUS authentication port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:74
-msgid "coovachilli_radius_radiusauthport"
+msgid "RADIUS authentication port"
 msgstr "Cổng xác thực RADIUS"
 
 #. The UDP port number to use for radius authentication requests (default 1812)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:75
-msgid "coovachilli_radius_radiusauthport_desc"
+msgid "The UDP port number to use for radius authentication requests (default 1812)"
 msgstr "Số của cổng UDP để yêu cầu xác thực radius (default 1812)"
 
 #. Option radiuscalled
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:76
-msgid "coovachilli_radius_radiuscalled"
+msgid "Option radiuscalled"
 msgstr "Tùy chọn radiuscalled"
 
 #. RADIUS listen address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:77
-msgid "coovachilli_radius_radiuslisten"
+msgid "RADIUS listen address"
 msgstr "Địa chỉ nghe RADIUS"
 
 #. Local interface IP address to use for the radius interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:78
-msgid "coovachilli_radius_radiuslisten_desc"
+msgid "Local interface IP address to use for the radius interface"
 msgstr "Địa chỉ IP giao diện địa phương để dùng cho giao diện radius"
 
 #. RADIUS location ID
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:79
-msgid "coovachilli_radius_radiuslocationid"
+msgid "RADIUS location ID"
 msgstr "RADIUS vị tri ID"
 
 #. WISPr Location ID
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:80
-msgid "coovachilli_radius_radiuslocationid_desc"
+msgid "WISPr Location ID"
 msgstr "WISPr vị trí ID"
 
 #. RADIUS location name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:81
-msgid "coovachilli_radius_radiuslocationname"
+msgid "RADIUS location name"
 msgstr "Tên vị trí RADIUS"
 
 #. WISPr Location Name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:82
-msgid "coovachilli_radius_radiuslocationname_desc"
+msgid "WISPr Location Name"
 msgstr "Tên vị trí WISPr"
 
 #. NAS ID
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:83
-msgid "coovachilli_radius_radiusnasid"
+msgid "NAS ID"
 msgstr "NAS ID"
 
 #. Network access server identifier
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:84
-msgid "coovachilli_radius_radiusnasid_desc"
+msgid "Network access server identifier"
 msgstr "Network truy cập server identifier"
 
 #. Option radiusnasip
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:85
-msgid "coovachilli_radius_radiusnasip"
+msgid "Option radiusnasip"
 msgstr "Lựa chọn radiusnasip"
 
 #. NAS port type
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:86
-msgid "coovachilli_radius_radiusnasporttype"
+msgid "NAS port type"
 msgstr "Loại cổng NAS"
 
 #. Value of NAS-Port-Type attribute. Defaults to 19 (Wireless-IEEE-802.11)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:87
-msgid "coovachilli_radius_radiusnasporttype_desc"
+msgid "Value of NAS-Port-Type attribute. Defaults to 19 (Wireless-IEEE-802.11)"
 msgstr ""
 "Giá trị của NAS-Port-Type attribute. Mặc định tới 19 (Wireless-IEEE-802.11)"
 
 #. Send RADIUS VSA
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:88
-msgid "coovachilli_radius_radiusoriginalurl"
+msgid "Send RADIUS VSA"
 msgstr "Gá»­i RADIUS VSA"
 
 #. Send the ChilliSpot-OriginalURL RADIUS VSA in Access-Request
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:89
-msgid "coovachilli_radius_radiusoriginalurl_desc"
+msgid "Send the ChilliSpot-OriginalURL RADIUS VSA in Access-Request"
 msgstr "Gửi ChilliSpot-OriginalURL RADIUS VSA trong yêu cầu truy cập"
 
 #. RADIUS secret
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:90
-msgid "coovachilli_radius_radiussecret"
+msgid "RADIUS secret"
 msgstr "RADIUS bí mật"
 
 #. Radius shared secret for both servers
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:91
-msgid "coovachilli_radius_radiussecret_desc"
+msgid "Radius shared secret for both servers"
 msgstr "Radius chia sẻ bí mật cho cả 2 servers"
 
 #. RADIUS server 1
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:92
-msgid "coovachilli_radius_radiusserver1"
+msgid "RADIUS server 1"
 msgstr "RADIUS server 1"
 
 #. The IP address of radius server 1
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:93
-msgid "coovachilli_radius_radiusserver1_desc"
+msgid "The IP address of radius server 1"
 msgstr "Địa chỉ IP của radius server 1"
 
 #. RADIUS server 2
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:94
-msgid "coovachilli_radius_radiusserver2"
+msgid "RADIUS server 2"
 msgstr "RADIUS server 2"
 
 #. The IP address of radius server 2
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:95
-msgid "coovachilli_radius_radiusserver2_desc"
+msgid "The IP address of radius server 2"
 msgstr "Địa chỉ IP của radius server 2"
 
 #. Swap octets
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:96
-msgid "coovachilli_radius_swapoctets"
+msgid "Swap octets"
 msgstr "Swap octets"
 
 #. Swap the meaning of &quot;input octets&quot; and &quot;output octets&quot; as it related to RADIUS attribtues
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:97
-msgid "coovachilli_radius_swapoctets_desc"
+msgid "Swap the meaning of \"input octets\" and \"output octets\" as it related to RADIUS attribtues"
 msgstr ""
 "Hoán ý nghĩa của &amp;quot;input octets&amp;quot; và &amp;quot;output "
 "octets&amp;quot; khi nó liên quan tới RADIUS attribtues"
 
 #. Allow WPA guests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:98
-msgid "coovachilli_radius_wpaguests"
+msgid "Allow WPA guests"
 msgstr "Cho phép WPA guests"
 
 #. Allows WPA Guest authentication by sending ChilliSpot-Config=allow-wpa-guests in RADIUS Access-Requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:99
-msgid "coovachilli_radius_wpaguests_desc"
+msgid "Allows WPA Guest authentication by sending ChilliSpot-Config=allow-wpa-guests in RADIUS Access-Requests"
 msgstr ""
 "Cho phép xác thực WPA Guest bằng cách gửi ChilliSpot-Config=allow-wpa-guests "
 "trong RADIUS yêu cầu truy cập"
 
 #. RADIUS proxy settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:100
-msgid "coovachilli_proxy"
+msgid "RADIUS proxy settings"
 msgstr "Những cài đặt RADIUS proxy "
 
 #. RADIUS proxy settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:101
-msgid "coovachilli_proxy_desc"
+msgid "RADIUS proxy settings"
 msgstr "Những cài đặt RADIUS proxy"
 
 #. Proxy client
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:102
-msgid "coovachilli_proxy_proxyclient"
+msgid "Proxy client"
 msgstr "Proxy client"
 
 #. IP address from which radius requests are accepted. If omitted the server will not accept radius requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:103
-msgid "coovachilli_proxy_proxyclient_desc"
+msgid "IP address from which radius requests are accepted. If omitted the server will not accept radius requests"
 msgstr ""
 "Địa chỉ IP mà yêu cầu radius được chấp nhận. Nếu bỏ qua server sẽ không chấp "
 "nhận yêu cầu radius."
 
 #. Proxy listen address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:104
-msgid "coovachilli_proxy_proxylisten"
+msgid "Proxy listen address"
 msgstr "Proxy listen address"
 
 #. Local interface IP address to use for accepting radius requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:105
-msgid "coovachilli_proxy_proxylisten_desc"
+msgid "Local interface IP address to use for accepting radius requests"
 msgstr "Địa chỉ giao diện IP  địa phương dùng để chấp nhận yêu cầu radius"
 
 #. Proxy port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:106
-msgid "coovachilli_proxy_proxyport"
+msgid "Proxy port"
 msgstr "Proxy port"
 
 #. UDP Port to listen to for accepting radius requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:107
-msgid "coovachilli_proxy_proxyport_desc"
+msgid "UDP Port to listen to for accepting radius requests"
 msgstr "Cổng UDP để listen để chấp nhận yêu cầu radius"
 
 #. Proxy secret
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:108
-msgid "coovachilli_proxy_proxysecret"
+msgid "Proxy secret"
 msgstr "Proxy bí mật"
 
 #. Radius shared secret for clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:109
-msgid "coovachilli_proxy_proxysecret_desc"
+msgid "Radius shared secret for clients"
 msgstr "Radius chia sẻ bí mật cho các client"
 
 #. UAM configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:110
-msgid "coovachilli_uam"
+msgid "UAM configuration"
 msgstr "Cấu hình UAM"
 
 #. Unified Configuration Method settings
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:111
-msgid "coovachilli_uam_desc"
+msgid "Unified Configuration Method settings"
 msgstr "Thống nhất cấu hình phương pháp cài đặt"
 
 #. Use Chilli XML
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:112
-msgid "coovachilli_uam_chillixml"
+msgid "Use Chilli XML"
 msgstr "Dùng Chilli XML"
 
 #. Return the so-called Chilli XML along with WISPr XML
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:113
-msgid "coovachilli_uam_chillixml_desc"
+msgid "Return the so-called Chilli XML along with WISPr XML"
 msgstr "Trở về cái gọi là Chilli XML cùng với WISPr XML"
 
 #. Default idle timeout
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:114
-msgid "coovachilli_uam_defidletimeout"
+msgid "Default idle timeout"
 msgstr "Mặc định idle timeout"
 
 #. Default idle timeout unless otherwise set by RADIUS (defaults to 0)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:115
-msgid "coovachilli_uam_defidletimeout_desc"
+msgid "Default idle timeout unless otherwise set by RADIUS (defaults to 0)"
 msgstr "Mặc định idle timeout trừ khi đặt bởi RADIUS (mặc định tới 0)"
 
 #. Default interim interval
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:116
-msgid "coovachilli_uam_definteriminterval"
+msgid "Default interim interval"
 msgstr "Mặc định interim interval"
 
 #. Default interim-interval for RADIUS accounting unless otherwise set by RADIUS (defaults to 0)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:117
-msgid "coovachilli_uam_definteriminterval_desc"
+msgid "Default interim-interval for RADIUS accounting unless otherwise set by RADIUS (defaults to 0)"
 msgstr ""
 "Mặc định interim-interval cho RADIUS accounting trừ khi đặt bởi RADIUS "
 "(defaults tới 0)"
 
 #. Default session timeout
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:118
-msgid "coovachilli_uam_defsessiontimeout"
+msgid "Default session timeout"
 msgstr "Mặc định session timeout"
 
 #. Default session timeout unless otherwise set by RADIUS (defaults to 0)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:119
-msgid "coovachilli_uam_defsessiontimeout_desc"
+msgid "Default session timeout unless otherwise set by RADIUS (defaults to 0)"
 msgstr "Mặc định session timeout trừ khi đặt bởi RADIUS (mặc định tới 0)"
 
 #. Inspect DNS traffic
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:120
-msgid "coovachilli_uam_dnsparanoia"
+msgid "Inspect DNS traffic"
 msgstr "Kiểm tra lưu thông DNS"
 
 #. Inspect DNS packets and drop responses with any non- A, CNAME, SOA, or MX records to prevent dns tunnels (experimental)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:121
-msgid "coovachilli_uam_dnsparanoia_desc"
+msgid "Inspect DNS packets and drop responses with any non- A, CNAME, SOA, or MX records to prevent dns tunnels (experimental)"
 msgstr ""
 
 #. Local users file
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:122
-msgid "coovachilli_uam_localusers"
+msgid "Local users file"
 msgstr ""
 
 #. A colon seperated file containing usernames and passwords of locally authenticated users
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:123
-msgid "coovachilli_uam_localusers_desc"
+msgid "A colon seperated file containing usernames and passwords of locally authenticated users"
 msgstr ""
 
 #. Location name
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:124
-msgid "coovachilli_uam_locationname"
+msgid "Location name"
 msgstr ""
 
 #. Human readable location name used in JSON interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:125
-msgid "coovachilli_uam_locationname_desc"
+msgid "Human readable location name used in JSON interface"
 msgstr ""
 
 #. Do not redirect to UAM server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:126
 #, fuzzy
-msgid "coovachilli_uam_nouamsuccess"
+msgid "Do not redirect to UAM server"
 msgstr "Thống nhất cấu hình phương pháp cài đặt"
 
 #. Do not return to UAM server on login success, just redirect to original URL
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:127
 #, fuzzy
-msgid "coovachilli_uam_nouamsuccess_desc"
+msgid "Do not return to UAM server on login success, just redirect to original URL"
 msgstr "Thống nhất cấu hình phương pháp cài đặt"
 
 #. Do not do WISPr
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:128
 #, fuzzy
-msgid "coovachilli_uam_nouamwispr"
+msgid "Do not do WISPr"
 msgstr "Thống nhất cấu hình phương pháp cài đặt"
 
 #. Do not do any WISPr XML, assume the back-end is doing this instead
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:129
 #, fuzzy
-msgid "coovachilli_uam_nouamwispr_desc"
+msgid "Do not do any WISPr XML, assume the back-end is doing this instead"
 msgstr "Thống nhất cấu hình phương pháp cài đặt"
 
 #. Post auth proxy
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:130
-msgid "coovachilli_uam_postauthproxy"
+msgid "Post auth proxy"
 msgstr ""
 
 #. Used with postauthproxyport to define a post authentication HTTP proxy server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:131
-msgid "coovachilli_uam_postauthproxy_desc"
+msgid "Used with postauthproxyport to define a post authentication HTTP proxy server"
 msgstr ""
 
 #. Post auth proxy port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:132
-msgid "coovachilli_uam_postauthproxyport"
+msgid "Post auth proxy port"
 msgstr ""
 
 #. Used with postauthproxy to define a post authentication HTTP proxy server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:133
-msgid "coovachilli_uam_postauthproxyport_desc"
+msgid "Used with postauthproxy to define a post authentication HTTP proxy server"
 msgstr ""
 
 #. Allowed resources
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:134
-msgid "coovachilli_uam_uamallowed"
+msgid "Allowed resources"
 msgstr ""
 
 #. List of resources the client can access without first authenticating
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:135
 #, fuzzy
-msgid "coovachilli_uam_uamallowed_desc"
+msgid "List of resources the client can access without first authenticating"
 msgstr "Thống nhất cấu hình phương pháp cài đặt"
 
 #. Allow any DNS server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:136
 #, fuzzy
-msgid "coovachilli_uam_uamanydns"
+msgid "Allow any DNS server"
 msgstr "Thống nhất cấu hình phương pháp cài đặt"
 
 #. Allow any DNS server for unauthenticated clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:137
 #, fuzzy
-msgid "coovachilli_uam_uamanydns_desc"
+msgid "Allow any DNS server for unauthenticated clients"
 msgstr "Thống nhất cấu hình phương pháp cài đặt"
 
 #. Allow any IP address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:138
 #, fuzzy
-msgid "coovachilli_uam_uamanyip"
+msgid "Allow any IP address"
 msgstr "Thống nhất cấu hình phương pháp cài đặt"
 
 #. Allow clients to use any IP settings they wish by spoofing ARP (experimental)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:139
 #, fuzzy
-msgid "coovachilli_uam_uamanyip_desc"
+msgid "Allow clients to use any IP settings they wish by spoofing ARP (experimental)"
 msgstr "Thống nhất cấu hình phương pháp cài đặt"
 
 #. Allowed domains
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:140
 #, fuzzy
-msgid "coovachilli_uam_uamdomain"
+msgid "Allowed domains"
 msgstr "Tên miền"
 
 #. Defines a list of domain names to automatically add to the walled garden
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:141
 #, fuzzy
-msgid "coovachilli_uam_uamdomain_desc"
+msgid "Defines a list of domain names to automatically add to the walled garden"
 msgstr ""
 "Được sử dụng để thông báo cho khách hàng về tên miền để dùng cho các tra cứu "
 "DNS"
@@ -765,13 +765,13 @@ msgstr ""
 #. UAM homepage
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:142
 #, fuzzy
-msgid "coovachilli_uam_uamhomepage"
+msgid "UAM homepage"
 msgstr "Tên miền"
 
 #. URL of homepage to redirect unauthenticated users to
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:143
 #, fuzzy
-msgid "coovachilli_uam_uamhomepage_desc"
+msgid "URL of homepage to redirect unauthenticated users to"
 msgstr ""
 "Được sử dụng để thông báo cho khách hàng về tên miền để dùng cho các tra cứu "
 "DNS"
@@ -779,194 +779,194 @@ msgstr ""
 #. UAM static content port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:144
 #, fuzzy
-msgid "coovachilli_uam_uamiport"
+msgid "UAM static content port"
 msgstr "Thống nhất cấu hình phương pháp cài đặt"
 
 #. TCP port to bind to for only serving embedded content
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:145
 #, fuzzy
-msgid "coovachilli_uam_uamiport_desc"
+msgid "TCP port to bind to for only serving embedded content"
 msgstr "Thống nhất cấu hình phương pháp cài đặt"
 
 #. UAM listening address
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:146
 #, fuzzy
-msgid "coovachilli_uam_uamlisten"
+msgid "UAM listening address"
 msgstr "Thống nhất cấu hình phương pháp cài đặt"
 
 #. IP address to listen to for authentication of clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:147
 #, fuzzy
-msgid "coovachilli_uam_uamlisten_desc"
+msgid "IP address to listen to for authentication of clients"
 msgstr "Thống nhất cấu hình phương pháp cài đặt"
 
 #. UAM logout IP
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:148
 #, fuzzy
-msgid "coovachilli_uam_uamlogoutip"
+msgid "UAM logout IP"
 msgstr "Thống nhất cấu hình phương pháp cài đặt"
 
 #. Use this IP address to instantly logout a client accessing it (defaults to 1.1.1.1)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:149
 #, fuzzy
-msgid "coovachilli_uam_uamlogoutip_desc"
+msgid "Use this IP address to instantly logout a client accessing it (defaults to 1.1.1.1)"
 msgstr "Thống nhất cấu hình phương pháp cài đặt"
 
 #. UAM listening port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:150
 #, fuzzy
-msgid "coovachilli_uam_uamport"
+msgid "UAM listening port"
 msgstr "Thống nhất cấu hình phương pháp cài đặt"
 
 #. TCP port to bind to for authenticating clients (default 3990)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:151
 #, fuzzy
-msgid "coovachilli_uam_uamport_desc"
+msgid "TCP port to bind to for authenticating clients (default 3990)"
 msgstr "Thống nhất cấu hình phương pháp cài đặt"
 
 #. UAM secret
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:152
 #, fuzzy
-msgid "coovachilli_uam_uamsecret"
+msgid "UAM secret"
 msgstr "Thống nhất cấu hình phương pháp cài đặt"
 
 #. Shared secret between uamserver and chilli
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:153
 #, fuzzy
-msgid "coovachilli_uam_uamsecret_desc"
+msgid "Shared secret between uamserver and chilli"
 msgstr "Thống nhất cấu hình phương pháp cài đặt"
 
 #. UAM server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:154
 #, fuzzy
-msgid "coovachilli_uam_uamserver"
+msgid "UAM server"
 msgstr "Thống nhất cấu hình phương pháp cài đặt"
 
 #. URL of web server to use for authenticating clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:155
 #, fuzzy
-msgid "coovachilli_uam_uamserver_desc"
+msgid "URL of web server to use for authenticating clients"
 msgstr "Thống nhất cấu hình phương pháp cài đặt"
 
 #. UAM user interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:156
 #, fuzzy
-msgid "coovachilli_uam_uamui"
+msgid "UAM user interface"
 msgstr "Thống nhất cấu hình phương pháp cài đặt"
 
 #. An init.d style program to handle local content on the uamuiport web server
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:157
 #, fuzzy
-msgid "coovachilli_uam_uamui_desc"
+msgid "An init.d style program to handle local content on the uamuiport web server"
 msgstr "Thống nhất cấu hình phương pháp cài đặt"
 
 #. Use status file
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:158
-msgid "coovachilli_uam_usestatusfile"
+msgid "Use status file"
 msgstr ""
 
 #. Write the status of clients in a non-volatile state file (experimental)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:159
-msgid "coovachilli_uam_usestatusfile_desc"
+msgid "Write the status of clients in a non-volatile state file (experimental)"
 msgstr ""
 
 #. WISPr login url
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:160
-msgid "coovachilli_uam_wisprlogin"
+msgid "WISPr login url"
 msgstr ""
 
 #. Specific URL to be given in WISPr XML LoginURL
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:161
-msgid "coovachilli_uam_wisprlogin_desc"
+msgid "Specific URL to be given in WISPr XML LoginURL"
 msgstr ""
 
 #. CGI program
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:162
 #, fuzzy
-msgid "coovachilli_uam_wwwbin"
+msgid "CGI program"
 msgstr "Thống nhất cấu hình phương pháp cài đặt"
 
 #. Executable to run as a CGI type program (like haserl) for URLs with extention .chi
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:163
 #, fuzzy
-msgid "coovachilli_uam_wwwbin_desc"
+msgid "Executable to run as a CGI type program (like haserl) for URLs with extention .chi"
 msgstr "Thống nhất cấu hình phương pháp cài đặt"
 
 #. Web content directory
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:164
 #, fuzzy
-msgid "coovachilli_uam_wwwdir"
+msgid "Web content directory"
 msgstr "Thống nhất cấu hình phương pháp cài đặt"
 
 #. Directory where embedded local web content is placed
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:165
 #, fuzzy
-msgid "coovachilli_uam_wwwdir_desc"
+msgid "Directory where embedded local web content is placed"
 msgstr "Thống nhất cấu hình phương pháp cài đặt"
 
 #. MAC configuration
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:166
 #, fuzzy
-msgid "coovachilli_macauth"
+msgid "MAC configuration"
 msgstr "Cấu hình RADIUS"
 
 #. Configure MAC authentication
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:167
 #, fuzzy
-msgid "coovachilli_macauth_desc"
+msgid "Configure MAC authentication"
 msgstr "Cấu hình RADIUS"
 
 #. Allowed MAC addresses
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:168
 #, fuzzy
-msgid "coovachilli_macauth_macallowed"
+msgid "Allowed MAC addresses"
 msgstr "Cấu hình RADIUS"
 
 #. List of MAC addresses for which MAC authentication will be performed
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:169
 #, fuzzy
-msgid "coovachilli_macauth_macallowed_desc"
+msgid "List of MAC addresses for which MAC authentication will be performed"
 msgstr "Cấu hình RADIUS"
 
 #. Authenticate locally allowed MACs
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:170
-msgid "coovachilli_macauth_macallowlocal"
+msgid "Authenticate locally allowed MACs"
 msgstr ""
 
 #. Authenticate allowed MAC addresses without the use of RADIUS
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:171
 #, fuzzy
-msgid "coovachilli_macauth_macallowlocal_desc"
+msgid "Authenticate allowed MAC addresses without the use of RADIUS"
 msgstr "Cấu hình RADIUS"
 
 #. Enable MAC authentification
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:172
 #, fuzzy
-msgid "coovachilli_macauth_macauth"
+msgid "Enable MAC authentification"
 msgstr "Cấu hình RADIUS"
 
 #. Try to authenticate all users based on their mac address alone
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:173
 #, fuzzy
-msgid "coovachilli_macauth_macauth_desc"
+msgid "Try to authenticate all users based on their mac address alone"
 msgstr "Cấu hình RADIUS"
 
 #. Password
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:174
 #, fuzzy
-msgid "coovachilli_macauth_macpasswd"
+msgid "Password"
 msgstr "Cấu hình RADIUS"
 
 #. Password used when performing MAC authentication
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:175
 #, fuzzy
-msgid "coovachilli_macauth_macpasswd_desc"
+msgid "Password used when performing MAC authentication"
 msgstr "Cấu hình RADIUS"
 
 #. Suffix
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:176
 #, fuzzy
-msgid "coovachilli_macauth_macsuffix"
+msgid "Suffix"
 msgstr "Cấu hình RADIUS"
 
 #. Suffix to add to the MAC address in order to form the User-Name, which is sent to the radius server
diff --git a/po/vi/ddns.po b/po/vi/ddns.po
index 5e1d7ed38..bfaeee250 100644
--- a/po/vi/ddns.po
+++ b/po/vi/ddns.po
@@ -15,39 +15,39 @@ msgstr ""
 
 #. Dynamic DNS
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:1
-msgid "ddns"
+msgid "Dynamic DNS"
 msgstr "Dynamic DNS"
 
 #. Dynamic DNS allows that your router can be reached with a fixed hostname while having a dynamically changing IP-Address.
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:2
-msgid "ddns_desc"
+msgid "Dynamic DNS allows that your router can be reached with a fixed hostname while having a dynamically changing IP-Address."
 msgstr ""
 "Dynamic DNS cho phép bộ định tuyến có thể được đạt đến với một hostname cố "
 "định, trong khi có một địa chỉ AP thay đổi năng động."
 
 #. Source of IP-Address
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:3
-msgid "ddns_service_ipsource"
+msgid "Source of IP-Address"
 msgstr "Nguồn của địa chỉ IP"
 
 #. Check for changed IP every
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:4
-msgid "ddns_service_checkinterval"
+msgid "Check for changed IP every"
 msgstr "Kiểm tra mỗi thay đổi IP"
 
 #. Check-Time unit
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:5
-msgid "ddns_service_checkunit"
+msgid "Check-Time unit"
 msgstr "Đơn vị kiểm tra thời gian"
 
 #. Force update every
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:6
-msgid "ddns_service_forceinterval"
+msgid "Force update every"
 msgstr "Buộc cập nhật mỗi"
 
 #. Force-Time unit
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:7
-msgid "ddns_service_forceunit"
+msgid "Force-Time unit"
 msgstr "Force-đơn vị thời gian"
 
 #. Custom Update-URL
diff --git a/po/vi/default.po b/po/vi/default.po
index 02a1332b2..310c5b4ed 100644
--- a/po/vi/default.po
+++ b/po/vi/default.po
@@ -15,37 +15,37 @@ msgstr ""
 
 #. Skip to navigation
 #: i18n/english/luasrc/i18n/default.en.lua:1
-msgid "skiplink1"
+msgid "Skip to navigation"
 msgstr "Chuyển đến mục định hướng"
 
 #. Skip to content
 #: i18n/english/luasrc/i18n/default.en.lua:2
-msgid "skiplink2"
+msgid "Skip to content"
 msgstr "Nhảy tới nội dung"
 
 #. Navigation
 #: i18n/english/luasrc/i18n/default.en.lua:3
-msgid "navigation"
+msgid "Navigation"
 msgstr "Sự điều hướng"
 
 #. About
 #: i18n/english/luasrc/i18n/default.en.lua:4
-msgid "about"
+msgid "About"
 msgstr "Về"
 
 #. Add
 #: i18n/english/luasrc/i18n/default.en.lua:5
-msgid "add"
+msgid "Add"
 msgstr "Thêm vào"
 
 #. Addresses
 #: i18n/english/luasrc/i18n/default.en.lua:6
-msgid "addresses"
+msgid "Addresses"
 msgstr "Địa chỉ"
 
 #. Aliases
 #: i18n/english/luasrc/i18n/default.en.lua:7
-msgid "aliases"
+msgid "Aliases"
 msgstr "Aliases"
 
 #. all
@@ -60,99 +60,99 @@ msgstr "quay lại"
 
 #. Administration
 #: i18n/english/luasrc/i18n/default.en.lua:10
-msgid "administration"
+msgid "Administration"
 msgstr "Quản trị"
 
 #. Essentials
 #: i18n/english/luasrc/i18n/default.en.lua:11
-msgid "essentials"
+msgid "Essentials"
 msgstr "Essentials"
 
 #. Apply
 #: i18n/english/luasrc/i18n/default.en.lua:12
-msgid "apply"
+msgid "Apply"
 msgstr "Áp dụng"
 
 #. Basic Settings
 #: i18n/english/luasrc/i18n/default.en.lua:13
-msgid "basicsettings"
+msgid "Basic Settings"
 msgstr "Cài đặt căn bản"
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast
 #: i18n/english/luasrc/i18n/default.en.lua:14
-msgid "broadcast"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"
 msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"
 
 #. Cancel
 #: i18n/english/luasrc/i18n/default.en.lua:15
-msgid "cancel"
+msgid "Cancel"
 msgstr "Bỏ qua"
 
 #. Changes
 #: i18n/english/luasrc/i18n/default.en.lua:16
-msgid "changes"
+msgid "Changes"
 msgstr "Thay đổi"
 
 #. Channel
 #: i18n/english/luasrc/i18n/default.en.lua:17
-msgid "channel"
+msgid "Channel"
 msgstr "Kênh"
 
 #. <abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/prefix
 #: i18n/english/luasrc/i18n/default.en.lua:18
-msgid "cidr6"
+msgid "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/prefix"
 msgstr ""
 "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: "
 "address/prefix"
 
 #. Code
 #: i18n/english/luasrc/i18n/default.en.lua:19
-msgid "code"
+msgid "Code"
 msgstr "Mã"
 
 #. Configuration
 #: i18n/english/luasrc/i18n/default.en.lua:20
-msgid "config"
+msgid "Configuration"
 msgstr "Cấu hình"
 
 #. Configuration file
 #: i18n/english/luasrc/i18n/default.en.lua:21
-msgid "configfile"
+msgid "Configuration file"
 msgstr "Tập tin cấu hình"
 
 #. Confirmation
 #: i18n/english/luasrc/i18n/default.en.lua:22
-msgid "confirmation"
+msgid "Confirmation"
 msgstr "Xác nhận"
 
 #. Delete
 #: i18n/english/luasrc/i18n/default.en.lua:23
-msgid "delete"
+msgid "Delete"
 msgstr "Xóa"
 
 #. Description
 #: i18n/english/luasrc/i18n/default.en.lua:24
-msgid "descr"
+msgid "Description"
 msgstr "Mô tả"
 
 #. Design
 #: i18n/english/luasrc/i18n/default.en.lua:25
-msgid "design"
+msgid "Design"
 msgstr "Thiết kế"
 
 #. Destination
 #: i18n/english/luasrc/i18n/default.en.lua:26
-msgid "destination"
+msgid "Destination"
 msgstr "Điểm đến"
 
 #. Device
 #: i18n/english/luasrc/i18n/default.en.lua:27
-msgid "device"
+msgid "Device"
 msgstr "Công cụ"
 
 #. Devices
 #: i18n/english/luasrc/i18n/default.en.lua:28
-msgid "devices"
+msgid "Devices"
 msgstr "Những công cụ"
 
 #. disable
@@ -162,22 +162,22 @@ msgstr "Vô hiệu hóa"
 
 #. Distance
 #: i18n/english/luasrc/i18n/default.en.lua:30
-msgid "distance"
+msgid "Distance"
 msgstr "Khoảng cách "
 
 #. Kernel Log
 #: i18n/english/luasrc/i18n/default.en.lua:31
-msgid "dmesg"
+msgid "Kernel Log"
 msgstr "Kernel Log"
 
 #. <abbr title=\"Domain Name System\">DNS</abbr>-Server
 #: i18n/english/luasrc/i18n/default.en.lua:32
-msgid "dnsserver"
+msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Server"
 msgstr "<abbr title=\"Hệ thông tên miền\">DNS</abbr>-Máy chủ"
 
 #. Edit
 #: i18n/english/luasrc/i18n/default.en.lua:33
-msgid "edit"
+msgid "Edit"
 msgstr "Chỉnh sửa"
 
 #. enable
@@ -187,47 +187,47 @@ msgstr "Kích hoạt"
 
 #. Encryption
 #: i18n/english/luasrc/i18n/default.en.lua:35
-msgid "encryption"
+msgid "Encryption"
 msgstr "Encryption"
 
 #. Error
 #: i18n/english/luasrc/i18n/default.en.lua:36
-msgid "error"
+msgid "Error"
 msgstr "Lỗi"
 
 #. Filesystem
 #: i18n/english/luasrc/i18n/default.en.lua:37
-msgid "filesystem"
+msgid "Filesystem"
 msgstr "Tập tin hệ thống"
 
 #. Filter
 #: i18n/english/luasrc/i18n/default.en.lua:38
-msgid "filter"
+msgid "Filter"
 msgstr "Lọc"
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway
 #: i18n/english/luasrc/i18n/default.en.lua:39
-msgid "gateway"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
 msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
 
 #. <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway
 #: i18n/english/luasrc/i18n/default.en.lua:40
-msgid "gateway6"
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 msgstr "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 
 #. General
 #: i18n/english/luasrc/i18n/default.en.lua:41
-msgid "general"
+msgid "General"
 msgstr "Tổng quát"
 
 #. Hostname
 #: i18n/english/luasrc/i18n/default.en.lua:42
-msgid "hostname"
+msgid "Hostname"
 msgstr "Tên host"
 
 #. Install
 #: i18n/english/luasrc/i18n/default.en.lua:43
-msgid "install"
+msgid "Install"
 msgstr "Cài đặt "
 
 #. installed
@@ -237,102 +237,102 @@ msgstr "Đã cài đặt "
 
 #. Interface
 #: i18n/english/luasrc/i18n/default.en.lua:45
-msgid "interface"
+msgid "Interface"
 msgstr "Giao diện "
 
 #. Interfaces
 #: i18n/english/luasrc/i18n/default.en.lua:46
-msgid "interfaces"
+msgid "Interfaces"
 msgstr "Giao diện "
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address
 #: i18n/english/luasrc/i18n/default.en.lua:47
-msgid "ipaddress"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
 msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
 
 #. <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address
 #: i18n/english/luasrc/i18n/default.en.lua:48
-msgid "ip6address"
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address"
 msgstr "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address"
 
 #. Legend
 #: i18n/english/luasrc/i18n/default.en.lua:49
-msgid "legend"
+msgid "Legend"
 msgstr "Legend"
 
 #. Library
 #: i18n/english/luasrc/i18n/default.en.lua:50
-msgid "library"
+msgid "Library"
 msgstr "thư viện "
 
 #. Logout
 #: i18n/english/luasrc/i18n/default.en.lua:51
-msgid "logout"
+msgid "Logout"
 msgstr "Thoát ra"
 
 #. Key
 #: i18n/english/luasrc/i18n/default.en.lua:52
-msgid "key"
+msgid "Key"
 msgstr "Phím "
 
 #. Language
 #: i18n/english/luasrc/i18n/default.en.lua:53
-msgid "language"
+msgid "Language"
 msgstr "Ngôn ngữ"
 
 #. Limit
 #: i18n/english/luasrc/i18n/default.en.lua:54
-msgid "limit"
+msgid "Limit"
 msgstr "Giới hạn "
 
 #. Load
 #: i18n/english/luasrc/i18n/default.en.lua:55
-msgid "load"
+msgid "Load"
 msgstr "Tải "
 
 #. Login
 #: i18n/english/luasrc/i18n/default.en.lua:56
-msgid "login"
+msgid "Login"
 msgstr "Đăng nhập "
 
 #. <abbr title=\"Media Access Control\">MAC</abbr>-Address
 #: i18n/english/luasrc/i18n/default.en.lua:57
-msgid "macaddress"
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 
 #. see &#39;%s&#39; manpage
 #: i18n/english/luasrc/i18n/default.en.lua:58
-msgid "manpage"
+msgid "see '%s' manpage"
 msgstr "xem &amp;#39;%s&amp;#39; trang chính"
 
 #. Metric
 #: i18n/english/luasrc/i18n/default.en.lua:59
-msgid "metric"
+msgid "Metric"
 msgstr "Metric"
 
 #. Mode
 #: i18n/english/luasrc/i18n/default.en.lua:60
-msgid "mode"
+msgid "Mode"
 msgstr "Chế độ"
 
 #. Name
 #: i18n/english/luasrc/i18n/default.en.lua:61
-msgid "name"
+msgid "Name"
 msgstr "Tên"
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask
 #: i18n/english/luasrc/i18n/default.en.lua:62
-msgid "netmask"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 
 #. Network
 #: i18n/english/luasrc/i18n/default.en.lua:63
-msgid "network"
+msgid "Network"
 msgstr "mạng lưới "
 
 #. Networks
 #: i18n/english/luasrc/i18n/default.en.lua:64
-msgid "networks"
+msgid "Networks"
 msgstr "mạng lưới"
 
 #. none
@@ -342,117 +342,117 @@ msgstr "không "
 
 #. not installed
 #: i18n/english/luasrc/i18n/default.en.lua:66
-msgid "notinstalled"
+msgid "not installed"
 msgstr "không cài đặt "
 
 #. OK
 #: i18n/english/luasrc/i18n/default.en.lua:67
-msgid "ok"
+msgid "OK"
 msgstr "OK "
 
 #. Options
 #: i18n/english/luasrc/i18n/default.en.lua:68
-msgid "options"
+msgid "Options"
 msgstr "Lựa chọn "
 
 #. Overview
 #: i18n/english/luasrc/i18n/default.en.lua:69
-msgid "overview"
+msgid "Overview"
 msgstr "Nhìn chung"
 
 #. Package Manager
 #: i18n/english/luasrc/i18n/default.en.lua:70
-msgid "packagemanager"
+msgid "Package Manager"
 msgstr "Quản lí gói"
 
 #. Password
 #: i18n/english/luasrc/i18n/default.en.lua:71
-msgid "password"
+msgid "Password"
 msgstr "Mật mã"
 
 #. Path
 #: i18n/english/luasrc/i18n/default.en.lua:72
-msgid "path"
+msgid "Path"
 msgstr "Đường dẫn"
 
 #. Port
 #: i18n/english/luasrc/i18n/default.en.lua:73
-msgid "port"
+msgid "Port"
 msgstr "Cá»­a "
 
 #. Ports
 #: i18n/english/luasrc/i18n/default.en.lua:74
-msgid "ports"
+msgid "Ports"
 msgstr "Cá»­a"
 
 #. Proceed
 #: i18n/english/luasrc/i18n/default.en.lua:75
-msgid "proceed"
+msgid "Proceed"
 msgstr "Proceed"
 
 #. Protocol
 #: i18n/english/luasrc/i18n/default.en.lua:76
-msgid "protocol"
+msgid "Protocol"
 msgstr "Protocol"
 
 #. Reboot
 #: i18n/english/luasrc/i18n/default.en.lua:77
-msgid "reboot"
+msgid "Reboot"
 msgstr "Reboot"
 
 #. Reset
 #: i18n/english/luasrc/i18n/default.en.lua:78
-msgid "reset"
+msgid "Reset"
 msgstr "Reset"
 
 #. Revert
 #: i18n/english/luasrc/i18n/default.en.lua:79
-msgid "revert"
+msgid "Revert"
 msgstr "Revert"
 
 #. Save
 #: i18n/english/luasrc/i18n/default.en.lua:80
-msgid "save"
+msgid "Save"
 msgstr "LÆ°u"
 
 #. Save &amp; Apply
 #: i18n/english/luasrc/i18n/default.en.lua:81
-msgid "saveapply"
+msgid "Save & Apply"
 msgstr "Lưu & amp; amp; áp dụng "
 
 #. Scan
 #: i18n/english/luasrc/i18n/default.en.lua:82
-msgid "scan"
+msgid "Scan"
 msgstr "Scan"
 
 #. Service
 #: i18n/english/luasrc/i18n/default.en.lua:83
-msgid "service"
+msgid "Service"
 msgstr "Dịch vụ "
 
 #. Services
 #: i18n/english/luasrc/i18n/default.en.lua:84
-msgid "services"
+msgid "Services"
 msgstr "Dịch vụ "
 
 #. Settings
 #: i18n/english/luasrc/i18n/default.en.lua:85
-msgid "settings"
+msgid "Settings"
 msgstr "Cài đặt "
 
 #. Size
 #: i18n/english/luasrc/i18n/default.en.lua:86
-msgid "size"
+msgid "Size"
 msgstr "Dung lượng "
 
 #. Source
 #: i18n/english/luasrc/i18n/default.en.lua:87
-msgid "source"
+msgid "Source"
 msgstr "Nguồn"
 
 #. Start
 #: i18n/english/luasrc/i18n/default.en.lua:88
-msgid "start"
+msgid "Start"
 msgstr "Bắt đầu "
 
 #. static
@@ -462,72 +462,72 @@ msgstr "thống kê"
 
 #. Status
 #: i18n/english/luasrc/i18n/default.en.lua:90
-msgid "status"
+msgid "Status"
 msgstr "Tình trạng"
 
 #. Statistics
 #: i18n/english/luasrc/i18n/default.en.lua:91
-msgid "statistics"
+msgid "Statistics"
 msgstr "Thống kê"
 
 #. Submit
 #: i18n/english/luasrc/i18n/default.en.lua:92
-msgid "submit"
+msgid "Submit"
 msgstr "Trình "
 
 #. System Log
 #: i18n/english/luasrc/i18n/default.en.lua:93
-msgid "syslog"
+msgid "System Log"
 msgstr "System Log"
 
 #. System
 #: i18n/english/luasrc/i18n/default.en.lua:94
-msgid "system"
+msgid "System"
 msgstr "Hệ thống"
 
 #. Target
 #: i18n/english/luasrc/i18n/default.en.lua:95
-msgid "target"
+msgid "Target"
 msgstr "Đích"
 
 #. Timezone
 #: i18n/english/luasrc/i18n/default.en.lua:96
-msgid "timezone"
+msgid "Timezone"
 msgstr "Múi giờ "
 
 #. Type
 #: i18n/english/luasrc/i18n/default.en.lua:97
-msgid "type"
+msgid "Type"
 msgstr "Loại "
 
 #. Unknown Error
 #: i18n/english/luasrc/i18n/default.en.lua:98
-msgid "unknownerror"
+msgid "Unknown Error"
 msgstr "Không hiểu lỗi"
 
 #. Unsaved Changes
 #: i18n/english/luasrc/i18n/default.en.lua:99
-msgid "unsavedchanges"
+msgid "Unsaved Changes"
 msgstr "Thay đổi không lưu"
 
 #. Username
 #: i18n/english/luasrc/i18n/default.en.lua:100
-msgid "username"
+msgid "Username"
 msgstr "Tên người dùng "
 
 #. Version
 #: i18n/english/luasrc/i18n/default.en.lua:101
-msgid "version"
+msgid "Version"
 msgstr "Phiên bản"
 
 #. Web <abbr title=\"User Interface\">UI</abbr>
 #: i18n/english/luasrc/i18n/default.en.lua:102
-msgid "webui"
+msgid "Web <abbr title=\"User Interface\">UI</abbr>"
 msgstr "Web <abbr title=\"User Interface\">UI</abbr>"
 
 #. Wifi
 #: i18n/english/luasrc/i18n/default.en.lua:103
-msgid "wifi"
+msgid "Wifi"
 msgstr "Wifi"
 
 #. Zone
diff --git a/po/vi/freifunk.po b/po/vi/freifunk.po
index c4d72b19e..3f45fc8e4 100644
--- a/po/vi/freifunk.po
+++ b/po/vi/freifunk.po
@@ -15,240 +15,240 @@ msgstr ""
 
 #. Hello and welcome in the network of
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:1
-msgid "ff_hellonet"
+msgid "Hello and welcome in the network of"
 msgstr "Xin chào và chào mừng gia nhập mạng lưới của"
 
 #. We are an initiative to establish a free, independent and open wireless mesh network.
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:2
-msgid "ff_public1"
+msgid "We are an initiative to establish a free, independent and open wireless mesh network."
 msgstr "Chúng tôi là phát triển mạng lưới nguồn mở không dây đầu tiên"
 
 #. This is the access point
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:3
-msgid "ff_public2"
+msgid "This is the access point"
 msgstr "Đây là điểm truy cập "
 
 #. It is operated by
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:4
-msgid "ff_public3"
+msgid "It is operated by"
 msgstr "Nó hoạt động bởi "
 
 #. You can find further information about the global Freifunk initiative at
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:5
-msgid "ff_public4"
+msgid "You can find further information about the global Freifunk initiative at"
 msgstr "Bạn có thể tìm thấy thông tin về Freifunk toàn cầu tại "
 
 #. If you are interested in our project then contact the local community
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:6
-msgid "ff_public5"
+msgid "If you are interested in our project then contact the local community"
 msgstr ""
 "Nếu bạn quan tâm đến đề án của chúng tôi, hãy liên hệ cộng đồng địa phương"
 
 #. Internet access depends on technical and organisational conditions and may or may not work for you.
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:7
-msgid "ff_public6"
+msgid "Internet access depends on technical and organisational conditions and may or may not work for you."
 msgstr ""
 "Truy cập Internet phù thuộc vào kỹ thật và điều kiện tổ chức và có thể hoạt "
 "động hoặc không hoạt động cho bạn"
 
 #. Location
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:8
-msgid "ff_location"
+msgid "Location"
 msgstr "Địa chỉ"
 
 #. E-Mail
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:9
-msgid "ff_mail"
+msgid "E-Mail"
 msgstr "E-mail"
 
 #. You really should provide your address here!
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:10
-msgid "ff_mail1"
+msgid "You really should provide your address here!"
 msgstr "Bạn nên cung cấp địa chỉ ở đây!"
 
 #. Nickname
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:11
-msgid "ff_nickname"
+msgid "Nickname"
 msgstr "Tên"
 
 #. Realname
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:12
-msgid "ff_name"
+msgid "Realname"
 msgstr "Tên thật "
 
 #. Node
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:13
-msgid "ff_node"
+msgid "Node"
 msgstr "Node"
 
 #. Notice
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:14
-msgid "ff_note"
+msgid "Notice"
 msgstr "Chú ý"
 
 #. Phone
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:15
-msgid "ff_phone"
+msgid "Phone"
 msgstr "Điện thoại"
 
 #. Memory
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:16
-msgid "ff_ram"
+msgid "Memory"
 msgstr "Bộ nhớ"
 
 #. Free
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:17
-msgid "ff_free"
+msgid "Free"
 msgstr "Miễn phí"
 
 #. Buffers
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:18
-msgid "ff_buffers"
+msgid "Buffers"
 msgstr "Buffers"
 
 #. Cached
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:19
-msgid "ff_cached"
+msgid "Cached"
 msgstr "Cached"
 
 #. Total
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:20
-msgid "ff_total"
+msgid "Total"
 msgstr "Tổng cộng "
 
 #. Coordinates
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:21
-msgid "ff_geocoord"
+msgid "Coordinates"
 msgstr "Tọa độ"
 
 #. Client-Splash
-msgid "ff_splash"
+msgid "Client-Splash"
 msgstr "Client-Splash"
 
 #. Active Clients
-msgid "ff_splash_clients"
+msgid "Active Clients"
 msgstr "Đối tượng đang tham gia"
 
 #. Hostname
-msgid "ff_splash_hostname"
+msgid "Hostname"
 msgstr "Hostname"
 
 #. IP Address
-msgid "ff_splash_ip"
+msgid "IP Address"
 msgstr "Địa chỉ IP"
 
 #. MAC Address
-msgid "ff_splash_mac"
+msgid "MAC Address"
 msgstr "Địa chỉ MAC"
 
 #. Time remaining
-msgid "ff_splash_timeleft"
+msgid "Time remaining"
 msgstr "Thời gian còn lại"
 
 #. Traffic (in/out)
-msgid "ff_splash_traffic"
+msgid "Traffic (down/up)"
 msgstr "Outgoing traffic"
 
 #. Policy
-msgid "ff_splash_policy"
+msgid "Policy"
 msgstr "Chính sách"
 
 #. unknown
-msgid "ff_splash_unknown"
+msgid "unknown"
 msgstr "Không biết"
 
 #. expired
-msgid "ff_splash_expired"
+msgid "expired"
 msgstr "Hết hạn"
 
 #. whitelisted
-msgid "ff_splash_whitelisted"
+msgid "whitelisted"
 msgstr "danh sách trắng"
 
 #. splashed
-msgid "ff_splash_splashed"
+msgid "splashed"
 msgstr "splashed"
 
 #. blacklisted
-msgid "ff_splash_blacklisted"
+msgid "blacklisted"
 msgstr "danh sách đen"
 
 #. temporarily blocked
-msgid "ff_splash_tempblock"
+msgid "temporarily blocked"
 msgstr "hiện tại chặng"
 
 #. No clients connected
-msgid "ff_splash_noclients"
+msgid "No clients connected"
 msgstr "Không đối tượng kết nối"
 
 #. P2P-Block
-msgid "ff_p2pblock"
+msgid "P2P-Block"
 msgstr "P2P-Block"
 
 #. P2P-Block is a greylisting mechanism to block various peer-to-peer protocols for non-whitelisted clients.
-msgid "ff_p2pblock_desc"
+msgid "P2P-Block is a greylisting mechanism to block various peer-to-peer protocols for non-whitelisted clients."
 msgstr ""
 "P2P-Block là một cơ chế greylisting để chặn các peer-to-peer protocols cho "
 "khách hàng không nằm trên whitelisted."
 
 #. Enable P2P-Block
-msgid "ff_p2pblock_enabled"
+msgid "Enable P2P-Block"
 msgstr "Kích hoạt P2P-Block"
 
 #. Portrange
-msgid "ff_p2pblock_portrange"
+msgid "Portrange"
 msgstr "Portrange"
 
 #. Block Time
-msgid "ff_p2pblock_blocktime"
+msgid "Block Time"
 msgstr "Thời gian Block"
 
 #. seconds
-msgid "ff_p2pblock_blocktime_desc"
+msgid "seconds"
 msgstr "giây"
 
 #. Whitelisted IPs
-msgid "ff_p2pblock_whitelist"
+msgid "Whitelisted IPs"
 msgstr "Whitelisted IPs"
 
 #. Layer7-Protokolle
-msgid "ff_p2pblock_layer7"
+msgid "Layer7-Protocols"
 msgstr "Layer7-protocols"
 
 #. IP-P2P
-msgid "ff_p2pblock_ipp2p"
+msgid "IP-P2P"
 msgstr "IP-P2P"
 
 #. Freifunk Remote Update
-msgid "ff_remote_update"
+msgid "Freifunk Remote Update"
 msgstr "Freifunk cập nhật từ xa"
 
 #. Check for new firmware versions and perform automatic updates.
-msgid "ff_remote_update_desc"
+msgid "Check for new firmware versions and perform automatic updates."
 msgstr "Kiểm tra  các phiên bản phần cứng mới và thực hiện tự động cập nhật."
 
 #. Update available!
-msgid "ff_remote_update_available"
+msgid "Update available!"
 msgstr "Cập nhật sẵn có!"
 
 #. The installed firmware is the most recent version.
-msgid "ff_remote_update_uptodate"
+msgid "The installed firmware is the most recent version."
 msgstr "Phần cứng được cài đặt là phiên bản mới nhất."
 
 #. Start Upgrade
-msgid "ff_remote_update_install"
+msgid "Start Upgrade"
 msgstr "Bắt đầu cập nhật "
 
 #. Update Settings
-msgid "ff_remote_update_settings"
+msgid "Update Settings"
 msgstr "Cập nhật cài đặt"
 
 #. Keep configuration
-msgid "ff_remote_update_keepcfg"
+msgid "Keep configuration"
 msgstr "Giữ cấu hình"
 
 #. Verify downloaded images
-msgid "ff_remote_update_verify"
+msgid "Verify downloaded images"
 msgstr "Xác minh hình ảnh đã tải"
 
 #. Confirm Upgrade
diff --git a/po/vi/hd_idle.po b/po/vi/hd_idle.po
index 9f6a01804..9ae4f4deb 100644
--- a/po/vi/hd_idle.po
+++ b/po/vi/hd_idle.po
@@ -15,37 +15,37 @@ msgstr ""
 
 #. Disk
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:1
-msgid "disk"
+msgid "Disk"
 msgstr "Ổ đĩa"
 
 #. Enable debug
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:2
-msgid "enable_debug"
+msgid "Enable debug"
 msgstr "Kích hoạt debug"
 
 #. hd-idle
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:3
-msgid "hd_idle"
+msgid "hd-idle"
 msgstr "hd-idle"
 
 #. hd-idle is a utility program for spinning-down external disks after a period of idle time.
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:4
-msgid "hd_idle_desc"
+msgid "hd-idle is a utility program for spinning-down external disks after a period of idle time."
 msgstr ""
 "hd-idle là một chương trình tiện ích để quay các đĩa ngoài sau một khoảng "
 "thời gian idle."
 
 #. Idle-Time
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:5
-msgid "idle_time_interval"
+msgid "Idle-Time"
 msgstr "Thời gian Idle"
 
 #. Idle-Time unit
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:6
-msgid "idle_time_unit"
+msgid "Idle-Time unit"
 msgstr "Đơn vị thời gian Idle"
 
 #. Settings
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:7
-msgid "settings"
+msgid "Settings"
 msgstr "Sắp đặt"
diff --git a/po/vi/initmgr.po b/po/vi/initmgr.po
index 59cf90864..d0e0f8ccb 100644
--- a/po/vi/initmgr.po
+++ b/po/vi/initmgr.po
@@ -15,12 +15,12 @@ msgstr ""
 
 #. Initscripts
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:1
-msgid "initmgr"
+msgid "Initscripts"
 msgstr "Initscripts"
 
 #. You can enable or disable installed init scripts here. Changes will applied after a device reboot.<br /><strong>Warning: If you disable essential init scripts like &quot;network&quot;, your device might become inaccesable!</strong>
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:2
-msgid "initmgr_desc"
+msgid "You can enable or disable installed init scripts here. Changes will applied after a device reboot.<br /><strong>Warning: If you disable essential init scripts like \"network\", your device might become inaccesable!</strong>"
 msgstr ""
 "Bạn có thể bật hoặc tắt cài đặt init script tại đây. Thay đổi này sẽ được áp "
 "dụng sau khi một thiết bị khởi động lại.<br /><strong>Cảnh báo: Nếu bạn vô "
@@ -29,12 +29,12 @@ msgstr ""
 
 #. Start priority
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:3
-msgid "initmgr_index"
+msgid "Start priority"
 msgstr "Bắt đầu ưu tiên"
 
 #. Initscript
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:4
-msgid "initmgr_name"
+msgid "Initscript"
 msgstr "Initscript"
 
 #. Enable/Disable
diff --git a/po/vi/livestats.po b/po/vi/livestats.po
index 1efb5dc12..f71f5d0d3 100644
--- a/po/vi/livestats.po
+++ b/po/vi/livestats.po
@@ -15,32 +15,32 @@ msgstr ""
 
 #. incoming
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:1
-msgid "livestats_incoming"
+msgid "incoming"
 msgstr "đang gọi đến"
 
 #. outgoing
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:2
-msgid "livestats_outgoing"
+msgid "outgoing"
 msgstr "gọi đi"
 
 #. traffic on
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:3
-msgid "livestats_traffic"
+msgid "traffic on"
 msgstr "lưu thông trên"
 
 #. signal-to-noise ratio for
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:4
-msgid "livestats_wifi"
+msgid "signal-to-noise ratio for"
 msgstr "signal-to-noise ratio for"
 
 #. load average
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:5
-msgid "livestats_loadavg"
+msgid "load average"
 msgstr "tải trung bình"
 
 #. Realtime Wireless Status
 #: applications/luci-livestats/luasrc/i18n/livestats.en.lua:6
-msgid "livestats_stat_wireless"
+msgid "Realtime Wireless Status"
 msgstr "Tình trạng Realtime Wireless"
 
 #. Realtime Network Traffic
diff --git a/po/vi/luci-fw.po b/po/vi/luci-fw.po
index ef0683063..f60d18ba3 100644
--- a/po/vi/luci-fw.po
+++ b/po/vi/luci-fw.po
@@ -15,61 +15,61 @@ msgstr ""
 
 #. Port forwarding
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:1
-msgid "fw_portfw"
+msgid "Port forwarding"
 msgstr "Cổng chuyển tiếp"
 
 #. Traffic Redirection
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:2
-msgid "fw_redirect"
+msgid "Traffic Redirection"
 msgstr "Sự chuyển hướng lưu thông"
 
 #. Traffic redirection allows you to change the destination address of forwarded packets.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:3
-msgid "fw_redirect_desc"
+msgid "Traffic redirection allows you to change the destination address of forwarded packets."
 msgstr ""
 "Sự chuyển hướng lưu thông cho phép bạn thay đổi địa chỉ điểm đến của gói "
 "chuyển tiếp. "
 
 #. Zone-to-Zone traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:4
-msgid "fw_forwarding"
+msgid "Zone-to-Zone traffic"
 msgstr "Lưu thông Zone- to - Zone"
 
 #. Firewall
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:5
-msgid "fw_fw"
+msgid "Firewall"
 msgstr "Firewall"
 
 #. Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:6
-msgid "fw_zone"
+msgid "Zone"
 msgstr "Zone"
 
 #. Zones
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:7
-msgid "fw_zones"
+msgid "Zones"
 msgstr "Zones"
 
 #. Custom forwarding
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:8
-msgid "fw_custfwd"
+msgid "Custom forwarding"
 msgstr "Tùy chỉnh chuyển tiếp"
 
 #. The firewall creates zones over your network interfaces to control network traffic flow.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:9
-msgid "fw_fw1"
+msgid "The firewall creates zones over your network interfaces to control network traffic flow."
 msgstr ""
 "The firewall tạo zones trên giao diện mạng lưới để điều triển sự dòng lưu "
 "thông của mạng."
 
 #. Advanced Rules
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:10
-msgid "firewall_rule"
+msgid "Advanced Rules"
 msgstr "Luật cấp cao"
 
 #. Advanced rules let you customize the firewall to your needs. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:11
-msgid "firewall_rule_desc"
+msgid "Advanced rules let you customize the firewall to your needs. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall."
 msgstr ""
 "Luật cấp cao để bạn tùy chỉnh firewall mà bạn cần. Chỉ những kết nối mới sẽ "
 "được làm cho phù hợp. Các gói thuộc đã mở các kết nối sẽ tự động cho phép "
@@ -77,139 +77,139 @@ msgstr ""
 
 #. Input Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:12
-msgid "firewall_rule_src"
+msgid "Input Zone"
 msgstr "Input Zone"
 
 #. Output Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:13
-msgid "firewall_rule_dest"
+msgid "Output Zone"
 msgstr "Output Zone"
 
 #. Source address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:14
-msgid "firewall_rule_srcip"
+msgid "Source address"
 msgstr "Địa chỉ nguồn"
 
 #. Destination address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:15
-msgid "firewall_rule_destip"
+msgid "Destination address"
 msgstr "Địa chỉ điểm đến"
 
 #. Source MAC-Address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:16
-msgid "firewall_rule_srcmac"
+msgid "Source MAC-Address"
 msgstr "Đỉa chỉ MAC nguồn"
 
 #. Source port
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:17
-msgid "firewall_rule_srcport"
+msgid "Source port"
 msgstr "Cổng nguồn"
 
 #. Destination port
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:18
-msgid "firewall_rule_destport"
+msgid "Destination port"
 msgstr "Cổng điểm đến"
 
 #. Action
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:19
-msgid "firewall_rule_target"
+msgid "Action"
 msgstr "Action"
 
 #. accept
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:20
-msgid "fw_accept"
+msgid "accept"
 msgstr "chấp nhận"
 
 #. reject
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:21
-msgid "fw_reject"
+msgid "reject"
 msgstr "Không chấp nhận"
 
 #. drop
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:22
-msgid "fw_drop"
+msgid "drop"
 msgstr "drop"
 
 #. Source
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:23
-msgid "fw_src"
+msgid "Source"
 msgstr "Nguồn"
 
 #. Destination
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:24
-msgid "fw_dest"
+msgid "Destination"
 msgstr "Điểm đến"
 
 #. Traffic Control
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:25
-msgid "fw_traffic"
+msgid "Traffic Control"
 msgstr "Điều khiển lưu thông"
 
 #. MSS Clamping
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:26
-msgid "fw_mtufix"
+msgid "MSS Clamping"
 msgstr "MSS Clamping"
 
 #. Drop invalid packets
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:27
-msgid "fw_dropinvalid"
+msgid "Drop invalid packets"
 msgstr "Bỏ qua nhưng gói không hợp lý"
 
 #. Port forwarding allows to provide network services in the internal network to an external network.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:28
-msgid "fw_portfw1"
+msgid "Port forwarding allows to provide network services in the internal network to an external network."
 msgstr ""
 "Cổng chuyển tiếp cho phép cung cấp những dịch vụ mạng trong vùng tới một "
 "ngoại mạng. "
 
 #. External Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:29
-msgid "firewall_redirect_src_desc"
+msgid "External Zone"
 msgstr "External Zone"
 
 #. External port
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:30
-msgid "firewall_redirect_srcdport"
+msgid "External port"
 msgstr "External port"
 
 #. port or range as first-last
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:31
-msgid "firewall_redirect_srcdport_desc"
+msgid "port or range as first-last"
 msgstr "Cổng hay range từ đầu-tới-cuối"
 
 #. Source address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:32
-msgid "firewall_redirect_srcip"
+msgid "Source address"
 msgstr "Địa chỉ nguồn"
 
 #. Source MAC
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:33
-msgid "firewall_redirect_srcmac"
+msgid "Source MAC"
 msgstr "Nguồn MAC"
 
 #. Internal address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:34
-msgid "firewall_redirect_destip"
+msgid "Internal address"
 msgstr "Internal address"
 
 #. IP-Address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:35
-msgid "firewall_redirect_destip_desc"
+msgid "IP-Address"
 msgstr "Địa chỉ IP"
 
 #. Internal port (optional)
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:36
-msgid "firewall_redirect_destport"
+msgid "Internal port (optional)"
 msgstr "Internal port (tùy chọn)"
 
 #. port or range as first-last
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:37
-msgid "firewall_redirect_destport_desc"
+msgid "port or range as first-last"
 msgstr "cổng hoặc range từ đầu đến cuối"
 
 #. Here you can specify which network traffic is allowed to flow between network zones. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall. If you experience occasional connection problems try enabling MSS Clamping otherwise disable it for performance reasons.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:38
-msgid "fw_forwarding1"
+msgid "Here you can specify which network traffic is allowed to flow between network zones. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall. If you experience occasional connection problems try enabling MSS Clamping otherwise disable it for performance reasons."
 msgstr ""
 "Tại đây bạn có thể xác định được mạng lưới giao thông được phép lưu lượng "
 "qua network zone. Chỉ có kết nối mới sẽ là phù hợp. Các gói thuộc kết nối đã "
@@ -218,48 +218,48 @@ msgstr ""
 
 #. Input
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:39
-msgid "firewall_forwarding_src"
+msgid "Input"
 msgstr "Input"
 
 #. Output
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:40
-msgid "firewall_forwarding_dest"
+msgid "Output"
 msgstr "Output"
 
 #. Defaults
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:41
-msgid "firewall_defaults"
+msgid "Defaults"
 msgstr "Mặc định"
 
 #. These are the default settings that are used if no other rules match.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:42
-msgid "firewall_defaults_desc"
+msgid "These are the default settings that are used if no other rules match."
 msgstr ""
 "Có những cài đặt mặc định được dùng nếu những cái luật khác không phù hợp"
 
 #. SYN-flood protection
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:43
-msgid "firewall_defaults_synflood"
+msgid "SYN-flood protection"
 msgstr "SYN-flood bảo vệ "
 
 #. Incoming Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:44
-msgid "firewall_defaults_input"
+msgid "Incoming Traffic"
 msgstr "Lưu thông đang tới"
 
 #. Outgoing Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:45
-msgid "firewall_defaults_output"
+msgid "Outgoing Traffic"
 msgstr "Lưu thông ra ngoài"
 
 #. Forwarded Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:46
-msgid "firewall_defaults_forward"
+msgid "Forwarded Traffic"
 msgstr "Lưu thông chuyển tiếp"
 
 #. Zones part the network interfaces into certain isolated areas to separate network traffic. One or more networks can belong to a zone. The MASQ-flag enables NAT masquerading for all outgoing traffic on this zone.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:47
-msgid "firewall_zone_desc"
+msgid "Zones part the network interfaces into certain isolated areas to separate network traffic. One or more networks can belong to a zone. The MASQ-flag enables NAT masquerading for all outgoing traffic on this zone."
 msgstr ""
 "Phân vùng các phần giao diện mạng vào những khu vực cô lập nhất định để phân "
 "chia mạng lưới lưu thông. Một hoặc nhiều mạng lưới có thể thuộc vào một "
@@ -268,42 +268,42 @@ msgstr ""
 
 #. Incoming Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:48
-msgid "firewall_zone_input"
+msgid "Incoming Traffic"
 msgstr "Incoming Traffic"
 
 #. Default Policy
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:49
-msgid "firewall_zone_input_desc"
+msgid "Default Policy"
 msgstr "Chính sách mặc định"
 
 #. Outgoing Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:50
-msgid "firewall_zone_output"
+msgid "Outgoing Traffic"
 msgstr "Outgoing Traffic"
 
 #. Default Policy
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:51
-msgid "firewall_zone_output_desc"
+msgid "Default Policy"
 msgstr "Chính sách mặc định"
 
 #. Forwarded Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:52
-msgid "firewall_zone_forward"
+msgid "Forwarded Traffic"
 msgstr "Forwarded Traffic"
 
 #. Default Policy
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:53
-msgid "firewall_zone_forward_desc"
+msgid "Default Policy"
 msgstr "Chính sách mặc định"
 
 #. MASQ
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:54
-msgid "firewall_zone_masq"
+msgid "MASQ"
 msgstr "MASQ"
 
 #. Networks
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:55
-msgid "firewall_zone_network"
+msgid "Networks"
 msgstr "Networks"
 
 #. contained networks
diff --git a/po/vi/mmc_over_gpio.po b/po/vi/mmc_over_gpio.po
index ca574a6a3..883674c95 100644
--- a/po/vi/mmc_over_gpio.po
+++ b/po/vi/mmc_over_gpio.po
@@ -15,15 +15,15 @@ msgstr ""
 
 #. MMC/SD driver configuration
 #: applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua:1
-msgid "mmc_over_gpio"
+msgid "MMC/SD driver configuration"
 msgstr "Cấu hình trình điều khiển MMC/SD"
 
 #. MMC/SD driver configuration
 #: applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua:2
-msgid "mmc_over_gpio_desc"
+msgid "MMC/SD driver configuration"
 msgstr "Cấu hình trình điều khiển MMC/SD"
 
 #. Settings
 #: applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua:3
-msgid "settings"
+msgid "Settings"
 msgstr "Sắp đặt"
diff --git a/po/vi/ntpc.po b/po/vi/ntpc.po
index 9ca783eda..27ba50f05 100644
--- a/po/vi/ntpc.po
+++ b/po/vi/ntpc.po
@@ -15,42 +15,42 @@ msgstr ""
 
 #. Time Synchronisation
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:1
-msgid "ntpc"
+msgid "Time Synchronisation"
 msgstr "Thời gian đồng bộ hóa"
 
 #. Synchronizes the system time
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:2
-msgid "ntpc_desc"
+msgid "Synchronizes the system time"
 msgstr "Đồng bộ hóa giờ hệ thống"
 
 #. Time Server
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:3
-msgid "ntpc_timeserver"
+msgid "Time Server"
 msgstr "Giờ server"
 
 #. Update Interval (in s)
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:4
-msgid "ntpc_interval"
+msgid "Update Interval (in s)"
 msgstr "Cập nhật Interval (giây)"
 
 #. Count of Time Measurements
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:5
-msgid "ntpc_count"
+msgid "Count of Time Measurements"
 msgstr "Đếm thời gian"
 
 #. empty = infinite
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:6
-msgid "ntpc_count_desc"
+msgid "empty = infinite"
 msgstr "Rỗng = Vô tận"
 
 #. Clock Adjustment
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:7
-msgid "ntpc_drift"
+msgid "Clock Adjustment"
 msgstr "Điều chỉnh đồng hồ"
 
 #. Offset Frequency
 #: applications/luci-ntpc/luasrc/i18n/ntpc.en.lua:8
-msgid "ntpc_drift_freq"
+msgid "Offset Frequency"
 msgstr "tần số offset "
 
 #. Current system time
diff --git a/po/vi/olsr.po b/po/vi/olsr.po
index 00b01b532..01ba3675e 100644
--- a/po/vi/olsr.po
+++ b/po/vi/olsr.po
@@ -15,42 +15,42 @@ msgstr ""
 
 #. OLSR Daemon
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:1
-msgid "olsrd"
+msgid "OLSR Daemon"
 msgstr "OLSR Daemon"
 
 #. Neighbour IP
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:2
-msgid "olsrd_neighbour_ip"
+msgid "Neighbour IP"
 msgstr "Lận cận IP"
 
 #. Local interface IP
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:3
-msgid "olsrd_local_ip"
+msgid "Local interface IP"
 msgstr "Giao diện địa phương IP"
 
 #. Announced network
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:4
-msgid "olsrd_network"
+msgid "Announced network"
 msgstr "Mạng lưới thông báo"
 
 #. OLSR gateway
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:5
-msgid "olsrd_gateway"
+msgid "OLSR gateway"
 msgstr "Cổng OLSR"
 
 #. OLSR node
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:6
-msgid "olsrd_node"
+msgid "OLSR node"
 msgstr "OLSR node"
 
 #. Unable to connect to the OLSR daemon!
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:7
-msgid "olsrd_error"
+msgid "Unable to connect to the OLSR daemon!"
 msgstr "Không thể kết nối với OLSR daemon!"
 
 #. Make sure that OLSRd is running, the &quot;txtinfo&quot; plugin is loaded, configured on port 2006 and accepts connections from &quot;127.0.0.1&quot;.
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:8
-msgid "olsrd_error_desc"
+msgid "Make sure that OLSRd is running, the \"txtinfo\" plugin is loaded, configured on port 2006 and accepts connections from \"127.0.0.1\"."
 msgstr ""
 "Bảo đảm là OLSRd đang vận hành, the &amp;quot;txtinfo&amp;quot; plugin được "
 "tải, định cấu hình trên cổng 2006 và chấp nhận kết nối từ "
@@ -58,607 +58,607 @@ msgstr ""
 
 #. OLSR - HNA-Announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:9
-msgid "olsrd_hna"
+msgid "OLSR - HNA-Announcements"
 msgstr "OLSR - HNA - Thông báo"
 
 #. OLSR - Plugins
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:10
-msgid "olsrd_plugins"
+msgid "OLSR - Plugins"
 msgstr "OLSR - Plugins"
 
 #. OLSR connections
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:11
-msgid "olsrd_links"
+msgid "OLSR connections"
 msgstr "Kết nối OLSR"
 
 #. Overview of currently established OLSR connections
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:12
-msgid "olsrd_links_desc"
+msgid "Overview of currently established OLSR connections"
 msgstr "Tổng quát về kết nối OLSR hiện tại "
 
 #. Expected retransmission count
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:13
-msgid "olsrd_links_etx_desc"
+msgid "Expected retransmission count"
 msgstr "Expected retransmission count"
 
 #. Success rate of sent packages
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:14
-msgid "olsrd_links_lq_desc"
+msgid "Success rate of sent packages"
 msgstr "Tỉ lệ thành công của gói đã gửi"
 
 #. Success rate of received packages
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:15
-msgid "olsrd_links_nlq_desc"
+msgid "Success rate of received packages"
 msgstr "Tỉ lệ thành công của gói nhận"
 
 #. Known OLSR routes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:16
-msgid "olsrd_routes"
+msgid "Known OLSR routes"
 msgstr "Tuyến OLRS đã biết"
 
 #. Overview of currently known routes to other OLSR nodes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:17
-msgid "olsrd_routes_desc"
+msgid "Overview of currently known routes to other OLSR nodes"
 msgstr "Tổng quát của các tuyến đã biết hiện tại tới những OLSR nodes khác"
 
 #. Active OLSR nodes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:18
-msgid "olsrd_topology"
+msgid "Active OLSR nodes"
 msgstr "Những OLSR nodes đang hoạt động"
 
 #. Overview of currently known OLSR nodes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:19
-msgid "olsrd_topology_desc"
+msgid "Overview of currently known OLSR nodes"
 msgstr "Tổng quát của các OLSR nodes đã biết hiện tại"
 
 #. Last hop
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:20
-msgid "olsrd_topology_lasthop"
+msgid "Last hop"
 msgstr "Hop cuối "
 
 #. Active host net announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:21
-msgid "olsrd_hna2"
+msgid "Active host net announcements"
 msgstr "Thông báo của mạng host đang hoạt động"
 
 #. Overview of currently active OLSR host net announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:22
-msgid "olsrd_hna_desc"
+msgid "Overview of currently active OLSR host net announcements"
 msgstr "Tổng quát về các thông báo của mạng host đang hoạt động"
 
 #. Active MID announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:23
-msgid "olsrd_mid"
+msgid "Active MID announcements"
 msgstr "Thông báo của các MID đang hoạt động"
 
 #. Overview of known multiple interface announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:24
-msgid "olsrd_mid_desc"
+msgid "Overview of known multiple interface announcements"
 msgstr "Tổng quát về thông báo của nhiều giao diện đã biết"
 
 #. Secondary OLSR interfaces
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:25
-msgid "olsrd_mid_aliases"
+msgid "Secondary OLSR interfaces"
 msgstr "Giao diện OLSR thứ nhì"
 
 #. Freifunk
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:26
-msgid "olsrd_etx_ff"
+msgid "Freifunk"
 msgstr "Freifunk"
 
 #. floating point
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:27
-msgid "olsrd_etx_float"
+msgid "floating point"
 msgstr "điểm nổi"
 
 #. fixed point math
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:28
-msgid "olsrd_etx_fpm"
+msgid "fixed point math"
 msgstr "tính toán điểm cố định"
 
 #. General settings
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:29
-msgid "olsrd_olsrd"
+msgid "General settings"
 msgstr "Cài đặt tổng quát"
 
 #. Start without network
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:30
-msgid "olsrd_olsrd_allownoint"
+msgid "Start without network"
 msgstr "Khởi động không mạng lưới"
 
 #. Clear screen
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:31
-msgid "olsrd_olsrd_clearscreen"
+msgid "Clear screen"
 msgstr "Xóa màn hình"
 
 #. Debugmode
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:32
-msgid "olsrd_olsrd_debuglevel"
+msgid "Debugmode"
 msgstr "Debugmode"
 
 #. FIB metric
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:33
-msgid "olsrd_olsrd_fibmetric"
+msgid "FIB metric"
 msgstr "FIB metric"
 
 #. Internet protocol
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:34
-msgid "olsrd_olsrd_ipversion"
+msgid "Internet protocol"
 msgstr "Internet protocol"
 
 #. LQ aging
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:35
-msgid "olsrd_olsrd_linkqualityaging"
+msgid "LQ aging"
 msgstr "LQ aging"
 
 #. LQ algorithm
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:36
-msgid "olsrd_olsrd_linkqualityalgorithm"
+msgid "LQ algorithm"
 msgstr "LQ algorithm"
 
 #. LQ Dijkstra limit
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:37
-msgid "olsrd_olsrd_linkqualitydijkstralimit"
+msgid "LQ Dijkstra limit"
 msgstr "Giới hạn LQ Dijkstra"
 
 #. LQ fisheye
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:38
-msgid "olsrd_olsrd_linkqualityfisheye"
+msgid "LQ fisheye"
 msgstr "LQ fisheye"
 
 #. LQ level
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:39
-msgid "olsrd_olsrd_linkqualitylevel"
+msgid "LQ level"
 msgstr "LQ level"
 
 #. MPR selection
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:40
-msgid "olsrd_olsrd_linkqualitylevel_1"
+msgid "MPR selection"
 msgstr "Sự chọn lọc MPR"
 
 #. MPR selection and routing
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:41
-msgid "olsrd_olsrd_linkqualitylevel_2"
+msgid "MPR selection and routing"
 msgstr "Chọn lọc MPR và lộ trình"
 
 #. LQ window size
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:42
-msgid "olsrd_olsrd_linkqualitywinsize"
+msgid "LQ window size"
 msgstr "Dung lượng LQ window"
 
 #. MPR coverage
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:43
-msgid "olsrd_olsrd_mprcoverage"
+msgid "MPR coverage"
 msgstr "Phạm vi MPR"
 
 #. Pollrate
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:44
-msgid "olsrd_olsrd_pollrate"
+msgid "Pollrate"
 msgstr "Pollrate"
 
 #. TC redundancy
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:45
-msgid "olsrd_olsrd_tcredundancy"
+msgid "TC redundancy"
 msgstr "TC redundancy"
 
 #. MPR selectors
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:46
-msgid "olsrd_olsrd_tcredundancy_0"
+msgid "MPR selectors"
 msgstr "Bộ chọn MPR "
 
 #. MPR selectors and MPR
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:47
-msgid "olsrd_olsrd_tcredundancy_1"
+msgid "MPR selectors and MPR"
 msgstr "Bộ chọn MPR và MPR"
 
 #. all neighbours
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:48
-msgid "olsrd_olsrd_tcredundancy_2"
+msgid "all neighbours"
 msgstr "Tất cả vùng lân cận"
 
 #. Use hysteresis
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:49
-msgid "olsrd_olsrd_usehysteresis"
+msgid "Use hysteresis"
 msgstr "Dùng hysteresis"
 
 #. Willingness
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:50
-msgid "olsrd_olsrd_willingness"
+msgid "Willingness"
 msgstr "Sẵn sàng"
 
 #. Hello interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:51
-msgid "olsrd_interface_hellointerval"
+msgid "Hello interval"
 msgstr "Vùng xin chào"
 
 #. Hello validity time
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:52
-msgid "olsrd_interface_hellovaliditytime"
+msgid "Hello validity time"
 msgstr "Thời gian hợp lệ hóa lời chào"
 
 #. HNA interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:53
-msgid "olsrd_interface_hnainterval"
+msgid "HNA interval"
 msgstr "Khoảng HNA"
 
 #. HNA validity time
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:54
-msgid "olsrd_interface_hnavaliditytime"
+msgid "HNA validity time"
 msgstr "Thời gian hợp lệ hóa HNA "
 
 #. IPv4 broadcast
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:55
-msgid "olsrd_interface_ip4broadcast"
+msgid "IPv4 broadcast"
 msgstr "IPv4 broadcast"
 
 #. MID interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:56
-msgid "olsrd_interface_midinterval"
+msgid "MID interval"
 msgstr "Khoảng MID"
 
 #. MID validity time
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:57
-msgid "olsrd_interface_midvaliditytime"
+msgid "MID validity time"
 msgstr "Thời gian hợp lệ hóa MID"
 
 #. TC interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:58
-msgid "olsrd_interface_tcinterval"
+msgid "TC interval"
 msgstr "Khoảng TC"
 
 #. TC validity time
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:59
-msgid "olsrd_interface_tcvaliditytime"
+msgid "TC validity time"
 msgstr "Thời gian hợp lệ hóa TC"
 
 #. IPv6 address type
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:60
-msgid "olsrd_interface_ip6addrtype"
+msgid "IPv6 address type"
 msgstr "Loại địa chỉ IPv6"
 
 #. IPC settings
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:61
-msgid "olsrd_ipcconnect"
+msgid "IPC settings"
 msgstr "Cài đặt IPC"
 
 #. IPC connections enable you to remote-control the local OLSRd instance using external programs
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:62
-msgid "olsrd_ipcconnect_desc"
+msgid "IPC connections enable you to remote-control the local OLSRd instance using external programs"
 msgstr ""
 "Kết nối IPC cho phép bạn điều khiển từ xa OLSRd instance địa phương dùng "
 "chương trình bên ngoài"
 
 #. Allowed host addresses
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:63
-msgid "olsrd_ipcconnect_host"
+msgid "Allowed host addresses"
 msgstr "Các địa chỉ host cho phép "
 
 #. Multiple separated by spaces
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:64
-msgid "olsrd_ipcconnect_host_desc"
+msgid "Multiple separated by spaces"
 msgstr "Nhiều phân cách bởi những khoảng trống"
 
 #. Maxmimum connection count
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:65
-msgid "olsrd_ipcconnect_maxconnections"
+msgid "Maxmimum connection count"
 msgstr "Đếm kết nối tối đa"
 
 #. Set to 0 to disable IPC
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:66
-msgid "olsrd_ipcconnect_maxconnections_desc"
+msgid "Set to 0 to disable IPC"
 msgstr "Đặt 0 để vô hiệu hóa IPC"
 
 #. Allowed subnets
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:67
-msgid "olsrd_ipcconnect_net"
+msgid "Allowed subnets"
 msgstr "Cho phép subnets"
 
 #. Address Mask; multiple separated by space
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:68
-msgid "olsrd_ipcconnect_net_desc"
+msgid "Address Mask; multiple separated by space"
 msgstr "Địa chỉ Mask; nhiều phân cách bằng khoảng trống"
 
 #. IPv4 HNA announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:69
-msgid "olsrd_hna4"
+msgid "IPv4 HNA announcements"
 msgstr "IPv4 HNA thông báo"
 
 #. Hna4 entries allow you to propagate local IPv4 host- and network-routes into the mesh network
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:70
-msgid "olsrd_hna4_desc"
+msgid "Hna4 entries allow you to propagate local IPv4 host- and network-routes into the mesh network"
 msgstr ""
 "Mục Hna4  cho phép bạn lan truyền host IPv4 địa phương và các tuyến mạng "
 "lưới tới các mạng lưới"
 
 #. Network address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:71
-msgid "olsrd_hna4_netaddr"
+msgid "Network address"
 msgstr "Địa chỉ mạng "
 
 #. IPv4 address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:72
-msgid "olsrd_hna4_netaddr_desc"
+msgid "IPv4 address"
 msgstr "Địa chỉ IPv4"
 
 #. Netmask
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:73
-msgid "olsrd_hna4_netmask"
+msgid "Netmask"
 msgstr "Netmask"
 
 #. IPv4 address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:74
-msgid "olsrd_hna4_netmask_desc"
+msgid "IPv4 address"
 msgstr "Địa chỉ IPv4"
 
 #. IPv6 HNA announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:75
-msgid "olsrd_hna6"
+msgid "IPv6 HNA announcements"
 msgstr "IPv6 HNA thông báo"
 
 #. Hna6 entries allow you to propagate local IPv6 host- and network-routes into the mesh network
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:76
-msgid "olsrd_hna6_desc"
+msgid "Hna6 entries allow you to propagate local IPv6 host- and network-routes into the mesh network"
 msgstr ""
 "Mục Hna6 cho phép bạn lan truyền host IPv6 địa phương và tuyến mạng lưới vào "
 "các mạng lưới"
 
 #. Network address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:77
-msgid "olsrd_hna6_netaddr"
+msgid "Network address"
 msgstr "Địa chỉ mạng"
 
 #. IPv6 address
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:78
-msgid "olsrd_hna6_netaddr_desc"
+msgid "IPv6 address"
 msgstr "Địa chỉ IPv6 "
 
 #. Prefix
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:79
-msgid "olsrd_hna6_prefix"
+msgid "Prefix"
 msgstr "Tiền tố"
 
 #. IPv6 prefix
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:80
-msgid "olsrd_hna6_prefix_desc"
+msgid "IPv6 prefix"
 msgstr "Tiền tố IPv6"
 
 #. Plugin configuration
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:81
-msgid "olsrd_loadplugin"
+msgid "Plugin configuration"
 msgstr "Cấu hình Plugin"
 
 #. Enable plugin
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:82
-msgid "olsrd_loadplugin_ignore"
+msgid "Enable plugin"
 msgstr "Kích hoạt plugin"
 
 #. Library
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:83
-msgid "olsrd_loadplugin_library"
+msgid "Library"
 msgstr "Thư viện "
 
 #. Allow connections from this hosts
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:84
-msgid "olsrd_loadplugin_accept"
+msgid "Allow connections from this hosts"
 msgstr "Cho phép kết nối từ host này"
 
 #. Ping test addresses
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:85
-msgid "olsrd_loadplugin_ping"
+msgid "Ping test addresses"
 msgstr "Ping test địa chỉ"
 
 #. Interval
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:86
-msgid "olsrd_loadplugin_interval"
+msgid "Refresh interval in seconds"
 msgstr "Khoảng"
 
 #. HNA announcements
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:87
-msgid "olsrd_loadplugin_hna"
+msgid "HNA announcements"
 msgstr "HNA thông báo"
 
 #. Format: IP-Address Netmask / OLSR will announce this network once it is reachable
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:88
-msgid "olsrd_loadplugin_hna_desc"
+msgid "Format: IP-Address Netmask / OLSR will announce this network once it is reachable"
 msgstr ""
 "Mặc định: địa chỉ IP Netmask / OLSR sẽ thông báo với mạng này một lần khi nó "
 "tiếp cận"
 
 #. Alternative \"hosts\" file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:89
-msgid "olsrd_loadplugin_addhosts"
+msgid "Alternative \"hosts\" file"
 msgstr "Tập tin host khác"
 
 #. The contents of this file will be appended to the autogenerated \"hosts\" file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:90
-msgid "olsrd_loadplugin_addhosts_desc"
+msgid "The contents of this file will be appended to the autogenerated \"hosts\" file"
 msgstr "Nội dung của tập tin này sẽ được nối vào các tập tin \"hosts\" tự phát"
 
 #. DNS server
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:91
-msgid "olsrd_loadplugin_dnsserver"
+msgid "DNS server"
 msgstr "DNS server"
 
 #. Alternative hostnames
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:92
-msgid "olsrd_loadplugin_hosts"
+msgid "Alternative hostnames"
 msgstr "Tên host khác"
 
 #. Format: Interface-IP Hostname
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:93
-msgid "olsrd_loadplugin_hosts_desc"
+msgid "Format: Interface-IP Hostname"
 msgstr "Format: Giao diện-IP tên host"
 
 #. Path to the \"hosts\" file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:94
-msgid "olsrd_loadplugin_hostsfile"
+msgid "Path to the \"hosts\" file"
 msgstr "Đường dẫn tới tập tin \"hosts\""
 
 #. Latitude
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:95
-msgid "olsrd_loadplugin_lat"
+msgid "Latitude"
 msgstr "Bề rộng"
 
 #. Output file for coordinates
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:96
-msgid "olsrd_loadplugin_latlonfile"
+msgid "Output file for coordinates"
 msgstr "Tập tin output cho tọa độ "
 
 #. OLSR will write received coordinates of other nodes to this file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:97
-msgid "olsrd_loadplugin_latlonfile_desc"
+msgid "OLSR will write received coordinates of other nodes to this file"
 msgstr "OLSR sẽ viết những tọa đọ thu nhập của các nodes khác vào tập tin này "
 
 #. Input file for coordinates
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:98
-msgid "olsrd_loadplugin_latloninfile"
+msgid "Input file for coordinates"
 msgstr "Tập tin input cho tọa độ"
 
 #. OLSR periodically checks this file for new coordinates and propagates them
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:99
-msgid "olsrd_loadplugin_latloninfile_desc"
+msgid "OLSR periodically checks this file for new coordinates and propagates them"
 msgstr "OLSR định kỳ kiểm tra tập tin này các tọa độ mới và lan truyền chúng"
 
 #. Longitude
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:100
-msgid "olsrd_loadplugin_lon"
+msgid "Longitude"
 msgstr "Chiều dài"
 
 #. Hostnames
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:101
-msgid "olsrd_loadplugin_name"
+msgid "Hostnames"
 msgstr "Tên host"
 
 #. Command for name changes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:102
-msgid "olsrd_loadplugin_namechangescript"
+msgid "Command for name changes"
 msgstr "Lệnh thay đổi tên"
 
 #. OLSR executes this command once entries in the \"hosts\" are changed
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:103
-msgid "olsrd_loadplugin_namechangescript_desc"
+msgid "OLSR executes this command once entries in the \"hosts\" are changed"
 msgstr "OLSR thi hành lệnh này một lần trong \"hosts\" đã thay đổi"
 
 #. Path to the \"resolv\" file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:104
-msgid "olsrd_loadplugin_resolvfile"
+msgid "Path to the \"resolv\" file"
 msgstr "Đường dẫn tới tập tin \"resolv\""
 
 #. Command for service changes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:105
-msgid "olsrd_loadplugin_serviceschangescript"
+msgid "Command for service changes"
 msgstr "Lệnh thay đổi dịch vụ"
 
 #. OLSR excutes this command once new service announcements are received
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:106
-msgid "olsrd_loadplugin_serviceschangescript_desc"
+msgid "OLSR excutes this command once new service announcements are received"
 msgstr "OLSR thi hành lệnh này một lần thông báo dịch vụ mới đã nhận "
 
 #. PID file for SIGHUP signals
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:107
-msgid "olsrd_loadplugin_sighuppidfile"
+msgid "PID file for SIGHUP signals"
 msgstr "Tập tin PID cho tín hiệu SIGHUP "
 
 #. OLSR sends a HUP signal to this PID once the \"hosts\" oder \"resolv\" file is changed
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:108
-msgid "olsrd_loadplugin_sighuppidfile_desc"
+msgid "OLSR sends a HUP signal to this PID once the \"hosts\" oder \"resolv\" file is changed"
 msgstr ""
 "OLSR gửi một tín hiệu HUP tới PID này khi \"hosts\" oder tập tin \"resolv\" được "
 "thay đổi"
 
 #. Domain suffix
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:109
-msgid "olsrd_loadplugin_suffix"
+msgid "Domain suffix"
 msgstr "Domain suffix"
 
 #. Timeout
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:110
-msgid "olsrd_loadplugin_timeout"
+msgid "Timeout"
 msgstr "Timeout"
 
 #. Name of the BMF interface
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:111
-msgid "olsrd_loadplugin_bmfinterface"
+msgid "Name of the BMF interface"
 msgstr "Tên của giao diện BMF"
 
 #. IP address of the BMF interface
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:112
-msgid "olsrd_loadplugin_bmfinterfaceid"
+msgid "IP address of the BMF interface"
 msgstr "Địa chỉ IP của giao diện BMF"
 
 #. Redirect local broadcasts
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:113
-msgid "olsrd_loadplugin_dolocalbroadcast"
+msgid "Redirect local broadcasts"
 msgstr "Chuyển tới broadcasts địa phương"
 
 #. Also redirect broadcasts from OLSR interfaces
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:114
-msgid "olsrd_loadplugin_capturepacketsonolsrinterfaces"
+msgid "Also redirect broadcasts from OLSR interfaces"
 msgstr "Đồng thời chuyển broadcasts từ giao diện OLSR"
 
 #. Propagation mechanism
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:115
-msgid "olsrd_loadplugin_bmfmechanism"
+msgid "Propagation mechanism"
 msgstr "Cơ chế lan truyền"
 
 #. Number of retransmissions per package
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:116
-msgid "olsrd_loadplugin_broadcastretransmitcount"
+msgid "Number of retransmissions per package"
 msgstr "Số lượng retransmissions trên gói"
 
 #. Minimum number of neighbours for broadcast redirection
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:117
-msgid "olsrd_loadplugin_fanoutlimit"
+msgid "Minimum number of neighbours for broadcast redirection"
 msgstr "Số lượng tối thiểu của neighbors cho sự đổi hướng phát"
 
 #. Non-OLSR interfaces
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:118
-msgid "olsrd_loadplugin_nonolsrif"
+msgid "Non-OLSR interfaces"
 msgstr "Giao diện không OLSR"
 
 #. Used port
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:119
-msgid "olsrd_loadplugin_port"
+msgid "Used port"
 msgstr "Cổng đã dùng"
 
 #. Allow connections from hosts
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:120
-msgid "olsrd_loadplugin_host"
+msgid "Allow connections from hosts"
 msgstr "Cho phép kết nối từ hosts"
 
 #. Allow connections from subnets
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:121
-msgid "olsrd_loadplugin_net"
+msgid "Allow connections from subnets"
 msgstr "Cho phép kết nối từ subnets"
 
 #. Format: IP-AddresseNetmask
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:122
-msgid "olsrd_loadplugin_net_desc"
+msgid "Format: IP-AddresseNetmask"
 msgstr "Format: IP-AddresseNetmask"
 
 #. Used protocols
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:123
-msgid "olsrd_loadplugin_redistribute"
+msgid "Used protocols"
 msgstr "Protocols sử dụng"
 
 #. Only export routes to Quagga or to kernel too
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:124
-msgid "olsrd_loadplugin_exportroutes"
+msgid "Only export routes to Quagga or to kernel too"
 msgstr "Chỉ export routes tới Quagga hoặc cũng tới kernel "
 
 #. Always prefer local routes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:125
-msgid "olsrd_loadplugin_localpref"
+msgid "Always prefer local routes"
 msgstr "Luôn ưu tiên cho đường dẫn địa phương"
 
 #. Distance of exported routes
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:126
-msgid "olsrd_loadplugin_distance"
+msgid "Distance of exported routes"
 msgstr "Khoảng cách của những tuyến đưa ra"
 
 #. Key file
 #: applications/luci-olsr/luasrc/i18n/olsr.en.lua:127
-msgid "olsrd_loadplugin_keyfile"
+msgid "Key file"
 msgstr "Tập tin chính"
 
 #. Watchdog timestamp file
diff --git a/po/vi/openvpn.po b/po/vi/openvpn.po
index af48a9444..580d827a9 100644
--- a/po/vi/openvpn.po
+++ b/po/vi/openvpn.po
@@ -15,949 +15,949 @@ msgstr ""
 
 #. OpenVPN
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:1
-msgid "openvpn"
+msgid "OpenVPN"
 msgstr "OpenVPN"
 
 #. Switch to basic configuration
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:3
-msgid "openvpn_switch_basic"
+msgid "« Switch to basic configuration"
 msgstr "Chuyển sang cấu hình căn bản"
 
 #. Switch to advanced configuration
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:4
-msgid "openvpn_switch_advanced"
+msgid "Switch to advanced configuration »"
 msgstr "Chuyển sang cấu hình cấp cao"
 
 #. Enabled
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:6
-msgid "openvpn_enable"
+msgid "Enabled"
 msgstr "Kích hoạt "
 
 #. Started
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:7
-msgid "openvpn_active"
+msgid "Started"
 msgstr "Bắt đầu"
 
 #. no
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:8
-msgid "openvpn_active_no"
+msgid "no"
 msgstr "không"
 
 #. yes (%i)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:9
-msgid "openvpn_active_yes"
+msgid "yes (%i)"
 msgstr "Có (%i)"
 
 #. Port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:10
-msgid "openvpn_port"
+msgid "Port"
 msgstr "Cổng"
 
 #. Protocol
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:11
-msgid "openvpn_proto"
+msgid "Protocol"
 msgstr "Protocol"
 
 #. Instance \"%s\"
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:13
-msgid "openvpn_instance"
+msgid "Instance \"%s\""
 msgstr "Instance \"%s\""
 
 #. OpenVPN instances
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:15
-msgid "openvpn_overview"
+msgid "OpenVPN instances"
 msgstr "OpenVPN instances"
 
 #. Below is a list of configured OpenVPN instances and their current state
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:16
-msgid "openvpn_overview_desc"
+msgid "Below is a list of configured OpenVPN instances and their current state"
 msgstr ""
 "Dưới đây là một list của OpenVPN instances đã được cấu hình và tình trạng "
 "hiện tại"
 
 #. Daemon configuration
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:18
-msgid "openvpn_service"
+msgid "Daemon configuration"
 msgstr "Cấu hình Daemon"
 
 #. Networking options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:19
-msgid "openvpn_networking"
+msgid "Networking options"
 msgstr "Tùy chọn mạng "
 
 #. VPN options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:20
-msgid "openvpn_vpn"
+msgid "VPN options"
 msgstr "Tùy chọn VPN"
 
 #. Cryptography settings
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:21
-msgid "openvpn_cryptography"
+msgid "Cryptography settings"
 msgstr "Các cài đặt cryptography"
 
 #. Read configuration options from file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:23
-msgid "openvpn_param_config"
+msgid "Read configuration options from file"
 msgstr "Đọc tùy chọn cấu hình từ tập tin"
 
 #. Local host name or ip address
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:24
-msgid "openvpn_param_local"
+msgid "Local host name or ip address"
 msgstr "Tên host địa phương và địa chỉ IP"
 
 #. Remote host name or ip address
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:25
-msgid "openvpn_param_remote"
+msgid "Remote host name or ip address"
 msgstr "Tên host ngoài vùng và địa chỉ IP"
 
 #. Randomly choose remote server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:26
-msgid "openvpn_param_remote_random"
+msgid "Randomly choose remote server"
 msgstr "Ngẫu nhiên chọn server ngoài vùng"
 
 #. Major mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:27
-msgid "openvpn_param_mode"
+msgid "Major mode"
 msgstr "Chế độ chính"
 
 #. Use protocol
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:28
-msgid "openvpn_param_proto"
+msgid "Use protocol"
 msgstr "Dùng protocol"
 
 #. Connection retry interval
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:29
-msgid "openvpn_param_connect_retry"
+msgid "Connection retry interval"
 msgstr "Khoảng thử kết nối"
 
 #. Connection timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:30
-msgid "openvpn_param_connect_timeout"
+msgid "Connection timeout"
 msgstr "Ngừng kết nối"
 
 #. Maximum connection attempt retries
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:31
-msgid "openvpn_param_connect_retry_max"
+msgid "Maximum connection attempt retries"
 msgstr "Số lần thử kết nối tối đa"
 
 #. Try to sense proxy settings automatically
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:32
-msgid "openvpn_param_auto_proxy"
+msgid "Try to sense proxy settings automatically"
 msgstr "Thử cảm giác các cài đặt proxy tự động "
 
 #. Connect to remote host
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:33
-msgid "openvpn_param_http_proxy"
+msgid "Connect to remote host"
 msgstr "Kết nối với host ngoài vùng"
 
 #. Retry indefinitely on HTTP proxy errors
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:34
-msgid "openvpn_param_http_proxy_retry"
+msgid "Retry indefinitely on HTTP proxy errors"
 msgstr "Thử lại trên HTTP proxy lỗi"
 
 #. Proxy timeout in seconds
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:35
-msgid "openvpn_param_http_proxy_timeout"
+msgid "Proxy timeout in seconds"
 msgstr "Proxy timeout in seconds"
 
 #. Set extended HTTP proxy options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:36
-msgid "openvpn_param_http_proxy_option"
+msgid "Set extended HTTP proxy options"
 msgstr "Thiết lập các tùy chọn mở rộng HTTP proxy"
 
 #. Connect through Socks5 proxy
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:37
-msgid "openvpn_param_socks_proxy"
+msgid "Connect through Socks5 proxy"
 msgstr "Kết nối qua Socks5 proxy"
 
 #. Retry indefinitely on Socks proxy errors
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:38
-msgid "openvpn_param_socks_proxy_retry"
+msgid "Retry indefinitely on Socks proxy errors"
 msgstr "Thử lại trên Socks proxy lỗi"
 
 #. If hostname resolve fails, retry
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:39
-msgid "openvpn_param_resolv_retry"
+msgid "If hostname resolve fails, retry"
 msgstr "Nếu hostname resolve thất bại, thử lại"
 
 #. Allow remote to change its IP or port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:40
-msgid "openvpn_param_float"
+msgid "Allow remote to change its IP or port"
 msgstr "Cho phép đối tượng ngoài vùng thay đổi IP hoặc cổng"
 
 #. Execute shell command on remote ip change
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:41
-msgid "openvpn_param_ipchange"
+msgid "Execute shell command on remote ip change"
 msgstr "Thực hiện lệnh shell trên ip thay đổi từ xa"
 
 #. TCP/UDP port # for both local and remote
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:42
-msgid "openvpn_param_port"
+msgid "TCP/UDP port # for both local and remote"
 msgstr "Cổng TCP/UDP # cho cả địa phương và ngoài vùng"
 
 #. TCP/UDP port # for local (default=1194)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:43
-msgid "openvpn_param_lport"
+msgid "TCP/UDP port # for local (default=1194)"
 msgstr "Cổng TCP/UDP # cho địa phương (default=1194)"
 
 #. TCP/UDP port # for remote (default=1194)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:44
-msgid "openvpn_param_rport"
+msgid "TCP/UDP port # for remote (default=1194)"
 msgstr "Cổng TCP/UDP # cho ngoài vùng (default=1194)"
 
 #. Bind to local address and port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:45
-msgid "openvpn_param_bind"
+msgid "Bind to local address and port"
 msgstr "Kết nối địa chỉ địa phương và cổng"
 
 #. Do not bind to local address and port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:46
-msgid "openvpn_param_nobind"
+msgid "Do not bind to local address and port"
 msgstr "Đừng đóng kết địa chỉ địa phương và cổng"
 
 #. tun/tap device
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:47
-msgid "openvpn_param_dev"
+msgid "tun/tap device"
 msgstr "Công cụ tun/tap"
 
 #. Type of used device
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:48
-msgid "openvpn_param_dev_type"
+msgid "Type of used device"
 msgstr "Loại công cụ sử dụng"
 
 #. Use tun/tap device node
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:49
-msgid "openvpn_param_dev_node"
+msgid "Use tun/tap device node"
 msgstr "Dùng chế độ công cụ tun/tap"
 
 #. Set the link layer address of the tap device
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:50
-msgid "openvpn_param_lladdr"
+msgid "Set the link layer address of the tap device"
 msgstr "Đặt địa chỉ link layer của công cụ tap"
 
 #. 'net30', 'p2p', or 'subnet'
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:51
-msgid "openvpn_param_topology"
+msgid "'net30', 'p2p', or 'subnet'"
 msgstr "'net30', 'p2p', or 'subnet'"
 
 #. Make tun device IPv6 capable
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:52
-msgid "openvpn_param_tun_ipv6"
+msgid "Make tun device IPv6 capable"
 msgstr "Làm cho tun công cụ IPv6 có khả năng"
 
 #. Configure device to use IP address
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:53
-msgid "openvpn_param_ifconfig"
+msgid "Configure device to use IP address"
 msgstr "Định cấu hình công cụ để dùng địa chỉ IP"
 
 #. Don't actually execute ifconfig
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:54
-msgid "openvpn_param_ifconfig_noexec"
+msgid "Don't actually execute ifconfig"
 msgstr "Đừng thực sự thực hiện ifconfig"
 
 #. Don't warn on ifconfig inconsistencies
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:55
-msgid "openvpn_param_ifconfig_nowarn"
+msgid "Don't warn on ifconfig inconsistencies"
 msgstr "Đừng cảnh báo về sự không nhất quán của ifconfig"
 
 #. Add route after establishing connection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:56
-msgid "openvpn_param_route"
+msgid "Add route after establishing connection"
 msgstr "Thêm tuyến sau khi kết nối thành lập"
 
 #. Specify a default gateway for routes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:57
-msgid "openvpn_param_route_gateway"
+msgid "Specify a default gateway for routes"
 msgstr "Chỉ định một cổng mặc định cho tuyến"
 
 #. Specify a default metric for routes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:58
-msgid "openvpn_param_route_metric"
+msgid "Specify a default metric for routes"
 msgstr "Chỉ định metric mặc định cho tuyến"
 
 #. Delay n seconds after connection 
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:59
-msgid "openvpn_param_route_delay"
+msgid "Delay n seconds after connection "
 msgstr "Trì hoãn n giây sau khi kết nối <span class=\"translation-space\"> </span>\n"
 
 #. Execute shell cmd after routes are added
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:60
-msgid "openvpn_param_route_up"
+msgid "Execute shell cmd after routes are added"
 msgstr "Thực hiện shell cmd sau khi tuyến đã thêm vào"
 
 #. Don't add routes automatically
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:61
-msgid "openvpn_param_route_noexec"
+msgid "Don't add routes automatically"
 msgstr "Đừng tự động thêm vào đường dẫn"
 
 #. Don't pull options from server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:62
-msgid "openvpn_param_route_nopull"
+msgid "Don't pull options from server"
 msgstr "Đừng kéo lựa chọn từ server"
 
 #. Automatically redirect default route
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:63
-msgid "openvpn_param_redirect_gateway"
+msgid "Automatically redirect default route"
 msgstr "Tự động chuyển hướng tuyến mặc định"
 
 #. Pass environment variables to script
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:64
-msgid "openvpn_param_setenv"
+msgid "Pass environment variables to script"
 msgstr "Bỏ qua yếu tố môi trường tới script"
 
 #. Shaping for peer bandwidth
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:65
-msgid "openvpn_param_shaper"
+msgid "Shaping for peer bandwidth"
 msgstr "Shaping cho peer bandwidth"
 
 #. Set timeouts in server mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:66
-msgid "openvpn_param_keepalive"
+msgid "Set timeouts in server mode"
 msgstr "Đặt timeouts trong chế độ server"
 
 #. tun/tap inactivity timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:67
-msgid "openvpn_param_inactive"
+msgid "tun/tap inactivity timeout"
 msgstr "tun/tap timeout không có hành động"
 
 #. Remote ping timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:68
-msgid "openvpn_param_ping_exit"
+msgid "Remote ping timeout"
 msgstr "PING timeout từ xa"
 
 #. Restart after remote ping timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:69
-msgid "openvpn_param_ping_restart"
+msgid "Restart after remote ping timeout"
 msgstr "Khởi động lại sau khi remote ping timeout"
 
 #. Only process ping timeouts if routes exist
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:70
-msgid "openvpn_param_ping_timer_rem"
+msgid "Only process ping timeouts if routes exist"
 msgstr "Chỉ xử lý ping timouts nếu tuyến tồn tại"
 
 #. Ping remote every n seconds over TCP/UDP port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:71
-msgid "openvpn_param_ping"
+msgid "Ping remote every n seconds over TCP/UDP port"
 msgstr "Ping remote mỗi n giây trên cổng TCP/UDP"
 
 #. Configure a multi-homed UDP server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:72
-msgid "openvpn_param_multihome"
+msgid "Configure a multi-homed UDP server"
 msgstr "Định cấu hình một multi-homed UDP server"
 
 #. Optimize TUN/TAP/UDP writes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:73
-msgid "openvpn_param_fast_io"
+msgid "Optimize TUN/TAP/UDP writes"
 msgstr "Tối ưu hóa TUN/TAP/UDP writes"
 
 #. Remap SIGUSR1 signals
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:74
-msgid "openvpn_param_remap_usr1"
+msgid "Remap SIGUSR1 signals"
 msgstr "Remap tín hiệu SIGUSR1"
 
 #. Keep tun/tap device open on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:75
-msgid "openvpn_param_persist_tun"
+msgid "Keep tun/tap device open on restart"
 msgstr "Giữ công cụ tun/tap mở khi khởi động lại  "
 
 #. Keep remote IP address on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:76
-msgid "openvpn_param_persist_remote_ip"
+msgid "Keep remote IP address on restart"
 msgstr "Giữ remote địa chỉ IP ở chế độ khởi động"
 
 #. Keep local IP address on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:77
-msgid "openvpn_param_persist_local_ip"
+msgid "Keep local IP address on restart"
 msgstr "Giữ địa chỉ IP ở chế độ khởi động"
 
 #. Don't re-read key on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:78
-msgid "openvpn_param_persist_key"
+msgid "Don't re-read key on restart"
 msgstr "Đừng đọc lại key ở chế độ khởi động "
 
 #. TOS passthrough (applies to IPv4 only)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:79
-msgid "openvpn_param_passtos"
+msgid "TOS passthrough (applies to IPv4 only)"
 msgstr "TOS passthrough (chỉ áp dụng cho IPv4)"
 
 #. Set tun/tap device MTU
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:80
-msgid "openvpn_param_tun_mtu"
+msgid "Set tun/tap device MTU"
 msgstr "Đặt công cụ tun/tap MTU"
 
 #. Set tun/tap device overhead
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:81
-msgid "openvpn_param_tun_mtu_extra"
+msgid "Set tun/tap device overhead"
 msgstr "Đặt thiết bị tun/tap overhead"
 
 #. Set TCP/UDP MTU
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:82
-msgid "openvpn_param_link_mtu"
+msgid "Set TCP/UDP MTU"
 msgstr "Cài đặt TCP/UDP MTU"
 
 #. Enable Path MTU discovery
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:83
-msgid "openvpn_param_mtu_disc"
+msgid "Enable Path MTU discovery"
 msgstr "Kích hoạt khám phá đường dẫn MTU"
 
 #. Empirically measure MTU
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:84
-msgid "openvpn_param_mtu_test"
+msgid "Empirically measure MTU"
 msgstr "Đo MTU"
 
 #. Enable internal datagram fragmentation
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:85
-msgid "openvpn_param_fragment"
+msgid "Enable internal datagram fragmentation"
 msgstr "Kích hoạt internal datagram fragmentation"
 
 #. Set upper bound on TCP MSS
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:86
-msgid "openvpn_param_mssfix"
+msgid "Set upper bound on TCP MSS"
 msgstr "Đặt upper bound trên TCP MSS"
 
 #. Set the TCP/UDP send buffer size
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:87
-msgid "openvpn_param_sndbuf"
+msgid "Set the TCP/UDP send buffer size"
 msgstr "Đặt TCP/UDP gửi dung lượng buffer"
 
 #. Set the TCP/UDP receive buffer size
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:88
-msgid "openvpn_param_rcvbuf"
+msgid "Set the TCP/UDP receive buffer size"
 msgstr "Đặt TCP/UDP nhận dung lượng buffer"
 
 #. Set tun/tap TX queue length
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:89
-msgid "openvpn_param_txqueuelen"
+msgid "Set tun/tap TX queue length"
 msgstr "Đặt tun/tap độ dài queue"
 
 #. Disable Paging
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:90
-msgid "openvpn_param_mlock"
+msgid "Disable Paging"
 msgstr "Vô hiệu hóa Paging"
 
 #. Shell cmd to execute after tun device open
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:91
-msgid "openvpn_param_up"
+msgid "Shell cmd to execute after tun device open"
 msgstr "Shell cmd để thực thi sau khi thiết bị tun mở"
 
 #. Delay tun/tap open and up script execution
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:92
-msgid "openvpn_param_up_delay"
+msgid "Delay tun/tap open and up script execution"
 msgstr "Trì hoãn tun/tap mở và up script execution"
 
 #. Shell cmd to run after tun device close
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:93
-msgid "openvpn_param_down"
+msgid "Shell cmd to run after tun device close"
 msgstr "Shell cmd để chạy sau khi thiết bị tun đóng"
 
 #. Call down cmd/script before TUN/TAP close
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:94
-msgid "openvpn_param_down_pre"
+msgid "Call down cmd/script before TUN/TAP close"
 msgstr "Call down cmd/script trước khi TUN/TAP đóng"
 
 #. Run up/down scripts for all restarts
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:95
-msgid "openvpn_param_up_restart"
+msgid "Run up/down scripts for all restarts"
 msgstr "Chạy up/down scripts cho tất cả khởi động"
 
 #. Set UID to user
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:96
-msgid "openvpn_param_user"
+msgid "Set UID to user"
 msgstr "Cài đặt UID tới người dùng"
 
 #. Set GID to group
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:97
-msgid "openvpn_param_group"
+msgid "Set GID to group"
 msgstr "Cài đặt GID tới nhóm"
 
 #. Chroot to directory after initialization
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:98
-msgid "openvpn_param_chroot"
+msgid "Chroot to directory after initialization"
 msgstr "Chroot vào thư mục sau khi khởi tạo"
 
 #. Change to directory before initialization
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:99
-msgid "openvpn_param_cd"
+msgid "Change to directory before initialization"
 msgstr "Chuyển qua thư mục trước khi khởi tạo"
 
 #. Daemonize after initialization
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:100
-msgid "openvpn_param_daemon"
+msgid "Daemonize after initialization"
 msgstr "Daemonize sau khi khởi tạo"
 
 #. Output to syslog and do not daemonize
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:101
-msgid "openvpn_param_syslog"
+msgid "Output to syslog and do not daemonize"
 msgstr "Output tới syslog và đừng daemonize"
 
 #. Run as an inetd or xinetd server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:102
-msgid "openvpn_param_inetd"
+msgid "Run as an inetd or xinetd server"
 msgstr "Chạy như inetd hoặc xinetd server"
 
 #. Write log to file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:103
-msgid "openvpn_param_log"
+msgid "Write log to file"
 msgstr "Viết log lên tập tin"
 
 #. Append log to file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:104
-msgid "openvpn_param_log_append"
+msgid "Append log to file"
 msgstr "Nối thêm log lên tập tin"
 
 #. Don't log timestamps
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:105
-msgid "openvpn_param_suppress_timestamps"
+msgid "Don't log timestamps"
 msgstr "Đừng log timestamps"
 
 #. Write process ID to file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:106
-msgid "openvpn_param_writepid"
+msgid "Write process ID to file"
 msgstr "Viết xử lý ID lên tập tin"
 
 #. Change process priority
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:107
-msgid "openvpn_param_nice"
+msgid "Change process priority"
 msgstr "Thay đổi quy trình ưu tiên"
 
 #. Echo parameters to log
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:108
-msgid "openvpn_param_echo"
+msgid "Echo parameters to log"
 msgstr "Báo tham số lên log"
 
 #. Set output verbosity
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:109
-msgid "openvpn_param_verb"
+msgid "Set output verbosity"
 msgstr "Đặt output verbosity"
 
 #. Limit repeated log messages
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:110
-msgid "openvpn_param_mute"
+msgid "Limit repeated log messages"
 msgstr "Giới hạn lập log tin nhắn"
 
 #. Write status to file every n seconds
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:111
-msgid "openvpn_param_status"
+msgid "Write status to file every n seconds"
 msgstr "Viết tình trạng tới tập tin mỗi n giây"
 
 #. Status file format version
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:112
-msgid "openvpn_param_status_version"
+msgid "Status file format version"
 msgstr "Tình trạng tập tin phiên bản format"
 
 #. Disable options consistency check
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:113
-msgid "openvpn_param_disable_occ"
+msgid "Disable options consistency check"
 msgstr "Vô hiệu hóa tùy chọn kiểm tra nhất quán"
 
 #. Special stress testing mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:114
-msgid "openvpn_param_gremlin"
+msgid "Special stress testing mode"
 msgstr "Chế độ kiểm tra stress đặc biệt "
 
 #. Use fast LZO compression
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:115
-msgid "openvpn_param_comp_lzo"
+msgid "Use fast LZO compression"
 msgstr "Dùng LZO nén nhanh"
 
 #. Don't use adaptive lzo compression
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:116
-msgid "openvpn_param_comp_noadapt"
+msgid "Don't use adaptive lzo compression"
 msgstr "Đừng dùng bộ nén lzo thích ứng"
 
 #. Enable management interface on <em>IP</em> <em>port</em>
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:117
-msgid "openvpn_param_management"
+msgid "Enable management interface on <em>IP</em> <em>port</em>"
 msgstr "Kích hoạt giao diện điều hành trên <em>IP</em> <em>cổng</em>"
 
 #. Management interface will connect as a TCP client
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:118
-msgid "openvpn_param_management_client"
+msgid "Management interface will connect as a TCP client"
 msgstr "Giao diện điều hành sẽ kết nối như một đối tượng TCP"
 
 #. Query management channel for private key
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:119
-msgid "openvpn_param_management_query_passwords"
+msgid "Query management channel for private key"
 msgstr "Tra vấn kênh điều hành cho phím bảo mật "
 
 #. Start OpenVPN in a hibernating state
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:120
-msgid "openvpn_param_management_hold"
+msgid "Start OpenVPN in a hibernating state"
 msgstr "Bắt đầu OpenVPN trong một hibernating state"
 
 #. Issue SIGUSR1 on management disconnect
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:121
-msgid "openvpn_param_management_signal"
+msgid "Issue SIGUSR1 on management disconnect"
 msgstr "Vấn đề SIGUSR1 trên điều hành dừng kết nối"
 
 #. Forget passwords on management disconnect
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:122
-msgid "openvpn_param_management_forget_disconnect"
+msgid "Forget passwords on management disconnect"
 msgstr "Quên mật mã trên điều hành dừng kết nối"
 
 #. Number of lines for log file history
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:123
-msgid "openvpn_param_management_log_cache"
+msgid "Number of lines for log file history"
 msgstr "Số dòng cho tập tin log history"
 
 #. Load plug-in module
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:124
-msgid "openvpn_param_plugin"
+msgid "Load plug-in module"
 msgstr "Tải plug-in module"
 
 #. Configure server mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:125
-msgid "openvpn_param_server"
+msgid "Configure server mode"
 msgstr "Định cấu hình chế độ server"
 
 #. Configure server bridge
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:126
-msgid "openvpn_param_server_bridge"
+msgid "Configure server bridge"
 msgstr "Định cấu hình cầu nối server"
 
 #. Push options to peer
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:127
-msgid "openvpn_param_push"
+msgid "Push options to peer"
 msgstr "Đẩy lựa chọn cho đối tác"
 
 #. Don't inherit global push options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:128
-msgid "openvpn_param_push_reset"
+msgid "Don't inherit global push options"
 msgstr "Đừng thừa hưởng tùy chọn đẩy toàn cầu"
 
 #. Set aside a pool of subnets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:129
-msgid "openvpn_param_ifconfig_pool"
+msgid "Set aside a pool of subnets"
 msgstr "Để sang một bên một pool của subnets"
 
 #. Use individual addresses rather than /30 subnets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:130
-msgid "openvpn_param_ifconfig_pool_linear"
+msgid "Use individual addresses rather than /30 subnets"
 msgstr "Nên dùng địa chỉ cá nhân hơn là /30 subnets"
 
 #. Persist/unpersist ifconfig-pool
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:131
-msgid "openvpn_param_ifconfig_pool_persist"
+msgid "Persist/unpersist ifconfig-pool"
 msgstr "Persist/unpersist ifconfig-pool"
 
 #. Push an ifconfig option to remote
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:132
-msgid "openvpn_param_ifconfig_push"
+msgid "Push an ifconfig option to remote"
 msgstr "Đảy một tùy chọn ifconfig tới remote"
 
 #. Route subnet to client
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:133
-msgid "openvpn_param_iroute"
+msgid "Route subnet to client"
 msgstr "Tuyến subnet tới khách hàng"
 
 #. Client is disabled
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:134
-msgid "openvpn_param_disable"
+msgid "Client is disabled"
 msgstr "Đối tượng bị vô hiệu hóa"
 
 #. Don't require client certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:135
-msgid "openvpn_param_client_cert_not_required"
+msgid "Don't require client certificate"
 msgstr "Đừng yêu câu  chứng chỉ đối tượng"
 
 #. Use username as common name
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:136
-msgid "openvpn_param_username_as_common_name"
+msgid "Use username as common name"
 msgstr "Dùng tên đăng nhập như tên thông thường"
 
 #. Script to verify interactive authentication
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:137
-msgid "openvpn_param_auth_user_pass_verify"
+msgid "Script to verify interactive authentication"
 msgstr "Script để làm rõ tương tác xác thực"
 
 #. Allow client-to-client traffic
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:138
-msgid "openvpn_param_client_to_client"
+msgid "Allow client-to-client traffic"
 msgstr "Cho phép lưu thông đối tượng - đến - đối tượng"
 
 #. Allow multiple clients with same certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:139
-msgid "openvpn_param_duplicate_cn"
+msgid "Allow multiple clients with same certificate"
 msgstr "Cho phép nhiều đối tượng với cùng một chứng chỉ"
 
 #. Run script cmd on client connection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:140
-msgid "openvpn_param_client_connect"
+msgid "Run script cmd on client connection"
 msgstr "Chạy script cmd trên đối tượng kết nối"
 
 #. Run script cmd on client disconnection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:141
-msgid "openvpn_param_client_disconnect"
+msgid "Run script cmd on client disconnection"
 msgstr "Chạy script cmd trên đối tượng không kết nối"
 
 #. Directory for custom client config files
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:142
-msgid "openvpn_param_client_config_dir"
+msgid "Directory for custom client config files"
 msgstr "Dạnh mục cho các tập tin config đối tương tùy chỉnh"
 
 #. Refuse connection if no custom client config
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:143
-msgid "openvpn_param_ccd_exclusive"
+msgid "Refuse connection if no custom client config"
 msgstr "Từ chối kết nối nêu không có config đối tượng tùy chỉnh"
 
 #. Temporary directory for client-connect return file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:144
-msgid "openvpn_param_tmp_dir"
+msgid "Temporary directory for client-connect return file"
 msgstr "Danh mục tạm thời cho tập tin client-connect return"
 
 #. Set size of real and virtual address hash tables
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:145
-msgid "openvpn_param_hash_size"
+msgid "Set size of real and virtual address hash tables"
 msgstr "Đặt dung lượng của bảng address hash thực và ảo"
 
 #. Number of allocated broadcast buffers
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:146
-msgid "openvpn_param_bcast_buffers"
+msgid "Number of allocated broadcast buffers"
 msgstr "Số lượng phân bổ phát sóng buffers"
 
 #. Maximum number of queued TCP output packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:147
-msgid "openvpn_param_tcp_queue_limit"
+msgid "Maximum number of queued TCP output packets"
 msgstr "Số lượng tối đa của queued TCP output packets"
 
 #. Script to validate client virtual addresses
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:148
-msgid "openvpn_param_learn_address"
+msgid "Script to validate client virtual addresses"
 msgstr "Script để hợp thức hóa địa chỉ ảo của đối tượng"
 
 #. Allowed maximum of new connections
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:149
-msgid "openvpn_param_connect_freq"
+msgid "Allowed maximum of new connections"
 msgstr "Cho phép tối đa kết nối mới là"
 
 #. Allowed maximum of connected clients
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:150
-msgid "openvpn_param_max_clients"
+msgid "Allowed maximum of connected clients"
 msgstr "Cho phép tối đa đối tượng kết nối mới là"
 
 #. Allowed maximum of internal
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:151
-msgid "openvpn_param_max_routes_per_client"
+msgid "Allowed maximum of internal"
 msgstr "Internal tối đa được cho phép"
 
 #. Proxy incoming HTTPS sessions
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:152
-msgid "openvpn_param_port_share"
+msgid "Proxy incoming HTTPS sessions"
 msgstr "Những phiên proxy incoming HTTPS "
 
 #. Configure client mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:153
-msgid "openvpn_param_client"
+msgid "Configure client mode"
 msgstr "Định cấu hình chế độ đối tượng "
 
 #. Authenticate using username/password
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:154
-msgid "openvpn_param_auth_user_pass"
+msgid "Authenticate using username/password"
 msgstr "Xác thực username/password đang sử dụng"
 
 #. Accept options pushed from server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:155
-msgid "openvpn_param_pull"
+msgid "Accept options pushed from server"
 msgstr "Chấp nhận tùy chọn được đảy từ server"
 
 #. Handling of authentication failures
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:156
-msgid "openvpn_param_auth_retry"
+msgid "Handling of authentication failures"
 msgstr "Xử lý những sai soát khi xác thực "
 
 #. Send notification to peer on disconnect
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:157
-msgid "openvpn_param_explicit_exit_notify"
+msgid "Send notification to peer on disconnect"
 msgstr "Gửi thông báo cho bạn bè về ngắt kết nối"
 
 #. Enable Static Key encryption mode (non-TLS)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:158
-msgid "openvpn_param_secret"
+msgid "Enable Static Key encryption mode (non-TLS)"
 msgstr "Kích hoạt chế độ mã hóa khóa tĩnh (non-TLS)"
 
 #. HMAC authentication for packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:159
-msgid "openvpn_param_auth"
+msgid "HMAC authentication for packets"
 msgstr "Sự xác thực HMAC cho gói"
 
 #. Encryption cipher for packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:160
-msgid "openvpn_param_cipher"
+msgid "Encryption cipher for packets"
 msgstr "Encryption cipher cho các gói"
 
 #. Size of cipher key
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:161
-msgid "openvpn_param_keysize"
+msgid "Size of cipher key"
 msgstr "Dung lượng của cipher key"
 
 #. Enable OpenSSL hardware crypto engines
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:162
-msgid "openvpn_param_engine"
+msgid "Enable OpenSSL hardware crypto engines"
 msgstr "Kích hoạt OpenSSL hardware crypto engines"
 
 #. Disable replay protection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:163
-msgid "openvpn_param_no_replay"
+msgid "Disable replay protection"
 msgstr "Vô hiệu hóa replay protection"
 
 #. Silence the output of replay warnings
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:164
-msgid "openvpn_param_mute_replay_warnings"
+msgid "Silence the output of replay warnings"
 msgstr "Silence the output của các cảnh báo reply"
 
 #. Replay protection sliding window size
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:165
-msgid "openvpn_param_replay_window"
+msgid "Replay protection sliding window size"
 msgstr "Replay chế độ bảo vệ kích thước window trượt"
 
 #. Disable cipher initialisation vector
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:166
-msgid "openvpn_param_no_iv"
+msgid "Disable cipher initialisation vector"
 msgstr "Vô hiệu hóa cipher initialisation vector"
 
 #. Persist replay-protection state
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:167
-msgid "openvpn_param_replay_persist"
+msgid "Persist replay-protection state"
 msgstr "Tiếp tục tình trạng replay-protection"
 
 #. Run a self-test of crypto features
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:168
-msgid "openvpn_param_test_crypto"
+msgid "Run a self-test of crypto features"
 msgstr "Chạy một chế độ tự kiểm tra các tính năng của crypto"
 
 #. Enable TLS and assume server role
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:169
-msgid "openvpn_param_tls_server"
+msgid "Enable TLS and assume server role"
 msgstr "Kích hoạt TLS và giả định vải trò của server"
 
 #. Enable TLS and assume client role
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:170
-msgid "openvpn_param_tls_client"
+msgid "Enable TLS and assume client role"
 msgstr "Kích hoạt TLS và giả định vải trò của client"
 
 #. Data channel key exchange method
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:171
-msgid "openvpn_param_key_method"
+msgid "Data channel key exchange method"
 msgstr "Data channel key trao đổi phương pháp"
 
 #. Certificate authority
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:172
-msgid "openvpn_param_ca"
+msgid "Certificate authority"
 msgstr "Giấy chứng nhận ủy quyền"
 
 #. Directory of trusted certificates (CAs and CRLs)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:173
-msgid "openvpn_param_capath"
+msgid "Directory of trusted certificates (CAs and CRLs)"
 msgstr "Danh mục các chứng chỉ tin cậy (CAS và CRLs)"
 
 #. Diffie Hellman parameters
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:174
-msgid "openvpn_param_dh"
+msgid "Diffie Hellman parameters"
 msgstr "Tham số Diffie Hellman "
 
 #. Local certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:175
-msgid "openvpn_param_cert"
+msgid "Local certificate"
 msgstr "Chứng chỉ địa phương"
 
 #. Local private key
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:176
-msgid "openvpn_param_key"
+msgid "Local private key"
 msgstr "Phím bảo mật địa phương"
 
 #. PKCS#12 file containing keys
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:177
-msgid "openvpn_param_pkcs12"
+msgid "PKCS#12 file containing keys"
 msgstr "PKCS # 12 tập tin có chứa key"
 
 #. TLS cipher
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:178
-msgid "openvpn_param_tls_cipher"
+msgid "TLS cipher"
 msgstr "TLS cipher"
 
 #. Retransmit timeout on TLS control channel
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:179
-msgid "openvpn_param_tls_timeout"
+msgid "Retransmit timeout on TLS control channel"
 msgstr "Retransmit timeout trên kênh kiểm soát TLS"
 
 #. Renegotiate data chan. key after bytes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:180
-msgid "openvpn_param_reneg_bytes"
+msgid "Renegotiate data chan. key after bytes"
 msgstr "Thương lượng lại data chan. key sau bytes"
 
 #. Renegotiate data chan. key after packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:181
-msgid "openvpn_param_reneg_pkts"
+msgid "Renegotiate data chan. key after packets"
 msgstr "Thương lượng lại data chan. key sau packets"
 
 #. Renegotiate data chan. key after seconds
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:182
-msgid "openvpn_param_reneg_sec"
+msgid "Renegotiate data chan. key after seconds"
 msgstr "Thương lượng lại data chan. key sau seconds"
 
 #. Timeframe for key exchange
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:183
-msgid "openvpn_param_hand_window"
+msgid "Timeframe for key exchange"
 msgstr "Timeframe cho trao đổi key"
 
 #. Key transition window
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:184
-msgid "openvpn_param_tran_window"
+msgid "Key transition window"
 msgstr "Key transition window"
 
 #. Allow only one session
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:185
-msgid "openvpn_param_single_session"
+msgid "Allow only one session"
 msgstr "Chỉ cho phép một session"
 
 #. Exit on TLS negotiation failure
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:186
-msgid "openvpn_param_tls_exit"
+msgid "Exit on TLS negotiation failure"
 msgstr "Exit trên TLS khi thương lượng thất bại"
 
 #. Additional authentication over TLS
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:187
-msgid "openvpn_param_tls_auth"
+msgid "Additional authentication over TLS"
 msgstr "Xác thực bổ xung trên TLS"
 
 #. Get PEM password from controlling tty before we daemonize
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:188
-msgid "openvpn_param_askpass"
+msgid "Get PEM password from controlling tty before we daemonize"
 msgstr "Lấy mật mã PEM từ điều khiển tty trước khi chúng ta daemonize"
 
 #. Don't cache --askpass or --auth-user-pass passwords
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:189
-msgid "openvpn_param_auth_nocache"
+msgid "Don't cache --askpass or --auth-user-pass passwords"
 msgstr "Don't cache --askpass or --auth-user-pass passwords"
 
 #. Check peer certificate against a CRL
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:190
-msgid "openvpn_param_crl_verify"
+msgid "Check peer certificate against a CRL"
 msgstr "Kiểm tra chứng chỉ đối tác với một CRL"
 
 #. Shell command to verify X509 name
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:191
-msgid "openvpn_param_tls_verify"
+msgid "Shell command to verify X509 name"
 msgstr "Shell command để hợp thức hóa tên X509 "
 
 #. Only accept connections from given X509 name
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:192
-msgid "openvpn_param_tls_remote"
+msgid "Only accept connections from given X509 name"
 msgstr "Chỉ chấp nhận kết nối từ những tên X509 cho sẵn"
 
 #. Require explicit designation on certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:193
-msgid "openvpn_param_ns_cert_type"
+msgid "Require explicit designation on certificate"
 msgstr "Yêu cầu rõ ràng về giấy chứng nhận "
 
 #. Require explicit key usage on certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:194
-msgid "openvpn_param_remote_cert_ku"
+msgid "Require explicit key usage on certificate"
 msgstr "Yêu cầu key dùng rõ rãng trên chứng nhận"
 
 #. Require extended explicit key usage on certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:195
-msgid "openvpn_param_remote_cert_eku"
+msgid "Require extended explicit key usage on certificate"
 msgstr "Yêu cầu gia hạn rõ ràng về cách sử dụng key trên giấy chứng nhận"
 
 #. Require normal and extended key usage on certificate
diff --git a/po/vi/p910nd.po b/po/vi/p910nd.po
index 0b384028f..ea598f47e 100644
--- a/po/vi/p910nd.po
+++ b/po/vi/p910nd.po
@@ -15,19 +15,19 @@ msgstr ""
 
 #. p910nd - Printer server
 #: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:1
-msgid "p910nd"
+msgid "p910nd - Printer server"
 msgstr "p910nd - Máy in chủ"
 
 #. First you have to install the packages to get support for USB (kmod-usb-printer) or parallel port (kmod-lp).
 #: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:2
-msgid "p910nd_desc"
+msgid "First you have to install the packages to get support for USB (kmod-usb-printer) or parallel port (kmod-lp)."
 msgstr ""
 "Trước tiên, bạn cần phải cài đặt các gói để hỗ trợ cho cổng USB (kmod-usb-"
 "in), hoặc cổng song song (kmod-lp)."
 
 #. Bidirectional mode
 #: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:3
-msgid "bidirectional"
+msgid "Bidirectional mode"
 msgstr "Chế độ 2 chiều"
 
 #. p910nd listens on port 910+N. E.g. 9100 for the first printer.
diff --git a/po/vi/polipo.po b/po/vi/polipo.po
index e8253042c..98d4bbfb4 100644
--- a/po/vi/polipo.po
+++ b/po/vi/polipo.po
@@ -15,27 +15,27 @@ msgstr ""
 
 #. Polipo
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:1
-msgid "polipo"
+msgid "Polipo"
 msgstr "Polipo"
 
 #. On-Disk Cache
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:2
-msgid "polipo_cache"
+msgid "On-Disk Cache"
 msgstr "Cạc trên ổ đĩa"
 
 #. Shared cache
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:3
-msgid "polipo_cache_cacheisshared"
+msgid "Shared cache"
 msgstr "Cạc trên ổ đĩa"
 
 #. Enable if cache (proxy) is shared by multiple users.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:4
-msgid "polipo_cache_cacheisshared_desc"
+msgid "Enable if cache (proxy) is shared by multiple users."
 msgstr "Kích hoạt nếu cạc được chia rẻ bởi nhiều người dùng."
 
 #. To enable polipo on-disk cache cleaning (highly recommended), you should add a cron job in Scheduled Tasks services that will execute /usr/sbin/polipo_purge script. For example to perform disk cache cleanup every day at 6:00 in the morning you should add the following line in Scheduled Tasks &quot;0 6 * * *	/usr/sbin/polipo_purge&quot; (without quotes).
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:5
-msgid "polipo_cache_desc"
+msgid "To enable polipo on-disk cache cleaning (highly recommended), you should add a cron job in Scheduled Tasks services that will execute /usr/sbin/polipo_purge script. For example to perform disk cache cleanup every day at 6:00 in the morning you should add the following line in Scheduled Tasks \"0 6 * * *\\t/usr/sbin/polipo_purge\" (without quotes)."
 msgstr ""
 "Để kích hoạt tính năng làm sạch trên cạc đĩa polipo (rất khuyến khích), bạn "
 "nên thêm vào một công việc cron trong những công tác đã schedule, nó sẽ thực "
@@ -46,12 +46,12 @@ msgstr ""
 
 #. Disk cache location
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:6
-msgid "polipo_cache_diskcacheroot"
+msgid "Disk cache location"
 msgstr "Vị trí cạc đĩa"
 
 #. Location where polipo will cache files permanently. Use of external storage devices is recommended, because the cache can grow considerably. Leave it empty to disable on-disk cache.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:7
-msgid "polipo_cache_diskcacheroot_desc"
+msgid "Location where polipo will cache files permanently. Use of external storage devices is recommended, because the cache can grow considerably. Leave it empty to disable on-disk cache."
 msgstr ""
 "Vị trị mà polipo sẽ định các tập tin thường xuyên. Sử dụng thiết bị nhớ "
 "ngoài được khuyến khích, bởi vì cạc có thể lớn lên đáng kể. Để lại nó trống "
@@ -59,52 +59,52 @@ msgstr ""
 
 #. Truncate cache files size (in bytes)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:8
-msgid "polipo_cache_diskcachetruncatesize"
+msgid "Truncate cache files size (in bytes)"
 msgstr "Bỏ bớt những tập tin cạc với dung lượng  (bytes)"
 
 #. Size to which cached files should be truncated. (default value: 1048576)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:9
-msgid "polipo_cache_diskcachetruncatesize_desc"
+msgid "Size to which cached files should be truncated. (default value: 1048576)"
 msgstr "Dung lượng mà những tập tin cạc bị cắt bỏ. (Giá trị: 1048576)"
 
 #. Truncate cache files time
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:10
-msgid "polipo_cache_diskcachetruncatetime"
+msgid "Truncate cache files time"
 msgstr "Cắt bỏ tập tin cạc khi"
 
 #. Time after which cached files will be truncated. (default value: 4d12h)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:11
-msgid "polipo_cache_diskcachetruncatetime_desc"
+msgid "Time after which cached files will be truncated. (default value: 4d12h)"
 msgstr "Thời gian khi tập tin cạc sẽ bị cắt bỏ (Giá trị: 4d12h)"
 
 #. Delete cache files time
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:12
-msgid "polipo_cache_diskcacheunlinktime"
+msgid "Delete cache files time"
 msgstr "Xóa tập tin cạc khi"
 
 #. Time after which cached files will be deleted. (default value: 32d)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:13
-msgid "polipo_cache_diskcacheunlinktime_desc"
+msgid "Time after which cached files will be deleted. (default value: 32d)"
 msgstr "Thời gian khi tập tin cạc sẽ bị xóa. (Giá trị: 32d)"
 
 #. Polipo is a small and fast caching web proxy.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:14
-msgid "polipo_desc"
+msgid "Polipo is a small and fast caching web proxy."
 msgstr "Polipo là một web proxy nhỏ và nhanh caching."
 
 #. General
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:15
-msgid "polipo_general"
+msgid "General"
 msgstr "Tổng quát"
 
 #. Allowed clients
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:16
-msgid "polipo_general_allowedclients"
+msgid "Allowed clients"
 msgstr "Đối tượng cho phép"
 
 #. When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients that are allowed to connect. The format is IP address or network address (192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6)).
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:17
-msgid "polipo_general_allowedclients_desc"
+msgid "When listen address is set to 0.0.0.0 or :: (IPv6), you must list clients that are allowed to connect. The format is IP address or network address (192.168.1.123, 192.168.1.0/24, 2001:660:116::/48 (IPv6))."
 msgstr ""
 "Khi nghe địa chỉ được đặt ở 0.0.0.0 hoặc :: (IPv6), bạn phải liệt kê những "
 "đối tượng được phép kết nối. Định dạng là địa chỉ IP hoặc địa chỉ mạng "
@@ -112,46 +112,46 @@ msgstr ""
 
 #. In RAM cache size (in bytes)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:18
-msgid "polipo_general_chunkhighmark"
+msgid "In RAM cache size (in bytes)"
 msgstr "Trong RAM dung lượng cạc (tính theo bytes)"
 
 #. How much RAM should Polipo use for its cache.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:19
-msgid "polipo_general_chunkhighmark_desc"
+msgid "How much RAM should Polipo use for its cache."
 msgstr "Bao nhiêu RAM Polipo nên dùng cho cạc."
 
 #. DNS server address
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:20
-msgid "polipo_general_dnsnameserver"
+msgid "DNS server address"
 msgstr "Địa chỉ tên miền máy chủ"
 
 #. Set the DNS server address to use, if you want Polipo to use different DNS server than the host system.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:21
-msgid "polipo_general_dnsnameserver_desc"
+msgid "Set the DNS server address to use, if you want Polipo to use different DNS server than the host system."
 msgstr ""
 "Cài đặt địa chỉ tên miền máy chủ để sử dụng, nếu bạn muốn Polipo dùng tên "
 "miền khác với hệ thông chính. "
 
 #. Query DNS for IPv6
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:22
-msgid "polipo_general_dnsqueryipv6"
+msgid "Query DNS for IPv6"
 msgstr "Tra vấn DNS cho IPv6"
 
 #. false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = Query both, prefer IPv6; true = Query only IPv6
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:23
-msgid "polipo_general_dnsqueryipv6_desc"
+msgid "false = Do not query IPv6; reluctantly = Query both, prefer IPv4; happily = Query both, prefer IPv6; true = Query only IPv6"
 msgstr ""
 "False = Đừng truy vấn IPv6; reluctantly = Truy vấn cả hai, IPv4 được chuộng "
 "hơn; happily = truy vấn cả hai, IPv6 chuộng hơn; true = chỉ truy vấn IPv6"
 
 #. Query DNS by hostname
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:24
-msgid "polipo_general_dnsusegethostbyname"
+msgid "Query DNS by hostname"
 msgstr "Tra vấn DNS bằng hostname"
 
 #. false = Never use system DNS resolver; reluctantly = Query DNS directly, if DNS server is unavailable fail to system DNS resolver; happily = Query DNS directly, if host could not be found fallback to system DNS resolver; true = Always use system DNS resolver
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:25
-msgid "polipo_general_dnsusegethostbyname_desc"
+msgid "false = Never use system DNS resolver; reluctantly = Query DNS directly, if DNS server is unavailable fail to system DNS resolver; happily = Query DNS directly, if host could not be found fallback to system DNS resolver; true = Always use system DNS resolver"
 msgstr ""
 "false = Đừng bao giờ dùng bộ phân tích hệ thống DNS; reluctantly = Truy vấn "
 "DNS trực tiếp, nếu DNS server không có sẵn trong bộ phân tích hệ thống DNS; "
@@ -160,80 +160,80 @@ msgstr ""
 
 #. Syslog facility
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:26
-msgid "polipo_general_logfacility"
+msgid "Syslog facility"
 msgstr "Syslog facility"
 
 #. Log file location
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:27
-msgid "polipo_general_logfile"
+msgid "Log file location"
 msgstr "Vị trí tập tin sổ ghi"
 
 #. Use of external storage device is recommended, because the log file is written frequently and can grow considerably.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:28
-msgid "polipo_general_logfile_desc"
+msgid "Use of external storage device is recommended, because the log file is written frequently and can grow considerably."
 msgstr ""
 "Nên dùng bộ nhớ ngoài bởi vì tập tin sổ ghi được viết rất nhiều lần và có "
 "thể phát tán rất mạnh. "
 
 #. Log to syslog
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:29
-msgid "polipo_general_logsyslog"
+msgid "Log to syslog"
 msgstr "Log to syslog"
 
 #. Parent proxy authentication
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:30
-msgid "polipo_general_parentauthcredentials"
+msgid "Parent proxy authentication"
 msgstr "Xác thực parent proxy "
 
 #. Basic HTTP authentication supported. Provide username and password in username:password format.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:31
-msgid "polipo_general_parentauthcredentials_desc"
+msgid "Basic HTTP authentication supported. Provide username and password in username:password format."
 msgstr ""
 "Sự chứng thực HTTP Cơ bản được hỗ trợ. Cung cấp tên người dùng và mật khẩu "
 "trong tên người dùng: mật khẩu định dạng"
 
 #. Parent proxy address
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:32
-msgid "polipo_general_parentproxy"
+msgid "Parent proxy address"
 msgstr "Địa chỉ parent proxy "
 
 #. Parent proxy address (in host:port format), to which Polipo will forward the requests.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:33
-msgid "polipo_general_parentproxy_desc"
+msgid "Parent proxy address (in host:port format), to which Polipo will forward the requests."
 msgstr ""
 "Địa chỉ parent proxy (in host:port format), cái mà Polipo sẽ chuyển yêu cầu "
 "tới."
 
 #. Listen address
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:34
-msgid "polipo_general_proxyaddress"
+msgid "Listen address"
 msgstr "Địa chỉ nge"
 
 #. The interface on which Polipo will listen. To listen on all interfaces use 0.0.0.0 or :: (IPv6).
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:35
-msgid "polipo_general_proxyaddress_desc"
+msgid "The interface on which Polipo will listen. To listen on all interfaces use 0.0.0.0 or :: (IPv6)."
 msgstr ""
 "Giao diện mà Polipo sẽ nghe. Để nghe trên tất cả các giao diện dùng 0.0.0.0 "
 "hoặc :: (IPv6)"
 
 #. Listen port
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:36
-msgid "polipo_general_proxyport"
+msgid "Listen port"
 msgstr "Cổng nghe"
 
 #. Port on which Polipo will listen. (default value: 8123)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:37
-msgid "polipo_general_proxyport_desc"
+msgid "Port on which Polipo will listen. (default value: 8123)"
 msgstr "Cổng mà Polipo sẽ nghe. (giá trị: 8123)"
 
 #. Poor Man&#39;s Multiplexing
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:38
-msgid "polipo_pmm"
+msgid "Poor Man's Multiplexing"
 msgstr "Poor Man&amp;#39;s Multiplexing"
 
 #. Poor Man&#39;s Multiplexing (PMM) is a technique that simulates multiplexing by requesting an instance in multiple segments. It tries to lower the latency caused by the weakness of HTTP protocol. NOTE: some sites may not work with PMM enabled.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:39
-msgid "polipo_pmm_desc"
+msgid "Poor Man's Multiplexing (PMM) is a technique that simulates multiplexing by requesting an instance in multiple segments. It tries to lower the latency caused by the weakness of HTTP protocol. NOTE: some sites may not work with PMM enabled."
 msgstr ""
 "Poor Man&amp;#39;s Multiplexing (PMM) là một kỹ thuật kích thích "
 "multiplexing bằng cách yêu cầu trường hợp trong nhiều phân đoạn. Nó cố gắng "
@@ -242,19 +242,19 @@ msgstr ""
 
 #. First PMM segment size (in bytes)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:40
-msgid "polipo_pmm_pmmfirstsize"
+msgid "First PMM segment size (in bytes)"
 msgstr "Dung lượng phân đoạn PMM đầu tiên (in bytes)"
 
 #. Size of the first PMM segment. If not defined, it defaults to twice the PMM segment size.
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:41
-msgid "polipo_pmm_pmmfirstsize_desc"
+msgid "Size of the first PMM segment. If not defined, it defaults to twice the PMM segment size."
 msgstr ""
 "Dung lượng của phân đoạn PMM đầu tiên. Nếu không định nghĩa sẽ mặc định dung "
 "lượng của phân đoạn PMM gấp 2 lần"
 
 #. PMM segments size (in bytes)
 #: applications/luci-polipo/luasrc/i18n/polipo.en.lua:42
-msgid "polipo_pmm_pmmsize"
+msgid "PMM segments size (in bytes)"
 msgstr "Dung lượng phân đoạn PMM (in bytes)"
 
 #. To enable PMM, PMM segment size must be set to some positive value.
diff --git a/po/vi/qos.po b/po/vi/qos.po
index 71b404e5a..c0e2e5823 100644
--- a/po/vi/qos.po
+++ b/po/vi/qos.po
@@ -15,93 +15,93 @@ msgstr ""
 
 #. Quality of Service
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:1
-msgid "qos"
+msgid "Quality of Service"
 msgstr "Chất lượng dịch vụ "
 
 #. With QoS you can priorize network traffic selected by adresses, ports or services.
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:2
-msgid "qos_desc"
+msgid "With QoS you can priorize network traffic selected by adresses, ports or services."
 msgstr ""
 "Với QoS, bạn có thể ưu tiên cho mạng lưới giao thông được chọn bởi địa chỉ, "
 "cổng hay dịch vụ."
 
 #. Classification
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:3
-msgid "qos_interface_classgroup"
+msgid "Classification"
 msgstr "Phân loại"
 
 #. Calculate Overhead
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:4
-msgid "qos_interface_overhead"
+msgid "Calculate Overhead"
 msgstr "Tính toán tổng quát"
 
 #. Half-Duplex
-msgid "qos_interface_halfduplex"
+msgid "Half-Duplex"
 msgstr "Half-Duplex"
 
 #. Downlink
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:5
-msgid "qos_interface_download"
+msgid "Downlink"
 msgstr "Downlink"
 
 #. Uplink
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:6
-msgid "qos_interface_upload"
+msgid "Uplink"
 msgstr "Uplink"
 
 #. Prioritization
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:7
-msgid "qos_classify"
+msgid "Prioritization"
 msgstr "Quá trình ưu tiên"
 
 #. Priority
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:8
-msgid "qos_classify_target"
+msgid "Priority"
 msgstr "Ưu tiên"
 
 #. Source address
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:9
-msgid "qos_classify_srchost"
+msgid "Source address"
 msgstr "Địa chỉ nguồn"
 
 #. source network / source host
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:10
-msgid "qos_classify_srchost_dest"
+msgid "source network / source host"
 msgstr "nguồn mạng/ nguồn host"
 
 #. Target address
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:11
-msgid "qos_classify_dsthost"
+msgid "Target address"
 msgstr "Địa chỉ mục tiêu"
 
 #. target network / target host
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:12
-msgid "qos_classify_dsthost_dest"
+msgid "target network / target host"
 msgstr "Mục tiêu mạng/ mục tiêu host"
 
 #. portrange
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:13
-msgid "qos_classify_portrange"
+msgid "portrange"
 msgstr "portrange"
 
 #. low
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:14
-msgid "qos_bulk"
+msgid "low"
 msgstr "thấp"
 
 #. normal
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:15
-msgid "qos_normal"
+msgid "normal"
 msgstr "bình thường"
 
 #. express
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:16
-msgid "qos_express"
+msgid "express"
 msgstr "cấp tốc"
 
 #. priority
 #: applications/luci-qos/luasrc/i18n/qos.en.lua:17
-msgid "qos_priority"
+msgid "priority"
 msgstr "ưu tiên"
 
 #. Bytes sent
diff --git a/po/vi/rrdtool.po b/po/vi/rrdtool.po
index 57f3c2f96..7c695fae6 100644
--- a/po/vi/rrdtool.po
+++ b/po/vi/rrdtool.po
@@ -15,102 +15,102 @@ msgstr ""
 
 #. %H: Wireless - Signal Noise Ratio
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:1
-msgid "stat_dg_title_wireless__signal_noise"
+msgid "%H: Wireless - Signal Noise Ratio"
 msgstr "%H: Wireless - Signal Noise Ratio"
 
 #. dBm
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:2
-msgid "stat_dg_label_wireless__signal_noise"
+msgid "dBm"
 msgstr "dBm"
 
 #. Noise Level
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:3
-msgid "stat_ds_signal_noise"
+msgid "Noise Level"
 msgstr "Noise Level"
 
 #. Signal Strength
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:4
-msgid "stat_ds_signal_power"
+msgid "Signal Strength"
 msgstr "Độ mạnh của tín hiệu"
 
 #. %H: Wireless - Signal Quality
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:5
-msgid "stat_dg_title_wireless__signal_quality"
+msgid "%H: Wireless - Signal Quality"
 msgstr "%H: Wireless -Chất lượng tín hiệu"
 
 #. n
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:6
-msgid "stat_dg_label_wireless__signal_quality"
+msgid "n"
 msgstr "n"
 
 #. Signal Quality
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:7
-msgid "stat_ds_signal_quality"
+msgid "Signal Quality"
 msgstr "Chất lượng tín hiệu "
 
 #. %H: ICMP Roundtrip Times
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:8
-msgid "stat_dg_title_ping"
+msgid "%H: ICMP Roundtrip Times"
 msgstr "%H: ICMP thời gian đi một vòng"
 
 #. ms
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:9
-msgid "stat_dg_label_ping"
+msgid "ms"
 msgstr "ms"
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:10
-msgid "stat_ds_ping"
+msgid "%di"
 msgstr "%di"
 
 #. %H: Firewall - Processed Packets
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:11
-msgid "stat_dg_title_iptables__ipt_packets"
+msgid "%H: Firewall - Processed Packets"
 msgstr "%H: Firewall - Gói đã xử lý"
 
 #. Packets/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:12
-msgid "stat_dg_label_iptables__ipt_packets"
+msgid "Packets/s"
 msgstr "Gói"
 
 #. Chain \"%di\"
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:13
-msgid "stat_ds_ipt_packets"
+msgid "Chain \"%di\""
 msgstr "Chuỗi \"%di\""
 
 #. %H: Netlink - Transfer on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:14
-msgid "stat_dg_title_netlink__if_octets"
+msgid "%H: Netlink - Transfer on %pi"
 msgstr "%H: Netlink - chuyển về %pi"
 
 #. Bytes/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:15
-msgid "stat_dg_label_netlink__if_octets"
+msgid "Bytes/s"
 msgstr "Bytes/s"
 
 #. Bytes (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:16
-msgid "stat_ds_if_octets"
+msgid "Bytes (%ds)"
 msgstr "Bytes (%ds)"
 
 #. %H: Netlink - Packets on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:17
-msgid "stat_dg_title_netlink__if_packets"
+msgid "%H: Netlink - Packets on %pi"
 msgstr "%H: Netlink - Đóng gói trên %pi"
 
 #. Packets/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:18
-msgid "stat_dg_label_netlink__if_packets"
+msgid "Packets/s"
 msgstr "Gói"
 
 #. Processed (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:19
-msgid "stat_ds_if_packets"
+msgid "Processed (%ds)"
 msgstr "Đã xử lý (%ds)"
 
 #. Dropped   (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:20
-msgid "stat_ds_if_dropped"
+msgid "Dropped (%ds)"
 msgstr ""
 "Dropped<span class=\"translation-space\"> </span>\n"
 "<span class=\"translation-space\"> </span>\n"
@@ -119,7 +119,7 @@ msgstr ""
 
 #. Errors    (%ds)
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:21
-msgid "stat_ds_if_errors"
+msgid "Errors (%ds)"
 msgstr ""
 "Lỗi<span class=\"translation-space\"> </span>\n"
 "<span class=\"translation-space\"> </span>\n"
@@ -129,237 +129,237 @@ msgstr ""
 
 #. %H: Netlink - Multicast on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:22
-msgid "stat_dg_title_netlink__if_multicast"
+msgid "%H: Netlink - Multicast on %pi"
 msgstr "%H: Netlink - Multicast on %pi"
 
 #. Packets/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:23
-msgid "stat_dg_label_netlink__if_multicast"
+msgid "Packets/s"
 msgstr "Gói"
 
 #. Packets
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:24
-msgid "stat_ds_if_multicast"
+msgid "Packets"
 msgstr "Gói"
 
 #. %H: Netlink - Collisions on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:25
-msgid "stat_dg_title_netlink__if_collisions"
+msgid "%H: Netlink - Collisions on %pi"
 msgstr "%H: Netlink - Collisions on %pi"
 
 #. Collisions/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:26
-msgid "stat_dg_label_netlink__if_collisions"
+msgid "Collisions/s"
 msgstr "Collisions/s"
 
 #. Collisions
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:27
-msgid "stat_ds_if_collisions"
+msgid "Collisions"
 msgstr "Collisions"
 
 #. %H: Netlink - Errors on %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:28
-msgid "stat_dg_title_netlink__if_tx_errors"
+msgid "%H: Netlink - Errors on %pi"
 msgstr "%H: Netlink - lỗi trên %pi"
 
 #. Errors/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:29
-msgid "stat_dg_label_netlink__if_tx_errors"
+msgid "Errors/s"
 msgstr "Lỗi"
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:30
-msgid "stat_ds_if_tx_errors"
+msgid "%di"
 msgstr "%di"
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:31
-msgid "stat_ds_if_rx_errors"
+msgid "%di"
 msgstr "%di"
 
 #. %H: Processes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:32
-msgid "stat_dg_title_processes"
+msgid "%H: Processes"
 msgstr "%H: Quá trình"
 
 #. Processes/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:33
-msgid "stat_dg_label_processes"
+msgid "Processes/s"
 msgstr "Quy trình"
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:34
-msgid "stat_ds_ps_state"
+msgid "%di"
 msgstr "%di"
 
 #. %H: Process %pi - used cpu time
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:35
-msgid "stat_dg_title_processes__ps_cputime"
+msgid "%H: Process %pi - used cpu time"
 msgstr "%H: Quá trình %pi - thời gian cpu đã sử dụng"
 
 #. Jiffies
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:36
-msgid "stat_dg_label_processes__ps_cputime"
+msgid "Jiffies"
 msgstr "Jiffies"
 
 #. system
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:37
-msgid "stat_ds_ps_cputime__syst"
+msgid "System"
 msgstr "Hệ thống"
 
 #. user
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:38
-msgid "stat_ds_ps_cputime__user"
+msgid "user"
 msgstr "Người dùng"
 
 #. %H: Process %pi - threads and processes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:39
-msgid "stat_dg_title_processes__ps_count"
+msgid "%H: Process %pi - threads and processes"
 msgstr "%H: quá trình %pi - các luồng và quá trình"
 
 #. Count
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:40
-msgid "stat_dg_label_processes__ps_count"
+msgid "Count"
 msgstr "Đếm"
 
 #. %ds
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:41
-msgid "stat_ds_ps_count"
+msgid "%ds"
 msgstr "%ds"
 
 #. %H: Process %pi - page faults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:42
-msgid "stat_dg_title_processes__ps_pagefaults"
+msgid "%H: Process %pi - page faults"
 msgstr "%H: quá trình %pi - lỗi trang"
 
 #. Pagefaults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:43
-msgid "stat_dg_label_processes__ps_pagefaults"
+msgid "Pagefaults"
 msgstr "Pagefaults"
 
 #. page faults
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:44
-msgid "stat_ds_ps_pagefaults"
+msgid "page faults"
 msgstr "page faults"
 
 #. %H: Process %pi - virtual memory size
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:45
-msgid "stat_dg_title_processes__ps_rss"
+msgid "%H: Process %pi - virtual memory size"
 msgstr "%H: quá trình %pi - dung lượng bộ nhớ ảo "
 
 #. Bytes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:46
-msgid "stat_dg_label_processes__ps_rss"
+msgid "Bytes"
 msgstr "Bytes"
 
 #. virtual memory
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:47
-msgid "stat_ds_ps_rss"
+msgid "virtual memory"
 msgstr "Bộ nhớ ảo"
 
 #. %H: Usage on Processor #%pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:48
-msgid "stat_dg_title_cpu"
+msgid "%H: Usage on Processor #%pi"
 msgstr "%H: sử dụng trên bộ xử lý #%pi"
 
 #. %
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:49
-msgid "stat_dg_label_cpu"
+msgid "%"
 msgstr "%"
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:50
-msgid "stat_ds_cpu"
+msgid "%di"
 msgstr "%di"
 
 #. %H: Transfer on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:51
-msgid "stat_dg_title_interface__if_octets"
+msgid "%H: Transfer on %di"
 msgstr "%H: Chuyển tải trên %di"
 
 #. Bytes/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:52
-msgid "stat_dg_label_interface__if_octets"
+msgid "Bytes/s"
 msgstr "Bytes/s"
 
 #. %H: Packets on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:53
-msgid "stat_dg_title_interface__if_packets"
+msgid "%H: Packets on %di"
 msgstr "%H: Gói trên %di"
 
 #. Packets/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:54
-msgid "stat_dg_label_interface__if_packets"
+msgid "Packets/s"
 msgstr "Gói"
 
 #. %H: TCP-Connections to Port %pi
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:55
-msgid "stat_dg_title_tcpconns"
+msgid "%H: TCP-Connections to Port %pi"
 msgstr "%H: TCP-kết nối tới cổng %pi"
 
 #. Connections/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:56
-msgid "stat_dg_label_tcpconns"
+msgid "Connections/s"
 msgstr "Kết nối"
 
 #. %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:57
-msgid "stat_ds_tcp_connections"
+msgid "%di"
 msgstr "%di"
 
 #. %H: Disk Space Usage on %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:58
-msgid "stat_dg_title_df"
+msgid "%H: Disk Space Usage on %di"
 msgstr "%H: sử dụng không gian trên đĩa ở %di"
 
 #. Bytes
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:59
-msgid "stat_dg_label_df"
+msgid "Bytes"
 msgstr "Bytes"
 
 #. %ds
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:60
-msgid "stat_ds_df__free"
+msgid "%ds"
 msgstr "%ds"
 
 #. %ds
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:61
-msgid "stat_ds_df__used"
+msgid "%ds"
 msgstr "%ds"
 
 #. %H: Interrupts
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:62
-msgid "stat_dg_title_irq"
+msgid "%H: Interrupts"
 msgstr "%H: Cắt ngang"
 
 #. Issues/s
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:63
-msgid "stat_dg_label_irq"
+msgid "Issues/s"
 msgstr "Vấn đề"
 
 #. IRQ %di
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:64
-msgid "stat_ds_irq"
+msgid "IRQ %di"
 msgstr "IRQ %di"
 
 #. %H: System Load
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:65
-msgid "stat_dg_title_load"
+msgid "%H: System Load"
 msgstr "%H: Tải hệ thống"
 
 #. Load
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:66
-msgid "stat_dg_label_load"
+msgid "Load"
 msgstr "Tải"
 
 #. 1 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:67
-msgid "stat_ds_load__shortterm"
+msgid "1 min"
 msgstr "1 phút"
 
 #. 5 min
 #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:68
-msgid "stat_ds_load__midterm"
+msgid "5 min"
 msgstr "5 phút"
 
 #. 15 min
diff --git a/po/vi/samba.po b/po/vi/samba.po
index ea9d1e088..889d82c88 100644
--- a/po/vi/samba.po
+++ b/po/vi/samba.po
@@ -15,84 +15,84 @@ msgstr ""
 
 #. Network Shares
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:1
-msgid "samba"
+msgid "Network Shares"
 msgstr "Mạng chia sẻ"
 
 #. Hostname
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:2
-msgid "samba_samba_name"
+msgid "Hostname"
 msgstr "tên máy chủ"
 
 #. Description
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:3
-msgid "samba_samba_description"
+msgid "Description"
 msgstr "Mô tả"
 
 #. Workgroup
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:4
-msgid "samba_samba_workgroup"
+msgid "Workgroup"
 msgstr "Nhóm làm việc "
 
 #. Share home-directories
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:5
-msgid "samba_samba_homes"
+msgid "Share home-directories"
 msgstr "Chia sẻ danh bạ chính"
 
 #. System users can reach their home directories via network shares.
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:6
-msgid "samba_samba_homes_desc"
+msgid "System users can reach their home directories via network shares."
 msgstr ""
 "Những người sử dụng hệ thống có thể tiếp cận những thư mục tại nhà thông qua "
 "mạng lưới chia sẻ trực tuyến."
 
 #. Shared Directories
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:7
-msgid "samba_sambashare"
+msgid "Shared Directories"
 msgstr "Thư mục chia sẻ"
 
 #. Shared Directory
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:8
-msgid "samba_sambashare_path"
+msgid "Shared Directory"
 msgstr "Đã chia sẻ thư mục"
 
 #. Physical Path
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:9
-msgid "samba_sambashare_path_desc"
+msgid "Physical Path"
 msgstr "Đường dẫn vật lý"
 
 #. Allowed Users
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:10
-msgid "samba_sambashare_users"
+msgid "Allowed Users"
 msgstr "Người sử dụng được cho phép"
 
 #. optional
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:11
-msgid "samba_sambashare_users_desc"
+msgid "optional"
 msgstr "Tùy thích"
 
 #. Read Only
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:12
-msgid "samba_sambashare_readonly"
+msgid "Read Only"
 msgstr "Chỉ đọc "
 
 #. Allow Guests
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:13
-msgid "samba_sambashare_guestok"
+msgid "Allow Guests"
 msgstr "Cho phép khách"
 
 #. Create Mask
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:14
-msgid "samba_sambashare_createmask"
+msgid "Create Mask"
 msgstr "Tạo Mask"
 
 #. Mask for new files
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:15
-msgid "samba_sambashare_createmask_desc"
+msgid "Mask for new files"
 msgstr "Mask cho tập tin mới"
 
 #. Directory Mask
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:16
-msgid "samba_sambashare_dirmask"
+msgid "Directory Mask"
 msgstr "Thư mục Mask"
 
 #. Mask for new directories
diff --git a/po/vi/statistics.po b/po/vi/statistics.po
index 7758c6640..234c61059 100644
--- a/po/vi/statistics.po
+++ b/po/vi/statistics.po
@@ -15,12 +15,12 @@ msgstr ""
 
 #. Statistics
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:1
-msgid "stat_statistics"
+msgid "Statistics"
 msgstr "Thống kê"
 
 #. The statistics package is based on <a href=\"http://collectd.org/index.shtml\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD Tool</a> to render diagram images from collected data.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:2
-msgid "stat_desc"
+msgid "The statistics package is based on <a href=\"http://collectd.org/index.shtml\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD Tool</a> to render diagram images from collected data."
 msgstr ""
 "Gói thống kê dựa trên <a href=\"http://collectd.org/index.shtml\">Collectd</a> "
 "and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD Tool</a> vẽ lại sơ đồ "
@@ -28,142 +28,142 @@ msgstr ""
 
 #. System plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:3
-msgid "stat_systemplugins"
+msgid "System plugins"
 msgstr "System plugins"
 
 #. Network plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:4
-msgid "stat_networkplugins"
+msgid "Network plugins"
 msgstr "Network plugins"
 
 #. Output plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:5
-msgid "stat_outputplugins"
+msgid "Output plugins"
 msgstr "Output plugins"
 
 #. Display timespan
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:6
-msgid "stat_showtimespan"
+msgid "Display timespan »"
 msgstr "Display timespan"
 
 #. Graphs
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:7
-msgid "stat_graphs"
+msgid "Graphs"
 msgstr "Graphs"
 
 #. Collectd
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:8
-msgid "stat_collectd"
+msgid "Collectd"
 msgstr "Collectd"
 
 #. Processor
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:9
-msgid "stat_cpu"
+msgid "Processor"
 msgstr "Bộ xử lý"
 
 #. Ping
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:10
-msgid "stat_ping"
+msgid "Ping"
 msgstr "Ping"
 
 #. Firewall
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:11
-msgid "stat_iptables"
+msgid "Firewall"
 msgstr "Firewall"
 
 #. Netlink
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:12
-msgid "stat_netlink"
+msgid "Netlink"
 msgstr "Netlink"
 
 #. Processes
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:13
-msgid "stat_processes"
+msgid "Processes"
 msgstr "Quá trình xử lý"
 
 #. Wireless
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:14
-msgid "stat_wireless"
+msgid "Wireless"
 msgstr "Mạng không dây"
 
 #. TCP Connections
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:15
-msgid "stat_tcpconns"
+msgid "TCP Connections"
 msgstr "Kết nối TCP"
 
 #. Interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:16
-msgid "stat_interface"
+msgid "Interfaces"
 msgstr "Giao diện"
 
 #. Disk Space Usage
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:17
-msgid "stat_df"
+msgid "Disk Space Usage"
 msgstr "Khoảng trống trên đĩa"
 
 #. Interrupts
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:18
-msgid "stat_irq"
+msgid "Interrupts"
 msgstr "Cắt ngang"
 
 #. Disk Usage
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:19
-msgid "stat_disk"
+msgid "Disk Usage"
 msgstr "Disk Usage"
 
 #. Exec
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:20
-msgid "stat_exec"
+msgid "Exec"
 msgstr "Exec"
 
 #. RRDTool
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:21
-msgid "stat_rrdtool"
+msgid "RRDTool"
 msgstr "RRDTool"
 
 #. Network
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:22
-msgid "stat_network"
+msgid "Network"
 msgstr "Network"
 
 #. CSV Output
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:23
-msgid "stat_csv"
+msgid "CSV Output"
 msgstr "CSV Output"
 
 #. System Load
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:24
-msgid "stat_load"
+msgid "System Load"
 msgstr "System Load"
 
 #. DNS
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:25
-msgid "stat_dns"
+msgid "DNS"
 msgstr "DNS"
 
 #. Email
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:26
-msgid "stat_email"
+msgid "Email"
 msgstr "Email"
 
 #. UnixSock
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:27
-msgid "stat_unixsock"
+msgid "UnixSock"
 msgstr "UnixSock"
 
 #. Statistics
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:28
-msgid "lucistatistics"
+msgid "Statistics"
 msgstr "Thống kê"
 
 #. Collectd Settings
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:29
-msgid "lucistatistics_collectd"
+msgid "Collectd Settings"
 msgstr "Những cài đặt collectd"
 
 #. Collectd is a small daeomon for collecting data from various sources through different plugins. On this page you can change general settings for the collectd daemon.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:30
-msgid "lucistatistics_collectd_desc"
+msgid "Collectd is a small daeomon for collecting data from various sources through different plugins. On this page you can change general settings for the collectd daemon."
 msgstr ""
 "Collectd là một daeomon nhỏ để thu thập dữ liệu từ nhiều nguồn thông qua các "
 "plugins khác nhau. Trên trang này, bạn có thể thay đổi cài đặt tổng quát "
@@ -171,225 +171,225 @@ msgstr ""
 
 #. Hostname
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:31
-msgid "lucistatistics_collectd_hostname"
+msgid "Hostname"
 msgstr "Tên host"
 
 #. Base Directory
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:32
-msgid "lucistatistics_collectd_basedir"
+msgid "Base Directory"
 msgstr "Thư mục Cơ sở"
 
 #. Directory for sub-configurations
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:33
-msgid "lucistatistics_collectd_include"
+msgid "Directory for sub-configurations"
 msgstr "Danh mục cho sub-configurations"
 
 #. Directory for collectd plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:34
-msgid "lucistatistics_collectd_plugindir"
+msgid "Directory for collectd plugins"
 msgstr "Danh mục cho collectd plugins"
 
 #. Used PID file
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:35
-msgid "lucistatistics_collectd_pidfile"
+msgid "Used PID file"
 msgstr "Tập tin PID đã sử dụng"
 
 #. Datasets definition file
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:36
-msgid "lucistatistics_collectd_typesdb"
+msgid "Datasets definition file"
 msgstr "Tập tin định nghĩa cơ sở dữ liệu"
 
 #. Data collection interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:37
-msgid "lucistatistics_collectd_interval"
+msgid "Data collection interval"
 msgstr "Khoảng thu thập dữ liệu"
 
 #. Seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:38
-msgid "lucistatistics_collectd_interval_desc"
+msgid "Seconds"
 msgstr "Giây"
 
 #. Number of threads for data collection
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:39
-msgid "lucistatistics_collectd_readthreads"
+msgid "Number of threads for data collection"
 msgstr "Số lượng các chủ đề để thu thập dữ liệu"
 
 #. Try to lookup fully qualified hostname
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:40
-msgid "lucistatistics_collectd_fqdnlookup"
+msgid "Try to lookup fully qualified hostname"
 msgstr "Thử tra cứu những tên host đủ điều kiện"
 
 #. CPU Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:41
-msgid "lucistatistics_collectdcpu"
+msgid "CPU Plugin Configuration"
 msgstr "Cấu hình Plugin CPU"
 
 #. The cpu plugin collects basic statistics about the processor usage.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:42
-msgid "lucistatistics_collectdcpu_desc"
+msgid "The cpu plugin collects basic statistics about the processor usage."
 msgstr "CPU plugin thu thập số liệu thống kê cơ bản về sử dụng bộ việc xử lý"
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:43
-msgid "lucistatistics_collectdcpu_enable"
+msgid "Enable this plugin"
 msgstr "Kích hoạt plugin này"
 
 #. CSV Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:44
-msgid "lucistatistics_collectdcsv"
+msgid "CSV Plugin Configuration"
 msgstr "Cấu hình CSV plugin"
 
 #. The csv plugin stores collected data in csv file format for further processing by external programs.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:45
-msgid "lucistatistics_collectdcsv_desc"
+msgid "The csv plugin stores collected data in csv file format for further processing by external programs."
 msgstr ""
 "CSV plugin stores thu thập dữ liệu trong tập tin định dạng csv để tiến hành "
 "xử lý bằng các chương trình bên ngoài."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:46
-msgid "lucistatistics_collectdcsv_enable"
+msgid "Enable this plugin"
 msgstr "Kích hoạt plugin này"
 
 #. Storage directory for the csv files
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:47
-msgid "lucistatistics_collectdcsv_datadir"
+msgid "Storage directory for the csv files"
 msgstr "Thư mục lưu trữ cho nhưng tập tin csv"
 
 #. Store data values as rates instead of absolute values
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:48
-msgid "lucistatistics_collectdcsv_storerates"
+msgid "Store data values as rates instead of absolute values"
 msgstr "Những giá trị dữ liệu lưu trữ như một tỉ lệ thay vì giá trị tuyệt đối"
 
 #. DF Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:49
-msgid "lucistatistics_collectddf"
+msgid "DF Plugin Configuration"
 msgstr "Cấu hình DF plugin"
 
 #. The df plugin collects statistics about the disk space usage on different devices, mount points or filesystem types.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:50
-msgid "lucistatistics_collectddf_desc"
+msgid "The df plugin collects statistics about the disk space usage on different devices, mount points or filesystem types."
 msgstr ""
 "df plugin thu thập số liệu thông kế về khoảng trống trên đĩa trên những "
 "thiết bị khác,  mount points hoặc những loại filesystem."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:51
-msgid "lucistatistics_collectddf_enable"
+msgid "Enable this plugin"
 msgstr "Kích hoạt plugin này"
 
 #. Monitor devices
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:52
-msgid "lucistatistics_collectddf_devices"
+msgid "Monitor devices"
 msgstr "Monitor devices"
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:53
-msgid "lucistatistics_collectddf_devices_desc"
+msgid "multiple separated by space"
 msgstr "Nhiều phân tách bởi những khoảng trống"
 
 #. Monitor mount points
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:54
-msgid "lucistatistics_collectddf_mountpoints"
+msgid "Monitor mount points"
 msgstr "Monitor mount points"
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:55
-msgid "lucistatistics_collectddf_mountpoints_desc"
+msgid "multiple separated by space"
 msgstr "Nhiều phân tách bởi những khoảng trống"
 
 #. Monitor filesystem types
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:56
-msgid "lucistatistics_collectddf_fstypes"
+msgid "Monitor filesystem types"
 msgstr "Kiểm soát loại filesystem"
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:57
-msgid "lucistatistics_collectddf_fstypes_desc"
+msgid "multiple separated by space"
 msgstr "Nhiều phân tách bởi những khoảng trống"
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:58
-msgid "lucistatistics_collectddf_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr "Kiểm soát tất cả trừ những cái được chọn"
 
 #. Disk Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:59
-msgid "lucistatistics_collectddisk"
+msgid "Disk Plugin Configuration"
 msgstr "Cấu hình disk plugin"
 
 #. The disk plugin collects detailled usage statistics for selected partitions or whole disks.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:60
-msgid "lucistatistics_collectddisk_desc"
+msgid "The disk plugin collects detailled usage statistics for selected partitions or whole disks."
 msgstr ""
 "Disk plugin thu thập số liệu thống kê chi tiết về cách sử dụng cho những "
 "phân vùng lựa chọn hoặc toàn bộ đĩa."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:61
-msgid "lucistatistics_collectddisk_enable"
+msgid "Enable this plugin"
 msgstr "Kích hoạt plugin này"
 
 #. Monitor disks and partitions
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:62
-msgid "lucistatistics_collectddisk_disks"
+msgid "Monitor disks and partitions"
 msgstr "Kiểm soát đĩa và phân vùng"
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:63
-msgid "lucistatistics_collectddisk_disks_desc"
+msgid "multiple separated by space"
 msgstr "Nhiều phân tách bằng khoảng trống"
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:64
-msgid "lucistatistics_collectddisk_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr "Kiểm soát tất cả trừ những cái đươc chọn"
 
 #. DNS Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:65
-msgid "lucistatistics_collectddns"
+msgid "DNS Plugin Configuration"
 msgstr "Cấu hình DNS plugin"
 
 #. The dns plugin collects detailled statistics about dns related traffic on selected interfaces.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:66
-msgid "lucistatistics_collectddns_desc"
+msgid "The dns plugin collects detailled statistics about dns related traffic on selected interfaces."
 msgstr ""
 " dns plugin thu thập những thông kê chi tiết về dns liên quan đến lưu thông "
 "trên những giao diện được chọn. "
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:67
-msgid "lucistatistics_collectddns_enable"
+msgid "Enable this plugin"
 msgstr "Kích hoạt plugin này"
 
 #. Monitor interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:68
-msgid "lucistatistics_collectddns_interfaces"
+msgid "Monitor interfaces"
 msgstr "Kiểm soát giao diện"
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:69
-msgid "lucistatistics_collectddns_interfaces_desc"
+msgid "multiple separated by space"
 msgstr "nhiều phân tách bằng những khoảng trống"
 
 #. Ignore source addresses
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:70
-msgid "lucistatistics_collectddns_ignoresources"
+msgid "Ignore source addresses"
 msgstr "Lờ đi những địa chỉ nguồn"
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:71
-msgid "lucistatistics_collectddns_ignoresources_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr "Giữ Ctrl trong khi click để chọn nhiều giao diện"
 
 #. E-Mail Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:72
-msgid "lucistatistics_collectdemail"
+msgid "E-Mail Plugin Configuration"
 msgstr "Cấu hình e-mail plugin"
 
 #. The email plugin creates a unix socket which can be used to transmit email-statistics to a running collectd daemon. This plugin is primarily intended to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can be used in other ways as well.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:73
-msgid "lucistatistics_collectdemail_desc"
+msgid "The email plugin creates a unix socket which can be used to transmit email-statistics to a running collectd daemon. This plugin is primarily intended to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can be used in other ways as well."
 msgstr ""
 "Email plugin tạo ra một unix socket mà có thể dùng để truyền thông kê e-mail "
 "tới một collectd daemon đang chạy. Cái plugin này chủ yếu được dùng với "
@@ -398,47 +398,47 @@ msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:74
-msgid "lucistatistics_collectdemail_enable"
+msgid "Enable this plugin"
 msgstr "Kích hoạt plugin này"
 
 #. Filepath of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:75
-msgid "lucistatistics_collectdemail_socketfile"
+msgid "Filepath of the unix socket"
 msgstr "Filepath của unix socket"
 
 #. Group ownership of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:76
-msgid "lucistatistics_collectdemail_socketgroup"
+msgid "Group ownership of the unix socket"
 msgstr "Nhóm chủ của unix socket"
 
 #. group name
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:77
-msgid "lucistatistics_collectdemail_socketgroup_desc"
+msgid "group name"
 msgstr "Tên nhóm"
 
 #. File permissions of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:78
-msgid "lucistatistics_collectdemail_socketperms"
+msgid "File permissions of the unix socket"
 msgstr "Tập tin cho phép của unix socket"
 
 #. octal
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:79
-msgid "lucistatistics_collectdemail_socketperms_desc"
+msgid "octal"
 msgstr "octal"
 
 #. Maximum allowed connections
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:80
-msgid "lucistatistics_collectdemail_maxconns"
+msgid "Maximum allowed connections"
 msgstr "Tối đã kết nối cho phép"
 
 #. Exec Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:81
-msgid "lucistatistics_collectdexec"
+msgid "Exec Plugin Configuration"
 msgstr "Cấu hình Exec Plugin"
 
 #. The exec plugin starts external commands to read values from or to notify external processes when certain threshold values have been reached.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:82
-msgid "lucistatistics_collectdexec_desc"
+msgid "The exec plugin starts external commands to read values from or to notify external processes when certain threshold values have been reached."
 msgstr ""
 "Exec plugin bắt đầu những lệnh bên ngoài để đọc những giá trị từ hoặc tới "
 "những quá trình xử lý thông báo bên ngoài khi giá trị của một threshold nhất "
@@ -446,44 +446,44 @@ msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:83
-msgid "lucistatistics_collectdexec_enable"
+msgid "Enable this plugin"
 msgstr "Kích hoạt plugin này"
 
 #. Add command for reading values
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:84
-msgid "lucistatistics_collectdexecinput"
+msgid "Add command for reading values"
 msgstr "Thêm lệnh cho giá trị đang đọc"
 
 #. Here you can define external commands which will be started by collectd in order to read certain values. The values will be read from stdout.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:85
-msgid "lucistatistics_collectdexecinput_desc"
+msgid "Here you can define external commands which will be started by collectd in order to read certain values. The values will be read from stdout."
 msgstr ""
 "Ở đây bạn có thể định nghĩa các lệnh bên ngoài mà sẽ khởi động bằng collectd "
 "để đọc những giá trị nhất định. Những giá trị sẽ được đọc từ stdout"
 
 #. Commandline
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:86
-msgid "lucistatistics_collectdexecinput_cmdline"
+msgid "Commandline"
 msgstr "Dòng lệnh"
 
 #. Run as user
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:87
-msgid "lucistatistics_collectdexecinput_cmduser"
+msgid "Run as user"
 msgstr "Chạy như người dùng"
 
 #. Run as group
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:88
-msgid "lucistatistics_collectdexecinput_cmdgroup"
+msgid "Run as group"
 msgstr "Chạy như nhóm"
 
 #. Add notification command
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:89
-msgid "lucistatistics_collectdexecnotify"
+msgid "Add notification command"
 msgstr "Thêm lệnh thông báo"
 
 #. Here you can define external commands which will be started by collectd when certain threshold values have been reached. The values leading to invokation will be feeded to the the called programs stdin.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:90
-msgid "lucistatistics_collectdexecnotify_desc"
+msgid "Here you can define external commands which will be started by collectd when certain threshold values have been reached. The values leading to invokation will be feeded to the the called programs stdin."
 msgstr ""
 "Ở đây bạn có thể định nghĩa các lệnh  bên ngoài cái mà bắt đầu bằng collectd "
 "khi những giá trị threshold nhất định được tiếp cận. Những giá trị dẫn tới "
@@ -491,168 +491,168 @@ msgstr ""
 
 #. Commandline
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:91
-msgid "lucistatistics_collectdexecnotify_cmdline"
+msgid "Commandline"
 msgstr "Commandline"
 
 #. Run as user
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:92
-msgid "lucistatistics_collectdexecnotify_cmduser"
+msgid "Run as user"
 msgstr "Chạy như ưser"
 
 #. Run as group
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:93
-msgid "lucistatistics_collectdexecnotify_cmdgroup"
+msgid "Run as group"
 msgstr "Chạy như group"
 
 #. Interface Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:94
-msgid "lucistatistics_collectdinterface"
+msgid "Interface Plugin Configuration"
 msgstr "Cấu hình giao diện plugin"
 
 #. The interface plugin collects traffic statistics on selected interfaces.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:95
-msgid "lucistatistics_collectdinterface_desc"
+msgid "The interface plugin collects traffic statistics on selected interfaces."
 msgstr ""
 "Giao diện plugin thu thập những thống kê lưu thông trên những giao diện được "
 "chọn"
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:96
-msgid "lucistatistics_collectdinterface_enable"
+msgid "Enable this plugin"
 msgstr "Kích hoạt plugin này"
 
 #. Monitor interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:97
-msgid "lucistatistics_collectdinterface_interfaces"
+msgid "Monitor interfaces"
 msgstr "Monitor giao diện"
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:98
-msgid "lucistatistics_collectdinterface_interfaces_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr "Giữ phím Ctrl trong khi click để chọn nhiều giao diện "
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:99
-msgid "lucistatistics_collectdinterface_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr "Monitor tất cả trừ những cái được chọn"
 
 #. Iptables Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:100
-msgid "lucistatistics_collectdiptables"
+msgid "Iptables Plugin Configuration"
 msgstr "cấu hình Iptables Plugin "
 
 #. The iptables plugin will monitor selected firewall rules and collect informations about processed bytes and packets per rule.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:101
-msgid "lucistatistics_collectdiptables_desc"
+msgid "The iptables plugin will monitor selected firewall rules and collect informations about processed bytes and packets per rule."
 msgstr ""
 "iptables plugin sẽ monitor những cái firewall rules được chọn và thu thập "
 "thông tin về bytes xử lý và gói trên rule. "
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:102
-msgid "lucistatistics_collectdiptables_enable"
+msgid "Enable this plugin"
 msgstr "Kích họat plugin này"
 
 #. Add matching rule
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:103
-msgid "lucistatistics_collectdiptablesmatch"
+msgid "Add matching rule"
 msgstr "Thêm matching rule"
 
 #. Here you can define various criteria by which the monitored iptables rules are selected.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:104
-msgid "lucistatistics_collectdiptablesmatch_desc"
+msgid "Here you can define various criteria by which the monitored iptables rules are selected."
 msgstr ""
 "Ở đây bạn có thể định nghĩa những tiêu chuẩn khác nhau để monitor iptables "
 "rules được chọn."
 
 #. Name of the rule
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:105
-msgid "lucistatistics_collectdiptablesmatch_name"
+msgid "Name of the rule"
 msgstr "Tên của rule"
 
 #. max. 16 chars
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:106
-msgid "lucistatistics_collectdiptablesmatch_name_desc"
+msgid "max. 16 chars"
 msgstr "max. 16 chars"
 
 #. Table
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:107
-msgid "lucistatistics_collectdiptablesmatch_table"
+msgid "Table"
 msgstr "Table"
 
 #. Chain
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:108
-msgid "lucistatistics_collectdiptablesmatch_chain"
+msgid "Chain"
 msgstr "Chain"
 
 #. Action (target)
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:109
-msgid "lucistatistics_collectdiptablesmatch_target"
+msgid "Action (target)"
 msgstr "Action (target)"
 
 #. Network protocol
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:110
-msgid "lucistatistics_collectdiptablesmatch_protocol"
+msgid "Network protocol"
 msgstr "Network protocol"
 
 #. Source ip range
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:111
-msgid "lucistatistics_collectdiptablesmatch_source"
+msgid "Source ip range"
 msgstr "Nguồn ip range"
 
 #. CIDR notation
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:112
-msgid "lucistatistics_collectdiptablesmatch_source_desc"
+msgid "CIDR notation"
 msgstr "CIDR notation"
 
 #. Destination ip range
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:113
-msgid "lucistatistics_collectdiptablesmatch_destination"
+msgid "Destination ip range"
 msgstr "Điểm đến ip range"
 
 #. CIDR notation
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:114
-msgid "lucistatistics_collectdiptablesmatch_destination_desc"
+msgid "CIDR notation"
 msgstr "CIDR notation"
 
 #. Incoming interface
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:115
-msgid "lucistatistics_collectdiptablesmatch_inputif"
+msgid "Incoming interface"
 msgstr "Giao diện đang tới"
 
 #. e.g. br-lan
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:116
-msgid "lucistatistics_collectdiptablesmatch_inputif_desc"
+msgid "e.g. br-lan"
 msgstr "e.g. br-lan"
 
 #. Outgoing interface
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:117
-msgid "lucistatistics_collectdiptablesmatch_outputif"
+msgid "Outgoing interface"
 msgstr "Giao diện ra ngoài"
 
 #. e.g. br-ff
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:118
-msgid "lucistatistics_collectdiptablesmatch_outputif_desc"
+msgid "e.g. br-ff"
 msgstr "e.g. br-ff"
 
 #. Options
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:119
-msgid "lucistatistics_collectdiptablesmatch_options"
+msgid "Options"
 msgstr "Tùy chọn"
 
 #. e.g. reject-with tcp-reset
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:120
-msgid "lucistatistics_collectdiptablesmatch_options_desc"
+msgid "e.g. reject-with tcp-reset"
 msgstr "e.g. reject-with tcp-reset"
 
 #. IRQ Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:121
-msgid "lucistatistics_collectdirq"
+msgid "IRQ Plugin Configuration"
 msgstr "Cấu hình IRQ Plugin "
 
 #. The irq plugin will monitor the rate of issues per second for each selected interrupt. If no interrupt is selected then all interrupts are monitored.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:122
-msgid "lucistatistics_collectdirq_desc"
+msgid "The irq plugin will monitor the rate of issues per second for each selected interrupt. If no interrupt is selected then all interrupts are monitored."
 msgstr ""
 "irq plugin sẽ monitor tỉ lệ vấn đề trên giây cho những interrupt được chọn. "
 "Nếu không có interrupt được chọn thi tất cả các interrupt sẽ được monitor. "
@@ -661,119 +661,119 @@ msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:123
-msgid "lucistatistics_collectdirq_enable"
+msgid "Enable this plugin"
 msgstr "Kích hoạt plugin này"
 
 #. Monitor interrupts
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:124
-msgid "lucistatistics_collectdirq_irqs"
+msgid "Monitor interrupts"
 msgstr "Monitor interrupts"
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:125
-msgid "lucistatistics_collectdirq_irqs_desc"
+msgid "multiple separated by space"
 msgstr "Nhiều phân tách bởi khoảng rống"
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:126
-msgid "lucistatistics_collectdirq_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr "Monitor tất cả trừ những cái được chọn"
 
 #. Load Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:127
-msgid "lucistatistics_collectdload"
+msgid "Load Plugin Configuration"
 msgstr "Tải cấu hình plugin"
 
 #. The load plugin collects statistics about the general system load.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:128
-msgid "lucistatistics_collectdload_desc"
+msgid "The load plugin collects statistics about the general system load."
 msgstr "Plugin tải thu thập thông kê về tổng quát system load"
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:129
-msgid "lucistatistics_collectdload_enable"
+msgid "Enable this plugin"
 msgstr "Kích hoạt plugin này"
 
 #. Netlink Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:130
-msgid "lucistatistics_collectdnetlink"
+msgid "Netlink Plugin Configuration"
 msgstr "Cấu hình Netlink Plugin "
 
 #. The netlink plugin collects extended informations like qdisc-, class- and filter-statistics for selected interfaces.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:131
-msgid "lucistatistics_collectdnetlink_desc"
+msgid "The netlink plugin collects extended informations like qdisc-, class- and filter-statistics for selected interfaces."
 msgstr ""
 "Netlink plugin thu thập những thông tin mở rộng như qdisc-, class- and "
 "filter-statistics cho những giao diện được chọn"
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:132
-msgid "lucistatistics_collectdnetlink_enable"
+msgid "Enable this plugin"
 msgstr "Kích hoạt plugin"
 
 #. Basic monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:133
-msgid "lucistatistics_collectdnetlink_interfaces"
+msgid "Basic monitoring"
 msgstr "Monitoring căn bản"
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:134
-msgid "lucistatistics_collectdnetlink_interfaces_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr "Giữ phím Ctrl trong khi click để chọn nhiều giao diện cùng lúc"
 
 #. Verbose monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:135
-msgid "lucistatistics_collectdnetlink_verboseinterfaces"
+msgid "Verbose monitoring"
 msgstr "Verbose monitoring"
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:136
-msgid "lucistatistics_collectdnetlink_verboseinterfaces_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr "Giữ phím Ctrl trong khi click để chọn nhiều giao diện cùng lúc"
 
 #. Qdisc monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:137
-msgid "lucistatistics_collectdnetlink_qdiscs"
+msgid "Qdisc monitoring"
 msgstr "Qdisc monitoring"
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:138
-msgid "lucistatistics_collectdnetlink_qdiscs_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr "Giữ phím Ctrl trong khi click để chọn nhiều giao diện cùng lúc"
 
 #. Shaping class monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:139
-msgid "lucistatistics_collectdnetlink_classes"
+msgid "Shaping class monitoring"
 msgstr "Shaping class monitoring"
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:140
-msgid "lucistatistics_collectdnetlink_classes_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr "Giữ phím Ctrl trong khi click để chọn nhiều giao diện cùng lúc"
 
 #. Filter class monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:141
-msgid "lucistatistics_collectdnetlink_filters"
+msgid "Filter class monitoring"
 msgstr "Filter class monitoring"
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:142
-msgid "lucistatistics_collectdnetlink_filters_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr "Giữ phím Ctrl trong khi click để chọn nhiều giao diện cùng lúc"
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:143
-msgid "lucistatistics_collectdnetlink_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr "Monitor tất cả trừ những cái được chọn"
 
 #. Network Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:144
-msgid "lucistatistics_collectdnetwork"
+msgid "Network Plugin Configuration"
 msgstr "Cấu hình network plugin"
 
 #. The network plugin provides network based communication between different collectd instances. Collectd can operate both in client and server mode. In client mode locally collected date is transferred to a collectd server instance, in server mode the local instance receives data from other hosts.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:145
-msgid "lucistatistics_collectdnetwork_desc"
+msgid "The network plugin provides network based communication between different collectd instances. Collectd can operate both in client and server mode. In client mode locally collected date is transferred to a collectd server instance, in server mode the local instance receives data from other hosts."
 msgstr ""
 "Network plugin cung cấp network dựa trên giao tiếp giữa những collectd "
 "instances khác nhau. Collectd có thể vận hành trên cả 2 chế độ client và "
@@ -783,167 +783,167 @@ msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:146
-msgid "lucistatistics_collectdnetwork_enable"
+msgid "Enable this plugin"
 msgstr "Kích hoạt plugin này"
 
 #. Listener interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:147
-msgid "lucistatistics_collectdnetworklisten"
+msgid "Listener interfaces"
 msgstr "Giao diện listener"
 
 #. This section defines on which interfaces collectd will wait for incoming connections.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:148
-msgid "lucistatistics_collectdnetworklisten_desc"
+msgid "This section defines on which interfaces collectd will wait for incoming connections."
 msgstr ""
 "Section này định nghĩa trên giao diện collectd sẽ đợi những kết nối đang tới"
 
 #. Listen host
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:149
-msgid "lucistatistics_collectdnetworklisten_host"
+msgid "Listen host"
 msgstr "Listen host"
 
 #. host-, ip- or ip6 address
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:150
-msgid "lucistatistics_collectdnetworklisten_host_desc"
+msgid "host-, ip- or ip6 address"
 msgstr "Địa chỉ host-, ip- or ip6 "
 
 #. Listen port
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:151
-msgid "lucistatistics_collectdnetworklisten_port"
+msgid "Listen port"
 msgstr "Listen port"
 
 #. 0 - 65535
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:152
-msgid "lucistatistics_collectdnetworklisten_port_desc"
+msgid "0 - 65535"
 msgstr "0 - 65535"
 
 #. server interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:153
-msgid "lucistatistics_collectdnetworkserver"
+msgid "server interfaces"
 msgstr "giao diện server"
 
 #. This section defines to which servers the locally collected data is sent to.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:154
-msgid "lucistatistics_collectdnetworkserver_desc"
+msgid "This section defines to which servers the locally collected data is sent to."
 msgstr "Section này định nghĩa servers thu thập dữ liệu địa phương để gửi đi"
 
 #. Server host
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:155
-msgid "lucistatistics_collectdnetworkserver_host"
+msgid "Server host"
 msgstr "Server host"
 
 #. host-, ip- or ip6 address
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:156
-msgid "lucistatistics_collectdnetworkserver_host_desc"
+msgid "host-, ip- or ip6 address"
 msgstr "host-, ip- or ip6 address"
 
 #. Server port
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:157
-msgid "lucistatistics_collectdnetworkserver_port"
+msgid "Server port"
 msgstr "Server port"
 
 #. 0 - 65535
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:158
-msgid "lucistatistics_collectdnetworkserver_port_desc"
+msgid "0 - 65535"
 msgstr "0 - 65535"
 
 #. TTL for network packets
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:159
-msgid "lucistatistics_collectdnetwork_timetolive"
+msgid "TTL for network packets"
 msgstr "TTL cho gói mạng"
 
 #. 0 - 255
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:160
-msgid "lucistatistics_collectdnetwork_timetolive_desc"
+msgid "0 - 255"
 msgstr "0 - 255"
 
 #. Forwarding between listen and server addresses
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:161
-msgid "lucistatistics_collectdnetwork_forward"
+msgid "Forwarding between listen and server addresses"
 msgstr "chuyển tiếp giữa listen và địa chỉ server"
 
 #. Cache flush interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:162
-msgid "lucistatistics_collectdnetwork_cacheflush"
+msgid "Cache flush interval"
 msgstr "Cache flush interval"
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:163
-msgid "lucistatistics_collectdnetwork_cacheflush_desc"
+msgid "seconds"
 msgstr "Giây"
 
 #. Ping Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:164
-msgid "lucistatistics_collectdping"
+msgid "Ping Plugin Configuration"
 msgstr "Cấu hình Ping plugin"
 
 #. The ping plugin will send icmp echo replies to selected hosts and measure the roundtrip time for each host.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:165
-msgid "lucistatistics_collectdping_desc"
+msgid "The ping plugin will send icmp echo replies to selected hosts and measure the roundtrip time for each host."
 msgstr ""
 "ping plugin sẽ gửi icmp echo trả lời tới những host được chọn và đo thời "
 "gian vận hành qua lại cho từng host"
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:166
-msgid "lucistatistics_collectdping_enable"
+msgid "Enable this plugin"
 msgstr "Kích hoạt plugin này"
 
 #. Monitor hosts
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:167
-msgid "lucistatistics_collectdping_hosts"
+msgid "Monitor hosts"
 msgstr "Monitor hosts"
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:168
-msgid "lucistatistics_collectdping_hosts_desc"
+msgid "multiple separated by space"
 msgstr "Nhiều phân tách bởi khoảng trống"
 
 #. TTL for ping packets
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:169
-msgid "lucistatistics_collectdping_ttl"
+msgid "TTL for ping packets"
 msgstr "TTl cho gói ping"
 
 #. 0 - 255
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:170
-msgid "lucistatistics_collectdping_ttl_desc"
+msgid "0 - 255"
 msgstr "0 - 255"
 
 #. Processes Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:171
-msgid "lucistatistics_collectdprocesses"
+msgid "Processes Plugin Configuration"
 msgstr "Cấu hình processes plugin"
 
 #. The processes plugin collects informations like cpu time, page faults and memory usage of selected processes.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:172
-msgid "lucistatistics_collectdprocesses_desc"
+msgid "The processes plugin collects informations like cpu time, page faults and memory usage of selected processes."
 msgstr ""
 "Processes plugin thu thập thông tin như cpu time, page faults và memory "
 "usage của từng processes được chọn. "
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:173
-msgid "lucistatistics_collectdprocesses_enable"
+msgid "Enable this plugin"
 msgstr "Kích hoạt plugin này"
 
 #. Monitor processes
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:174
-msgid "lucistatistics_collectdprocesses_processes"
+msgid "Monitor processes"
 msgstr "Monitor processes"
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:175
-msgid "lucistatistics_collectdprocesses_processes_desc"
+msgid "multiple separated by space"
 msgstr "Nhiều phân tách bằng khoảng trống"
 
 #. RRDTool Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:176
-msgid "lucistatistics_collectdrrdtool"
+msgid "RRDTool Plugin Configuration"
 msgstr "Cấu hình RRDTool Plugin "
 
 #. The rrdtool plugin stores the collected data in rrd database files, the foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong values will result in a very high memory consumption in the temporary directory. This can render the device unusable!</strong>
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:177
-msgid "lucistatistics_collectdrrdtool_desc"
+msgid "The rrdtool plugin stores the collected data in rrd database files, the foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong values will result in a very high memory consumption in the temporary directory. This can render the device unusable!</strong>"
 msgstr ""
 "The rrdtool plugin lưu những dữ liệu thu thập trong rrd database files, cơ "
 "sở của biểu đồ.<br /><br /><strong> Cảnh báo: Đặt sai giá trị sẽ tiêu hao bộ "
@@ -952,176 +952,176 @@ msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:178
-msgid "lucistatistics_collectdrrdtool_enable"
+msgid "Enable this plugin"
 msgstr "Kích hoạt plugin này"
 
 #. Storage directory
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:179
-msgid "lucistatistics_collectdrrdtool_datadir"
+msgid "Storage directory"
 msgstr "Thư mục lưu trữ"
 
 #. RRD step interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:180
-msgid "lucistatistics_collectdrrdtool_stepsize"
+msgid "RRD step interval"
 msgstr "RRD step interval"
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:181
-msgid "lucistatistics_collectdrrdtool_stepsize_desc"
+msgid "seconds"
 msgstr "Giây"
 
 #. RRD heart beat interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:182
-msgid "lucistatistics_collectdrrdtool_heartbeat"
+msgid "RRD heart beat interval"
 msgstr "RRD heart beat interval"
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:183
-msgid "lucistatistics_collectdrrdtool_heartbeat_desc"
+msgid "seconds"
 msgstr "giây"
 
 #. Only create average RRAs
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:184
-msgid "lucistatistics_collectdrrdtool_rrasingle"
+msgid "Only create average RRAs"
 msgstr "Chỉ tạo trung bình RRAs"
 
 #. reduces rrd size
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:185
-msgid "lucistatistics_collectdrrdtool_rrasingle_desc"
+msgid "reduces rrd size"
 msgstr "Giảm rrd size"
 
 #. Stored timespans
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:186
-msgid "lucistatistics_collectdrrdtool_rratimespans"
+msgid "Stored timespans"
 msgstr "LÆ°u timspans"
 
 #. seconds; multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:187
-msgid "lucistatistics_collectdrrdtool_rratimespans_desc"
+msgid "seconds; multiple separated by space"
 msgstr "giây; nhiều phân tách bởi khoảng trống"
 
 #. Rows per RRA
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:188
-msgid "lucistatistics_collectdrrdtool_rrarows"
+msgid "Rows per RRA"
 msgstr "Rows per RRA"
 
 #. RRD XFiles Factor
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:189
-msgid "lucistatistics_collectdrrdtool_xff"
+msgid "RRD XFiles Factor"
 msgstr "Yếu tố RRD XFiles"
 
 #. Cache collected data for
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:190
-msgid "lucistatistics_collectdrrdtool_cachetimeout"
+msgid "Cache collected data for"
 msgstr "Cache collected data cho"
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:191
-msgid "lucistatistics_collectdrrdtool_cachetimeout_desc"
+msgid "seconds"
 msgstr "giây"
 
 #. Flush cache after
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:192
-msgid "lucistatistics_collectdrrdtool_cacheflush"
+msgid "Flush cache after"
 msgstr "Flush cache sau khi"
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:193
-msgid "lucistatistics_collectdrrdtool_cacheflush_desc"
+msgid "seconds"
 msgstr "giây"
 
 #. TCPConns Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:194
-msgid "lucistatistics_collectdtcpconns"
+msgid "TCPConns Plugin Configuration"
 msgstr "Cấu hình TCPConns Plugin "
 
 #. The tcpconns plugin collects informations about open tcp connections on selected ports.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:195
-msgid "lucistatistics_collectdtcpconns_desc"
+msgid "The tcpconns plugin collects informations about open tcp connections on selected ports."
 msgstr ""
 "Tcpconns plugin thu thập thông tin về open tcp kết nối trên những cổng được "
 "chọn."
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:196
-msgid "lucistatistics_collectdtcpconns_enable"
+msgid "Enable this plugin"
 msgstr "Kích hoạt cổng này"
 
 #. Monitor all local listen ports
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:197
-msgid "lucistatistics_collectdtcpconns_listeningports"
+msgid "Monitor all local listen ports"
 msgstr "Monitor tất cả local listen port"
 
 #. Monitor local ports
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:198
-msgid "lucistatistics_collectdtcpconns_localports"
+msgid "Monitor local ports"
 msgstr "Monitor cổng địa phương"
 
 #. 0 - 65535; multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:199
-msgid "lucistatistics_collectdtcpconns_localports_desc"
+msgid "0 - 65535; multiple separated by space"
 msgstr "0 - 65535; nhiều phân tách bằng khoảng trống"
 
 #. Monitor remote ports
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:200
-msgid "lucistatistics_collectdtcpconns_remoteports"
+msgid "Monitor remote ports"
 msgstr "Monitor remote ports"
 
 #. 0 - 65535; multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:201
-msgid "lucistatistics_collectdtcpconns_remoteports_desc"
+msgid "0 - 65535; multiple separated by space"
 msgstr "0 - 65535; nhiều phân tách bằng khoảng trống"
 
 #. Unixsock Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:202
-msgid "lucistatistics_collectdunixsock"
+msgid "Unixsock Plugin Configuration"
 msgstr "Cấu hình Unixsock Plugin "
 
 #. The unixsock plugin creates a unix socket which can be used to read collected data from a running collectd instance.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:203
-msgid "lucistatistics_collectdunixsock_desc"
+msgid "The unixsock plugin creates a unix socket which can be used to read collected data from a running collectd instance."
 msgstr ""
 "Unixsock plugin tạo một unix socket mà có thể dùng để đọc dữ liệu thu thập "
 "từ một collectd instance đang vận hành. "
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:204
-msgid "lucistatistics_collectdunixsock_enable"
+msgid "Enable this plugin"
 msgstr "Kích hoạt plugin này"
 
 #. Filepath of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:205
-msgid "lucistatistics_collectdunixsock_socketfile"
+msgid "Filepath of the unix socket"
 msgstr "Filepath của unix socket"
 
 #. Group ownership of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:206
-msgid "lucistatistics_collectdunixsock_socketgroup"
+msgid "Group ownership of the unix socket"
 msgstr "Group ownership của unix socket"
 
 #. group name
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:207
-msgid "lucistatistics_collectdunixsock_socketgroup_desc"
+msgid "group name"
 msgstr "tên nhóm"
 
 #. File permissions of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:208
-msgid "lucistatistics_collectdunixsock_socketperms"
+msgid "File permissions of the unix socket"
 msgstr "File permissions của unix socket"
 
 #. octal
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:209
-msgid "lucistatistics_collectdunixsock_socketperms_desc"
+msgid "octal"
 msgstr "octal"
 
 #. Wireless Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:210
-msgid "lucistatistics_collectdwireless"
+msgid "Wireless Plugin Configuration"
 msgstr "Cấu hình Wireless Plugin "
 
 #. The wireless plugin collects statistics about wireless signal strength, noise and quality.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:211
-msgid "lucistatistics_collectdwireless_desc"
+msgid "The wireless plugin collects statistics about wireless signal strength, noise and quality."
 msgstr ""
 "Cấu hình wireless plugin thu thập thống kê về độ mạnh của tín hiệu wireless, "
 "noise và chất lượng."
diff --git a/po/vi/sysauth.po b/po/vi/sysauth.po
index 4ff8c0793..867d26ee9 100644
--- a/po/vi/sysauth.po
+++ b/po/vi/sysauth.po
@@ -15,12 +15,12 @@ msgstr ""
 
 #. Authorization Required
 #: i18n/english/luasrc/i18n/sysauth.en.lua:1
-msgid "sysauth_head"
+msgid "Authorization Required"
 msgstr "Yêu cầu ủy quyền"
 
 #. Please enter your username and password.
 #: i18n/english/luasrc/i18n/sysauth.en.lua:2
-msgid "sysauth_prompt"
+msgid "Please enter your username and password."
 msgstr "Nhập tên và mật mã"
 
 #. Invalid username and/or password! Please try again.
diff --git a/po/vi/tinyproxy.po b/po/vi/tinyproxy.po
index e895d8105..127b72b43 100644
--- a/po/vi/tinyproxy.po
+++ b/po/vi/tinyproxy.po
@@ -15,157 +15,157 @@ msgstr ""
 
 #. Tinyproxy
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:1
-msgid "tinyproxy"
+msgid "Tinyproxy"
 msgstr "Tinyproxy"
 
 #. Tinyproxy is a small and fast non-caching HTTP(S)-Proxy
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:2
-msgid "tinyproxy_desc"
+msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
 msgstr "Tinyproxy là một proxy nhỏ và nhanh không-cạc HTTP(S)"
 
 #. Allow access from
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:3
-msgid "tinyproxy_tinyproxy_allow"
+msgid "Allow access from"
 msgstr "Cho phép truy cập từ"
 
 #. Allowed headers for anonymous proxy
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:4
-msgid "tinyproxy_tinyproxy_anonymous"
+msgid "Allowed headers for anonymous proxy"
 msgstr "Cho phép headers cho anonymous proxy"
 
 #. Bind outgoing traffic to address
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:5
-msgid "tinyproxy_tinyproxy_bind"
+msgid "Bind outgoing traffic to address"
 msgstr "Blind lưu lượng truy cập ngoài vào địa chỉ"
 
 #. Ports allowed for CONNECT method
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:6
-msgid "tinyproxy_tinyproxy_connectport"
+msgid "Ports allowed for CONNECT method"
 msgstr "Cổng cho phép phương pháp CONNECT"
 
 #. 0 = disabled, empty = all
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:7
-msgid "tinyproxy_tinyproxy_connectport_desc"
+msgid "0 = disabled, empty = all"
 msgstr "0=vô hiệu hóa, rỗng = tất cả"
 
 #. Error document
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:8
-msgid "tinyproxy_tinyproxy_defaulterrorfile"
+msgid "Error document"
 msgstr "Tài liệu lỗi"
 
 #. Filter list
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:9
-msgid "tinyproxy_tinyproxy_filter"
+msgid "Filter list"
 msgstr "Lọc list"
 
 #. Case sensitive filters
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:10
-msgid "tinyproxy_tinyproxy_filtercasesensitive"
+msgid "Case sensitive filters"
 msgstr "Lọc phím nhạy cảm"
 
 #. Filter list is a whitelist
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:11
-msgid "tinyproxy_tinyproxy_filterdefaultdeny"
+msgid "Filter list is a whitelist"
 msgstr "Lọc list là một whitelist"
 
 #. Extended regular expression filters
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:12
-msgid "tinyproxy_tinyproxy_filterextended"
+msgid "Extended regular expression filters"
 msgstr "Mở rộng các bộ lọc thường xuyên biểu"
 
 #. Filter URLs instead of domains
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:13
-msgid "tinyproxy_tinyproxy_filterurls"
+msgid "Filter URLs instead of domains"
 msgstr "Lọc URLs thay domain"
 
 #. Listen on address
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:14
-msgid "tinyproxy_tinyproxy_listen"
+msgid "Listen on address"
 msgstr "Nghe trên địa chỉ"
 
 #. Logfile
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:15
-msgid "tinyproxy_tinyproxy_logfile"
+msgid "Logfile"
 msgstr "Logfile"
 
 #. Log level
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:16
-msgid "tinyproxy_tinyproxy_loglevel"
+msgid "Log level"
 msgstr "Log level"
 
 #. Maximum number of clients
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:17
-msgid "tinyproxy_tinyproxy_maxclients"
+msgid "Maximum number of clients"
 msgstr "Tối đa số lượng khách hàng"
 
 #. Maximum requests per thread
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:18
-msgid "tinyproxy_tinyproxy_maxrequestsperchild"
+msgid "Maximum requests per thread"
 msgstr "Tối đa yêu cầu trên thread"
 
 #. Max. spare servers
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:19
-msgid "tinyproxy_tinyproxy_maxspareservers"
+msgid "Max. spare servers"
 msgstr "Tối đa spare servers"
 
 #. Min. spare servers
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:20
-msgid "tinyproxy_tinyproxy_minspareservers"
+msgid "Min. spare servers"
 msgstr "Tối thiểu spare servers"
 
 #. Spare servers to start with
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:21
-msgid "tinyproxy_tinyproxy_startservers"
+msgid "Spare servers to start with"
 msgstr "Spare servers bắt đầu với"
 
 #. Statistic document
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:22
-msgid "tinyproxy_tinyproxy_statfile"
+msgid "Statistic document"
 msgstr "Tài liệu thống kê"
 
 #. Write to syslog
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:23
-msgid "tinyproxy_tinyproxy_syslog"
+msgid "Write to syslog"
 msgstr "viết tới syslog"
 
 #. Connection Timeout
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:24
-msgid "tinyproxy_tinyproxy_timeout"
+msgid "Connection Timeout"
 msgstr "Kết nối hết hiệu lực"
 
 #. Value of Via-Header
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:25
-msgid "tinyproxy_tinyproxy_viaproxyname"
+msgid "Value of Via-Header"
 msgstr "Giá trị của Via-Header"
 
 #. Include client IP
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:26
-msgid "tinyproxy_tinyproxy_xtinyproxy"
+msgid "Include client IP"
 msgstr "Bao gồm IP của khách hàng"
 
 #. Via proxy
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:27
-msgid "tinyproxy_type_proxy"
+msgid "Via proxy"
 msgstr "Via proxy"
 
 #. Reject access
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:28
-msgid "tinyproxy_type_reject"
+msgid "Reject access"
 msgstr "Từ chối truy cập "
 
 #. Upstream Control
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:29
-msgid "tinyproxy_upstream"
+msgid "Upstream Control"
 msgstr "Điều khiển Upstream "
 
 #. Target host
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:30
-msgid "tinyproxy_upstream_target"
+msgid "Target host"
 msgstr "Host mục tiêu"
 
 #. Type
 #: applications/luci-tinyproxy/luasrc/i18n/tinyproxy.en.lua:31
-msgid "tinyproxy_upstream_type"
+msgid "Type"
 msgstr "Loại "
 
 #. Upstream Proxy
diff --git a/po/vi/upnp.po b/po/vi/upnp.po
index 3c57eb1f2..7567f5ad6 100644
--- a/po/vi/upnp.po
+++ b/po/vi/upnp.po
@@ -15,36 +15,36 @@ msgstr ""
 
 #. Universal Plug &amp; Play
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:1
-msgid "upnpd"
+msgid "Universal Plug & Play"
 msgstr "Universal Plug &amp;amp; Play"
 
 #. UPNP allows clients in the local network to automatically configure the router.
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:2
-msgid "upnpd_desc"
+msgid "UPNP allows clients in the local network to automatically configure the router."
 msgstr ""
 "UPNP cho phép đối tượng trong mạng địa phương tự động định dạng bộ định "
 "tuyến"
 
 #. UPNP should only be enabled if absolutely necessary as it can result in high security risks for your network.
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:3
-msgid "upnpd_config_desc"
+msgid "UPNP should only be enabled if absolutely necessary as it can result in high security risks for your network."
 msgstr ""
 "Chỉ nên kích hoạt UPNP khi thật cần thiết vì nó có thể gây nguy hiểm cho "
 "mạng lưới"
 
 #. Enable secure mode
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:4
-msgid "upnpd_config_securemode"
+msgid "Enable secure mode"
 msgstr "Kích hoạt chế độ an toàn"
 
 #. Log output
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:5
-msgid "upnpd_config_logoutput"
+msgid "Log output"
 msgstr "Log output"
 
 #. Downlink
 #: applications/luci-upnp/luasrc/i18n/upnp.en.lua:6
-msgid "upnpd_config_download"
+msgid "Downlink"
 msgstr "Downlink"
 
 #. Uplink
diff --git a/po/vi/ushare.po b/po/vi/ushare.po
index f816ca5e7..284e70086 100644
--- a/po/vi/ushare.po
+++ b/po/vi/ushare.po
@@ -15,37 +15,37 @@ msgstr ""
 
 #. Content directories
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:1
-msgid "content_directories"
+msgid "Content directories"
 msgstr "Danh bạ nội dung "
 
 #. Disable telnet console
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:2
-msgid "disable_telnet"
+msgid "Disable telnet console"
 msgstr "Vô hiệu hóa khiển telnet"
 
 #. Disable webinterface
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:3
-msgid "disable_webif"
+msgid "Disable webinterface"
 msgstr "Vô hiệu hóa giao diện web"
 
 #. Options
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:4
-msgid "options"
+msgid "Options"
 msgstr "Lựa chọn "
 
 #. Servername
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:5
-msgid "servername"
+msgid "Servername"
 msgstr "tên máy chủ"
 
 #. Settings
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:6
-msgid "settings"
+msgid "Settings"
 msgstr "Cài đặt"
 
 #. uShare
 #: applications/luci-ushare/luasrc/i18n/ushare.en.lua:7
-msgid "ushare"
+msgid "uShare"
 msgstr "uShare"
 
 #. uShare
diff --git a/po/vi/uvc_streamer.po b/po/vi/uvc_streamer.po
index f1e23237d..06e625a6e 100644
--- a/po/vi/uvc_streamer.po
+++ b/po/vi/uvc_streamer.po
@@ -15,22 +15,22 @@ msgstr ""
 
 #. Frames per second
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
-msgid "framespersecond"
+msgid "Frames per second"
 msgstr "Frames trên giây"
 
 #. Resolution
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
-msgid "resolution"
+msgid "Resolution"
 msgstr "Sự phân giải"
 
 #. Settings
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
-msgid "settings"
+msgid "Settings"
 msgstr "Cài đặt "
 
 #. Webcam streaming
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4
-msgid "uvc_streamer"
+msgid "Webcam streaming"
 msgstr "Luồng webcam"
 
 #. Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a href=\"http://%s:%i/\">http://%s:%i/</a>
diff --git a/po/vi/uvl.po b/po/vi/uvl.po
index 8e2cbc771..a083f4582 100644
--- a/po/vi/uvl.po
+++ b/po/vi/uvl.po
@@ -15,212 +15,212 @@ msgstr ""
 
 #. Unable to load config \"%p\": %1
 #: libs/uvl/luasrc/i18n/uvl.en.lua:1
-msgid "uvl_err_uciload"
+msgid "Unable to load config \"%p\": %1"
 msgstr "Không thể tải cấu hình \"%p\": %1"
 
 #. Error in scheme \"%p\":\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:2
-msgid "uvl_err_scheme"
+msgid "Error in scheme \"%p\":\\n%c"
 msgstr ""
 "Lỗi trong sơ đồ \"%p\":\n"
 "%c"
 
 #. Error in config \"%p\":\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:3
-msgid "uvl_err_config"
+msgid "Error in config \"%p\":\\n%c"
 msgstr ""
 "Lỗi trong cấu hình \"%p\":\n"
 "%c"
 
 #. Error in section \"%i\" (%I):\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:4
-msgid "uvl_err_section"
+msgid "Error in section \"%i\" (%I):\\n%c"
 msgstr ""
 "Lỗi trong mục \"%i\" (%I):\n"
 "%c"
 
 #. Error in option \"%i\" (%I):\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:5
-msgid "uvl_err_option"
+msgid "Error in option \"%i\" (%I):\\n%c"
 msgstr ""
 "Lỗi trong tùy chọn \"%i\" (%I):\n"
 "%c"
 
 #. Option \"%i\" has invalid reference specification %1:\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:6
-msgid "uvl_err_reference"
+msgid "Option \"%i\" has invalid reference specification %1:\\n%c"
 msgstr "Tùy chọn \"% i\" có đặc điểm kỹ thuật tham chiếu không hợp lệ% 1: \\ n% c"
 
 #. In dependency check for %t \"%i\":\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:7
-msgid "uvl_err_dependency"
+msgid "In dependency check for %t \"%i\":\\n%c"
 msgstr ""
 "Kiểm tra phụ thuộc cho %t \"%i\":\n"
 "%c"
 
 #. Can not find scheme \"%p\" in \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:8
-msgid "uvl_err_sme_find"
+msgid "Can not find scheme \"%p\" in \"%1\""
 msgstr "Không thể tìm thấy sơ đồ \"%p\" in \"%1\""
 
 #. Can not access file \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:9
-msgid "uvl_err_sme_read"
+msgid "Can not access file \"%1\""
 msgstr "Không thể truy cập tập tin \"%1\""
 
 #. Missing required scheme field \"%1\" in \"%i\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:10
-msgid "uvl_err_sme_reqfld"
+msgid "Missing required scheme field \"%1\" in \"%i\""
 msgstr "Thiếu sơ đồ lĩnh vực yêu cầu \"%1\" in \"%i\""
 
 #. Illegal reference \"%1\" to an anonymous section
 #: libs/uvl/luasrc/i18n/uvl.en.lua:11
-msgid "uvl_err_sme_invref"
+msgid "Illegal reference \"%1\" to an anonymous section"
 msgstr "Bất hợp pháp tham khảo \"% 1\"  tới một danh mục"
 
 #. Malformed reference in \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:12
-msgid "uvl_err_sme_badref"
+msgid "Malformed reference in \"%1\""
 msgstr "Malformed reference trong \"%1\""
 
 #. Malformed dependency specification \"%1\" in \"%i\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:13
-msgid "uvl_err_sme_baddep"
+msgid "Malformed dependency specification \"%1\" in \"%i\""
 msgstr "Malformed dependency specification \"%1\" trong \"%i\""
 
 #. Malformed validator specification \"%1\" in \"%i\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:14
-msgid "uvl_err_sme_badval"
+msgid "Malformed validator specification \"%1\" in \"%i\""
 msgstr "Malformed validator specification \"%1\" in \"%i\""
 
 #. External validator \"%1\" failed: %2
 #: libs/uvl/luasrc/i18n/uvl.en.lua:15
-msgid "uvl_err_sme_errval"
+msgid "External validator \"%1\" failed: %2"
 msgstr "External validator \"%1\" failed: %2"
 
 #. Variable \"%o\" in scheme \"%p\" references unknown package \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:16
-msgid "uvl_err_sme_vbadpack"
+msgid "Variable \"%o\" in scheme \"%p\" references unknown package \"%1\""
 msgstr "Variable \"%o\" in scheme \"%p\" references gói không rõ ràng \"%1\""
 
 #. Variable \"%o\" in scheme \"%p\" references unknown section \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:17
-msgid "uvl_err_sme_vbadsect"
+msgid "Variable \"%o\" in scheme \"%p\" references unknown section \"%1\""
 msgstr "Variable \"%o\" in scheme \"%p\" references unknown section \"%1\""
 
 #. Enum \"%v\" in scheme \"%p\" references unknown package \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:18
-msgid "uvl_err_sme_ebadpack"
+msgid "Enum \"%v\" in scheme \"%p\" references unknown package \"%1\""
 msgstr "Enum \"%v\" in scheme \"%p\" references unknown package \"%1\""
 
 #. Enum \"%v\" in scheme \"%p\" references unknown section \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:19
-msgid "uvl_err_sme_ebadsect"
+msgid "Enum \"%v\" in scheme \"%p\" references unknown section \"%1\""
 msgstr "Enum \"%v\" in scheme \"%p\" references unknown section \"%1\""
 
 #. Enum \"%v\" in scheme \"%p\" references unknown option \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:20
-msgid "uvl_err_sme_ebadopt"
+msgid "Enum \"%v\" in scheme \"%p\" references unknown option \"%1\""
 msgstr "Enum \"%v\" in scheme \"%p\" references unknown option \"%1\""
 
 #. Enum \"%v\" in scheme \"%p\" references non-enum option \"%p.%s.%o\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:21
-msgid "uvl_err_sme_ebadtype"
+msgid "Enum \"%v\" in scheme \"%p\" references non-enum option \"%p.%s.%o\""
 msgstr "Enum \"%v\" in scheme \"%p\" references non-enum option \"%p.%s.%o\""
 
 #. Enum \"%v\" in scheme \"%p\" redeclares the default value of \"%p.%s.%o\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:22
-msgid "uvl_err_sme_ebaddef"
+msgid "Enum \"%v\" in scheme \"%p\" redeclares the default value of \"%p.%s.%o\""
 msgstr "Enum \"%v\" in scheme \"%p\" redeclares the default value of \"%p.%s.%o\""
 
 #. Section \"%i\" (%I) not found in scheme
 #: libs/uvl/luasrc/i18n/uvl.en.lua:23
-msgid "uvl_err_sect_unknown"
+msgid "Section \"%i\" (%I) not found in scheme"
 msgstr "Phần \"% i\" (% i) không được tìm thấy trong chương trình"
 
 #. Required section \"%p.%s\" not found in config
 #: libs/uvl/luasrc/i18n/uvl.en.lua:24
-msgid "uvl_err_sect_required"
+msgid "Required section \"%p.%s\" not found in config"
 msgstr "Phần yêu cầu \"%p.%s\" không được tìm thấy trong cấu hình"
 
 #. Unique section \"%p.%s\" occurs multiple times in config
 #: libs/uvl/luasrc/i18n/uvl.en.lua:25
-msgid "uvl_err_sect_unique"
+msgid "Unique section \"%p.%s\" occurs multiple times in config"
 msgstr "Phần duy nhất \"%p.%s\" xảy ra nhiều lần trong cấu hình"
 
 #. The section of type \"%p.%s\" is stored anonymously in config but must be named
 #: libs/uvl/luasrc/i18n/uvl.en.lua:26
-msgid "uvl_err_sect_named"
+msgid "The section of type \"%p.%s\" is stored anonymously in config but must be named"
 msgstr ""
 "Các phần của loại \"%p.%s\" được lưu giữ ngẫu nhiên trong cấu hình, nhưng phải "
 "được đặt tên"
 
 #. Section \"%p.%s\" not found in config
 #: libs/uvl/luasrc/i18n/uvl.en.lua:27
-msgid "uvl_err_sect_notfound"
+msgid "Section \"%p.%s\" not found in config"
 msgstr "Phần \"%p.%s\" không được tìm thấy trong cấu hình"
 
 #. Option \"%i\" (%I) not found in scheme
 #: libs/uvl/luasrc/i18n/uvl.en.lua:28
-msgid "uvl_err_opt_unknown"
+msgid "Option \"%i\" (%I) not found in scheme"
 msgstr "Tùy chọn \"%i\" (%I) không tìm thấy trong sơ đồ"
 
 #. Required option \"%i\" has no value
 #: libs/uvl/luasrc/i18n/uvl.en.lua:29
-msgid "uvl_err_opt_required"
+msgid "Required option \"%i\" has no value"
 msgstr "Tùy chọn yêu cầu \"%i\" không có giá trị"
 
 #. Value \"%1\" of option \"%i\" is not defined in enum %2
 #: libs/uvl/luasrc/i18n/uvl.en.lua:30
-msgid "uvl_err_opt_badvalue"
+msgid "Value \"%1\" of option \"%i\" is not defined in enum %2"
 msgstr "Giá trị \"%1\" của tùy chọn \"%i\" không được định nghĩa trong enum %2"
 
 #. Value \"%1\" of option \"%i\" does not validate as datatype \"%2\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:31
-msgid "uvl_err_opt_invvalue"
+msgid "Value \"%1\" of option \"%i\" does not validate as datatype \"%2\""
 msgstr "Giá trị \"%1\" của tùy chọn \"%i\" không có hiệu lực như datatype \"%2\""
 
 #. Option \"%i\" is defined as list but stored as plain value
 #: libs/uvl/luasrc/i18n/uvl.en.lua:32
-msgid "uvl_err_opt_notlist"
+msgid "Option \"%i\" is defined as list but stored as plain value"
 msgstr ""
 "Tùy chọn \"%i\" được định nghĩa như một list nhưng lưu trữ như một giá trị "
 "rỗng"
 
 #. Option \"%i\" has unknown datatype \"%1\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:33
-msgid "uvl_err_opt_datatype"
+msgid "Option \"%i\" has unknown datatype \"%1\""
 msgstr "Tùy chọn \"%i\" có không xác định datatype \"%1\""
 
 #. Option \"%p.%s.%o\" not found in config
 #: libs/uvl/luasrc/i18n/uvl.en.lua:34
-msgid "uvl_err_opt_notfound"
+msgid "Option \"%p.%s.%o\" not found in config"
 msgstr "Tùy chọn \"%p.%s.%o\" không tìm thấy trong cấu hình"
 
 #. Dependency (%1) failed:\noption \"%i\" is not eqal \"%2\"
 #: libs/uvl/luasrc/i18n/uvl.en.lua:35
-msgid "uvl_err_dep_notequal"
+msgid "Dependency (%1) failed:\\noption \"%i\" is not eqal \"%2\""
 msgstr ""
 "Phụ thuộc (%1) bị lỗi:\n"
 "option \"%i\" thì không bằng \"%2\""
 
 #. Dependency (%1) failed:\noption \"%i\" has no value
 #: libs/uvl/luasrc/i18n/uvl.en.lua:36
-msgid "uvl_err_dep_novalue"
+msgid "Dependency (%1) failed:\\noption \"%i\" has no value"
 msgstr ""
 "Phụ thuộc (%1) bị lỗi:\n"
 "option \"%i\" không có giá trị"
 
 #. Dependency (%1) failed:\n%c
 #: libs/uvl/luasrc/i18n/uvl.en.lua:37
-msgid "uvl_err_dep_notvalid"
+msgid "Dependency (%1) failed:\\n%c"
 msgstr ""
 "Phụ thuộc (%1) bị lỗi:\n"
 "%c"
 
 #. Recursive dependency for option \"%i\" detected
 #: libs/uvl/luasrc/i18n/uvl.en.lua:38
-msgid "uvl_err_dep_recursive"
+msgid "Recursive dependency for option \"%i\" detected"
 msgstr "Recursive phụ thuộc cho các tùy chọn \"% i\" được phát hiện"
 
 #. In dependency check for enum value \"%i\":\n%c
diff --git a/po/vi/wifi.po b/po/vi/wifi.po
index a9aac8acd..45047c7eb 100644
--- a/po/vi/wifi.po
+++ b/po/vi/wifi.po
@@ -15,192 +15,192 @@ msgstr ""
 
 #. auto
 #: i18n/english/luasrc/i18n/wifi.en.lua:1
-msgid "wifi_auto"
+msgid "auto"
 msgstr "tự động"
 
 #. Frequency Hopping
 #: i18n/english/luasrc/i18n/wifi.en.lua:2
-msgid "wifi_fh"
+msgid "Frequency Hopping"
 msgstr "Tần số Hopping"
 
 #. Diversity
 #: i18n/english/luasrc/i18n/wifi.en.lua:3
-msgid "wifi_diversity"
+msgid "Diversity"
 msgstr "Đa dạng"
 
 #. Transmitter Antenna
 #: i18n/english/luasrc/i18n/wifi.en.lua:4
-msgid "wifi_txantenna"
+msgid "Transmitter Antenna"
 msgstr "Máy phát Antenna"
 
 #. Receiver Antenna
 #: i18n/english/luasrc/i18n/wifi.en.lua:5
-msgid "wifi_rxantenna"
+msgid "Receiver Antenna"
 msgstr "Máy thu Antenna"
 
 #. Distance Optimization
 #: i18n/english/luasrc/i18n/wifi.en.lua:6
-msgid "wifi_distance"
+msgid "Distance Optimization"
 msgstr "Khoảng cách tối ưu"
 
 #. Distance to farthest network member in meters.
 #: i18n/english/luasrc/i18n/wifi.en.lua:7
-msgid "wifi_distance_desc"
+msgid "Distance to farthest network member in meters."
 msgstr "Khoảng cách tới thành viên xa nhất trong mạng lưới tính bằng mét"
 
 #. MAC-Address Filter
 #: i18n/english/luasrc/i18n/wifi.en.lua:8
-msgid "wifi_macpolicy"
+msgid "MAC-Address Filter"
 msgstr "Lọc địa chỉ MAC"
 
 #. Allow listed only
 #: i18n/english/luasrc/i18n/wifi.en.lua:9
-msgid "wifi_whitelist"
+msgid "Allow listed only"
 msgstr "Chỉ cho phép danh sách liệt kê"
 
 #. Allow all except listed
 #: i18n/english/luasrc/i18n/wifi.en.lua:10
-msgid "wifi_blacklist"
+msgid "Allow all except listed"
 msgstr "Cho phép tất cả trừ danh sách liệt kê"
 
 #. MAC-List
 #: i18n/english/luasrc/i18n/wifi.en.lua:11
-msgid "wifi_maclist"
+msgid "MAC-List"
 msgstr "Danh sách MAC"
 
 #. Frame Bursting
 #: i18n/english/luasrc/i18n/wifi.en.lua:12
-msgid "wifi_bursting"
+msgid "Frame Bursting"
 msgstr "Khung nổ"
 
 #. Regulatory Domain
 #: i18n/english/luasrc/i18n/wifi.en.lua:13
-msgid "wifi_regdomain"
+msgid "Regulatory Domain"
 msgstr "Miền điều chỉnh"
 
 #. Country Code
 #: i18n/english/luasrc/i18n/wifi.en.lua:14
-msgid "wifi_country"
+msgid "Country Code"
 msgstr "Mã quốc gia"
 
 #. Outdoor Channels
 #: i18n/english/luasrc/i18n/wifi.en.lua:15
-msgid "wifi_outdoor"
+msgid "Outdoor Channels"
 msgstr "Kênh ngoại mạng"
 
 #. Connection Limit
 #: i18n/english/luasrc/i18n/wifi.en.lua:16
-msgid "wifi_maxassoc"
+msgid "Connection Limit"
 msgstr "Giới hạn kết nối"
 
 #. <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:17
-msgid "wifi_essid"
+msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "<abbr title=\"Mở rộng dịch vụ đặt Identifier\">ESSID</abbr>"
 
 #. <abbr title=\"Basic Service Set Identifier\">BSSID</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:18
-msgid "wifi_bssid"
+msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr "<abbr title=\"Dịch vụ căn bản đặt Identifier\">BSSID</abbr>"
 
 #. Fragmentation Threshold
 #: i18n/english/luasrc/i18n/wifi.en.lua:19
-msgid "wifi_frag"
+msgid "Fragmentation Threshold"
 msgstr "Ngưỡng cửa Phân đoạn"
 
 #. RTS/CTS Threshold
 #: i18n/english/luasrc/i18n/wifi.en.lua:20
-msgid "wifi_rts"
+msgid "RTS/CTS Threshold"
 msgstr "RTS/CTS Threshold"
 
 #. <abbr title=\"Wireless Distribution System\">WDS</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:21
-msgid "wifi_wds"
+msgid "<abbr title=\"Wireless Distribution System\">WDS</abbr>"
 msgstr "<abbr title=\"Hệ thống phân phối mạng không dây\">WDS</abbr>"
 
 #. Separate WDS
 #: i18n/english/luasrc/i18n/wifi.en.lua:22
-msgid "wifi_wdssep"
+msgid "Separate WDS"
 msgstr "Phân tách WDS"
 
 #. Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:23
-msgid "wifi_hidden"
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
 #. Isolate Clients
 #: i18n/english/luasrc/i18n/wifi.en.lua:24
-msgid "wifi_isloate"
+msgid "Isolate Clients"
 msgstr "Cô lập đối tượng"
 
 #. Prevent Client to Client Communication
 #: i18n/english/luasrc/i18n/wifi.en.lua:25
-msgid "wifi_isloate_desc"
+msgid "Prevent Client to Client Communication"
 msgstr "Ngăn chặng giao tiếp giữa đối tượng với đối tượng"
 
 #. Background Scan
 #: i18n/english/luasrc/i18n/wifi.en.lua:26
-msgid "wifi_bgscan"
+msgid "Background Scan"
 msgstr "Background Scan"
 
 #. Transmission Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:27
-msgid "wifi_rate"
+msgid "Transmission Rate"
 msgstr "Truyền tải rate"
 
 #. Multicast Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:28
-msgid "wifi_mcast_rate"
+msgid "Multicast Rate"
 msgstr "Multicast Rate"
 
 #. Minimum Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:29
-msgid "wifi_minrate"
+msgid "Minimum Rate"
 msgstr "Mức thấp nhất"
 
 #. Maximum Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:30
-msgid "wifi_maxrate"
+msgid "Maximum Rate"
 msgstr "Mức cao nhất"
 
 #. Compression
 #: i18n/english/luasrc/i18n/wifi.en.lua:31
-msgid "wifi_compression"
+msgid "Compression"
 msgstr "Sức nén"
 
 #. Turbo Mode
 #: i18n/english/luasrc/i18n/wifi.en.lua:32
-msgid "wifi_turbo"
+msgid "Turbo Mode"
 msgstr "Turbo Mode"
 
 #. Fast Frames
 #: i18n/english/luasrc/i18n/wifi.en.lua:33
-msgid "wifi_ff"
+msgid "Fast Frames"
 msgstr "Khung nhanh"
 
 #. WMM Mode
 #: i18n/english/luasrc/i18n/wifi.en.lua:34
-msgid "wifi_wmm"
+msgid "WMM Mode"
 msgstr "WMM Mode"
 
 #. XR Support
 #: i18n/english/luasrc/i18n/wifi.en.lua:35
-msgid "wifi_xr"
+msgid "XR Support"
 msgstr "Hỗ trợ XR"
 
 #. AR Support
 #: i18n/english/luasrc/i18n/wifi.en.lua:36
-msgid "wifi_ar"
+msgid "AR Support"
 msgstr "Hỗ trợ AR"
 
 #. Disable HW-Beacon timer
 #: i18n/english/luasrc/i18n/wifi.en.lua:37
-msgid "wifi_nosbeacon"
+msgid "Disable HW-Beacon timer"
 msgstr "Vô hiệu hóa bộ chỉnh giờ HW-Beacon"
 
 #. Do not send probe responses
 #: i18n/english/luasrc/i18n/wifi.en.lua:38
-msgid "wifi_noprobereq"
+msgid "Do not send probe responses"
 msgstr "Không gửi nhắc hồi đáp"
 
 #. WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP and ad-hoc mode) to be installed.
diff --git a/po/zh_CN/admin-core.po b/po/zh_CN/admin-core.po
index b0a1662a7..b86f5c6e0 100644
--- a/po/zh_CN/admin-core.po
+++ b/po/zh_CN/admin-core.po
@@ -13,2070 +13,2070 @@ msgstr ""
 
 #. The following changes have been applied
 #: i18n/english/luasrc/i18n/admin-core.en.lua:1
-msgid "uci_applied"
+msgid "The following changes have been applied"
 msgstr "下列修改已生效"
 
 #. The following changes have been reverted
 #: i18n/english/luasrc/i18n/admin-core.en.lua:2
-msgid "uci_reverted"
+msgid "The following changes have been reverted"
 msgstr "下列修改已恢复"
 
 #. User Interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:3
-msgid "a_i_ui"
+msgid "User Interface"
 msgstr "用户界面"
 
 #. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a collection of free Lua software including an <abbr title=\"Model-View-Controller\">MVC</abbr>-Webframework and webinterface for embedded devices. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is licensed under the Apache-License.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:4
-msgid "c_lucidesc"
+msgid "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a collection of free Lua software including an <abbr title=\"Model-View-Controller\">MVC</abbr>-Webframework and webinterface for embedded devices. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is licensed under the Apache-License."
 msgstr ""
 
 #. Project Homepage
 #: i18n/english/luasrc/i18n/admin-core.en.lua:5
-msgid "c_projecthome"
+msgid "Project Homepage"
 msgstr "项目主页"
 
 #. Lead Development
 #: i18n/english/luasrc/i18n/admin-core.en.lua:6
-msgid "c_leaddev"
+msgid "Lead Development"
 msgstr "开发主管"
 
 #. Contributing Developers
 #: i18n/english/luasrc/i18n/admin-core.en.lua:7
-msgid "c_contributors"
+msgid "Contributing Developers"
 msgstr "开发贡献者"
 
 #. Thanks To
 #: i18n/english/luasrc/i18n/admin-core.en.lua:8
-msgid "c_thanksto"
+msgid "Thanks To"
 msgstr "感谢"
 
 #. Hello!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:9
-msgid "a_i_i_hello"
+msgid "Hello!"
 msgstr "你好!"
 
 #. This is the administration area of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:10
-msgid "a_i_i_admin1"
+msgid "This is the administration area of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>."
 msgstr "这是LuCI的管理界面"
 
 #. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a free, flexible, and user friendly graphical interface for configuring OpenWrt Kamikaze.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:11
-msgid "a_i_i_admin2"
+msgid "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a free, flexible, and user friendly graphical interface for configuring OpenWrt Kamikaze."
 msgstr ""
 
 #. On the following pages you can adjust all important settings of your router.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:12
-msgid "a_i_i_admin3"
+msgid "On the following pages you can adjust all important settings of your router."
 msgstr "你可以在以下的页面修改路由器的所有重要参数."
 
 #. Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> changes have to be confirmed by clicking Changes - Save &amp; Apply before being applied.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:13
-msgid "a_i_i_admin4"
+msgid "Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> changes have to be confirmed by clicking Changes - Save & Apply before being applied."
 msgstr ""
 
 #. As we always want to improve this interface we are looking forward to your feedback and suggestions.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:14
-msgid "a_i_i_admin5"
+msgid "As we always want to improve this interface we are looking forward to your feedback and suggestions."
 msgstr ""
 
 #. And now have fun with your router!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:15
-msgid "a_i_i_admin6"
+msgid "And now have fun with your router!"
 msgstr ""
 
 #. The <abbr title=\"Lua Configuration Interface\">LuCI</abbr> Team
 #: i18n/english/luasrc/i18n/admin-core.en.lua:16
-msgid "a_i_i_team"
+msgid "The <abbr title=\"Lua Configuration Interface\">LuCI</abbr> Team"
 msgstr "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> 开发组"
 
 #. Here you can customize the settings and the functionality of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:17
-msgid "a_i_luci1"
+msgid "Here you can customize the settings and the functionality of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>."
 msgstr ""
 "在这里你可以自定义<abbr title=\"Lua Configuration Interface\">LuCI</abbr>的信息设置和功能配置"
 
 #. Post-commit actions
 #: i18n/english/luasrc/i18n/admin-core.en.lua:18
-msgid "a_i_ucicommit"
+msgid "Post-commit actions"
 msgstr "提交操作"
 
 #. These commands will be executed automatically when a given <abbr title=\"Unified Configuration Interface\">UCI</abbr> configuration is committed allowing changes to be applied instantly.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:19
-msgid "a_i_ucicommit1"
+msgid "These commands will be executed automatically when a given <abbr title=\"Unified Configuration Interface\">UCI</abbr> configuration is committed allowing changes to be applied instantly."
 msgstr ""
 
 #. Files to be kept when flashing a new firmware
 #: i18n/english/luasrc/i18n/admin-core.en.lua:20
-msgid "a_i_keepflash"
+msgid "Files to be kept when flashing a new firmware"
 msgstr "在升级新的firmware时要保留的文件"
 
 #. When flashing a new firmware with <abbr title=\"Lua Configuration Interface\">LuCI</abbr> these files will be added to the new firmware installation.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:21
-msgid "a_i_keepflash1"
+msgid "When flashing a new firmware with <abbr title=\"Lua Configuration Interface\">LuCI</abbr> these files will be added to the new firmware installation."
 msgstr ""
 "使用<abbr title=\"Lua Configuration "
 "Interface\">LuCI</abbr>升级新的firmware时这些文件将会添加到新安装的firmware里"
 
 #. Here you can find information about the current system status like <abbr title=\"Central Processing Unit\">CPU</abbr> clock frequency, memory usage or network interface data.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:22
-msgid "a_st_i_status1"
+msgid "Here you can find information about the current system status like <abbr title=\"Central Processing Unit\">CPU</abbr> clock frequency, memory usage or network interface data."
 msgstr ""
 "你可以在这里查看当前的系统信息,例如<abbr title=\"Central Processing "
 "Unit\">CPU</abbr>频率、内存使用率和网络接口信息等。"
 
 #. Also kernel or service logfiles can be viewed here to get an overview over their current state.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:23
-msgid "a_st_i_status2"
+msgid "Also kernel or service logfiles can be viewed here to get an overview over their current state."
 msgstr ""
 
 #. <abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan
 #: i18n/english/luasrc/i18n/admin-core.en.lua:24
-msgid "iwscan"
+msgid "<abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan"
 msgstr "搜索无线网络(<abbr title=\"Wireless Local Area Network\">WLAN</abbr>)"
 
 #. Wifi networks in your local environment
 #: i18n/english/luasrc/i18n/admin-core.en.lua:25
-msgid "iwscan1"
+msgid "Wifi networks in your local environment"
 msgstr "本地连接的wifi网络"
 
 #. <abbr title=\"Encrypted\">Encr.</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:26
-msgid "iwscan_encr"
+msgid "<abbr title=\"Encrypted\">Encr.</abbr>"
 msgstr "加密"
 
 #. Link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:27
-msgid "iwscan_link"
+msgid "Link"
 msgstr "连接"
 
 #. Signal
 #: i18n/english/luasrc/i18n/admin-core.en.lua:28
-msgid "iwscan_signal"
+msgid "Signal"
 msgstr "信号"
 
 #. Noise
 #: i18n/english/luasrc/i18n/admin-core.en.lua:29
-msgid "iwscan_noise"
+msgid "Noise"
 msgstr "噪音"
 
 #. Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:30
-msgid "routes"
+msgid "Routes"
 msgstr "路由"
 
 #. Netmask
 #: i18n/english/luasrc/i18n/admin-core.en.lua:31
-msgid "routes_netmask"
+msgid "Netmask"
 msgstr "子网掩码"
 
 #. Gateway
 #: i18n/english/luasrc/i18n/admin-core.en.lua:32
-msgid "routes_gateway"
+msgid "Gateway"
 msgstr "网关"
 
 #. Metric
 #: i18n/english/luasrc/i18n/admin-core.en.lua:33
-msgid "routes_metric"
+msgid "Metric"
 msgstr "Metric"
 
 #. Here you can configure the basic aspects of your device like its hostname or the timezone.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:34
-msgid "a_s_desc"
+msgid "Here you can configure the basic aspects of your device like its hostname or the timezone."
 msgstr "在这里可以设置设备的初始配置,如主机名或者时区"
 
 #. Software
 #: i18n/english/luasrc/i18n/admin-core.en.lua:35
-msgid "a_s_packages"
+msgid "Software"
 msgstr "软件"
 
 #. Admin Password
 #: i18n/english/luasrc/i18n/admin-core.en.lua:36
-msgid "a_s_changepw"
+msgid "Admin Password"
 msgstr "管理员密码"
 
 #. OPKG-Configuration
 #: i18n/english/luasrc/i18n/admin-core.en.lua:37
-msgid "a_s_p_ipkg"
+msgid "OPKG-Configuration"
 msgstr "OPKG包管理配置"
 
 #. <abbr title=\"Secure Shell\">SSH</abbr>-Keys
 #: i18n/english/luasrc/i18n/admin-core.en.lua:38
-msgid "a_s_sshkeys"
+msgid "<abbr title=\"Secure Shell\">SSH</abbr>-Keys"
 msgstr "<abbr title=\"Secure Shell\">SSH</abbr>-密钥"
 
 #. Mount Points
 #: i18n/english/luasrc/i18n/admin-core.en.lua:39
-msgid "a_s_fstab"
+msgid "Mount Points"
 msgstr "挂接点"
 
 #. Change settings related to the system itself, its identification, installed hard- and software, authentication or mount points.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:40
-msgid "a_s_i_system1"
+msgid "Change settings related to the system itself, its identification, installed hard- and software, authentication or mount points."
 msgstr ""
 
 #. These settings define the base of your system.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:41
-msgid "a_s_i_system2"
+msgid "These settings define the base of your system."
 msgstr ""
 
 #. Pay attention as any misconfiguration here may prevent your device from booting or may lock yourself out of it.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:42
-msgid "a_s_i_system3"
+msgid "Pay attention as any misconfiguration here may prevent your device from booting or may lock yourself out of it."
 msgstr ""
 
 #. Interfaces
 #: i18n/english/luasrc/i18n/admin-core.en.lua:43
-msgid "a_s_if"
+msgid "Interfaces"
 msgstr "接口"
 
 #. Bridge
 #: i18n/english/luasrc/i18n/admin-core.en.lua:44
-msgid "a_s_if_bridge"
+msgid "Bridge"
 msgstr "网桥"
 
 #. ID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:45
-msgid "a_s_if_bridge_id"
+msgid "ID"
 msgstr "ID"
 
 #. Bridge Port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:46
-msgid "a_s_if_bridge_port"
+msgid "Bridge Port"
 msgstr "桥接口"
 
 #. STP
 #: i18n/english/luasrc/i18n/admin-core.en.lua:47
-msgid "a_s_if_bridge_stp"
+msgid "STP"
 msgstr "STP"
 
 #. Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:48
-msgid "a_s_if_device"
+msgid "Device"
 msgstr "设备"
 
 #. Ethernet Bridge
 #: i18n/english/luasrc/i18n/admin-core.en.lua:49
-msgid "a_s_if_ethbridge"
+msgid "Ethernet Bridge"
 msgstr "以太桥"
 
 #. Ethernet Adapter
 #: i18n/english/luasrc/i18n/admin-core.en.lua:50
-msgid "a_s_if_ethdev"
+msgid "Ethernet Adapter"
 msgstr "以太接口卡"
 
 #. Ethernet Switch
 #: i18n/english/luasrc/i18n/admin-core.en.lua:51
-msgid "a_s_if_ethswitch"
+msgid "Ethernet Switch"
 msgstr "以太交换机"
 
 #. Interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:52
-msgid "a_s_if_interface"
+msgid "Interface"
 msgstr "接口"
 
 #. IP Configuration
 #: i18n/english/luasrc/i18n/admin-core.en.lua:53
-msgid "a_s_if_ipconfig"
+msgid "IP Configuration"
 msgstr "IP配置"
 
 #. Alias
 #: i18n/english/luasrc/i18n/admin-core.en.lua:54
-msgid "a_s_if_ipconfig_alias"
+msgid "Alias"
 msgstr "别名"
 
 #. DHCP assigned
 #: i18n/english/luasrc/i18n/admin-core.en.lua:55
-msgid "a_s_if_ipconfig_dhcp"
+msgid "DHCP assigned"
 msgstr "DHCP已分配节点"
 
 #. IPv6
 #: i18n/english/luasrc/i18n/admin-core.en.lua:56
-msgid "a_s_if_ipconfig_ipv6"
+msgid "IPv6"
 msgstr "IPv6"
 
 #. Not configured
 #: i18n/english/luasrc/i18n/admin-core.en.lua:57
-msgid "a_s_if_ipconfig_none"
+msgid "Not configured"
 msgstr "未配置"
 
 #. Primary
 #: i18n/english/luasrc/i18n/admin-core.en.lua:58
-msgid "a_s_if_ipconfig_primary"
+msgid "Primary"
 msgstr "主要"
 
 #. Channel
 #: i18n/english/luasrc/i18n/admin-core.en.lua:59
-msgid "a_s_if_iwchannel"
+msgid "Channel"
 msgstr "通道"
 
 #. Mode
 #: i18n/english/luasrc/i18n/admin-core.en.lua:60
-msgid "a_s_if_iwmode"
+msgid "Mode"
 msgstr "模式(Mode)"
 
 #. Ad-Hoc
 #: i18n/english/luasrc/i18n/admin-core.en.lua:61
-msgid "a_s_if_iwmode_adhoc"
+msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
 #. Pseudo Ad-Hoc
 #: i18n/english/luasrc/i18n/admin-core.en.lua:62
-msgid "a_s_if_iwmode_ahdemo"
+msgid "Pseudo Ad-Hoc"
 msgstr "Pseudo Ad-Hoc"
 
 #. Master
 #: i18n/english/luasrc/i18n/admin-core.en.lua:63
-msgid "a_s_if_iwmode_ap"
+msgid "Master"
 msgstr "Master"
 
 #. Master + WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:64
-msgid "a_s_if_iwmode_apwds"
+msgid "Master + WDS"
 msgstr "Master + WDS"
 
 #. Client
 #: i18n/english/luasrc/i18n/admin-core.en.lua:65
-msgid "a_s_if_iwmode_sta"
+msgid "Client"
 msgstr "客户端"
 
 #. Client + WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:66
-msgid "a_s_if_iwmode_stawds"
+msgid "Client + WDS"
 msgstr "Client + WDS"
 
 #. WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:67
-msgid "a_s_if_iwmode_wds"
+msgid "WDS"
 msgstr "WDS"
 
 #. SSID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:68
-msgid "a_s_if_iwssid"
+msgid "SSID"
 msgstr "SSID"
 
 #. MAC
 #: i18n/english/luasrc/i18n/admin-core.en.lua:69
-msgid "a_s_if_mac"
+msgid "MAC"
 msgstr "MAC"
 
 #. Pkts.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:70
-msgid "a_s_if_pkts"
+msgid "Pkts."
 msgstr "Pkts."
 
 #. Interface Status
 #: i18n/english/luasrc/i18n/admin-core.en.lua:71
-msgid "a_s_if_status"
+msgid "Interface Status"
 msgstr "接口状态"
 
 #. Transfer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:72
-msgid "a_s_if_transfer"
+msgid "Transfer"
 msgstr "转发"
 
 #. RX
 #: i18n/english/luasrc/i18n/admin-core.en.lua:73
-msgid "a_s_if_transfer_rx"
+msgid "RX"
 msgstr "接收"
 
 #. TX
 #: i18n/english/luasrc/i18n/admin-core.en.lua:74
-msgid "a_s_if_transfer_tx"
+msgid "TX"
 msgstr "发送"
 
 #. Type
 #: i18n/english/luasrc/i18n/admin-core.en.lua:75
-msgid "a_s_if_type"
+msgid "Type"
 msgstr "Type"
 
 #. VLAN
 #: i18n/english/luasrc/i18n/admin-core.en.lua:76
-msgid "a_s_if_vlan"
+msgid "VLAN"
 msgstr "VLAN"
 
 #. Ports
 #: i18n/english/luasrc/i18n/admin-core.en.lua:77
-msgid "a_s_if_vlanports"
+msgid "Ports"
 msgstr "端口"
 
 #. Wireless Adapter
 #: i18n/english/luasrc/i18n/admin-core.en.lua:78
-msgid "a_s_if_wifidev"
+msgid "Wireless Adapter"
 msgstr "无线网卡"
 
 #. Firewall
 #: i18n/english/luasrc/i18n/admin-core.en.lua:79
-msgid "a_s_ipt"
+msgid "Firewall"
 msgstr "防火墙"
 
 #. Actions
 #: i18n/english/luasrc/i18n/admin-core.en.lua:80
-msgid "a_s_ipt_actions"
+msgid "Actions"
 msgstr "动作"
 
 #. Traffic
 #: i18n/english/luasrc/i18n/admin-core.en.lua:81
-msgid "a_s_ipt_bytes"
+msgid "Traffic"
 msgstr "Traffic"
 
 #. Chain
 #: i18n/english/luasrc/i18n/admin-core.en.lua:82
-msgid "a_s_ipt_chain"
+msgid "Chain"
 msgstr "Chain"
 
 #. Destination
 #: i18n/english/luasrc/i18n/admin-core.en.lua:83
-msgid "a_s_ipt_destination"
+msgid "Destination"
 msgstr "Destination"
 
 #. Flags
 #: i18n/english/luasrc/i18n/admin-core.en.lua:84
-msgid "a_s_ipt_flags"
+msgid "Flags"
 msgstr "标志"
 
 #. In
 #: i18n/english/luasrc/i18n/admin-core.en.lua:85
-msgid "a_s_ipt_inputif"
+msgid "In"
 msgstr ""
 
 #. No chains in this table
 #: i18n/english/luasrc/i18n/admin-core.en.lua:86
-msgid "a_s_ipt_nochains"
+msgid "No chains in this table"
 msgstr ""
 
 #. No Rules in this chain
 #: i18n/english/luasrc/i18n/admin-core.en.lua:87
-msgid "a_s_ipt_norules"
+msgid "No Rules in this chain"
 msgstr ""
 
 #. Options
 #: i18n/english/luasrc/i18n/admin-core.en.lua:88
-msgid "a_s_ipt_options"
+msgid "Options"
 msgstr "操作"
 
 #. Out
 #: i18n/english/luasrc/i18n/admin-core.en.lua:89
-msgid "a_s_ipt_outputif"
+msgid "Out"
 msgstr ""
 
 #. Packets
 #: i18n/english/luasrc/i18n/admin-core.en.lua:90
-msgid "a_s_ipt_packets"
+msgid "Packets"
 msgstr "包"
 
 #. Pkts.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:91
-msgid "a_s_ipt_pkts"
+msgid "Pkts."
 msgstr ""
 
 #. Policy
 #: i18n/english/luasrc/i18n/admin-core.en.lua:92
-msgid "a_s_ipt_policy"
+msgid "Policy"
 msgstr "策略"
 
 #. Prot.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:93
-msgid "a_s_ipt_prot"
+msgid "Prot."
 msgstr ""
 
 #. References
 #: i18n/english/luasrc/i18n/admin-core.en.lua:94
-msgid "a_s_ipt_references"
+msgid "References"
 msgstr "参考"
 
 #. Reset Counters
 #: i18n/english/luasrc/i18n/admin-core.en.lua:95
-msgid "a_s_ipt_reset"
+msgid "Reset Counters"
 msgstr ""
 
 #. Restart Firewall
 #: i18n/english/luasrc/i18n/admin-core.en.lua:96
-msgid "a_s_ipt_restart"
+msgid "Restart Firewall"
 msgstr "重启防火墙"
 
 #. #
 #: i18n/english/luasrc/i18n/admin-core.en.lua:97
-msgid "a_s_ipt_rulenum"
+msgid "#"
 msgstr "#"
 
 #. Source
 #: i18n/english/luasrc/i18n/admin-core.en.lua:98
-msgid "a_s_ipt_source"
+msgid "Source"
 msgstr ""
 
 #. Firewall Status
 #: i18n/english/luasrc/i18n/admin-core.en.lua:99
-msgid "a_s_ipt_status"
+msgid "Firewall Status"
 msgstr "防火墙状态"
 
 #. Table
 #: i18n/english/luasrc/i18n/admin-core.en.lua:100
-msgid "a_s_ipt_table"
+msgid "Table"
 msgstr "列表"
 
 #. Target
 #: i18n/english/luasrc/i18n/admin-core.en.lua:101
-msgid "a_s_ipt_target"
+msgid "Target"
 msgstr ""
 
 #. Perform Actions
 #: i18n/english/luasrc/i18n/admin-core.en.lua:102
-msgid "a_s_packages_do"
+msgid "Perform Actions"
 msgstr ""
 
 #. Install
 #: i18n/english/luasrc/i18n/admin-core.en.lua:103
-msgid "a_s_packages_install"
+msgid "Install"
 msgstr "安装"
 
 #. Download and install package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:104
-msgid "a_s_packages_installurl"
+msgid "Download and install package"
 msgstr "下载并安装软件包"
 
 #. Edit package lists and installation targets
 #: i18n/english/luasrc/i18n/admin-core.en.lua:105
-msgid "a_s_packages_ipkg"
+msgid "Edit package lists and installation targets"
 msgstr ""
 
 #. Package name
 #: i18n/english/luasrc/i18n/admin-core.en.lua:106
-msgid "a_s_packages_name"
+msgid "Package name"
 msgstr "包名"
 
 #. Remove
 #: i18n/english/luasrc/i18n/admin-core.en.lua:107
-msgid "a_s_packages_remove"
+msgid "Remove"
 msgstr "移除"
 
 #. Find package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:108
-msgid "a_s_packages_search"
+msgid "Find package"
 msgstr "搜索数据包"
 
 #. Package lists updated
 #: i18n/english/luasrc/i18n/admin-core.en.lua:109
-msgid "a_s_packages_update"
+msgid "Package lists updated"
 msgstr "新数据包列表"
 
 #. Update package lists
 #: i18n/english/luasrc/i18n/admin-core.en.lua:110
-msgid "a_s_packages_updatelist"
+msgid "Update package lists"
 msgstr "更新数据包列表"
 
 #. Upgrade installed packages
 #: i18n/english/luasrc/i18n/admin-core.en.lua:111
-msgid "a_s_packages_upgrade"
+msgid "Upgrade installed packages"
 msgstr ""
 
 #. Could not set default destination
 #: i18n/english/luasrc/i18n/admin-core.en.lua:112
-msgid "a_s_packages_code1"
+msgid "Could not set default destination"
 msgstr ""
 
 #. Error parsing config file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:113
-msgid "a_s_packages_code2"
+msgid "Error parsing config file"
 msgstr ""
 
 #. Could not create temporary directory (ran out of space?)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:114
-msgid "a_s_packages_code3"
+msgid "Could not create temporary directory (ran out of space?)"
 msgstr ""
 
 #. Could not get adminstrative lock (ran out of space?)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:115
-msgid "a_s_packages_code4"
+msgid "Could not get adminstrative lock (ran out of space?)"
 msgstr ""
 
 #. Unsatisfied Dependencies
 #: i18n/english/luasrc/i18n/admin-core.en.lua:116
-msgid "a_s_packages_code5"
+msgid "Unsatisfied Dependencies"
 msgstr ""
 
 #. Refused to remove essential package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:117
-msgid "a_s_packages_code6"
+msgid "Refused to remove essential package"
 msgstr ""
 
 #. Package has dependents
 #: i18n/english/luasrc/i18n/admin-core.en.lua:118
-msgid "a_s_packages_code7"
+msgid "Package has dependents"
 msgstr ""
 
 #. Package has no installation candidate (wrong name?)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:119
-msgid "a_s_packages_code8"
+msgid "Package has no installation candidate (wrong name?)"
 msgstr ""
 
 #. Package has no available architecture 
 #: i18n/english/luasrc/i18n/admin-core.en.lua:120
-msgid "a_s_packages_code9"
+msgid "Package has no available architecture "
 msgstr ""
 
 #. Package is not trusted
 #: i18n/english/luasrc/i18n/admin-core.en.lua:121
-msgid "a_s_packages_code10"
+msgid "Package is not trusted"
 msgstr ""
 
 #. Error while downloading
 #: i18n/english/luasrc/i18n/admin-core.en.lua:122
-msgid "a_s_packages_code11"
+msgid "Error while downloading"
 msgstr "下载错误"
 
 #. Conflicts with other packages
 #: i18n/english/luasrc/i18n/admin-core.en.lua:123
-msgid "a_s_packages_code12"
+msgid "Conflicts with other packages"
 msgstr ""
 
 #. Package is already installed
 #: i18n/english/luasrc/i18n/admin-core.en.lua:124
-msgid "a_s_packages_code13"
+msgid "Package is already installed"
 msgstr "数据包已安装完毕"
 
 #. Package has unresolved dependencies
 #: i18n/english/luasrc/i18n/admin-core.en.lua:125
-msgid "a_s_packages_code14"
+msgid "Package has unresolved dependencies"
 msgstr ""
 
 #. Refused to downgrade package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:126
-msgid "a_s_packages_code15"
+msgid "Refused to downgrade package"
 msgstr ""
 
 #. Package manager ran out of space
 #: i18n/english/luasrc/i18n/admin-core.en.lua:127
-msgid "a_s_packages_code16"
+msgid "Package manager ran out of space"
 msgstr ""
 
 #. Bad signature while verifiying package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:128
-msgid "a_s_packages_code17"
+msgid "Bad signature while verifiying package"
 msgstr ""
 
 #. MD5 error while verifiying package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:129
-msgid "a_s_packages_code18"
+msgid "MD5 error while verifiying package"
 msgstr ""
 
 #. Internal error occured
 #: i18n/english/luasrc/i18n/admin-core.en.lua:130
-msgid "a_s_packages_code19"
+msgid "Internal error occured"
 msgstr ""
 
 #. Package lists
 #: i18n/english/luasrc/i18n/admin-core.en.lua:131
-msgid "a_s_p_ipkg_pkglists"
+msgid "Package lists"
 msgstr "数据包列表"
 
 #. Installation targets
 #: i18n/english/luasrc/i18n/admin-core.en.lua:132
-msgid "a_s_p_ipkg_targets"
+msgid "Installation targets"
 msgstr ""
 
 #. Change the password of the system administrator (User <code>root</code>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:133
-msgid "a_s_changepw1"
+msgid "Change the password of the system administrator (User <code>root</code>)"
 msgstr "修改系统管理员密码(用户<code>root</code>)"
 
 #. Password successfully changed
 #: i18n/english/luasrc/i18n/admin-core.en.lua:134
-msgid "a_s_changepw_changed"
+msgid "Password successfully changed"
 msgstr "密码更新成功"
 
 #. Error: Passwords do not match
 #: i18n/english/luasrc/i18n/admin-core.en.lua:135
-msgid "a_s_changepw_nomatch"
+msgid "Error: Passwords do not match"
 msgstr "错误：输入的密码不匹配"
 
 #. Here you can paste public <abbr title=\"Secure Shell\">SSH</abbr>-Keys (one per line) for <abbr title=\"Secure Shell\">SSH</abbr> public-key authentication.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:136
-msgid "a_s_sshkeys1"
+msgid "Here you can paste public <abbr title=\"Secure Shell\">SSH</abbr>-Keys (one per line) for <abbr title=\"Secure Shell\">SSH</abbr> public-key authentication."
 msgstr ""
 
 #. Mount Points
 #: i18n/english/luasrc/i18n/admin-core.en.lua:137
-msgid "a_s_fstab_mountpoints"
+msgid "Mount Points"
 msgstr ""
 
 #. Mount Points define at which point a memory device will be attached to the filesystem
 #: i18n/english/luasrc/i18n/admin-core.en.lua:138
-msgid "a_s_fstab_mountpoints1"
+msgid "Mount Points define at which point a memory device will be attached to the filesystem"
 msgstr ""
 
 #. Mounted file systems
 #: i18n/english/luasrc/i18n/admin-core.en.lua:139
-msgid "a_s_fstab_active"
+msgid "Mounted file systems"
 msgstr ""
 
 #. Used
 #: i18n/english/luasrc/i18n/admin-core.en.lua:140
-msgid "a_s_fstab_used"
+msgid "Used"
 msgstr ""
 
 #. Available
 #: i18n/english/luasrc/i18n/admin-core.en.lua:141
-msgid "a_s_fstab_avail"
+msgid "Available"
 msgstr ""
 
 #. Mount Point
 #: i18n/english/luasrc/i18n/admin-core.en.lua:142
-msgid "a_s_fstab_mountpoint"
+msgid "Mount Point"
 msgstr ""
 
 #. The device file of the memory or partition (<abbr title=\"for example\">e.g.</abbr> <code>/dev/sda1</code>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:143
-msgid "a_s_fstab_device1"
+msgid "The device file of the memory or partition (<abbr title=\"for example\">e.g.</abbr> <code>/dev/sda1</code>)"
 msgstr ""
 
 #. The filesystem that was used to format the memory (<abbr title=\"for example\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></samp>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:144
-msgid "a_s_fstab_fs1"
+msgid "The filesystem that was used to format the memory (<abbr title=\"for example\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></samp>)"
 msgstr ""
 
 #. If your physical memory is insufficient unused data can be temporarily swapped to a swap-device resulting in a higher amount of usable <abbr title=\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very slow process as the swap-device cannot be accessed with the high datarates of the <abbr title=\"Random Access Memory\">RAM</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:145
-msgid "a_s_fstab_swap1"
+msgid "If your physical memory is insufficient unused data can be temporarily swapped to a swap-device resulting in a higher amount of usable <abbr title=\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very slow process as the swap-device cannot be accessed with the high datarates of the <abbr title=\"Random Access Memory\">RAM</abbr>."
 msgstr ""
 
 #. Reboots the operating system of your device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:146
-msgid "a_s_reboot1"
+msgid "Reboots the operating system of your device"
 msgstr ""
 
 #. Perform reboot
 #: i18n/english/luasrc/i18n/admin-core.en.lua:147
-msgid "a_s_reboot_do"
+msgid "Perform reboot"
 msgstr ""
 
 #. Please wait: Device rebooting...
 #: i18n/english/luasrc/i18n/admin-core.en.lua:148
-msgid "a_s_reboot_running"
+msgid "Please wait: Device rebooting..."
 msgstr "请等待：设备正在重启中…"
 
 #. Warning: There are unsaved changes that will be lost while rebooting!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:149
-msgid "a_s_reboot_u"
+msgid "Warning: There are unsaved changes that will be lost while rebooting!"
 msgstr ""
 
 #. Changes applied.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:150
-msgid "a_s_applyreboot1"
+msgid "Changes applied."
 msgstr ""
 
 #. Backup / Restore
 #: i18n/english/luasrc/i18n/admin-core.en.lua:151
-msgid "a_s_backup"
+msgid "Backup / Restore"
 msgstr "备份/另存为"
 
 #. Create backup
 #: i18n/english/luasrc/i18n/admin-core.en.lua:152
-msgid "a_s_backup_backup"
+msgid "Create backup"
 msgstr "创建备份"
 
 #. Backup Archive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:153
-msgid "a_s_backup_archive"
+msgid "Backup Archive"
 msgstr ""
 
 #. Reset router to defaults
 #: i18n/english/luasrc/i18n/admin-core.en.lua:154
-msgid "a_s_backup_reset"
+msgid "Reset router to defaults"
 msgstr ""
 
 #. Proceed reverting all settings and resetting to firmware defaults?
 #: i18n/english/luasrc/i18n/admin-core.en.lua:155
-msgid "a_s_backup_reset1"
+msgid "Proceed reverting all settings and resetting to firmware defaults?"
 msgstr ""
 
 #. Restore backup
 #: i18n/english/luasrc/i18n/admin-core.en.lua:156
-msgid "a_s_backup_restore"
+msgid "Restore backup"
 msgstr ""
 
 #. Here you can backup and restore your router configuration and - if possible - reset the router to the default settings.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:157
-msgid "a_s_backup1"
+msgid "Here you can backup and restore your router configuration and - if possible - reset the router to the default settings."
 msgstr ""
 
 #. <abbr title=\"Hypertext Transfer Protocol\">HTTP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:158
-msgid "a_srv_http"
+msgid "<abbr title=\"Hypertext Transfer Protocol\">HTTP</abbr>-Server"
 msgstr ""
 
 #. <abbr title=\"Secure Shell\">SSH</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:159
-msgid "a_srv_ssh"
+msgid "<abbr title=\"Secure Shell\">SSH</abbr>-Server"
 msgstr ""
 
 #. Services and daemons perform certain tasks on your device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:160
-msgid "a_srv_services1"
+msgid "Services and daemons perform certain tasks on your device."
 msgstr ""
 
 #. Most of them are network servers, that offer a certain service for your device or network like shell access, serving webpages like <abbr title=\"Lua Configuration Interface\">LuCI</abbr>, doing mesh routing, sending e-mails, ...
 #: i18n/english/luasrc/i18n/admin-core.en.lua:161
-msgid "a_srv_services2"
+msgid "Most of them are network servers, that offer a certain service for your device or network like shell access, serving webpages like <abbr title=\"Lua Configuration Interface\">LuCI</abbr>, doing mesh routing, sending e-mails, ..."
 msgstr ""
 
 #. A small webserver which can be used to serve <abbr title=\"Lua Configuration Interface\">LuCI</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:162
-msgid "a_srv_http1"
+msgid "A small webserver which can be used to serve <abbr title=\"Lua Configuration Interface\">LuCI</abbr>."
 msgstr ""
 
 #. Authentication Realm
 #: i18n/english/luasrc/i18n/admin-core.en.lua:163
-msgid "a_srv_http_authrealm"
+msgid "Authentication Realm"
 msgstr ""
 
 #. The realm which will be displayed at the authentication prompt for protected pages.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:164
-msgid "a_srv_http_authrealm1"
+msgid "The realm which will be displayed at the authentication prompt for protected pages."
 msgstr ""
 
 #. defaults to <code>/etc/httpd.conf</code>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:165
-msgid "a_srv_http_config1"
+msgid "defaults to <code>/etc/httpd.conf</code>"
 msgstr ""
 
 #. Document root
 #: i18n/english/luasrc/i18n/admin-core.en.lua:166
-msgid "a_srv_http_root"
+msgid "Document root"
 msgstr ""
 
 #. Enable Keep-Alive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:167
-msgid "a_srv_http_keepalive"
+msgid "Enable Keep-Alive"
 msgstr ""
 
 #. Connection timeout
 #: i18n/english/luasrc/i18n/admin-core.en.lua:168
-msgid "a_srv_http_timeout"
+msgid "Connection timeout"
 msgstr ""
 
 #. Plugin path
 #: i18n/english/luasrc/i18n/admin-core.en.lua:169
-msgid "a_srv_http_path"
+msgid "Plugin path"
 msgstr ""
 
 #. A lightweight HTTP/1.1 webserver written in C and Lua designed to serve LuCI
 #: i18n/english/luasrc/i18n/admin-core.en.lua:170
-msgid "a_srv_lucittpd"
+msgid "A lightweight HTTP/1.1 webserver written in C and Lua designed to serve LuCI"
 msgstr ""
 
 #. Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:171
-msgid "a_srv_dropbear1"
+msgid "Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
 msgstr ""
 
 #. Password authentication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:172
-msgid "a_srv_d_pwauth"
+msgid "Password authentication"
 msgstr ""
 
 #. Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:173
-msgid "a_srv_d_pwauth1"
+msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
 msgstr ""
 
 #. Channel
 #: i18n/english/luasrc/i18n/admin-core.en.lua:174
-msgid "a_w_channel"
+msgid "Channel"
 msgstr ""
 
 #. On this pages you can find configuration options for <abbr title=\"Wireless Local Area Network\">WLAN</abbr> based wireless networks.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:175
-msgid "a_w_wifi1"
+msgid "On this pages you can find configuration options for <abbr title=\"Wireless Local Area Network\">WLAN</abbr> based wireless networks."
 msgstr ""
 
 #. You can easily integrate your 802.11a/b/g/n-devices into your physical network and use the virtual adapter support to build wireless repeaters or offer several networks with one device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:176
-msgid "a_w_wifi2"
+msgid "You can easily integrate your 802.11a/b/g/n-devices into your physical network and use the virtual adapter support to build wireless repeaters or offer several networks with one device."
 msgstr ""
 
 #. There is support for Managed, Client, Ad-Hoc and <abbr title=\"Wireless Distribution System\">WDS</abbr> operating modes as well as <abbr title=\"Wi-Fi Protected Access\">WPA</abbr> and <abbr title=\"Wi-Fi Protected Access 2\">WPA2</abbr> encryption for secure communnication.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:177
-msgid "a_w_wifi3"
+msgid "There is support for Managed, Client, Ad-Hoc and <abbr title=\"Wireless Distribution System\">WDS</abbr> operating modes as well as <abbr title=\"Wi-Fi Protected Access\">WPA</abbr> and <abbr title=\"Wi-Fi Protected Access 2\">WPA2</abbr> encryption for secure communnication."
 msgstr ""
 
 #. Here you can configure installed wifi devices.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:178
-msgid "a_w_devices1"
+msgid "Here you can configure installed wifi devices."
 msgstr ""
 
 #. Transmit Antenna
 #: i18n/english/luasrc/i18n/admin-core.en.lua:179
-msgid "a_w_txantenna"
+msgid "Transmit Antenna"
 msgstr ""
 
 #. Receive Antenna
 #: i18n/english/luasrc/i18n/admin-core.en.lua:180
-msgid "a_w_rxantenna"
+msgid "Receive Antenna"
 msgstr ""
 
 #. Distance to furthest station (in meter)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:181
-msgid "a_w_distance1"
+msgid "Distance to furthest station (in meter)"
 msgstr ""
 
 #. Diversity
 #: i18n/english/luasrc/i18n/admin-core.en.lua:182
-msgid "a_w_diversity"
+msgid "Diversity"
 msgstr ""
 
 #. Country Code
 #: i18n/english/luasrc/i18n/admin-core.en.lua:183
-msgid "a_w_countrycode"
+msgid "Country Code"
 msgstr ""
 
 #. Connection Limit
 #: i18n/english/luasrc/i18n/admin-core.en.lua:184
-msgid "a_w_connlimit"
+msgid "Connection Limit"
 msgstr ""
 
 #. You can run several wifi networks with one device. Be aware that there are certain hardware and driverspecific restrictions. Normally you can operate 1 Ad-Hoc or up to 3 Master-Mode and 1 Client-Mode network simultaneously.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:185
-msgid "a_w_networks1"
+msgid "You can run several wifi networks with one device. Be aware that there are certain hardware and driverspecific restrictions. Normally you can operate 1 Ad-Hoc or up to 3 Master-Mode and 1 Client-Mode network simultaneously."
 msgstr ""
 
 #. Network Name (<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:186
-msgid "a_w_netid"
+msgid "Network Name (<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>)"
 msgstr ""
 
 #. Add the Wifi network to physical network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:187
-msgid "a_w_network1"
+msgid "Add the Wifi network to physical network"
 msgstr ""
 
 #.  - Create new Network - 
 #: i18n/english/luasrc/i18n/admin-core.en.lua:188
-msgid "a_w_netmanual"
+msgid " - Create new Network - "
 msgstr ""
 
 #. Transmit Power
 #: i18n/english/luasrc/i18n/admin-core.en.lua:189
-msgid "a_w_txpwr"
+msgid "Transmit Power"
 msgstr ""
 
 #. Broadcom Frameburst
 #: i18n/english/luasrc/i18n/admin-core.en.lua:190
-msgid "a_w_brcmburst"
+msgid "Broadcom Frameburst"
 msgstr ""
 
 #. Atheros Frameburst
 #: i18n/english/luasrc/i18n/admin-core.en.lua:191
-msgid "a_w_athburst"
+msgid "Atheros Frameburst"
 msgstr ""
 
 #. RadiusServer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:192
-msgid "a_w_radiussrv"
+msgid "RadiusServer"
 msgstr ""
 
 #. Radius-Port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:193
-msgid "a_w_radiusport"
+msgid "Radius-Port"
 msgstr ""
 
 #. AP-Isolation
 #: i18n/english/luasrc/i18n/admin-core.en.lua:194
-msgid "a_w_apisolation"
+msgid "AP-Isolation"
 msgstr ""
 
 #. Prevents Client to Client communication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:195
-msgid "a_w_apisolation1"
+msgid "Prevents Client to Client communication"
 msgstr ""
 
 #. Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:196
-msgid "a_w_hideessid"
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 
 #. Access Point
 #: i18n/english/luasrc/i18n/admin-core.en.lua:197
-msgid "a_w_ap"
+msgid "Access Point"
 msgstr ""
 
 #. Ad-Hoc
 #: i18n/english/luasrc/i18n/admin-core.en.lua:198
-msgid "a_w_adhoc"
+msgid "Ad-Hoc"
 msgstr ""
 
 #. Pseudo Ad-Hoc (ahdemo)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:199
-msgid "a_w_ahdemo"
+msgid "Pseudo Ad-Hoc (ahdemo)"
 msgstr ""
 
 #. Client
 #: i18n/english/luasrc/i18n/admin-core.en.lua:200
-msgid "a_w_client"
+msgid "Client"
 msgstr ""
 
 #. WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:201
-msgid "a_w_wds"
+msgid "WDS"
 msgstr ""
 
 #. Monitor
 #: i18n/english/luasrc/i18n/admin-core.en.lua:202
-msgid "a_w_monitor"
+msgid "Monitor"
 msgstr ""
 
 #. Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> firewalls
 #: i18n/english/luasrc/i18n/admin-core.en.lua:203
-msgid "dhcp_dnsmasq_desc"
+msgid "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> firewalls"
 msgstr ""
 
 #. Domain required
 #: i18n/english/luasrc/i18n/admin-core.en.lua:204
-msgid "dhcp_dnsmasq_domainneeded"
+msgid "Domain required"
 msgstr ""
 
 #. Don&#39;t forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without <abbr title=\"Domain Name System\">DNS</abbr>-Name
 #: i18n/english/luasrc/i18n/admin-core.en.lua:205
-msgid "dhcp_dnsmasq_domainneeded_desc"
+msgid "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without <abbr title=\"Domain Name System\">DNS</abbr>-Name"
 msgstr ""
 
 #. Authoritative
 #: i18n/english/luasrc/i18n/admin-core.en.lua:206
-msgid "dhcp_dnsmasq_authoritative"
+msgid "Authoritative"
 msgstr ""
 
 #. This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> in the local network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:207
-msgid "dhcp_dnsmasq_authoritative_desc"
+msgid "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> in the local network"
 msgstr ""
 
 #. Filter private
 #: i18n/english/luasrc/i18n/admin-core.en.lua:208
-msgid "dhcp_dnsmasq_boguspriv"
+msgid "Filter private"
 msgstr ""
 
 #. Don&#39;t forward reverse lookups for local networks
 #: i18n/english/luasrc/i18n/admin-core.en.lua:209
-msgid "dhcp_dnsmasq_boguspriv_desc"
+msgid "Don't forward reverse lookups for local networks"
 msgstr ""
 
 #. Filter useless
 #: i18n/english/luasrc/i18n/admin-core.en.lua:210
-msgid "dhcp_dnsmasq_filterwin2k"
+msgid "Filter useless"
 msgstr ""
 
 #. filter useless <abbr title=\"Domain Name System\">DNS</abbr>-queries of Windows-systems
 #: i18n/english/luasrc/i18n/admin-core.en.lua:211
-msgid "dhcp_dnsmasq_filterwin2k_desc"
+msgid "filter useless <abbr title=\"Domain Name System\">DNS</abbr>-queries of Windows-systems"
 msgstr ""
 
 #. Localise queries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:212
-msgid "dhcp_dnsmasq_localisequeries"
+msgid "Localise queries"
 msgstr ""
 
 #. localises the hostname depending on its subnet
 #: i18n/english/luasrc/i18n/admin-core.en.lua:213
-msgid "dhcp_dnsmasq_localisequeries_desc"
+msgid "localises the hostname depending on its subnet"
 msgstr ""
 
 #. Local Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:214
-msgid "dhcp_dnsmasq_local"
+msgid "Local Server"
 msgstr ""
 
 #. Local Domain
 #: i18n/english/luasrc/i18n/admin-core.en.lua:215
-msgid "dhcp_dnsmasq_domain"
+msgid "Local Domain"
 msgstr ""
 
 #. Expand Hosts
 #: i18n/english/luasrc/i18n/admin-core.en.lua:216
-msgid "dhcp_dnsmasq_expandhosts"
+msgid "Expand Hosts"
 msgstr ""
 
 #. adds domain names to hostentries in the resolv file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:217
-msgid "dhcp_dnsmasq_expandhosts_desc"
+msgid "adds domain names to hostentries in the resolv file"
 msgstr ""
 
 #. don&#39;t cache unknown
 #: i18n/english/luasrc/i18n/admin-core.en.lua:218
-msgid "dhcp_dnsmasq_nonegcache"
+msgid "don't cache unknown"
 msgstr ""
 
 #. prevents caching of negative <abbr title=\"Domain Name System\">DNS</abbr>-replies
 #: i18n/english/luasrc/i18n/admin-core.en.lua:219
-msgid "dhcp_dnsmasq_nonegcache_desc"
+msgid "prevents caching of negative <abbr title=\"Domain Name System\">DNS</abbr>-replies"
 msgstr ""
 
 #. Use <code>/etc/ethers</code>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:220
-msgid "dhcp_dnsmasq_readethers"
+msgid "Use <code>/etc/ethers</code>"
 msgstr ""
 
 #. Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:221
-msgid "dhcp_dnsmasq_readethers_desc"
+msgid "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server"
 msgstr ""
 
 #. Leasefile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:222
-msgid "dhcp_dnsmasq_leasefile"
+msgid "Leasefile"
 msgstr ""
 
 #. file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-leases will be stored
 #: i18n/english/luasrc/i18n/admin-core.en.lua:223
-msgid "dhcp_dnsmasq_leasefile_desc"
+msgid "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-leases will be stored"
 msgstr ""
 
 #. Resolvfile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:224
-msgid "dhcp_dnsmasq_resolvfile"
+msgid "Resolvfile"
 msgstr ""
 
 #. local <abbr title=\"Domain Name System\">DNS</abbr> file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:225
-msgid "dhcp_dnsmasq_resolvfile_desc"
+msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr ""
 
 #. Ignore <code>/etc/hosts</code>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:226
-msgid "dhcp_dnsmasq_nohosts"
+msgid "Ignore <code>/etc/hosts</code>"
 msgstr ""
 
 #. Strict order
 #: i18n/english/luasrc/i18n/admin-core.en.lua:227
-msgid "dhcp_dnsmasq_strictorder"
+msgid "Strict order"
 msgstr ""
 
 #. <abbr title=\"Domain Name System\">DNS</abbr>-Server will be queried in the order of the resolvfile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:228
-msgid "dhcp_dnsmasq_strictorder_desc"
+msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Server will be queried in the order of the resolvfile"
 msgstr ""
 
 #. Log queries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:229
-msgid "dhcp_dnsmasq_logqueries"
+msgid "Log queries"
 msgstr ""
 
 #. Ignore resolve file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:230
-msgid "dhcp_dnsmasq_noresolv"
+msgid "Ignore resolve file"
 msgstr ""
 
 #. concurrent queries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:231
-msgid "dhcp_dnsmasq_dnsforwardmax"
+msgid "concurrent queries"
 msgstr ""
 
 #. <abbr title=\"Domain Name System\">DNS</abbr>-Port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:232
-msgid "dhcp_dnsmasq_port"
+msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Port"
 msgstr ""
 
 #. <abbr title=\"maximal\">max.</abbr> <abbr title=\"Extension Mechanisms for Domain Name System\">EDNS0</abbr> paket size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:233
-msgid "dhcp_dnsmasq_ednspacket_max"
+msgid "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Extension Mechanisms for Domain Name System\">EDNS0</abbr> paket size"
 msgstr ""
 
 #. <abbr title=\"maximal\">max.</abbr> <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:234
-msgid "dhcp_dnsmasq_dhcpleasemax"
+msgid "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Leases"
 msgstr ""
 
 #. additional hostfile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:235
-msgid "dhcp_dnsmasq_addnhosts"
+msgid "additional hostfile"
 msgstr ""
 
 #. query port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:236
-msgid "dhcp_dnsmasq_queryport"
+msgid "query port"
 msgstr ""
 
 #. Enable TFTP-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:237
-msgid "dhcp_dnsmasq_enabletftp"
+msgid "Enable TFTP-Server"
 msgstr ""
 
 #. TFTP-Server Root
 #: i18n/english/luasrc/i18n/admin-core.en.lua:238
-msgid "dhcp_dnsmasq_tftproot"
+msgid "TFTP-Server Root"
 msgstr ""
 
 #. Network Boot Image
 #: i18n/english/luasrc/i18n/admin-core.en.lua:239
-msgid "dhcp_dnsmasq_dhcpboot"
+msgid "Network Boot Image"
 msgstr ""
 
 #. Switch
 #: i18n/english/luasrc/i18n/admin-core.en.lua:240
-msgid "a_n_switch"
+msgid "Switch"
 msgstr ""
 
 #. Active Connections
 #: i18n/english/luasrc/i18n/admin-core.en.lua:241
-msgid "a_n_conntrack"
+msgid "Active Connections"
 msgstr ""
 
 #. This page gives an overview over currently active network connections.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:242
-msgid "a_n_conntrack_desc"
+msgid "This page gives an overview over currently active network connections."
 msgstr ""
 
 #. Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:243
-msgid "a_n_routes"
+msgid "Routes"
 msgstr ""
 
 #. IPv4 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:244
-msgid "a_n_routes4"
+msgid "IPv4 Routes"
 msgstr ""
 
 #. IPv6 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:245
-msgid "a_n_routes6"
+msgid "IPv6 Routes"
 msgstr ""
 
 #. In this area you find all network-related settings.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:246
-msgid "a_network1"
+msgid "In this area you find all network-related settings."
 msgstr ""
 
 #. On most routers the network switch can be freely configured and splitted up into several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:247
-msgid "a_network2"
+msgid "On most routers the network switch can be freely configured and splitted up into several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s."
 msgstr ""
 
 #. Interfaces and <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> / <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Settings allow a custom organisation of the network and connections to other networks like the internet.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:248
-msgid "a_network3"
+msgid "Interfaces and <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> / <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Settings allow a custom organisation of the network and connections to other networks like the internet."
 msgstr ""
 
 #. With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> devices in your local network can be automatically configured for network communication.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:249
-msgid "a_network4"
+msgid "With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> devices in your local network can be automatically configured for network communication."
 msgstr ""
 
 #. Firewall and portforwarding can be used to secure your network while providing services to external networks.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:250
-msgid "a_network5"
+msgid "Firewall and portforwarding can be used to secure your network while providing services to external networks."
 msgstr ""
 
 #. The network ports on your router can be combined to several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s in which computers can communicate directly with each other. <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s are often used to separate different network segments. Often there is by default one Uplink port for a connection to the next greater network like the internet and other ports for a local network.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:251
-msgid "a_n_switch1"
+msgid "The network ports on your router can be combined to several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s in which computers can communicate directly with each other. <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s are often used to separate different network segments. Often there is by default one Uplink port for a connection to the next greater network like the internet and other ports for a local network."
 msgstr ""
 
 #. Ports belonging to a <abbr title=\"Virtual Local Area Network\">VLAN</abbr> are separated with spaces. The port with the highest number (usually 5) is oftern the connection to the internal network interface of the router. On devices with 5 ports often the one with the lowest number (0) is the predefined Uplink port.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:252
-msgid "network_switch_desc"
+msgid "Ports belonging to a <abbr title=\"Virtual Local Area Network\">VLAN</abbr> are separated with spaces. The port with the highest number (usually 5) is oftern the connection to the internal network interface of the router. On devices with 5 ports often the one with the lowest number (0) is the predefined Uplink port."
 msgstr ""
 
 #. On this page you can configure the network interfaces. You can bridge several interfaces by ticking the &quot;bridge interfaces&quot; field and enter the names of several network interfaces separated by spaces. You can also use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation <samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: <samp>eth0.1</samp>).
 #: i18n/english/luasrc/i18n/admin-core.en.lua:253
-msgid "a_n_ifaces1"
+msgid "On this page you can configure the network interfaces. You can bridge several interfaces by ticking the \"bridge interfaces\" field and enter the names of several network interfaces separated by spaces. You can also use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation <samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: <samp>eth0.1</samp>)."
 msgstr ""
 
 #. Bridge interfaces
 #: i18n/english/luasrc/i18n/admin-core.en.lua:254
-msgid "a_n_i_bridge"
+msgid "Bridge interfaces"
 msgstr ""
 
 #. creates a bridge over specified interface(s)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:255
-msgid "a_n_i_bridge1"
+msgid "creates a bridge over specified interface(s)"
 msgstr ""
 
 #. Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>
-msgid "a_n_i_stp"
+msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 msgstr ""
 
 #. Enables the Spanning Tree Protocol on this bridge
-msgid "a_n_i_stp1"
+msgid "Enables the Spanning Tree Protocol on this bridge"
 msgstr ""
 
 #. With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> network members can automatically receive their network settings (<abbr title=\"Internet Protocol\">IP</abbr>-address, netmask, <abbr title=\"Domain Name System\">DNS</abbr>-server, ...).
 #: i18n/english/luasrc/i18n/admin-core.en.lua:256
-msgid "dhcp_desc"
+msgid "With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> network members can automatically receive their network settings (<abbr title=\"Internet Protocol\">IP</abbr>-address, netmask, <abbr title=\"Domain Name System\">DNS</abbr>-server, ...)."
 msgstr ""
 
 #. Leasetime
 #: i18n/english/luasrc/i18n/admin-core.en.lua:257
-msgid "dhcp_dhcp_leasetime"
+msgid "Leasetime"
 msgstr ""
 
 #. Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:258
-msgid "dhcp_dhcp_dynamicdhcp"
+msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 msgstr ""
 
 #. Ignore interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:259
-msgid "dhcp_dhcp_ignore"
+msgid "Ignore interface"
 msgstr ""
 
 #. disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for this interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:260
-msgid "dhcp_dhcp_ignore_desc"
+msgid "disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for this interface"
 msgstr ""
 
 #. Force
 #: i18n/english/luasrc/i18n/admin-core.en.lua:261
-msgid "dhcp_dhcp_force"
+msgid "Force"
 msgstr ""
 
 #. first address (last octet)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:262
-msgid "dhcp_dhcp_start_desc"
+msgid "first address (last octet)"
 msgstr ""
 
 #. number of leased addresses -1
 #: i18n/english/luasrc/i18n/admin-core.en.lua:263
-msgid "dhcp_dhcp_limit_desc"
+msgid "number of leased addresses -1"
 msgstr ""
 
 #. DHCP-Options
 #: i18n/english/luasrc/i18n/admin-core.en.lua:264
-msgid "dhcp_dhcp_dhcpoption"
+msgid "DHCP-Options"
 msgstr ""
 
 #. See &quot;dnsmasq --help dhcp&quot; for a list of available options.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:265
-msgid "dhcp_dhcp_dhcpoption_desc"
+msgid "See \"dnsmasq --help dhcp\" for a list of available options."
 msgstr ""
 
 #. Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:266
-msgid "dhcp_leases"
+msgid "Leases"
 msgstr ""
 
 #. Static Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:267
-msgid "luci_ethers"
+msgid "Static Leases"
 msgstr ""
 
 #. Leasetime remaining
 #: i18n/english/luasrc/i18n/admin-core.en.lua:268
-msgid "dhcp_timeremain"
+msgid "Leasetime remaining"
 msgstr ""
 
 #. Active Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:269
-msgid "dhcp_leases_active"
+msgid "Active Leases"
 msgstr ""
 
 #. Point-to-Point Connections
 #: i18n/english/luasrc/i18n/admin-core.en.lua:270
-msgid "a_n_ptp"
+msgid "Point-to-Point Connections"
 msgstr ""
 
 #. Point-to-Point connections with <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> or <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr> are often used to connect a device over <abbr title=\"Digital Subscriber Line\">DSL</abbr> or similar technologies to an internet access point.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:271
-msgid "a_n_ptp1"
+msgid "Point-to-Point connections with <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> or <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr> are often used to connect a device over <abbr title=\"Digital Subscriber Line\">DSL</abbr> or similar technologies to an internet access point."
 msgstr ""
 
 #. You need to install &quot;comgt&quot; for UMTS/GPRS, &quot;ppp-mod-pppoe&quot; for PPPoE, &quot;ppp-mod-pppoa&quot; for PPPoA or &quot;pptp&quot; for PPtP support
 #: i18n/english/luasrc/i18n/admin-core.en.lua:272
-msgid "network_interface_prereq"
+msgid "You need to install \"comgt\" for UMTS/GPRS, \"ppp-mod-pppoe\" for PPPoE, \"ppp-mod-pppoa\" for PPPoA or \"pptp\" for PPtP support"
 msgstr ""
 
 #. You need to install &quot;ppp-mod-pppoe&quot; for PPPoE or &quot;pptp&quot; for PPtP support
 #: i18n/english/luasrc/i18n/admin-core.en.lua:273
-msgid "network_interface_prereq_mini"
+msgid "You need to install \"ppp-mod-pppoe\" for PPPoE or \"pptp\" for PPtP support"
 msgstr ""
 
 #. <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:274
-msgid "network_interface_server"
+msgid "<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"
 msgstr ""
 
 #. Automatic Disconnect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:275
-msgid "network_interface_demand"
+msgid "Automatic Disconnect"
 msgstr ""
 
 #. Time (in seconds) after which an unused connection will be closed
 #: i18n/english/luasrc/i18n/admin-core.en.lua:276
-msgid "network_interface_demand_desc"
+msgid "Time (in seconds) after which an unused connection will be closed"
 msgstr ""
 
 #. Keep-Alive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:277
-msgid "network_interface_keepalive"
+msgid "Keep-Alive"
 msgstr ""
 
 #. Number of failed connection tests to initiate automatic reconnect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:278
-msgid "network_interface_keepalive_desc"
+msgid "Number of failed connection tests to initiate automatic reconnect"
 msgstr ""
 
 #. Modem device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:279
-msgid "network_interface_device"
+msgid "Modem device"
 msgstr ""
 
 #. The device node of your modem, e.g. /dev/ttyUSB0
 #: i18n/english/luasrc/i18n/admin-core.en.lua:280
-msgid "network_interface_device_desc"
+msgid "The device node of your modem, e.g. /dev/ttyUSB0"
 msgstr ""
 
 #. Replace default route
 #: i18n/english/luasrc/i18n/admin-core.en.lua:281
-msgid "network_interface_defaultroute"
+msgid "Replace default route"
 msgstr ""
 
 #. Let pppd replace the current default route to use the PPP interface after successful connect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:282
-msgid "network_interface_defaultroute_desc"
+msgid "Let pppd replace the current default route to use the PPP interface after successful connect"
 msgstr ""
 
 #. Use peer DNS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:283
-msgid "network_interface_peerdns"
+msgid "Use peer DNS"
 msgstr ""
 
 #. Configure the local DNS server to use the name servers adverticed by the PPP peer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:284
-msgid "network_interface_peerdns_desc"
+msgid "Configure the local DNS server to use the name servers adverticed by the PPP peer"
 msgstr ""
 
 #. Enable IPv6 on PPP link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:285
-msgid "network_interface_ipv6"
+msgid "Enable IPv6 on PPP link"
 msgstr ""
 
 #. Connect script
 #: i18n/english/luasrc/i18n/admin-core.en.lua:286
-msgid "network_interface_connect"
+msgid "Connect script"
 msgstr ""
 
 #. Let pppd run this script after establishing the PPP link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:287
-msgid "network_interface_connect_desc"
+msgid "Let pppd run this script after establishing the PPP link"
 msgstr ""
 
 #. Disconnect script
 #: i18n/english/luasrc/i18n/admin-core.en.lua:288
-msgid "network_interface_disconnect"
+msgid "Disconnect script"
 msgstr ""
 
 #. Let pppd run this script before tearing down the PPP link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:289
-msgid "network_interface_disconnect_desc"
+msgid "Let pppd run this script before tearing down the PPP link"
 msgstr ""
 
 #. Additional pppd options
 #: i18n/english/luasrc/i18n/admin-core.en.lua:290
-msgid "network_interface_pppd_options"
+msgid "Additional pppd options"
 msgstr ""
 
 #. Specify additional command line arguments for pppd here
 #: i18n/english/luasrc/i18n/admin-core.en.lua:291
-msgid "network_interface_pppd_options_desc"
+msgid "Specify additional command line arguments for pppd here"
 msgstr ""
 
 #. Access point (APN)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:292
-msgid "network_interface_apn"
+msgid "Access point (APN)"
 msgstr ""
 
 #. PIN code
 #: i18n/english/luasrc/i18n/admin-core.en.lua:293
-msgid "network_interface_pincode"
+msgid "PIN code"
 msgstr ""
 
 #. Make sure that you provide the correct pin code here or you might lock your sim card!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:294
-msgid "network_interface_pincode_desc"
+msgid "Make sure that you provide the correct pin code here or you might lock your sim card!"
 msgstr ""
 
 #. Service type
 #: i18n/english/luasrc/i18n/admin-core.en.lua:295
-msgid "network_interface_service"
+msgid "Service type"
 msgstr ""
 
 #. Setup wait time
 #: i18n/english/luasrc/i18n/admin-core.en.lua:296
-msgid "network_interface_maxwait"
+msgid "Setup wait time"
 msgstr ""
 
 #. Seconds to wait for the modem to become ready before attempting to connect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:297
-msgid "network_interface_maxwait_desc"
+msgid "Seconds to wait for the modem to become ready before attempting to connect"
 msgstr ""
 
 #. PPPoA Encapsulation
 #: i18n/english/luasrc/i18n/admin-core.en.lua:298
-msgid "network_interface_encaps"
+msgid "PPPoA Encapsulation"
 msgstr ""
 
 #. Routes specify over which interface and gateway a certain host or network can be reached.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:299
-msgid "a_n_r_routes1"
+msgid "Routes specify over which interface and gateway a certain host or network can be reached."
 msgstr ""
 
 #. Static Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:300
-msgid "a_n_routes_static"
+msgid "Static Routes"
 msgstr ""
 
 #. Static IPv4 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:301
-msgid "a_n_routes_static4"
+msgid "Static IPv4 Routes"
 msgstr ""
 
 #. Static IPv6 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:302
-msgid "a_n_routes_static6"
+msgid "Static IPv6 Routes"
 msgstr ""
 
 #. Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:303
-msgid "a_n_routes_kernel4"
+msgid "Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes"
 msgstr ""
 
 #. Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:304
-msgid "a_n_routes_kernel6"
+msgid "Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes"
 msgstr ""
 
 #. Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:305
-msgid "a_n_r_target1"
+msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
 msgstr ""
 
 #. <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network (CIDR)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:306
-msgid "a_n_r_target6"
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network (CIDR)"
 msgstr ""
 
 #. if target is a network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:307
-msgid "a_n_r_netmask1"
+msgid "if target is a network"
 msgstr ""
 
 #. Internet Connection
 #: i18n/english/luasrc/i18n/admin-core.en.lua:308
-msgid "m_n_inet"
+msgid "Internet Connection"
 msgstr ""
 
 #. Local Network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:309
-msgid "m_n_local"
+msgid "Local Network"
 msgstr ""
 
 #. Route
 #: i18n/english/luasrc/i18n/admin-core.en.lua:310
-msgid "m_n_route"
+msgid "Route"
 msgstr ""
 
 #. Bridge
 #: i18n/english/luasrc/i18n/admin-core.en.lua:311
-msgid "m_n_brdige"
+msgid "Bridge"
 msgstr ""
 
 #. Provide (Access Point)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:312
-msgid "m_w_ap"
+msgid "Provide (Access Point)"
 msgstr ""
 
 #. Independent (Ad-Hoc)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:313
-msgid "m_w_adhoc"
+msgid "Independent (Ad-Hoc)"
 msgstr ""
 
 #. Join (Client)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:314
-msgid "m_w_client"
+msgid "Join (Client)"
 msgstr ""
 
 #. Distributed (<abbr title=\"Wireless Distribution System\">WDS</abbr>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:315
-msgid "m_w_wds"
+msgid "Distributed (<abbr title=\"Wireless Distribution System\">WDS</abbr>)"
 msgstr ""
 
 #. Clientmode
 #: i18n/english/luasrc/i18n/admin-core.en.lua:316
-msgid "m_w_clientmode"
+msgid "Clientmode"
 msgstr ""
 
 #. System log buffer size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:317
-msgid "system_system_logsize"
+msgid "System log buffer size"
 msgstr ""
 
 #. External system log server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:318
-msgid "system_system_logip"
+msgid "External system log server"
 msgstr ""
 
 #. Log output level
 #: i18n/english/luasrc/i18n/admin-core.en.lua:319
-msgid "system_system_conloglevel"
+msgid "Log output level"
 msgstr ""
 
 #. Level of log messages on the console
 #: i18n/english/luasrc/i18n/admin-core.en.lua:320
-msgid "system_system_conloglevel_desc"
+msgid "Level of log messages on the console"
 msgstr ""
 
 #. Processor
 #: i18n/english/luasrc/i18n/admin-core.en.lua:321
-msgid "m_i_processor"
+msgid "Processor"
 msgstr ""
 
 #. Memory
 #: i18n/english/luasrc/i18n/admin-core.en.lua:322
-msgid "m_i_memory"
+msgid "Memory"
 msgstr ""
 
 #. Local Time
 #: i18n/english/luasrc/i18n/admin-core.en.lua:323
-msgid "m_i_systemtime"
+msgid "Local Time"
 msgstr ""
 
 #. Uptime
 #: i18n/english/luasrc/i18n/admin-core.en.lua:324
-msgid "m_i_uptime"
+msgid "Uptime"
 msgstr ""
 
 #. First leased address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:325
-msgid "m_n_d_firstaddress"
+msgid "First leased address"
 msgstr ""
 
 #. Number of leased addresses
 #: i18n/english/luasrc/i18n/admin-core.en.lua:326
-msgid "m_n_d_numleases"
+msgid "Number of leased addresses"
 msgstr ""
 
 #. Routing table
 #: i18n/english/luasrc/i18n/admin-core.en.lua:327
-msgid "routingtable"
+msgid "Routing table"
 msgstr ""
 
 #. Wifi scan
 #: i18n/english/luasrc/i18n/admin-core.en.lua:328
-msgid "wlanscan"
+msgid "Wifi scan"
 msgstr ""
 
 #. Frequency
 #: i18n/english/luasrc/i18n/admin-core.en.lua:329
-msgid "frequency"
+msgid "Frequency"
 msgstr ""
 
 #. Power
 #: i18n/english/luasrc/i18n/admin-core.en.lua:330
-msgid "power"
+msgid "Power"
 msgstr ""
 
 #. Noise
 #: i18n/english/luasrc/i18n/admin-core.en.lua:331
-msgid "noise"
+msgid "Noise"
 msgstr ""
 
 #. Signal
 #: i18n/english/luasrc/i18n/admin-core.en.lua:332
-msgid "signal"
+msgid "Signal"
 msgstr ""
 
 #. Link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:333
-msgid "link"
+msgid "Link"
 msgstr ""
 
 #. <abbr title=\"Fragmentation\">Frag.</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:334
-msgid "frag"
+msgid "<abbr title=\"Fragmentation\">Frag.</abbr>"
 msgstr ""
 
 #. <abbr title=\"Request To Send\">RTS</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:335
-msgid "rts"
+msgid "<abbr title=\"Request To Send\">RTS</abbr>"
 msgstr ""
 
 #. Bitrate
 #: i18n/english/luasrc/i18n/admin-core.en.lua:336
-msgid "bitrate"
+msgid "Bitrate"
 msgstr ""
 
 #. automatically reconnect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:337
-msgid "m_n_keepalive"
+msgid "automatically reconnect"
 msgstr ""
 
 #. disconnect when idle for
 #: i18n/english/luasrc/i18n/admin-core.en.lua:338
-msgid "m_n_dialondemand"
+msgid "disconnect when idle for"
 msgstr ""
 
 #. <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:339
-msgid "m_n_pptp_server"
+msgid "<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"
 msgstr ""
 
 #. <abbr title=\"Light Emitting Diode\">LED</abbr> Configuration
 #: i18n/english/luasrc/i18n/admin-core.en.lua:340
-msgid "leds"
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr ""
 
 #. Customizes the behaviour of the device <abbr title=\"Light Emitting Diode\">LED</abbr>s if possible.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:341
-msgid "leds_desc"
+msgid "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode\">LED</abbr>s if possible."
 msgstr ""
 
 #. <abbr title=\"Light Emitting Diode\">LED</abbr> Name
 #: i18n/english/luasrc/i18n/admin-core.en.lua:342
-msgid "system_led_name"
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr ""
 
 #. <abbr title=\"Light Emitting Diode\">LED</abbr> Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:343
-msgid "system_led_sysfs"
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Device"
 msgstr ""
 
 #. Default state
 #: i18n/english/luasrc/i18n/admin-core.en.lua:344
-msgid "system_led_default"
+msgid "Default state"
 msgstr ""
 
 #. ticked = on
 #: i18n/english/luasrc/i18n/admin-core.en.lua:345
-msgid "system_led_default_desc"
+msgid "ticked = on"
 msgstr ""
 
 #. Trigger
 #: i18n/english/luasrc/i18n/admin-core.en.lua:346
-msgid "system_led_trigger"
+msgid "Trigger"
 msgstr ""
 
 #. None
 #: i18n/english/luasrc/i18n/admin-core.en.lua:347
-msgid "system_led_trigger_none"
+msgid "None"
 msgstr ""
 
 #. Default On
 #: i18n/english/luasrc/i18n/admin-core.en.lua:348
-msgid "system_led_trigger_defaulton"
+msgid "Default On"
 msgstr ""
 
 #. Timer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:349
-msgid "system_led_trigger_timer"
+msgid "Timer"
 msgstr ""
 
 #. Heartbeat (Load Average)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:350
-msgid "system_led_trigger_heartbeat"
+msgid "Heartbeat (Load Average)"
 msgstr ""
 
 #. Network Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:351
-msgid "system_led_trigger_netdev"
+msgid "Network Device"
 msgstr ""
 
 #. Off-State Delay
 #: i18n/english/luasrc/i18n/admin-core.en.lua:352
-msgid "system_led_delayoff"
+msgid "Off-State Delay"
 msgstr ""
 
 #. Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is off
 #: i18n/english/luasrc/i18n/admin-core.en.lua:353
-msgid "system_led_delayoff_desc"
+msgid "Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is off"
 msgstr ""
 
 #. On-State Delay
 #: i18n/english/luasrc/i18n/admin-core.en.lua:354
-msgid "system_led_delayon"
+msgid "On-State Delay"
 msgstr ""
 
 #. Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is on
 #: i18n/english/luasrc/i18n/admin-core.en.lua:355
-msgid "system_led_delayon_desc"
+msgid "Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is on"
 msgstr ""
 
 #. Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:356
-msgid "system_led_dev"
+msgid "Device"
 msgstr ""
 
 #. Trigger Mode
 #: i18n/english/luasrc/i18n/admin-core.en.lua:357
-msgid "system_led_mode"
+msgid "Trigger Mode"
 msgstr ""
 
 #. Link On
 #: i18n/english/luasrc/i18n/admin-core.en.lua:358
-msgid "system_led_mode_link"
+msgid "Link On"
 msgstr ""
 
 #. Transmit
 #: i18n/english/luasrc/i18n/admin-core.en.lua:359
-msgid "system_led_mode_tx"
+msgid "Transmit"
 msgstr ""
 
 #. Receive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:360
-msgid "system_led_mode_rx"
+msgid "Receive"
 msgstr ""
 
 #. Active
 #: i18n/english/luasrc/i18n/admin-core.en.lua:361
-msgid "network_interface_up"
+msgid "Active"
 msgstr ""
 
 #. <abbr title=\"Media Access Control\">MAC</abbr>-Address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:362
-msgid "network_interface_hwaddr"
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr ""
 
 #. Hardware Address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:363
-msgid "network_interface_hwaddr_desc"
+msgid "Hardware Address"
 msgstr ""
 
 #. Traffic
 #: i18n/english/luasrc/i18n/admin-core.en.lua:364
-msgid "network_interface_txrx"
+msgid "Traffic"
 msgstr ""
 
 #. transmitted / received
 #: i18n/english/luasrc/i18n/admin-core.en.lua:365
-msgid "network_interface_txrx_desc"
+msgid "transmitted / received"
 msgstr ""
 
 #. Errors
 #: i18n/english/luasrc/i18n/admin-core.en.lua:366
-msgid "network_interface_err"
+msgid "Errors"
 msgstr ""
 
 #. TX / RX
 #: i18n/english/luasrc/i18n/admin-core.en.lua:367
-msgid "network_interface_err_desc"
+msgid "TX / RX"
 msgstr ""
 
 #. Create / Assign firewall-zone
 #: i18n/english/luasrc/i18n/admin-core.en.lua:368
-msgid "network_interface_fwzone"
+msgid "Create / Assign firewall-zone"
 msgstr ""
 
 #. This interface does not belong to any firewall zone yet.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:369
-msgid "network_interface_fwzone_desc"
+msgid "Choose the firewall zone you want to assign to this interface. Select <em>unspecified</em> to remove the interface from the associated zone or fill out the <em>create</em> field to define a new zone and attach the interface to it."
 msgstr ""
 
 #. Processes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:370
-msgid "process_head"
+msgid "Processes"
 msgstr ""
 
 #. This list gives an overview over currently running system processes and their status.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:371
-msgid "process_descr"
+msgid "This list gives an overview over currently running system processes and their status."
 msgstr ""
 
 #. PID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:372
-msgid "process_pid"
+msgid "PID"
 msgstr ""
 
 #. Owner
 #: i18n/english/luasrc/i18n/admin-core.en.lua:373
-msgid "process_owner"
+msgid "Owner"
 msgstr ""
 
 #. Command
 #: i18n/english/luasrc/i18n/admin-core.en.lua:374
-msgid "process_command"
+msgid "Command"
 msgstr ""
 
 #. CPU usage (%)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:375
-msgid "process_cpu"
+msgid "CPU usage (%)"
 msgstr ""
 
 #. Memory usage (%)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:376
-msgid "process_mem"
+msgid "Memory usage (%)"
 msgstr ""
 
 #. Hang Up
 #: i18n/english/luasrc/i18n/admin-core.en.lua:377
-msgid "process_hup"
+msgid "Hang Up"
 msgstr ""
 
 #. Terminate
 #: i18n/english/luasrc/i18n/admin-core.en.lua:378
-msgid "process_term"
+msgid "Terminate"
 msgstr ""
 
 #. Kill
 #: i18n/english/luasrc/i18n/admin-core.en.lua:379
-msgid "process_kill"
+msgid "Kill"
 msgstr ""
 
 #. cached
 #: i18n/english/luasrc/i18n/admin-core.en.lua:380
-msgid "mem_cached"
+msgid "cached"
 msgstr ""
 
 #. buffered
 #: i18n/english/luasrc/i18n/admin-core.en.lua:381
-msgid "mem_buffered"
+msgid "buffered"
 msgstr ""
 
 #. free
 #: i18n/english/luasrc/i18n/admin-core.en.lua:382
-msgid "mem_free"
+msgid "free"
 msgstr ""
 
 #. Scheduled Tasks
 #: i18n/english/luasrc/i18n/admin-core.en.lua:383
-msgid "a_s_crontab"
+msgid "Scheduled Tasks"
 msgstr ""
 
 #. This is the system crontab in which scheduled tasks can be defined.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:384
-msgid "a_s_crontab1"
+msgid "This is the system crontab in which scheduled tasks can be defined."
 msgstr ""
 
 #. NAS ID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:385
-msgid "a_w_nasid"
+msgid "NAS ID"
 msgstr ""
 
 #. Path to CA-Certificate
 #: i18n/english/luasrc/i18n/admin-core.en.lua:386
-msgid "a_w_cacert"
+msgid "Path to CA-Certificate"
 msgstr ""
 
 #. EAP-Method
 #: i18n/english/luasrc/i18n/admin-core.en.lua:387
-msgid "a_w_eaptype"
+msgid "EAP-Method"
 msgstr ""
 
 #. Path to Private Key
 #: i18n/english/luasrc/i18n/admin-core.en.lua:388
-msgid "a_w_tlsprivkey"
+msgid "Path to Private Key"
 msgstr ""
 
 #. Password of Private Key
 #: i18n/english/luasrc/i18n/admin-core.en.lua:389
-msgid "a_w_tlsprivkeypwd"
+msgid "Password of Private Key"
 msgstr ""
 
 #. Authentication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:390
-msgid "a_w_peapauth"
+msgid "Authentication"
 msgstr ""
 
 #. Identity
 #: i18n/english/luasrc/i18n/admin-core.en.lua:391
-msgid "a_w_peapidentity"
+msgid "Identity"
 msgstr ""
 
 #. Password
 #: i18n/english/luasrc/i18n/admin-core.en.lua:392
-msgid "a_w_peappassword"
+msgid "Password"
 msgstr ""
 
 #. Create Network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:393
-msgid "a_w_create"
+msgid "Create Network"
 msgstr ""
 
 #. Hostnames
 #: i18n/english/luasrc/i18n/admin-core.en.lua:394
-msgid "hostnames"
+msgid "Hostnames"
 msgstr ""
 
 #. Host entries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:395
-msgid "hostnames_entries"
+msgid "Host entries"
 msgstr ""
 
 #. Hostname
 #: i18n/english/luasrc/i18n/admin-core.en.lua:396
-msgid "hostnames_hostname"
+msgid "Hostname"
 msgstr ""
 
 #. IP address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:397
-msgid "hostnames_address"
+msgid "IP address"
 msgstr ""
 
 #. Clamp Segment Size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:398
-msgid "m_n_mssfix"
+msgid "Clamp Segment Size"
 msgstr ""
 
 #. Fixes problems with unreachable websites, submitting forms or other unexpected behaviour for some ISPs.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:399
-msgid "m_n_mssfix_desc"
+msgid "Fixes problems with unreachable websites, submitting forms or other unexpected behaviour for some ISPs."
 msgstr ""
 
 #. Flash Firmware
 #: i18n/english/luasrc/i18n/admin-core.en.lua:400
-msgid "admin_upgrade"
+msgid "Flash Firmware"
 msgstr ""
 
 #. The uploaded image file does not contain a supported format. Make sure that you choose the generic image format for your platform.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:401
-msgid "admin_upgrade_badimage"
+msgid "The uploaded image file does not contain a supported format. Make sure that you choose the generic image format for your platform."
 msgstr ""
 
 #. Checksum
 #: i18n/english/luasrc/i18n/admin-core.en.lua:402
-msgid "admin_upgrade_checksum"
+msgid "Checksum"
 msgstr ""
 
 #. Upload an OpenWrt image file to reflash the device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:403
-msgid "admin_upgrade_desc"
+msgid "Upload an OpenWrt image file to reflash the device."
 msgstr ""
 
 #. Size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:404
-msgid "admin_upgrade_filesize"
+msgid "Size"
 msgstr ""
 
 #. Firmware image
 #: i18n/english/luasrc/i18n/admin-core.en.lua:405
-msgid "admin_upgrade_fwimage"
+msgid "Firmware image"
 msgstr ""
 
 #. Keep configuration files
 #: i18n/english/luasrc/i18n/admin-core.en.lua:406
-msgid "admin_upgrade_keepcfg"
+msgid "Keep configuration files"
 msgstr ""
 
 #. Sorry. OpenWrt does not support a system upgrade on this platform.<br /> You need to manually flash your device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:407
-msgid "admin_upgrade_nosupport"
+msgid "Sorry. OpenWrt does not support a system upgrade on this platform.<br /> You need to manually flash your device."
 msgstr ""
 
 #. The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a few minutes until you try to reconnect. It might be necessary to renew the address of your computer to reach the device again, depending on your settings.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:408
-msgid "admin_upgrade_running"
+msgid "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a few minutes until you try to reconnect. It might be necessary to renew the address of your computer to reach the device again, depending on your settings."
 msgstr ""
 
 #.  (%s available)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:409
-msgid "admin_upgrade_spaceavail"
+msgid " (%s available)"
 msgstr ""
 
 #. It appears that you try to flash an image that does not fit into the flash memory, please verify the image file!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:410
-msgid "admin_upgrade_toolarge"
+msgid "It appears that you try to flash an image that does not fit into the flash memory, please verify the image file!"
 msgstr ""
 
 #. Upload image
 #: i18n/english/luasrc/i18n/admin-core.en.lua:411
-msgid "admin_upgrade_upload"
+msgid "Upload image"
 msgstr ""
 
 #. The flash image was uploaded. Below is the checksum and file size listed, compare them with the original file to ensure data integrity.<br /> Click \"Proceed\" below to start the flash procedure.
diff --git a/po/zh_CN/asterisk.po b/po/zh_CN/asterisk.po
index 7b388e646..9688ba9aa 100644
--- a/po/zh_CN/asterisk.po
+++ b/po/zh_CN/asterisk.po
@@ -13,1252 +13,1252 @@ msgstr ""
 
 #. Asterisk General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:1
-msgid "asterisk_asterisk"
+msgid "Asterisk General Options"
 msgstr ""
 
 #. AGI directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:2
-msgid "asterisk_asterisk_agidir"
+msgid "AGI directory"
 msgstr ""
 
 #. Cache recorded sound files during recording
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:3
-msgid "asterisk_asterisk_cacherecordfiles"
+msgid "Cache recorded sound files during recording"
 msgstr ""
 
 #. Debug Level
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:4
-msgid "asterisk_asterisk_debug"
+msgid "Debug Level"
 msgstr ""
 
 #. Disable some warnings
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:5
-msgid "asterisk_asterisk_dontwarn"
+msgid "Disable some warnings"
 msgstr ""
 
 #. Dump core on crash
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:6
-msgid "asterisk_asterisk_dumpcore"
+msgid "Dump core on crash"
 msgstr ""
 
 #. High Priority
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:7
-msgid "asterisk_asterisk_highpriority"
+msgid "High Priority"
 msgstr ""
 
 #. Initialise Crypto
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:8
-msgid "asterisk_asterisk_initcrypto"
+msgid "Initialise Crypto"
 msgstr ""
 
 #. Use Internal Timing
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:9
-msgid "asterisk_asterisk_internaltiming"
+msgid "Use Internal Timing"
 msgstr ""
 
 #. Log directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:10
-msgid "asterisk_asterisk_logdir"
+msgid "Log directory"
 msgstr ""
 
 #. Maximum number of calls allowed
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:11
-msgid "asterisk_asterisk_maxcalls"
+msgid "Maximum number of calls allowed"
 msgstr ""
 
 #. Maximum load to stop accepting new calls
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:12
-msgid "asterisk_asterisk_maxload"
+msgid "Maximum load to stop accepting new calls"
 msgstr ""
 
 #. Disable console colors
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:13
-msgid "asterisk_asterisk_nocolor"
+msgid "Disable console colors"
 msgstr ""
 
 #. Sound files Cache directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:14
-msgid "asterisk_asterisk_recordcachedir"
+msgid "Sound files Cache directory"
 msgstr ""
 
 #. The Group to run as
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:15
-msgid "asterisk_asterisk_rungroup"
+msgid "The Group to run as"
 msgstr ""
 
 #. The User to run as
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:16
-msgid "asterisk_asterisk_runuser"
+msgid "The User to run as"
 msgstr ""
 
 #. Voicemail Spool directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:17
-msgid "asterisk_asterisk_spooldir"
+msgid "Voicemail Spool directory"
 msgstr ""
 
 #. Prefix UniquID with system name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:18
-msgid "asterisk_asterisk_systemname"
+msgid "Prefix UniquID with system name"
 msgstr ""
 
 #. Build transcode paths via SLINEAR, not directly
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:19
-msgid "asterisk_asterisk_transcodeviasln"
+msgid "Build transcode paths via SLINEAR, not directly"
 msgstr ""
 
 #. Transmit SLINEAR silence while recording a channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:20
-msgid "asterisk_asterisk_transmitsilenceduringrecord"
+msgid "Transmit SLINEAR silence while recording a channel"
 msgstr ""
 
 #. Verbose Level
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:21
-msgid "asterisk_asterisk_verbose"
+msgid "Verbose Level"
 msgstr ""
 
 #. Time Zone
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:22
-msgid "asterisk_asterisk_zone"
+msgid "Time Zone"
 msgstr ""
 
 #. Section dialplan
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:23
-msgid "asterisk_dialplan"
+msgid "Section dialplan"
 msgstr ""
 
 #. include
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:24
-msgid "asterisk_dialplan_include"
+msgid "include"
 msgstr ""
 
 #. Dialplan Extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:25
-msgid "asterisk_dialplanexten"
+msgid "Dialplan Extension"
 msgstr ""
 
 #. Dialplan General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:26
-msgid "asterisk_dialplangeneral"
+msgid "Dialplan General Options"
 msgstr ""
 
 #. Allow transfer
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:27
-msgid "asterisk_dialplangeneral_allowtransfer"
+msgid "Allow transfer"
 msgstr ""
 
 #. Reinvite/redirect media connections
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:28
-msgid "asterisk_dialplangeneral_canreinvite"
+msgid "Reinvite/redirect media connections"
 msgstr ""
 
 #. Clear global vars
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:29
-msgid "asterisk_dialplangeneral_clearglobalvars"
+msgid "Clear global vars"
 msgstr ""
 
 #. Dialplan Goto
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:30
-msgid "asterisk_dialplangoto"
+msgid "Dialplan Goto"
 msgstr ""
 
 #. Dialplan Conference
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:31
-msgid "asterisk_dialplanmeetme"
+msgid "Dialplan Conference"
 msgstr ""
 
 #. Dialplan Time
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:32
-msgid "asterisk_dialplansaytime"
+msgid "Dialplan Time"
 msgstr ""
 
 #. Dialplan Voicemail
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:33
-msgid "asterisk_dialplanvoice"
+msgid "Dialplan Voicemail"
 msgstr ""
 
 #. Dial Zones for Dialplan
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:34
-msgid "asterisk_dialzone"
+msgid "Dial Zones for Dialplan"
 msgstr ""
 
 #. Prefix to add matching dialplans
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:35
-msgid "asterisk_dialzone_addprefix"
+msgid "Prefix to add matching dialplans"
 msgstr ""
 
 #. Match International prefix
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:36
-msgid "asterisk_dialzone_international"
+msgid "Match International prefix"
 msgstr ""
 
 #. Prefix (0) to add/remove to/from international numbers
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:37
-msgid "asterisk_dialzone_localprefix"
+msgid "Prefix (0) to add/remove to/from international numbers"
 msgstr ""
 
 #. localzone
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:38
-msgid "asterisk_dialzone_localzone"
+msgid "localzone"
 msgstr ""
 
 #. Match plan
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:39
-msgid "asterisk_dialzone_match"
+msgid "Match plan"
 msgstr ""
 
 #. Connection to use
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:40
-msgid "asterisk_dialzone_uses"
+msgid "Connection to use"
 msgstr ""
 
 #. Feature Key maps
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:41
-msgid "asterisk_featuremap"
+msgid "Feature Key maps"
 msgstr ""
 
 #. Attended transfer key
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:42
-msgid "asterisk_featuremap_atxfer"
+msgid "Attended transfer key"
 msgstr ""
 
 #. Blind transfer key
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:43
-msgid "asterisk_featuremap_blindxfer"
+msgid "Blind transfer key"
 msgstr ""
 
 #. Key to Disconnect call
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:44
-msgid "asterisk_featuremap_disconnect"
+msgid "Key to Disconnect call"
 msgstr ""
 
 #. Key to Park call
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:45
-msgid "asterisk_featuremap_parkcall"
+msgid "Key to Park call"
 msgstr ""
 
 #. Parking Feature
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:46
-msgid "asterisk_featurepark"
+msgid "Parking Feature"
 msgstr ""
 
 #. ADSI Park
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:47
-msgid "asterisk_featurepark_adsipark"
+msgid "ADSI Park"
 msgstr ""
 
 #. Attended transfer timeout (sec)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:48
-msgid "asterisk_featurepark_atxfernoanswertimeout"
+msgid "Attended transfer timeout (sec)"
 msgstr ""
 
 #. One touch record key
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:49
-msgid "asterisk_featurepark_automon"
+msgid "One touch record key"
 msgstr ""
 
 #. Name of call context for parking
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:50
-msgid "asterisk_featurepark_context"
+msgid "Name of call context for parking"
 msgstr ""
 
 #. Sound file to play to parked caller
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:51
-msgid "asterisk_featurepark_courtesytone"
+msgid "Sound file to play to parked caller"
 msgstr ""
 
 #. Max time (ms) between digits for feature activation
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:52
-msgid "asterisk_featurepark_featuredigittimeout"
+msgid "Max time (ms) between digits for feature activation"
 msgstr ""
 
 #. Method to Find Parking slot
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:53
-msgid "asterisk_featurepark_findslot"
+msgid "Method to Find Parking slot"
 msgstr ""
 
 #. parkedmusicclass
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:54
-msgid "asterisk_featurepark_parkedmusicclass"
+msgid "parkedmusicclass"
 msgstr ""
 
 #. Play courtesy tone to
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:55
-msgid "asterisk_featurepark_parkedplay"
+msgid "Play courtesy tone to"
 msgstr ""
 
 #. Enable Parking
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:56
-msgid "asterisk_featurepark_parkenabled"
+msgid "Enable Parking"
 msgstr ""
 
 #. Extension to dial to park
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:57
-msgid "asterisk_featurepark_parkext"
+msgid "Extension to dial to park"
 msgstr ""
 
 #. Parking time (secs)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:58
-msgid "asterisk_featurepark_parkingtime"
+msgid "Parking time (secs)"
 msgstr ""
 
 #. Range of extensions for call parking
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:59
-msgid "asterisk_featurepark_parkpos"
+msgid "Range of extensions for call parking"
 msgstr ""
 
 #. Pickup extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:60
-msgid "asterisk_featurepark_pickupexten"
+msgid "Pickup extension"
 msgstr ""
 
 #. Seconds to wait bewteen digits when transferring
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:61
-msgid "asterisk_featurepark_transferdigittimeout"
+msgid "Seconds to wait bewteen digits when transferring"
 msgstr ""
 
 #. sound when attended transfer is complete
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:62
-msgid "asterisk_featurepark_xferfailsound"
+msgid "sound when attended transfer is complete"
 msgstr ""
 
 #. Sound when attended transfer fails
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:63
-msgid "asterisk_featurepark_xfersound"
+msgid "Sound when attended transfer fails"
 msgstr ""
 
 #. Reload Hardware Config
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:64
-msgid "asterisk_hardwarereboot"
+msgid "Reload Hardware Config"
 msgstr ""
 
 #. Reboot Method
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:65
-msgid "asterisk_hardwarereboot_method"
+msgid "Reboot Method"
 msgstr ""
 
 #. Parameter
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:66
-msgid "asterisk_hardwarereboot_param"
+msgid "Parameter"
 msgstr ""
 
 #. SIP Connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:67
-msgid "asterisk_iax"
+msgid "SIP Connection"
 msgstr ""
 
 #. Always Dial International
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:68
-msgid "asterisk_iax_alwaysinternational"
+msgid "Always Dial International"
 msgstr ""
 
 #. context
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:69
-msgid "asterisk_iax_context"
+msgid "context"
 msgstr ""
 
 #. Country Code for connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:70
-msgid "asterisk_iax_countrycode"
+msgid "Country Code for connection"
 msgstr ""
 
 #. Add as Extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:71
-msgid "asterisk_iax_extension"
+msgid "Add as Extension"
 msgstr ""
 
 #. Host name (or blank)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:72
-msgid "asterisk_iax_host"
+msgid "Host name (or blank)"
 msgstr ""
 
 #. International Dial Prefix
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:73
-msgid "asterisk_iax_internationalprefix"
+msgid "International Dial Prefix"
 msgstr ""
 
 #. Dial Prefix (for external line)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:74
-msgid "asterisk_iax_prefix"
+msgid "Dial Prefix (for external line)"
 msgstr ""
 
 #. Secret
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:75
-msgid "asterisk_iax_secret"
+msgid "Secret"
 msgstr ""
 
 #. Dial Timeout (sec)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:76
-msgid "asterisk_iax_timeout"
+msgid "Dial Timeout (sec)"
 msgstr ""
 
 #. Option type
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:77
-msgid "asterisk_iax_type"
+msgid "Option type"
 msgstr ""
 
 #. User name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:78
-msgid "asterisk_iax_username"
+msgid "User name"
 msgstr ""
 
 #. IAX General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:79
-msgid "asterisk_iaxgeneral"
+msgid "IAX General Options"
 msgstr ""
 
 #. Allow Codecs
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:80
-msgid "asterisk_iaxgeneral_allow"
+msgid "Allow Codecs"
 msgstr ""
 
 #. Reinvite/redirect media connections
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:81
-msgid "asterisk_iaxgeneral_canreinvite"
+msgid "Reinvite/redirect media connections"
 msgstr ""
 
 #. Static
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:82
-msgid "asterisk_iaxgeneral_static"
+msgid "Static"
 msgstr ""
 
 #. Write Protect
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:83
-msgid "asterisk_iaxgeneral_writeprotect"
+msgid "Write Protect"
 msgstr ""
 
 #. Meetme Conference
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:84
-msgid "asterisk_meetme"
+msgid "Meetme Conference"
 msgstr ""
 
 #. Admin PIN
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:85
-msgid "asterisk_meetme_adminpin"
+msgid "Admin PIN"
 msgstr ""
 
 #. Meeting PIN
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:86
-msgid "asterisk_meetme_pin"
+msgid "Meeting PIN"
 msgstr ""
 
 #. Meetme Conference General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:87
-msgid "asterisk_meetmegeneral"
+msgid "Meetme Conference General Options"
 msgstr ""
 
 #. Number of 20ms audio buffers to be used
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:88
-msgid "asterisk_meetmegeneral_audiobuffers"
+msgid "Number of 20ms audio buffers to be used"
 msgstr ""
 
 #. Modules
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:89
-msgid "asterisk_module"
+msgid "Modules"
 msgstr ""
 
 #. Alarm Receiver Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:90
-msgid "asterisk_module_appalarmreceiver"
+msgid "Alarm Receiver Application"
 msgstr ""
 
 #. Authentication Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:91
-msgid "asterisk_module_appauthenticate"
+msgid "Authentication Application"
 msgstr ""
 
 #. Make sure asterisk doesnt save CDR
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:92
-msgid "asterisk_module_appcdr"
+msgid "Make sure asterisk doesnt save CDR"
 msgstr ""
 
 #. Check if channel is available
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:93
-msgid "asterisk_module_appchanisavail"
+msgid "Check if channel is available"
 msgstr ""
 
 #. Listen in on any channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:94
-msgid "asterisk_module_appchanspy"
+msgid "Listen in on any channel"
 msgstr ""
 
 #. Control Playback Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:95
-msgid "asterisk_module_appcontrolplayback"
+msgid "Control Playback Application"
 msgstr ""
 
 #. Cuts up variables
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:96
-msgid "asterisk_module_appcut"
+msgid "Cuts up variables"
 msgstr ""
 
 #. Database access functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:97
-msgid "asterisk_module_appdb"
+msgid "Database access functions"
 msgstr ""
 
 #. Dialing Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:98
-msgid "asterisk_module_appdial"
+msgid "Dialing Application"
 msgstr ""
 
 #. Virtual Dictation Machine Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:99
-msgid "asterisk_module_appdictate"
+msgid "Virtual Dictation Machine Application"
 msgstr ""
 
 #. Directed Call Pickup Support
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:100
-msgid "asterisk_module_appdirectedpickup"
+msgid "Directed Call Pickup Support"
 msgstr ""
 
 #. Extension Directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:101
-msgid "asterisk_module_appdirectory"
+msgid "Extension Directory"
 msgstr ""
 
 #. DISA (Direct Inward System Access) Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:102
-msgid "asterisk_module_appdisa"
+msgid "DISA (Direct Inward System Access) Application"
 msgstr ""
 
 #. Dump channel variables Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:103
-msgid "asterisk_module_appdumpchan"
+msgid "Dump channel variables Application"
 msgstr ""
 
 #. Simple Echo Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:104
-msgid "asterisk_module_appecho"
+msgid "Simple Echo Application"
 msgstr ""
 
 #. ENUM Lookup
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:105
-msgid "asterisk_module_appenumlookup"
+msgid "ENUM Lookup"
 msgstr ""
 
 #. Reevaluates strings
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:106
-msgid "asterisk_module_appeval"
+msgid "Reevaluates strings"
 msgstr ""
 
 #. Executes applications
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:107
-msgid "asterisk_module_appexec"
+msgid "Executes applications"
 msgstr ""
 
 #. External IVR application interface
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:108
-msgid "asterisk_module_appexternalivr"
+msgid "External IVR application interface"
 msgstr ""
 
 #. Fork The CDR into 2 seperate entities
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:109
-msgid "asterisk_module_appforkcdr"
+msgid "Fork The CDR into 2 seperate entities"
 msgstr ""
 
 #. Get ADSI CPE ID
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:110
-msgid "asterisk_module_appgetcpeid"
+msgid "Get ADSI CPE ID"
 msgstr ""
 
 #. Group Management Routines
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:111
-msgid "asterisk_module_appgroupcount"
+msgid "Group Management Routines"
 msgstr ""
 
 #. Encode and Stream via icecast and ices
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:112
-msgid "asterisk_module_appices"
+msgid "Encode and Stream via icecast and ices"
 msgstr ""
 
 #. Image Transmission Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:113
-msgid "asterisk_module_appimage"
+msgid "Image Transmission Application"
 msgstr ""
 
 #. Look up Caller*ID name/number from black
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:114
-msgid "asterisk_module_applookupblacklist"
+msgid "Look up Caller*ID name/number from black"
 msgstr ""
 
 #. Look up CallerID Name from local databas
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:115
-msgid "asterisk_module_applookupcidname"
+msgid "Look up CallerID Name from local databas"
 msgstr ""
 
 #. Extension Macros
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:116
-msgid "asterisk_module_appmacro"
+msgid "Extension Macros"
 msgstr ""
 
 #. A simple math Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:117
-msgid "asterisk_module_appmath"
+msgid "A simple math Application"
 msgstr ""
 
 #. MD5 checksum Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:118
-msgid "asterisk_module_appmd5"
+msgid "MD5 checksum Application"
 msgstr ""
 
 #. Digital Milliwatt (mu-law) Test Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:119
-msgid "asterisk_module_appmilliwatt"
+msgid "Digital Milliwatt (mu-law) Test Application"
 msgstr ""
 
 #. Record a call and mix the audio during the recording
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:120
-msgid "asterisk_module_appmixmonitor"
+msgid "Record a call and mix the audio during the recording"
 msgstr ""
 
 #. Call Parking and Announce Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:121
-msgid "asterisk_module_appparkandannounce"
+msgid "Call Parking and Announce Application"
 msgstr ""
 
 #. Trivial Playback Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:122
-msgid "asterisk_module_appplayback"
+msgid "Trivial Playback Application"
 msgstr ""
 
 #. Require phone number to be entered
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:123
-msgid "asterisk_module_appprivacy"
+msgid "Require phone number to be entered"
 msgstr ""
 
 #. True Call Queueing
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:124
-msgid "asterisk_module_appqueue"
+msgid "True Call Queueing"
 msgstr ""
 
 #. Random goto
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:125
-msgid "asterisk_module_apprandom"
+msgid "Random goto"
 msgstr ""
 
 #. Read Variable Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:126
-msgid "asterisk_module_appread"
+msgid "Read Variable Application"
 msgstr ""
 
 #. Read in a file
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:127
-msgid "asterisk_module_appreadfile"
+msgid "Read in a file"
 msgstr ""
 
 #. Realtime Data Lookup/Rewrite
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:128
-msgid "asterisk_module_apprealtime"
+msgid "Realtime Data Lookup/Rewrite"
 msgstr ""
 
 #. Trivial Record Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:129
-msgid "asterisk_module_apprecord"
+msgid "Trivial Record Application"
 msgstr ""
 
 #. Say time
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:130
-msgid "asterisk_module_appsayunixtime"
+msgid "Say time"
 msgstr ""
 
 #. Send DTMF digits Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:131
-msgid "asterisk_module_appsenddtmf"
+msgid "Send DTMF digits Application"
 msgstr ""
 
 #. Send Text Applications
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:132
-msgid "asterisk_module_appsendtext"
+msgid "Send Text Applications"
 msgstr ""
 
 #. Set CallerID Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:133
-msgid "asterisk_module_appsetcallerid"
+msgid "Set CallerID Application"
 msgstr ""
 
 #. CDR user field apps
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:134
-msgid "asterisk_module_appsetcdruserfield"
+msgid "CDR user field apps"
 msgstr ""
 
 #. load =&gt; .so ; Set CallerID Name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:135
-msgid "asterisk_module_appsetcidname"
+msgid "load => .so ; Set CallerID Name"
 msgstr ""
 
 #. load =&gt; .so ; Set CallerID Number
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:136
-msgid "asterisk_module_appsetcidnum"
+msgid "load => .so ; Set CallerID Number"
 msgstr ""
 
 #. Set RDNIS Number
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:137
-msgid "asterisk_module_appsetrdnis"
+msgid "Set RDNIS Number"
 msgstr ""
 
 #. Set ISDN Transfer Capability
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:138
-msgid "asterisk_module_appsettransfercapability"
+msgid "Set ISDN Transfer Capability"
 msgstr ""
 
 #. SMS/PSTN handler
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:139
-msgid "asterisk_module_appsms"
+msgid "SMS/PSTN handler"
 msgstr ""
 
 #. Hangs up the requested channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:140
-msgid "asterisk_module_appsofthangup"
+msgid "Hangs up the requested channel"
 msgstr ""
 
 #. Stack Routines
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:141
-msgid "asterisk_module_appstack"
+msgid "Stack Routines"
 msgstr ""
 
 #. Generic System() application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:142
-msgid "asterisk_module_appsystem"
+msgid "Generic System() application"
 msgstr ""
 
 #. Playback with Talk Detection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:143
-msgid "asterisk_module_apptalkdetect"
+msgid "Playback with Talk Detection"
 msgstr ""
 
 #. Interface Test Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:144
-msgid "asterisk_module_apptest"
+msgid "Interface Test Application"
 msgstr ""
 
 #. Transfer
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:145
-msgid "asterisk_module_apptransfer"
+msgid "Transfer"
 msgstr ""
 
 #. TXTCIDName
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:146
-msgid "asterisk_module_apptxtcidname"
+msgid "TXTCIDName"
 msgstr ""
 
 #. Send URL Applications
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:147
-msgid "asterisk_module_appurl"
+msgid "Send URL Applications"
 msgstr ""
 
 #. Custom User Event Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:148
-msgid "asterisk_module_appuserevent"
+msgid "Custom User Event Application"
 msgstr ""
 
 #. Send verbose output
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:149
-msgid "asterisk_module_appverbose"
+msgid "Send verbose output"
 msgstr ""
 
 #. Voicemail
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:150
-msgid "asterisk_module_appvoicemail"
+msgid "Voicemail"
 msgstr ""
 
 #. Waits until first ring after time
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:151
-msgid "asterisk_module_appwaitforring"
+msgid "Waits until first ring after time"
 msgstr ""
 
 #. Wait For Silence Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:152
-msgid "asterisk_module_appwaitforsilence"
+msgid "Wait For Silence Application"
 msgstr ""
 
 #. While Loops and Conditional Execution
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:153
-msgid "asterisk_module_appwhile"
+msgid "While Loops and Conditional Execution"
 msgstr ""
 
 #. Comma Separated Values CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:154
-msgid "asterisk_module_cdrcsv"
+msgid "Comma Separated Values CDR Backend"
 msgstr ""
 
 #. Customizable Comma Separated Values CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:155
-msgid "asterisk_module_cdrcustom"
+msgid "Customizable Comma Separated Values CDR Backend"
 msgstr ""
 
 #. Asterisk Call Manager CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:156
-msgid "asterisk_module_cdrmanager"
+msgid "Asterisk Call Manager CDR Backend"
 msgstr ""
 
 #. MySQL CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:157
-msgid "asterisk_module_cdrmysql"
+msgid "MySQL CDR Backend"
 msgstr ""
 
 #. PostgreSQL CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:158
-msgid "asterisk_module_cdrpgsql"
+msgid "PostgreSQL CDR Backend"
 msgstr ""
 
 #. SQLite CDR Backend
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:159
-msgid "asterisk_module_cdrsqlite"
+msgid "SQLite CDR Backend"
 msgstr ""
 
 #. Agent Proxy Channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:160
-msgid "asterisk_module_chanagent"
+msgid "Agent Proxy Channel"
 msgstr ""
 
 #. Channel driver for GTalk
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:161
-msgid "asterisk_module_chanalsa"
+msgid "Channel driver for GTalk"
 msgstr ""
 
 #. Channel driver for GTalk
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:162
-msgid "asterisk_module_changtalk"
+msgid "Channel driver for GTalk"
 msgstr ""
 
 #. Option chan_iax2
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:163
-msgid "asterisk_module_chaniax2"
+msgid "Option chan_iax2"
 msgstr ""
 
 #. Local Proxy Channel
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:164
-msgid "asterisk_module_chanlocal"
+msgid "Local Proxy Channel"
 msgstr ""
 
 #. Session Initiation Protocol (SIP)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:165
-msgid "asterisk_module_chansip"
+msgid "Session Initiation Protocol (SIP)"
 msgstr ""
 
 #. Adaptive Differential PCM Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:166
-msgid "asterisk_module_codecadpcm"
+msgid "Adaptive Differential PCM Coder/Decoder"
 msgstr ""
 
 #. A-law Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:167
-msgid "asterisk_module_codecalaw"
+msgid "A-law Coder/Decoder"
 msgstr ""
 
 #. A-law and Mulaw direct Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:168
-msgid "asterisk_module_codecamu"
+msgid "A-law and Mulaw direct Coder/Decoder"
 msgstr ""
 
 #. ITU G.726-32kbps G726 Transcoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:169
-msgid "asterisk_module_codecg726"
+msgid "ITU G.726-32kbps G726 Transcoder"
 msgstr ""
 
 #. GSM/PCM16 (signed linear) Codec Translation
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:170
-msgid "asterisk_module_codecgsm"
+msgid "GSM/PCM16 (signed linear) Codec Translation"
 msgstr ""
 
 #. Speex/PCM16 (signed linear) Codec Translator
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:171
-msgid "asterisk_module_codecspeex"
+msgid "Speex/PCM16 (signed linear) Codec Translator"
 msgstr ""
 
 #. Mu-law Coder/Decoder
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:172
-msgid "asterisk_module_codeculaw"
+msgid "Mu-law Coder/Decoder"
 msgstr ""
 
 #. Sun Microsystems AU format (signed linear)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:173
-msgid "asterisk_module_formatau"
+msgid "Sun Microsystems AU format (signed linear)"
 msgstr ""
 
 #. G.723.1 Simple Timestamp File Format
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:174
-msgid "asterisk_module_formatg723"
+msgid "G.723.1 Simple Timestamp File Format"
 msgstr ""
 
 #. Raw G.726 (16/24/32/40kbps) data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:175
-msgid "asterisk_module_formatg726"
+msgid "Raw G.726 (16/24/32/40kbps) data"
 msgstr ""
 
 #. Raw G729 data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:176
-msgid "asterisk_module_formatg729"
+msgid "Raw G729 data"
 msgstr ""
 
 #. Raw GSM data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:177
-msgid "asterisk_module_formatgsm"
+msgid "Raw GSM data"
 msgstr ""
 
 #. Raw h263 data
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:178
-msgid "asterisk_module_formath263"
+msgid "Raw h263 data"
 msgstr ""
 
 #. JPEG (Joint Picture Experts Group) Image
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:179
-msgid "asterisk_module_formatjpeg"
+msgid "JPEG (Joint Picture Experts Group) Image"
 msgstr ""
 
 #. Raw uLaw 8khz Audio support (PCM)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:180
-msgid "asterisk_module_formatpcm"
+msgid "Raw uLaw 8khz Audio support (PCM)"
 msgstr ""
 
 #. load =&gt; .so ; Raw aLaw 8khz PCM Audio support
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:181
-msgid "asterisk_module_formatpcmalaw"
+msgid "load => .so ; Raw aLaw 8khz PCM Audio support"
 msgstr ""
 
 #. Raw Signed Linear Audio support (SLN)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:182
-msgid "asterisk_module_formatsln"
+msgid "Raw Signed Linear Audio support (SLN)"
 msgstr ""
 
 #. Dialogic VOX (ADPCM) File Format
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:183
-msgid "asterisk_module_formatvox"
+msgid "Dialogic VOX (ADPCM) File Format"
 msgstr ""
 
 #. Microsoft WAV format (8000hz Signed Line
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:184
-msgid "asterisk_module_formatwav"
+msgid "Microsoft WAV format (8000hz Signed Line"
 msgstr ""
 
 #. Microsoft WAV format (Proprietary GSM)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:185
-msgid "asterisk_module_formatwavgsm"
+msgid "Microsoft WAV format (Proprietary GSM)"
 msgstr ""
 
 #. Caller ID related dialplan functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:186
-msgid "asterisk_module_funccallerid"
+msgid "Caller ID related dialplan functions"
 msgstr ""
 
 #. ENUM Functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:187
-msgid "asterisk_module_funcenum"
+msgid "ENUM Functions"
 msgstr ""
 
 #. URI encoding / decoding functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:188
-msgid "asterisk_module_funcuri"
+msgid "URI encoding / decoding functions"
 msgstr ""
 
 #. Asterisk Extension Language Compiler
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:189
-msgid "asterisk_module_pbxael"
+msgid "Asterisk Extension Language Compiler"
 msgstr ""
 
 #. Text Extension Configuration
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:190
-msgid "asterisk_module_pbxconfig"
+msgid "Text Extension Configuration"
 msgstr ""
 
 #. load =&gt; .so ; Builtin dialplan functions
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:191
-msgid "asterisk_module_pbxfunctions"
+msgid "load => .so ; Builtin dialplan functions"
 msgstr ""
 
 #. Loopback Switch
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:192
-msgid "asterisk_module_pbxloopback"
+msgid "Loopback Switch"
 msgstr ""
 
 #. Realtime Switch
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:193
-msgid "asterisk_module_pbxrealtime"
+msgid "Realtime Switch"
 msgstr ""
 
 #. Outgoing Spool Support
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:194
-msgid "asterisk_module_pbxspool"
+msgid "Outgoing Spool Support"
 msgstr ""
 
 #. Wil Cal U (Auto Dialer)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:195
-msgid "asterisk_module_pbxwilcalu"
+msgid "Wil Cal U (Auto Dialer)"
 msgstr ""
 
 #. MySQL Config Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:196
-msgid "asterisk_module_resconfigmysql"
+msgid "MySQL Config Resource"
 msgstr ""
 
 #. ODBC Config Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:197
-msgid "asterisk_module_resconfigodbc"
+msgid "ODBC Config Resource"
 msgstr ""
 
 #. PGSQL Module
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:198
-msgid "asterisk_module_resconfigpgsql"
+msgid "PGSQL Module"
 msgstr ""
 
 #. Cryptographic Digital Signatures
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:199
-msgid "asterisk_module_rescrypto"
+msgid "Cryptographic Digital Signatures"
 msgstr ""
 
 #. Call Parking Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:200
-msgid "asterisk_module_resfeatures"
+msgid "Call Parking Resource"
 msgstr ""
 
 #. Indications Configuration
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:201
-msgid "asterisk_module_resindications"
+msgid "Indications Configuration"
 msgstr ""
 
 #. Call Monitoring Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:202
-msgid "asterisk_module_resmonitor"
+msgid "Call Monitoring Resource"
 msgstr ""
 
 #. Music On Hold Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:203
-msgid "asterisk_module_resmusiconhold"
+msgid "Music On Hold Resource"
 msgstr ""
 
 #. ODBC Resource
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:204
-msgid "asterisk_module_resodbc"
+msgid "ODBC Resource"
 msgstr ""
 
 #. SMDI Module
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:205
-msgid "asterisk_module_ressmdi"
+msgid "SMDI Module"
 msgstr ""
 
 #. SNMP Module
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:206
-msgid "asterisk_module_ressnmp"
+msgid "SNMP Module"
 msgstr ""
 
 #. Music On Hold
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:207
-msgid "asterisk_moh"
+msgid "Music On Hold"
 msgstr ""
 
 #. Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:208
-msgid "asterisk_moh_application"
+msgid "Application"
 msgstr ""
 
 #. Directory of Music
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:209
-msgid "asterisk_moh_directory"
+msgid "Directory of Music"
 msgstr ""
 
 #. Option mode
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:210
-msgid "asterisk_moh_mode"
+msgid "Option mode"
 msgstr ""
 
 #. Random Play
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:211
-msgid "asterisk_moh_random"
+msgid "Random Play"
 msgstr ""
 
 #. SIP Connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:212
-msgid "asterisk_sip"
+msgid "SIP Connection"
 msgstr ""
 
 #. Always Dial International
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:213
-msgid "asterisk_sip_alwaysinternational"
+msgid "Always Dial International"
 msgstr ""
 
 #. Reinvite/redirect media connections
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:214
-msgid "asterisk_sip_canreinvite"
+msgid "Reinvite/redirect media connections"
 msgstr ""
 
 #. context
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:215
-msgid "asterisk_sip_context"
+msgid "context"
 msgstr ""
 
 #. Country Code for connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:216
-msgid "asterisk_sip_countrycode"
+msgid "Country Code for connection"
 msgstr ""
 
 #. DTMF mode
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:217
-msgid "asterisk_sip_dtmfmode"
+msgid "DTMF mode"
 msgstr ""
 
 #. Add as Extension
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:218
-msgid "asterisk_sip_extension"
+msgid "Add as Extension"
 msgstr ""
 
 #. Primary domain identity for From: headers
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:219
-msgid "asterisk_sip_fromdomain"
+msgid "Primary domain identity for From: headers"
 msgstr ""
 
 #. From user (required by many SIP providers)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:220
-msgid "asterisk_sip_fromuser"
+msgid "From user (required by many SIP providers)"
 msgstr ""
 
 #. Host name (or blank)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:221
-msgid "asterisk_sip_host"
+msgid "Host name (or blank)"
 msgstr ""
 
 #. Ring on incoming dialplan contexts
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:222
-msgid "asterisk_sip_incoming"
+msgid "Ring on incoming dialplan contexts"
 msgstr ""
 
 #. Allow Insecure for
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:223
-msgid "asterisk_sip_insecure"
+msgid "Allow Insecure for"
 msgstr ""
 
 #. International Dial Prefix
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:224
-msgid "asterisk_sip_internationalprefix"
+msgid "International Dial Prefix"
 msgstr ""
 
 #. Mailbox for MWI
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:225
-msgid "asterisk_sip_mailbox"
+msgid "Mailbox for MWI"
 msgstr ""
 
 #. NAT between phone and Asterisk
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:226
-msgid "asterisk_sip_nat"
+msgid "NAT between phone and Asterisk"
 msgstr ""
 
 #. Check tags in headers
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:227
-msgid "asterisk_sip_pedantic"
+msgid "Check tags in headers"
 msgstr ""
 
 #. SIP Port
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:228
-msgid "asterisk_sip_port"
+msgid "SIP Port"
 msgstr ""
 
 #. Dial Prefix (for external line)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:229
-msgid "asterisk_sip_prefix"
+msgid "Dial Prefix (for external line)"
 msgstr ""
 
 #. Reply Timeout (ms) for down connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:230
-msgid "asterisk_sip_qualify"
+msgid "Reply Timeout (ms) for down connection"
 msgstr ""
 
 #. Register connection
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:231
-msgid "asterisk_sip_register"
+msgid "Register connection"
 msgstr ""
 
 #. Secret
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:232
-msgid "asterisk_sip_secret"
+msgid "Secret"
 msgstr ""
 
 #. Dial own extension for mailbox
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:233
-msgid "asterisk_sip_selfmailbox"
+msgid "Dial own extension for mailbox"
 msgstr ""
 
 #. Dial Timeout (sec)
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:234
-msgid "asterisk_sip_timeout"
+msgid "Dial Timeout (sec)"
 msgstr ""
 
 #. Client Type
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:235
-msgid "asterisk_sip_type"
+msgid "Client Type"
 msgstr ""
 
 #. Username
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:236
-msgid "asterisk_sip_username"
+msgid "Username"
 msgstr ""
 
 #. Section sipgeneral
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:237
-msgid "asterisk_sipgeneral"
+msgid "Section sipgeneral"
 msgstr ""
 
 #. Allow codecs
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:238
-msgid "asterisk_sipgeneral_allow"
+msgid "Allow codecs"
 msgstr ""
 
 #. SIP Port
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:239
-msgid "asterisk_sipgeneral_port"
+msgid "SIP Port"
 msgstr ""
 
 #. SIP realm
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:240
-msgid "asterisk_sipgeneral_realm"
+msgid "SIP realm"
 msgstr ""
 
 #. Voicemail general options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:241
-msgid "asterisk_voicegeneral"
+msgid "Voicemail general options"
 msgstr ""
 
 #. From Email address of server
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:242
-msgid "asterisk_voicegeneral_serveremail"
+msgid "From Email address of server"
 msgstr ""
 
 #. Voice Mail boxes
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:243
-msgid "asterisk_voicemail"
+msgid "Voice Mail boxes"
 msgstr ""
 
 #. Email contains attachment
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:244
-msgid "asterisk_voicemail_attach"
+msgid "Email contains attachment"
 msgstr ""
 
 #. Email
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:245
-msgid "asterisk_voicemail_email"
+msgid "Email"
 msgstr "Email"
 
 #. Display Name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:246
-msgid "asterisk_voicemail_name"
+msgid "Display Name"
 msgstr "显示名字"
 
 #. Password
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:247
-msgid "asterisk_voicemail_password"
+msgid "Password"
 msgstr "密码"
 
 #. zone
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:248
-msgid "asterisk_voicemail_zone"
+msgid "zone"
 msgstr "区"
 
 #. Voice Zone settings
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:249
-msgid "asterisk_voicezone"
+msgid "Voice Zone settings"
 msgstr ""
 
 #. Message Format
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:250
-msgid "asterisk_voicezone_message"
+msgid "Message Format"
 msgstr "消息格式"
 
 #. Time Zone
diff --git a/po/zh_CN/cbi.po b/po/zh_CN/cbi.po
index e3fe7a276..73bd718b4 100644
--- a/po/zh_CN/cbi.po
+++ b/po/zh_CN/cbi.po
@@ -13,82 +13,82 @@ msgstr ""
 
 #. Add entry
 #: i18n/english/luasrc/i18n/cbi.en.lua:1
-msgid "cbi_add"
+msgid "Add"
 msgstr ""
 
 #. Remove entry
 #: i18n/english/luasrc/i18n/cbi.en.lua:2
-msgid "cbi_del"
+msgid "Delete"
 msgstr ""
 
 #. Replace entry
 #: i18n/english/luasrc/i18n/cbi.en.lua:3
-msgid "cbi_replace"
+msgid "Replace entry"
 msgstr ""
 
 #. Invalid input value
 #: i18n/english/luasrc/i18n/cbi.en.lua:4
-msgid "cbi_invalid"
+msgid "Invalid"
 msgstr ""
 
 #. <strong>Validation failed:</strong> Please check any input fields for mistakes.
 #: i18n/english/luasrc/i18n/cbi.en.lua:5
-msgid "cbi_invalid_section"
+msgid "<strong>Validation failed:</strong> Please check any input fields for mistakes."
 msgstr ""
 
 #. This field is mandatory
 #: i18n/english/luasrc/i18n/cbi.en.lua:6
-msgid "cbi_missing"
+msgid "This field is mandatory"
 msgstr ""
 
 #. <strong>Validation failed:</strong> At least one mandatory field has no or an invalid value
 #: i18n/english/luasrc/i18n/cbi.en.lua:7
-msgid "cbi_deperror"
+msgid "<strong>Validation failed:</strong> At least one mandatory field has no or an invalid value"
 msgstr ""
 
 #. A requirement for this option was not met
 #: i18n/english/luasrc/i18n/cbi.en.lua:8
-msgid "cbi_reqerror"
+msgid "A requirement for this option was not met"
 msgstr ""
 
 #. -- Additional Field --
 #: i18n/english/luasrc/i18n/cbi.en.lua:9
-msgid "cbi_addopt"
+msgid "-- Additional Field --"
 msgstr ""
 
 #.  (optional)
 #: i18n/english/luasrc/i18n/cbi.en.lua:10
-msgid "cbi_optional"
+msgid " (optional)"
 msgstr ""
 
 #. This section contains no values yet
 #: i18n/english/luasrc/i18n/cbi.en.lua:11
-msgid "cbi_sectempty"
+msgid "This section contains no values yet"
 msgstr ""
 
 #. -- custom --
 #: i18n/english/luasrc/i18n/cbi.en.lua:12
-msgid "cbi_manual"
+msgid "-- custom --"
 msgstr "-- 自定义 --"
 
 #. -- Please choose --
 #: i18n/english/luasrc/i18n/cbi.en.lua:13
-msgid "cbi_select"
+msgid "-- Please choose --"
 msgstr "-- 请选择 --"
 
 #. Go to relevant configuration page
 #: i18n/english/luasrc/i18n/cbi.en.lua:14
-msgid "cbi_gorel"
+msgid " "
 msgstr ""
 
 #. Applying changes
 #: i18n/english/luasrc/i18n/cbi.en.lua:15
-msgid "cbi_applying"
+msgid "Applying changes"
 msgstr "应用更改"
 
 #. Uploaded File
 #: i18n/english/luasrc/i18n/cbi.en.lua:16
-msgid "cbi_upload"
+msgid "Uploaded File"
 msgstr "更新文件"
 
 #. Search file...
diff --git a/po/zh_CN/ddns.po b/po/zh_CN/ddns.po
index 7a7e5c00f..6850468d1 100644
--- a/po/zh_CN/ddns.po
+++ b/po/zh_CN/ddns.po
@@ -13,37 +13,37 @@ msgstr ""
 
 #. Dynamic DNS
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:1
-msgid "ddns"
+msgid "Dynamic DNS"
 msgstr "动态DNS"
 
 #. Dynamic DNS allows that your router can be reached with a fixed hostname while having a dynamically changing IP-Address.
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:2
-msgid "ddns_desc"
+msgid "Dynamic DNS allows that your router can be reached with a fixed hostname while having a dynamically changing IP-Address."
 msgstr ""
 
 #. Source of IP-Address
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:3
-msgid "ddns_service_ipsource"
+msgid "Source of IP-Address"
 msgstr ""
 
 #. Check for changed IP every
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:4
-msgid "ddns_service_checkinterval"
+msgid "Check for changed IP every"
 msgstr ""
 
 #. Check-Time unit
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:5
-msgid "ddns_service_checkunit"
+msgid "Check-Time unit"
 msgstr ""
 
 #. Force update every
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:6
-msgid "ddns_service_forceinterval"
+msgid "Force update every"
 msgstr ""
 
 #. Force-Time unit
 #: applications/luci-ddns/luasrc/i18n/ddns.en.lua:7
-msgid "ddns_service_forceunit"
+msgid "Force-Time unit"
 msgstr ""
 
 #. Custom Update-URL
diff --git a/po/zh_CN/default.po b/po/zh_CN/default.po
index 711a09782..6cd0c8195 100644
--- a/po/zh_CN/default.po
+++ b/po/zh_CN/default.po
@@ -13,37 +13,37 @@ msgstr ""
 
 #. Skip to navigation
 #: i18n/english/luasrc/i18n/default.en.lua:1
-msgid "skiplink1"
+msgid "Skip to navigation"
 msgstr ""
 
 #. Skip to content
 #: i18n/english/luasrc/i18n/default.en.lua:2
-msgid "skiplink2"
+msgid "Skip to content"
 msgstr ""
 
 #. Navigation
 #: i18n/english/luasrc/i18n/default.en.lua:3
-msgid "navigation"
+msgid "Navigation"
 msgstr ""
 
 #. About
 #: i18n/english/luasrc/i18n/default.en.lua:4
-msgid "about"
+msgid "About"
 msgstr "关于"
 
 #. Add
 #: i18n/english/luasrc/i18n/default.en.lua:5
-msgid "add"
+msgid "Add"
 msgstr "添加"
 
 #. Addresses
 #: i18n/english/luasrc/i18n/default.en.lua:6
-msgid "addresses"
+msgid "Addresses"
 msgstr "地址"
 
 #. Aliases
 #: i18n/english/luasrc/i18n/default.en.lua:7
-msgid "aliases"
+msgid "Aliases"
 msgstr ""
 
 #. all
@@ -58,97 +58,97 @@ msgstr "返回"
 
 #. Administration
 #: i18n/english/luasrc/i18n/default.en.lua:10
-msgid "administration"
+msgid "Administration"
 msgstr "管理员"
 
 #. Essentials
 #: i18n/english/luasrc/i18n/default.en.lua:11
-msgid "essentials"
+msgid "Essentials"
 msgstr ""
 
 #. Apply
 #: i18n/english/luasrc/i18n/default.en.lua:12
-msgid "apply"
+msgid "Apply"
 msgstr "应用"
 
 #. Basic Settings
 #: i18n/english/luasrc/i18n/default.en.lua:13
-msgid "basicsettings"
+msgid "Basic Settings"
 msgstr "基本设置"
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast
 #: i18n/english/luasrc/i18n/default.en.lua:14
-msgid "broadcast"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"
 msgstr ""
 
 #. Cancel
 #: i18n/english/luasrc/i18n/default.en.lua:15
-msgid "cancel"
+msgid "Cancel"
 msgstr "取消"
 
 #. Changes
 #: i18n/english/luasrc/i18n/default.en.lua:16
-msgid "changes"
+msgid "Changes"
 msgstr "更改"
 
 #. Channel
 #: i18n/english/luasrc/i18n/default.en.lua:17
-msgid "channel"
+msgid "Channel"
 msgstr ""
 
 #. <abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/prefix
 #: i18n/english/luasrc/i18n/default.en.lua:18
-msgid "cidr6"
+msgid "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/prefix"
 msgstr ""
 
 #. Code
 #: i18n/english/luasrc/i18n/default.en.lua:19
-msgid "code"
+msgid "Code"
 msgstr ""
 
 #. Configuration
 #: i18n/english/luasrc/i18n/default.en.lua:20
-msgid "config"
+msgid "Configuration"
 msgstr "配置"
 
 #. Configuration file
 #: i18n/english/luasrc/i18n/default.en.lua:21
-msgid "configfile"
+msgid "Configuration file"
 msgstr "配置文件"
 
 #. Confirmation
 #: i18n/english/luasrc/i18n/default.en.lua:22
-msgid "confirmation"
+msgid "Confirmation"
 msgstr ""
 
 #. Delete
 #: i18n/english/luasrc/i18n/default.en.lua:23
-msgid "delete"
+msgid "Delete"
 msgstr "删除"
 
 #. Description
 #: i18n/english/luasrc/i18n/default.en.lua:24
-msgid "descr"
+msgid "Description"
 msgstr "描述"
 
 #. Design
 #: i18n/english/luasrc/i18n/default.en.lua:25
-msgid "design"
+msgid "Design"
 msgstr "主题"
 
 #. Destination
 #: i18n/english/luasrc/i18n/default.en.lua:26
-msgid "destination"
+msgid "Destination"
 msgstr ""
 
 #. Device
 #: i18n/english/luasrc/i18n/default.en.lua:27
-msgid "device"
+msgid "Device"
 msgstr "设备"
 
 #. Devices
 #: i18n/english/luasrc/i18n/default.en.lua:28
-msgid "devices"
+msgid "Devices"
 msgstr "设备"
 
 #. disable
@@ -158,22 +158,22 @@ msgstr "禁用"
 
 #. Distance
 #: i18n/english/luasrc/i18n/default.en.lua:30
-msgid "distance"
+msgid "Distance"
 msgstr ""
 
 #. Kernel Log
 #: i18n/english/luasrc/i18n/default.en.lua:31
-msgid "dmesg"
+msgid "Kernel Log"
 msgstr "内核日志"
 
 #. <abbr title=\"Domain Name System\">DNS</abbr>-Server
 #: i18n/english/luasrc/i18n/default.en.lua:32
-msgid "dnsserver"
+msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Server"
 msgstr ""
 
 #. Edit
 #: i18n/english/luasrc/i18n/default.en.lua:33
-msgid "edit"
+msgid "Edit"
 msgstr "编辑"
 
 #. enable
@@ -183,47 +183,47 @@ msgstr "启用"
 
 #. Encryption
 #: i18n/english/luasrc/i18n/default.en.lua:35
-msgid "encryption"
+msgid "Encryption"
 msgstr ""
 
 #. Error
 #: i18n/english/luasrc/i18n/default.en.lua:36
-msgid "error"
+msgid "Error"
 msgstr "错误"
 
 #. Filesystem
 #: i18n/english/luasrc/i18n/default.en.lua:37
-msgid "filesystem"
+msgid "Filesystem"
 msgstr "文件系统"
 
 #. Filter
 #: i18n/english/luasrc/i18n/default.en.lua:38
-msgid "filter"
+msgid "Filter"
 msgstr "过滤器"
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway
 #: i18n/english/luasrc/i18n/default.en.lua:39
-msgid "gateway"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
 msgstr ""
 
 #. <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway
 #: i18n/english/luasrc/i18n/default.en.lua:40
-msgid "gateway6"
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 msgstr ""
 
 #. General
 #: i18n/english/luasrc/i18n/default.en.lua:41
-msgid "general"
+msgid "General"
 msgstr ""
 
 #. Hostname
 #: i18n/english/luasrc/i18n/default.en.lua:42
-msgid "hostname"
+msgid "Hostname"
 msgstr "主机名"
 
 #. Install
 #: i18n/english/luasrc/i18n/default.en.lua:43
-msgid "install"
+msgid "Install"
 msgstr "安装"
 
 #. installed
@@ -233,102 +233,102 @@ msgstr "已安装"
 
 #. Interface
 #: i18n/english/luasrc/i18n/default.en.lua:45
-msgid "interface"
+msgid "Interface"
 msgstr "接口"
 
 #. Interfaces
 #: i18n/english/luasrc/i18n/default.en.lua:46
-msgid "interfaces"
+msgid "Interfaces"
 msgstr ""
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address
 #: i18n/english/luasrc/i18n/default.en.lua:47
-msgid "ipaddress"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
 msgstr ""
 
 #. <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address
 #: i18n/english/luasrc/i18n/default.en.lua:48
-msgid "ip6address"
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address"
 msgstr ""
 
 #. Legend
 #: i18n/english/luasrc/i18n/default.en.lua:49
-msgid "legend"
+msgid "Legend"
 msgstr ""
 
 #. Library
 #: i18n/english/luasrc/i18n/default.en.lua:50
-msgid "library"
+msgid "Library"
 msgstr ""
 
 #. Logout
 #: i18n/english/luasrc/i18n/default.en.lua:51
-msgid "logout"
+msgid "Logout"
 msgstr "登出"
 
 #. Key
 #: i18n/english/luasrc/i18n/default.en.lua:52
-msgid "key"
+msgid "Key"
 msgstr "密钥"
 
 #. Language
 #: i18n/english/luasrc/i18n/default.en.lua:53
-msgid "language"
+msgid "Language"
 msgstr "语言"
 
 #. Limit
 #: i18n/english/luasrc/i18n/default.en.lua:54
-msgid "limit"
+msgid "Limit"
 msgstr ""
 
 #. Load
 #: i18n/english/luasrc/i18n/default.en.lua:55
-msgid "load"
+msgid "Load"
 msgstr ""
 
 #. Login
 #: i18n/english/luasrc/i18n/default.en.lua:56
-msgid "login"
+msgid "Login"
 msgstr "登录"
 
 #. <abbr title=\"Media Access Control\">MAC</abbr>-Address
 #: i18n/english/luasrc/i18n/default.en.lua:57
-msgid "macaddress"
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr "<abbr title=\"Media Access Control\">MAC</abbr>-地址"
 
 #. see &#39;%s&#39; manpage
 #: i18n/english/luasrc/i18n/default.en.lua:58
-msgid "manpage"
+msgid "see '%s' manpage"
 msgstr ""
 
 #. Metric
 #: i18n/english/luasrc/i18n/default.en.lua:59
-msgid "metric"
+msgid "Metric"
 msgstr "Metric"
 
 #. Mode
 #: i18n/english/luasrc/i18n/default.en.lua:60
-msgid "mode"
+msgid "Mode"
 msgstr "模式"
 
 #. Name
 #: i18n/english/luasrc/i18n/default.en.lua:61
-msgid "name"
+msgid "Name"
 msgstr "名字"
 
 #. <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask
 #: i18n/english/luasrc/i18n/default.en.lua:62
-msgid "netmask"
+msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr ""
 
 #. Network
 #: i18n/english/luasrc/i18n/default.en.lua:63
-msgid "network"
+msgid "Network"
 msgstr ""
 
 #. Networks
 #: i18n/english/luasrc/i18n/default.en.lua:64
-msgid "networks"
+msgid "Networks"
 msgstr ""
 
 #. none
@@ -338,117 +338,117 @@ msgstr ""
 
 #. not installed
 #: i18n/english/luasrc/i18n/default.en.lua:66
-msgid "notinstalled"
+msgid "not installed"
 msgstr "未安装"
 
 #. OK
 #: i18n/english/luasrc/i18n/default.en.lua:67
-msgid "ok"
+msgid "OK"
 msgstr "OK"
 
 #. Options
 #: i18n/english/luasrc/i18n/default.en.lua:68
-msgid "options"
+msgid "Options"
 msgstr "操作"
 
 #. Overview
 #: i18n/english/luasrc/i18n/default.en.lua:69
-msgid "overview"
+msgid "Overview"
 msgstr ""
 
 #. Package Manager
 #: i18n/english/luasrc/i18n/default.en.lua:70
-msgid "packagemanager"
+msgid "Package Manager"
 msgstr ""
 
 #. Password
 #: i18n/english/luasrc/i18n/default.en.lua:71
-msgid "password"
+msgid "Password"
 msgstr "密码"
 
 #. Path
 #: i18n/english/luasrc/i18n/default.en.lua:72
-msgid "path"
+msgid "Path"
 msgstr "路径"
 
 #. Port
 #: i18n/english/luasrc/i18n/default.en.lua:73
-msgid "port"
+msgid "Port"
 msgstr "端口"
 
 #. Ports
 #: i18n/english/luasrc/i18n/default.en.lua:74
-msgid "ports"
+msgid "Ports"
 msgstr "端口"
 
 #. Proceed
 #: i18n/english/luasrc/i18n/default.en.lua:75
-msgid "proceed"
+msgid "Proceed"
 msgstr ""
 
 #. Protocol
 #: i18n/english/luasrc/i18n/default.en.lua:76
-msgid "protocol"
+msgid "Protocol"
 msgstr "协议"
 
 #. Reboot
 #: i18n/english/luasrc/i18n/default.en.lua:77
-msgid "reboot"
+msgid "Reboot"
 msgstr "重启"
 
 #. Reset
 #: i18n/english/luasrc/i18n/default.en.lua:78
-msgid "reset"
+msgid "Reset"
 msgstr "重置"
 
 #. Revert
 #: i18n/english/luasrc/i18n/default.en.lua:79
-msgid "revert"
+msgid "Revert"
 msgstr ""
 
 #. Save
 #: i18n/english/luasrc/i18n/default.en.lua:80
-msgid "save"
+msgid "Save"
 msgstr "保存"
 
 #. Save &amp; Apply
 #: i18n/english/luasrc/i18n/default.en.lua:81
-msgid "saveapply"
+msgid "Save & Apply"
 msgstr "保存&amp;amp; 应用"
 
 #. Scan
 #: i18n/english/luasrc/i18n/default.en.lua:82
-msgid "scan"
+msgid "Scan"
 msgstr "搜索"
 
 #. Service
 #: i18n/english/luasrc/i18n/default.en.lua:83
-msgid "service"
+msgid "Service"
 msgstr ""
 
 #. Services
 #: i18n/english/luasrc/i18n/default.en.lua:84
-msgid "services"
+msgid "Services"
 msgstr ""
 
 #. Settings
 #: i18n/english/luasrc/i18n/default.en.lua:85
-msgid "settings"
+msgid "Settings"
 msgstr "设置"
 
 #. Size
 #: i18n/english/luasrc/i18n/default.en.lua:86
-msgid "size"
+msgid "Size"
 msgstr ""
 
 #. Source
 #: i18n/english/luasrc/i18n/default.en.lua:87
-msgid "source"
+msgid "Source"
 msgstr ""
 
 #. Start
 #: i18n/english/luasrc/i18n/default.en.lua:88
-msgid "start"
+msgid "Start"
 msgstr "开始"
 
 #. static
@@ -458,72 +458,72 @@ msgstr "静态"
 
 #. Status
 #: i18n/english/luasrc/i18n/default.en.lua:90
-msgid "status"
+msgid "Status"
 msgstr "状态"
 
 #. Statistics
 #: i18n/english/luasrc/i18n/default.en.lua:91
-msgid "statistics"
+msgid "Statistics"
 msgstr "统计"
 
 #. Submit
 #: i18n/english/luasrc/i18n/default.en.lua:92
-msgid "submit"
+msgid "Submit"
 msgstr "提交"
 
 #. System Log
 #: i18n/english/luasrc/i18n/default.en.lua:93
-msgid "syslog"
+msgid "System Log"
 msgstr "系统日志"
 
 #. System
 #: i18n/english/luasrc/i18n/default.en.lua:94
-msgid "system"
+msgid "System"
 msgstr "系统"
 
 #. Target
 #: i18n/english/luasrc/i18n/default.en.lua:95
-msgid "target"
+msgid "Target"
 msgstr ""
 
 #. Timezone
 #: i18n/english/luasrc/i18n/default.en.lua:96
-msgid "timezone"
+msgid "Timezone"
 msgstr "时区"
 
 #. Type
 #: i18n/english/luasrc/i18n/default.en.lua:97
-msgid "type"
+msgid "Type"
 msgstr "类型"
 
 #. Unknown Error
 #: i18n/english/luasrc/i18n/default.en.lua:98
-msgid "unknownerror"
+msgid "Unknown Error"
 msgstr "未知错误"
 
 #. Unsaved Changes
 #: i18n/english/luasrc/i18n/default.en.lua:99
-msgid "unsavedchanges"
+msgid "Unsaved Changes"
 msgstr "不保存更改"
 
 #. Username
 #: i18n/english/luasrc/i18n/default.en.lua:100
-msgid "username"
+msgid "Username"
 msgstr "用户名"
 
 #. Version
 #: i18n/english/luasrc/i18n/default.en.lua:101
-msgid "version"
+msgid "Version"
 msgstr "版本"
 
 #. Web <abbr title=\"User Interface\">UI</abbr>
 #: i18n/english/luasrc/i18n/default.en.lua:102
-msgid "webui"
+msgid "Web <abbr title=\"User Interface\">UI</abbr>"
 msgstr ""
 
 #. Wifi
 #: i18n/english/luasrc/i18n/default.en.lua:103
-msgid "wifi"
+msgid "Wifi"
 msgstr "Wifi"
 
 #. Zone
diff --git a/po/zh_CN/freifunk.po b/po/zh_CN/freifunk.po
index d4fc867fe..3a8b1d15f 100644
--- a/po/zh_CN/freifunk.po
+++ b/po/zh_CN/freifunk.po
@@ -13,201 +13,201 @@ msgstr ""
 
 #. Hello and welcome in the network of
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:1
-msgid "ff_hellonet"
+msgid "Hello and welcome in the network of"
 msgstr ""
 
 #. We are an initiative to establish a free, independent and open wireless mesh network.
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:2
-msgid "ff_public1"
+msgid "We are an initiative to establish a free, independent and open wireless mesh network."
 msgstr ""
 
 #. This is the access point
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:3
-msgid "ff_public2"
+msgid "This is the access point"
 msgstr ""
 
 #. It is operated by
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:4
-msgid "ff_public3"
+msgid "It is operated by"
 msgstr ""
 
 #. You can find further information about the global Freifunk initiative at
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:5
-msgid "ff_public4"
+msgid "You can find further information about the global Freifunk initiative at"
 msgstr ""
 
 #. If you are interested in our project then contact the local community
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:6
-msgid "ff_public5"
+msgid "If you are interested in our project then contact the local community"
 msgstr ""
 
 #. Internet access depends on technical and organisational conditions and may or may not work for you.
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:7
-msgid "ff_public6"
+msgid "Internet access depends on technical and organisational conditions and may or may not work for you."
 msgstr ""
 
 #. Location
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:8
-msgid "ff_location"
+msgid "Location"
 msgstr ""
 
 #. E-Mail
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:9
-msgid "ff_mail"
+msgid "E-Mail"
 msgstr "Email"
 
 #. You really should provide your address here!
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:10
-msgid "ff_mail1"
+msgid "You really should provide your address here!"
 msgstr ""
 
 #. Nickname
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:11
-msgid "ff_nickname"
+msgid "Nickname"
 msgstr ""
 
 #. Realname
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:12
-msgid "ff_name"
+msgid "Realname"
 msgstr ""
 
 #. Node
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:13
-msgid "ff_node"
+msgid "Node"
 msgstr ""
 
 #. Notice
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:14
-msgid "ff_note"
+msgid "Notice"
 msgstr ""
 
 #. Phone
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:15
-msgid "ff_phone"
+msgid "Phone"
 msgstr "电话"
 
 #. Memory
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:16
-msgid "ff_ram"
+msgid "Memory"
 msgstr "内存"
 
 #. Free
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:17
-msgid "ff_free"
+msgid "Free"
 msgstr ""
 
 #. Buffers
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:18
-msgid "ff_buffers"
+msgid "Buffers"
 msgstr "缓冲"
 
 #. Cached
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:19
-msgid "ff_cached"
+msgid "Cached"
 msgstr "缓存"
 
 #. Total
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:20
-msgid "ff_total"
+msgid "Total"
 msgstr "总共"
 
 #. Coordinates
 #: modules/freifunk/luasrc/i18n/freifunk.en.lua:21
-msgid "ff_geocoord"
+msgid "Coordinates"
 msgstr ""
 
 #. Client-Splash
-msgid "ff_splash"
+msgid "Client-Splash"
 msgstr ""
 
 #. Active Clients
-msgid "ff_splash_clients"
+msgid "Active Clients"
 msgstr ""
 
 #. Hostname
-msgid "ff_splash_hostname"
+msgid "Hostname"
 msgstr "主机名"
 
 #. IP Address
-msgid "ff_splash_ip"
+msgid "IP Address"
 msgstr "IP地址"
 
 #. MAC Address
-msgid "ff_splash_mac"
+msgid "MAC Address"
 msgstr "MAC地址"
 
 #. Time remaining
-msgid "ff_splash_timeleft"
+msgid "Time remaining"
 msgstr ""
 
 #. Outgoing traffic
-msgid "ff_splash_traffic"
+msgid "Traffic (down/up)"
 msgstr ""
 
 #. Policy
-msgid "ff_splash_policy"
+msgid "Policy"
 msgstr "策略"
 
 #. unknown
-msgid "ff_splash_unknown"
+msgid "unknown"
 msgstr "未知"
 
 #. expired
-msgid "ff_splash_expired"
+msgid "expired"
 msgstr ""
 
 #. whitelisted
-msgid "ff_splash_whitelisted"
+msgid "whitelisted"
 msgstr ""
 
 #. splashed
-msgid "ff_splash_splashed"
+msgid "splashed"
 msgstr ""
 
 #. blacklisted
-msgid "ff_splash_blacklisted"
+msgid "blacklisted"
 msgstr ""
 
 #. temporarily blocked
-msgid "ff_splash_tempblock"
+msgid "temporarily blocked"
 msgstr ""
 
 #. No clients connected
-msgid "ff_splash_noclients"
+msgid "No clients connected"
 msgstr ""
 
 #. P2P-Block
-msgid "ff_p2pblock"
+msgid "P2P-Block"
 msgstr ""
 
 #. P2P-Block is a greylisting mechanism to block various peer-to-peer protocols for non-whitelisted clients.
-msgid "ff_p2pblock_desc"
+msgid "P2P-Block is a greylisting mechanism to block various peer-to-peer protocols for non-whitelisted clients."
 msgstr ""
 
 #. Enable P2P-Block
-msgid "ff_p2pblock_enabled"
+msgid "Enable P2P-Block"
 msgstr "启用 P2P-Block"
 
 #. Portrange
-msgid "ff_p2pblock_portrange"
+msgid "Portrange"
 msgstr ""
 
 #. Block Time
-msgid "ff_p2pblock_blocktime"
+msgid "Block Time"
 msgstr ""
 
 #. seconds
-msgid "ff_p2pblock_blocktime_desc"
+msgid "seconds"
 msgstr ""
 
 #. Whitelisted IPs
-msgid "ff_p2pblock_whitelist"
+msgid "Whitelisted IPs"
 msgstr ""
 
 #. Layer7-Protokolle
-msgid "ff_p2pblock_layer7"
+msgid "Layer7-Protocols"
 msgstr ""
 
 #. IP-P2P
-msgid "ff_p2pblock_ipp2p"
+msgid "IP-P2P"
 msgstr "IP-P2P"
diff --git a/po/zh_CN/hd_idle.po b/po/zh_CN/hd_idle.po
index 9171d4919..d4e5ce801 100644
--- a/po/zh_CN/hd_idle.po
+++ b/po/zh_CN/hd_idle.po
@@ -13,35 +13,35 @@ msgstr ""
 
 #. Disk
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:1
-msgid "disk"
+msgid "Disk"
 msgstr ""
 
 #. Enable debug
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:2
-msgid "enable_debug"
+msgid "Enable debug"
 msgstr "启用debug"
 
 #. hd-idle
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:3
-msgid "hd_idle"
+msgid "hd-idle"
 msgstr "hd-idle"
 
 #. hd-idle is a utility program for spinning-down external disks after a period of idle time.
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:4
-msgid "hd_idle_desc"
+msgid "hd-idle is a utility program for spinning-down external disks after a period of idle time."
 msgstr ""
 
 #. Idle-Time
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:5
-msgid "idle_time_interval"
+msgid "Idle-Time"
 msgstr "Idle-Time"
 
 #. Idle-Time unit
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:6
-msgid "idle_time_unit"
+msgid "Idle-Time unit"
 msgstr "Idle-Time 单元"
 
 #. Settings
 #: applications/luci-hd_idle/luasrc/i18n/hd_idle.en.lua:7
-msgid "settings"
+msgid "Settings"
 msgstr "设置"
diff --git a/po/zh_CN/initmgr.po b/po/zh_CN/initmgr.po
index b1ba29bd4..46cc12568 100644
--- a/po/zh_CN/initmgr.po
+++ b/po/zh_CN/initmgr.po
@@ -13,22 +13,22 @@ msgstr ""
 
 #. Initscripts
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:1
-msgid "initmgr"
+msgid "Initscripts"
 msgstr ""
 
 #. You can enable or disable installed init scripts here. Changes will applied after a device reboot.<br /><strong>Warning: If you disable essential init scripts like &quot;network&quot;, your device might become inaccesable!</strong>
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:2
-msgid "initmgr_desc"
+msgid "You can enable or disable installed init scripts here. Changes will applied after a device reboot.<br /><strong>Warning: If you disable essential init scripts like \"network\", your device might become inaccesable!</strong>"
 msgstr ""
 
 #. Start priority
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:3
-msgid "initmgr_index"
+msgid "Start priority"
 msgstr ""
 
 #. Initscript
 #: applications/luci-initmgr/luasrc/i18n/initmgr.en.lua:4
-msgid "initmgr_name"
+msgid "Initscript"
 msgstr ""
 
 #. Enable/Disable
diff --git a/po/zh_CN/luci-fw.po b/po/zh_CN/luci-fw.po
index 8daac03b1..3526e6ebc 100644
--- a/po/zh_CN/luci-fw.po
+++ b/po/zh_CN/luci-fw.po
@@ -13,277 +13,277 @@ msgstr ""
 
 #. Port forwarding
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:1
-msgid "fw_portfw"
+msgid "Port forwarding"
 msgstr ""
 
 #. Traffic Redirection
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:2
-msgid "fw_redirect"
+msgid "Traffic Redirection"
 msgstr ""
 
 #. Traffic redirection allows you to change the destination address of forwarded packets.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:3
-msgid "fw_redirect_desc"
+msgid "Traffic redirection allows you to change the destination address of forwarded packets."
 msgstr ""
 
 #. Zone-to-Zone traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:4
-msgid "fw_forwarding"
+msgid "Zone-to-Zone traffic"
 msgstr ""
 
 #. Firewall
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:5
-msgid "fw_fw"
+msgid "Firewall"
 msgstr "防火墙"
 
 #. Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:6
-msgid "fw_zone"
+msgid "Zone"
 msgstr "区"
 
 #. Zones
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:7
-msgid "fw_zones"
+msgid "Zones"
 msgstr "区"
 
 #. Custom forwarding
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:8
-msgid "fw_custfwd"
+msgid "Custom forwarding"
 msgstr ""
 
 #. The firewall creates zones over your network interfaces to control network traffic flow.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:9
-msgid "fw_fw1"
+msgid "The firewall creates zones over your network interfaces to control network traffic flow."
 msgstr ""
 
 #. Advanced Rules
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:10
-msgid "firewall_rule"
+msgid "Advanced Rules"
 msgstr ""
 
 #. Advanced rules let you customize the firewall to your needs. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:11
-msgid "firewall_rule_desc"
+msgid "Advanced rules let you customize the firewall to your needs. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall."
 msgstr ""
 
 #. Input Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:12
-msgid "firewall_rule_src"
+msgid "Input Zone"
 msgstr ""
 
 #. Output Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:13
-msgid "firewall_rule_dest"
+msgid "Output Zone"
 msgstr ""
 
 #. Source address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:14
-msgid "firewall_rule_srcip"
+msgid "Source address"
 msgstr ""
 
 #. Destination address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:15
-msgid "firewall_rule_destip"
+msgid "Destination address"
 msgstr ""
 
 #. Source MAC-Address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:16
-msgid "firewall_rule_srcmac"
+msgid "Source MAC-Address"
 msgstr ""
 
 #. Source port
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:17
-msgid "firewall_rule_srcport"
+msgid "Source port"
 msgstr ""
 
 #. Destination port
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:18
-msgid "firewall_rule_destport"
+msgid "Destination port"
 msgstr ""
 
 #. Action
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:19
-msgid "firewall_rule_target"
+msgid "Action"
 msgstr ""
 
 #. accept
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:20
-msgid "fw_accept"
+msgid "accept"
 msgstr ""
 
 #. reject
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:21
-msgid "fw_reject"
+msgid "reject"
 msgstr ""
 
 #. drop
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:22
-msgid "fw_drop"
+msgid "drop"
 msgstr ""
 
 #. Source
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:23
-msgid "fw_src"
+msgid "Source"
 msgstr ""
 
 #. Destination
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:24
-msgid "fw_dest"
+msgid "Destination"
 msgstr ""
 
 #. Traffic Control
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:25
-msgid "fw_traffic"
+msgid "Traffic Control"
 msgstr ""
 
 #. MSS Clamping
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:26
-msgid "fw_mtufix"
+msgid "MSS Clamping"
 msgstr ""
 
 #. Drop invalid packets
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:27
-msgid "fw_dropinvalid"
+msgid "Drop invalid packets"
 msgstr ""
 
 #. Port forwarding allows to provide network services in the internal network to an external network.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:28
-msgid "fw_portfw1"
+msgid "Port forwarding allows to provide network services in the internal network to an external network."
 msgstr ""
 
 #. External Zone
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:29
-msgid "firewall_redirect_src_desc"
+msgid "External Zone"
 msgstr ""
 
 #. External port
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:30
-msgid "firewall_redirect_srcdport"
+msgid "External port"
 msgstr ""
 
 #. port or range as first-last
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:31
-msgid "firewall_redirect_srcdport_desc"
+msgid "port or range as first-last"
 msgstr ""
 
 #. Source address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:32
-msgid "firewall_redirect_srcip"
+msgid "Source address"
 msgstr ""
 
 #. Source MAC
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:33
-msgid "firewall_redirect_srcmac"
+msgid "Source MAC"
 msgstr ""
 
 #. Internal address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:34
-msgid "firewall_redirect_destip"
+msgid "Internal address"
 msgstr ""
 
 #. IP-Address
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:35
-msgid "firewall_redirect_destip_desc"
+msgid "IP-Address"
 msgstr ""
 
 #. Internal port (optional)
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:36
-msgid "firewall_redirect_destport"
+msgid "Internal port (optional)"
 msgstr ""
 
 #. port or range as first-last
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:37
-msgid "firewall_redirect_destport_desc"
+msgid "port or range as first-last"
 msgstr ""
 
 #. Here you can specify which network traffic is allowed to flow between network zones. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall. If you experience occasional connection problems try enabling MSS Clamping otherwise disable it for performance reasons.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:38
-msgid "fw_forwarding1"
+msgid "Here you can specify which network traffic is allowed to flow between network zones. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall. If you experience occasional connection problems try enabling MSS Clamping otherwise disable it for performance reasons."
 msgstr ""
 
 #. Input
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:39
-msgid "firewall_forwarding_src"
+msgid "Input"
 msgstr ""
 
 #. Output
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:40
-msgid "firewall_forwarding_dest"
+msgid "Output"
 msgstr ""
 
 #. Defaults
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:41
-msgid "firewall_defaults"
+msgid "Defaults"
 msgstr ""
 
 #. These are the default settings that are used if no other rules match.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:42
-msgid "firewall_defaults_desc"
+msgid "These are the default settings that are used if no other rules match."
 msgstr ""
 
 #. SYN-flood protection
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:43
-msgid "firewall_defaults_synflood"
+msgid "SYN-flood protection"
 msgstr ""
 
 #. Incoming Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:44
-msgid "firewall_defaults_input"
+msgid "Incoming Traffic"
 msgstr ""
 
 #. Outgoing Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:45
-msgid "firewall_defaults_output"
+msgid "Outgoing Traffic"
 msgstr ""
 
 #. Forwarded Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:46
-msgid "firewall_defaults_forward"
+msgid "Forwarded Traffic"
 msgstr ""
 
 #. Zones part the network interfaces into certain isolated areas to separate network traffic. One or more networks can belong to a zone. The MASQ-flag enables NAT masquerading for all outgoing traffic on this zone.
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:47
-msgid "firewall_zone_desc"
+msgid "Zones part the network interfaces into certain isolated areas to separate network traffic. One or more networks can belong to a zone. The MASQ-flag enables NAT masquerading for all outgoing traffic on this zone."
 msgstr ""
 
 #. Incoming Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:48
-msgid "firewall_zone_input"
+msgid "Incoming Traffic"
 msgstr ""
 
 #. Default Policy
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:49
-msgid "firewall_zone_input_desc"
+msgid "Default Policy"
 msgstr ""
 
 #. Outgoing Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:50
-msgid "firewall_zone_output"
+msgid "Outgoing Traffic"
 msgstr ""
 
 #. Default Policy
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:51
-msgid "firewall_zone_output_desc"
+msgid "Default Policy"
 msgstr ""
 
 #. Forwarded Traffic
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:52
-msgid "firewall_zone_forward"
+msgid "Forwarded Traffic"
 msgstr ""
 
 #. Default Policy
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:53
-msgid "firewall_zone_forward_desc"
+msgid "Default Policy"
 msgstr ""
 
 #. MASQ
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:54
-msgid "firewall_zone_masq"
+msgid "MASQ"
 msgstr "MASQ"
 
 #. Networks
 #: applications/luci-fw/luasrc/i18n/luci-fw.en.lua:55
-msgid "firewall_zone_network"
+msgid "Networks"
 msgstr ""
 
 #. contained networks
diff --git a/po/zh_CN/mmc_over_gpio.po b/po/zh_CN/mmc_over_gpio.po
index daa4ce6fe..b472295da 100644
--- a/po/zh_CN/mmc_over_gpio.po
+++ b/po/zh_CN/mmc_over_gpio.po
@@ -13,15 +13,15 @@ msgstr ""
 
 #. MMC/SD driver configuration
 #: applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua:1
-msgid "mmc_over_gpio"
+msgid "MMC/SD driver configuration"
 msgstr "MMC/SD 驱动设置"
 
 #. MMC/SD driver configuration
 #: applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua:2
-msgid "mmc_over_gpio_desc"
+msgid "MMC/SD driver configuration"
 msgstr "MMC/SD 驱动设置"
 
 #. Settings
 #: applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua:3
-msgid "settings"
+msgid "Settings"
 msgstr "设置"
diff --git a/po/zh_CN/openvpn.po b/po/zh_CN/openvpn.po
index c3ab7db46..7139e919d 100644
--- a/po/zh_CN/openvpn.po
+++ b/po/zh_CN/openvpn.po
@@ -13,947 +13,947 @@ msgstr ""
 
 #. OpenVPN
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:1
-msgid "openvpn"
+msgid "OpenVPN"
 msgstr "OpenVPN"
 
 #. Switch to basic configuration
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:3
-msgid "openvpn_switch_basic"
+msgid "« Switch to basic configuration"
 msgstr "切换到基本配置"
 
 #. Switch to advanced configuration
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:4
-msgid "openvpn_switch_advanced"
+msgid "Switch to advanced configuration »"
 msgstr "切换到高级配置"
 
 #. Enabled
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:6
-msgid "openvpn_enable"
+msgid "Enabled"
 msgstr "启用"
 
 #. Started
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:7
-msgid "openvpn_active"
+msgid "Started"
 msgstr "开始"
 
 #. no
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:8
-msgid "openvpn_active_no"
+msgid "no"
 msgstr "no"
 
 #. yes (%i)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:9
-msgid "openvpn_active_yes"
+msgid "yes (%i)"
 msgstr "yes (%i)"
 
 #. Port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:10
-msgid "openvpn_port"
+msgid "Port"
 msgstr "端口"
 
 #. Protocol
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:11
-msgid "openvpn_proto"
+msgid "Protocol"
 msgstr "协议"
 
 #. Instance \"%s\"
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:13
-msgid "openvpn_instance"
+msgid "Instance \"%s\""
 msgstr ""
 
 #. OpenVPN instances
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:15
-msgid "openvpn_overview"
+msgid "OpenVPN instances"
 msgstr ""
 
 #. Below is a list of configured OpenVPN instances and their current state
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:16
-msgid "openvpn_overview_desc"
+msgid "Below is a list of configured OpenVPN instances and their current state"
 msgstr ""
 
 #. Daemon configuration
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:18
-msgid "openvpn_service"
+msgid "Daemon configuration"
 msgstr ""
 
 #. Networking options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:19
-msgid "openvpn_networking"
+msgid "Networking options"
 msgstr "网络操作"
 
 #. VPN options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:20
-msgid "openvpn_vpn"
+msgid "VPN options"
 msgstr "VPN操作"
 
 #. Cryptography settings
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:21
-msgid "openvpn_cryptography"
+msgid "Cryptography settings"
 msgstr "密码设置"
 
 #. Read configuration options from file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:23
-msgid "openvpn_param_config"
+msgid "Read configuration options from file"
 msgstr ""
 
 #. Local host name or ip address
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:24
-msgid "openvpn_param_local"
+msgid "Local host name or ip address"
 msgstr "本地主机名或者IP地址"
 
 #. Remote host name or ip address
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:25
-msgid "openvpn_param_remote"
+msgid "Remote host name or ip address"
 msgstr ""
 
 #. Randomly choose remote server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:26
-msgid "openvpn_param_remote_random"
+msgid "Randomly choose remote server"
 msgstr ""
 
 #. Major mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:27
-msgid "openvpn_param_mode"
+msgid "Major mode"
 msgstr ""
 
 #. Use protocol
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:28
-msgid "openvpn_param_proto"
+msgid "Use protocol"
 msgstr ""
 
 #. Connection retry interval
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:29
-msgid "openvpn_param_connect_retry"
+msgid "Connection retry interval"
 msgstr ""
 
 #. Connection timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:30
-msgid "openvpn_param_connect_timeout"
+msgid "Connection timeout"
 msgstr "连接超时"
 
 #. Maximum connection attempt retries
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:31
-msgid "openvpn_param_connect_retry_max"
+msgid "Maximum connection attempt retries"
 msgstr ""
 
 #. Try to sense proxy settings automatically
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:32
-msgid "openvpn_param_auto_proxy"
+msgid "Try to sense proxy settings automatically"
 msgstr ""
 
 #. Connect to remote host
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:33
-msgid "openvpn_param_http_proxy"
+msgid "Connect to remote host"
 msgstr "连接到远程主机"
 
 #. Retry indefinitely on HTTP proxy errors
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:34
-msgid "openvpn_param_http_proxy_retry"
+msgid "Retry indefinitely on HTTP proxy errors"
 msgstr ""
 
 #. Proxy timeout in seconds
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:35
-msgid "openvpn_param_http_proxy_timeout"
+msgid "Proxy timeout in seconds"
 msgstr ""
 
 #. Set extended HTTP proxy options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:36
-msgid "openvpn_param_http_proxy_option"
+msgid "Set extended HTTP proxy options"
 msgstr ""
 
 #. Connect through Socks5 proxy
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:37
-msgid "openvpn_param_socks_proxy"
+msgid "Connect through Socks5 proxy"
 msgstr ""
 
 #. Retry indefinitely on Socks proxy errors
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:38
-msgid "openvpn_param_socks_proxy_retry"
+msgid "Retry indefinitely on Socks proxy errors"
 msgstr ""
 
 #. If hostname resolve fails, retry
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:39
-msgid "openvpn_param_resolv_retry"
+msgid "If hostname resolve fails, retry"
 msgstr ""
 
 #. Allow remote to change its IP or port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:40
-msgid "openvpn_param_float"
+msgid "Allow remote to change its IP or port"
 msgstr ""
 
 #. Execute shell command on remote ip change
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:41
-msgid "openvpn_param_ipchange"
+msgid "Execute shell command on remote ip change"
 msgstr ""
 
 #. TCP/UDP port # for both local and remote
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:42
-msgid "openvpn_param_port"
+msgid "TCP/UDP port # for both local and remote"
 msgstr ""
 
 #. TCP/UDP port # for local (default=1194)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:43
-msgid "openvpn_param_lport"
+msgid "TCP/UDP port # for local (default=1194)"
 msgstr ""
 
 #. TCP/UDP port # for remote (default=1194)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:44
-msgid "openvpn_param_rport"
+msgid "TCP/UDP port # for remote (default=1194)"
 msgstr ""
 
 #. Bind to local address and port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:45
-msgid "openvpn_param_bind"
+msgid "Bind to local address and port"
 msgstr ""
 
 #. Do not bind to local address and port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:46
-msgid "openvpn_param_nobind"
+msgid "Do not bind to local address and port"
 msgstr ""
 
 #. tun/tap device
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:47
-msgid "openvpn_param_dev"
+msgid "tun/tap device"
 msgstr ""
 
 #. Type of used device
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:48
-msgid "openvpn_param_dev_type"
+msgid "Type of used device"
 msgstr ""
 
 #. Use tun/tap device node
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:49
-msgid "openvpn_param_dev_node"
+msgid "Use tun/tap device node"
 msgstr ""
 
 #. Set the link layer address of the tap device
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:50
-msgid "openvpn_param_lladdr"
+msgid "Set the link layer address of the tap device"
 msgstr ""
 
 #. 'net30', 'p2p', or 'subnet'
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:51
-msgid "openvpn_param_topology"
+msgid "'net30', 'p2p', or 'subnet'"
 msgstr ""
 
 #. Make tun device IPv6 capable
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:52
-msgid "openvpn_param_tun_ipv6"
+msgid "Make tun device IPv6 capable"
 msgstr ""
 
 #. Configure device to use IP address
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:53
-msgid "openvpn_param_ifconfig"
+msgid "Configure device to use IP address"
 msgstr ""
 
 #. Don't actually execute ifconfig
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:54
-msgid "openvpn_param_ifconfig_noexec"
+msgid "Don't actually execute ifconfig"
 msgstr ""
 
 #. Don't warn on ifconfig inconsistencies
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:55
-msgid "openvpn_param_ifconfig_nowarn"
+msgid "Don't warn on ifconfig inconsistencies"
 msgstr ""
 
 #. Add route after establishing connection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:56
-msgid "openvpn_param_route"
+msgid "Add route after establishing connection"
 msgstr ""
 
 #. Specify a default gateway for routes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:57
-msgid "openvpn_param_route_gateway"
+msgid "Specify a default gateway for routes"
 msgstr ""
 
 #. Specify a default metric for routes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:58
-msgid "openvpn_param_route_metric"
+msgid "Specify a default metric for routes"
 msgstr ""
 
 #. Delay n seconds after connection 
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:59
-msgid "openvpn_param_route_delay"
+msgid "Delay n seconds after connection "
 msgstr ""
 
 #. Execute shell cmd after routes are added
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:60
-msgid "openvpn_param_route_up"
+msgid "Execute shell cmd after routes are added"
 msgstr ""
 
 #. Don't add routes automatically
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:61
-msgid "openvpn_param_route_noexec"
+msgid "Don't add routes automatically"
 msgstr ""
 
 #. Don't pull options from server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:62
-msgid "openvpn_param_route_nopull"
+msgid "Don't pull options from server"
 msgstr ""
 
 #. Automatically redirect default route
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:63
-msgid "openvpn_param_redirect_gateway"
+msgid "Automatically redirect default route"
 msgstr ""
 
 #. Pass environment variables to script
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:64
-msgid "openvpn_param_setenv"
+msgid "Pass environment variables to script"
 msgstr ""
 
 #. Shaping for peer bandwidth
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:65
-msgid "openvpn_param_shaper"
+msgid "Shaping for peer bandwidth"
 msgstr ""
 
 #. Set timeouts in server mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:66
-msgid "openvpn_param_keepalive"
+msgid "Set timeouts in server mode"
 msgstr ""
 
 #. tun/tap inactivity timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:67
-msgid "openvpn_param_inactive"
+msgid "tun/tap inactivity timeout"
 msgstr ""
 
 #. Remote ping timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:68
-msgid "openvpn_param_ping_exit"
+msgid "Remote ping timeout"
 msgstr ""
 
 #. Restart after remote ping timeout
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:69
-msgid "openvpn_param_ping_restart"
+msgid "Restart after remote ping timeout"
 msgstr ""
 
 #. Only process ping timeouts if routes exist
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:70
-msgid "openvpn_param_ping_timer_rem"
+msgid "Only process ping timeouts if routes exist"
 msgstr ""
 
 #. Ping remote every n seconds over TCP/UDP port
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:71
-msgid "openvpn_param_ping"
+msgid "Ping remote every n seconds over TCP/UDP port"
 msgstr ""
 
 #. Configure a multi-homed UDP server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:72
-msgid "openvpn_param_multihome"
+msgid "Configure a multi-homed UDP server"
 msgstr ""
 
 #. Optimize TUN/TAP/UDP writes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:73
-msgid "openvpn_param_fast_io"
+msgid "Optimize TUN/TAP/UDP writes"
 msgstr ""
 
 #. Remap SIGUSR1 signals
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:74
-msgid "openvpn_param_remap_usr1"
+msgid "Remap SIGUSR1 signals"
 msgstr ""
 
 #. Keep tun/tap device open on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:75
-msgid "openvpn_param_persist_tun"
+msgid "Keep tun/tap device open on restart"
 msgstr ""
 
 #. Keep remote IP address on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:76
-msgid "openvpn_param_persist_remote_ip"
+msgid "Keep remote IP address on restart"
 msgstr ""
 
 #. Keep local IP address on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:77
-msgid "openvpn_param_persist_local_ip"
+msgid "Keep local IP address on restart"
 msgstr ""
 
 #. Don't re-read key on restart
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:78
-msgid "openvpn_param_persist_key"
+msgid "Don't re-read key on restart"
 msgstr ""
 
 #. TOS passthrough (applies to IPv4 only)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:79
-msgid "openvpn_param_passtos"
+msgid "TOS passthrough (applies to IPv4 only)"
 msgstr ""
 
 #. Set tun/tap device MTU
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:80
-msgid "openvpn_param_tun_mtu"
+msgid "Set tun/tap device MTU"
 msgstr ""
 
 #. Set tun/tap device overhead
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:81
-msgid "openvpn_param_tun_mtu_extra"
+msgid "Set tun/tap device overhead"
 msgstr ""
 
 #. Set TCP/UDP MTU
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:82
-msgid "openvpn_param_link_mtu"
+msgid "Set TCP/UDP MTU"
 msgstr ""
 
 #. Enable Path MTU discovery
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:83
-msgid "openvpn_param_mtu_disc"
+msgid "Enable Path MTU discovery"
 msgstr ""
 
 #. Empirically measure MTU
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:84
-msgid "openvpn_param_mtu_test"
+msgid "Empirically measure MTU"
 msgstr ""
 
 #. Enable internal datagram fragmentation
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:85
-msgid "openvpn_param_fragment"
+msgid "Enable internal datagram fragmentation"
 msgstr ""
 
 #. Set upper bound on TCP MSS
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:86
-msgid "openvpn_param_mssfix"
+msgid "Set upper bound on TCP MSS"
 msgstr ""
 
 #. Set the TCP/UDP send buffer size
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:87
-msgid "openvpn_param_sndbuf"
+msgid "Set the TCP/UDP send buffer size"
 msgstr ""
 
 #. Set the TCP/UDP receive buffer size
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:88
-msgid "openvpn_param_rcvbuf"
+msgid "Set the TCP/UDP receive buffer size"
 msgstr ""
 
 #. Set tun/tap TX queue length
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:89
-msgid "openvpn_param_txqueuelen"
+msgid "Set tun/tap TX queue length"
 msgstr ""
 
 #. Disable Paging
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:90
-msgid "openvpn_param_mlock"
+msgid "Disable Paging"
 msgstr ""
 
 #. Shell cmd to execute after tun device open
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:91
-msgid "openvpn_param_up"
+msgid "Shell cmd to execute after tun device open"
 msgstr ""
 
 #. Delay tun/tap open and up script execution
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:92
-msgid "openvpn_param_up_delay"
+msgid "Delay tun/tap open and up script execution"
 msgstr ""
 
 #. Shell cmd to run after tun device close
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:93
-msgid "openvpn_param_down"
+msgid "Shell cmd to run after tun device close"
 msgstr ""
 
 #. Call down cmd/script before TUN/TAP close
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:94
-msgid "openvpn_param_down_pre"
+msgid "Call down cmd/script before TUN/TAP close"
 msgstr ""
 
 #. Run up/down scripts for all restarts
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:95
-msgid "openvpn_param_up_restart"
+msgid "Run up/down scripts for all restarts"
 msgstr ""
 
 #. Set UID to user
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:96
-msgid "openvpn_param_user"
+msgid "Set UID to user"
 msgstr ""
 
 #. Set GID to group
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:97
-msgid "openvpn_param_group"
+msgid "Set GID to group"
 msgstr ""
 
 #. Chroot to directory after initialization
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:98
-msgid "openvpn_param_chroot"
+msgid "Chroot to directory after initialization"
 msgstr ""
 
 #. Change to directory before initialization
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:99
-msgid "openvpn_param_cd"
+msgid "Change to directory before initialization"
 msgstr ""
 
 #. Daemonize after initialization
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:100
-msgid "openvpn_param_daemon"
+msgid "Daemonize after initialization"
 msgstr ""
 
 #. Output to syslog and do not daemonize
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:101
-msgid "openvpn_param_syslog"
+msgid "Output to syslog and do not daemonize"
 msgstr ""
 
 #. Run as an inetd or xinetd server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:102
-msgid "openvpn_param_inetd"
+msgid "Run as an inetd or xinetd server"
 msgstr ""
 
 #. Write log to file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:103
-msgid "openvpn_param_log"
+msgid "Write log to file"
 msgstr ""
 
 #. Append log to file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:104
-msgid "openvpn_param_log_append"
+msgid "Append log to file"
 msgstr ""
 
 #. Don't log timestamps
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:105
-msgid "openvpn_param_suppress_timestamps"
+msgid "Don't log timestamps"
 msgstr ""
 
 #. Write process ID to file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:106
-msgid "openvpn_param_writepid"
+msgid "Write process ID to file"
 msgstr ""
 
 #. Change process priority
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:107
-msgid "openvpn_param_nice"
+msgid "Change process priority"
 msgstr ""
 
 #. Echo parameters to log
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:108
-msgid "openvpn_param_echo"
+msgid "Echo parameters to log"
 msgstr ""
 
 #. Set output verbosity
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:109
-msgid "openvpn_param_verb"
+msgid "Set output verbosity"
 msgstr ""
 
 #. Limit repeated log messages
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:110
-msgid "openvpn_param_mute"
+msgid "Limit repeated log messages"
 msgstr ""
 
 #. Write status to file every n seconds
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:111
-msgid "openvpn_param_status"
+msgid "Write status to file every n seconds"
 msgstr ""
 
 #. Status file format version
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:112
-msgid "openvpn_param_status_version"
+msgid "Status file format version"
 msgstr ""
 
 #. Disable options consistency check
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:113
-msgid "openvpn_param_disable_occ"
+msgid "Disable options consistency check"
 msgstr ""
 
 #. Special stress testing mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:114
-msgid "openvpn_param_gremlin"
+msgid "Special stress testing mode"
 msgstr ""
 
 #. Use fast LZO compression
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:115
-msgid "openvpn_param_comp_lzo"
+msgid "Use fast LZO compression"
 msgstr ""
 
 #. Don't use adaptive lzo compression
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:116
-msgid "openvpn_param_comp_noadapt"
+msgid "Don't use adaptive lzo compression"
 msgstr ""
 
 #. Enable management interface on <em>IP</em> <em>port</em>
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:117
-msgid "openvpn_param_management"
+msgid "Enable management interface on <em>IP</em> <em>port</em>"
 msgstr ""
 
 #. Management interface will connect as a TCP client
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:118
-msgid "openvpn_param_management_client"
+msgid "Management interface will connect as a TCP client"
 msgstr ""
 
 #. Query management channel for private key
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:119
-msgid "openvpn_param_management_query_passwords"
+msgid "Query management channel for private key"
 msgstr ""
 
 #. Start OpenVPN in a hibernating state
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:120
-msgid "openvpn_param_management_hold"
+msgid "Start OpenVPN in a hibernating state"
 msgstr ""
 
 #. Issue SIGUSR1 on management disconnect
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:121
-msgid "openvpn_param_management_signal"
+msgid "Issue SIGUSR1 on management disconnect"
 msgstr ""
 
 #. Forget passwords on management disconnect
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:122
-msgid "openvpn_param_management_forget_disconnect"
+msgid "Forget passwords on management disconnect"
 msgstr ""
 
 #. Number of lines for log file history
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:123
-msgid "openvpn_param_management_log_cache"
+msgid "Number of lines for log file history"
 msgstr ""
 
 #. Load plug-in module
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:124
-msgid "openvpn_param_plugin"
+msgid "Load plug-in module"
 msgstr ""
 
 #. Configure server mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:125
-msgid "openvpn_param_server"
+msgid "Configure server mode"
 msgstr ""
 
 #. Configure server bridge
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:126
-msgid "openvpn_param_server_bridge"
+msgid "Configure server bridge"
 msgstr ""
 
 #. Push options to peer
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:127
-msgid "openvpn_param_push"
+msgid "Push options to peer"
 msgstr ""
 
 #. Don't inherit global push options
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:128
-msgid "openvpn_param_push_reset"
+msgid "Don't inherit global push options"
 msgstr ""
 
 #. Set aside a pool of subnets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:129
-msgid "openvpn_param_ifconfig_pool"
+msgid "Set aside a pool of subnets"
 msgstr ""
 
 #. Use individual addresses rather than /30 subnets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:130
-msgid "openvpn_param_ifconfig_pool_linear"
+msgid "Use individual addresses rather than /30 subnets"
 msgstr ""
 
 #. Persist/unpersist ifconfig-pool
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:131
-msgid "openvpn_param_ifconfig_pool_persist"
+msgid "Persist/unpersist ifconfig-pool"
 msgstr ""
 
 #. Push an ifconfig option to remote
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:132
-msgid "openvpn_param_ifconfig_push"
+msgid "Push an ifconfig option to remote"
 msgstr ""
 
 #. Route subnet to client
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:133
-msgid "openvpn_param_iroute"
+msgid "Route subnet to client"
 msgstr ""
 
 #. Client is disabled
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:134
-msgid "openvpn_param_disable"
+msgid "Client is disabled"
 msgstr ""
 
 #. Don't require client certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:135
-msgid "openvpn_param_client_cert_not_required"
+msgid "Don't require client certificate"
 msgstr ""
 
 #. Use username as common name
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:136
-msgid "openvpn_param_username_as_common_name"
+msgid "Use username as common name"
 msgstr ""
 
 #. Script to verify interactive authentication
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:137
-msgid "openvpn_param_auth_user_pass_verify"
+msgid "Script to verify interactive authentication"
 msgstr ""
 
 #. Allow client-to-client traffic
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:138
-msgid "openvpn_param_client_to_client"
+msgid "Allow client-to-client traffic"
 msgstr ""
 
 #. Allow multiple clients with same certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:139
-msgid "openvpn_param_duplicate_cn"
+msgid "Allow multiple clients with same certificate"
 msgstr ""
 
 #. Run script cmd on client connection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:140
-msgid "openvpn_param_client_connect"
+msgid "Run script cmd on client connection"
 msgstr ""
 
 #. Run script cmd on client disconnection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:141
-msgid "openvpn_param_client_disconnect"
+msgid "Run script cmd on client disconnection"
 msgstr ""
 
 #. Directory for custom client config files
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:142
-msgid "openvpn_param_client_config_dir"
+msgid "Directory for custom client config files"
 msgstr ""
 
 #. Refuse connection if no custom client config
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:143
-msgid "openvpn_param_ccd_exclusive"
+msgid "Refuse connection if no custom client config"
 msgstr ""
 
 #. Temporary directory for client-connect return file
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:144
-msgid "openvpn_param_tmp_dir"
+msgid "Temporary directory for client-connect return file"
 msgstr ""
 
 #. Set size of real and virtual address hash tables
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:145
-msgid "openvpn_param_hash_size"
+msgid "Set size of real and virtual address hash tables"
 msgstr ""
 
 #. Number of allocated broadcast buffers
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:146
-msgid "openvpn_param_bcast_buffers"
+msgid "Number of allocated broadcast buffers"
 msgstr ""
 
 #. Maximum number of queued TCP output packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:147
-msgid "openvpn_param_tcp_queue_limit"
+msgid "Maximum number of queued TCP output packets"
 msgstr ""
 
 #. Script to validate client virtual addresses
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:148
-msgid "openvpn_param_learn_address"
+msgid "Script to validate client virtual addresses"
 msgstr ""
 
 #. Allowed maximum of new connections
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:149
-msgid "openvpn_param_connect_freq"
+msgid "Allowed maximum of new connections"
 msgstr ""
 
 #. Allowed maximum of connected clients
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:150
-msgid "openvpn_param_max_clients"
+msgid "Allowed maximum of connected clients"
 msgstr ""
 
 #. Allowed maximum of internal
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:151
-msgid "openvpn_param_max_routes_per_client"
+msgid "Allowed maximum of internal"
 msgstr ""
 
 #. Proxy incoming HTTPS sessions
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:152
-msgid "openvpn_param_port_share"
+msgid "Proxy incoming HTTPS sessions"
 msgstr ""
 
 #. Configure client mode
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:153
-msgid "openvpn_param_client"
+msgid "Configure client mode"
 msgstr ""
 
 #. Authenticate using username/password
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:154
-msgid "openvpn_param_auth_user_pass"
+msgid "Authenticate using username/password"
 msgstr ""
 
 #. Accept options pushed from server
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:155
-msgid "openvpn_param_pull"
+msgid "Accept options pushed from server"
 msgstr ""
 
 #. Handling of authentication failures
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:156
-msgid "openvpn_param_auth_retry"
+msgid "Handling of authentication failures"
 msgstr ""
 
 #. Send notification to peer on disconnect
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:157
-msgid "openvpn_param_explicit_exit_notify"
+msgid "Send notification to peer on disconnect"
 msgstr ""
 
 #. Enable Static Key encryption mode (non-TLS)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:158
-msgid "openvpn_param_secret"
+msgid "Enable Static Key encryption mode (non-TLS)"
 msgstr ""
 
 #. HMAC authentication for packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:159
-msgid "openvpn_param_auth"
+msgid "HMAC authentication for packets"
 msgstr ""
 
 #. Encryption cipher for packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:160
-msgid "openvpn_param_cipher"
+msgid "Encryption cipher for packets"
 msgstr ""
 
 #. Size of cipher key
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:161
-msgid "openvpn_param_keysize"
+msgid "Size of cipher key"
 msgstr ""
 
 #. Enable OpenSSL hardware crypto engines
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:162
-msgid "openvpn_param_engine"
+msgid "Enable OpenSSL hardware crypto engines"
 msgstr ""
 
 #. Disable replay protection
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:163
-msgid "openvpn_param_no_replay"
+msgid "Disable replay protection"
 msgstr ""
 
 #. Silence the output of replay warnings
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:164
-msgid "openvpn_param_mute_replay_warnings"
+msgid "Silence the output of replay warnings"
 msgstr ""
 
 #. Replay protection sliding window size
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:165
-msgid "openvpn_param_replay_window"
+msgid "Replay protection sliding window size"
 msgstr ""
 
 #. Disable cipher initialisation vector
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:166
-msgid "openvpn_param_no_iv"
+msgid "Disable cipher initialisation vector"
 msgstr ""
 
 #. Persist replay-protection state
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:167
-msgid "openvpn_param_replay_persist"
+msgid "Persist replay-protection state"
 msgstr ""
 
 #. Run a self-test of crypto features
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:168
-msgid "openvpn_param_test_crypto"
+msgid "Run a self-test of crypto features"
 msgstr ""
 
 #. Enable TLS and assume server role
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:169
-msgid "openvpn_param_tls_server"
+msgid "Enable TLS and assume server role"
 msgstr ""
 
 #. Enable TLS and assume client role
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:170
-msgid "openvpn_param_tls_client"
+msgid "Enable TLS and assume client role"
 msgstr ""
 
 #. Data channel key exchange method
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:171
-msgid "openvpn_param_key_method"
+msgid "Data channel key exchange method"
 msgstr ""
 
 #. Certificate authority
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:172
-msgid "openvpn_param_ca"
+msgid "Certificate authority"
 msgstr ""
 
 #. Directory of trusted certificates (CAs and CRLs)
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:173
-msgid "openvpn_param_capath"
+msgid "Directory of trusted certificates (CAs and CRLs)"
 msgstr ""
 
 #. Diffie Hellman parameters
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:174
-msgid "openvpn_param_dh"
+msgid "Diffie Hellman parameters"
 msgstr ""
 
 #. Local certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:175
-msgid "openvpn_param_cert"
+msgid "Local certificate"
 msgstr ""
 
 #. Local private key
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:176
-msgid "openvpn_param_key"
+msgid "Local private key"
 msgstr ""
 
 #. PKCS#12 file containing keys
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:177
-msgid "openvpn_param_pkcs12"
+msgid "PKCS#12 file containing keys"
 msgstr ""
 
 #. TLS cipher
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:178
-msgid "openvpn_param_tls_cipher"
+msgid "TLS cipher"
 msgstr ""
 
 #. Retransmit timeout on TLS control channel
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:179
-msgid "openvpn_param_tls_timeout"
+msgid "Retransmit timeout on TLS control channel"
 msgstr ""
 
 #. Renegotiate data chan. key after bytes
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:180
-msgid "openvpn_param_reneg_bytes"
+msgid "Renegotiate data chan. key after bytes"
 msgstr ""
 
 #. Renegotiate data chan. key after packets
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:181
-msgid "openvpn_param_reneg_pkts"
+msgid "Renegotiate data chan. key after packets"
 msgstr ""
 
 #. Renegotiate data chan. key after seconds
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:182
-msgid "openvpn_param_reneg_sec"
+msgid "Renegotiate data chan. key after seconds"
 msgstr ""
 
 #. Timeframe for key exchange
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:183
-msgid "openvpn_param_hand_window"
+msgid "Timeframe for key exchange"
 msgstr ""
 
 #. Key transition window
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:184
-msgid "openvpn_param_tran_window"
+msgid "Key transition window"
 msgstr ""
 
 #. Allow only one session
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:185
-msgid "openvpn_param_single_session"
+msgid "Allow only one session"
 msgstr ""
 
 #. Exit on TLS negotiation failure
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:186
-msgid "openvpn_param_tls_exit"
+msgid "Exit on TLS negotiation failure"
 msgstr ""
 
 #. Additional authentication over TLS
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:187
-msgid "openvpn_param_tls_auth"
+msgid "Additional authentication over TLS"
 msgstr ""
 
 #. Get PEM password from controlling tty before we daemonize
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:188
-msgid "openvpn_param_askpass"
+msgid "Get PEM password from controlling tty before we daemonize"
 msgstr ""
 
 #. Don't cache --askpass or --auth-user-pass passwords
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:189
-msgid "openvpn_param_auth_nocache"
+msgid "Don't cache --askpass or --auth-user-pass passwords"
 msgstr ""
 
 #. Check peer certificate against a CRL
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:190
-msgid "openvpn_param_crl_verify"
+msgid "Check peer certificate against a CRL"
 msgstr ""
 
 #. Shell command to verify X509 name
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:191
-msgid "openvpn_param_tls_verify"
+msgid "Shell command to verify X509 name"
 msgstr ""
 
 #. Only accept connections from given X509 name
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:192
-msgid "openvpn_param_tls_remote"
+msgid "Only accept connections from given X509 name"
 msgstr ""
 
 #. Require explicit designation on certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:193
-msgid "openvpn_param_ns_cert_type"
+msgid "Require explicit designation on certificate"
 msgstr ""
 
 #. Require explicit key usage on certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:194
-msgid "openvpn_param_remote_cert_ku"
+msgid "Require explicit key usage on certificate"
 msgstr ""
 
 #. Require extended explicit key usage on certificate
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:195
-msgid "openvpn_param_remote_cert_eku"
+msgid "Require extended explicit key usage on certificate"
 msgstr ""
 
 #. Require normal and extended key usage on certificate
diff --git a/po/zh_CN/samba.po b/po/zh_CN/samba.po
index 50e59cf03..cccc3f49f 100644
--- a/po/zh_CN/samba.po
+++ b/po/zh_CN/samba.po
@@ -13,82 +13,82 @@ msgstr ""
 
 #. Network Shares
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:1
-msgid "samba"
+msgid "Network Shares"
 msgstr "网络共享"
 
 #. Hostname
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:2
-msgid "samba_samba_name"
+msgid "Hostname"
 msgstr "主机名"
 
 #. Description
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:3
-msgid "samba_samba_description"
+msgid "Description"
 msgstr "描述"
 
 #. Workgroup
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:4
-msgid "samba_samba_workgroup"
+msgid "Workgroup"
 msgstr "工作组"
 
 #. Share home-directories
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:5
-msgid "samba_samba_homes"
+msgid "Share home-directories"
 msgstr "共享主目录"
 
 #. System users can reach their home directories via network shares.
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:6
-msgid "samba_samba_homes_desc"
+msgid "System users can reach their home directories via network shares."
 msgstr ""
 
 #. Shared Directories
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:7
-msgid "samba_sambashare"
+msgid "Shared Directories"
 msgstr "共享目录"
 
 #. Shared Directory
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:8
-msgid "samba_sambashare_path"
+msgid "Shared Directory"
 msgstr "共享目录"
 
 #. Physical Path
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:9
-msgid "samba_sambashare_path_desc"
+msgid "Physical Path"
 msgstr "物理路径"
 
 #. Allowed Users
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:10
-msgid "samba_sambashare_users"
+msgid "Allowed Users"
 msgstr "允许用户"
 
 #. optional
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:11
-msgid "samba_sambashare_users_desc"
+msgid "optional"
 msgstr ""
 
 #. Read Only
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:12
-msgid "samba_sambashare_readonly"
+msgid "Read Only"
 msgstr "只读"
 
 #. Allow Guests
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:13
-msgid "samba_sambashare_guestok"
+msgid "Allow Guests"
 msgstr ""
 
 #. Create Mask
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:14
-msgid "samba_sambashare_createmask"
+msgid "Create Mask"
 msgstr ""
 
 #. Mask for new files
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:15
-msgid "samba_sambashare_createmask_desc"
+msgid "Mask for new files"
 msgstr ""
 
 #. Directory Mask
 #: applications/luci-samba/luasrc/i18n/samba.en.lua:16
-msgid "samba_sambashare_dirmask"
+msgid "Directory Mask"
 msgstr ""
 
 #. Mask for new directories
diff --git a/po/zh_CN/statistics.po b/po/zh_CN/statistics.po
index f49adb343..6e28cd23d 100644
--- a/po/zh_CN/statistics.po
+++ b/po/zh_CN/statistics.po
@@ -13,1057 +13,1057 @@ msgstr ""
 
 #. Statistics
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:1
-msgid "stat_statistics"
+msgid "Statistics"
 msgstr "统计"
 
 #. The statistics package is based on <a href=\"http://collectd.org/index.shtml\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD Tool</a> to render diagram images from collected data.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:2
-msgid "stat_desc"
+msgid "The statistics package is based on <a href=\"http://collectd.org/index.shtml\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD Tool</a> to render diagram images from collected data."
 msgstr ""
 
 #. System plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:3
-msgid "stat_systemplugins"
+msgid "System plugins"
 msgstr "系统插件"
 
 #. Network plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:4
-msgid "stat_networkplugins"
+msgid "Network plugins"
 msgstr "网络插件"
 
 #. Output plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:5
-msgid "stat_outputplugins"
+msgid "Output plugins"
 msgstr "输出插件"
 
 #. Display timespan
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:6
-msgid "stat_showtimespan"
+msgid "Display timespan »"
 msgstr ""
 
 #. Graphs
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:7
-msgid "stat_graphs"
+msgid "Graphs"
 msgstr "图"
 
 #. Collectd
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:8
-msgid "stat_collectd"
+msgid "Collectd"
 msgstr ""
 
 #. Processor
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:9
-msgid "stat_cpu"
+msgid "Processor"
 msgstr ""
 
 #. Ping
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:10
-msgid "stat_ping"
+msgid "Ping"
 msgstr "Ping"
 
 #. Firewall
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:11
-msgid "stat_iptables"
+msgid "Firewall"
 msgstr "防火墙"
 
 #. Netlink
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:12
-msgid "stat_netlink"
+msgid "Netlink"
 msgstr "Netlink"
 
 #. Processes
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:13
-msgid "stat_processes"
+msgid "Processes"
 msgstr "处理"
 
 #. Wireless
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:14
-msgid "stat_wireless"
+msgid "Wireless"
 msgstr "无线"
 
 #. TCP Connections
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:15
-msgid "stat_tcpconns"
+msgid "TCP Connections"
 msgstr "TCP连接"
 
 #. Interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:16
-msgid "stat_interface"
+msgid "Interfaces"
 msgstr "接口"
 
 #. Disk Space Usage
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:17
-msgid "stat_df"
+msgid "Disk Space Usage"
 msgstr "已用磁盘空间"
 
 #. Interrupts
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:18
-msgid "stat_irq"
+msgid "Interrupts"
 msgstr "中断"
 
 #. Disk Usage
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:19
-msgid "stat_disk"
+msgid "Disk Usage"
 msgstr ""
 
 #. Exec
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:20
-msgid "stat_exec"
+msgid "Exec"
 msgstr ""
 
 #. RRDTool
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:21
-msgid "stat_rrdtool"
+msgid "RRDTool"
 msgstr "RRD 工具"
 
 #. Network
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:22
-msgid "stat_network"
+msgid "Network"
 msgstr "网络"
 
 #. CSV Output
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:23
-msgid "stat_csv"
+msgid "CSV Output"
 msgstr "CSV 输出"
 
 #. System Load
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:24
-msgid "stat_load"
+msgid "System Load"
 msgstr "加载系统"
 
 #. DNS
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:25
-msgid "stat_dns"
+msgid "DNS"
 msgstr "DNS"
 
 #. Email
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:26
-msgid "stat_email"
+msgid "Email"
 msgstr "Email"
 
 #. UnixSock
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:27
-msgid "stat_unixsock"
+msgid "UnixSock"
 msgstr "UnixSock"
 
 #. Statistics
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:28
-msgid "lucistatistics"
+msgid "Statistics"
 msgstr "统计"
 
 #. Collectd Settings
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:29
-msgid "lucistatistics_collectd"
+msgid "Collectd Settings"
 msgstr ""
 
 #. Collectd is a small daeomon for collecting data from various sources through different plugins. On this page you can change general settings for the collectd daemon.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:30
-msgid "lucistatistics_collectd_desc"
+msgid "Collectd is a small daeomon for collecting data from various sources through different plugins. On this page you can change general settings for the collectd daemon."
 msgstr ""
 
 #. Hostname
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:31
-msgid "lucistatistics_collectd_hostname"
+msgid "Hostname"
 msgstr "主机名"
 
 #. Base Directory
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:32
-msgid "lucistatistics_collectd_basedir"
+msgid "Base Directory"
 msgstr "基本目录"
 
 #. Directory for sub-configurations
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:33
-msgid "lucistatistics_collectd_include"
+msgid "Directory for sub-configurations"
 msgstr ""
 
 #. Directory for collectd plugins
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:34
-msgid "lucistatistics_collectd_plugindir"
+msgid "Directory for collectd plugins"
 msgstr ""
 
 #. Used PID file
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:35
-msgid "lucistatistics_collectd_pidfile"
+msgid "Used PID file"
 msgstr "已用 PID 文件"
 
 #. Datasets definition file
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:36
-msgid "lucistatistics_collectd_typesdb"
+msgid "Datasets definition file"
 msgstr ""
 
 #. Data collection interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:37
-msgid "lucistatistics_collectd_interval"
+msgid "Data collection interval"
 msgstr ""
 
 #. Seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:38
-msgid "lucistatistics_collectd_interval_desc"
+msgid "Seconds"
 msgstr "秒"
 
 #. Number of threads for data collection
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:39
-msgid "lucistatistics_collectd_readthreads"
+msgid "Number of threads for data collection"
 msgstr ""
 
 #. Try to lookup fully qualified hostname
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:40
-msgid "lucistatistics_collectd_fqdnlookup"
+msgid "Try to lookup fully qualified hostname"
 msgstr ""
 
 #. CPU Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:41
-msgid "lucistatistics_collectdcpu"
+msgid "CPU Plugin Configuration"
 msgstr "CPU 插件设置"
 
 #. The cpu plugin collects basic statistics about the processor usage.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:42
-msgid "lucistatistics_collectdcpu_desc"
+msgid "The cpu plugin collects basic statistics about the processor usage."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:43
-msgid "lucistatistics_collectdcpu_enable"
+msgid "Enable this plugin"
 msgstr "启用此插件"
 
 #. CSV Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:44
-msgid "lucistatistics_collectdcsv"
+msgid "CSV Plugin Configuration"
 msgstr "CSV插件配置"
 
 #. The csv plugin stores collected data in csv file format for further processing by external programs.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:45
-msgid "lucistatistics_collectdcsv_desc"
+msgid "The csv plugin stores collected data in csv file format for further processing by external programs."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:46
-msgid "lucistatistics_collectdcsv_enable"
+msgid "Enable this plugin"
 msgstr "启用此插件"
 
 #. Storage directory for the csv files
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:47
-msgid "lucistatistics_collectdcsv_datadir"
+msgid "Storage directory for the csv files"
 msgstr ""
 
 #. Store data values as rates instead of absolute values
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:48
-msgid "lucistatistics_collectdcsv_storerates"
+msgid "Store data values as rates instead of absolute values"
 msgstr ""
 
 #. DF Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:49
-msgid "lucistatistics_collectddf"
+msgid "DF Plugin Configuration"
 msgstr "DF插件配置"
 
 #. The df plugin collects statistics about the disk space usage on different devices, mount points or filesystem types.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:50
-msgid "lucistatistics_collectddf_desc"
+msgid "The df plugin collects statistics about the disk space usage on different devices, mount points or filesystem types."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:51
-msgid "lucistatistics_collectddf_enable"
+msgid "Enable this plugin"
 msgstr "启用此插件"
 
 #. Monitor devices
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:52
-msgid "lucistatistics_collectddf_devices"
+msgid "Monitor devices"
 msgstr ""
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:53
-msgid "lucistatistics_collectddf_devices_desc"
+msgid "multiple separated by space"
 msgstr ""
 
 #. Monitor mount points
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:54
-msgid "lucistatistics_collectddf_mountpoints"
+msgid "Monitor mount points"
 msgstr ""
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:55
-msgid "lucistatistics_collectddf_mountpoints_desc"
+msgid "multiple separated by space"
 msgstr ""
 
 #. Monitor filesystem types
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:56
-msgid "lucistatistics_collectddf_fstypes"
+msgid "Monitor filesystem types"
 msgstr ""
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:57
-msgid "lucistatistics_collectddf_fstypes_desc"
+msgid "multiple separated by space"
 msgstr ""
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:58
-msgid "lucistatistics_collectddf_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr ""
 
 #. Disk Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:59
-msgid "lucistatistics_collectddisk"
+msgid "Disk Plugin Configuration"
 msgstr "磁盘插件配置"
 
 #. The disk plugin collects detailled usage statistics for selected partitions or whole disks.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:60
-msgid "lucistatistics_collectddisk_desc"
+msgid "The disk plugin collects detailled usage statistics for selected partitions or whole disks."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:61
-msgid "lucistatistics_collectddisk_enable"
+msgid "Enable this plugin"
 msgstr "启用此插件"
 
 #. Monitor disks and partitions
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:62
-msgid "lucistatistics_collectddisk_disks"
+msgid "Monitor disks and partitions"
 msgstr ""
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:63
-msgid "lucistatistics_collectddisk_disks_desc"
+msgid "multiple separated by space"
 msgstr ""
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:64
-msgid "lucistatistics_collectddisk_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr ""
 
 #. DNS Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:65
-msgid "lucistatistics_collectddns"
+msgid "DNS Plugin Configuration"
 msgstr "DNS插件配置"
 
 #. The dns plugin collects detailled statistics about dns related traffic on selected interfaces.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:66
-msgid "lucistatistics_collectddns_desc"
+msgid "The dns plugin collects detailled statistics about dns related traffic on selected interfaces."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:67
-msgid "lucistatistics_collectddns_enable"
+msgid "Enable this plugin"
 msgstr "启用此插件"
 
 #. Monitor interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:68
-msgid "lucistatistics_collectddns_interfaces"
+msgid "Monitor interfaces"
 msgstr ""
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:69
-msgid "lucistatistics_collectddns_interfaces_desc"
+msgid "multiple separated by space"
 msgstr ""
 
 #. Ignore source addresses
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:70
-msgid "lucistatistics_collectddns_ignoresources"
+msgid "Ignore source addresses"
 msgstr ""
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:71
-msgid "lucistatistics_collectddns_ignoresources_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr ""
 
 #. E-Mail Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:72
-msgid "lucistatistics_collectdemail"
+msgid "E-Mail Plugin Configuration"
 msgstr "Email插件配置"
 
 #. The email plugin creates a unix socket which can be used to transmit email-statistics to a running collectd daemon. This plugin is primarily intended to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can be used in other ways as well.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:73
-msgid "lucistatistics_collectdemail_desc"
+msgid "The email plugin creates a unix socket which can be used to transmit email-statistics to a running collectd daemon. This plugin is primarily intended to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can be used in other ways as well."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:74
-msgid "lucistatistics_collectdemail_enable"
+msgid "Enable this plugin"
 msgstr "启用此插件"
 
 #. Filepath of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:75
-msgid "lucistatistics_collectdemail_socketfile"
+msgid "Filepath of the unix socket"
 msgstr ""
 
 #. Group ownership of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:76
-msgid "lucistatistics_collectdemail_socketgroup"
+msgid "Group ownership of the unix socket"
 msgstr ""
 
 #. group name
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:77
-msgid "lucistatistics_collectdemail_socketgroup_desc"
+msgid "group name"
 msgstr "群名称"
 
 #. File permissions of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:78
-msgid "lucistatistics_collectdemail_socketperms"
+msgid "File permissions of the unix socket"
 msgstr ""
 
 #. octal
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:79
-msgid "lucistatistics_collectdemail_socketperms_desc"
+msgid "octal"
 msgstr ""
 
 #. Maximum allowed connections
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:80
-msgid "lucistatistics_collectdemail_maxconns"
+msgid "Maximum allowed connections"
 msgstr "允许最大连接数"
 
 #. Exec Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:81
-msgid "lucistatistics_collectdexec"
+msgid "Exec Plugin Configuration"
 msgstr "Exec插件配置"
 
 #. The exec plugin starts external commands to read values from or to notify external processes when certain threshold values have been reached.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:82
-msgid "lucistatistics_collectdexec_desc"
+msgid "The exec plugin starts external commands to read values from or to notify external processes when certain threshold values have been reached."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:83
-msgid "lucistatistics_collectdexec_enable"
+msgid "Enable this plugin"
 msgstr "启用此插件"
 
 #. Add command for reading values
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:84
-msgid "lucistatistics_collectdexecinput"
+msgid "Add command for reading values"
 msgstr ""
 
 #. Here you can define external commands which will be started by collectd in order to read certain values. The values will be read from stdout.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:85
-msgid "lucistatistics_collectdexecinput_desc"
+msgid "Here you can define external commands which will be started by collectd in order to read certain values. The values will be read from stdout."
 msgstr ""
 
 #. Commandline
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:86
-msgid "lucistatistics_collectdexecinput_cmdline"
+msgid "Commandline"
 msgstr "命令行"
 
 #. Run as user
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:87
-msgid "lucistatistics_collectdexecinput_cmduser"
+msgid "Run as user"
 msgstr "以用户身份运行"
 
 #. Run as group
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:88
-msgid "lucistatistics_collectdexecinput_cmdgroup"
+msgid "Run as group"
 msgstr "以群组身份运行"
 
 #. Add notification command
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:89
-msgid "lucistatistics_collectdexecnotify"
+msgid "Add notification command"
 msgstr ""
 
 #. Here you can define external commands which will be started by collectd when certain threshold values have been reached. The values leading to invokation will be feeded to the the called programs stdin.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:90
-msgid "lucistatistics_collectdexecnotify_desc"
+msgid "Here you can define external commands which will be started by collectd when certain threshold values have been reached. The values leading to invokation will be feeded to the the called programs stdin."
 msgstr ""
 
 #. Commandline
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:91
-msgid "lucistatistics_collectdexecnotify_cmdline"
+msgid "Commandline"
 msgstr "命令行"
 
 #. Run as user
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:92
-msgid "lucistatistics_collectdexecnotify_cmduser"
+msgid "Run as user"
 msgstr "以用户身份运行"
 
 #. Run as group
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:93
-msgid "lucistatistics_collectdexecnotify_cmdgroup"
+msgid "Run as group"
 msgstr "以群组身份运行"
 
 #. Interface Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:94
-msgid "lucistatistics_collectdinterface"
+msgid "Interface Plugin Configuration"
 msgstr ""
 
 #. The interface plugin collects traffic statistics on selected interfaces.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:95
-msgid "lucistatistics_collectdinterface_desc"
+msgid "The interface plugin collects traffic statistics on selected interfaces."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:96
-msgid "lucistatistics_collectdinterface_enable"
+msgid "Enable this plugin"
 msgstr "启用此插件"
 
 #. Monitor interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:97
-msgid "lucistatistics_collectdinterface_interfaces"
+msgid "Monitor interfaces"
 msgstr ""
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:98
-msgid "lucistatistics_collectdinterface_interfaces_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr ""
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:99
-msgid "lucistatistics_collectdinterface_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr ""
 
 #. Iptables Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:100
-msgid "lucistatistics_collectdiptables"
+msgid "Iptables Plugin Configuration"
 msgstr "Iptables插件配置"
 
 #. The iptables plugin will monitor selected firewall rules and collect informations about processed bytes and packets per rule.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:101
-msgid "lucistatistics_collectdiptables_desc"
+msgid "The iptables plugin will monitor selected firewall rules and collect informations about processed bytes and packets per rule."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:102
-msgid "lucistatistics_collectdiptables_enable"
+msgid "Enable this plugin"
 msgstr "启用此插件"
 
 #. Add matching rule
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:103
-msgid "lucistatistics_collectdiptablesmatch"
+msgid "Add matching rule"
 msgstr ""
 
 #. Here you can define various criteria by which the monitored iptables rules are selected.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:104
-msgid "lucistatistics_collectdiptablesmatch_desc"
+msgid "Here you can define various criteria by which the monitored iptables rules are selected."
 msgstr ""
 
 #. Name of the rule
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:105
-msgid "lucistatistics_collectdiptablesmatch_name"
+msgid "Name of the rule"
 msgstr ""
 
 #. max. 16 chars
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:106
-msgid "lucistatistics_collectdiptablesmatch_name_desc"
+msgid "max. 16 chars"
 msgstr ""
 
 #. Table
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:107
-msgid "lucistatistics_collectdiptablesmatch_table"
+msgid "Table"
 msgstr "表格"
 
 #. Chain
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:108
-msgid "lucistatistics_collectdiptablesmatch_chain"
+msgid "Chain"
 msgstr ""
 
 #. Action (target)
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:109
-msgid "lucistatistics_collectdiptablesmatch_target"
+msgid "Action (target)"
 msgstr ""
 
 #. Network protocol
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:110
-msgid "lucistatistics_collectdiptablesmatch_protocol"
+msgid "Network protocol"
 msgstr "网络协议"
 
 #. Source ip range
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:111
-msgid "lucistatistics_collectdiptablesmatch_source"
+msgid "Source ip range"
 msgstr ""
 
 #. CIDR notation
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:112
-msgid "lucistatistics_collectdiptablesmatch_source_desc"
+msgid "CIDR notation"
 msgstr ""
 
 #. Destination ip range
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:113
-msgid "lucistatistics_collectdiptablesmatch_destination"
+msgid "Destination ip range"
 msgstr ""
 
 #. CIDR notation
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:114
-msgid "lucistatistics_collectdiptablesmatch_destination_desc"
+msgid "CIDR notation"
 msgstr ""
 
 #. Incoming interface
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:115
-msgid "lucistatistics_collectdiptablesmatch_inputif"
+msgid "Incoming interface"
 msgstr ""
 
 #. e.g. br-lan
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:116
-msgid "lucistatistics_collectdiptablesmatch_inputif_desc"
+msgid "e.g. br-lan"
 msgstr ""
 
 #. Outgoing interface
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:117
-msgid "lucistatistics_collectdiptablesmatch_outputif"
+msgid "Outgoing interface"
 msgstr ""
 
 #. e.g. br-ff
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:118
-msgid "lucistatistics_collectdiptablesmatch_outputif_desc"
+msgid "e.g. br-ff"
 msgstr ""
 
 #. Options
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:119
-msgid "lucistatistics_collectdiptablesmatch_options"
+msgid "Options"
 msgstr ""
 
 #. e.g. reject-with tcp-reset
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:120
-msgid "lucistatistics_collectdiptablesmatch_options_desc"
+msgid "e.g. reject-with tcp-reset"
 msgstr ""
 
 #. IRQ Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:121
-msgid "lucistatistics_collectdirq"
+msgid "IRQ Plugin Configuration"
 msgstr ""
 
 #. The irq plugin will monitor the rate of issues per second for each selected interrupt. If no interrupt is selected then all interrupts are monitored.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:122
-msgid "lucistatistics_collectdirq_desc"
+msgid "The irq plugin will monitor the rate of issues per second for each selected interrupt. If no interrupt is selected then all interrupts are monitored."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:123
-msgid "lucistatistics_collectdirq_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Monitor interrupts
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:124
-msgid "lucistatistics_collectdirq_irqs"
+msgid "Monitor interrupts"
 msgstr ""
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:125
-msgid "lucistatistics_collectdirq_irqs_desc"
+msgid "multiple separated by space"
 msgstr ""
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:126
-msgid "lucistatistics_collectdirq_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr ""
 
 #. Load Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:127
-msgid "lucistatistics_collectdload"
+msgid "Load Plugin Configuration"
 msgstr ""
 
 #. The load plugin collects statistics about the general system load.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:128
-msgid "lucistatistics_collectdload_desc"
+msgid "The load plugin collects statistics about the general system load."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:129
-msgid "lucistatistics_collectdload_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Netlink Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:130
-msgid "lucistatistics_collectdnetlink"
+msgid "Netlink Plugin Configuration"
 msgstr ""
 
 #. The netlink plugin collects extended informations like qdisc-, class- and filter-statistics for selected interfaces.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:131
-msgid "lucistatistics_collectdnetlink_desc"
+msgid "The netlink plugin collects extended informations like qdisc-, class- and filter-statistics for selected interfaces."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:132
-msgid "lucistatistics_collectdnetlink_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Basic monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:133
-msgid "lucistatistics_collectdnetlink_interfaces"
+msgid "Basic monitoring"
 msgstr ""
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:134
-msgid "lucistatistics_collectdnetlink_interfaces_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr ""
 
 #. Verbose monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:135
-msgid "lucistatistics_collectdnetlink_verboseinterfaces"
+msgid "Verbose monitoring"
 msgstr ""
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:136
-msgid "lucistatistics_collectdnetlink_verboseinterfaces_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr ""
 
 #. Qdisc monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:137
-msgid "lucistatistics_collectdnetlink_qdiscs"
+msgid "Qdisc monitoring"
 msgstr ""
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:138
-msgid "lucistatistics_collectdnetlink_qdiscs_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr ""
 
 #. Shaping class monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:139
-msgid "lucistatistics_collectdnetlink_classes"
+msgid "Shaping class monitoring"
 msgstr ""
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:140
-msgid "lucistatistics_collectdnetlink_classes_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr ""
 
 #. Filter class monitoring
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:141
-msgid "lucistatistics_collectdnetlink_filters"
+msgid "Filter class monitoring"
 msgstr ""
 
 #. hold Ctrl while clicking to select multiple interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:142
-msgid "lucistatistics_collectdnetlink_filters_desc"
+msgid "hold Ctrl while clicking to select multiple interfaces"
 msgstr ""
 
 #. Monitor all except selected ones
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:143
-msgid "lucistatistics_collectdnetlink_ignoreselected"
+msgid "Monitor all except selected ones"
 msgstr ""
 
 #. Network Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:144
-msgid "lucistatistics_collectdnetwork"
+msgid "Network Plugin Configuration"
 msgstr ""
 
 #. The network plugin provides network based communication between different collectd instances. Collectd can operate both in client and server mode. In client mode locally collected date is transferred to a collectd server instance, in server mode the local instance receives data from other hosts.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:145
-msgid "lucistatistics_collectdnetwork_desc"
+msgid "The network plugin provides network based communication between different collectd instances. Collectd can operate both in client and server mode. In client mode locally collected date is transferred to a collectd server instance, in server mode the local instance receives data from other hosts."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:146
-msgid "lucistatistics_collectdnetwork_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Listener interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:147
-msgid "lucistatistics_collectdnetworklisten"
+msgid "Listener interfaces"
 msgstr ""
 
 #. This section defines on which interfaces collectd will wait for incoming connections.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:148
-msgid "lucistatistics_collectdnetworklisten_desc"
+msgid "This section defines on which interfaces collectd will wait for incoming connections."
 msgstr ""
 
 #. Listen host
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:149
-msgid "lucistatistics_collectdnetworklisten_host"
+msgid "Listen host"
 msgstr ""
 
 #. host-, ip- or ip6 address
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:150
-msgid "lucistatistics_collectdnetworklisten_host_desc"
+msgid "host-, ip- or ip6 address"
 msgstr ""
 
 #. Listen port
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:151
-msgid "lucistatistics_collectdnetworklisten_port"
+msgid "Listen port"
 msgstr ""
 
 #. 0 - 65535
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:152
-msgid "lucistatistics_collectdnetworklisten_port_desc"
+msgid "0 - 65535"
 msgstr ""
 
 #. server interfaces
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:153
-msgid "lucistatistics_collectdnetworkserver"
+msgid "server interfaces"
 msgstr ""
 
 #. This section defines to which servers the locally collected data is sent to.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:154
-msgid "lucistatistics_collectdnetworkserver_desc"
+msgid "This section defines to which servers the locally collected data is sent to."
 msgstr ""
 
 #. Server host
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:155
-msgid "lucistatistics_collectdnetworkserver_host"
+msgid "Server host"
 msgstr ""
 
 #. host-, ip- or ip6 address
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:156
-msgid "lucistatistics_collectdnetworkserver_host_desc"
+msgid "host-, ip- or ip6 address"
 msgstr ""
 
 #. Server port
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:157
-msgid "lucistatistics_collectdnetworkserver_port"
+msgid "Server port"
 msgstr ""
 
 #. 0 - 65535
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:158
-msgid "lucistatistics_collectdnetworkserver_port_desc"
+msgid "0 - 65535"
 msgstr ""
 
 #. TTL for network packets
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:159
-msgid "lucistatistics_collectdnetwork_timetolive"
+msgid "TTL for network packets"
 msgstr ""
 
 #. 0 - 255
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:160
-msgid "lucistatistics_collectdnetwork_timetolive_desc"
+msgid "0 - 255"
 msgstr ""
 
 #. Forwarding between listen and server addresses
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:161
-msgid "lucistatistics_collectdnetwork_forward"
+msgid "Forwarding between listen and server addresses"
 msgstr ""
 
 #. Cache flush interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:162
-msgid "lucistatistics_collectdnetwork_cacheflush"
+msgid "Cache flush interval"
 msgstr ""
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:163
-msgid "lucistatistics_collectdnetwork_cacheflush_desc"
+msgid "seconds"
 msgstr ""
 
 #. Ping Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:164
-msgid "lucistatistics_collectdping"
+msgid "Ping Plugin Configuration"
 msgstr ""
 
 #. The ping plugin will send icmp echo replies to selected hosts and measure the roundtrip time for each host.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:165
-msgid "lucistatistics_collectdping_desc"
+msgid "The ping plugin will send icmp echo replies to selected hosts and measure the roundtrip time for each host."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:166
-msgid "lucistatistics_collectdping_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Monitor hosts
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:167
-msgid "lucistatistics_collectdping_hosts"
+msgid "Monitor hosts"
 msgstr ""
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:168
-msgid "lucistatistics_collectdping_hosts_desc"
+msgid "multiple separated by space"
 msgstr ""
 
 #. TTL for ping packets
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:169
-msgid "lucistatistics_collectdping_ttl"
+msgid "TTL for ping packets"
 msgstr ""
 
 #. 0 - 255
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:170
-msgid "lucistatistics_collectdping_ttl_desc"
+msgid "0 - 255"
 msgstr ""
 
 #. Processes Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:171
-msgid "lucistatistics_collectdprocesses"
+msgid "Processes Plugin Configuration"
 msgstr ""
 
 #. The processes plugin collects informations like cpu time, page faults and memory usage of selected processes.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:172
-msgid "lucistatistics_collectdprocesses_desc"
+msgid "The processes plugin collects informations like cpu time, page faults and memory usage of selected processes."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:173
-msgid "lucistatistics_collectdprocesses_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Monitor processes
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:174
-msgid "lucistatistics_collectdprocesses_processes"
+msgid "Monitor processes"
 msgstr ""
 
 #. multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:175
-msgid "lucistatistics_collectdprocesses_processes_desc"
+msgid "multiple separated by space"
 msgstr ""
 
 #. RRDTool Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:176
-msgid "lucistatistics_collectdrrdtool"
+msgid "RRDTool Plugin Configuration"
 msgstr ""
 
 #. The rrdtool plugin stores the collected data in rrd database files, the foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong values will result in a very high memory consumption in the temporary directory. This can render the device unusable!</strong>
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:177
-msgid "lucistatistics_collectdrrdtool_desc"
+msgid "The rrdtool plugin stores the collected data in rrd database files, the foundation of the diagrams.<br /><br /><strong>Warning: Setting the wrong values will result in a very high memory consumption in the temporary directory. This can render the device unusable!</strong>"
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:178
-msgid "lucistatistics_collectdrrdtool_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Storage directory
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:179
-msgid "lucistatistics_collectdrrdtool_datadir"
+msgid "Storage directory"
 msgstr ""
 
 #. RRD step interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:180
-msgid "lucistatistics_collectdrrdtool_stepsize"
+msgid "RRD step interval"
 msgstr ""
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:181
-msgid "lucistatistics_collectdrrdtool_stepsize_desc"
+msgid "seconds"
 msgstr ""
 
 #. RRD heart beat interval
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:182
-msgid "lucistatistics_collectdrrdtool_heartbeat"
+msgid "RRD heart beat interval"
 msgstr ""
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:183
-msgid "lucistatistics_collectdrrdtool_heartbeat_desc"
+msgid "seconds"
 msgstr ""
 
 #. Only create average RRAs
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:184
-msgid "lucistatistics_collectdrrdtool_rrasingle"
+msgid "Only create average RRAs"
 msgstr ""
 
 #. reduces rrd size
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:185
-msgid "lucistatistics_collectdrrdtool_rrasingle_desc"
+msgid "reduces rrd size"
 msgstr ""
 
 #. Stored timespans
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:186
-msgid "lucistatistics_collectdrrdtool_rratimespans"
+msgid "Stored timespans"
 msgstr ""
 
 #. seconds; multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:187
-msgid "lucistatistics_collectdrrdtool_rratimespans_desc"
+msgid "seconds; multiple separated by space"
 msgstr ""
 
 #. Rows per RRA
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:188
-msgid "lucistatistics_collectdrrdtool_rrarows"
+msgid "Rows per RRA"
 msgstr ""
 
 #. RRD XFiles Factor
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:189
-msgid "lucistatistics_collectdrrdtool_xff"
+msgid "RRD XFiles Factor"
 msgstr ""
 
 #. Cache collected data for
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:190
-msgid "lucistatistics_collectdrrdtool_cachetimeout"
+msgid "Cache collected data for"
 msgstr ""
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:191
-msgid "lucistatistics_collectdrrdtool_cachetimeout_desc"
+msgid "seconds"
 msgstr ""
 
 #. Flush cache after
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:192
-msgid "lucistatistics_collectdrrdtool_cacheflush"
+msgid "Flush cache after"
 msgstr ""
 
 #. seconds
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:193
-msgid "lucistatistics_collectdrrdtool_cacheflush_desc"
+msgid "seconds"
 msgstr ""
 
 #. TCPConns Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:194
-msgid "lucistatistics_collectdtcpconns"
+msgid "TCPConns Plugin Configuration"
 msgstr ""
 
 #. The tcpconns plugin collects informations about open tcp connections on selected ports.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:195
-msgid "lucistatistics_collectdtcpconns_desc"
+msgid "The tcpconns plugin collects informations about open tcp connections on selected ports."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:196
-msgid "lucistatistics_collectdtcpconns_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Monitor all local listen ports
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:197
-msgid "lucistatistics_collectdtcpconns_listeningports"
+msgid "Monitor all local listen ports"
 msgstr ""
 
 #. Monitor local ports
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:198
-msgid "lucistatistics_collectdtcpconns_localports"
+msgid "Monitor local ports"
 msgstr ""
 
 #. 0 - 65535; multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:199
-msgid "lucistatistics_collectdtcpconns_localports_desc"
+msgid "0 - 65535; multiple separated by space"
 msgstr ""
 
 #. Monitor remote ports
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:200
-msgid "lucistatistics_collectdtcpconns_remoteports"
+msgid "Monitor remote ports"
 msgstr ""
 
 #. 0 - 65535; multiple separated by space
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:201
-msgid "lucistatistics_collectdtcpconns_remoteports_desc"
+msgid "0 - 65535; multiple separated by space"
 msgstr ""
 
 #. Unixsock Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:202
-msgid "lucistatistics_collectdunixsock"
+msgid "Unixsock Plugin Configuration"
 msgstr ""
 
 #. The unixsock plugin creates a unix socket which can be used to read collected data from a running collectd instance.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:203
-msgid "lucistatistics_collectdunixsock_desc"
+msgid "The unixsock plugin creates a unix socket which can be used to read collected data from a running collectd instance."
 msgstr ""
 
 #. Enable this plugin
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:204
-msgid "lucistatistics_collectdunixsock_enable"
+msgid "Enable this plugin"
 msgstr ""
 
 #. Filepath of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:205
-msgid "lucistatistics_collectdunixsock_socketfile"
+msgid "Filepath of the unix socket"
 msgstr ""
 
 #. Group ownership of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:206
-msgid "lucistatistics_collectdunixsock_socketgroup"
+msgid "Group ownership of the unix socket"
 msgstr ""
 
 #. group name
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:207
-msgid "lucistatistics_collectdunixsock_socketgroup_desc"
+msgid "group name"
 msgstr ""
 
 #. File permissions of the unix socket
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:208
-msgid "lucistatistics_collectdunixsock_socketperms"
+msgid "File permissions of the unix socket"
 msgstr ""
 
 #. octal
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:209
-msgid "lucistatistics_collectdunixsock_socketperms_desc"
+msgid "octal"
 msgstr ""
 
 #. Wireless Plugin Configuration
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:210
-msgid "lucistatistics_collectdwireless"
+msgid "Wireless Plugin Configuration"
 msgstr ""
 
 #. The wireless plugin collects statistics about wireless signal strength, noise and quality.
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:211
-msgid "lucistatistics_collectdwireless_desc"
+msgid "The wireless plugin collects statistics about wireless signal strength, noise and quality."
 msgstr ""
 
 #. Enable this plugin
diff --git a/po/zh_CN/sysauth.po b/po/zh_CN/sysauth.po
index 180ac11b6..2588c0c96 100644
--- a/po/zh_CN/sysauth.po
+++ b/po/zh_CN/sysauth.po
@@ -13,12 +13,12 @@ msgstr ""
 
 #. Authorization Required
 #: i18n/english/luasrc/i18n/sysauth.en.lua:1
-msgid "sysauth_head"
+msgid "Authorization Required"
 msgstr "认证请求"
 
 #. Please enter your username and password.
 #: i18n/english/luasrc/i18n/sysauth.en.lua:2
-msgid "sysauth_prompt"
+msgid "Please enter your username and password."
 msgstr "请输入您的用户名和密码"
 
 #. Invalid username and/or password! Please try again.
diff --git a/po/zh_CN/wifi.po b/po/zh_CN/wifi.po
index b7179e41d..e949c765e 100644
--- a/po/zh_CN/wifi.po
+++ b/po/zh_CN/wifi.po
@@ -13,192 +13,192 @@ msgstr ""
 
 #. auto
 #: i18n/english/luasrc/i18n/wifi.en.lua:1
-msgid "wifi_auto"
+msgid "auto"
 msgstr "自动"
 
 #. Frequency Hopping
 #: i18n/english/luasrc/i18n/wifi.en.lua:2
-msgid "wifi_fh"
+msgid "Frequency Hopping"
 msgstr ""
 
 #. Diversity
 #: i18n/english/luasrc/i18n/wifi.en.lua:3
-msgid "wifi_diversity"
+msgid "Diversity"
 msgstr ""
 
 #. Transmitter Antenna
 #: i18n/english/luasrc/i18n/wifi.en.lua:4
-msgid "wifi_txantenna"
+msgid "Transmitter Antenna"
 msgstr ""
 
 #. Receiver Antenna
 #: i18n/english/luasrc/i18n/wifi.en.lua:5
-msgid "wifi_rxantenna"
+msgid "Receiver Antenna"
 msgstr ""
 
 #. Distance Optimization
 #: i18n/english/luasrc/i18n/wifi.en.lua:6
-msgid "wifi_distance"
+msgid "Distance Optimization"
 msgstr ""
 
 #. Distance to farthest network member in meters.
 #: i18n/english/luasrc/i18n/wifi.en.lua:7
-msgid "wifi_distance_desc"
+msgid "Distance to farthest network member in meters."
 msgstr ""
 
 #. MAC-Address Filter
 #: i18n/english/luasrc/i18n/wifi.en.lua:8
-msgid "wifi_macpolicy"
+msgid "MAC-Address Filter"
 msgstr "MAC-地址过滤"
 
 #. Allow listed only
 #: i18n/english/luasrc/i18n/wifi.en.lua:9
-msgid "wifi_whitelist"
+msgid "Allow listed only"
 msgstr ""
 
 #. Allow all except listed
 #: i18n/english/luasrc/i18n/wifi.en.lua:10
-msgid "wifi_blacklist"
+msgid "Allow all except listed"
 msgstr ""
 
 #. MAC-List
 #: i18n/english/luasrc/i18n/wifi.en.lua:11
-msgid "wifi_maclist"
+msgid "MAC-List"
 msgstr "MAC-列表"
 
 #. Frame Bursting
 #: i18n/english/luasrc/i18n/wifi.en.lua:12
-msgid "wifi_bursting"
+msgid "Frame Bursting"
 msgstr ""
 
 #. Regulatory Domain
 #: i18n/english/luasrc/i18n/wifi.en.lua:13
-msgid "wifi_regdomain"
+msgid "Regulatory Domain"
 msgstr ""
 
 #. Country Code
 #: i18n/english/luasrc/i18n/wifi.en.lua:14
-msgid "wifi_country"
+msgid "Country Code"
 msgstr "国家编号"
 
 #. Outdoor Channels
 #: i18n/english/luasrc/i18n/wifi.en.lua:15
-msgid "wifi_outdoor"
+msgid "Outdoor Channels"
 msgstr ""
 
 #. Connection Limit
 #: i18n/english/luasrc/i18n/wifi.en.lua:16
-msgid "wifi_maxassoc"
+msgid "Connection Limit"
 msgstr ""
 
 #. <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:17
-msgid "wifi_essid"
+msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 
 #. <abbr title=\"Basic Service Set Identifier\">BSSID</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:18
-msgid "wifi_bssid"
+msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 
 #. Fragmentation Threshold
 #: i18n/english/luasrc/i18n/wifi.en.lua:19
-msgid "wifi_frag"
+msgid "Fragmentation Threshold"
 msgstr ""
 
 #. RTS/CTS Threshold
 #: i18n/english/luasrc/i18n/wifi.en.lua:20
-msgid "wifi_rts"
+msgid "RTS/CTS Threshold"
 msgstr ""
 
 #. <abbr title=\"Wireless Distribution System\">WDS</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:21
-msgid "wifi_wds"
+msgid "<abbr title=\"Wireless Distribution System\">WDS</abbr>"
 msgstr ""
 
 #. Separate WDS
 #: i18n/english/luasrc/i18n/wifi.en.lua:22
-msgid "wifi_wdssep"
+msgid "Separate WDS"
 msgstr ""
 
 #. Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>
 #: i18n/english/luasrc/i18n/wifi.en.lua:23
-msgid "wifi_hidden"
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr ""
 
 #. Isolate Clients
 #: i18n/english/luasrc/i18n/wifi.en.lua:24
-msgid "wifi_isloate"
+msgid "Isolate Clients"
 msgstr ""
 
 #. Prevent Client to Client Communication
 #: i18n/english/luasrc/i18n/wifi.en.lua:25
-msgid "wifi_isloate_desc"
+msgid "Prevent Client to Client Communication"
 msgstr ""
 
 #. Background Scan
 #: i18n/english/luasrc/i18n/wifi.en.lua:26
-msgid "wifi_bgscan"
+msgid "Background Scan"
 msgstr ""
 
 #. Transmission Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:27
-msgid "wifi_rate"
+msgid "Transmission Rate"
 msgstr ""
 
 #. Multicast Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:28
-msgid "wifi_mcast_rate"
+msgid "Multicast Rate"
 msgstr ""
 
 #. Minimum Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:29
-msgid "wifi_minrate"
+msgid "Minimum Rate"
 msgstr ""
 
 #. Maximum Rate
 #: i18n/english/luasrc/i18n/wifi.en.lua:30
-msgid "wifi_maxrate"
+msgid "Maximum Rate"
 msgstr ""
 
 #. Compression
 #: i18n/english/luasrc/i18n/wifi.en.lua:31
-msgid "wifi_compression"
+msgid "Compression"
 msgstr ""
 
 #. Turbo Mode
 #: i18n/english/luasrc/i18n/wifi.en.lua:32
-msgid "wifi_turbo"
+msgid "Turbo Mode"
 msgstr ""
 
 #. Fast Frames
 #: i18n/english/luasrc/i18n/wifi.en.lua:33
-msgid "wifi_ff"
+msgid "Fast Frames"
 msgstr ""
 
 #. WMM Mode
 #: i18n/english/luasrc/i18n/wifi.en.lua:34
-msgid "wifi_wmm"
+msgid "WMM Mode"
 msgstr ""
 
 #. XR Support
 #: i18n/english/luasrc/i18n/wifi.en.lua:35
-msgid "wifi_xr"
+msgid "XR Support"
 msgstr ""
 
 #. AR Support
 #: i18n/english/luasrc/i18n/wifi.en.lua:36
-msgid "wifi_ar"
+msgid "AR Support"
 msgstr ""
 
 #. Disable HW-Beacon timer
 #: i18n/english/luasrc/i18n/wifi.en.lua:37
-msgid "wifi_nosbeacon"
+msgid "Disable HW-Beacon timer"
 msgstr ""
 
 #. Do not send probe responses
 #: i18n/english/luasrc/i18n/wifi.en.lua:38
-msgid "wifi_noprobereq"
+msgid "Do not send probe responses"
 msgstr ""
 
 #. WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP and ad-hoc mode) to be installed.
-- 
2.25.1